@nxtedition/deepstream.io-client-js 24.1.3 → 24.1.5

package/package.json

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

package/src/utils/multicast-listener.js

@@ -13,7 +13,7 @@ class Listener {
     this._recursive = recursive
     this._stringify = stringify || JSON.stringify
 
-    this._$onConnectionStateChange(this._connection.connected)
+    this._$onConnectionStateChange()
   }
 
   get connected() {
@@ -209,8 +209,8 @@ class Listener {
     return true
   }
 
-  _$onConnectionStateChange(connected) {
-    if (connected) {
+  _$onConnectionStateChange() {
+    if (this.connected) {
       this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern])
     } else {
       this._reset()

package/src/utils/unicast-listener.js

@@ -38,7 +38,7 @@ class Listener {
     this._connection = this._handler._connection
     this._subscriptions = new Map()
 
-    this._$onConnectionStateChange(this._connection.connected)
+    this._$onConnectionStateChange()
   }
 
   get connected() {
@@ -90,8 +90,8 @@ class Listener {
           next: (data) => {
             if (data == null) {
               this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
+              this._subscriptions.delete(name)
               subscription.unsubscribe()
-              this._subscriptions.set(name, null)
             } else {
               const version = `INF-${this._connection.hasher.h64ToString(data)}`
               this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [name, version, data])
@@ -100,32 +100,31 @@ class Listener {
           error: (err) => {
             this._error(name, err)
             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, name])
-        this._subscriptions.set(name, null)
+        this._subscriptions.delete(name)
       }
     } else if (message.action === C.ACTIONS.LISTEN_REJECT) {
-      if (!this._subscriptions.has(name)) {
-        this._error(name, 'invalid remove: listener missing')
-        return
-      }
-
       const subscription = this._subscriptions.get(name)
 
-      subscription?.unsubscribe()
-
-      this._subscriptions.delete(name)
+      if (subscription) {
+        this._subscriptions.delete(name)
+        subscription.unsubscribe()
+      } else {
+        this._error(name, 'invalid remove: listener missing')
+      }
     } else {
       return false
     }
     return true
   }
 
-  _$onConnectionStateChange(connected) {
-    if (connected) {
+  _$onConnectionStateChange() {
+    if (this.connected) {
       this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern, 'U'])
     } else {
       this._reset()