@nxtedition/deepstream.io-client-js 28.1.12 → 28.1.15

package/package.json

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

package/src/record/record-handler.js

@@ -269,7 +269,7 @@ class RecordHandler {
     let onAbort
 
     const signal = opts?.signal
-    const timeout = opts?.timeout
+    const timeout = opts?.timeout || 2 * 60e3
 
     const signalPromise = signal
       ? new Promise((resolve, reject) => {
@@ -278,31 +278,27 @@ class RecordHandler {
           }
           signal.addEventListener('abort', onAbort)
         })
-      : null
+      : Promise.resolve()
     signalPromise?.catch(() => {})
 
     try {
       if (this._patching.size) {
         let patchingTimeout
         const patching = [...this._patching.values()]
+
         await Promise.race([
           Promise.all(
             patching.map((callbacks) => new Promise((resolve) => callbacks.push(resolve))),
           ),
           new Promise((resolve) => {
-            patchingTimeout = timers.setTimeout(
-              () => {
-                this._client._$onError(
-                  C.TOPIC.RECORD,
-                  C.EVENT.TIMEOUT,
-                  Object.assign(new Error('sync patching timeout'), {
-                    data: { patching, timeout },
-                  }),
-                )
-                resolve(null)
-              },
-              timeout ?? 2 * 60e3,
-            )
+            patchingTimeout = timers.setTimeout(() => {
+              this._client._$onError(
+                C.TOPIC.RECORD,
+                C.EVENT.TIMEOUT,
+                new Error('sync patching timeout'),
+              )
+              resolve(null)
+            }, timeout)
           }),
           signalPromise,
         ]).finally(() => {
@@ -313,24 +309,20 @@ class RecordHandler {
       if (this._updating.size) {
         let updatingTimeout
         const updating = [...this._updating.values()]
+
         await Promise.race([
           Promise.all(
             updating.map((callbacks) => new Promise((resolve) => callbacks.push(resolve))),
           ),
           new Promise((resolve) => {
-            updatingTimeout = timers.setTimeout(
-              () => {
-                this._client._$onError(
-                  C.TOPIC.RECORD,
-                  C.EVENT.TIMEOUT,
-                  Object.assign(new Error('sync updating timeout'), {
-                    data: { updating, timeout },
-                  }),
-                )
-                resolve(null)
-              },
-              timeout ?? 2 * 60e3,
-            )
+            updatingTimeout = timers.setTimeout(() => {
+              this._client._$onError(
+                C.TOPIC.RECORD,
+                C.EVENT.TIMEOUT,
+                new Error('sync updating timeout'),
+              )
+              resolve(null)
+            }, timeout)
           }),
           signalPromise,
         ]).finally(() => {
@@ -340,23 +332,21 @@ class RecordHandler {
 
       let serverTimeout
       const token = xuid()
+
       return await Promise.race([
-        await new Promise((resolve) => {
+        new Promise((resolve) => {
           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,
-                Object.assign(new Error('sync server timeout'), { data: { token, timeout } }),
-              )
-              resolve(null)
-            },
-            timeout ?? 2 * 60e3,
-          )
+          serverTimeout = timers.setTimeout(() => {
+            this._client._$onError(
+              C.TOPIC.RECORD,
+              C.EVENT.TIMEOUT,
+              new Error('sync server timeout'),
+            )
+            resolve(null)
+          }, timeout)
         }),
         signalPromise,
       ]).finally(() => {