@nxtedition/deepstream.io-client-js 23.4.32 → 23.4.34

package/package.json

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

package/src/record/record-handler.js

@@ -24,8 +24,8 @@ class RecordHandler {
     this._client = client
     this._records = new Map()
     this._listeners = new Map()
-    this._patch = new Set()
-    this._prune = new Set()
+    this._pending = new Set()
+    this._pruning = new Set()
 
     this._connected = 0
     this._stats = {
@@ -48,56 +48,53 @@ class RecordHandler {
 
     this._client.on(C.EVENT.CONNECTED, this._onConnectionStateChange.bind(this))
 
-    this._pruneTimeout = null
+    this._pruningTimeout = null
 
     // TODO (perf): schedule & yield to avoid blocking event loop?
-    const _pruneSome = () => {
-      const prune = this._prune
+    const _prune = () => {
+      const prune = this._pruning
 
-      this._prune = new Set()
+      this._pruning = new Set()
       for (const rec of prune) {
-        invariant(
-          rec.pending === false && rec.refs === 0,
-          'cannot prune pending or referenced record'
-        )
+        invariant(!rec.pending && !rec.ref, 'cannot prune pending or referenced record')
         rec._unsubscribe()
         this._records.delete(rec.name)
         this._stats.destroyed++
       }
 
-      if (this._pruneTimeout && this._pruneTimeout.refresh) {
-        this._pruneTimeout.refresh()
+      if (this._pruningTimeout && this._pruningTimeout.refresh) {
+        this._pruningTimeout.refresh()
       } else {
-        this._pruneTimeout = setTimeout(_pruneSome, 1e3)
-        if (this._pruneTimeout.unref) {
-          this._pruneTimeout.unref()
+        this._pruningTimeout = setTimeout(_prune, 1e3)
+        if (this._pruningTimeout.unref) {
+          this._pruningTimeout.unref()
         }
       }
     }
 
-    _pruneSome()
+    _prune()
 
     this._syncAll = this._syncAll.bind(this)
   }
 
   _onRef(rec) {
     if (rec.refs === 0 && !rec.pending) {
-      this._prune.add(rec)
+      this._pruning.add(rec)
     } else if (rec.refs === 1) {
-      this._prune.delete(rec)
+      this._pruning.delete(rec)
     }
   }
 
   _onPending(rec) {
     if (!rec.pending) {
-      this._patch.delete(rec)
+      this._pending.delete(rec)
       if (rec.refs === 0) {
-        this._prune.add(rec)
+        this._pruning.add(rec)
       }
     } else {
-      this._patch.add(rec)
+      this._pending.add(rec)
       if (rec.refs === 0) {
-        this._prune.delete(rec)
+        this._pruning.delete(rec)
       }
     }
   }
@@ -111,8 +108,8 @@ class RecordHandler {
       ...this._stats,
       listeners: this._listeners.size,
       records: this._records.size,
-      pruning: this._prune.size,
-      pending: this._patch.size,
+      pruning: this._pruning.size,
+      pending: this._pending.size,
     }
   }
 
@@ -180,7 +177,7 @@ class RecordHandler {
       let token
       let timeoutHandle
 
-      const records = [...this._patch]
+      const records = [...this._pending]
 
       const onDone = (val) => {
         if (done) {

package/src/record/record.js

@@ -21,7 +21,7 @@ class Record {
     this._subscriptions = []
     this._updating = null
     this._patches = null
-    this._pruning = false
+    this._pending = false
 
     this._subscribe()
   }
@@ -47,7 +47,7 @@ class Record {
   }
 
   get pending() {
-    return this._patches ? this._patches.length / 2 : 0
+    return this._pending
   }
 
   ref() {
@@ -243,7 +243,7 @@ class Record {
 
   _unsubscribe() {
     invariant(!this._refs, this._name + ' must not have refs')
-    invariant(!this.pending, this._name + ' must not have pending')
+    invariant(!this._patches, this._name + ' must not have patches')
 
     const prevState = this._state
 
@@ -263,6 +263,11 @@ class Record {
   _subscribe() {
     invariant(this._refs, this._name + ' missing refs')
 
+    if (!this._pending) {
+      this._pending = true
+      this._handler._onPending(this)
+    }
+
     const connection = this._handler._connection
     if (!this._subscribed && connection.connected) {
       connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
@@ -318,12 +323,16 @@ class Record {
       }
 
       this._patches = null
-      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)
     }
 
+    if (this._pending) {
+      this._pending = false
+      this._handler._onPending(this)
+    }
+
     if (this._state < Record.STATE.SERVER) {
       this._state = this._version.charAt(0) === 'I' ? Record.STATE.STALE : Record.STATE.SERVER
     }