@nxtedition/deepstream.io-client-js 28.1.13 → 28.1.16

package/package.json

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

package/src/record/record-handler.js

@@ -101,7 +101,6 @@ class RecordHandler {
     this._patching = new Map()
     this._updating = new Map()
     this._putting = new Set()
-    this._syncing = new Set()
 
     this._connected = 0
     this._stats = {
@@ -270,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) => {
@@ -282,23 +281,11 @@ class RecordHandler {
       : Promise.resolve()
     signalPromise?.catch(() => {})
 
-    const sync = {
-      status: 'pending',
-      data: undefined,
-      timeout: timeout || 2 * 60e3,
-      timestamp: Date.now(),
-    }
-
-    this._syncing.add(sync)
     try {
       if (this._patching.size) {
         let patchingTimeout
         const patching = [...this._patching.values()]
 
-        sync.status = 'patching'
-        sync.data = patching
-        sync.timestamp = Date.now()
-
         await Promise.race([
           Promise.all(
             patching.map((callbacks) => new Promise((resolve) => callbacks.push(resolve))),
@@ -308,12 +295,10 @@ class RecordHandler {
               this._client._$onError(
                 C.TOPIC.RECORD,
                 C.EVENT.TIMEOUT,
-                Object.assign(new Error('sync patching timeout'), {
-                  data: sync,
-                }),
+                new Error('sync patching timeout'),
               )
               resolve(null)
-            }, sync.timeout)
+            }, timeout)
           }),
           signalPromise,
         ]).finally(() => {
@@ -325,10 +310,6 @@ class RecordHandler {
         let updatingTimeout
         const updating = [...this._updating.values()]
 
-        sync.status = 'updating'
-        sync.data = updating
-        sync.timestamp = Date.now()
-
         await Promise.race([
           Promise.all(
             updating.map((callbacks) => new Promise((resolve) => callbacks.push(resolve))),
@@ -338,12 +319,10 @@ class RecordHandler {
               this._client._$onError(
                 C.TOPIC.RECORD,
                 C.EVENT.TIMEOUT,
-                Object.assign(new Error('sync updating timeout'), {
-                  data: sync,
-                }),
+                new Error('sync updating timeout'),
               )
               resolve(null)
-            }, sync.timeout)
+            }, timeout)
           }),
           signalPromise,
         ]).finally(() => {
@@ -354,12 +333,8 @@ class RecordHandler {
       let serverTimeout
       const token = xuid()
 
-      sync.status = 'token'
-      sync.data = token
-      sync.timestamp = Date.now()
-
       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])
         }),
@@ -368,18 +343,16 @@ class RecordHandler {
             this._client._$onError(
               C.TOPIC.RECORD,
               C.EVENT.TIMEOUT,
-              Object.assign(new Error('sync server timeout'), { data: { token, timeout } }),
+              new Error('sync server timeout'),
             )
             resolve(null)
-          }, sync.timeout)
+          }, timeout)
         }),
         signalPromise,
       ]).finally(() => {
         timers.clearTimeout(serverTimeout)
       })
     } finally {
-      this._syncing.delete(sync)
-
       if (onAbort) {
         signal?.removeEventListener('abort', onAbort)
       }

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/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])
       }