@nxtedition/deepstream.io-client-js 24.1.17 → 24.1.19

package/package.json

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

package/src/record/record.js

@@ -203,12 +203,42 @@ class Record {
 
       let timeoutHandle
 
+      const onDone = (err, val) => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve(val)
+        }
+
+        this.unref()
+        this.unsubscribe(onUpdate)
+
+        if (timeoutHandle) {
+          timers.clearTimeout(timeoutHandle)
+          timeoutHandle = null
+        }
+
+        signal?.removeEventListener('abort', onAbort)
+      }
+
+      const onUpdate = () => {
+        if (this._state >= state) {
+          onDone(null, null)
+        }
+      }
+
+      const onAbort = signal
+        ? (abort) => {
+            onDone(abort ?? new utils.AbortError())
+          }
+        : null
+
       if (timeout > 0) {
         timeoutHandle = timers.setTimeout(() => {
           const expected = C.RECORD_STATE_NAME[state]
           const current = C.RECORD_STATE_NAME[this._state]
 
-          reject(
+          onDone(
             Object.assign(new Error(`timeout  ${this.name} [${current}<${expected}]`), {
               code: 'ETIMEDOUT',
             })
@@ -216,21 +246,7 @@ class Record {
         }, timeout)
       }
 
-      const onUpdate = () => {
-        if (this._state < state) {
-          return
-        }
-
-        this.unref()
-        this.unsubscribe(onUpdate)
-
-        if (timeoutHandle) {
-          timers.clearTimeout(timeoutHandle)
-          timeoutHandle = null
-        }
-
-        resolve(null)
-      }
+      signal?.addEventListener('abort', onAbort)
 
       this.ref()
       this.subscribe(onUpdate)
@@ -249,7 +265,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]