@nxtedition/deepstream.io-client-js 32.0.25 → 32.0.27

package/package.json

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

package/src/message/connection.js

@@ -103,11 +103,15 @@ Connection.prototype._createEndpoint = function () {
     this._endpoint = new BrowserWebSocket(this._url)
     this._endpoint.binaryType = 'arraybuffer'
     this._endpoint.onmessage = ({ data }) => {
-      let buf = new Uint8Array(data)
-      if (buf[0] > 128) {
-        buf = buf.subarray(buf[0] - 128)
+      if (typeof data === 'string') {
+        this._onMessage(data)
+      } else {
+        let buf = new Uint8Array(data)
+        if (buf[0] > 128) {
+          buf = buf.subarray(buf[0] - 128)
+        }
+        this._onMessage(decoder.decode(buf))
       }
-      this._onMessage(decoder.decode(buf))
     }
   }
 
@@ -147,10 +151,11 @@ Connection.prototype.send = function (message) {
   }
 
   if (this._endpoint._socket && !this._corked) {
-    this._endpoint._socket.cork()
+    const socket = this._endpoint._socket
     this._corked = true
+    socket.cork()
     setTimeout(() => {
-      this._endpoint._socket.uncork()
+      socket.uncork()
       this._corked = false
     }, 1)
   }

package/src/record/record-handler.js

@@ -43,17 +43,10 @@ function onUpdate(record, subscription) {
   }
 
   if (!subscription.synced || subscription.record.state < subscription.state) {
-    if (subscription.timeoutValue > 0) {
-      if (!subscription.timeout) {
-        subscription.timeout = timers.setTimeout(onTimeout, subscription.timeoutValue, subscription)
-      } else {
-        subscription.timeout.refresh()
-      }
-    }
     return
   }
 
-  if (subscription.timeout) {
+  if (subscription.timeout != null) {
     timers.clearTimeout(subscription.timeout)
     subscription.timeout = null
   }
@@ -78,6 +71,10 @@ function onUpdate(record, subscription) {
 }
 
 function onTimeout(subscription) {
+  if (!subscription.record) {
+    return
+  }
+
   const expected = C.RECORD_STATE_NAME[subscription.state]
   const current = C.RECORD_STATE_NAME[subscription.record.state]
 
@@ -429,7 +426,7 @@ class RecordHandler {
       throw new Error('invalid argument: data')
     }
 
-    if (parent != null && (typeof version !== 'string' || !/^\d+-/.test(version))) {
+    if (parent != null && (typeof parent !== 'string' || !/^\d+-/.test(parent))) {
       throw new Error('invalid argument: parent')
     }
 
@@ -623,6 +620,11 @@ class RecordHandler {
     }
 
     return new rxjs.Observable((subscriber) => {
+      if (signal?.aborted) {
+        subscriber.error(new utils.AbortError())
+        return
+      }
+
       // TODO (perf): Make a class
       const subscription = {
         /** @readonly @type {unknown} */
@@ -685,6 +687,10 @@ class RecordHandler {
       } else {
         onSync(subscription)
       }
+
+      if (timeout > 0 && (!subscription.synced || subscription.record.state < subscription.state)) {
+        subscription.timeout = timers.setTimeout(onTimeout, timeout, subscription)
+      }
     })
   }
 

package/src/record/record.js

@@ -19,14 +19,16 @@ class Record {
     this._data = jsonPath.EMPTY
     this._state = C.RECORD_STATE.VOID
     this._refs = 0
-    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 +96,8 @@ class Record {
    * @returns {Record}
    */
   subscribe(fn, opaque = null) {
+    this._subscriptions ??= []
+
     if (this._emittingArr == this._subscriptions) {
       this._subscriptions = this._subscriptions.slice()
     }
@@ -110,6 +114,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 +145,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')
     }
@@ -148,6 +158,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')
     }
@@ -229,7 +243,7 @@ class Record {
   when(stateOrNil, optionsOrNil) {
     invariant(this._refs > 0, 'missing refs')
 
-    if (stateOrNil != null && stateOrNil === 'object') {
+    if (stateOrNil != null && typeof stateOrNil === 'object') {
       optionsOrNil = stateOrNil
       stateOrNil = optionsOrNil?.state
     }
@@ -252,9 +266,26 @@ class Record {
         return
       }
 
-      let timeoutHandle
+      const context = {
+        name: 'when',
+        /** @type {timers.Timeout|NodeJS.Timeout|null} */
+        timeout: null,
+        /** @type {AbortSignal|null} */
+        signal: null,
+        done: false,
+      }
+
+      const onAbort = (e) => {
+        onDone(signal.reason ?? new utils.AbortError())
+      }
 
       const onDone = (err) => {
+        if (context.done) {
+          return
+        }
+
+        context.done = true
+
         if (err) {
           reject(err)
         } else {
@@ -262,14 +293,17 @@ class Record {
         }
 
         this.unref()
-        this.unsubscribe(onUpdate)
+        this.unsubscribe(onUpdate, context)
 
-        if (timeoutHandle) {
-          timers.clearTimeout(timeoutHandle)
-          timeoutHandle = null
+        if (context.timeout != null) {
+          timers.clearTimeout(context.timeout)
+          context.timeout = null
         }
 
-        signal?.removeEventListener('abort', onAbort)
+        if (context.signal != null) {
+          context.signal.removeEventListener('abort', onAbort)
+          context.signal = null
+        }
       }
 
       const onUpdate = () => {
@@ -278,14 +312,8 @@ class Record {
         }
       }
 
-      const onAbort = signal
-        ? () => {
-            onDone(signal.reason ?? new utils.AbortError())
-          }
-        : null
-
       if (timeout > 0) {
-        timeoutHandle = timers.setTimeout(() => {
+        context.timeout = timers.setTimeout(() => {
           const expected = C.RECORD_STATE_NAME[state]
           const current = C.RECORD_STATE_NAME[this._state]
 
@@ -297,10 +325,13 @@ class Record {
         }, timeout)
       }
 
-      signal?.addEventListener('abort', onAbort)
+      if (signal) {
+        context.signal = signal
+        signal?.addEventListener('abort', onAbort)
+      }
 
       this.ref()
-      this.subscribe(onUpdate)
+      this.subscribe(onUpdate, context)
     })
   }
 
@@ -558,34 +589,38 @@ class Record {
       throw new Error('cannot reenter emitUpdate')
     }
 
-    try {
-      const arr = this._subscriptions
-      const len = arr.length
-
-      this._emittingArr = arr
-      for (let n = 0; n < len; n += 2) {
-        this._emittingIndex = n
-        // TODO (fix): What if this throws?
-        arr[n + 0](this, arr[n + 1])
+    if (this._subscriptions != null) {
+      try {
+        const arr = this._subscriptions
+        const len = arr.length
+
+        this._emittingArr = arr
+        for (let n = 0; n < len; n += 2) {
+          this._emittingIndex = n
+          // TODO (fix): What if this throws?
+          arr[n + 0](this, arr[n + 1])
+        }
+      } finally {
+        this._emittingArr = null
+        this._emittingIndex = -1
       }
-    } finally {
-      this._emittingArr = null
-      this._emittingIndex = -1
     }
 
-    try {
-      const arr = this._observers
-      const len = arr.length
-
-      this._emittingArr = arr
-      for (let n = 0; n < len; n++) {
-        this._emittingIndex = n
-        // TODO (fix): What if this throws?
-        arr[n].onUpdate(this, arr[n])
+    if (this._observers != null) {
+      try {
+        const arr = this._observers
+        const len = arr.length
+
+        this._emittingArr = arr
+        for (let n = 0; n < len; n++) {
+          this._emittingIndex = n
+          // TODO (fix): What if this throws?
+          arr[n].onUpdate(this, arr[n])
+        }
+      } finally {
+        this._emittingArr = null
+        this._emittingIndex = -1
       }
-    } finally {
-      this._emittingArr = null
-      this._emittingIndex = -1
     }
 
     this._handler._client.emit('recordUpdated', this)

package/src/rpc/rpc-handler.js

@@ -168,10 +168,11 @@ RpcHandler.prototype._onConnectionStateChange = function (connected) {
     }
   } else {
     const err = Object.assign(new Error('socket hang up'), { code: 'ECONNRESET' })
-    for (const rpc of this._rpcs.values()) {
+    const rpcs = this._rpcs
+    this._rpcs = new Map()
+    for (const rpc of rpcs.values()) {
       rpc.callback(err)
     }
-    this._rpcs.clear()
   }
 }
 

package/src/utils/legacy-listener.js

@@ -157,6 +157,7 @@ export default class Listener {
               } catch (err) {
                 const bigIntPaths = /BigInt/.test(err.message) ? findBigIntPaths(value) : undefined
                 this._error(
+                  provider.name,
                   Object.assign(new Error(`invalid value: ${value}`), {
                     cause: err,
                     data: { name: provider.name, bigIntPaths },

package/src/utils/multicast-listener.js

@@ -157,6 +157,7 @@ export default class Listener {
               } catch (err) {
                 const bigIntPaths = /BigInt/.test(err.message) ? findBigIntPaths(value) : undefined
                 this._error(
+                  provider.name,
                   Object.assign(new Error(`invalid value: ${value}`), {
                     cause: err,
                     data: { name: provider.name, bigIntPaths },