@nxtedition/deepstream.io-client-js 31.2.15 → 31.2.17

package/package.json

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

package/src/event/event-handler.js

@@ -1,7 +1,7 @@
 import * as C from '../constants/constants.js'
 import * as messageBuilder from '../message/message-builder.js'
 import * as messageParser from '../message/message-parser.js'
-import MulticastListener from '../utils/multicast-listener.js'
+import LegacyListener from '../utils/legacy-listener.js'
 import UnicastListener from '../utils/unicast-listener.js'
 import EventEmitter from 'component-emitter2'
 import * as rxjs from 'rxjs'
@@ -126,7 +126,7 @@ EventHandler.prototype.provide = function (pattern, callback, options) {
   const listener =
     options.mode?.toLowerCase() === 'unicast'
       ? new UnicastListener(C.TOPIC.EVENT, pattern, callback, this, options)
-      : new MulticastListener(C.TOPIC.EVENT, pattern, callback, this, options)
+      : new LegacyListener(C.TOPIC.EVENT, pattern, callback, this, options)
 
   this._listeners.set(pattern, listener)
   return () => {

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

@@ -10,6 +10,11 @@ import type {
 
 type Lookup<Table, Name> = Name extends keyof Table ? Table[Name] : unknown
 
+type Disposer = {
+  (): void
+  [Symbol.dispose](): void
+}
+
 export default class RecordHandler<Records = Record<string, unknown>> {
   VOID: 0
   CLIENT: 1
@@ -41,7 +46,7 @@ export default class RecordHandler<Records = Record<string, unknown>> {
     pattern: string,
     callback: (key: string) => unknown,
     optionsOrRecursive?: ProvideOptions | boolean,
-  ) => void | (() => void)
+  ) => Disposer
 
   sync: (options?: SyncOptions) => Promise<void>
 
@@ -223,6 +228,7 @@ export interface RecordStats {
 export interface ProvideOptions {
   recursive?: boolean
   stringify?: ((input: unknown) => string) | null
+  mode: undefined | null | 'unicast'
 }
 
 export interface SyncOptions {

package/src/record/record-handler.js

@@ -1,5 +1,5 @@
 import Record from './record.js'
-import MulticastListener from '../utils/multicast-listener.js'
+import LegacyListener from '../utils/legacy-listener.js'
 import UnicastListener from '../utils/unicast-listener.js'
 import * as C from '../constants/constants.js'
 import * as rxjs from 'rxjs'
@@ -84,9 +84,18 @@ function onTimeout(subscription) {
 
   subscription.subscriber.error(
     Object.assign(
-      new Error(`timeout state: ${subscription.record.name} [${current}<${expected}]`),
+      new Error(
+        !subscription.synced
+          ? `timeout sync: ${subscription.record.name}`
+          : `timeout state: ${subscription.record.name} [${current}<${expected}]`,
+      ),
       {
         code: 'ETIMEDOUT',
+        timeout: subscription.timeoutValue,
+        expected,
+        current,
+        synced: subscription.synced,
+        name: subscription.record.name,
       },
     ),
   )
@@ -261,7 +270,7 @@ class RecordHandler {
     const listener =
       options.mode?.toLowerCase() === 'unicast'
         ? new UnicastListener(C.TOPIC.RECORD, pattern, callback, this, options)
-        : new MulticastListener(C.TOPIC.RECORD, pattern, callback, this, options)
+        : new LegacyListener(C.TOPIC.RECORD, pattern, callback, this, options)
 
     this._stats.listeners += 1
     this._listeners.set(pattern, listener)
@@ -678,7 +687,6 @@ class RecordHandler {
       subscription.record = this.getRecord(name).subscribe(onUpdate, subscription)
 
       if (sync) {
-        // TODO (fix): What about sync timeout?
         this._sync(onSync, sync === true ? 'WEAK' : sync, subscription)
       } else {
         onSync(subscription)

package/src/utils/{multicast-listener.js → legacy-listener.js}

@@ -1,6 +1,6 @@
 import * as rxjs from 'rxjs'
 import * as C from '../constants/constants.js'
-import { h64ToString, findBigIntPaths } from '../utils/utils.js'
+import { h64ToString, findBigIntPaths } from './utils.js'
 
 export default class Listener {
   constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {