@nxtedition/deepstream.io-client-js 23.4.39 → 23.4.41

package/package.json

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

package/src/record/record-handler.js

@@ -164,6 +164,15 @@ class RecordHandler {
     return new Promise((resolve) => {
       let counter = 0
 
+      const doSync = () => {
+        const token = xuid()
+        this._syncEmitter.once(token, resolve)
+
+        if (this._connected) {
+          this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
+        }
+      }
+
       const onUpdate = (rec) => {
         if (rec.pending) {
           return
@@ -177,18 +186,17 @@ class RecordHandler {
           return
         }
 
-        const token = xuid()
-        this._syncEmitter.once(token, resolve)
-
-        if (this._connected) {
-          this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
-        }
+        doSync()
       }
 
-      for (const rec of this._pending) {
-        rec.ref()
-        rec.subscribe(onUpdate)
-        counter += 1
+      if (this._pending.size > 0) {
+        for (const rec of this._pending) {
+          rec.ref()
+          rec.subscribe(onUpdate)
+          counter += 1
+        }
+      } else {
+        doSync()
       }
     })
   }

package/src/record/record.js

@@ -22,7 +22,8 @@ class Record {
     this._subscriptionsEmitting = false
     this._updating = null
     this._patches = null
-    this._pending = false
+
+    this._handler._onPending(this)
 
     this._subscribe()
   }
@@ -48,7 +49,7 @@ class Record {
   }
 
   get pending() {
-    return this._pending
+    return this._state < Record.STATE.SERVER
   }
 
   ref() {
@@ -127,9 +128,6 @@ 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))
     }
@@ -250,6 +248,7 @@ class Record {
     } else {
       this._subscribed = false
       this._state = Record.STATE.CLIENT
+      this._handler._onPending(this)
     }
 
     if (this._state !== prevState) {
@@ -279,12 +278,6 @@ class Record {
   _subscribe() {
     invariant(this._refs, this._name + ' missing refs')
 
-    if (!this._pending) {
-      this._pending = true
-      this._handler._onPending(this)
-      this._emitUpdate()
-    }
-
     const connection = this._handler._connection
     if (!this._subscribed && connection.connected) {
       connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
@@ -322,7 +315,6 @@ class Record {
     const prevData = this._data
     const prevVersion = this._version
     const prevState = this._state
-    const prevPending = this._pending
 
     if (this._updating?.delete(version)) {
       this._handler._stats.updating -= 1
@@ -346,21 +338,12 @@ class Record {
       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
+      this._handler._onPending(this)
     }
 
-    if (
-      this._data !== prevData ||
-      this._version !== prevVersion ||
-      this._state !== prevState ||
-      this._pending !== prevPending
-    ) {
+    if (this._data !== prevData || this._version !== prevVersion || this._state !== prevState) {
       this._emitUpdate()
     }
   }