@nxtedition/deepstream.io-client-js 24.0.7 → 24.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.0.7",
+  "version": "24.0.9",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "bugs": {

package/src/client.js

@@ -91,7 +91,8 @@ Client.prototype._$onMessage = function (message) {
 }
 
 Client.prototype._$onError = function (topic, event, msgOrError, data) {
-  const error = msgOrError && msgOrError.message ? msgOrError : new Error(msgOrError)
+  const error =
+    msgOrError && msgOrError.message ? msgOrError : new Error(msgOrError || 'unknown error')
   error.topic = topic
   error.event = event
   error.data = data

package/src/record/record-handler.js

@@ -158,7 +158,15 @@ class RecordHandler {
   }
 
   get stats() {
-    return this._stats
+    let subscriptions = 0
+    for (const listener of this._listeners.values()) {
+      subscriptions += listener.subscriptions ?? 0
+    }
+
+    return {
+      ...this._stats,
+      subscriptions,
+    }
   }
 
   /**
@@ -376,23 +384,23 @@ class RecordHandler {
     if (idx < args.length && (args[idx] == null || typeof args[idx] === 'object')) {
       const options = args[idx++] || {}
 
-      if (options.signal != null) {
+      if (options.signal !== undefined) {
         signal = options.signal
       }
 
-      if (options.timeout != null) {
+      if (options.timeout !== undefined) {
         timeout = options.timeout
       }
 
-      if (options.path != null) {
+      if (options.path !== undefined) {
         path = options.path
       }
 
-      if (options.state != null) {
+      if (options.state !== undefined) {
         state = options.state
       }
 
-      if (options.dataOnly != null) {
+      if (options.dataOnly !== undefined) {
         dataOnly = options.dataOnly
       }
     }
@@ -435,7 +443,7 @@ class RecordHandler {
 
       const record = (subscription.record = this.getRecord(name).subscribe(onUpdate, subscription))
 
-      if (timeout && state && record.state < state) {
+      if (timeout > 0 && state && record.state < state) {
         // TODO (perf): Avoid Timer allocation.
         subscription.timeout = timers.setTimeout(onTimeout, timeout, subscription)
       }

package/src/utils/multicast-listener.js

@@ -9,7 +9,7 @@ class Listener {
     this._handler = handler
     this._client = this._handler._client
     this._connection = this._handler._connection
-    this._providers = new Map()
+    this._subscriptions = new Map()
     this._recursive = recursive
     this._stringify = stringify || JSON.stringify
 
@@ -20,6 +20,12 @@ class Listener {
     return this._client.getConnectionState() === C.CONNECTION_STATE.OPEN
   }
 
+  get stats() {
+    return {
+      subscriptions: this._subscriptions.size,
+    }
+  }
+
   _$destroy() {
     this._reset()
 
@@ -42,7 +48,7 @@ class Listener {
     const name = message.data[1]
 
     if (message.action === C.ACTIONS.SUBSCRIPTION_FOR_PATTERN_FOUND) {
-      if (this._providers.has(name)) {
+      if (this._subscriptions.has(name)) {
         this._error(name, 'invalid add: listener exists')
         return
       }
@@ -175,9 +181,9 @@ class Listener {
 
       provider.start()
 
-      this._providers.set(provider.name, provider)
+      this._subscriptions.set(provider.name, provider)
     } else if (message.action === C.ACTIONS.LISTEN_ACCEPT) {
-      const provider = this._providers.get(name)
+      const provider = this._subscriptions.get(name)
       if (!provider?.value$) {
         return
       }
@@ -189,13 +195,13 @@ class Listener {
         provider.valueSubscription = provider.value$.subscribe(provider.observer)
       }
     } else if (message.action === C.ACTIONS.SUBSCRIPTION_FOR_PATTERN_REMOVED) {
-      const provider = this._providers.get(name)
+      const provider = this._subscriptions.get(name)
 
       if (!provider) {
         this._error(name, 'invalid remove: listener missing')
       } else {
         provider.stop()
-        this._providers.delete(provider.name)
+        this._subscriptions.delete(provider.name)
       }
     } else {
       return false
@@ -216,10 +222,10 @@ class Listener {
   }
 
   _reset() {
-    for (const provider of this._providers.values()) {
+    for (const provider of this._subscriptions.values()) {
       provider.stop()
     }
-    this._providers.clear()
+    this._subscriptions.clear()
   }
 }
 

package/src/utils/unicast-listener.js

@@ -43,6 +43,12 @@ class Listener {
     return this._client.getConnectionState() === C.CONNECTION_STATE.OPEN
   }
 
+  get stats() {
+    return {
+      subscriptions: this._subscriptions.size,
+    }
+  }
+
   _$destroy() {
     this._reset()