fix: support fragmented and multiple packets from remote scan process (…

…#824)
AlCalzone · Dec 11, 2023 · 0ccb454 · 0ccb454
1 parent 4a19320
commit 0ccb454
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 15 deletions.
diff --git a/admin/build/index.js.map b/admin/build/index.js.map
diff --git a/build/main.js b/build/main.js
diff --git a/build/main.js.map b/build/main.js.map
diff --git a/build/scanProcess.js.map b/build/scanProcess.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -269,6 +269,7 @@ function connectToBLEServer() {
 	socket = new Socket();
 
 	const reviver = getMessageReviver(handleMessage);
+	let receiveBuffer = "";
 
 	socket
 		.on("close", () => {
@@ -280,11 +281,20 @@ function connectToBLEServer() {
 			adapter.setState("info.connection", true, true);
 		})
 		.on("data", (data) => {
-			try {
-				const msg = JSON.parse(data.toString());
-				reviver(msg);
-			} catch (e) {
-				console.error(e);
+			// Each message ends with a newline. We might receive multiple messages at once,
+			// and we might also receive incomplete messages.
+			receiveBuffer += data.toString();
+			let newlineIndex: number;
+			while ((newlineIndex = receiveBuffer.indexOf("\n")) > -1) {
+				const line = receiveBuffer.slice(0, newlineIndex);
+				receiveBuffer = receiveBuffer.slice(newlineIndex + 1);
+				try {
+					const msg = JSON.parse(line);
+					reviver(msg);
+				} catch (e) {
+					console.error(e);
+					console.error("data was: " + line);
+				}
 			}
 		});