@nxtedition/deepstream.io-client-js 24.1.16 → 24.1.18

package/package.json

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

package/src/record/record.js

@@ -175,8 +175,7 @@ class Record {
     }
   }
 
-  // TODO (fix): timeout + signal
-  async when(stateOrNil, optionsOrNil) {
+  when(stateOrNil, optionsOrNil) {
     invariant(this._refs > 0, 'missing refs')
 
     if (stateOrNil != null && stateOrNil === 'object') {
@@ -188,11 +187,15 @@ class Record {
     const state = stateOrNil ?? C.RECORD_STATE.SERVER
     const timeout = optionsOrNil?.timeout ?? 2 * 60e3
 
+    if (signal?.aborted) {
+      return Promise.reject(signal.reason || new utils.AbortError())
+    }
+
     if (!Number.isFinite(state) || state < 0) {
-      throw new Error('invalid argument: state')
+      return Promise.reject(new Error('invalid argument: state'))
     }
 
-    await new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       if (this._state >= state) {
         resolve(null)
         return
@@ -232,8 +235,6 @@ class Record {
       this.ref()
       this.subscribe(onUpdate)
     })
-
-    signal?.throwIfAborted()
   }
 
   update(...args) {
@@ -248,7 +249,7 @@ class Record {
       return Promise.resolve()
     }
 
-    const options = args.at(-1) === 'object' ? args.pop() : null
+    const options = args.at(-1) != null && typeof args.at(-1) === 'object' ? args.pop() : null
     const path = args.length === 1 ? undefined : args[0]
     const updater = args.length === 1 ? args[0] : args[1]
 
@@ -264,6 +265,10 @@ class Record {
       throw new Error('invalid argument: path')
     }
 
+    if (options?.signal?.aborted) {
+      return Promise.reject(options.signal.reason || new utils.AbortError())
+    }
+
     this.ref()
     return this.when(C.RECORD_STATE.SERVER, options)
       .then(() => {