@nxtedition/deepstream.io-client-js 24.1.9 → 24.1.11

package/benchmark/record-handler.mjs

@@ -0,0 +1,14 @@
+import { bench, run } from 'mitata'
+import createDeepstream from '../src/client.js'
+
+const ds = createDeepstream('ws://localhost:6020/deepstream')
+
+bench('record.get', () => {
+  ds.record.get(Math.random().toString())
+})
+
+bench('record.observe', () => {
+  ds.record.observe(Math.random().toString()).subscribe()
+})
+
+await run()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.1.9",
+  "version": "24.1.11",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "bugs": {
@@ -78,6 +78,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.2",
+    "mitata": "^0.1.11",
     "pinst": "^3.0.0",
     "prettier": "^2.8.8"
   },

package/src/message/connection.js

@@ -9,8 +9,6 @@ const xxhash = require('xxhash-wasm')
 const FixedQueue = require('../utils/fixed-queue')
 const Emitter = require('component-emitter2')
 
-const kCorked = Symbol('corked')
-
 const Connection = function (client, url, options) {
   this._client = client
   this._options = options
@@ -108,6 +106,7 @@ Connection.prototype._createEndpoint = function () {
     : new NodeWebSocket(this._url, {
         generateMask() {},
       })
+  this._corked = false
 
   this._endpoint.onopen = this._onOpen.bind(this)
   this._endpoint.onerror = this._onError.bind(this)
@@ -138,12 +137,12 @@ Connection.prototype.send = function (message) {
     return false
   }
 
-  if (this._endpoint._socket && !this._endpoint[kCorked]) {
+  if (this._endpoint._socket && !this._corked) {
     this._endpoint._socket.cork()
-    this._endpoint[kCorked] = true
+    this._corked = true
     setImmediate(() => {
-      this._endpoint[kCorked] = false
       this._endpoint._socket.uncork()
+      this._corked = false
     })
   }
 

package/src/record/record-handler.js

@@ -51,6 +51,27 @@ function onTimeout(subscription) {
   )
 }
 
+function onUpdateFast(rec, opaque) {
+  if (rec.state >= opaque.state) {
+    timers.clearTimeout(opaque.timeout)
+    rec.unsubscribe(onUpdateFast, opaque)
+    rec.unref()
+    opaque.resolve(rec.data)
+  }
+}
+
+function onTimeoutFast(opaque) {
+  opaque.unsubscribe(onUpdateFast, opaque)
+  opaque.unref()
+  opaque.resolve(
+    Promise.reject(
+      Object.assign(new Error(`timeout ${opaque.rec.name} [${opaque.rec.state}<${opaque.state}]`), {
+        code: 'ETIMEDOUT',
+      })
+    )
+  )
+}
+
 class RecordHandler {
   constructor(options, connection, client) {
     this.JSON = jsonPath
@@ -367,14 +388,35 @@ class RecordHandler {
    * @returns {Promise}
    */
   get(...args) {
-    return new Promise((resolve, reject) => {
-      this.observe(...args)
-        .pipe(rx.first())
-        .subscribe({
-          next: resolve,
-          error: reject,
-        })
-    })
+    if (args.length === 1 || (args.length === 2 && typeof args[1] === 'number')) {
+      return new Promise((resolve) => {
+        const rec = this.getRecord(args[0])
+        const state = args.length === 2 ? args[1] : C.RECORD_STATE.SERVER
+
+        if (rec.state < state) {
+          rec.unref()
+          resolve(rec.data)
+        } else {
+          const opaque = {
+            rec,
+            state,
+            resolve,
+            timeout: null,
+          }
+          opaque.timeout = timers.setTimeout(onTimeoutFast, 2 * 60e3, opaque)
+          rec.subscribe(onUpdateFast, opaque)
+        }
+      })
+    } else {
+      return new Promise((resolve, reject) => {
+        this.observe(...args)
+          .pipe(rx.first())
+          .subscribe({
+            next: resolve,
+            error: reject,
+          })
+      })
+    }
   }
 
   /**
@@ -418,7 +460,10 @@ class RecordHandler {
 
     let idx = 0
 
-    if (idx < args.length && (args[idx] == null || typeof args[idx] === 'string')) {
+    if (
+      idx < args.length &&
+      (args[idx] == null || typeof args[idx] === 'string' || Array.isArray(args[idx]))
+    ) {
       path = args[idx++]
     }