@nxtedition/deepstream.io-client-js 31.0.0 → 31.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "31.0.0",
+  "version": "31.0.2",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",

package/src/message/connection.js

@@ -76,7 +76,7 @@ Connection.prototype.authenticate = function (authParams, callback) {
 }
 
 Connection.prototype.sendMsg = function (topic, action, data) {
-  return this.send(messageBuilder.getMsg(topic, action, data))
+  return this.send(messageBuilder.getMsg(topic, action, data, utils.isNode))
 }
 
 Connection.prototype.close = function () {
@@ -118,7 +118,10 @@ Connection.prototype.send = function (message) {
       C.TOPIC.CONNECTION,
       C.EVENT.CONNECTION_ERROR,
       err,
-      message.split(C.MESSAGE_PART_SEPERATOR).map((x) => x.slice(0, 256)),
+      message
+        .toString()
+        .split(C.MESSAGE_PART_SEPERATOR)
+        .map((x) => x.slice(0, 256)),
     )
     return false
   }

package/src/message/message-builder.js

@@ -1,25 +1,107 @@
 import * as C from '../constants/constants.js'
+import varint from 'varint'
 
 const SEP = C.MESSAGE_PART_SEPERATOR
+const MAX_MESSAGE_SIZE = 1024 * 1024
 
-export function getMsg(topic, action, data) {
+let poolBuf
+let poolPos = 0
+
+export function getMsg(topic, action, data, binary) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
 
-  const sendData = [topic, action]
+  if (binary) {
+    let headerSize = 0
 
-  if (data) {
-    for (let i = 0; i < data.length; i++) {
-      if (typeof data[i] === 'object') {
-        sendData.push(JSON.stringify(data[i]))
-      } else {
-        sendData.push(data[i])
+    // Estimate headerSize
+    if (data) {
+      headerSize = 1
+      for (let n = 0; n < data.length; n++) {
+        if (typeof data[n] !== 'string') {
+          throw new Error(`invalid data[${n}]`)
+        }
+        headerSize += varint.encodingLength(data[n].length)
+      }
+      // Allow for some multi chars here and there...
+      headerSize += 2
+    }
+
+    if (!poolBuf || poolBuf.byteLength - poolPos < MAX_MESSAGE_SIZE) {
+      poolBuf = Buffer.allocUnsafeSlow(8 * MAX_MESSAGE_SIZE)
+      poolPos = 0
+    }
+
+    let msgPos = poolPos
+
+    for (let i = 0; i < headerSize; i++) {
+      poolBuf[poolPos + i] = 0
+    }
+
+    let headerPos = poolPos
+    poolBuf[headerPos++] = 128 + headerSize
+
+    const dataStart = poolPos + headerSize
+
+    let dataPos = dataStart
+    if (topic.length === 1) {
+      poolBuf[dataPos++] = topic.charCodeAt(0)
+    } else {
+      throw new Error('invalid topic: ' + topic)
+    }
+
+    if (action.length === 1) {
+      poolBuf[dataPos++] = 31
+      poolBuf[dataPos++] = action.charCodeAt(0)
+    } else if (action.length === 2) {
+      poolBuf[dataPos++] = 31
+      poolBuf[dataPos++] = action.charCodeAt(0)
+      poolBuf[dataPos++] = action.charCodeAt(1)
+    } else if (action.length === 3) {
+      poolBuf[dataPos++] = 31
+      poolBuf[dataPos++] = action.charCodeAt(0)
+      poolBuf[dataPos++] = action.charCodeAt(1)
+      poolBuf[dataPos++] = action.charCodeAt(2)
+    } else {
+      throw new Error('invalid action: ' + action)
+    }
+
+    if (data) {
+      for (let i = 0; i < data.length; i++) {
+        poolBuf[dataPos++] = 31
+        const len = poolBuf.write(data[i], dataPos)
+        dataPos += len
+
+        if (headerSize > 0) {
+          const encodingLength = varint.encodingLength(len + 1)
+          if (headerPos + encodingLength > dataStart) {
+            // Overflow. Discard the header and fallback to only separators.
+            msgPos = dataStart
+            headerSize = 0
+          } else {
+            varint.encode(len + 1, poolBuf, headerPos)
+            headerPos += varint.encode.bytes
+          }
+        }
       }
     }
-  }
 
-  return sendData.join(SEP)
+    poolPos = dataPos
+    return poolBuf.subarray(msgPos, dataPos)
+  } else {
+    const sendData = [topic, action]
+    if (data) {
+      for (let i = 0; i < data.length; i++) {
+        if (typeof data[i] === 'object') {
+          sendData.push(JSON.stringify(data[i]))
+        } else {
+          sendData.push(data[i])
+        }
+      }
+    }
+    return sendData.join(SEP)
+  }
 }
 
 export function typed(value) {

package/src/record/record.js

@@ -377,6 +377,8 @@ class Record {
 
     const update = [this._name, nextVersion, jsonPath.stringify(nextData), prevVersion]
 
+    connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, update)
+
     if (!this._updating) {
       this._onUpdating(true)
     }
@@ -387,8 +389,6 @@ class Record {
       throw new Error('invalid state')
     }
 
-    connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, update)
-
     this._data = nextData
     this._version = nextVersion
   }