@nxtedition/deepstream.io-client-js 32.0.3 → 32.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "32.0.3",
+  "version": "32.0.4",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",

package/src/record/record-handler.js

@@ -95,6 +95,8 @@ function onTimeout(subscription) {
 }
 
 class Subscription {
+  /** @type {unknown} */
+  key = null
   /** @type {unknown} */
   subscriber = null
   /** @type {unknown} */
@@ -597,6 +599,7 @@ class RecordHandler {
     let timeout = defaults?.timeout ?? 0
     let dataOnly = defaults?.dataOnly ?? false
     let sync = defaults?.sync ?? false
+    let key
 
     let idx = 0
 
@@ -640,6 +643,10 @@ class RecordHandler {
       if (options.sync !== undefined) {
         sync = options.sync
       }
+
+      if (options.key !== undefined) {
+        key = options.key
+      }
     }
 
     if (typeof state === 'string') {
@@ -670,6 +677,7 @@ class RecordHandler {
 
       const subscription = new Subscription()
 
+      subscription.key = key
       subscription.subscriber = subscriber
       subscription.path = path
       subscription.state = state

package/src/record/record.js

@@ -19,14 +19,17 @@ class Record {
     this._data = jsonPath.EMPTY_OBJ
     this._state = C.RECORD_STATE.VOID
     this._refs = 1
-    this._subscriptions = []
+
+    /** @type {Array|null} */
+    this._subscriptions = null
 
     /** @type {Array|null} */
     this._emittingArr = null
     /** @type {number} */
     this._emittingIndex = -1
 
-    this._observers = []
+    /** @type {Array|null} */
+    this._observers = null
 
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
@@ -94,6 +97,8 @@ class Record {
    * @returns {Record}
    */
   subscribe(fn, opaque = null) {
+    this._subscriptions ??= []
+
     if (this._emittingArr == this._subscriptions) {
       this._subscriptions = this._subscriptions.slice()
     }
@@ -110,6 +115,10 @@ class Record {
    * @returns {Record}
    */
   unsubscribe(fn, opaque = null) {
+    if (!this._subscriptions) {
+      return this
+    }
+
     if (this._emittingArr == this._subscriptions) {
       this._subscriptions = this._subscriptions.slice()
     }
@@ -137,6 +146,8 @@ class Record {
    * @param {{ index: number, onUpdate: (Record) => void}} subscription
    */
   _observe(subscription) {
+    this._observers ??= []
+
     if (subscription.index != null && subscription.index !== -1) {
       throw new Error('already observing')
     }
@@ -153,6 +164,10 @@ class Record {
    * @param {{ index: number, onUpdate: (Record) => void}} subscription
    */
   _unobserve(subscription) {
+    if (!this._observers) {
+      return this
+    }
+
     if (subscription.index == null || subscription.index === -1) {
       throw new Error('not observing')
     }
@@ -242,6 +257,7 @@ class Record {
     const signal = optionsOrNil?.signal
     const state = stateOrNil ?? C.RECORD_STATE.SERVER
     const timeout = optionsOrNil?.timeout ?? 2 * 60e3
+    const key = optionsOrNil?.key ?? 'when'
 
     if (signal?.aborted) {
       return Promise.reject(signal.reason || new utils.AbortError())
@@ -257,9 +273,34 @@ class Record {
         return
       }
 
-      let timeoutHandle
+      const subscription = {
+        key,
+        /** @type {timers.Timeout|NodeJS.Timeout|null} */
+        timeout: null,
+        /** @type {AbortSignal|null} */
+        signal: null,
+        done: false,
+
+        state,
+        index: -1,
+        onUpdate(record, subscription) {
+          if (record._state >= subscription.state) {
+            onDone(null)
+          }
+        },
+      }
+
+      const onAbort = (e) => {
+        onDone(signal.reason ?? new utils.AbortError())
+      }
 
       const onDone = (err) => {
+        if (subscription.done) {
+          return
+        }
+
+        subscription.done = true
+
         if (err) {
           reject(err)
         } else {
@@ -267,30 +308,21 @@ class Record {
         }
 
         this.unref()
-        this.unsubscribe(onUpdate)
+        this._unobserve(subscription)
 
-        if (timeoutHandle) {
-          timers.clearTimeout(timeoutHandle)
-          timeoutHandle = null
+        if (subscription.timeout != null) {
+          timers.clearTimeout(subscription.timeout)
+          subscription.timeout = null
         }
 
-        signal?.removeEventListener('abort', onAbort)
-      }
-
-      const onUpdate = () => {
-        if (this._state >= state) {
-          onDone(null)
+        if (subscription.signal != null) {
+          subscription.signal.removeEventListener('abort', onAbort)
+          subscription.signal = null
         }
       }
 
-      const onAbort = signal
-        ? () => {
-            onDone(signal.reason ?? new utils.AbortError())
-          }
-        : null
-
       if (timeout > 0) {
-        timeoutHandle = timers.setTimeout(() => {
+        subscription.timeout = timers.setTimeout(() => {
           const expected = C.RECORD_STATE_NAME[state]
           const current = C.RECORD_STATE_NAME[this._state]
 
@@ -302,10 +334,13 @@ class Record {
         }, timeout)
       }
 
-      signal?.addEventListener('abort', onAbort)
+      if (signal) {
+        subscription.signal = signal
+        signal?.addEventListener('abort', onAbort)
+      }
 
       this.ref()
-      this.subscribe(onUpdate)
+      this._observe(subscription)
     })
   }