@nxtedition/deepstream.io-client-js 24.2.0 → 24.2.2

package/package.json

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

package/src/message/connection.js

@@ -140,10 +140,10 @@ Connection.prototype.send = function (message) {
   if (this._endpoint._socket && !this._corked) {
     this._endpoint._socket.cork()
     this._corked = true
-    setImmediate(() => {
+    setTimeout(() => {
       this._endpoint._socket.uncork()
       this._corked = false
-    })
+    }, 1)
   }
 
   this.emit('send', message)
@@ -188,7 +188,7 @@ Connection.prototype._onOpen = function () {
 }
 
 Connection.prototype._onError = function (err) {
-  this._recvMessages()
+  this._recvMessages({ didTimeout: true, timeRemaining: () => 0 })
 
   if (err.error) {
     const { message, error } = err
@@ -210,7 +210,7 @@ Connection.prototype._onError = function (err) {
 }
 
 Connection.prototype._onClose = function () {
-  this._recvMessages()
+  this._recvMessages({ didTimeout: true, timeRemaining: () => 0 })
 
   if (this._deliberateClose === true) {
     this._setState(C.CONNECTION_STATE.CLOSED)
@@ -236,7 +236,7 @@ Connection.prototype._recvMessages = function (deadline) {
   for (
     let n = 0;
     // eslint-disable-next-line no-unmodified-loop-condition
-    n < this._batchSize && (!deadline || deadline.timeRemaining() || deadline.didTimeout);
+    deadline ? deadline.didTimeout || deadline.timeRemaining() : n < this._batchSize;
     ++n
   ) {
     const message = this._recvQueue.shift()

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 {
@@ -356,7 +363,7 @@ class RecordHandler {
       return
     }
 
-    setImmediate(() => {
+    setTimeout(() => {
       // Token must be universally unique until deepstream properly separates
       // sync requests from different sockets.
       const token = xuid()
@@ -367,7 +374,7 @@ class RecordHandler {
         }
       })
       this._connection.sendMsg2(C.TOPIC.RECORD, C.ACTIONS.SYNC, token, 'WEAK')
-    })
+    }, 1)
   }
 
   set(name, ...args) {

package/src/record/record.js

@@ -128,7 +128,7 @@ class Record {
     if (!path) {
       return this._data
     } else if (typeof path === 'string' || Array.isArray(path)) {
-      return path ? jsonPath.get(this._data, path) : this._data
+      return jsonPath.get(this._data, path)
     } else if (typeof path === 'function') {
       return path(this._data)
     } else {

package/src/utils/utils.js

@@ -126,7 +126,11 @@ module.exports.AbortError = class AbortError extends Error {
   }
 }
 
-module.exports.schedule = isNode ? setImmediate : window.requestIdleCallback
+function defaultSchedule(fn) {
+  setTimeout(fn, 0)
+}
+
+module.exports.schedule = isNode ? defaultSchedule : window.requestIdleCallback
 
 const abortSignals = new WeakMap()
 const onAbort = function () {