@whitewall/blip-sdk 0.0.141 → 0.0.143

package/src/sender/tcp/tcpsender.ts

@@ -13,6 +13,7 @@ import { BlipError } from '../bliperror.ts'
 import { ConnectionSender, type ConnectionSenderConstructor, OpenConnectionSender } from '../sender.ts'
 import { SessionNegotiator } from '../sessionnegotiator.ts'
 import { EnvelopeThrottler } from '../throttler.ts'
+import { tryParseJSON } from './json-parser.ts'
 
 /**
  * @remarks
@@ -97,6 +98,7 @@ export class TCPSender extends OpenConnectionSender {
     public async close() {
         this.sessionNegotiator?.finish()
         await this.connectionHandle.close()
+        await super.close()
     }
 
     public static login = ConnectionSender.login<TCPSender>
@@ -142,8 +144,7 @@ class TCPHandle<T> {
         if (!this.closing && this.currentSocketPromise) {
             this.closing = true
             const current = await this.currentSocketPromise
-            current.end()
-            current.destroy()
+            current.end().removeAllListeners().destroySoon()
         }
     }
 
@@ -155,8 +156,8 @@ class TCPHandle<T> {
     ): Promise<Socket> {
         const { connect } = await import('node:net')
 
-        const socket = connect({ host, port }).setEncoding('utf8')
-        let buffer = ''
+        const socket = connect({ host, port }).setKeepAlive(true)
+        let buffer = Buffer.alloc(0)
 
         await new Promise<void>((resolve) => {
             socket.once('connect', () => {
@@ -180,8 +181,8 @@ class TCPHandle<T> {
                 }
             })
 
-            socket.on('data', (chunk) => {
-                const result = this.tryParseJSON(buffer + chunk)
+            socket.on('data', (chunk: Buffer<ArrayBuffer>) => {
+                const result = tryParseJSON<T>(buffer.length === 0 ? chunk : Buffer.concat([buffer, chunk]))
                 buffer = result.remainingBuffer
 
                 for (const parsed of result.parsedObjects) {
@@ -195,58 +196,4 @@ class TCPHandle<T> {
 
         return socket
     }
-
-    private tryParseJSON(buffer: string): { parsedObjects: Array<T>; remainingBuffer: string } {
-        const parsedObjects: Array<T> = []
-        let currBuffer = buffer
-        let startIndex = buffer.indexOf('{')
-
-        while (startIndex !== -1) {
-            let braceCount = 0
-            let inString = false
-            let escaped = false
-            let foundEnd = false
-            let endIndex = startIndex
-
-            for (let i = startIndex; i < currBuffer.length; i++) {
-                const char = currBuffer[i]
-
-                if (inString) {
-                    if (escaped) {
-                        escaped = false
-                    } else if (char === '\\') {
-                        escaped = true
-                    } else if (char === '"') {
-                        inString = false
-                    }
-                } else if (char === '"') {
-                    inString = true
-                } else if (char === '{') {
-                    braceCount++
-                } else if (char === '}') {
-                    braceCount--
-                    // When all opened braces are closed, we found the end.
-                    if (braceCount === 0) {
-                        endIndex = i
-                        foundEnd = true
-                        break
-                    }
-                }
-            }
-
-            // If we haven't found a complete JSON object, break and wait for more data.
-            if (!foundEnd) {
-                break
-            }
-
-            const rawMessage = currBuffer.slice(startIndex, endIndex + 1).trim()
-            const parsed = JSON.parse(rawMessage) as T
-            parsedObjects.push(parsed)
-
-            currBuffer = currBuffer.slice(endIndex + 1)
-            startIndex = currBuffer.indexOf('{')
-        }
-
-        return { parsedObjects, remainingBuffer: currBuffer }
-    }
 }

package/src/sender/websocket/websocketsender.ts

@@ -94,6 +94,7 @@ export class WebSocketSender extends OpenConnectionSender {
     public async close() {
         this.sessionNegotiator?.finish()
         await this.connectionHandle.close()
+        await super.close()
     }
 
     public static login = ConnectionSender.login<WebSocketSender>