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

package/package.json

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

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,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])
@@ -105,27 +105,25 @@ class Listener {
         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()