@nxtedition/deepstream.io-client-js 23.4.1 → 23.4.3

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.1",
+  "version": "23.4.3",
   "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

@@ -48,7 +48,17 @@ class RecordHandler {
 
     this._client.on(C.EVENT.CONNECTED, this._onConnectionStateChange.bind(this))
 
+    const _prune = () => {
+      if (!this._pruning) {
+        this._pruning = true
+        this._schedule(prune)
+      }
+    }
+
     const prune = () => {
+      this._now = Date.now()
+      this._pruning = false
+
       let counter = 0
       for (const [rec, timestamp] of this._prune) {
         if (this._now - timestamp < 1e3) {
@@ -65,22 +75,13 @@ class RecordHandler {
         this._prune.delete(rec)
 
         if (counter++ > 1024) {
-          this._schedule(prune)
-          return
+          _prune()
         }
       }
-
-      this._pruning = false
     }
 
-    const pruneInterval = setInterval(() => {
-      this._now = Date.now()
-      if (!this._pruning) {
-        this._pruning = true
-        this._schedule(prune)
-      }
-    }, 1e3)
-    pruneInterval.unref?.()
+    this._pruneInterval = setInterval(_prune, 1e3)
+    this._pruneInterval.unref?.()
   }
 
   _onRef(rec) {