@nxtedition/deepstream.io-client-js 28.1.22 → 28.1.23

package/package.json

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

package/src/record/record-handler.js

@@ -163,13 +163,16 @@ class RecordHandler {
   }
 
   _onUpdating(rec, value) {
+    const callbacks = this._updating.get(rec)
+
     if (value) {
+      invariant(!callbacks, 'updating callbacks must not exist')
       this._stats.updating += 1
       this._updating.set(rec, [])
     } else {
-      this._stats.updating -= 1
+      invariant(callbacks, 'updating callbacks must exist')
 
-      const callbacks = this._updating.get(rec)
+      this._stats.updating -= 1
       this._updating.delete(rec)
       for (const callback of callbacks) {
         callback()
@@ -287,40 +290,6 @@ class RecordHandler {
 
       signalPromise?.catch(noop)
 
-      if (this._putting.size) {
-        const promises = []
-
-        {
-          const puttingPromises = []
-          for (const callbacks of this._putting.values()) {
-            puttingPromises.push(new Promise((resolve) => callbacks.push(resolve)))
-          }
-          promises.push(puttingPromises)
-        }
-
-        if (timeout) {
-          promises.push(
-            new Promise((resolve) => {
-              const patchingTimeout = timers.setTimeout(() => {
-                this._client._$onError(
-                  C.TOPIC.RECORD,
-                  C.EVENT.TIMEOUT,
-                  new Error('sync putting timeout'),
-                )
-                resolve(null)
-              }, timeout)
-              disposers.push(() => timers.clearTimeout(patchingTimeout))
-            }),
-          )
-        }
-
-        if (signalPromise) {
-          promises.push(signalPromise)
-        }
-
-        await Promise.race(promises)
-      }
-
       if (this._patching.size) {
         const promises = []
 
@@ -329,7 +298,7 @@ class RecordHandler {
           for (const callbacks of this._patching.values()) {
             patchingPromises.push(new Promise((resolve) => callbacks.push(resolve)))
           }
-          promises.push(patchingPromises)
+          promises.push(Promise.all(patchingPromises))
         }
 
         if (timeout) {
@@ -363,7 +332,7 @@ class RecordHandler {
           for (const callbacks of this._updating.values()) {
             updatingPromises.push(new Promise((resolve) => callbacks.push(resolve)))
           }
-          promises.push(updatingPromises)
+          promises.push(Promise.all(updatingPromises))
         }
 
         if (timeout) {
@@ -388,13 +357,7 @@ class RecordHandler {
       {
         const promises = []
 
-        promises.push(
-          new Promise((resolve) => {
-            const token = xuid()
-            this._syncEmitter.once(token, resolve)
-            this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
-          }),
-        )
+        promises.push(new Promise((resolve) => this._sync(resolve)))
 
         if (timeout) {
           promises.push(
@@ -420,7 +383,7 @@ class RecordHandler {
     }
   }
 
-  _sync(callback, opaque) {
+  _sync(callback, type, opaque) {
     this._syncQueue.push(callback, opaque)
 
     if (this._syncQueue.length > 2) {
@@ -437,7 +400,7 @@ class RecordHandler {
           queue[n](queue[n + 1])
         }
       })
-      this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token, 'WEAK'])
+      this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, type ? [token, type] : [token])
     }, 1)
   }
 
@@ -476,9 +439,7 @@ class RecordHandler {
     this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.PUT, update)
 
     this._putting.set(update, [])
-    this._sync((update) => {
-      this._putting.delete(update)
-    }, update)
+    this._sync((update) => this._putting.delete(update), 'WEAK', update)
   }
 
   /**
@@ -545,7 +506,7 @@ class RecordHandler {
           rec.subscribe(onUpdateFast, opaque)
 
           if (!opaque.synced) {
-            this._sync(onSyncFast, opaque)
+            this._sync(onSyncFast, 'WEAK', opaque)
           }
         }
       })
@@ -736,13 +697,14 @@ class RecordHandler {
 
     if (connected) {
       this._connected = Date.now()
-      for (const token of this._syncEmitter.eventNames()) {
-        this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
-      }
 
       for (const update of this._putting.keys()) {
         this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.PUT, update)
       }
+
+      for (const token of this._syncEmitter.eventNames()) {
+        this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
+      }
     } else {
       this._connected = 0
     }