@nxtedition/deepstream.io-client-js 24.2.1 → 24.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.2.1",
+  "version": "24.2.3",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "bugs": {

package/src/message/connection.js

@@ -1,8 +1,8 @@
 const BrowserWebSocket = globalThis.WebSocket || globalThis.MozWebSocket
-const NodeWebSocket = BrowserWebSocket ? null : require('ws')
+const utils = require('../utils/utils')
+const NodeWebSocket = utils.isNode ? require('ws') : null
 const messageParser = require('./message-parser')
 const messageBuilder = require('./message-builder')
-const utils = require('../utils/utils')
 const C = require('../constants/constants')
 const pkg = require('../../package.json')
 const xxhash = require('xxhash-wasm')
@@ -101,11 +101,11 @@ Connection.prototype.close = function () {
 }
 
 Connection.prototype._createEndpoint = function () {
-  this._endpoint = BrowserWebSocket
-    ? new BrowserWebSocket(this._url)
-    : new NodeWebSocket(this._url, {
+  this._endpoint = NodeWebSocket
+    ? new NodeWebSocket(this._url, {
         generateMask() {},
       })
+    : new BrowserWebSocket(this._url)
   this._corked = false
 
   this._endpoint.onopen = this._onOpen.bind(this)

package/src/record/record-handler.js

@@ -45,9 +45,12 @@ function onTimeout(subscription) {
   const current = C.RECORD_STATE_NAME[subscription.record.state]
 
   subscription.subscriber.error(
-    Object.assign(new Error(`timeout  ${subscription.record.name} [${current}<${expected}]`), {
-      code: 'ETIMEDOUT',
-    })
+    Object.assign(
+      new Error(`timeout state: ${subscription.record.name} [${current}<${expected}]`),
+      {
+        code: 'ETIMEDOUT',
+      }
+    )
   )
 }
 
@@ -68,16 +71,20 @@ function onSyncFast(opaque) {
 }
 
 function onTimeoutFast(opaque) {
-  const { rec, resolve } = opaque
+  const { rec, synced, resolve } = opaque
   rec.unsubscribe(onUpdateFast, opaque)
   rec.unref()
-  resolve(
-    Promise.reject(
-      Object.assign(new Error(`timeout ${opaque.rec.name} [${opaque.rec.state}<${opaque.state}]`), {
-        code: 'ETIMEDOUT',
-      })
-    )
-  )
+
+  let err
+  if (rec.state < opaque.state) {
+    err = new Error(`timeout state: ${opaque.rec.name} [${opaque.rec.state}<${opaque.state}]`)
+  } else if (!synced) {
+    err = new Error(`timeout sync: ${opaque.rec.name} `)
+  } else {
+    err = new Error('timeout')
+  }
+
+  resolve(Promise.reject(Object.assign(err, { code: 'ETIMEDOUT' })))
 }
 
 class RecordHandler {
@@ -323,7 +330,7 @@ class RecordHandler {
 
       let serverTimeout
       const token = xuid()
-      await Promise.race([
+      return await Promise.race([
         await new Promise((resolve) => {
           this._syncEmitter.once(token, resolve)
           this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
@@ -606,7 +613,7 @@ class RecordHandler {
     }
 
     if (message.action === C.ACTIONS.SYNC) {
-      this._syncEmitter.emit(message.data[0])
+      this._syncEmitter.emit(message.data[0], message.data[1]?.toString())
       return true
     }