@nxtedition/deepstream.io-client-js 24.2.9 → 24.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.2.9",
+  "version": "24.3.0",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "bugs": {

package/src/message/connection.js

@@ -82,14 +82,6 @@ Connection.prototype.sendMsg = function (topic, action, data) {
   return this.send(messageBuilder.getMsg(topic, action, data))
 }
 
-Connection.prototype.sendMsg1 = function (topic, action, p0) {
-  return this.send(messageBuilder.getMsg1(topic, action, p0))
-}
-
-Connection.prototype.sendMsg2 = function (topic, action, p0, p1) {
-  return this.send(messageBuilder.getMsg2(topic, action, p0, p1))
-}
-
 Connection.prototype.close = function () {
   this._deliberateClose = true
   this._endpoint?.close()
@@ -101,8 +93,7 @@ Connection.prototype.close = function () {
 }
 
 Connection.prototype._createEndpoint = function () {
-  const decoder = new TextDecoder()
-  if (NodeWebSocket) {
+  if (utils.isNode) {
     this._endpoint = new NodeWebSocket(this._url, {
       generateMask() {},
     })
@@ -110,16 +101,16 @@ Connection.prototype._createEndpoint = function () {
     this._endpoint = new BrowserWebSocket(this._url)
     this._endpoint.binaryType = 'arraybuffer'
   }
-
-  this._endpoint.onmessage = ({ data }) => {
-    this._onMessage(typeof data === 'string' ? data : decoder.decode(data))
-  }
-
   this._corked = false
 
   this._endpoint.onopen = this._onOpen.bind(this)
   this._endpoint.onerror = this._onError.bind(this)
   this._endpoint.onclose = this._onClose.bind(this)
+
+  const decoder = new TextDecoder()
+  this._endpoint.onmessage = ({ data }) => {
+    this._onMessage(typeof data === 'string' ? data : decoder.decode(data))
+  }
 }
 
 Connection.prototype.send = function (message) {
@@ -255,20 +246,20 @@ Connection.prototype._recvMessages = function (deadline) {
       continue
     }
 
-    try {
-      messageParser.parseMessage(message, this._client, this._message)
+    if (this._logger) {
+      this._logger.trace(message, 'receive')
+    }
+
+    messageParser.parseMessage(message, this._client, this._message)
 
-      this.emit('recv', this._message)
+    this.emit('recv', this._message)
 
-      if (this._message.topic === C.TOPIC.CONNECTION) {
-        this._handleConnectionResponse(this._message)
-      } else if (this._message.topic === C.TOPIC.AUTH) {
-        this._handleAuthResponse(this._message)
-      } else {
-        this._client._$onMessage(this._message)
-      }
-    } catch (err) {
-      this._onError(err)
+    if (this._message.topic === C.TOPIC.CONNECTION) {
+      this._handleConnectionResponse(this._message)
+    } else if (this._message.topic === C.TOPIC.AUTH) {
+      this._handleAuthResponse(this._message)
+    } else {
+      this._client._$onMessage(this._message)
     }
   }
 

package/src/message/message-builder.js

@@ -1,33 +1,79 @@
 const C = require('../constants/constants')
 
-const SEP = C.MESSAGE_PART_SEPERATOR
+const poolEncoder = new TextEncoder()
+
+let poolSize
+let poolBuffer
+let poolView
+let poolOffset
+
+function reallocPool(size) {
+  poolSize = size ?? poolSize ?? 1024 * 1024
+  poolBuffer = new Uint8Array(new ArrayBuffer(poolSize))
+  poolView = new DataView(poolBuffer.buffer)
+  poolOffset = 0
+}
+
+function alignPool() {
+  // Ensure aligned slices
+  if (poolOffset & 0x7) {
+    poolOffset |= 0x7
+    poolOffset++
+  }
+}
+
+reallocPool()
 
 module.exports.getMsg = function (topic, action, data) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
 
-  const sendData = [topic, action]
+  if (poolOffset + poolSize / 16 >= poolSize) {
+    reallocPool()
+  } else {
+    alignPool()
+  }
+
+  const start = poolOffset
+
+  poolBuffer[poolOffset++] = topic.charCodeAt(0)
+  poolBuffer[poolOffset++] = 31
+  for (let n = 0; n < action.length; n++) {
+    poolBuffer[poolOffset++] = action.charCodeAt(n)
+  }
 
   if (data) {
     for (let i = 0; i < data.length; i++) {
-      if (typeof data[i] === 'object') {
-        sendData.push(JSON.stringify(data[i]))
+      const type = typeof data[i]
+      if (data[i] == null) {
+        poolBuffer[poolOffset++] = 31
+      } else if (type === 'object') {
+        poolBuffer[poolOffset++] = 31
+        const res = poolEncoder.encodeInto(
+          JSON.stringify(data[i]),
+          new Uint8Array(poolBuffer.buffer, poolOffset)
+        )
+        poolOffset += res.written
+      } else if (type === 'bigint') {
+        poolBuffer[poolOffset++] = 31
+        poolView.setBigUint64(poolOffset, data[i], false)
+        poolOffset += 8
+      } else if (type === 'string') {
+        poolBuffer[poolOffset++] = 31
+        const res = poolEncoder.encodeInto(data[i], new Uint8Array(poolBuffer.buffer, poolOffset))
+        poolOffset += res.written
       } else {
-        sendData.push(data[i])
+        throw new Error('invalid data')
+      }
+
+      if (poolOffset >= poolBuffer.length) {
+        reallocPool(start === 0 ? poolSize * 2 : poolSize)
+        return this.getMsg(topic, action, data)
       }
     }
   }
-
-  return sendData.join(SEP)
-}
-
-module.exports.getMsg1 = function (topic, action, p0) {
-  return `${topic}${SEP}${action}${SEP}${p0}`
-}
-
-module.exports.getMsg2 = function (topic, action, p0, p1) {
-  return `${topic}${SEP}${action}${SEP}${p0}${SEP}${p1}`
+  return new Uint8Array(poolBuffer.buffer, start, poolOffset - start)
 }
 
 module.exports.typed = function (value) {

package/src/record/record-handler.js

@@ -97,19 +97,11 @@ class RecordHandler {
     this._connection = connection
     this._client = client
     this._records = new Map()
-    this._cache = new Map()
     this._listeners = new Map()
     this._pruning = new Set()
     this._patching = new Map()
     this._updating = new Map()
 
-    this._registry = new FinalizationRegistry((name) => {
-      const entry = this._cache.get(name)
-      if (entry && entry.deref && entry.deref() === undefined) {
-        this._cache.delete(name)
-      }
-    })
-
     this._connected = 0
     this._stats = {
       updating: 0,
@@ -142,11 +134,6 @@ class RecordHandler {
       for (const rec of pruning) {
         rec._$dispose()
         this._records.delete(rec.name)
-
-        if (!this._cache.has(rec.name)) {
-          this._cache.set(rec.name, new WeakRef(rec))
-          this._registry.register(rec, rec.name)
-        }
       }
 
       this._stats.pruning -= pruning.size
@@ -232,7 +219,7 @@ class RecordHandler {
     let record = this._records.get(name)
 
     if (!record) {
-      record = this._cache.get(name)?.deref() ?? new Record(name, this)
+      record = new Record(name, this)
       this._stats.records += 1
       this._stats.created += 1
       this._records.set(name, record)
@@ -386,7 +373,7 @@ class RecordHandler {
           queue[n](queue[n + 1])
         }
       })
-      this._connection.sendMsg2(C.TOPIC.RECORD, C.ACTIONS.SYNC, token, 'WEAK')
+      this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token, 'WEAK'])
     }, 1)
   }
 

package/src/record/record.js

@@ -11,8 +11,12 @@ class Record {
   static STATE = C.RECORD_STATE
 
   constructor(name, handler) {
+    const connection = handler._connection
+
     this._handler = handler
+
     this._name = name
+    this._key = connection.hasher?.h64(name) ?? name
     this._version = ''
     this._data = jsonPath.EMPTY
     this._state = C.RECORD_STATE.VOID
@@ -21,7 +25,10 @@ class Record {
     this._emitting = false
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
-    this._subscribed = false
+    this._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [
+      this._name,
+      this._key,
+    ])
   }
 
   /** @type {string} */
@@ -59,7 +66,8 @@ class Record {
     if (this._refs === 1) {
       this._handler._onPruning(this, false)
       this._subscribed =
-        this._subscribed || connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
+        this._subscribed ||
+        connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name, this._key])
     }
     return this
   }
@@ -320,8 +328,10 @@ class Record {
     const connection = this._handler._connection
 
     if (connected) {
+      this._key = typeof this._key === 'bigint' ? this._key : connection.hasher?.h64(this._name)
       this._subscribed =
-        this._refs > 0 && connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
+        this._refs > 0 &&
+        connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name, this._key])
 
       if (this._updating) {
         for (const update of this._updating.values()) {
@@ -346,7 +356,7 @@ class Record {
     invariant(!this._updating, 'must not have updates')
 
     if (this._subscribed) {
-      connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, this._name)
+      connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, [this._key])
       this._subscribed = false
     }
 
@@ -368,7 +378,7 @@ class Record {
     const prevVersion = this._version
     const nextVersion = this._makeVersion(parseInt(prevVersion) + 1)
 
-    const update = [this._name, nextVersion, jsonPath.stringify(nextData), prevVersion]
+    const update = [this._key, nextVersion, jsonPath.stringify(nextData), prevVersion]
 
     if (!this._updating) {
       this._onUpdating(true)