@nxtedition/deepstream.io-client-js 24.3.2 → 24.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.3.2",
+  "version": "24.3.4",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",
@@ -65,6 +65,7 @@
     "invariant": "^2.2.4",
     "lodash.clonedeep": "^4.5.0",
     "utf-8-validate": "^6.0.3",
+    "varint": "^6.0.0",
     "ws": "^8.13.0",
     "xuid": "^4.1.2",
     "xxhash-wasm": "^1.0.2"

package/src/message/connection.js

@@ -151,8 +151,8 @@ Connection.prototype.send = function (message) {
 Connection.prototype._submit = function (message) {
   const { maxPacketSize } = this._options
 
-  if (message.length > maxPacketSize) {
-    const err = new Error(`Packet to big: ${message.length} > ${maxPacketSize}`)
+  if (message.byteLength > maxPacketSize) {
+    const err = new Error(`Packet to big: ${message.byteLength} > ${maxPacketSize}`)
     this._client._$onError(C.TOPIC.CONNECTION, C.EVENT.CONNECTION_ERROR, err)
     return false
   } else if (this._endpoint.readyState === this._endpoint.OPEN) {

package/src/message/message-builder.js

@@ -1,4 +1,5 @@
 import * as C from '../constants/constants.js'
+import varint from 'varint'
 
 const poolEncoder = new TextEncoder()
 
@@ -8,7 +9,7 @@ let poolView
 let poolOffset
 
 function reallocPool(size) {
-  poolSize = size ?? poolSize ?? 1024 * 1024
+  poolSize = size || poolSize || 1024 * 1024
   poolBuffer = new Uint8Array(new ArrayBuffer(poolSize))
   poolView = new DataView(poolBuffer.buffer)
   poolOffset = 0
@@ -22,14 +23,12 @@ function alignPool() {
   }
 }
 
-reallocPool()
-
 export function getMsg(topic, action, data) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
 
-  if (poolOffset + poolSize / 16 >= poolSize) {
+  if (!poolSize || poolOffset + poolSize / 16 >= poolSize) {
     reallocPool()
   } else {
     alignPool()
@@ -37,6 +36,11 @@ export function getMsg(topic, action, data) {
 
   const start = poolOffset
 
+  const headerSize = 8
+  poolBuffer[poolOffset++] = 128 + headerSize
+  let headerPos = poolOffset
+  poolOffset += headerSize - 1
+
   poolBuffer[poolOffset++] = topic.charCodeAt(0)
   poolBuffer[poolOffset++] = 31
   for (let n = 0; n < action.length; n++) {
@@ -46,33 +50,44 @@ export function getMsg(topic, action, data) {
   if (data) {
     for (let i = 0; i < data.length; i++) {
       const type = typeof data[i]
+      let len
       if (data[i] == null) {
         poolBuffer[poolOffset++] = 31
+        len = 0
       } else if (type === 'object') {
         poolBuffer[poolOffset++] = 31
         const res = poolEncoder.encodeInto(
           JSON.stringify(data[i]),
           new Uint8Array(poolBuffer.buffer, poolOffset)
         )
-        poolOffset += res.written
+        len = res.written
       } else if (type === 'bigint') {
         poolBuffer[poolOffset++] = 31
         poolView.setBigUint64(poolOffset, data[i], false)
-        poolOffset += 8
+        len = 8
       } else if (type === 'string') {
         poolBuffer[poolOffset++] = 31
         const res = poolEncoder.encodeInto(data[i], new Uint8Array(poolBuffer.buffer, poolOffset))
-        poolOffset += res.written
+        len = res.written
       } else {
         throw new Error('invalid data')
       }
 
+      poolOffset += len
+
+      varint.encode(len + 1, poolBuffer, headerPos)
+      headerPos += varint.encode.bytes
+      if (headerPos - start >= headerSize) {
+        throw new Error(`header too large: ${headerPos - start} ${headerSize}`)
+      }
+
       if (poolOffset >= poolBuffer.length) {
         reallocPool(start === 0 ? poolSize * 2 : poolSize)
         return getMsg(topic, action, data)
       }
     }
   }
+
   return new Uint8Array(poolBuffer.buffer, start, poolOffset - start)
 }
 

package/src/record/record-handler.js

@@ -101,6 +101,7 @@ class RecordHandler {
     this._pruning = new Set()
     this._patching = new Map()
     this._updating = new Map()
+    this._encoder = new TextEncoder()
 
     this._connected = 0
     this._stats = {
@@ -206,6 +207,12 @@ class RecordHandler {
     }
   }
 
+  getKey(name) {
+    return name.length <= 8 && this._encoder.encode(name).byteLength === 8
+      ? name
+      : this._connection.hasher.h64(name)
+  }
+
   /**
    * @param {string} name
    * @returns {Record}
@@ -219,7 +226,7 @@ class RecordHandler {
     let record = this._records.get(name)
 
     if (!record) {
-      record = new Record(name, this)
+      record = new Record(this.getKey(name), name, this)
       this._stats.records += 1
       this._stats.created += 1
       this._records.set(name, record)

package/src/record/record.js

@@ -12,18 +12,10 @@ import * as timers from '../utils/timers.js'
 class Record {
   static STATE = C.RECORD_STATE
 
-  constructor(name, handler) {
-    const connection = handler._connection
-
+  constructor(key, name, handler) {
     this._handler = handler
-
-    // TODO (fix): Implement this once we have binary header.
-    // this._key = name.length <= 8 && encoder.encode(name).byteLength === 8
-    //   ? name
-    //   : connection.hasher?.h64(name)
-
     this._name = name
-    this._key = name
+    this._key = key
     this._version = ''
     this._data = jsonPath.EMPTY
     this._state = C.RECORD_STATE.VOID
@@ -33,10 +25,7 @@ class Record {
 
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
-    this._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [
-      this._name,
-      this._key,
-    ])
+    this._subscribed = false
   }
 
   /** @type {string} */

package/src/utils/multicast-listener.js

@@ -56,6 +56,7 @@ class Listener {
       // TODO (refactor): Move to class
       const provider = {
         name,
+        key: this._handler.getKey(name),
         value$: null,
         sending: false,
         accepted: false,
@@ -68,7 +69,7 @@ class Listener {
         if (this.connected && provider.accepted) {
           this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [
             this._pattern,
-            provider.name,
+            provider.key,
           ])
         }
 
@@ -101,7 +102,7 @@ class Listener {
         this._connection.sendMsg(
           this._topic,
           accepted ? C.ACTIONS.LISTEN_ACCEPT : C.ACTIONS.LISTEN_REJECT,
-          [this._pattern, provider.name]
+          [this._pattern, provider.key]
         )
 
         provider.version = null
@@ -157,7 +158,7 @@ class Listener {
             if (provider.version !== version) {
               provider.version = version
               this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, [
-                provider.name,
+                provider.key,
                 version,
                 body,
               ])
@@ -218,7 +219,11 @@ class Listener {
   }
 
   _error(name, err) {
-    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [this._pattern, name])
+    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [
+      this._pattern,
+      name,
+      this._handler.getKey(name),
+    ])
   }
 
   _reset() {

package/src/utils/unicast-listener.js

@@ -68,27 +68,29 @@ class Listener {
         value$ = rxjs.throwError(() => err)
       }
 
+      const key = this._handler.getKey(name)
+
       if (value$) {
         const subscription = value$.pipe(PIPE).subscribe({
           next: (data) => {
             if (data == null) {
-              this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
+              this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
               this._subscriptions.delete(name)
               subscription.unsubscribe()
             } else {
               const version = `INF-${this._connection.hasher.h64ToString(data)}`
-              this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [name, version, data])
+              this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [key, version, data])
             }
           },
           error: (err) => {
             this._error(name, err)
-            this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
+            this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
             this._subscriptions.delete(name)
           },
         })
         this._subscriptions.set(name, subscription)
       } else {
-        this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
+        this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
       }
     } else if (message.action === C.ACTIONS.LISTEN_REJECT) {
       const subscription = this._subscriptions.get(name)