@nxtedition/deepstream.io-client-js 32.0.0 → 32.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "32.0.0",
+  "version": "32.0.3",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",
@@ -36,7 +36,7 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@nxtedition/json-path": "^2.0.0",
+    "@nxtedition/json-path": "^2.0.2",
     "bufferutil": "^4.1.0",
     "component-emitter2": "^1.3.5",
     "invariant": "^2.2.4",
@@ -48,7 +48,7 @@
     "xxhash-wasm": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "^25.0.8",
+    "@types/node": "^25.0.10",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-config-standard": "^17.1.0",
@@ -60,12 +60,12 @@
     "lint-staged": "^16.2.7",
     "mitata": "^1.0.10",
     "pinst": "^3.0.0",
-    "prettier": "^3.8.0",
+    "prettier": "^3.8.1",
     "rxjs": "^7.8.1",
     "tsd": "^0.33.0",
     "type-fest": "^5.4.1",
     "typescript": "^5.6.3",
-    "typescript-eslint": "^8.53.0"
+    "typescript-eslint": "^8.53.1"
   },
   "peerDependencies": {
     "rxjs": ">=6.x"

package/src/client.test-d.ts

@@ -96,6 +96,9 @@ expectError(ds.record.set('n', 'n1.x2', {}))
 expectError(ds.record.set('n', 'n1.n2.n3', { n4: 22 }))
 
 expectAssignable<string>(await ds.record.get('p', 'p1'))
+expectAssignable<{ name: string; version: string; state: number; data: string }>(
+  await ds.record.get2('p', 'p1'),
+)
 expectAssignable<string>(await ds.record.get('p', 'p1', { signal: new AbortController().signal }))
 expectAssignable<string>(await ds.record.get('p', { path: 'p1' }))
 expectAssignable<string | undefined>(await ds.record.get('p', 'p2'))

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

@@ -113,6 +113,73 @@ export default class RecordHandler<Records = Record<string, unknown>> {
     ): Observable<Get<Lookup<Records, Name>, Path>>
   }
 
+  observe2: {
+    <Name extends string>(
+      name: Name,
+      options: ObserveOptions,
+    ): Observable<{
+      name: string
+      version: string
+      state: number
+      data: Lookup<Records, Name>
+    }>
+
+    <Name extends string, Path extends string | string[]>(
+      name: Name,
+      options: ObserveOptionsWithPath<Path>,
+    ): Observable<{
+      name: string
+      version: string
+      state: number
+      data: Get<Lookup<Records, Name>, Path>
+    }>
+
+    <Name extends string>(
+      name: Name,
+      state?: number,
+      options?: ObserveOptions,
+    ): Observable<{
+      name: string
+      version: string
+      state: number
+      data: Lookup<Records, Name>
+    }>
+
+    <Name extends string, Path extends string | string[]>(
+      name: Name,
+      state?: number,
+      options?: ObserveOptionsWithPath<Path>,
+    ): Observable<{
+      name: string
+      version: string
+      state: number
+      data: Get<Lookup<Records, Name>, Path>
+    }>
+
+    <Name extends string, Path extends string | string[]>(
+      name: Name,
+      path: Path,
+      options?: ObserveOptionsWithPath<Path>,
+    ): Observable<{
+      name: string
+      version: string
+      state: number
+      data: Get<Lookup<Records, Name>, Path>
+    }>
+
+    <Name extends string, Path extends string | string[]>(
+      name: Name,
+      path: Path,
+      state?: number,
+      options?: ObserveOptionsWithPath<Path>,
+    ): Observable<{
+      name: string
+      version: string
+      state: number
+      data: Get<Lookup<Records, Name>, Path>
+    }>
+  }
+
   get: {
     <Name extends string>(name: Name, options: ObserveOptions): Promise<Lookup<Records, Name>>
 
@@ -147,11 +214,11 @@ export default class RecordHandler<Records = Record<string, unknown>> {
     ): Promise<Get<Lookup<Records, Name>, Path>>
   }
 
-  observe2: {
+  get2: {
     <Name extends string>(
       name: Name,
       options: ObserveOptions,
-    ): Observable<{
+    ): Promise<{
       name: string
       version: string
       state: number
@@ -161,7 +228,7 @@ export default class RecordHandler<Records = Record<string, unknown>> {
     <Name extends string, Path extends string | string[]>(
       name: Name,
       options: ObserveOptionsWithPath<Path>,
-    ): Observable<{
+    ): Promise<{
       name: string
       version: string
       state: number
@@ -172,7 +239,7 @@ export default class RecordHandler<Records = Record<string, unknown>> {
       name: Name,
       state?: number,
       options?: ObserveOptions,
-    ): Observable<{
+    ): Promise<{
       name: string
       version: string
       state: number
@@ -183,7 +250,7 @@ export default class RecordHandler<Records = Record<string, unknown>> {
       name: Name,
       state?: number,
       options?: ObserveOptionsWithPath<Path>,
-    ): Observable<{
+    ): Promise<{
       name: string
       version: string
       state: number
@@ -194,7 +261,7 @@ export default class RecordHandler<Records = Record<string, unknown>> {
       name: Name,
       path: Path,
       options?: ObserveOptionsWithPath<Path>,
-    ): Observable<{
+    ): Promise<{
       name: string
       version: string
       state: number
@@ -206,7 +273,7 @@ export default class RecordHandler<Records = Record<string, unknown>> {
       path: Path,
       state?: number,
       options?: ObserveOptionsWithPath<Path>,
-    ): Observable<{
+    ): Promise<{
       name: string
       version: string
       state: number

package/src/record/record-handler.js

@@ -44,17 +44,10 @@ function onUpdate(record, subscription) {
   }
 
   if (!subscription.synced || subscription.record.state < subscription.state) {
-    if (subscription.timeoutValue > 0) {
-      if (!subscription.timeout) {
-        subscription.timeout = timers.setTimeout(onTimeout, subscription.timeoutValue, subscription)
-      } else {
-        subscription.timeout.refresh()
-      }
-    }
     return
   }
 
-  if (subscription.timeout) {
+  if (subscription.timeout != null) {
     timers.clearTimeout(subscription.timeout)
     subscription.timeout = null
   }
@@ -101,6 +94,34 @@ function onTimeout(subscription) {
   )
 }
 
+class Subscription {
+  /** @type {unknown} */
+  subscriber = null
+  /** @type {unknown} */
+  path = null
+  /** @type {number} */
+  state = 0
+  /** @type {AbortSignal|null} */
+  signal = null
+  /** @type {boolean} */
+  dataOnly = false
+
+  /** @type {Record|null} */
+  record = null
+  /** @type {Timeout|null} */
+  timeout = null
+  /** @type {Function?} */
+  abort = null
+  /** @type {object|Array} */
+  data = kEmpty
+  /** @type {boolean} */
+  synced = false
+
+  index = -1
+
+  onUpdate = onUpdate
+}
+
 class RecordHandler {
   constructor(options, connection, client) {
     this.JSON = jsonPath
@@ -146,13 +167,23 @@ class RecordHandler {
       this._pruning = new Set()
 
       for (const rec of pruning) {
-        rec._$dispose()
-        this._records.delete(rec.name)
+        try {
+          rec._$dispose()
+          if (!this._records.delete(rec.name)) {
+            this._client._$onError(
+              C.TOPIC.RECORD,
+              C.EVENT.INTERNAL_ERROR,
+              `failed to delete pruned record: ${rec.name}`,
+            )
+          }
+        } catch (err) {
+          this._client._$onError(C.TOPIC.RECORD, C.EVENT.INTERNAL_ERROR, err)
+        }
       }
 
-      this._stats.pruning -= pruning.size
-      this._stats.records -= pruning.size
       this._stats.destroyed += pruning.size
+      this._stats.pruning = this._pruning.size
+      this._stats.records = this._records.size
 
       this._pruningTimeout.refresh()
     }
@@ -161,17 +192,12 @@ class RecordHandler {
   }
 
   _onPruning(rec, value) {
-    if (value) {
-      this._stats.pruning += 1
-    } else {
-      this._stats.pruning -= 1
-    }
-
     if (value) {
       this._pruning.add(rec)
     } else {
       this._pruning.delete(rec)
     }
+    this._stats.pruning = this._pruning.size
   }
 
   _onUpdating(rec, value) {
@@ -194,17 +220,15 @@ class RecordHandler {
 
   _onPatching(rec, value) {
     if (value) {
-      this._stats.patching += 1
       this._patching.set(rec, [])
     } else {
-      this._stats.patching -= 1
-
       const callbacks = this._patching.get(rec)
       this._patching.delete(rec)
       for (const callback of callbacks) {
         callback()
       }
     }
+    this._stats.patching = this._patching.size
   }
 
   get connected() {
@@ -242,15 +266,16 @@ class RecordHandler {
     }
 
     let record = this._records.get(name)
-
     if (!record) {
       record = new Record(name, this)
-      this._stats.records += 1
-      this._stats.created += 1
       this._records.set(name, record)
+      this._stats.created += 1
+      this._stats.records = this._records.size
+    } else {
+      record.ref()
     }
 
-    return record.ref()
+    return record
   }
 
   provide(pattern, callback, options) {
@@ -638,36 +663,19 @@ class RecordHandler {
     }
 
     return new rxjs.Observable((subscriber) => {
-      // TODO (perf): Make a class
-      const subscription = {
-        /** @readonly @type {unknown} */
-        subscriber,
-        /** @readonly @type {unknown} */
-        path,
-        /** @readonly @type {number} */
-        state,
-        /** @type {AbortSignal|null} */
-        signal,
-        /** @readonly @type {boolean} */
-        dataOnly,
-        /** @readonly @type {number} */
-        timeoutValue: timeout,
-
-        /** @type {Record|null} */
-        record: null,
-        /** @type {Timeout|null} */
-        timeout: null,
-        /** @type {Function?} */
-        abort: null,
-        /** @type {object|Array} */
-        data: kEmpty,
-        /** @type {boolean} */
-        synced: false,
-
-        index: -1,
-        onUpdate,
+      if (signal?.aborted) {
+        subscriber.error(new utils.AbortError())
+        return
       }
 
+      const subscription = new Subscription()
+
+      subscription.subscriber = subscriber
+      subscription.path = path
+      subscription.state = state
+      subscription.signal = signal
+      subscription.dataOnly = dataOnly
+
       subscriber.add(() => {
         if (subscription.timeout) {
           timers.clearTimeout(subscription.timeout)
@@ -700,6 +708,10 @@ class RecordHandler {
       } else {
         onSync(subscription)
       }
+
+      if (timeout > 0 && (!subscription.synced || subscription.record.state < subscription.state)) {
+        subscription.timeout = timers.setTimeout(onTimeout, timeout, subscription)
+      }
     })
   }
 

package/src/record/record.js

@@ -18,7 +18,7 @@ class Record {
     this._version = ''
     this._data = jsonPath.EMPTY_OBJ
     this._state = C.RECORD_STATE.VOID
-    this._refs = 0
+    this._refs = 1
     this._subscriptions = []
 
     /** @type {Array|null} */
@@ -141,6 +141,11 @@ class Record {
       throw new Error('already observing')
     }
 
+    if (this._emittingArr === this._observers) {
+      // TODO (perf): Shift from start if emitting?
+      this._observers = this._observers.slice()
+    }
+
     subscription.index = this._observers.push(subscription) - 1
   }