livedesk 0.1.123 → 0.1.125

package/hub/src/remote-hub.js

@@ -1024,6 +1024,59 @@ function startsWithTcpBinaryFrameMagic(buffer) {
         && buffer.subarray(0, TCP_BINARY_FRAME_MAGIC.length).equals(TCP_BINARY_FRAME_MAGIC);
 }
 
+function isJsonObjectStartByte(value) {
+    return value === 0x7b;
+}
+
+function isWhitespaceByte(value) {
+    return value === 0x20 || value === 0x09 || value === 0x0d || value === 0x0a;
+}
+
+function findFirstNonWhitespaceByte(buffer) {
+    if (!Buffer.isBuffer(buffer)) {
+        return -1;
+    }
+
+    for (let index = 0; index < buffer.length; index += 1) {
+        if (!isWhitespaceByte(buffer[index])) {
+            return index;
+        }
+    }
+    return -1;
+}
+
+function findTcpFrameOnlySyncIndex(buffer, startIndex = 0) {
+    if (!Buffer.isBuffer(buffer) || buffer.length <= 0) {
+        return -1;
+    }
+
+    const safeStart = Math.max(0, Math.min(buffer.length, Math.floor(Number(startIndex) || 0)));
+    const magicIndex = buffer.indexOf(TCP_BINARY_FRAME_MAGIC, safeStart);
+    const jsonIndex = buffer.indexOf(0x7b, safeStart);
+    if (magicIndex < 0) {
+        return jsonIndex;
+    }
+    if (jsonIndex < 0) {
+        return magicIndex;
+    }
+    return Math.min(magicIndex, jsonIndex);
+}
+
+function keepTcpFrameOnlySyncTail(buffer) {
+    if (!Buffer.isBuffer(buffer) || buffer.length <= 0) {
+        return Buffer.alloc(0);
+    }
+
+    const maxTailLength = Math.min(buffer.length, TCP_BINARY_FRAME_MAGIC.length - 1);
+    for (let tailLength = maxTailLength; tailLength > 0; tailLength -= 1) {
+        const tail = buffer.subarray(buffer.length - tailLength);
+        if (hasTcpBinaryFrameMagicPrefix(tail)) {
+            return tail;
+        }
+    }
+    return Buffer.alloc(0);
+}
+
 function parseTcpBinaryFramePacket(buffer) {
     if (!Buffer.isBuffer(buffer) || buffer.length < TCP_BINARY_FRAME_HEADER_BYTES) {
         return { incomplete: true };
@@ -3605,7 +3658,29 @@ export function createRemoteHub(options = {}) {
                 : incoming;
 
             while (!socket.destroyed) {
+                if (state.pendingBinaryFrame) {
+                    const { header, byteLength } = state.pendingBinaryFrame;
+                    if (state.buffer.length < byteLength) {
+                        return;
+                    }
+
+                    const framePayload = state.buffer.subarray(0, byteLength);
+                    state.buffer = state.buffer.subarray(byteLength);
+                    state.pendingBinaryFrame = null;
+                    enqueueAgentBinaryFrame(socket, state, header, framePayload);
+                    continue;
+                }
+
                 if (state.authenticated && state.frameOnly && state.buffer.length > 0) {
+                    const firstNonWhitespaceIndex = findFirstNonWhitespaceByte(state.buffer);
+                    if (firstNonWhitespaceIndex < 0) {
+                        state.buffer = Buffer.alloc(0);
+                        return;
+                    }
+                    if (firstNonWhitespaceIndex > 0) {
+                        state.buffer = state.buffer.subarray(firstNonWhitespaceIndex);
+                    }
+
                     if (state.buffer.length < TCP_BINARY_FRAME_MAGIC.length && hasTcpBinaryFrameMagicPrefix(state.buffer)) {
                         return;
                     }
@@ -3616,9 +3691,13 @@ export function createRemoteHub(options = {}) {
                             return;
                         }
                         if (!packet || packet.invalid) {
-                            writeJsonLine(socket, { type: 'error', error: 'invalid-tcp-binary-frame' });
-                            logWarn('remote', `invalid tcp binary frame from agent: ${packet?.reason || 'bad-magic'}`);
-                            socket.destroy();
+                            const syncIndex = findTcpFrameOnlySyncIndex(state.buffer, 1);
+                            if (syncIndex > 0) {
+                                state.buffer = state.buffer.subarray(syncIndex);
+                                continue;
+                            }
+
+                            state.buffer = keepTcpFrameOnlySyncTail(state.buffer);
                             return;
                         }
 
@@ -3626,19 +3705,17 @@ export function createRemoteHub(options = {}) {
                         enqueueAgentBinaryFrame(socket, state, packet.header, packet.payload);
                         continue;
                     }
-                }
 
-                if (state.pendingBinaryFrame) {
-                    const { header, byteLength } = state.pendingBinaryFrame;
-                    if (state.buffer.length < byteLength) {
+                    if (!isJsonObjectStartByte(state.buffer[0])) {
+                        const syncIndex = findTcpFrameOnlySyncIndex(state.buffer, 1);
+                        if (syncIndex > 0) {
+                            state.buffer = state.buffer.subarray(syncIndex);
+                            continue;
+                        }
+
+                        state.buffer = keepTcpFrameOnlySyncTail(state.buffer);
                         return;
                     }
-
-                    const framePayload = state.buffer.subarray(0, byteLength);
-                    state.buffer = state.buffer.subarray(byteLength);
-                    state.pendingBinaryFrame = null;
-                    enqueueAgentBinaryFrame(socket, state, header, framePayload);
-                    continue;
                 }
 
                 const newlineIndex = state.buffer.indexOf(0x0a);
@@ -3676,6 +3753,9 @@ export function createRemoteHub(options = {}) {
 
                     handleAgentMessage(socket, state, message);
                 } catch (err) {
+                    if (state.authenticated && state.frameOnly) {
+                        continue;
+                    }
                     writeJsonLine(socket, { type: 'error', error: 'invalid-json' });
                     logWarn('remote', `invalid agent message: ${err?.message || err}`);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.123",
+  "version": "0.1.125",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {