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

package/package.json

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

package/src/message/connection.js

@@ -318,11 +318,14 @@ Connection.prototype._setState = function (state) {
     return
   }
   this._state = state
+  this.emit(C.EVENT.CONNECTION_STATE_CHANGED, state)
   this._client.emit(C.EVENT.CONNECTION_STATE_CHANGED, state)
 
   if (state === C.CONNECTION_STATE.OPEN) {
+    this.emit(C.EVENT.CONNECTED, true)
     this._client.emit(C.EVENT.CONNECTED, true)
   } else if (state === C.CONNECTION_STATE.RECONNECTING || state === C.CONNECTION_STATE.CLOSED) {
+    this.emit(C.EVENT.CONNECTED, false)
     this._client.emit(C.EVENT.CONNECTED, false)
   }
 }

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/multicast-listener.js

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

package/src/utils/unicast-listener.js

@@ -2,8 +2,34 @@ const C = require('../constants/constants')
 const rx = require('rxjs/operators')
 const rxjs = require('rxjs')
 
+const PIPE = rxjs.pipe(
+  rx.map((value) => {
+    let data
+    if (value && typeof value === 'string') {
+      if (value.charAt(0) !== '{' && value.charAt(0) !== '[') {
+        throw new Error(`invalid value: ${value}`)
+      }
+      data = value
+    } else if (value && typeof value === 'object') {
+      data = JSON.stringify(value)
+    } else if (data != null) {
+      throw new Error(`invalid value: ${value}`)
+    }
+
+    return data
+  }),
+  rx.distinctUntilChanged()
+)
+
 class Listener {
-  constructor(topic, pattern, callback, handler, { stringify = null, recursive = false } = {}) {
+  constructor(topic, pattern, callback, handler, opts) {
+    if (opts.recursive) {
+      throw new Error('invalid argument: recursive')
+    }
+    if (opts.stringify) {
+      throw new Error('invalid argument: stringify')
+    }
+
     this._topic = topic
     this._pattern = pattern
     this._callback = callback
@@ -11,36 +37,12 @@ class Listener {
     this._client = this._handler._client
     this._connection = this._handler._connection
     this._subscriptions = new Map()
-    this._stringify = stringify || JSON.stringify
-
-    this._pipe = rxjs.pipe(
-      rx.map((value) => {
-        let data
-        if (value && typeof value === 'string') {
-          if (value.charAt(0) !== '{' && value.charAt(0) !== '[') {
-            throw new Error(`invalid value: ${value}`)
-          }
-          data = value
-        } else if (value && typeof value === 'object') {
-          data = this._stringify(value)
-        } else if (data != null) {
-          throw new Error(`invalid value: ${value}`)
-        }
-
-        return data
-      }),
-      rx.distinctUntilChanged()
-    )
-
-    this._$onConnectionStateChange()
-
-    if (recursive) {
-      throw new Error('invalid argument: recursive')
-    }
+
+    this._$onConnectionStateChange(this._connection.connected)
   }
 
   get connected() {
-    return this._client.getConnectionState() === C.CONNECTION_STATE.OPEN
+    return this._connection.connected
   }
 
   get stats() {
@@ -84,7 +86,7 @@ class Listener {
       }
 
       if (value$) {
-        const subscription = value$.pipe(this._pipe).subscribe({
+        const subscription = value$.pipe(PIPE).subscribe({
           next: (data) => {
             if (data == null) {
               this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
@@ -122,8 +124,8 @@ class Listener {
     return true
   }
 
-  _$onConnectionStateChange() {
-    if (this.connected) {
+  _$onConnectionStateChange(connected) {
+    if (connected) {
       this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern, 'U'])
     } else {
       this._reset()