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

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'
@@ -12,7 +12,7 @@ import * as timers from '../utils/timers.js'
 class Record {
   static STATE = C.RECORD_STATE
 
-  constructor(key, name, handler) {
+  constructor (key, name, handler) {
     this._handler = handler
     this._name = name
     this._key = key
@@ -28,40 +28,35 @@ class Record {
     this._subscribed = false
   }
 
-  /** @type {bigint} */
-  get key() {
-    return this._key
-  }
-
   /** @type {string} */
-  get name() {
+  get name () {
     return this._name
   }
 
   /** @type {string} */
-  get version() {
+  get version () {
     return this._version
   }
 
   /** @type {Object} */
-  get data() {
+  get data () {
     return this._data
   }
 
   /** @type {Number} */
-  get state() {
+  get state () {
     return this._state
   }
 
   /** @type {Number} */
-  get refs() {
+  get refs () {
     return this._refs
   }
 
   /**
    * @returns {Record}
    */
-  ref() {
+  ref () {
     const connection = this._handler._connection
 
     this._refs += 1
@@ -77,7 +72,7 @@ class Record {
   /**
    * @returns {Record}
    */
-  unref() {
+  unref () {
     this._refs -= 1
     if (this._refs === 0) {
       this._handler._onPruning(this, true)
@@ -90,7 +85,7 @@ class Record {
    * @param {*} opaque
    * @returns {Record}
    */
-  subscribe(fn, opaque = null) {
+  subscribe (fn, opaque = null) {
     if (this._emitting) {
       this._subscriptions = this._subscriptions.slice()
       this._emitting = false
@@ -107,7 +102,7 @@ class Record {
    * @param {*} opaque
    * @returns {Record}
    */
-  unsubscribe(fn, opaque = null) {
+  unsubscribe (fn, opaque = null) {
     if (this._emitting) {
       this._subscriptions = this._subscriptions.slice()
       this._emitting = false
@@ -131,7 +126,7 @@ class Record {
     return this
   }
 
-  get(path) {
+  get (path) {
     if (!path) {
       return this._data
     } else if (typeof path === 'string' || Array.isArray(path)) {
@@ -143,7 +138,7 @@ class Record {
     }
   }
 
-  set(pathOrData, dataOrNil) {
+  set (pathOrData, dataOrNil) {
     const prevData = this._data
     const prevVersion = this._version
 
@@ -190,7 +185,7 @@ class Record {
     }
   }
 
-  when(stateOrNil, optionsOrNil) {
+  when (stateOrNil, optionsOrNil) {
     invariant(this._refs > 0, 'missing refs')
 
     if (stateOrNil != null && stateOrNil === 'object') {
@@ -255,8 +250,8 @@ class Record {
 
           onDone(
             Object.assign(new Error(`timeout  ${this.name} [${current}<${expected}]`), {
-              code: 'ETIMEDOUT',
-            }),
+              code: 'ETIMEDOUT'
+            })
           )
         }, timeout)
       }
@@ -268,14 +263,14 @@ class Record {
     })
   }
 
-  update(...args) {
+  update (...args) {
     invariant(this._refs > 0, 'missing refs')
 
     if (this._version.charAt(0) === 'I') {
       this._handler._client._$onError(C.TOPIC.RECORD, C.EVENT.UPDATE_ERROR, 'cannot update', [
         this._name,
         this._version,
-        this._state,
+        this._state
       ])
       return Promise.resolve()
     }
@@ -314,7 +309,7 @@ class Record {
       })
   }
 
-  _$onMessage(message) {
+  _$onMessage (message) {
     if (message.action === C.ACTIONS.UPDATE) {
       this._onUpdate(message.data)
     } else if (message.action === C.ACTIONS.SUBSCRIPTION_HAS_PROVIDER) {
@@ -326,7 +321,7 @@ class Record {
     return true
   }
 
-  _$onConnectionStateChange(connected) {
+  _$onConnectionStateChange (connected) {
     const connection = this._handler._connection
 
     if (connected) {
@@ -349,7 +344,7 @@ class Record {
     }
   }
 
-  _$dispose() {
+  _$dispose () {
     const connection = this._handler._connection
 
     invariant(!this._refs, 'must not have refs')
@@ -367,7 +362,7 @@ class Record {
     }
   }
 
-  _update(nextData) {
+  _update (nextData) {
     invariant(this._version, 'must have version')
 
     const connection = this._handler._connection
@@ -397,7 +392,7 @@ class Record {
     this._version = nextVersion
   }
 
-  _onUpdate([, version, data, hasProvider]) {
+  _onUpdate ([, version, data]) {
     const prevData = this._data
     const prevVersion = this._version
     const prevState = this._state
@@ -434,20 +429,12 @@ 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)
-        ? C.RECORD_STATE.PROVIDER
-        : this._version.charAt(0) === 'I'
-          ? C.RECORD_STATE.STALE
-          : C.RECORD_STATE.SERVER
-    }
-
     if (this._state !== prevState || this._data !== prevData || this._version !== prevVersion) {
       this._emitUpdate()
     }
   }
 
-  _onPatching(value) {
+  _onPatching (value) {
     invariant(this._refs > 0, 'missing refs')
 
     if (value) {
@@ -461,7 +448,7 @@ class Record {
     this._handler._onPatching(this, value)
   }
 
-  _onUpdating(value) {
+  _onUpdating (value) {
     invariant(this._refs > 0, 'missing refs')
 
     if (value) {
@@ -475,7 +462,7 @@ class Record {
     this._handler._onUpdating(this, value)
   }
 
-  _onSubscriptionHasProvider([, hasProvider]) {
+  _onSubscriptionHasProvider ([, hasProvider]) {
     if (this._state < C.RECORD_STATE.SERVER) {
       return
     }
@@ -483,7 +470,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
@@ -494,16 +481,16 @@ class Record {
     }
   }
 
-  _error(event, msgOrError, data) {
+  _error (event, msgOrError, data) {
     this._handler._client._$onError(C.TOPIC.RECORD, event, msgOrError, [
       ...(Array.isArray(data) ? data : []),
       this._name,
       this._version,
-      this._state,
+      this._state
     ])
   }
 
-  _makeVersion(start) {
+  _makeVersion (start) {
     let revid = `${xuid()}-${this._handler._client.user || ''}`
     if (revid.length === 32 || revid.length === 16) {
       // HACK: https://github.com/apache/couchdb/issues/2015
@@ -512,7 +499,7 @@ class Record {
     return `${start}-${revid}`
   }
 
-  _emitUpdate() {
+  _emitUpdate () {
     this._emitting = true
 
     const arr = this._subscriptions
@@ -534,58 +521,58 @@ Record.prototype.destroy = Record.prototype.unref
 
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'connected', {
-  get: function connected() {
+  get: function connected () {
     return this._handler._client.getConnectionState() === C.CONNECTION_STATE.OPEN
-  },
+  }
 })
 
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'empty', {
-  get: function empty() {
+  get: function empty () {
     return Object.keys(this.data).length === 0
-  },
+  }
 })
 
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'ready', {
-  get: function ready() {
+  get: function ready () {
     return this._state >= C.RECORD_STATE.SERVER
-  },
+  }
 })
 
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'provided', {
-  get: function provided() {
+  get: function provided () {
     return this.state >= C.RECORD_STATE.PROVIDER
-  },
+  }
 })
 
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'usages', {
-  get: function usages() {
+  get: function usages () {
     return this._refs
-  },
+  }
 })
 
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'stale', {
-  get: function ready() {
+  get: function ready () {
     return !this.version
-  },
+  }
 })
 
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'isReady', {
-  get: function isReady() {
+  get: function isReady () {
     return this._state >= C.RECORD_STATE.SERVER
-  },
+  }
 })
 
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'hasProvider', {
-  get: function hasProvider() {
+  get: function hasProvider () {
     return this.state >= C.RECORD_STATE.PROVIDER
-  },
+  }
 })
 
 export default Record

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 {