@nxtedition/deepstream.io-client-js 24.0.5 → 24.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.0.5",
+  "version": "24.0.7",
   "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 = {
@@ -70,7 +72,6 @@ class RecordHandler {
       created: 0,
       destroyed: 0,
       records: 0,
-      pending: 0,
       pruning: 0,
       patching: 0,
     }
@@ -122,27 +123,33 @@ class RecordHandler {
     }
   }
 
-  _onPending(rec, value) {
-    if (value) {
-      this._stats.pending += 1
-    } else {
-      this._stats.pending -= 1
-    }
-  }
-
   _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()
+      }
     }
   }
 
@@ -211,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)
     })
   }
 

package/src/record/record.js

@@ -21,10 +21,7 @@ class Record {
     this._emitting = false
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
-    this._pending = false
     this._subscribed = this._sendMsg1(C.ACTIONS.SUBSCRIBE, this._name)
-
-    this._onPending(true)
   }
 
   /** @type {string} */
@@ -270,10 +267,6 @@ class Record {
       this._subscribed = false
     }
 
-    if (!this._pending) {
-      this._onPending(true)
-    }
-
     if (this._state > C.RECORD_STATE.CLIENT) {
       this._state = C.RECORD_STATE.CLIENT
       this._emitUpdate()
@@ -284,7 +277,6 @@ class Record {
     invariant(!this._refs, 'must not have refs')
     invariant(!this._patching, 'must not have patches')
     invariant(!this._updating, 'must not have updates')
-    invariant(!this._pending, 'must not be pending')
 
     if (this._subscribed) {
       this._sendMsg1(C.ACTIONS.UNSUBSCRIBE, this._name)
@@ -364,10 +356,6 @@ class Record {
       this._state = this._version.charAt(0) === 'I' ? C.RECORD_STATE.STALE : C.RECORD_STATE.SERVER
     }
 
-    if (this._pending) {
-      this._onPending(false)
-    }
-
     if (this._state !== prevState || this._data !== prevData || this._version !== prevVersion) {
       this._emitUpdate()
     }
@@ -401,16 +389,6 @@ class Record {
     this._handler._onUpdating(this, value)
   }
 
-  _onPending(value) {
-    if (value) {
-      this._pending = true
-    } else {
-      this._pending = false
-    }
-
-    this._handler._onPending(this, value)
-  }
-
   _onSubscriptionHasProvider([, hasProvider]) {
     if (this._state < C.RECORD_STATE.SERVER) {
       return