@nxtedition/deepstream.io-client-js 24.0.6 → 24.0.8

package/package.json

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

package/src/record/record-handler.js

@@ -63,6 +63,8 @@ class RecordHandler {
     this._records = new Map()
     this._listeners = new Map()
     this._pruning = new Set()
+    this._patching = new Map()
+    this._updating = new Map()
 
     this._connected = 0
     this._stats = {
@@ -124,16 +126,30 @@ class RecordHandler {
   _onUpdating(rec, value) {
     if (value) {
       this._stats.updating += 1
+      this._updating.set(rec, [])
     } else {
       this._stats.updating -= 1
+
+      const callbacks = this._updating.get(rec)
+      this._updating.delete(rec)
+      for (const callback of callbacks) {
+        callback()
+      }
     }
   }
 
   _onPatching(rec, value) {
     if (value) {
       this._stats.patching += 1
+      this._patching.set(rec, [])
     } else {
       this._stats.patching -= 1
+
+      const callbacks = this._patching.get(rec)
+      this._patching.delete(rec)
+      for (const callback of callbacks) {
+        callback()
+      }
     }
   }
 
@@ -202,13 +218,66 @@ class RecordHandler {
     }
   }
 
-  sync() {
-    // TODO (fix): Sync patching & updating?
-    // TODO (fix): Ensure no pending?
-    return new Promise((resolve) => {
-      const token = xuid()
-      this._syncEmitter.once(token, resolve)
-      this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
+  async sync() {
+    // TODO (fix): Sync pending? What about VOID state?
+
+    let patchingTimeout
+    await Promise.race([
+      Promise.all(
+        [...this._patching.values()].map(
+          (callbacks) => new Promise((resolve) => callbacks.push(resolve))
+        )
+      ),
+      new Promise((resolve) => {
+        patchingTimeout = timers.setTimeout(() => {
+          this._client._$onError(
+            C.TOPIC.RECORD,
+            C.EVENT.TIMEOUT,
+            new Error('sync patching timeout')
+          )
+          resolve(null)
+        }, 2 * 60e3)
+      }),
+    ]).finally(() => {
+      timers.clearTimeout(patchingTimeout)
+    })
+
+    let updatingTimeout
+    await Promise.race([
+      Promise.all(
+        [...this._updating.values()].map(
+          (callbacks) => new Promise((resolve) => callbacks.push(resolve))
+        )
+      ),
+      new Promise((resolve) => {
+        updatingTimeout = timers.setTimeout(() => {
+          this._client._$onError(
+            C.TOPIC.RECORD,
+            C.EVENT.TIMEOUT,
+            new Error('sync updating timeout')
+          )
+          resolve(null)
+        }, 2 * 60e3)
+      }),
+    ]).finally(() => {
+      timers.clearTimeout(updatingTimeout)
+    })
+
+    let serverTimeout
+    await Promise.race([
+      await new Promise((resolve) => {
+        const token = xuid()
+        this._syncEmitter.once(token, resolve)
+        this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
+      }),
+      new Promise((resolve) => {
+        serverTimeout = timers.setTimeout(() => {
+          this._client._$onError(C.TOPIC.RECORD, C.EVENT.TIMEOUT, new Error('sync server timeout'))
+          resolve(null)
+        }, 2 * 60e3)
+      }),
+    ]).finally(() => {
+      timers.clearTimeout(serverTimeout)
     })
   }
 
@@ -307,23 +376,23 @@ class RecordHandler {
     if (idx < args.length && (args[idx] == null || typeof args[idx] === 'object')) {
       const options = args[idx++] || {}
 
-      if (options.signal != null) {
+      if (options.signal !== undefined) {
         signal = options.signal
       }
 
-      if (options.timeout != null) {
+      if (options.timeout !== undefined) {
         timeout = options.timeout
       }
 
-      if (options.path != null) {
+      if (options.path !== undefined) {
         path = options.path
       }
 
-      if (options.state != null) {
+      if (options.state !== undefined) {
         state = options.state
       }
 
-      if (options.dataOnly != null) {
+      if (options.dataOnly !== undefined) {
         dataOnly = options.dataOnly
       }
     }
@@ -366,7 +435,7 @@ class RecordHandler {
 
       const record = (subscription.record = this.getRecord(name).subscribe(onUpdate, subscription))
 
-      if (timeout && state && record.state < state) {
+      if (timeout > 0 && state && record.state < state) {
         // TODO (perf): Avoid Timer allocation.
         subscription.timeout = timers.setTimeout(onTimeout, timeout, subscription)
       }