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

package/.husky/pre-commit

@@ -1,3 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-yarn lint-staged
+npx lint-staged

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.3.4",
+  "version": "24.4.1",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",
@@ -18,9 +18,9 @@
     "ws": false
   },
   "scripts": {
-    "_postinstall": "husky install",
     "prepublishOnly": "pinst --disable",
-    "postpublish": "pinst --enable"
+    "postpublish": "pinst --enable",
+    "prepare": "husky"
   },
   "lint-staged": {
     "*.{js,jsx,md,ts}": [
@@ -59,30 +59,31 @@
     "/__tests__"
   ],
   "dependencies": {
-    "@nxtedition/json-path": "^1.0.3",
-    "bufferutil": "^4.0.7",
+    "@nxtedition/json-path": "^1.0.8",
+    "bufferutil": "^4.0.8",
     "component-emitter2": "^1.3.5",
     "invariant": "^2.2.4",
     "lodash.clonedeep": "^4.5.0",
-    "utf-8-validate": "^6.0.3",
+    "utf-8-validate": "^6.0.4",
     "varint": "^6.0.0",
-    "ws": "^8.13.0",
-    "xuid": "^4.1.2",
+    "ws": "^8.18.0",
+    "xuid": "^4.1.3",
     "xxhash-wasm": "^1.0.2"
   },
   "devDependencies": {
-    "eslint": "^8.42.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint": "^8.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^16.0.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-n": "^17.10.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "husky": "^8.0.3",
-    "lint-staged": "^13.2.2",
+    "eslint-plugin-promise": "^7.0.0",
+    "husky": "^9.1.3",
+    "lint-staged": "^15.2.7",
     "mitata": "^0.1.11",
     "pinst": "^3.0.0",
-    "prettier": "^2.8.8"
+    "prettier": "^3.3.3",
+    "rxjs": "^7.8.1"
   },
   "peerDependencies": {
     "rxjs": ">=6.x"

package/src/client.js

@@ -81,7 +81,7 @@ Client.prototype._$onMessage = function (message) {
     this._$onError(
       message.topic,
       C.EVENT.MESSAGE_PARSE_ERROR,
-      `Received message for unknown topic ${message.topic}`
+      `Received message for unknown topic ${message.topic}`,
     )
   }
 
@@ -127,12 +127,10 @@ Client.prototype._getOptions = function (options) {
   return mergedOptions
 }
 
-function createDeepstream(url, options) {
+export default function createDeepstream(url, options) {
   return new Client(url, options)
 }
 
 Client.prototype.isSameOrNewer = utils.isSameOrNewer
 Client.prototype.CONSTANTS = C
 createDeepstream.CONSTANTS = C
-
-export default createDeepstream

package/src/event/event-handler.js

@@ -1,6 +1,6 @@
 import * as C from '../constants/constants.js'
 import * as messageBuilder from '../message/message-builder.js'
-import messageParser from '../message/message-parser.js'
+import * as messageParser from '../message/message-parser.js'
 import MulticastListener from '../utils/multicast-listener.js'
 import UnicastListener from '../utils/unicast-listener.js'
 import EventEmitter from 'component-emitter2'

package/src/message/connection.js

@@ -1,17 +1,14 @@
 import * as utils from '../utils/utils.js'
-import messageParser from './message-parser.js'
+import * as messageParser from './message-parser.js'
 import * as messageBuilder from './message-builder.js'
 import * as C from '../constants/constants.js'
-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 BrowserWebSocket = globalThis.WebSocket || globalThis.MozWebSocket
 
-const HASHER = await xxhash()
-
-const Connection = function (client, url, options) {
+export default function Connection(client, url, options) {
   this._client = client
   this._options = options
   this._logger = options.logger
@@ -32,6 +29,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)
@@ -40,8 +38,6 @@ const Connection = function (client, url, options) {
 
   this._state = C.CONNECTION_STATE.CLOSED
 
-  this.hasher = HASHER
-
   this._createEndpoint()
 }
 
@@ -92,24 +88,19 @@ Connection.prototype.close = function () {
 }
 
 Connection.prototype._createEndpoint = function () {
-  if (utils.isNode) {
-    this._endpoint = new NodeWebSocket(this._url, {
-      generateMask() {},
-    })
-  } else {
-    this._endpoint = new BrowserWebSocket(this._url)
-    this._endpoint.binaryType = 'arraybuffer'
-  }
+  this._endpoint = NodeWebSocket
+    ? new NodeWebSocket(this._url, {
+        generateMask() {},
+      })
+    : new BrowserWebSocket(this._url)
   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))
-  }
+  this._endpoint.onmessage = BrowserWebSocket
+    ? ({ data }) => this._onMessage(typeof data === 'string' ? data : Buffer.from(data).toString())
+    : ({ data }) => this._onMessage(typeof data === 'string' ? data : data.toString())
 }
 
 Connection.prototype.send = function (message) {
@@ -121,7 +112,7 @@ Connection.prototype.send = function (message) {
       C.TOPIC.CONNECTION,
       C.EVENT.CONNECTION_ERROR,
       err,
-      message.split(C.MESSAGE_PART_SEPERATOR).map((x) => x.slice(0, 256))
+      message.split(C.MESSAGE_PART_SEPERATOR).map((x) => x.slice(0, 256)),
     )
     return false
   }
@@ -151,8 +142,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 +161,7 @@ Connection.prototype._sendAuthParams = function () {
   this._setState(C.CONNECTION_STATE.AUTHENTICATING)
   const authMessage = messageBuilder.getMsg(C.TOPIC.AUTH, C.ACTIONS.REQUEST, [
     this._authParams,
-    '24.3.1', // TODO (fix): How to read from package.json?
+    '24.4.0',
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,
@@ -276,7 +267,7 @@ Connection.prototype._handleConnectionResponse = function (message) {
   } else if (message.action === C.ACTIONS.CHALLENGE) {
     this._setState(C.CONNECTION_STATE.CHALLENGING)
     this._submit(
-      messageBuilder.getMsg(C.TOPIC.CONNECTION, C.ACTIONS.CHALLENGE_RESPONSE, [this._url])
+      messageBuilder.getMsg(C.TOPIC.CONNECTION, C.ACTIONS.CHALLENGE_RESPONSE, [this._url]),
     )
   } else if (message.action === C.ACTIONS.REJECTION) {
     this._challengeDenied = true
@@ -344,10 +335,16 @@ Connection.prototype._tryReconnect = function () {
 
   if (this._reconnectionAttempt < this._options.maxReconnectAttempts) {
     this._setState(C.CONNECTION_STATE.RECONNECTING)
-    this._reconnectTimeout = setTimeout(() => {
-      this._reconnectTimeout = null
-      this._createEndpoint()
-    }, Math.min(this._options.maxReconnectInterval, this._options.reconnectIntervalIncrement * this._reconnectionAttempt))
+    this._reconnectTimeout = setTimeout(
+      () => {
+        this._reconnectTimeout = null
+        this._createEndpoint()
+      },
+      Math.min(
+        this._options.maxReconnectInterval,
+        this._options.reconnectIntervalIncrement * this._reconnectionAttempt,
+      ),
+    )
     this._reconnectionAttempt++
   } else {
     this._clearReconnect()
@@ -363,5 +360,3 @@ Connection.prototype._clearReconnect = function () {
   }
   this._reconnectionAttempt = 0
 }
-
-export default Connection

package/src/message/message-builder.js

@@ -1,94 +1,25 @@
 import * as C from '../constants/constants.js'
-import varint from 'varint'
 
-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++
-  }
-}
+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) {
-    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)
-  }
+  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
-        const res = poolEncoder.encodeInto(
-          JSON.stringify(data[i]),
-          new Uint8Array(poolBuffer.buffer, poolOffset)
-        )
-        len = res.written
-      } else if (type === 'bigint') {
-        poolBuffer[poolOffset++] = 31
-        poolView.setBigUint64(poolOffset, data[i], false)
-        len = 8
-      } else if (type === 'string') {
-        poolBuffer[poolOffset++] = 31
-        const res = poolEncoder.encodeInto(data[i], new Uint8Array(poolBuffer.buffer, poolOffset))
-        len = res.written
+      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) {
-        reallocPool(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/message/message-parser.js

@@ -1,10 +1,12 @@
 import * as C from '../constants/constants.js'
 
-const MessageParser = function () {
-  this._actions = this._getActions()
+const actions = {}
+
+for (const key in C.ACTIONS) {
+  actions[C.ACTIONS[key]] = key
 }
 
-MessageParser.prototype.convertTyped = function (value, client) {
+export function convertTyped(value, client) {
   const type = value.charAt(0)
 
   if (type === C.TYPES.STRING) {
@@ -45,24 +47,14 @@ MessageParser.prototype.convertTyped = function (value, client) {
   return undefined
 }
 
-MessageParser.prototype._getActions = function () {
-  const actions = {}
-
-  for (const key in C.ACTIONS) {
-    actions[C.ACTIONS[key]] = key
-  }
-
-  return actions
-}
-
-MessageParser.prototype.parseMessage = function (message, client, result) {
+export function parseMessage(message, client, result) {
   const parts = message.split(C.MESSAGE_PART_SEPERATOR)
 
   if (parts.length < 2) {
     client._$onError(
       C.TOPIC.ERROR,
       C.EVENT.MESSAGE_PARSE_ERROR,
-      new Error('Insufficiant message parts')
+      new Error('Insufficiant message parts'),
     )
     return null
   }
@@ -72,12 +64,12 @@ MessageParser.prototype.parseMessage = function (message, client, result) {
     return null
   }
 
-  if (this._actions[parts[1]] === undefined) {
+  if (actions[parts[1]] === undefined) {
     client._$onError(
       C.TOPIC.ERROR,
       C.EVENT.MESSAGE_PARSE_ERROR,
       new Error('Unknown action'),
-      message
+      message,
     )
     return null
   }
@@ -87,5 +79,3 @@ MessageParser.prototype.parseMessage = function (message, client, result) {
   result.action = parts[1]
   result.data = parts.splice(2)
 }
-
-export default new MessageParser()

package/src/record/record-handler.js

@@ -49,8 +49,8 @@ function onTimeout(subscription) {
       new Error(`timeout state: ${subscription.record.name} [${current}<${expected}]`),
       {
         code: 'ETIMEDOUT',
-      }
-    )
+      },
+    ),
   )
 }
 
@@ -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}
@@ -220,13 +213,13 @@ class RecordHandler {
   getRecord(name) {
     invariant(
       typeof name === 'string' && name.length > 0 && name !== '[object Object]',
-      `invalid name ${name}`
+      `invalid name ${name}`,
     )
 
     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)
@@ -294,17 +287,22 @@ class RecordHandler {
         const patching = [...this._patching.values()]
         await Promise.race([
           Promise.all(
-            patching.map((callbacks) => new Promise((resolve) => callbacks.push(resolve)))
+            patching.map((callbacks) => new Promise((resolve) => callbacks.push(resolve))),
           ),
           new Promise((resolve) => {
-            patchingTimeout = timers.setTimeout(() => {
-              this._client._$onError(
-                C.TOPIC.RECORD,
-                C.EVENT.TIMEOUT,
-                Object.assign(new Error('sync patching timeout'), { data: { patching, timeout } })
-              )
-              resolve(null)
-            }, timeout ?? 2 * 60e3)
+            patchingTimeout = timers.setTimeout(
+              () => {
+                this._client._$onError(
+                  C.TOPIC.RECORD,
+                  C.EVENT.TIMEOUT,
+                  Object.assign(new Error('sync patching timeout'), {
+                    data: { patching, timeout },
+                  }),
+                )
+                resolve(null)
+              },
+              timeout ?? 2 * 60e3,
+            )
           }),
           signalPromise,
         ]).finally(() => {
@@ -317,17 +315,22 @@ class RecordHandler {
         const updating = [...this._updating.values()]
         await Promise.race([
           Promise.all(
-            updating.map((callbacks) => new Promise((resolve) => callbacks.push(resolve)))
+            updating.map((callbacks) => new Promise((resolve) => callbacks.push(resolve))),
           ),
           new Promise((resolve) => {
-            updatingTimeout = timers.setTimeout(() => {
-              this._client._$onError(
-                C.TOPIC.RECORD,
-                C.EVENT.TIMEOUT,
-                Object.assign(new Error('sync updating timeout'), { data: { updating, timeout } })
-              )
-              resolve(null)
-            }, timeout ?? 2 * 60e3)
+            updatingTimeout = timers.setTimeout(
+              () => {
+                this._client._$onError(
+                  C.TOPIC.RECORD,
+                  C.EVENT.TIMEOUT,
+                  Object.assign(new Error('sync updating timeout'), {
+                    data: { updating, timeout },
+                  }),
+                )
+                resolve(null)
+              },
+              timeout ?? 2 * 60e3,
+            )
           }),
           signalPromise,
         ]).finally(() => {
@@ -343,14 +346,17 @@ class RecordHandler {
           this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
         }),
         new Promise((resolve) => {
-          serverTimeout = timers.setTimeout(() => {
-            this._client._$onError(
-              C.TOPIC.RECORD,
-              C.EVENT.TIMEOUT,
-              Object.assign(new Error('sync server timeout'), { data: { token, timeout } })
-            )
-            resolve(null)
-          }, timeout ?? 2 * 60e3)
+          serverTimeout = timers.setTimeout(
+            () => {
+              this._client._$onError(
+                C.TOPIC.RECORD,
+                C.EVENT.TIMEOUT,
+                Object.assign(new Error('sync server timeout'), { data: { token, timeout } }),
+              )
+              resolve(null)
+            },
+            timeout ?? 2 * 60e3,
+          )
         }),
         signalPromise,
       ]).finally(() => {
@@ -423,7 +429,7 @@ class RecordHandler {
         timeout: 2 * 60e3,
         dataOnly: true,
       },
-      ...args
+      ...args,
     )
   }
 
@@ -499,7 +505,7 @@ class RecordHandler {
       {
         timeout: 2 * 60e3,
       },
-      ...args
+      ...args,
     )
   }
 

package/src/record/record.js

@@ -1,21 +1,20 @@
 import jsonPath from '@nxtedition/json-path'
 import * as utils from '../utils/utils.js'
 import * as C from '../constants/constants.js'
-import messageParser from '../message/message-parser.js'
+import * as messageParser from '../message/message-parser.js'
 import xuid from 'xuid'
 import invariant from 'invariant'
 import cloneDeep from 'lodash.clonedeep'
 import * as timers from '../utils/timers.js'
 
-// const encoder = new TextEncoder()
-
 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
@@ -25,7 +24,7 @@ class Record {
 
     /** @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
   }
@@ -251,7 +249,7 @@ class Record {
           onDone(
             Object.assign(new Error(`timeout  ${this.name} [${current}<${expected}]`), {
               code: 'ETIMEDOUT',
-            })
+            }),
           )
         }, timeout)
       }
@@ -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)
@@ -473,8 +470,8 @@ class Record {
       hasProvider && messageParser.convertTyped(hasProvider, this._handler._client)
         ? C.RECORD_STATE.PROVIDER
         : this._version.charAt(0) === 'I'
-        ? C.RECORD_STATE.STALE
-        : C.RECORD_STATE.SERVER
+          ? C.RECORD_STATE.STALE
+          : C.RECORD_STATE.SERVER
 
     if (this._state !== prevState) {
       this._emitUpdate()

package/src/rpc/rpc-handler.js

@@ -1,6 +1,6 @@
 import * as C from '../constants/constants.js'
 import RpcResponse from './rpc-response.js'
-import messageParser from '../message/message-parser.js'
+import * as messageParser from '../message/message-parser.js'
 import * as messageBuilder from '../message/message-builder.js'
 import xuid from 'xuid'
 
@@ -153,7 +153,7 @@ RpcHandler.prototype._$handle = function (message) {
           rpcId: rpc.id,
           rpcName: rpc.name,
           rpcData: rpc.data,
-        })
+        }),
       )
     } else {
       rpc.callback(null, messageParser.convertTyped(data, this._client))

package/src/utils/multicast-listener.js

@@ -1,7 +1,8 @@
+import * as rxjs from 'rxjs'
 import * as C from '../constants/constants.js'
-import rxjs from 'rxjs'
+import { h64ToString } from '../utils/utils.js'
 
-class Listener {
+export default class Listener {
   constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
     this._topic = topic
     this._pattern = pattern
@@ -40,7 +41,7 @@ class Listener {
         C.TOPIC.RECORD,
         C.EVENT.NOT_CONNECTED,
         new Error('received message while not connected'),
-        message
+        message,
       )
       return
     }
@@ -56,7 +57,6 @@ class Listener {
       // TODO (refactor): Move to class
       const provider = {
         name,
-        key: this._handler.getKey(name),
         value$: null,
         sending: false,
         accepted: false,
@@ -69,7 +69,7 @@ class Listener {
         if (this.connected && provider.accepted) {
           this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [
             this._pattern,
-            provider.key,
+            provider.name,
           ])
         }
 
@@ -102,7 +102,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
@@ -152,13 +152,13 @@ class Listener {
             }
 
             const body = typeof value !== 'string' ? this._stringify(value) : value
-            const hash = this._connection.hasher.h64ToString(body)
+            const hash = h64ToString(body)
             const version = `INF-${hash}`
 
             if (provider.version !== version) {
               provider.version = version
               this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, [
-                provider.key,
+                provider.name,
                 version,
                 body,
               ])
@@ -219,11 +219,7 @@ class Listener {
   }
 
   _error(name, err) {
-    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [
-      this._pattern,
-      name,
-      this._handler.getKey(name),
-    ])
+    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [this._pattern, name])
   }
 
   _reset() {
@@ -233,5 +229,3 @@ class Listener {
     this._subscriptions.clear()
   }
 }
-
-export default Listener

package/src/utils/timers.js

@@ -1,10 +1,11 @@
-let fastNow = Date.now()
+const fastNowInterval = 1e3
+let fastNow = 0
 let fastNowTimeout
 
 const fastTimers = []
 
 function onTimeout() {
-  fastNow = Date.now()
+  fastNow += fastNowInterval
 
   let len = fastTimers.length
   let idx = 0
@@ -41,7 +42,7 @@ function refreshTimeout() {
     fastNowTimeout.refresh()
   } else {
     globalThis.clearTimeout(fastNowTimeout)
-    fastNowTimeout = globalThis.setTimeout(onTimeout, 1e3)
+    fastNowTimeout = globalThis.setTimeout(onTimeout, fastNowInterval)
     if (fastNowTimeout.unref) {
       fastNowTimeout.unref()
     }
@@ -80,7 +81,7 @@ class Timeout {
 }
 
 export function setTimeout(callback, delay, opaque) {
-  return delay < 1e3
+  return delay < fastNowInterval
     ? globalThis.setTimeout(callback, delay, opaque)
     : new Timeout(callback, delay, opaque)
 }

package/src/utils/unicast-listener.js

@@ -1,9 +1,9 @@
+import * as rxjs from 'rxjs'
 import * as C from '../constants/constants.js'
-import rx from 'rxjs/operators'
-import rxjs from 'rxjs'
+import { h64ToString } from '../utils/utils.js'
 
 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,10 +18,10 @@ const PIPE = rxjs.pipe(
 
     return data
   }),
-  rx.distinctUntilChanged()
+  rxjs.distinctUntilChanged(),
 )
 
-class Listener {
+export default class Listener {
   constructor(topic, pattern, callback, handler, opts) {
     if (opts.recursive) {
       throw new Error('invalid argument: recursive')
@@ -68,29 +68,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])
+              const version = `INF-${h64ToString(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)
@@ -128,5 +126,3 @@ class Listener {
     this._connection.sendMsg(this._topic, C.ACTIONS.UNLISTEN, [this._pattern])
   }
 }
-
-export default Listener

package/src/utils/utils.js

@@ -1,3 +1,5 @@
+import xxhash from 'xxhash-wasm'
+
 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 +176,9 @@ export function removeAbortListener(signal, handler) {
     }
   }
 }
+
+const HASHER = await xxhash()
+
+export function h64ToString(str) {
+  return HASHER.h64ToString(str)
+}