@nxtedition/deepstream.io-client-js 31.0.3 → 31.0.5

package/package.json

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

package/src/message/message-builder.js

@@ -2,10 +2,10 @@ import * as C from '../constants/constants.js'
 import varint from 'varint'
 
 const SEP = C.MESSAGE_PART_SEPERATOR
-const MAX_MESSAGE_SIZE = 1024 * 1024
 
 let poolBuf
 let poolPos = 0
+let poolSize = 1024 * 1024
 
 export function getMsg(topic, action, data, binary) {
   if (data && !(data instanceof Array)) {
@@ -14,6 +14,7 @@ export function getMsg(topic, action, data, binary) {
 
   if (binary) {
     let headerSize = 0
+    let estimatedSize = 0
 
     // Estimate headerSize
     if (data) {
@@ -22,14 +23,18 @@ export function getMsg(topic, action, data, binary) {
         if (typeof data[n] !== 'string') {
           throw new Error(`invalid data[${n}]`)
         }
+        estimatedSize += data[n].length + 1 // +1 for the separator
         headerSize += varint.encodingLength(data[n].length)
       }
-      // Allow for some multi chars here and there...
+      // Allow extra space for some multi chars here and there...
       headerSize += 2
+
+      estimatedSize += headerSize + topic.length + action.length + 2 // +2 for the topic and action separators
+      estimatedSize += 32 // Allow for some extra space
     }
 
-    if (!poolBuf || poolBuf.byteLength - poolPos < MAX_MESSAGE_SIZE) {
-      poolBuf = Buffer.allocUnsafeSlow(8 * MAX_MESSAGE_SIZE)
+    if (!poolBuf || poolBuf.byteLength - poolPos < estimatedSize) {
+      poolBuf = Buffer.allocUnsafeSlow(poolSize)
       poolPos = 0
     }
 
@@ -73,6 +78,13 @@ export function getMsg(topic, action, data, binary) {
         const len = poolBuf.write(data[i], dataPos)
         dataPos += len
 
+        if (dataPos >= poolPos + poolBuf.byteLength) {
+          poolSize *= poolPos === 0 ? 2 : 1
+          poolBuf = null
+          poolPos = 0
+          return getMsg(topic, action, data, binary)
+        }
+
         if (headerSize > 0) {
           const encodingLength = varint.encodingLength(len + 1)
           if (headerPos + encodingLength > dataStart) {

package/src/record/record-handler.js

@@ -4,7 +4,6 @@ import UnicastListener from '../utils/unicast-listener.js'
 import * as C from '../constants/constants.js'
 import * as rxjs from 'rxjs'
 import invariant from 'invariant'
-import EventEmitter from 'component-emitter2'
 import jsonPath from '@nxtedition/json-path'
 import * as utils from '../utils/utils.js'
 import xuid from 'xuid'
@@ -121,8 +120,7 @@ class RecordHandler {
     }
 
     this._syncQueue = []
-    this._syncEmitter = new EventEmitter()
-    this._readyEmitter = new EventEmitter()
+    this._syncMap = {}
 
     this.set = this.set.bind(this)
     this.get = this.get.bind(this)
@@ -649,7 +647,23 @@ class RecordHandler {
     }
 
     if (message.action === C.ACTIONS.SYNC) {
-      this._syncEmitter.emit(message.data[0], message.data[1]?.toString())
+      const [token] = message.data
+      if (!token) {
+        return true
+      }
+
+      const sync = this._syncMap[token]
+      delete this._syncMap[token]
+
+      if (!sync) {
+        return true
+      }
+
+      const { queue } = sync
+      for (let n = 0; n < queue.length; n += 2) {
+        queue[n](queue[n + 1])
+      }
+
       return true
     }
 
@@ -682,9 +696,17 @@ class RecordHandler {
         this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.PUT, update)
       }
 
-      for (const token of this._syncEmitter.eventNames()) {
-        this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
+      const syncMap = {}
+      for (const sync of Object.values(this._syncMap)) {
+        const token = xuid()
+        syncMap[token] = sync
+        this._connection.sendMsg(
+          C.TOPIC.RECORD,
+          C.ACTIONS.SYNC,
+          sync.type ? [token, sync.type] : [token],
+        )
       }
+      this._syncMap = syncMap
     } else {
       this._connected = 0
     }
@@ -710,11 +732,8 @@ class RecordHandler {
       // sync requests from different sockets.
       const token = xuid()
       const queue = this._syncQueue.splice(0)
-      this._syncEmitter.once(token, () => {
-        for (let n = 0; n < queue.length; n += 2) {
-          queue[n](queue[n + 1])
-        }
-      })
+
+      this._syncMap[token] = { queue, type }
       this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, type ? [token, type] : [token])
     }, 1)
   }