@nxtedition/deepstream.io-client-js 23.4.43 → 23.4.45

package/package.json

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

package/src/constants/constants.js

@@ -12,9 +12,10 @@ module.exports.CONNECTION_STATE.RECONNECTING = 'RECONNECTING'
 module.exports.RECORD_STATE = {}
 module.exports.RECORD_STATE.VOID = 0
 module.exports.RECORD_STATE.CLIENT = 1
-module.exports.RECORD_STATE.SERVER = 2
-module.exports.RECORD_STATE.STALE = 3
-module.exports.RECORD_STATE.PROVIDER = 4
+module.exports.RECORD_STATE.PENDING = 2
+module.exports.RECORD_STATE.SERVER = 3
+module.exports.RECORD_STATE.STALE = 4
+module.exports.RECORD_STATE.PROVIDER = 5
 
 module.exports.RECORD_STATE_NAME = []
 for (const [key, val] of Object.entries(module.exports.RECORD_STATE)) {

package/src/record/record-handler.js

@@ -51,11 +51,13 @@ class RecordHandler {
 
     // TODO (perf): schedule & yield to avoid blocking event loop?
     const _prune = () => {
-      const prune = this._pruning
+      const pruning = this._pruning
 
       this._pruning = new Set()
-      for (const rec of prune) {
-        invariant(!rec.pending && !rec.refs, 'cannot prune pending or referenced record')
+      for (const rec of pruning) {
+        invariant(rec.refs === 0, 'cannot prune referenced record')
+        invariant(!this._pending.has(rec), 'cannot prune pending record')
+
         rec._unsubscribe()
         this._records.delete(rec.name)
         this._stats.destroyed++
@@ -75,7 +77,7 @@ class RecordHandler {
   }
 
   _onRef(rec) {
-    if (rec.refs === 0 && !rec.pending) {
+    if (rec.refs === 0 && !this._pending.has(rec)) {
       this._pruning.add(rec)
     } else if (rec.refs === 1) {
       this._pruning.delete(rec)
@@ -83,7 +85,7 @@ class RecordHandler {
   }
 
   _onPending(rec) {
-    if (!rec.pending) {
+    if (rec.state > C.RECORD_STATE.PENDING) {
       this._pending.delete(rec)
       if (rec.refs === 0) {
         this._pruning.add(rec)
@@ -164,7 +166,11 @@ class RecordHandler {
     return new Promise((resolve) => {
       let counter = 0
 
-      const doSync = () => {
+      const maybeSync = () => {
+        if (counter > 0) {
+          return
+        }
+
         const token = xuid()
         this._syncEmitter.once(token, resolve)
 
@@ -174,7 +180,7 @@ class RecordHandler {
       }
 
       const onUpdate = (rec) => {
-        if (rec.pending) {
+        if (rec.state < C.RECORD_STATE.SERVER) {
           return
         }
 
@@ -182,22 +188,18 @@ class RecordHandler {
         rec.unref()
         counter -= 1
 
-        if (counter > 0) {
-          return
-        }
-
-        doSync()
+        maybeSync()
       }
 
-      if (this._pending.size > 0) {
-        for (const rec of this._pending) {
+      for (const rec of this._pending) {
+        if (rec.state < C.RECORD_STATE.SERVER) {
           rec.ref()
           rec.subscribe(onUpdate)
           counter += 1
         }
-      } else {
-        doSync()
       }
+
+      maybeSync()
     })
   }
 

package/src/record/record.js

@@ -48,10 +48,6 @@ class Record {
     return this._refs
   }
 
-  get pending() {
-    return this._state < Record.STATE.SERVER
-  }
-
   ref() {
     this._refs += 1
     if (this._refs === 1) {
@@ -127,9 +123,10 @@ class Record {
       throw new Error('invalid argument: path')
     }
 
-    if (!this._version) {
+    if (this._state < Record.STATE.SERVER) {
       this._patches = path && this._patches ? this._patches : []
       this._patches.push(path, cloneDeep(data))
+      this._state = Record.STATE.PENDING
     }
 
     if (this._update(jsonPath.set(this._data, path, data, false))) {