@nxtedition/deepstream.io-client-js 23.4.21 → 23.4.23

package/package.json

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

package/src/record/record-handler.js

@@ -345,7 +345,9 @@ class RecordHandler {
     if (idx < args.length && (args[idx] == null || typeof args[idx] === 'object')) {
       const options = args[idx++] || {}
 
-      signal = options.signal
+      if (options.signal != null) {
+        signal = options.signal
+      }
 
       if (options.timeout != null) {
         timeoutValue = options.timeout
@@ -391,6 +393,11 @@ class RecordHandler {
       let prevData = kEmpty
 
       const onUpdate = (record) => {
+        if (signal?.aborted) {
+          o.error(new utils.AbortError())
+          return
+        }
+
         if (state && record.state < state) {
           return
         }
@@ -436,15 +443,8 @@ class RecordHandler {
         onUpdate(record)
       }
 
-      const abort = () => {
-        o.error(new utils.AbortError())
-      }
-
-      signal?.addEventListener('abort', abort)
-
       return () => {
         record.unsubscribe(onUpdate).unref()
-        signal?.removeEventListener('abort', abort)
       }
     })
   }