Buffer chat messages, fix bugs, update TODOs.

retrixe · retrixe · commit ae1a54b7a4bb · 2022-09-15T02:42:07.000+05:30
Fix log event handler not being unregistered.
Disable login start with certificates (for now).
diff --git a/src/minecraft/connection/native.ts b/src/minecraft/connection/native.ts
@@ -133,6 +133,7 @@ export class NativeServerConnection
       this.eventEmitter.removeAllListeners('ecm:packet')
       this.eventEmitter.removeAllListeners('ecm:error')
       this.eventEmitter.removeAllListeners('ecm:close')
+      this.eventEmitter.removeAllListeners('ecm:log')
       this.closed = true
       this.emit('close')
     })
@@ -150,6 +151,7 @@ export class NativeServerConnection
     this.eventEmitter.removeAllListeners('ecm:packet')
     this.eventEmitter.removeAllListeners('ecm:error')
     this.eventEmitter.removeAllListeners('ecm:close')
+    this.eventEmitter.removeAllListeners('ecm:log')
   }
 }
 
diff --git a/src/minecraft/connection/shared.ts b/src/minecraft/connection/shared.ts
@@ -30,6 +30,8 @@ export const parseEncryptionRequestPacket = (packet: Packet) => {
 export const getLoginPacket = (opts: ConnectionOptions) => {
   const data: PacketDataTypes[] = [opts.username]
   if (opts.protocolVersion >= protocolMap[1.19]) {
+    data.push(false)
+    /* TODO: Support chat signing properly.
     data.push(!!opts.certificate)
     if (opts.certificate) {
       let buf = Buffer.alloc(8)
@@ -46,7 +48,7 @@ export const getLoginPacket = (opts: ConnectionOptions) => {
       buf = Buffer.from(opts.certificate.publicKeySignature, 'base64')
       data.push(writeVarInt(buf.byteLength))
       data.push(buf)
-    }
+    } */
     if (opts.protocolVersion >= protocolMap['1.19.1']) {
       if (opts.selectedProfile) {
         const msb = Buffer.from(opts.selectedProfile.substring(0, 16), 'hex')
diff --git a/src/screens/chat/ChatScreen.tsx b/src/screens/chat/ChatScreen.tsx
@@ -108,6 +108,7 @@ const ChatScreen = ({ navigation, route }: Props) => {
   const [messages, setMessages] = useState<Message[]>([])
   const [loggedIn, setLoggedIn] = useState(false)
   const [message, setMessage] = useState('')
+  const messagesBufferRef = useRef<Message[]>([])
   const healthRef = useRef<number | null>(null)
   const statusRef = useRef<Status>(connection ? 'CONNECTING' : 'OPENING')
   const idRef = useRef(0)
@@ -117,16 +118,27 @@ const ChatScreen = ({ navigation, route }: Props) => {
       ? 256
       : 100
   const addMessage = (text: MinecraftChat) =>
-    setMessages(m => {
-      const trunc = m.length > 500 ? m.slice(0, 499) : m
-      return [{ key: idRef.current++, text }].concat(trunc)
-    })
+    messagesBufferRef.current.unshift({ key: idRef.current++, text })
   const closeChatScreen = () => {
     if (navigation.canGoBack() && statusRef.current !== 'CLOSED') {
       navigation.goBack()
     }
   }
 
+  // Chat message buffering function.
+  useEffect(() => {
+    const interval = setInterval(() => {
+      if (messagesBufferRef.current.length) {
+        setMessages(m => {
+          const concat = messagesBufferRef.current.concat(m)
+          messagesBufferRef.current = []
+          return concat.length > 500 ? concat.slice(0, 499) : concat
+        })
+      }
+    }, 50)
+    return () => clearInterval(interval)
+  }, [])
+
   // Screen cleanup function.
   useEffect(() =>
     navigation.addListener('beforeRemove', () => {
diff --git a/src/screens/chat/sessionBuilder.ts b/src/screens/chat/sessionBuilder.ts
@@ -43,8 +43,8 @@ export const createConnection = async (
   // Create an updated "session" containing access tokens and certificates.
   let session = sessions[activeAccount]
   const is119 = version >= protocolMap[1.19]
+  // TODO: We should store session store in a persistent cache. Certificates and access tokens should be updated regularly.
   if (uuid && (!session || (!session.certificate && is119))) {
-    // LOW-TODO: Certificates and access tokens should be updated regularly.
     // We should probably lock access to them via a semaphore.
     try {
       // Create a session with the latest access token.
@@ -91,6 +91,7 @@ export const createConnection = async (
     }
   }
 
+  // TODO: Better connection cancellation support. The session load can take a lot of time.
   // Connect to server after setting up the session.
   try {
     const newConn = await initiateConnection({

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ export class NativeServerConnection`
`133`	`133`	`this.eventEmitter.removeAllListeners('ecm:packet')`
`134`	`134`	`this.eventEmitter.removeAllListeners('ecm:error')`
`135`	`135`	`this.eventEmitter.removeAllListeners('ecm:close')`
	`136`	`+ this.eventEmitter.removeAllListeners('ecm:log')`
`136`	`137`	`this.closed = true`
`137`	`138`	`this.emit('close')`
`138`	`139`	`})`
`@@ -150,6 +151,7 @@ export class NativeServerConnection`
`150`	`151`	`this.eventEmitter.removeAllListeners('ecm:packet')`
`151`	`152`	`this.eventEmitter.removeAllListeners('ecm:error')`
`152`	`153`	`this.eventEmitter.removeAllListeners('ecm:close')`
	`154`	`+ this.eventEmitter.removeAllListeners('ecm:log')`
`153`	`155`	`}`
`154`	`156`	`}`
`155`	`157`