@nxtedition/deepstream.io-client-js 23.4.2 → 23.4.4

package/__tests__/json-path.test.js

@@ -342,4 +342,12 @@ describe('plain JSON', () => {
     )
     expect(res.date).toEqual(date.toISOString())
   })
+
+  it('remove property on undefined', () => {
+    const y = {
+      time: {},
+    }
+    const res = jsonPath.set(y, 'time', undefined)
+    expect(Object.keys(res)).toEqual([])
+  })
 })

package/package.json

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

package/src/record/json-path.js

@@ -68,7 +68,11 @@ function set(data, path, value, isPlainJSON = false) {
   for (let i = 0; i < tokens.length; i++) {
     const token = tokens[i]
     if (i === tokens.length - 1) {
-      node[token] = newValue
+      if (newValue !== undefined) {
+        node[token] = newValue
+      } else {
+        delete node[token]
+      }
     } else if (node[token] != null && typeof node[token] === 'object') {
       node = node[token] = utils.shallowCopy(node[token])
     } else if (tokens[i + 1] && !isNaN(tokens[i + 1])) {
@@ -77,6 +81,7 @@ function set(data, path, value, isPlainJSON = false) {
       node = node[token] = {}
     }
   }
+
   return result
 }
 
@@ -144,7 +149,10 @@ function patch(oldValue, newValue, isPlainJSON) {
           obj[newKeys[j]] = oldValue[newKeys[j]]
         }
       }
-      obj[key] = val
+
+      if (val !== undefined) {
+        obj[key] = val
+      }
     }
 
     return obj || oldValue

package/src/record/record-handler.js

@@ -9,6 +9,7 @@ const jsonPath = require('./json-path')
 const utils = require('../utils/utils')
 const rx = require('rxjs/operators')
 const xuid = require('xuid')
+const timers = require('../utils/timers')
 
 const kEmpty = Symbol('kEmpty')
 
@@ -180,7 +181,7 @@ class RecordHandler {
         signal?.removeEventListener('abort', onAbort)
 
         if (timeoutHandle) {
-          clearTimeout(timeoutHandle)
+          timers.clearTimeout(timeoutHandle)
           timeoutHandle = null
         }
 
@@ -207,8 +208,7 @@ class RecordHandler {
       const onTimeout = () => {
         const elapsed = Date.now() - this._connected
         if (elapsed < timeoutValue) {
-          timeoutHandle = setTimeout(onTimeout, timeoutValue - elapsed)
-          timeoutHandle.unref?.()
+          timeoutHandle = timers.setTimeout(onTimeout, timeoutValue - elapsed)
         } else {
           for (const rec of records.filter((rec) => !rec.isReady)) {
             this._client._$onError(C.TOPIC.RECORD, C.EVENT.TIMEOUT, 'record timeout', [
@@ -230,8 +230,7 @@ class RecordHandler {
       }
 
       if (timeoutValue) {
-        timeoutHandle = setTimeout(onTimeout, timeoutValue)
-        timeoutHandle.unref?.()
+        timeoutHandle = timers.setTimeout(onTimeout, timeoutValue)
       }
 
       signal?.addEventListener('abort', onAbort)
@@ -373,7 +372,7 @@ class RecordHandler {
         }
 
         if (timeoutHandle) {
-          clearTimeout(timeoutHandle)
+          timers.clearTimeout(timeoutHandle)
           timeoutHandle = null
         }
 
@@ -397,7 +396,7 @@ class RecordHandler {
       const record = this.getRecord(name).subscribe(onUpdate)
 
       if (timeoutValue && state && record.state < state) {
-        timeoutHandle = setTimeout(() => {
+        timeoutHandle = timers.setTimeout(() => {
           const expected = C.RECORD_STATE_NAME[state]
           const current = C.RECORD_STATE_NAME[record.state]
           o.error(
@@ -407,7 +406,6 @@ class RecordHandler {
             )
           )
         }, timeoutValue)
-        timeoutHandle.unref?.()
       }
 
       if (record.version) {

package/src/utils/timers.js

@@ -0,0 +1,97 @@
+// undici timers
+
+'use strict'
+
+let fastNow = Date.now()
+let fastNowTimeout
+
+const fastTimers = []
+
+function onTimeout() {
+  fastNow = Date.now()
+
+  let len = fastTimers.length
+  let idx = 0
+  while (idx < len) {
+    const timer = fastTimers[idx]
+
+    if (timer.state === 0) {
+      timer.state = fastNow + timer.delay
+    } else if (timer.state > 0 && fastNow >= timer.state) {
+      timer.state = -1
+      timer.callback(timer.opaque)
+    }
+
+    if (timer.state === -1) {
+      timer.state = -2
+      if (idx !== len - 1) {
+        fastTimers[idx] = fastTimers.pop()
+      } else {
+        fastTimers.pop()
+      }
+      len -= 1
+    } else {
+      idx += 1
+    }
+  }
+
+  if (fastTimers.length > 0) {
+    refreshTimeout()
+  }
+}
+
+function refreshTimeout() {
+  if (fastNowTimeout && fastNowTimeout.refresh) {
+    fastNowTimeout.refresh()
+  } else {
+    clearTimeout(fastNowTimeout)
+    fastNowTimeout = setTimeout(onTimeout, 1e3)
+    if (fastNowTimeout.unref) {
+      fastNowTimeout.unref()
+    }
+  }
+}
+
+class Timeout {
+  constructor(callback, delay, opaque) {
+    this.callback = callback
+    this.delay = delay
+    this.opaque = opaque
+
+    //  -2 not in timer list
+    //  -1 in timer list but inactive
+    //   0 in timer list waiting for time
+    // > 0 in timer list waiting for time to expire
+    this.state = -2
+
+    this.refresh()
+  }
+
+  refresh() {
+    if (this.state === -2) {
+      fastTimers.push(this)
+      if (!fastNowTimeout || fastTimers.length === 1) {
+        refreshTimeout()
+      }
+    }
+
+    this.state = 0
+  }
+
+  clear() {
+    this.state = -1
+  }
+}
+
+module.exports = {
+  setTimeout(callback, delay, opaque) {
+    return delay < 1e3 ? setTimeout(callback, delay, opaque) : new Timeout(callback, delay, opaque)
+  },
+  clearTimeout(timeout) {
+    if (timeout instanceof Timeout) {
+      timeout.clear()
+    } else {
+      clearTimeout(timeout)
+    }
+  },
+}