@nxtedition/deepstream.io-client-js 26.0.11 → 26.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "26.0.11",
+  "version": "26.0.12",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",
@@ -75,14 +75,15 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.9.0",
+    "eslint-plugin-n": "^17.10.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.0.0",
-    "husky": "^9.1.1",
+    "husky": "^9.1.3",
     "lint-staged": "^15.2.7",
     "mitata": "^0.1.11",
     "pinst": "^3.0.0",
-    "prettier": "^3.3.3"
+    "prettier": "^3.3.3",
+    "rxjs": "^7.8.1"
   },
   "peerDependencies": {
     "rxjs": ">=6.x"

package/src/event/event-handler.js

@@ -1,10 +1,10 @@
-import * as C from '../constants/constants.js'
 import * as messageBuilder from '../message/message-builder.js'
 import messageParser from '../message/message-parser.js'
+import * as C from '../constants/constants.js'
 import MulticastListener from '../utils/multicast-listener.js'
 import UnicastListener from '../utils/unicast-listener.js'
 import EventEmitter from 'component-emitter2'
-import rxjs from 'rxjs'
+import * as rxjs from 'rxjs'
 
 const EventHandler = function (options, connection, client) {
   this._options = options

package/src/message/connection.js

@@ -6,10 +6,9 @@ import xxhash from 'xxhash-wasm'
 import FixedQueue from '../utils/fixed-queue.js'
 import Emitter from 'component-emitter2'
 
-const BrowserWebSocket = globalThis.WebSocket || globalThis.MozWebSocket
-const NodeWebSocket = utils.isNode ? await import('ws').then((x) => x.default) : null
-
 const HASHER = await xxhash()
+const NodeWebSocket = utils.isNode ? await import('ws').then((x) => x.default) : null
+const BrowserWebSocket = globalThis.WebSocket || globalThis.MozWebSocket
 
 const Connection = function (client, url, options) {
   this._client = client
@@ -32,6 +31,7 @@ const Connection = function (client, url, options) {
   this._recvQueue = new FixedQueue()
   this._reconnectTimeout = null
   this._reconnectionAttempt = 0
+  this._endpoint = null
 
   this._processingRecv = false
   this._recvMessages = this._recvMessages.bind(this)
@@ -86,7 +86,7 @@ Connection.prototype.close = function () {
   this._endpoint?.close()
 
   if (this._reconnectTimeout) {
-    clearTimeout(this._reconnectTimeout)
+    globalThis.clearTimeout(this._reconnectTimeout)
     this._reconnectTimeout = null
   }
 }
@@ -136,7 +136,7 @@ Connection.prototype.send = function (message) {
   if (this._endpoint._socket && !this._corked) {
     this._endpoint._socket.cork()
     this._corked = true
-    setTimeout(() => {
+    globalThis.setTimeout(() => {
       this._endpoint._socket.uncork()
       this._corked = false
     }, 1)
@@ -151,8 +151,8 @@ Connection.prototype.send = function (message) {
 Connection.prototype._submit = function (message) {
   const { maxPacketSize } = this._options
 
-  if (message.byteLength > maxPacketSize) {
-    const err = new Error(`Packet to big: ${message.byteLength} > ${maxPacketSize}`)
+  if (message.length > maxPacketSize) {
+    const err = new Error(`Packet to big: ${message.length} > ${maxPacketSize}`)
     this._client._$onError(C.TOPIC.CONNECTION, C.EVENT.CONNECTION_ERROR, err)
     return false
   } else if (this._endpoint.readyState === this._endpoint.OPEN) {
@@ -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.8', // TODO (fix): How to read from package.json?
+    '26.0.0',
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,
@@ -245,10 +245,6 @@ Connection.prototype._recvMessages = function (deadline) {
       continue
     }
 
-    if (this._logger) {
-      this._logger.trace(message, 'receive')
-    }
-
     messageParser.parseMessage(message, this._client, this._message)
 
     this.emit('recv', this._message)

package/src/message/message-builder.js

@@ -1,101 +1,25 @@
 import * as C from '../constants/constants.js'
-import varint from 'varint'
-import * as utils from '../utils/utils.js'
 
-const poolEncoder = new 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
-  }
-}
+const SEP = C.MESSAGE_PART_SEPERATOR
 
 export function getMsg(topic, action, data) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
 
-  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)
-  }
+  const sendData = [topic, action]
 
   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
-        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)
+      if (typeof data[i] === 'object') {
+        sendData.push(JSON.stringify(data[i]))
       } 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) {
-        allocPool(start === 0 ? poolSize * 2 : poolSize)
-        return getMsg(topic, action, data)
+        sendData.push(data[i])
       }
     }
   }
 
-  return new Uint8Array(poolBuffer.buffer, start, poolOffset - start)
+  return sendData.join(SEP)
 }
 
 export function typed(value) {

package/src/record/record-handler.js

@@ -2,7 +2,7 @@ import Record from './record.js'
 import MulticastListener from '../utils/multicast-listener.js'
 import UnicastListener from '../utils/unicast-listener.js'
 import * as C from '../constants/constants.js'
-import rxjs from 'rxjs'
+import * as rxjs from 'rxjs'
 import invariant from 'invariant'
 import EventEmitter from 'component-emitter2'
 import jsonPath from '@nxtedition/json-path'
@@ -101,7 +101,6 @@ class RecordHandler {
     this._pruning = new Set()
     this._patching = new Map()
     this._updating = new Map()
-    this._encoder = new TextEncoder()
 
     this._connected = 0
     this._stats = {
@@ -207,12 +206,6 @@ 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}
@@ -226,7 +219,7 @@ class RecordHandler {
     let record = this._records.get(name)
 
     if (!record) {
-      record = new Record(this.getKey(name), name, this)
+      record = new Record(name, this)
       this._stats.records += 1
       this._stats.created += 1
       this._records.set(name, record)

package/src/record/record.js

@@ -7,25 +7,24 @@ import invariant from 'invariant'
 import cloneDeep from 'lodash.clonedeep'
 import * as timers from '../utils/timers.js'
 
-// const encoder = new TextEncoder()
-
-class Record {
+export default class Record {
   static STATE = C.RECORD_STATE
 
-  constructor(key, name, handler) {
+  constructor(name, handler) {
+    const connection = handler._connection
+
     this._handler = handler
+
     this._name = name
-    this._key = key
     this._version = ''
     this._data = jsonPath.EMPTY
     this._state = C.RECORD_STATE.VOID
     this._refs = 0
     this._subscriptions = []
     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])
   }
 
   /** @type {string} */
@@ -63,8 +62,7 @@ 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._key])
+        this._subscribed || connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
     }
     return this
   }
@@ -326,8 +324,7 @@ class Record {
 
     if (connected) {
       this._subscribed =
-        this._refs > 0 &&
-        connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name, this._key])
+        this._refs > 0 && connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
 
       if (this._updating) {
         for (const update of this._updating.values()) {
@@ -352,7 +349,7 @@ class Record {
     invariant(!this._updating, 'must not have updates')
 
     if (this._subscribed) {
-      connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, [this._key])
+      connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, [this._name])
       this._subscribed = false
     }
 
@@ -374,7 +371,7 @@ class Record {
     const prevVersion = this._version
     const nextVersion = this._makeVersion(parseInt(prevVersion) + 1)
 
-    const update = [this._key, nextVersion, jsonPath.stringify(nextData), prevVersion]
+    const update = [this._name, nextVersion, jsonPath.stringify(nextData), prevVersion]
 
     if (!this._updating) {
       this._onUpdating(true)
@@ -576,5 +573,3 @@ Object.defineProperty(Record.prototype, 'hasProvider', {
     return this.state >= C.RECORD_STATE.PROVIDER
   },
 })
-
-export default Record

package/src/utils/multicast-listener.js

@@ -1,5 +1,5 @@
 import * as C from '../constants/constants.js'
-import rxjs from 'rxjs'
+import * as rxjs from 'rxjs'
 
 class Listener {
   constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
@@ -56,7 +56,6 @@ class Listener {
       // TODO (refactor): Move to class
       const provider = {
         name,
-        key: this._handler.getKey(name),
         value$: null,
         sending: false,
         accepted: false,
@@ -69,7 +68,7 @@ class Listener {
         if (this.connected && provider.accepted) {
           this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [
             this._pattern,
-            provider.key,
+            provider.name,
           ])
         }
 
@@ -78,7 +77,7 @@ class Listener {
         provider.accepted = false
         provider.sending = false
 
-        clearTimeout(provider.timeout)
+        globalThis.clearTimeout(provider.timeout)
         provider.timeout = null
 
         provider.patternSubscription?.unsubscribe()
@@ -102,7 +101,7 @@ class Listener {
         this._connection.sendMsg(
           this._topic,
           accepted ? C.ACTIONS.LISTEN_ACCEPT : C.ACTIONS.LISTEN_REJECT,
-          [this._pattern, provider.key],
+          [this._pattern, provider.name],
         )
 
         provider.version = null
@@ -158,7 +157,7 @@ class Listener {
             if (provider.version !== version) {
               provider.version = version
               this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, [
-                provider.key,
+                provider.name,
                 version,
                 body,
               ])

package/src/utils/unicast-listener.js

@@ -1,9 +1,8 @@
 import * as C from '../constants/constants.js'
-import rx from 'rxjs/operators'
-import rxjs from 'rxjs'
+import * as rxjs from 'rxjs'
 
 const PIPE = rxjs.pipe(
-  rx.map((value) => {
+  rxjs.map((value) => {
     let data
     if (value && typeof value === 'string') {
       if (value.charAt(0) !== '{' && value.charAt(0) !== '[') {
@@ -18,7 +17,7 @@ const PIPE = rxjs.pipe(
 
     return data
   }),
-  rx.distinctUntilChanged(),
+  rxjs.distinctUntilChanged(),
 )
 
 class Listener {
@@ -68,29 +67,27 @@ 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, key])
+              this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
               this._subscriptions.delete(name)
               subscription.unsubscribe()
             } else {
               const version = `INF-${this._connection.hasher.h64ToString(data)}`
-              this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [key, version, data])
+              this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [name, version, data])
             }
           },
           error: (err) => {
             this._error(name, err)
-            this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
+            this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
             this._subscriptions.delete(name)
           },
         })
         this._subscriptions.set(name, subscription)
       } else {
-        this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
+        this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
       }
     } else if (message.action === C.ACTIONS.LISTEN_REJECT) {
       const subscription = this._subscriptions.get(name)

package/src/utils/utils.js

@@ -79,7 +79,7 @@ export function setTimeout(callback, timeoutDuration) {
 
 export function setInterval(callback, intervalDuration) {
   if (intervalDuration !== null) {
-    return setInterval(callback, intervalDuration)
+    return globalThis.setInterval(callback, intervalDuration)
   } else {
     return -1
   }