@nxtedition/deepstream.io-client-js 26.0.3 → 26.0.5

package/package.json

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

package/src/client.js

@@ -36,13 +36,13 @@ const Client = function (url, options) {
 Emitter(Client.prototype)
 
 Object.defineProperty(Client.prototype, 'stats', {
-  get: function stats() {
+  get: function stats () {
     return {
       record: this.record.stats,
       rpc: this.rpc.stats,
-      event: this.event.stats,
+      event: this.event.stats
     }
-  },
+  }
 })
 
 Client.prototype.login = function (authParamsOrCallback, callback) {
@@ -127,7 +127,7 @@ Client.prototype._getOptions = function (options) {
   return mergedOptions
 }
 
-function createDeepstream(url, options) {
+function createDeepstream (url, options) {
   return new Client(url, options)
 }
 

package/src/default-options.js

@@ -5,5 +5,5 @@ export default {
   maxPacketSize: 1024 * 1024,
   batchSize: 4096,
   schedule: null,
-  logger: null,
+  logger: null
 }

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 { convertTyped } from '../message/message-parser.js'
+import 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'
@@ -13,7 +13,7 @@ const EventHandler = function (options, connection, client) {
   this._emitter = new EventEmitter()
   this._listeners = new Map()
   this._stats = {
-    emitted: 0,
+    emitted: 0
   }
 
   this.subscribe = this.subscribe.bind(this)
@@ -26,19 +26,19 @@ const EventHandler = function (options, connection, client) {
 }
 
 Object.defineProperty(EventHandler.prototype, 'connected', {
-  get: function connected() {
+  get: function connected () {
     return this._client.getConnectionState() === C.CONNECTION_STATE.OPEN
-  },
+  }
 })
 
 Object.defineProperty(EventHandler.prototype, 'stats', {
-  get: function stats() {
+  get: function stats () {
     return {
       ...this._stats,
       listeners: this._listeners.size,
-      events: this._emitter.eventNames().length,
+      events: this._emitter.eventNames().length
     }
-  },
+  }
 })
 
 EventHandler.prototype.subscribe = function (name, callback) {
@@ -143,7 +143,7 @@ EventHandler.prototype._$handle = function (message) {
 
   if (message.action === C.ACTIONS.EVENT) {
     if (message.data && message.data.length === 2) {
-      this._emitter.emit(name, convertTyped(data, this._client))
+      this._emitter.emit(name, messageParser.convertTyped(data, this._client))
     } else {
       this._emitter.emit(name)
     }

package/src/message/connection.js

@@ -1,11 +1,10 @@
 import * as utils from '../utils/utils.js'
-import { convertTyped } from './message-parser.js'
+import 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'
-import varint from 'varint'
 
 const BrowserWebSocket = globalThis.WebSocket || globalThis.MozWebSocket
 const NodeWebSocket = utils.isNode ? await import('ws').then((x) => x.default) : null
@@ -24,8 +23,12 @@ const Connection = function (client, url, options) {
   this._tooManyAuthAttempts = false
   this._connectionAuthenticationTimeout = false
   this._challengeDenied = false
-  this._decoder = new TextDecoder()
-  this._encoder = new TextEncoder()
+  this._message = {
+    raw: null,
+    topic: null,
+    action: null,
+    data: null,
+  }
   this._recvQueue = new FixedQueue()
   this._reconnectTimeout = null
   this._reconnectionAttempt = 0
@@ -103,8 +106,9 @@ Connection.prototype._createEndpoint = function () {
   this._endpoint.onerror = this._onError.bind(this)
   this._endpoint.onclose = this._onClose.bind(this)
 
+  const decoder = new TextDecoder()
   this._endpoint.onmessage = ({ data }) => {
-    this._onMessage(data)
+    this._onMessage(typeof data === 'string' ? data : decoder.decode(data))
   }
 }
 
@@ -113,7 +117,12 @@ Connection.prototype.send = function (message) {
 
   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, message)
+    this._client._$onError(
+      C.TOPIC.CONNECTION,
+      C.EVENT.CONNECTION_ERROR,
+      err,
+      message.split(C.MESSAGE_PART_SEPERATOR).map((x) => x.slice(0, 256)),
+    )
     return false
   }
 
@@ -161,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', // TODO (fix): How to read from package.json?
+    '26.0.5', // TODO (fix): How to read from package.json?
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,
@@ -206,60 +215,13 @@ Connection.prototype._onClose = function () {
   }
 }
 
-Connection.prototype._onMessage = function (raw) {
-  if (typeof raw === 'string') {
-    raw = this._encoder.encode(raw)
-  } else if (!utils.isNode) {
-    raw = new Uint8Array(raw)
-  }
-
-  const len = raw.byteLength
-
-  const start = 0
-
-  let pos = start
-
-  let headerSize = 0
-  if (raw[pos] >= 128) {
-    headerSize = raw[pos] - 128
-    pos += headerSize
-  }
-
-  // TODO (perf): Use numbers instead of string..
-  const topic = String.fromCharCode(raw[pos++])
-  pos++
-
-  let action = ''
-  while (pos < len && raw[pos] !== 31) {
-    // TODO (perf): Use numbers instead of string..
-    action += String.fromCharCode(raw[pos++])
+Connection.prototype._onMessage = function (data) {
+  // Remove MESSAGE_SEPERATOR if exists.
+  if (data.charCodeAt(data.length - 1) === 30) {
+    data = data.slice(0, -1)
   }
-  pos++
 
-  // TODO (fix): Validate topic and action
-
-  let data
-
-  // TODO (fix): Don't stringify binary data...
-
-  if (headerSize > 0) {
-    data = []
-    let headerPos = start + 1
-    while (headerPos < headerSize) {
-      const len = varint.decode(raw, headerPos)
-      headerPos += varint.decode.bytes
-      if (len === 0) {
-        break
-      }
-      data.push(this._decoder.decode(raw.subarray(pos, pos + len - 1)))
-      pos += len
-    }
-  } else {
-    data =
-      pos < len ? this._decoder.decode(raw.subarray(pos, len)).split(C.MESSAGE_PART_SEPERATOR) : []
-  }
-
-  this._recvQueue.push({ topic, action, data })
+  this._recvQueue.push(data)
   if (!this._processingRecv) {
     this._processingRecv = true
     this._schedule(this._recvMessages)
@@ -283,19 +245,20 @@ Connection.prototype._recvMessages = function (deadline) {
       continue
     }
 
-    if (message === C.TOPIC.ERROR) {
-      this._client._$onError(C.TOPIC.ERROR, message.action, new Error('Message error'), message)
-      continue
+    if (this._logger) {
+      this._logger.trace(message, 'receive')
     }
 
-    this.emit('recv', message)
+    messageParser.parseMessage(message, this._client, this._message)
+
+    this.emit('recv', this._message)
 
-    if (message.topic === C.TOPIC.CONNECTION) {
-      this._handleConnectionResponse(message)
-    } else if (message.topic === C.TOPIC.AUTH) {
-      this._handleAuthResponse(message)
+    if (this._message.topic === C.TOPIC.CONNECTION) {
+      this._handleConnectionResponse(this._message)
+    } else if (this._message.topic === C.TOPIC.AUTH) {
+      this._handleAuthResponse(this._message)
     } else {
-      this._client._$onMessage(message)
+      this._client._$onMessage(this._message)
     }
   }
 
@@ -352,7 +315,7 @@ Connection.prototype._getAuthData = function (data) {
   if (data === undefined) {
     return null
   } else {
-    return convertTyped(data, this._client)
+    return messageParser.convertTyped(data, this._client)
   }
 }
 

package/src/message/message-builder.js

@@ -9,7 +9,7 @@ let poolBuffer
 let poolView
 let poolOffset
 
-function allocPool(size) {
+function allocPool (size) {
   poolSize = size || poolSize || 1024 * 1024
   poolBuffer = utils.isNode
     ? globalThis.Buffer.allocUnsafe(poolSize)
@@ -18,7 +18,7 @@ function allocPool(size) {
   poolOffset = 0
 }
 
-function alignPool() {
+function alignPool () {
   // Ensure aligned slices
   if (poolOffset & 0x7) {
     poolOffset |= 0x7
@@ -26,7 +26,7 @@ function alignPool() {
   }
 }
 
-function writeString(dst, str, offset) {
+function writeString (dst, str, offset) {
   if (utils.isNode) {
     return dst.write(str, offset)
   } else {
@@ -35,7 +35,7 @@ function writeString(dst, str, offset) {
   }
 }
 
-export function getMsg(topic, action, data) {
+export function getMsg (topic, action, data) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
@@ -79,6 +79,7 @@ export function getMsg(topic, action, data) {
       } else {
         throw new Error('invalid data')
       }
+
       poolOffset += len
 
       varint.encode(len + 1, poolBuffer, headerPos)
@@ -97,7 +98,7 @@ export function getMsg(topic, action, data) {
   return new Uint8Array(poolBuffer.buffer, start, poolOffset - start)
 }
 
-export function typed(value) {
+export function typed (value) {
   const type = typeof value
 
   if (type === 'string') {

package/src/message/message-parser.js

@@ -1,6 +1,10 @@
 import * as C from '../constants/constants.js'
 
-export function convertTyped(value, client) {
+const MessageParser = function () {
+  this._actions = this._getActions()
+}
+
+MessageParser.prototype.convertTyped = function (value, client) {
   const type = value.charAt(0)
 
   if (type === C.TYPES.STRING) {
@@ -40,3 +44,48 @@ export function convertTyped(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) {
+  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')
+    )
+    return null
+  }
+
+  if (parts[0] === C.TOPIC.ERROR) {
+    client._$onError(C.TOPIC.ERROR, parts[1], new Error('Message error'), message)
+    return null
+  }
+
+  if (this._actions[parts[1]] === undefined) {
+    client._$onError(
+      C.TOPIC.ERROR,
+      C.EVENT.MESSAGE_PARSE_ERROR,
+      new Error('Unknown action'),
+      message
+    )
+    return null
+  }
+
+  result.raw = message
+  result.topic = parts[0]
+  result.action = parts[1]
+  result.data = parts.splice(2)
+}
+
+export default new MessageParser()

package/src/record/record-handler.js

@@ -13,7 +13,7 @@ import * as timers from '../utils/timers.js'
 
 const kEmpty = Symbol('kEmpty')
 
-function onUpdate(record, subscription) {
+function onUpdate (record, subscription) {
   if (subscription.state && record.state < subscription.state) {
     return
   }
@@ -35,12 +35,12 @@ function onUpdate(record, subscription) {
       name: record.name,
       version: record.version,
       state: record.state,
-      data,
+      data
     })
   }
 }
 
-function onTimeout(subscription) {
+function onTimeout (subscription) {
   const expected = C.RECORD_STATE_NAME[subscription.state]
   const current = C.RECORD_STATE_NAME[subscription.record.state]
 
@@ -48,13 +48,13 @@ function onTimeout(subscription) {
     Object.assign(
       new Error(`timeout state: ${subscription.record.name} [${current}<${expected}]`),
       {
-        code: 'ETIMEDOUT',
-      },
-    ),
+        code: 'ETIMEDOUT'
+      }
+    )
   )
 }
 
-function onUpdateFast(rec, opaque) {
+function onUpdateFast (rec, opaque) {
   const { timeout, resolve, synced, state } = opaque
 
   if (rec.state >= state && synced) {
@@ -65,12 +65,12 @@ function onUpdateFast(rec, opaque) {
   }
 }
 
-function onSyncFast(opaque) {
+function onSyncFast (opaque) {
   opaque.synced = true
   onUpdateFast(opaque.rec, opaque)
 }
 
-function onTimeoutFast(opaque) {
+function onTimeoutFast (opaque) {
   const { rec, synced, resolve } = opaque
   rec.unsubscribe(onUpdateFast, opaque)
   rec.unref()
@@ -88,7 +88,7 @@ function onTimeoutFast(opaque) {
 }
 
 class RecordHandler {
-  constructor(options, connection, client) {
+  constructor (options, connection, client) {
     this.JSON = jsonPath
     this.STATE = C.RECORD_STATE
     Object.assign(this, C.RECORD_STATE)
@@ -110,7 +110,7 @@ class RecordHandler {
       destroyed: 0,
       records: 0,
       pruning: 0,
-      patching: 0,
+      patching: 0
     }
 
     this._syncQueue = []
@@ -147,7 +147,7 @@ class RecordHandler {
     this._pruningTimeout = timers.setTimeout(_prune, 1e3)
   }
 
-  _onPruning(rec, value) {
+  _onPruning (rec, value) {
     if (value) {
       this._stats.pruning += 1
     } else {
@@ -161,7 +161,7 @@ class RecordHandler {
     }
   }
 
-  _onUpdating(rec, value) {
+  _onUpdating (rec, value) {
     if (value) {
       this._stats.updating += 1
       this._updating.set(rec, [])
@@ -176,7 +176,7 @@ class RecordHandler {
     }
   }
 
-  _onPatching(rec, value) {
+  _onPatching (rec, value) {
     if (value) {
       this._stats.patching += 1
       this._patching.set(rec, [])
@@ -191,11 +191,11 @@ class RecordHandler {
     }
   }
 
-  get connected() {
+  get connected () {
     return Boolean(this._connected)
   }
 
-  get stats() {
+  get stats () {
     let subscriptions = 0
     for (const listener of this._listeners.values()) {
       subscriptions += listener.subscriptions ?? 0
@@ -203,11 +203,11 @@ class RecordHandler {
 
     return {
       ...this._stats,
-      subscriptions,
+      subscriptions
     }
   }
 
-  getKey(name) {
+  getKey (name) {
     if (name.length > 8) {
       return this._connection.hasher.h64(name)
     }
@@ -219,10 +219,10 @@ class RecordHandler {
    * @param {string} name
    * @returns {Record}
    */
-  getRecord(name) {
+  getRecord (name) {
     invariant(
       typeof name === 'string' && name.length > 0 && name !== '[object Object]',
-      `invalid name ${name}`,
+      `invalid name ${name}`
     )
 
     let record = this._records.get(name)
@@ -237,7 +237,7 @@ class RecordHandler {
     return record.ref()
   }
 
-  provide(pattern, callback, options) {
+  provide (pattern, callback, options) {
     if (typeof pattern !== 'string' || pattern.length === 0) {
       throw new Error('invalid argument pattern')
     }
@@ -272,7 +272,7 @@ class RecordHandler {
     }
   }
 
-  async sync(opts) {
+  async sync (opts) {
     // TODO (fix): Sync pending? What about VOID state?
 
     let onAbort
@@ -282,11 +282,11 @@ class RecordHandler {
 
     const signalPromise = signal
       ? new Promise((resolve, reject) => {
-          onAbort = () => {
-            reject(signal.reason ?? new utils.AbortError())
-          }
-          signal.addEventListener('abort', onAbort)
-        })
+        onAbort = () => {
+          reject(signal.reason ?? new utils.AbortError())
+        }
+        signal.addEventListener('abort', onAbort)
+      })
       : null
     signalPromise?.catch(() => {})
 
@@ -296,7 +296,7 @@ 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(
@@ -305,15 +305,15 @@ class RecordHandler {
                   C.TOPIC.RECORD,
                   C.EVENT.TIMEOUT,
                   Object.assign(new Error('sync patching timeout'), {
-                    data: { patching, timeout },
-                  }),
+                    data: { patching, timeout }
+                  })
                 )
                 resolve(null)
               },
-              timeout ?? 2 * 60e3,
+              timeout ?? 2 * 60e3
             )
           }),
-          signalPromise,
+          signalPromise
         ]).finally(() => {
           timers.clearTimeout(patchingTimeout)
         })
@@ -324,7 +324,7 @@ 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(
@@ -333,15 +333,15 @@ class RecordHandler {
                   C.TOPIC.RECORD,
                   C.EVENT.TIMEOUT,
                   Object.assign(new Error('sync updating timeout'), {
-                    data: { updating, timeout },
-                  }),
+                    data: { updating, timeout }
+                  })
                 )
                 resolve(null)
               },
-              timeout ?? 2 * 60e3,
+              timeout ?? 2 * 60e3
             )
           }),
-          signalPromise,
+          signalPromise
         ]).finally(() => {
           timers.clearTimeout(updatingTimeout)
         })
@@ -360,14 +360,14 @@ class RecordHandler {
               this._client._$onError(
                 C.TOPIC.RECORD,
                 C.EVENT.TIMEOUT,
-                Object.assign(new Error('sync server timeout'), { data: { token, timeout } }),
+                Object.assign(new Error('sync server timeout'), { data: { token, timeout } })
               )
               resolve(null)
             },
-            timeout ?? 2 * 60e3,
+            timeout ?? 2 * 60e3
           )
         }),
-        signalPromise,
+        signalPromise
       ]).finally(() => {
         timers.clearTimeout(serverTimeout)
       })
@@ -378,7 +378,7 @@ class RecordHandler {
     }
   }
 
-  _sync(callback, opaque) {
+  _sync (callback, opaque) {
     this._syncQueue.push(callback, opaque)
 
     if (this._syncQueue.length > 2) {
@@ -399,7 +399,7 @@ class RecordHandler {
     }, 1)
   }
 
-  set(name, ...args) {
+  set (name, ...args) {
     const record = this.getRecord(name)
     try {
       return record.set(...args)
@@ -414,7 +414,7 @@ class RecordHandler {
    * @param  {...any} args
    * @returns {Promise}
    */
-  update(name, ...args) {
+  update (name, ...args) {
     try {
       const record = this.getRecord(name)
       try {
@@ -431,14 +431,14 @@ class RecordHandler {
    * @param  {...any} args
    * @returns {rxjs.Observable}
    */
-  observe(...args) {
+  observe (...args) {
     return this._observe(
       {
         state: C.RECORD_STATE.SERVER,
         timeout: 2 * 60e3,
-        dataOnly: true,
+        dataOnly: true
       },
-      ...args,
+      ...args
     )
   }
 
@@ -446,7 +446,7 @@ class RecordHandler {
    * @param  {...any} args
    * @returns {Promise}
    */
-  get(...args) {
+  get (...args) {
     if (args.length === 1 || (args.length === 2 && typeof args[1] === 'number')) {
       return new Promise((resolve) => {
         const rec = this.getRecord(args[0])
@@ -466,7 +466,7 @@ class RecordHandler {
             state,
             resolve,
             timeout: null,
-            synced,
+            synced
           }
           opaque.timeout = timers.setTimeout(onTimeoutFast, 2 * 60e3, opaque)
           rec.subscribe(onUpdateFast, opaque)
@@ -484,7 +484,7 @@ class RecordHandler {
           .pipe(rx.first())
           .subscribe({
             next: resolve,
-            error: reject,
+            error: reject
           })
       })
     }
@@ -494,13 +494,13 @@ class RecordHandler {
    * @param  {...any} args
    * @returns {Promise}
    */
-  get2(...args) {
+  get2 (...args) {
     return new Promise((resolve, reject) => {
       this.observe2(...args)
         .pipe(rx.first())
         .subscribe({
           next: resolve,
-          error: reject,
+          error: reject
         })
     })
   }
@@ -509,12 +509,12 @@ class RecordHandler {
    * @param  {...any} args
    * @returns {rxjs.Observable<{ name: string, version: string, state: Number, data: any}>}
    */
-  observe2(...args) {
+  observe2 (...args) {
     return this._observe(
       {
-        timeout: 2 * 60e3,
+        timeout: 2 * 60e3
       },
-      ...args,
+      ...args
     )
   }
 
@@ -522,7 +522,7 @@ class RecordHandler {
    * @returns {rxjs.Observable}
    */
   // TODO (perf): Avoid rest parameters.
-  _observe(defaults, name, ...args) {
+  _observe (defaults, name, ...args) {
     let path
     let state = defaults ? defaults.state : undefined
     let signal
@@ -585,7 +585,7 @@ class RecordHandler {
         timeout: null,
         /** @type {Record?} */ record: null,
         /** @type {Function?} */ abort: null,
-        unsubscribe() {
+        unsubscribe () {
           if (this.timeout) {
             timers.clearTimeout(this.timeout)
             this.timeout = null
@@ -602,7 +602,7 @@ class RecordHandler {
             this.record.unref()
             this.record = null
           }
-        },
+        }
       }
 
       const record = (subscription.record = this.getRecord(name).subscribe(onUpdate, subscription))
@@ -626,7 +626,7 @@ class RecordHandler {
     })
   }
 
-  _$handle(message) {
+  _$handle (message) {
     let name
     if (message.action === C.ACTIONS.ERROR) {
       name = message.data[1]
@@ -652,7 +652,7 @@ class RecordHandler {
     return false
   }
 
-  _onConnectionStateChange(connected) {
+  _onConnectionStateChange (connected) {
     for (const listener of this._listeners.values()) {
       listener._$onConnectionStateChange(connected)
     }

package/src/record/record.js

@@ -1,7 +1,7 @@
 import jsonPath from '@nxtedition/json-path'
 import * as utils from '../utils/utils.js'
 import * as C from '../constants/constants.js'
-import { convertTyped } from '../message/message-parser.js'
+import messageParser from '../message/message-parser.js'
 import xuid from 'xuid'
 import invariant from 'invariant'
 import cloneDeep from 'lodash.clonedeep'
@@ -28,11 +28,6 @@ class Record {
     this._subscribed = false
   }
 
-  /** @type {bigint} */
-  get key() {
-    return this._key
-  }
-
   /** @type {string} */
   get name() {
     return this._name
@@ -434,8 +429,8 @@ class Record {
       this._state = this._version.charAt(0) === 'I' ? C.RECORD_STATE.STALE : C.RECORD_STATE.SERVER
     }
 
-    if (hasProvider != null) {
-      this._state = convertTyped(hasProvider, this._handler._client)
+    if (hasProvider) {
+      this._state = messageParser.convertTyped(hasProvider, this._handler._client)
         ? C.RECORD_STATE.PROVIDER
         : this._version.charAt(0) === 'I'
           ? C.RECORD_STATE.STALE
@@ -483,7 +478,7 @@ class Record {
     const prevState = this._state
 
     this._state =
-      hasProvider && convertTyped(hasProvider, this._handler._client)
+      hasProvider && messageParser.convertTyped(hasProvider, this._handler._client)
         ? C.RECORD_STATE.PROVIDER
         : this._version.charAt(0) === 'I'
           ? C.RECORD_STATE.STALE

package/src/rpc/rpc-handler.js

@@ -1,6 +1,6 @@
 import * as C from '../constants/constants.js'
 import RpcResponse from './rpc-response.js'
-import { convertTyped } from '../message/message-parser.js'
+import messageParser from '../message/message-parser.js'
 import * as messageBuilder from '../message/message-builder.js'
 import xuid from 'xuid'
 
@@ -20,19 +20,19 @@ const RpcHandler = function (options, connection, client) {
 }
 
 Object.defineProperty(RpcHandler.prototype, 'connected', {
-  get: function connected() {
+  get: function connected () {
     return this._client.getConnectionState() === C.CONNECTION_STATE.OPEN
-  },
+  }
 })
 
 Object.defineProperty(RpcHandler.prototype, 'stats', {
-  get: function stats() {
+  get: function stats () {
     return {
       ...this._stats,
       listeners: this._providers.size,
-      rpcs: this._rpcs.size,
+      rpcs: this._rpcs.size
     }
-  },
+  }
 })
 
 RpcHandler.prototype.provide = function (name, callback) {
@@ -95,7 +95,7 @@ RpcHandler.prototype.make = function (name, data, callback) {
     id,
     name,
     data,
-    callback,
+    callback
   })
   this._connection.sendMsg(C.TOPIC.RPC, C.ACTIONS.REQUEST, [name, id, messageBuilder.typed(data)])
 
@@ -111,7 +111,7 @@ RpcHandler.prototype._respond = function (message) {
   if (callback) {
     let promise
     try {
-      promise = Promise.resolve(callback(convertTyped(data, this._client), response))
+      promise = Promise.resolve(callback(messageParser.convertTyped(data, this._client), response))
     } catch (err) {
       promise = Promise.reject(err)
     }
@@ -152,11 +152,11 @@ RpcHandler.prototype._$handle = function (message) {
         Object.assign(new Error(data), {
           rpcId: rpc.id,
           rpcName: rpc.name,
-          rpcData: rpc.data,
+          rpcData: rpc.data
         })
       )
     } else {
-      rpc.callback(null, convertTyped(data, this._client))
+      rpc.callback(null, messageParser.convertTyped(data, this._client))
     }
   }
 }

package/src/rpc/rpc-response.js

@@ -27,7 +27,7 @@ RpcResponse.prototype.error = function (error) {
     this._name,
     this._id,
     error.message || error,
-    true,
+    true
   ])
 }
 
@@ -40,7 +40,7 @@ RpcResponse.prototype.send = function (data) {
   this._connection.sendMsg(C.TOPIC.RPC, C.ACTIONS.RESPONSE, [
     this._name,
     this._id,
-    messageBuilder.typed(data),
+    messageBuilder.typed(data)
   ])
 }
 

package/src/utils/fixed-queue.js

@@ -51,27 +51,27 @@ const kMask = kSize - 1
 // but allows much quicker checks.
 
 class FixedCircularBuffer {
-  constructor() {
+  constructor () {
     this.bottom = 0
     this.top = 0
     this.list = new Array(kSize)
     this.next = null
   }
 
-  isEmpty() {
+  isEmpty () {
     return this.top === this.bottom
   }
 
-  isFull() {
+  isFull () {
     return ((this.top + 1) & kMask) === this.bottom
   }
 
-  push(data) {
+  push (data) {
     this.list[this.top] = data
     this.top = (this.top + 1) & kMask
   }
 
-  shift() {
+  shift () {
     const nextItem = this.list[this.bottom]
     if (nextItem === undefined) return null
     this.list[this.bottom] = undefined
@@ -81,15 +81,15 @@ class FixedCircularBuffer {
 }
 
 export default class FixedQueue {
-  constructor() {
+  constructor () {
     this.head = this.tail = new FixedCircularBuffer()
   }
 
-  isEmpty() {
+  isEmpty () {
     return this.head.isEmpty()
   }
 
-  push(data) {
+  push (data) {
     if (this.head.isFull()) {
       // Head is full: Creates a new queue, sets the old queue's `.next` to it,
       // and sets it as the new main queue.
@@ -98,7 +98,7 @@ export default class FixedQueue {
     this.head.push(data)
   }
 
-  shift() {
+  shift () {
     const tail = this.tail
     const next = tail.shift()
     if (tail.isEmpty() && tail.next !== null) {

package/src/utils/multicast-listener.js

@@ -2,7 +2,7 @@ import * as C from '../constants/constants.js'
 import rxjs from 'rxjs'
 
 class Listener {
-  constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
+  constructor (topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
     this._topic = topic
     this._pattern = pattern
     this._callback = callback
@@ -13,20 +13,20 @@ class Listener {
     this._recursive = recursive
     this._stringify = stringify || JSON.stringify
 
-    this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern])
+    this._$onConnectionStateChange()
   }
 
-  get connected() {
+  get connected () {
     return this._connection.connected
   }
 
-  get stats() {
+  get stats () {
     return {
-      subscriptions: this._subscriptions.size,
+      subscriptions: this._subscriptions.size
     }
   }
 
-  _$destroy() {
+  _$destroy () {
     this._reset()
 
     if (this.connected) {
@@ -34,13 +34,13 @@ class Listener {
     }
   }
 
-  _$onMessage(message) {
+  _$onMessage (message) {
     if (!this.connected) {
       this._client._$onError(
         C.TOPIC.RECORD,
         C.EVENT.NOT_CONNECTED,
         new Error('received message while not connected'),
-        message,
+        message
       )
       return
     }
@@ -63,13 +63,13 @@ class Listener {
         version: null,
         timeout: null,
         patternSubscription: null,
-        valueSubscription: null,
+        valueSubscription: null
       }
       provider.stop = () => {
         if (this.connected && provider.accepted) {
           this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [
             this._pattern,
-            provider.key,
+            provider.key
           ])
         }
 
@@ -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.key]
         )
 
         provider.version = null
@@ -160,12 +160,12 @@ class Listener {
               this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, [
                 provider.key,
                 version,
-                body,
+                body
               ])
             }
           }
         },
-        error: provider.error,
+        error: provider.error
       }
       provider.start = () => {
         try {
@@ -211,7 +211,7 @@ class Listener {
     return true
   }
 
-  _$onConnectionStateChange() {
+  _$onConnectionStateChange () {
     if (this.connected) {
       this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern])
     } else {
@@ -219,15 +219,11 @@ class Listener {
     }
   }
 
-  _error(name, err) {
-    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [
-      this._pattern,
-      name,
-      this._handler.getKey(name).toString(),
-    ])
+  _error (name, err) {
+    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [this._pattern, name])
   }
 
-  _reset() {
+  _reset () {
     for (const provider of this._subscriptions.values()) {
       provider.stop()
     }

package/src/utils/timers.js

@@ -3,7 +3,7 @@ let fastNowTimeout
 
 const fastTimers = []
 
-function onTimeout() {
+function onTimeout () {
   fastNow = Date.now()
 
   let len = fastTimers.length
@@ -36,7 +36,7 @@ function onTimeout() {
   }
 }
 
-function refreshTimeout() {
+function refreshTimeout () {
   if (fastNowTimeout && fastNowTimeout.refresh) {
     fastNowTimeout.refresh()
   } else {
@@ -49,7 +49,7 @@ function refreshTimeout() {
 }
 
 class Timeout {
-  constructor(callback, delay, opaque) {
+  constructor (callback, delay, opaque) {
     this.callback = callback
     this.delay = delay
     this.opaque = opaque
@@ -63,7 +63,7 @@ class Timeout {
     this.refresh()
   }
 
-  refresh() {
+  refresh () {
     if (this.state === -2) {
       fastTimers.push(this)
       if (!fastNowTimeout || fastTimers.length === 1) {
@@ -74,18 +74,18 @@ class Timeout {
     this.state = 0
   }
 
-  clear() {
+  clear () {
     this.state = -1
   }
 }
 
-export function setTimeout(callback, delay, opaque) {
+export function setTimeout (callback, delay, opaque) {
   return delay < 1e3
     ? globalThis.setTimeout(callback, delay, opaque)
     : new Timeout(callback, delay, opaque)
 }
 
-export function clearTimeout(timeout) {
+export function clearTimeout (timeout) {
   if (timeout instanceof Timeout) {
     timeout.clear()
   } else {

package/src/utils/unicast-listener.js

@@ -18,11 +18,11 @@ const PIPE = rxjs.pipe(
 
     return data
   }),
-  rx.distinctUntilChanged(),
+  rx.distinctUntilChanged()
 )
 
 class Listener {
-  constructor(topic, pattern, callback, handler, opts) {
+  constructor (topic, pattern, callback, handler, opts) {
     if (opts.recursive) {
       throw new Error('invalid argument: recursive')
     }
@@ -42,17 +42,17 @@ class Listener {
     this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern, 'U'])
   }
 
-  get stats() {
+  get stats () {
     return {
-      subscriptions: this._subscriptions.size,
+      subscriptions: this._subscriptions.size
     }
   }
 
-  _$destroy() {
+  _$destroy () {
     this._reset()
   }
 
-  _$onMessage(message) {
+  _$onMessage (message) {
     const name = message.data[1]
 
     if (message.action === C.ACTIONS.LISTEN_ACCEPT) {
@@ -86,7 +86,7 @@ class Listener {
             this._error(name, err)
             this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
             this._subscriptions.delete(name)
-          },
+          }
         })
         this._subscriptions.set(name, subscription)
       } else {
@@ -107,7 +107,7 @@ class Listener {
     return true
   }
 
-  _$onConnectionStateChange(connected) {
+  _$onConnectionStateChange (connected) {
     if (connected) {
       this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern, 'U'])
     } else {
@@ -115,15 +115,11 @@ class Listener {
     }
   }
 
-  _error(name, err) {
-    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [
-      this._pattern,
-      name,
-      this._handler.getKey(name).toString(),
-    ])
+  _error (name, err) {
+    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [this._pattern, name])
   }
 
-  _reset() {
+  _reset () {
     for (const subscription of this._subscriptions.values()) {
       subscription.unsubscribe()
     }

package/src/utils/utils.js

@@ -2,7 +2,7 @@ const NODE_ENV = typeof process !== 'undefined' && process.env && process.env.NO
 export const isNode = typeof process !== 'undefined' && process.toString() === '[object process]'
 export const isProduction = NODE_ENV === 'production'
 
-export function deepFreeze(o) {
+export function deepFreeze (o) {
   if (isProduction) {
     return o
   }
@@ -18,7 +18,7 @@ export function deepFreeze(o) {
   return o
 }
 
-export function splitRev(s) {
+export function splitRev (s) {
   if (!s) {
     return [-1, '00000000000000']
   }
@@ -29,7 +29,7 @@ export function splitRev(s) {
   return [ver.charAt(0) === 'I' ? Infinity : parseInt(ver, 10), s.slice(i + 1)]
 }
 
-export function isPlainObject(value, isPlainJSON) {
+export function isPlainObject (value, isPlainJSON) {
   if (isPlainJSON) {
     return value && typeof value === 'object' && !Array.isArray(value)
   }
@@ -50,13 +50,13 @@ export function isPlainObject(value, isPlainJSON) {
   return Object.getPrototypeOf(value) === proto
 }
 
-export function isSameOrNewer(a, b) {
+export function isSameOrNewer (a, b) {
   const [av, ar] = splitRev(a)
   const [bv, br] = splitRev(b)
   return av > bv || (av === bv && ar >= br)
 }
 
-export function shallowCopy(obj) {
+export function shallowCopy (obj) {
   if (Array.isArray(obj)) {
     return obj.slice(0)
   }
@@ -69,7 +69,7 @@ export function shallowCopy(obj) {
   return copy
 }
 
-export function setTimeout(callback, timeoutDuration) {
+export function setTimeout (callback, timeoutDuration) {
   if (timeoutDuration !== null) {
     return globalThis.setTimeout(callback, timeoutDuration)
   } else {
@@ -77,7 +77,7 @@ export function setTimeout(callback, timeoutDuration) {
   }
 }
 
-export function setInterval(callback, intervalDuration) {
+export function setInterval (callback, intervalDuration) {
   if (intervalDuration !== null) {
     return setInterval(callback, intervalDuration)
   } else {
@@ -85,7 +85,7 @@ export function setInterval(callback, intervalDuration) {
   }
 }
 
-export function compareRev(a, b) {
+export function compareRev (a, b) {
   if (!a) {
     return b ? -1 : 0
   }
@@ -116,14 +116,14 @@ export function compareRev(a, b) {
 }
 
 export class AbortError extends Error {
-  constructor() {
+  constructor () {
     super('The operation was aborted')
     this.code = 'ABORT_ERR'
     this.name = 'AbortError'
   }
 }
 
-function defaultSchedule(fn) {
+function defaultSchedule (fn) {
   setTimeout(fn, 0)
 }
 
@@ -139,7 +139,7 @@ const onAbort = function () {
   }
 }
 
-export function addAbortListener(signal, handler) {
+export function addAbortListener (signal, handler) {
   if (!signal) {
     return
   }
@@ -157,7 +157,7 @@ export function addAbortListener(signal, handler) {
   }
 }
 
-export function removeAbortListener(signal, handler) {
+export function removeAbortListener (signal, handler) {
   if (!signal) {
     return
   }
@@ -175,7 +175,7 @@ export function removeAbortListener(signal, handler) {
   }
 }
 
-export function readBigUInt64BE(buf, offset = 0) {
+export function readBigUInt64BE (buf, offset = 0) {
   const first = buf[offset]
   const last = buf[offset + 7]