@nxtedition/deepstream.io-client-js 26.0.12 → 27.0.0-beta.1

package/package.json

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

package/src/message/connection.js

@@ -170,7 +170,7 @@ Connection.prototype._sendAuthParams = function () {
   this._setState(C.CONNECTION_STATE.AUTHENTICATING)
   const authMessage = messageBuilder.getMsg(C.TOPIC.AUTH, C.ACTIONS.REQUEST, [
     this._authParams,
-    '26.0.0',
+    '27.0.0',
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,

package/src/message/message-builder.js

@@ -1,25 +1,100 @@
 import * as C from '../constants/constants.js'
+import varint from 'varint'
+import * as utils from '../utils/utils.js'
 
-const SEP = C.MESSAGE_PART_SEPERATOR
+const poolEncoder = new globalThis.TextEncoder()
+
+let poolSize
+let poolBuffer
+let poolView
+let poolOffset
+
+function allocPool(size) {
+  poolSize = size || poolSize || 1024 * 1024
+  poolBuffer = utils.isNode
+    ? globalThis.Buffer.allocUnsafe(poolSize)
+    : new Uint8Array(new ArrayBuffer(poolSize))
+  poolView = new DataView(poolBuffer.buffer)
+  poolOffset = 0
+}
+
+function alignPool() {
+  // Ensure aligned slices
+  if (poolOffset & 0x7) {
+    poolOffset |= 0x7
+    poolOffset++
+  }
+}
+
+function writeString(dst, str, offset) {
+  if (utils.isNode) {
+    return dst.write(str, offset)
+  } else {
+    const res = poolEncoder.encodeInto(str, new Uint8Array(dst.buffer, offset))
+    return res.written
+  }
+}
 
 export function getMsg(topic, action, data) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
 
-  const sendData = [topic, action]
+  if (!poolSize || poolOffset + poolSize / 16 >= poolSize) {
+    allocPool()
+  } else {
+    alignPool()
+  }
+
+  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++) {
+    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]
+      let len
+      if (data[i] == null) {
+        poolBuffer[poolOffset++] = 31
+        len = 0
+      } else if (type === 'object') {
+        poolBuffer[poolOffset++] = 31
+        len = writeString(poolBuffer, JSON.stringify(data[i]), poolOffset)
+      } else if (type === 'bigint') {
+        poolBuffer[poolOffset++] = 31
+        poolView.setBigUint64(poolOffset, data[i], false)
+        len = 8
+      } else if (type === 'string') {
+        poolBuffer[poolOffset++] = 31
+        len = writeString(poolBuffer, data[i], poolOffset)
       } else {
-        sendData.push(data[i])
+        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) {
+        allocPool(start === 0 ? poolSize * 2 : poolSize)
+        return getMsg(topic, action, data)
       }
     }
   }
 
-  return sendData.join(SEP)
+  return new Uint8Array(poolBuffer.buffer, start, poolOffset - start)
 }
 
 export function typed(value) {

package/src/record/record.js

@@ -11,11 +11,16 @@ export default class Record {
   static STATE = C.RECORD_STATE
 
   constructor(name, handler) {
+    if (!name?.length || typeof name !== 'string') {
+      throw new Error('invalid argument: name')
+    }
+
     const connection = handler._connection
 
     this._handler = handler
 
     this._name = name
+    this._key = utils.hashNameBigInt(name)
     this._version = ''
     this._data = jsonPath.EMPTY
     this._state = C.RECORD_STATE.VOID
@@ -24,7 +29,10 @@ export default class Record {
     this._emitting = false
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
-    this._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
+    this._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [
+      this._name,
+      this._key,
+    ])
   }
 
   /** @type {string} */
@@ -32,6 +40,11 @@ export default class Record {
     return this._name
   }
 
+  /** @type {bigint} */
+  get key() {
+    return this._key
+  }
+
   /** @type {string} */
   get version() {
     return this._version
@@ -62,7 +75,8 @@ export default class Record {
     if (this._refs === 1) {
       this._handler._onPruning(this, false)
       this._subscribed =
-        this._subscribed || connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
+        this._subscribed ||
+        connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name, this._key])
     }
     return this
   }
@@ -324,7 +338,8 @@ export default class Record {
 
     if (connected) {
       this._subscribed =
-        this._refs > 0 && connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
+        this._refs > 0 &&
+        connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._key, this._name])
 
       if (this._updating) {
         for (const update of this._updating.values()) {
@@ -349,7 +364,7 @@ export default class Record {
     invariant(!this._updating, 'must not have updates')
 
     if (this._subscribed) {
-      connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, [this._name])
+      connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, [this._key])
       this._subscribed = false
     }
 
@@ -371,7 +386,7 @@ export default 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)

package/src/utils/multicast-listener.js

@@ -1,5 +1,6 @@
 import * as C from '../constants/constants.js'
 import * as rxjs from 'rxjs'
+import * as utils from '../utils/utils.js'
 
 class Listener {
   constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
@@ -47,8 +48,15 @@ class Listener {
 
     const name = message.data[1]
 
+    if (!name?.length) {
+      this._error(name, 'invalid message')
+      return
+    }
+
+    const key = utils.hashNameBigInt(name)
+
     if (message.action === C.ACTIONS.SUBSCRIPTION_FOR_PATTERN_FOUND) {
-      if (this._subscriptions.has(name)) {
+      if (this._subscriptions.has(key)) {
         this._error(name, 'invalid add: listener exists')
         return
       }
@@ -56,6 +64,7 @@ class Listener {
       // TODO (refactor): Move to class
       const provider = {
         name,
+        key,
         value$: null,
         sending: false,
         accepted: false,
@@ -68,7 +77,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 +110,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
@@ -151,13 +160,13 @@ class Listener {
             }
 
             const body = typeof value !== 'string' ? this._stringify(value) : value
-            const hash = this._connection.hasher.h64ToString(body)
+            const hash = utils.h64ToString(body)
             const version = `INF-${hash}`
 
             if (provider.version !== version) {
               provider.version = version
               this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, [
-                provider.name,
+                provider.key,
                 version,
                 body,
               ])
@@ -181,9 +190,9 @@ class Listener {
 
       provider.start()
 
-      this._subscriptions.set(provider.name, provider)
+      this._subscriptions.set(provider.key, provider)
     } else if (message.action === C.ACTIONS.LISTEN_ACCEPT) {
-      const provider = this._subscriptions.get(name)
+      const provider = this._subscriptions.get(key)
       if (!provider?.value$) {
         return
       }
@@ -195,13 +204,13 @@ class Listener {
         provider.valueSubscription = provider.value$.subscribe(provider.observer)
       }
     } else if (message.action === C.ACTIONS.SUBSCRIPTION_FOR_PATTERN_REMOVED) {
-      const provider = this._subscriptions.get(name)
+      const provider = this._subscriptions.get(key)
 
       if (!provider) {
         this._error(name, 'invalid remove: listener missing')
       } else {
         provider.stop()
-        this._subscriptions.delete(provider.name)
+        this._subscriptions.delete(provider.key)
       }
     } else {
       return false

package/src/utils/unicast-listener.js

@@ -1,5 +1,6 @@
 import * as C from '../constants/constants.js'
 import * as rxjs from 'rxjs'
+import * as utils from '../utils/utils.js'
 
 const PIPE = rxjs.pipe(
   rxjs.map((value) => {
@@ -54,8 +55,15 @@ class Listener {
   _$onMessage(message) {
     const name = message.data[1]
 
+    if (!name?.length) {
+      this._error(name, 'invalid message')
+      return
+    }
+
+    const key = utils.hashNameBigInt(name)
+
     if (message.action === C.ACTIONS.LISTEN_ACCEPT) {
-      if (this._subscriptions.has(name)) {
+      if (this._subscriptions.has(key)) {
         this._error(name, 'invalid accept: listener exists')
         return
       }
@@ -71,29 +79,29 @@ class Listener {
         const subscription = value$.pipe(PIPE).subscribe({
           next: (data) => {
             if (data == null) {
-              this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
-              this._subscriptions.delete(name)
+              this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
+              this._subscriptions.delete(key)
               subscription.unsubscribe()
             } else {
-              const version = `INF-${this._connection.hasher.h64ToString(data)}`
-              this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [name, version, data])
+              const version = `INF-${utils.h64ToString(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._subscriptions.delete(name)
+            this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
+            this._subscriptions.delete(key)
           },
         })
-        this._subscriptions.set(name, subscription)
+        this._subscriptions.set(key, 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)
+      const subscription = this._subscriptions.get(key)
 
       if (subscription) {
-        this._subscriptions.delete(name)
+        this._subscriptions.delete(key)
         subscription.unsubscribe()
       } else {
         this._error(name, 'invalid remove: listener missing')

package/src/utils/utils.js

@@ -1,3 +1,7 @@
+import xxhash from 'xxhash-wasm'
+
+const HASHER = await xxhash()
+
 const NODE_ENV = typeof process !== 'undefined' && process.env && process.env.NODE_ENV
 export const isNode = typeof process !== 'undefined' && process.toString() === '[object process]'
 export const isProduction = NODE_ENV === 'production'
@@ -174,3 +178,24 @@ export function removeAbortListener(signal, handler) {
     }
   }
 }
+
+export function h64(name) {
+  return HASHER.h64(name)
+}
+
+export function h64ToString(name) {
+  return HASHER.h64ToString(name)
+}
+
+const encoder = new globalThis.TextEncoder()
+const buffer = new Uint8Array(8 * 3)
+const view = new DataView(buffer.buffer)
+
+export function hashNameBigInt(name) {
+  if (name.length >= 8) {
+    return HASHER.h64(name)
+  }
+
+  const { written } = encoder.encodeInto(name, buffer)
+  return written === 8 ? view.getBigUint64(0, false) : HASHER.h64Raw(buffer.subarray(0, written))
+}