@nxtedition/deepstream.io-client-js 28.1.18 → 28.1.21

package/package.json

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

package/src/record/record-handler.js

@@ -102,7 +102,7 @@ class RecordHandler {
     this._pruning = new Set()
     this._patching = new Map()
     this._updating = new Map()
-    this._putting = new Set()
+    this._putting = new Map()
 
     this._connected = 0
     this._stats = {
@@ -257,12 +257,15 @@ class RecordHandler {
     this._stats.listeners += 1
     this._listeners.set(pattern, listener)
 
-    return () => {
+    const disposer = () => {
       listener._$destroy()
 
       this._stats.listeners -= 1
       this._listeners.delete(pattern)
     }
+    disposer[Symbol.dispose] = disposer
+
+    return disposer
   }
 
   async sync(opts) {
@@ -284,6 +287,40 @@ 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 = []
 
@@ -429,7 +466,7 @@ class RecordHandler {
     const update = [name, version, jsonPath.stringify(data)]
     this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.PUT, update)
 
-    this._putting.add(update)
+    this._putting.set(update, [])
     this._sync((update) => {
       this._putting.delete(update)
     }, update)
@@ -694,7 +731,7 @@ class RecordHandler {
         this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
       }
 
-      for (const update of this._putting) {
+      for (const update of this._putting.keys()) {
         this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.PUT, update)
       }
     } else {

package/src/record/record.js

@@ -78,6 +78,10 @@ class Record {
     return this
   }
 
+  [Symbol.dispose]() {
+    this.unref()
+  }
+
   /**
    * @param {*} fn
    * @param {*} opaque