Merge pull request #222 from NarrativeScience/fix/incomplete-tcp-mess…

…ages2

Second attempt to address incomplete TCP messages

inputs/file/package.json

@@ -1,6 +1,6 @@
 {
   "name": "log.io-file-input",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Watches files on disk and sends new messages to the server",
   "homepage": "http://logio.org",
   "repository": {

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "log.io",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Listens for new messages over TCP and broadcasts to browsers via socket.io",
   "homepage": "http://logio.org",
   "repository": {

server/src/server.ts

@@ -77,11 +77,13 @@ async function broadcastMessage(
   data: Buffer,
 ): Promise<void> {
   // Parse raw message into parts
-  const msgs = data.toString().split('\0')
-  // Ignore messages that don't contain null termination character
-  if (msgs.length === 1) { return }
-  const validMsgs = msgs.filter(msg => !!msg.trim())
-  validMsgs.forEach(async (msg) => {
+  // NOTE: After split on null termination character, last item will always
+  // be either an empty string or a partial/incomplete message
+  const msgs = data.toString()
+    .split('\0')
+    .slice(0, -1)
+    .filter(msg => !!msg.trim())
+  msgs.forEach(async (msg) => {
     const msgParts = msg.split('|')
     const messageHandler = messageHandlers[msgParts[0]]
     if (messageHandler) {

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "log.io-ui",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "license": "Apache-2.0",
   "private": true,
   "dependencies": {