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

package/package.json

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

package/src/record/record-handler.js

@@ -265,96 +265,116 @@ class RecordHandler {
 
   async sync(opts) {
     // TODO (fix): Sync pending? What about VOID state?
-
-    let onAbort
+    // TODO (perf): Slow implementation...
 
     const signal = opts?.signal
-    const timeout = opts?.timeout || 2 * 60e3
-
-    const signalPromise = signal
-      ? new Promise((resolve, reject) => {
-          onAbort = () => {
-            reject(signal.reason ?? new utils.AbortError())
-          }
-          signal.addEventListener('abort', onAbort)
-        })
-      : Promise.resolve()
-    signalPromise?.catch(() => {})
+    const timeout = opts?.timeout ?? 2 * 60e3
 
+    const disposers = []
     try {
+      const signalPromise = signal
+        ? new Promise((resolve, reject) => {
+            const onAbort = () => reject(signal.reason ?? new utils.AbortError())
+            signal.addEventListener('abort', onAbort)
+            disposers.push(() => signal.removeEventListener('abort', onAbort))
+          })
+        : null
+
       if (this._patching.size) {
-        let patchingTimeout
-        const patching = [...this._patching.values()]
+        const promises = []
 
-        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,
-                new Error('sync patching timeout'),
-              )
-              resolve(null)
-            }, timeout)
-          }),
-          signalPromise,
-        ]).finally(() => {
-          timers.clearTimeout(patchingTimeout)
-        })
+        {
+          const patchingPromises = []
+          for (const callbacks of this._patching.values()) {
+            patchingPromises.push(new Promise((resolve) => callbacks.push(resolve)))
+          }
+          promises.push(patchingPromises)
+        }
+
+        if (timeout) {
+          promises.push(
+            new Promise((resolve) => {
+              const patchingTimeout = timers.setTimeout(() => {
+                this._client._$onError(
+                  C.TOPIC.RECORD,
+                  C.EVENT.TIMEOUT,
+                  new Error('sync patching timeout'),
+                )
+                resolve(null)
+              }, timeout)
+              disposers.push(() => timers.clearTimeout(patchingTimeout))
+            }),
+          )
+        }
+
+        if (signalPromise) {
+          promises.push(signalPromise)
+        }
+
+        await Promise.race(promises)
       }
 
       if (this._updating.size) {
-        let updatingTimeout
-        const updating = [...this._updating.values()]
+        const promises = []
 
-        await Promise.race([
-          Promise.all(
-            updating.map((callbacks) => new Promise((resolve) => callbacks.push(resolve))),
-          ),
+        {
+          const updatingPromises = []
+          for (const callbacks of this._updating.values()) {
+            updatingPromises.push(new Promise((resolve) => callbacks.push(resolve)))
+          }
+          promises.push(updatingPromises)
+        }
+
+        if (timeout) {
+          promises.push(
+            new Promise((resolve) => {
+              const updatingTimeout = timers.setTimeout(() => {
+                this._client._$onError(
+                  C.TOPIC.RECORD,
+                  C.EVENT.TIMEOUT,
+                  new Error('sync updating timeout'),
+                )
+                resolve(null)
+              }, timeout)
+              disposers.push(() => timers.clearTimeout(updatingTimeout))
+            }),
+          )
+        }
+
+        await Promise.race(promises)
+      }
+
+      {
+        const promises = []
+
+        promises.push(
           new Promise((resolve) => {
-            updatingTimeout = timers.setTimeout(() => {
-              this._client._$onError(
-                C.TOPIC.RECORD,
-                C.EVENT.TIMEOUT,
-                new Error('sync updating timeout'),
-              )
-              resolve(null)
-            }, timeout)
+            const token = xuid()
+            this._syncEmitter.once(token, resolve)
+            this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
           }),
-          signalPromise,
-        ]).finally(() => {
-          timers.clearTimeout(updatingTimeout)
-        })
-      }
+        )
+
+        if (timeout) {
+          promises.push(
+            new Promise((resolve, reject) => {
+              const serverTimeout = timers.setTimeout(() => {
+                reject(new Error('sync server timeout'))
+              }, timeout)
+              disposers.push(() => timers.clearTimeout(serverTimeout))
+            }),
+          )
+        }
 
-      let serverTimeout
-      const token = xuid()
+        if (signalPromise) {
+          promises.push(signalPromise)
+        }
 
-      return await Promise.race([
-        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,
-              new Error('sync server timeout'),
-            )
-            resolve(null)
-          }, timeout)
-        }),
-        signalPromise,
-      ]).finally(() => {
-        timers.clearTimeout(serverTimeout)
-      })
+        await Promise.race(promises)
+      }
     } finally {
-      if (onAbort) {
-        signal?.removeEventListener('abort', onAbort)
+      for (const disposer of disposers) {
+        disposer()
       }
     }
   }

package/src/rpc/rpc-handler.d.ts

@@ -14,12 +14,23 @@ export default class RpcHandler<Methods extends Record<string, RpcMethodDef>> {
   unprovide: <Name extends keyof Methods>(name: Name) => void
 
   make: {
-    <Name extends keyof Methods>(
+    <
+      Name extends keyof Methods | string,
+      Args extends Name extends keyof Methods ? Methods[Name][0] : unknown,
+      ReturnValue extends Name extends keyof Methods ? Methods[Name][1] : unknown,
+    >(
       name: Name,
-      args: Methods[Name][0],
-      callback: (error: unknown, response: Methods[Name][1]) => void,
+      args: Args,
+    ): Promise<ReturnValue>
+    <
+      Name extends keyof Methods | string,
+      Args extends Name extends keyof Methods ? Methods[Name][0] : unknown,
+      ReturnValue extends Name extends keyof Methods ? Methods[Name][1] : unknown,
+    >(
+      name: Name,
+      args: Args,
+      callback: (error: unknown, response: ReturnValue) => void,
     ): void
-    <Name extends keyof Methods>(name: Name, args: Methods[Name][0]): Promise<Methods[Name][1]>
   }
 }
 

package/src/utils/timers.js

@@ -78,6 +78,10 @@ class Timeout {
   clear() {
     this.state = -1
   }
+
+  [Symbol.dispose]() {
+    this.state = -1
+  }
 }
 
 export function setTimeout(callback, delay, opaque) {

package/src/utils/unicast-listener.js

@@ -4,14 +4,12 @@ import { h64ToString, findBigIntPaths } from '../utils/utils.js'
 
 const PIPE = rxjs.pipe(
   rxjs.map((value) => {
-    if (value == null) {
-      return null
-    } else if (typeof value === 'string') {
+    if (typeof value === 'string') {
       if (value.charAt(0) !== '{' && value.charAt(0) !== '[') {
         throw new Error(`invalid value: ${value}`)
       }
       return value
-    } else if (typeof value === 'object') {
+    } else if (value != null && typeof value === 'object') {
       try {
         return JSON.stringify(value)
       } catch (err) {
@@ -78,24 +76,18 @@ export default class Listener {
       if (value$) {
         const subscription = value$.pipe(PIPE).subscribe({
           next: (data) => {
-            if (data != null) {
-              const version = `INF-${h64ToString(data)}`
-              this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [name, version, data])
-            } else {
-              this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
-            }
+            const version = `INF-${h64ToString(data)}`
+            this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [name, version, data])
           },
           error: (err) => {
             this._error(name, err)
+
+            this._subscriptions.delete(name)
             this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
           },
         })
 
         this._subscriptions.set(name, subscription)
-
-        subscription.add(() => {
-          this._subscriptions.delete(name)
-        })
       } else {
         this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
       }