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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.1.22",
+  "version": "24.2.1",
   "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

@@ -356,7 +356,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 +367,7 @@ class RecordHandler {
         }
       })
       this._connection.sendMsg2(C.TOPIC.RECORD, C.ACTIONS.SYNC, token, 'WEAK')
-    })
+    }, 1)
   }
 
   set(name, ...args) {
@@ -504,7 +504,10 @@ class RecordHandler {
 
     if (
       idx < args.length &&
-      (args[idx] == null || typeof args[idx] === 'string' || Array.isArray(args[idx]))
+      (args[idx] == null ||
+        typeof args[idx] === 'string' ||
+        Array.isArray(args[idx]) ||
+        typeof args[idx] === 'function')
     ) {
       path = args[idx++]
     }

package/src/record/record.js

@@ -125,7 +125,15 @@ class Record {
   }
 
   get(path) {
-    return path ? jsonPath.get(this._data, path) : this._data
+    if (!path) {
+      return this._data
+    } else if (typeof path === 'string' || Array.isArray(path)) {
+      return jsonPath.get(this._data, path)
+    } else if (typeof path === 'function') {
+      return path(this._data)
+    } else {
+      throw new Error('invalid argument: path')
+    }
   }
 
   set(pathOrData, dataOrNil) {

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 () {