@nxtedition/deepstream.io-client-js 23.4.60 → 24.0.0

package/package.json

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

package/src/record/record-handler.js

@@ -13,6 +13,46 @@ const timers = require('../utils/timers')
 
 const kEmpty = Symbol('kEmpty')
 
+function noop() {}
+
+function onUpdate(record, subscription) {
+  if (subscription.state && record.state < subscription.state) {
+    return
+  }
+
+  if (subscription.timeout) {
+    timers.clearTimeout(subscription.timeout)
+    subscription.timeout = null
+  }
+
+  const data = subscription.path ? record.get(subscription.path) : record.data
+
+  if (subscription.dataOnly) {
+    if (data !== subscription.data) {
+      subscription.data = data
+      subscription.subscriber.next(data)
+    }
+  } else {
+    subscription.subscriber.next({
+      name: record.name,
+      version: record.version,
+      state: record.state,
+      data,
+    })
+  }
+}
+
+function onTimeout(subscription) {
+  const expected = C.RECORD_STATE_NAME[subscription.state]
+  const current = C.RECORD_STATE_NAME[subscription.record.state]
+
+  subscription.subscriber.error(
+    Object.assign(new Error(`timeout  ${subscription.record.name} [${current}<${expected}]`), {
+      code: 'ETIMEDOUT',
+    })
+  )
+}
+
 class RecordHandler {
   constructor(options, connection, client) {
     this.JSON = jsonPath
@@ -261,7 +301,7 @@ class RecordHandler {
     let path
     let state = defaults ? defaults.state : undefined
     let signal
-    let timeoutValue = defaults ? defaults.timeout : undefined
+    let timeout = defaults ? defaults.timeout : undefined
     let dataOnly = defaults ? defaults.dataOnly : undefined
 
     let idx = 0
@@ -282,7 +322,7 @@ class RecordHandler {
       }
 
       if (options.timeout != null) {
-        timeoutValue = options.timeout
+        timeout = options.timeout
       }
 
       if (options.path != null) {
@@ -302,84 +342,52 @@ class RecordHandler {
       state = C.RECORD_STATE[state.toUpperCase()]
     }
 
-    if (!name) {
-      const data = path ? undefined : jsonPath.EMPTY
-      return rxjs.of(
-        dataOnly
-          ? data
-          : utils.deepFreeze({
-              name,
-              version: '0-00000000000000',
-              data,
-              state: Number.isFinite(state) ? state : C.RECORD_STATE.SERVER,
-            })
-      )
-    }
-
-    if (signal?.aborted) {
-      return rxjs.throwError(() => new utils.AbortError())
-    }
-
-    return new rxjs.Observable((o) => {
-      let timeoutHandle
-      let prevData = kEmpty
-
-      const onUpdate = (record) => {
-        if (state && record.state < state) {
-          return
-        }
-
-        if (timeoutHandle) {
-          timers.clearTimeout(timeoutHandle)
-          timeoutHandle = null
-        }
+    return new rxjs.Observable((subscriber) => {
+      const subscription = {
+        subscriber,
+        path,
+        state,
+        signal,
+        dataOnly,
+        data: kEmpty,
+        timeout: null,
+        abort: noop,
+        unsubscribe() {
+          if (this.timeout) {
+            timers.clearTimeout(this.timeout)
+            this.timeout = null
+          }
 
-        const nextData = path ? record.get(path) : record.data
+          if (this.ignal) {
+            utils.removeAbortListener(this.signal, this.abort)
+            this.signal = null
+            this.abort = noop
+          }
 
-        if (dataOnly) {
-          if (nextData !== prevData) {
-            prevData = nextData
-            o.next(nextData)
+          if (this.record) {
+            this.record.unsubscribe(onUpdate, this)
+            this.record.unref()
+            this.record = null
           }
-        } else {
-          o.next({
-            name: record.name,
-            version: record.version,
-            data: nextData,
-            state: record.state,
-          })
-        }
+        },
       }
 
-      const record = this.getRecord(name).subscribe(onUpdate)
-
-      if (timeoutValue && state && record.state < state) {
-        timeoutHandle = timers.setTimeout(() => {
-          const expected = C.RECORD_STATE_NAME[state]
-          const current = C.RECORD_STATE_NAME[record.state]
-          o.error(
-            Object.assign(
-              new Error(
-                `timeout after ${timeoutValue / 1e3}s: ${record.name} [${current}<${expected}]`
-              ),
-              { code: 'ETIMEDOUT' }
-            )
-          )
-        }, timeoutValue)
+      const record = this.getRecord(name).subscribe(onUpdate, subscription)
+
+      if (timeout && subscription.state && record.state < subscription.state) {
+        subscription.timeout = timers.setTimeout(onTimeout, timeout, subscription)
       }
 
       if (record.version) {
-        onUpdate(record)
+        onUpdate(record, subscription)
       }
 
-      const abort = signal ? () => o.error(new utils.AbortError()) : null
-
-      utils.addAbortListener(signal, abort)
-
-      return () => {
-        record.unsubscribe(onUpdate).unref()
-        utils.removeAbortListener(signal, abort)
+      if (subscription.signal) {
+        subscription.abort = () => subscription.subscriber.error(new utils.AbortError())
+        utils.addAbortListener(subscription.signal, subscription.abort)
       }
+
+      return subscription
     })
   }
 

package/src/record/record.js

@@ -53,43 +53,47 @@ class Record {
       this._handler._onPruning(this, false)
       this._subscribed = this._subscribed || this._sendMsg1(C.ACTIONS.SUBSCRIBE, this._name)
     }
-
     return this
   }
 
   unref() {
-    invariant(this._refs > 0, 'missing refs')
-    invariant(this._refs > 0 || !this._patching, 'must not have patches')
-    invariant(this._refs > 0 || this._state >= C.RECORD_STATE.SERVER, 'must be ready')
-
     this._refs -= 1
     if (this._refs === 0) {
       this._handler._onPruning(this, true)
     }
-
     return this
   }
 
-  subscribe(fn) {
+  subscribe(fn, opaque = null) {
     if (this._emitting) {
       this._subscriptions = this._subscriptions.slice()
       this._emitting = false
     }
 
-    this._subscriptions.push(fn)
+    this._subscriptions.push(fn, opaque)
 
     return this
   }
 
-  unsubscribe(fn) {
+  unsubscribe(fn, opaque = null) {
     if (this._emitting) {
       this._subscriptions = this._subscriptions.slice()
       this._emitting = false
     }
 
-    const idx = this._subscriptions.indexOf(fn)
+    let idx = -1
+
+    const arr = this._subscriptions
+    const len = arr.length
+    for (let n = 0; n < len; n += 2) {
+      if (arr[n + 0] === fn && arr[n + 1] === opaque) {
+        idx = n
+        break
+      }
+    }
+
     if (idx !== -1) {
-      this._subscriptions.splice(idx, 1)
+      this._subscriptions.splice(idx, 2)
     }
 
     return this
@@ -344,10 +348,10 @@ class Record {
 
     if (value) {
       this._patching = []
-      this._refs += 1
+      this.ref()
     } else {
       this._patching = null
-      this._refs -= 1
+      this.unref()
     }
 
     this._handler._onPatching(this, value)
@@ -358,10 +362,10 @@ class Record {
 
     if (value) {
       this._updating = new Map()
-      this._refs += 1
+      this.ref()
     } else {
       this._updating = null
-      this._refs -= 1
+      this.unref()
     }
 
     this._handler._onUpdating(this, value)
@@ -370,10 +374,10 @@ class Record {
   _onPending(value) {
     if (value) {
       this._pending = true
-      this._refs += 1
+      this.ref()
     } else {
       this._pending = false
-      this._refs -= 1
+      this.unref()
     }
 
     this._handler._onPending(this, value)
@@ -423,9 +427,12 @@ class Record {
   _emitUpdate() {
     this._emitting = true
     try {
-      for (const fn of this._subscriptions) {
+      const arr = this._subscriptions
+      const len = arr.length
+
+      for (let n = 0; n < len; n += 2) {
         try {
-          fn(this)
+          arr[n + 0](this, arr[n + 1])
         } catch (err) {
           this._error(
             C.EVENT.USER_ERROR,

package/src/utils/utils.js

@@ -143,13 +143,17 @@ module.exports.addAbortListener = function addAbortListener(signal, handler) {
     return
   }
 
-  let handlers = abortSignals.get(signal)
-  if (!handlers) {
-    handlers = []
-    abortSignals.set(signal, handlers)
-    signal.addEventListener('abort', onAbort)
+  if (signal.aborted) {
+    queueMicrotask(handler)
+  } else {
+    let handlers = abortSignals.get(signal)
+    if (!handlers) {
+      handlers = []
+      abortSignals.set(signal, handlers)
+      signal.addEventListener('abort', onAbort)
+    }
+    handlers.push(handler)
   }
-  handlers.push(handler)
 }
 
 module.exports.removeAbortListener = function removeAbortListener(signal, handler) {