@nxtedition/deepstream.io-client-js 24.1.0 → 24.1.1

package/package.json

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

package/src/record/record.js

@@ -10,6 +10,8 @@ class Record {
   static STATE = C.RECORD_STATE
 
   constructor(name, handler) {
+    const connection = handler._connection
+
     this._handler = handler
 
     this._name = name
@@ -21,7 +23,7 @@ class Record {
     this._emitting = false
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
-    this._subscribed = this._sendMsg1(C.ACTIONS.SUBSCRIBE, this._name)
+    this._subscribed = connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
   }
 
   /** @type {string} */
@@ -53,10 +55,13 @@ class Record {
    * @returns {Record}
    */
   ref() {
+    const connection = this._handler._connection
+
     this._refs += 1
     if (this._refs === 1) {
       this._handler._onPruning(this, false)
-      this._subscribed = this._subscribed || this._sendMsg1(C.ACTIONS.SUBSCRIBE, this._name)
+      this._subscribed =
+        this._subscribed || connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
     }
     return this
   }
@@ -261,12 +266,15 @@ class Record {
   }
 
   _$onConnectionStateChange(connected) {
+    const connection = this._handler._connection
+
     if (connected) {
-      this._subscribed = this._refs > 0 && this._sendMsg1(C.ACTIONS.SUBSCRIBE, this._name)
+      this._subscribed =
+        this._refs > 0 && connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
 
       if (this._updating) {
         for (const update of this._updating.values()) {
-          this._sendMsg1(C.ACTIONS.UPDATE, update)
+          connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, update)
         }
       }
     } else {
@@ -280,12 +288,14 @@ class Record {
   }
 
   _$dispose() {
+    const connection = this._handler._connection
+
     invariant(!this._refs, 'must not have refs')
     invariant(!this._patching, 'must not have patches')
     invariant(!this._updating, 'must not have updates')
 
     if (this._subscribed) {
-      this._sendMsg1(C.ACTIONS.UNSUBSCRIBE, this._name)
+      connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, this._name)
       this._subscribed = false
     }
 
@@ -414,10 +424,6 @@ class Record {
     }
   }
 
-  _sendMsg1(action, data) {
-    return this._handler._connection.sendMsg1(C.TOPIC.RECORD, action, data)
-  }
-
   _error(event, msgOrError, data) {
     this._handler._client._$onError(C.TOPIC.RECORD, event, msgOrError, [
       ...(Array.isArray(data) ? data : []),

package/src/utils/unicast-listener.js

@@ -10,6 +10,7 @@ class Listener {
     this._handler = handler
     this._client = this._handler._client
     this._connection = this._handler._connection
+    this._connected = false
     this._subscriptions = new Map()
     this._stringify = stringify || JSON.stringify
 
@@ -39,10 +40,6 @@ class Listener {
     }
   }
 
-  get connected() {
-    return this._client.getConnectionState() === C.CONNECTION_STATE.OPEN
-  }
-
   get stats() {
     return {
       subscriptions: this._subscriptions.size,
@@ -52,13 +49,13 @@ class Listener {
   _$destroy() {
     this._reset()
 
-    if (this.connected) {
+    if (this._connected) {
       this._connection.sendMsg(this._topic, C.ACTIONS.UNLISTEN, [this._pattern])
     }
   }
 
   _$onMessage(message) {
-    if (!this.connected) {
+    if (!this._connected) {
       this._client._$onError(
         C.TOPIC.RECORD,
         C.EVENT.NOT_CONNECTED,
@@ -122,8 +119,10 @@ class Listener {
     return true
   }
 
-  _$onConnectionStateChange() {
-    if (this.connected) {
+  _$onConnectionStateChange(connected) {
+    this._connected = connected
+
+    if (connected) {
       this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern, 'U'])
     } else {
       this._reset()