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

package/package.json

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

package/src/record/record-handler.js

@@ -393,11 +393,6 @@ class RecordHandler {
       let prevData = kEmpty
 
       const onUpdate = (record) => {
-        if (signal?.aborted) {
-          o.error(new utils.AbortError())
-          return
-        }
-
         if (state && record.state < state) {
           return
         }
@@ -443,8 +438,13 @@ class RecordHandler {
         onUpdate(record)
       }
 
+      const abort = signal ? () => o.error(new utils.AbortError()) : null
+
+      utils.addAbortListener(signal, abort)
+
       return () => {
         record.unsubscribe(onUpdate).unref()
+        utils.removeAbortListener(signal, abort)
       }
     })
   }

package/src/utils/utils.js

@@ -127,3 +127,45 @@ module.exports.AbortError = class AbortError extends Error {
 }
 
 module.exports.schedule = isNode ? setImmediate : window.requestIdleCallback
+
+const abortSignals = new WeakMap()
+const onAbort = function () {
+  const handlers = abortSignals.get(this)
+  if (handlers) {
+    for (const handler of handlers) {
+      handler()
+    }
+  }
+}
+
+module.exports.addAbortListener = function addAbortListener(signal, handler) {
+  if (!signal) {
+    return
+  }
+
+  let handlers = abortSignals.get(signal)
+  if (!handlers) {
+    handlers = []
+    abortSignals.set(signal, handlers)
+    signal.addEventListener('abort', onAbort)
+  }
+  handlers.push(handler)
+}
+
+module.exports.removeAbortListener = function removeAbortListener(signal, handler) {
+  if (!signal) {
+    return
+  }
+
+  const handlers = abortSignals.get(signal)
+  if (handlers) {
+    const index = handlers.indexOf(handler)
+    if (index !== -1) {
+      handlers.splice(index, 1)
+      if (handlers.length === 0) {
+        abortSignals.delete(signal)
+        signal.removeEventListener('abort', onAbort)
+      }
+    }
+  }
+}