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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.1.1",
+  "version": "24.1.3",
   "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

@@ -5,6 +5,7 @@ const messageParser = require('../message/message-parser')
 const xuid = require('xuid')
 const invariant = require('invariant')
 const cloneDeep = require('lodash.clonedeep')
+const timers = require('../utils/timers')
 
 class Record {
   static STATE = C.RECORD_STATE
@@ -185,17 +186,33 @@ class Record {
 
     const signal = optionsOrNil?.signal
     const state = stateOrNil ?? C.RECORD_STATE.SERVER
+    const timeout = optionsOrNil?.timeout ?? 2 * 60e3
 
     if (!Number.isFinite(state) || state < 0) {
       throw new Error('invalid argument: state')
     }
 
-    await new Promise((resolve) => {
+    await new Promise((resolve, reject) => {
       if (this._state >= state) {
         resolve(null)
         return
       }
 
+      let timeoutHandle
+
+      if (timeout > 0) {
+        timeoutHandle = timers.setTimeout(() => {
+          const expected = C.RECORD_STATE_NAME[state]
+          const current = C.RECORD_STATE_NAME[this._state]
+
+          reject(
+            Object.assign(new Error(`timeout  ${this.name} [${current}<${expected}]`), {
+              code: 'ETIMEDOUT',
+            })
+          )
+        }, timeout)
+      }
+
       const onUpdate = () => {
         if (this._state < state) {
           return
@@ -204,6 +221,11 @@ class Record {
         this.unref()
         this.unsubscribe(onUpdate)
 
+        if (timeoutHandle) {
+          timers.clearTimeout(timeoutHandle)
+          timeoutHandle = null
+        }
+
         resolve(null)
       }
 

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,42 +2,47 @@ 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
     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
-
-    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._connection.connected
   }
 
   get stats() {
@@ -49,13 +54,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,
@@ -81,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])
@@ -120,8 +125,6 @@ class Listener {
   }
 
   _$onConnectionStateChange(connected) {
-    this._connected = connected
-
     if (connected) {
       this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN, [this._pattern, 'U'])
     } else {