@nxtedition/deepstream.io-client-js 31.2.4 → 31.2.5

package/package.json

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

package/src/record/record-handler.js

@@ -472,30 +472,31 @@ class RecordHandler {
   }
 
   /**
+   * @param {string} name
    * @param  {...any} args
    * @returns {rxjs.Observable}
    */
-  observe(...args) {
-    return this._observe(OBSERVE_DEFAULTS, ...args)
+  observe(name, ...args) {
+    return this._observe(OBSERVE_DEFAULTS, name, ...args)
   }
 
   /**
+   * @param {string} name
    * @param  {...any} args
    * @returns {rxjs.Observable<{ name: string, version: string, state: Number, data: any}>}
    */
-  observe2(...args) {
-    return this._observe(OBSERVE2_DEFAULTS, ...args)
+  observe2(name, ...args) {
+    return this._observe(OBSERVE2_DEFAULTS, name, ...args)
   }
 
   /**
-   *
-   * @param {*} name
+   * @param {string} name
    * @param  {...any} args
    * @returns { { value: object, async: false } | { value: Promise<object>, async: true } }
    */
   getAsync(name, ...args) {
     let path
-    let state = GET_DEFAULTS.state
+    let state = GET_DEFAULTS.state ?? C.RECORD_STATE.CLIENT
 
     let idx = 0
 
@@ -517,32 +518,40 @@ class RecordHandler {
       return { value: this.get(name, ...args), async: true }
     }
 
+    if (typeof state === 'string') {
+      state = C.RECORD_STATE[state.toUpperCase()]
+    }
+
+    if (!Number.isInteger(state) || state < 0) {
+      throw new Error('invalid argument: state')
+    }
+
     const rec = this.getRecord(name)
     try {
-      if (rec.state >= state) {
-        return { value: rec.get(path), async: false }
-      }
+      return rec.state >= state
+        ? { value: rec.get(path), async: false }
+        : { value: this.get(name, ...args), async: true }
     } finally {
       rec.unref()
     }
-
-    return { value: this.get(name, ...args), async: true }
   }
 
   /**
+   * @param {string} name
    * @param  {...any} args
    * @returns {Promise<object>}
    */
-  get(...args) {
-    return rxjs.firstValueFrom(this._observe(GET_DEFAULTS, ...args))
+  get(name, ...args) {
+    return rxjs.firstValueFrom(this._observe(GET_DEFAULTS, name, ...args))
   }
 
   /**
+   * @param {string} name
    * @param  {...any} args
    * @returns {Promise<object>}
    */
-  get2(...args) {
-    return rxjs.firstValueFrom(this._observe(GET2_DEFAULTS, ...args))
+  get2(name, ...args) {
+    return rxjs.firstValueFrom(this._observe(GET2_DEFAULTS, name, ...args))
   }
 
   /**
@@ -605,9 +614,6 @@ class RecordHandler {
         state = C.RECORD_STATE[state.toUpperCase()]
       }
 
-      // TODO (fix): Validate path?
-      // TODO (fix): Validate signal?
-
       if (!Number.isInteger(state) || state < 0) {
         throw new Error('invalid argument: state')
       }