@nxtedition/deepstream.io-client-js 31.0.9 → 31.0.10

package/package.json

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

package/src/record/record-handler.js

@@ -23,13 +23,12 @@ const OBSERVE2_DEFAULTS = {
 }
 const GET_DEFAULTS = {
   timeout: 2 * 60e3,
-  first: true,
   sync: true,
   dataOnly: true,
 }
 const GET2_DEFAULTS = {
   timeout: 2 * 60e3,
-  first: true,
+  sync: true,
 }
 
 function onSync(subscription) {
@@ -72,11 +71,6 @@ function onUpdate(record, subscription) {
       data,
     })
   }
-
-  if (subscription.first) {
-    subscription.subscriber.complete?.()
-    subscription.unsubscribe()
-  }
 }
 
 function onTimeout(subscription) {
@@ -475,165 +469,150 @@ class RecordHandler {
 
   /**
    * @param  {...any} args
-   * @returns {Promise}
+   * @returns {rxjs.Observable<{ name: string, version: string, state: Number, data: any}>}
    */
-  get(...args) {
-    return new Promise((resolve, reject) => {
-      this._subscribe({ next: resolve, error: reject }, GET_DEFAULTS, ...args)
-    })
+  observe2(...args) {
+    return this._observe(OBSERVE2_DEFAULTS, ...args)
   }
 
   /**
    * @param  {...any} args
    * @returns {Promise}
    */
-  get2(...args) {
-    return new Promise((resolve, reject) => {
-      this._subscribe({ next: resolve, error: reject }, GET2_DEFAULTS, ...args)
-    })
+  get(...args) {
+    return rxjs.firstValueFrom(this._observe(GET_DEFAULTS, ...args))
   }
 
   /**
    * @param  {...any} args
-   * @returns {rxjs.Observable<{ name: string, version: string, state: Number, data: any}>}
+   * @returns {Promise}
    */
-  observe2(...args) {
-    return this._observe(OBSERVE2_DEFAULTS, ...args)
+  get2(...args) {
+    return rxjs.firstValueFrom(this._observe(GET2_DEFAULTS, ...args))
   }
 
   /**
    * @returns {rxjs.Observable}
    */
   _observe(defaults, name, ...args) {
-    return new rxjs.Observable((subscriber) => this._subscribe(subscriber, defaults, name, ...args))
-  }
+    return new rxjs.Observable((subscriber) => {
+      let path
+      let state = defaults?.state
+      let signal
+      let timeout = defaults?.timeout
+      let dataOnly = defaults?.dataOnly
+      let sync = defaults?.sync
+
+      let idx = 0
+
+      if (
+        idx < args.length &&
+        (args[idx] == null ||
+          typeof args[idx] === 'string' ||
+          Array.isArray(args[idx]) ||
+          typeof args[idx] === 'function')
+      ) {
+        path = args[idx++]
+      }
 
-  /**
-   * @returns {{ unsubscribe: () => void }}
-   */
-  _subscribe(subscriber, defaults, name, ...args) {
-    let path
-    let state = defaults?.state
-    let signal
-    let timeout = defaults?.timeout
-    let dataOnly = defaults?.dataOnly
-    let sync = defaults?.sync
-    let first = defaults?.first
+      if (idx < args.length && (args[idx] == null || typeof args[idx] === 'number')) {
+        state = args[idx++]
+      }
 
-    let idx = 0
+      if (idx < args.length && (args[idx] == null || typeof args[idx] === 'object')) {
+        const options = args[idx++] || {}
 
-    if (
-      idx < args.length &&
-      (args[idx] == null ||
-        typeof args[idx] === 'string' ||
-        Array.isArray(args[idx]) ||
-        typeof args[idx] === 'function')
-    ) {
-      path = args[idx++]
-    }
+        if (options.signal !== undefined) {
+          signal = options.signal
+        }
 
-    if (idx < args.length && (args[idx] == null || typeof args[idx] === 'number')) {
-      state = args[idx++]
-    }
+        if (options.timeout !== undefined) {
+          timeout = options.timeout
+        }
 
-    if (idx < args.length && (args[idx] == null || typeof args[idx] === 'object')) {
-      const options = args[idx++] || {}
+        if (options.path !== undefined) {
+          path = options.path
+        }
 
-      if (options.signal !== undefined) {
-        signal = options.signal
-      }
+        if (options.state !== undefined) {
+          state = options.state
+        }
 
-      if (options.timeout !== undefined) {
-        timeout = options.timeout
-      }
+        if (options.dataOnly !== undefined) {
+          dataOnly = options.dataOnly
+        }
 
-      if (options.path !== undefined) {
-        path = options.path
+        if (options.sync !== undefined) {
+          sync = options.sync
+        }
       }
 
-      if (options.state !== undefined) {
-        state = options.state
+      if (typeof state === 'string') {
+        state = C.RECORD_STATE[state.toUpperCase()]
       }
 
-      if (options.dataOnly !== undefined) {
-        dataOnly = options.dataOnly
-      }
+      // TODO (perf): Make a class
+      const subscription = {
+        subscriber,
+        path,
+        state,
+        synced: false,
+        signal,
+        dataOnly,
+        data: kEmpty,
+        /** @type {NodeJS.Timeout|Timeout|null} */
+        timeout: null,
+        /** @type {Record?} */
+        record: null,
+        /** @type {Function?} */
+        abort: null,
+        unsubscribe() {
+          if (this.timeout) {
+            timers.clearTimeout(this.timeout)
+            this.timeout = null
+          }
 
-      if (options.sync !== undefined) {
-        sync = options.sync
-      }
+          if (this.signal) {
+            utils.removeAbortListener(this.signal, this.abort)
+            this.signal = null
+            this.abort = null
+          }
 
-      if (options.first !== undefined) {
-        first = options.first
+          if (this.record) {
+            this.record.unsubscribe(onUpdate, this)
+            this.record.unref()
+            this.record = null
+          }
+        },
       }
-    }
-
-    if (typeof state === 'string') {
-      state = C.RECORD_STATE[state.toUpperCase()]
-    }
-
-    // TODO (perf): Make a class
-    const subscription = {
-      subscriber,
-      first,
-      path,
-      state,
-      synced: false,
-      signal,
-      dataOnly,
-      data: kEmpty,
-      /** @type {NodeJS.Timeout|Timeout|null} */
-      timeout: null,
-      /** @type {Record?} */
-      record: null,
-      /** @type {Function?} */
-      abort: null,
-      unsubscribe() {
-        if (this.timeout) {
-          timers.clearTimeout(this.timeout)
-          this.timeout = null
-        }
-
-        if (this.signal) {
-          utils.removeAbortListener(this.signal, this.abort)
-          this.signal = null
-          this.abort = null
-        }
 
-        if (this.record) {
-          this.record.unsubscribe(onUpdate, this)
-          this.record.unref()
-          this.record = null
-        }
-      },
-    }
-
-    subscription.record = this.getRecord(name).subscribe(onUpdate, subscription)
+      subscription.record = this.getRecord(name).subscribe(onUpdate, subscription)
 
-    const record = subscription.record
+      const record = subscription.record
 
-    if (sync && record.state >= C.RECORD_STATE.SERVER) {
-      this._sync(onSync, sync === true ? 'WEAK' : sync, subscription)
-    } else {
-      subscription.synced = true
-    }
+      if (sync && record.state >= C.RECORD_STATE.SERVER) {
+        this._sync(onSync, sync === true ? 'WEAK' : sync, subscription)
+      } else {
+        subscription.synced = true
+      }
 
-    if (timeout > 0 && state && record.state < state) {
-      // TODO (perf): Avoid Timer allocation.
-      subscription.timeout = timers.setTimeout(onTimeout, timeout, subscription)
-    }
+      if (timeout > 0 && state && record.state < state) {
+        // TODO (perf): Avoid Timer allocation.
+        subscription.timeout = timers.setTimeout(onTimeout, timeout, subscription)
+      }
 
-    if (signal) {
-      // TODO (perf): Avoid abort closure allocation.
-      subscription.abort = () => subscriber.error(new utils.AbortError())
-      utils.addAbortListener(signal, subscription.abort)
-    }
+      if (signal) {
+        // TODO (perf): Avoid abort closure allocation.
+        subscription.abort = () => subscriber.error(new utils.AbortError())
+        utils.addAbortListener(signal, subscription.abort)
+      }
 
-    if (record.version) {
-      onUpdate(null, subscription)
-    }
+      if (record.version) {
+        onUpdate(null, subscription)
+      }
 
-    return subscription
+      return subscription
+    })
   }
 
   _$handle(message) {