@nxtedition/deepstream.io-client-js 23.4.27 → 23.4.28

package/package.json

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

package/src/record/record-handler.js

@@ -24,11 +24,9 @@ class RecordHandler {
     this._client = client
     this._records = new Map()
     this._listeners = new Map()
-    this._prune = new Map()
     this._patch = new Set()
-    this._now = Date.now()
-    this._pruning = false
-    this._purging = false
+    this._prune = new Set()
+
     this._connected = 0
     this._stats = {
       updating: 0,
@@ -46,55 +44,50 @@ class RecordHandler {
     this.provide = this.provide.bind(this)
     this.getRecord = this.getRecord.bind(this)
 
-    this._schedule = options.schedule ?? utils.schedule
-
     this._client.on(C.EVENT.CONNECTED, this._onConnectionStateChange.bind(this))
 
-    const _prune = () => {
-      let counter = 0
-      for (const [rec, timestamp] of this._prune) {
-        if (rec.pending) {
-          continue
-        }
-
-        if (this._now - timestamp < 1e3) {
-          return
-        }
+    // TODO (perf): schedule & yield to avoid blocking event loop?
+    const _pruneSome = () => {
+      const prune = this._prune
 
+      this._prune = new Set()
+      for (const rec of prune) {
+        invariant(rec.pending === false && rec.refs === 0)
         rec._unsubscribe()
-
         this._records.delete(rec.name)
-        this._prune.delete(rec)
-
-        if (counter++ > 2048) {
-          this._schedule(_prune)
-          return
-        }
       }
 
-      this._pruning = false
-      this._now = Date.now()
+      const prunetimeout = utils.setTimeout(() => _pruneSome, 1e3)
+      prunetimeout.unref?.()
     }
 
-    this._pruneInterval = utils.setInterval(() => {
-      if (!this._pruning) {
-        this._pruning = true
-        this._schedule(_prune)
-      }
-    }, 1e3)
-    this._pruneInterval.unref?.()
+    _pruneSome()
 
     this._syncAll = this._syncAll.bind(this)
   }
 
   _onRef(rec) {
-    if (rec.refs === 0) {
-      this._prune.set(rec, this._now)
+    if (rec.refs === 0 && !rec.pending) {
+      this._prune.add(rec)
     } else if (rec.refs === 1) {
       this._prune.delete(rec)
     }
   }
 
+  _onPending(rec) {
+    if (!rec.pending) {
+      this._patch.delete(rec)
+      if (rec.refs === 0) {
+        this._prune.add(rec)
+      }
+    } else {
+      this._patch.add(rec)
+      if (rec.refs === 0) {
+        this._prune.delete(rec)
+      }
+    }
+  }
+
   get connected() {
     return Boolean(this._connected)
   }

package/src/record/record.js

@@ -21,6 +21,7 @@ class Record {
     this._subscriptions = []
     this._updating = null
     this._patches = null
+    this._pruning = false
 
     this._subscribe()
   }
@@ -115,9 +116,11 @@ class Record {
     }
 
     if (!this._version) {
+      if (!this._patches) {
+        this._handler._onPending(this)
+      }
       this._patches = path && this._patches ? this._patches : []
       this._patches.push(path, cloneDeep(data))
-      this._handler._patch.add(this)
     }
 
     if (this._update(jsonPath.set(this._data, path, data, false))) {
@@ -315,7 +318,7 @@ class Record {
       }
 
       this._patches = null
-      this._handler._patch.delete(this)
+      this._handler._onPending(this)
     } else if (version.charAt(0) === 'I' || utils.compareRev(version, this._version) > 0) {
       this._version = version
       this._data = jsonPath.set(this._data, null, jsonPath.parse(data), true)