@nxtedition/deepstream.io-client-js 26.0.24 → 27.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "26.0.24",
+  "version": "27.0.0-beta.3",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",
@@ -71,6 +71,7 @@
     "xxhash-wasm": "^1.0.2"
   },
   "devDependencies": {
+    "@types/node": "^22.0.0",
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",

package/src/message/connection.js

@@ -37,6 +37,8 @@ export default function Connection(client, url, options) {
   this._url = new URL(url)
 
   this._state = C.CONNECTION_STATE.CLOSED
+
+  this._createEndpoint()
 }
 
 Emitter(Connection.prototype)
@@ -159,7 +161,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.22',
+    '27.0.0',
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,

package/src/message/message-builder.js

@@ -1,25 +1,101 @@
 import * as C from '../constants/constants.js'
+import * as utils from '../utils/utils.js'
+import varint from 'varint'
 
-const SEP = C.MESSAGE_PART_SEPERATOR
+const poolEncoder = new globalThis.TextEncoder()
+
+// TODO (fix): Don't assume maxMesageSize is 1MB
+const maxMessageSize = 1024 * 1024
+const poolSize = maxMessageSize * 4
+
+let poolBuffer
+let poolView
+let poolOffset
+
+function reallocPool() {
+  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 (!poolBuffer || poolOffset + maxMessageSize > poolSize) {
+    reallocPool()
+  } 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')
+      }
+
+      if (poolOffset >= poolSize) {
+        throw new Error('message too large')
       }
     }
   }
 
-  return sendData.join(SEP)
+  return new Uint8Array(poolBuffer.buffer, start, poolOffset - start)
 }
 
 export function typed(value) {

package/src/record/record.js

@@ -7,7 +7,7 @@ import invariant from 'invariant'
 import cloneDeep from 'lodash.clonedeep'
 import * as timers from '../utils/timers.js'
 
-class Record {
+export default class Record {
   static STATE = C.RECORD_STATE
 
   constructor(name, handler) {
@@ -15,6 +15,7 @@ class Record {
 
     this._handler = handler
     this._name = name
+    this._key = utils.h64(name)
     this._version = ''
     this._data = jsonPath.EMPTY
     this._state = C.RECORD_STATE.VOID
@@ -24,7 +25,15 @@ 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._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [
+      this._key,
+      this._name,
+    ])
+  }
+
+  /** @type {bigint} */
+  get key() {
+    return this._key
   }
 
   /** @type {string} */
@@ -62,7 +71,8 @@ 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._key, this._name])
     }
     return this
   }
@@ -324,7 +334,8 @@ 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 +360,7 @@ 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 +382,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)
@@ -389,7 +400,7 @@ class Record {
     this._version = nextVersion
   }
 
-  _onUpdate([, version, data]) {
+  _onUpdate([, version, data, hasProvider]) {
     const prevData = this._data
     const prevVersion = this._version
     const prevState = this._state
@@ -422,7 +433,9 @@ class Record {
       this._onPatching(false)
     }
 
-    if (this._state < C.RECORD_STATE.SERVER) {
+    if (hasProvider === 'T') {
+      this._state = C.RECORD_STATE.PROVIDER
+    } else if (this._state < C.RECORD_STATE.SERVER) {
       this._state = this._version.charAt(0) === 'I' ? C.RECORD_STATE.STALE : C.RECORD_STATE.SERVER
     }
 
@@ -571,5 +584,3 @@ Object.defineProperty(Record.prototype, 'hasProvider', {
     return this.state >= C.RECORD_STATE.PROVIDER
   },
 })
-
-export default Record

package/src/utils/multicast-listener.js

@@ -1,6 +1,6 @@
 import * as rxjs from 'rxjs'
 import * as C from '../constants/constants.js'
-import { h64ToString } from '../utils/utils.js'
+import { h64, h64ToString } from '../utils/utils.js'
 
 export default class Listener {
   constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
@@ -48,8 +48,12 @@ export default class Listener {
 
     const name = message.data[1]
 
+    // TOOD (fix): Validate name
+
+    const key = h64(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
       }
@@ -57,6 +61,7 @@ export default class Listener {
       // TODO (refactor): Move to class
       const provider = {
         name,
+        key,
         value$: null,
         sending: false,
         accepted: false,
@@ -69,7 +74,7 @@ export default class Listener {
         if (this.connected && provider.accepted) {
           this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [
             this._pattern,
-            provider.name,
+            provider.key,
           ])
         }
 
@@ -102,7 +107,7 @@ export default 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
@@ -158,7 +163,7 @@ export default class Listener {
             if (provider.version !== version) {
               provider.version = version
               this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, [
-                provider.name,
+                provider.key,
                 version,
                 body,
               ])
@@ -182,9 +187,9 @@ export default 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
       }
@@ -196,13 +201,13 @@ export default 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,6 +1,6 @@
 import * as rxjs from 'rxjs'
 import * as C from '../constants/constants.js'
-import { h64ToString } from '../utils/utils.js'
+import { h64, h64ToString } from '../utils/utils.js'
 
 const valuePipe = rxjs.pipe(
   rxjs.map((value) => {
@@ -55,8 +55,12 @@ export default class Listener {
   _$onMessage(message) {
     const name = message.data[1]
 
+    // TODO (fix): Validate name
+
+    const key = h64(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
       }
@@ -72,29 +76,29 @@ export default class Listener {
         const subscription = value$.pipe(valuePipe).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-${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._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')