@nxtedition/deepstream.io-client-js 23.4.40 → 23.4.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "23.4.40",
+  "version": "23.4.42",
   "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() {
@@ -231,8 +232,6 @@ class Record {
   }
 
   _$onConnectionStateChange() {
-    const prevState = this._state
-
     const connection = this._handler._connection
     if (connection.connected) {
       if (this._refs > 0) {
@@ -246,11 +245,21 @@ class Record {
       }
     } else {
       this._subscribed = false
-      this._state = Record.STATE.CLIENT
+      if (this._state > Record.STATE.CLIENT) {
+        this._state = Record.STATE.CLIENT
+        this._handler._onPending(this)
+        this._emitUpdate()
+      }
     }
+  }
 
-    if (this._state !== prevState) {
-      this._emitUpdate()
+  _subscribe() {
+    invariant(this._refs, this._name + ' missing refs')
+
+    const connection = this._handler._connection
+    if (!this._subscribed && connection.connected) {
+      connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
+      this._subscribed = true
     }
   }
 
@@ -258,35 +267,17 @@ class Record {
     invariant(!this._refs, this._name + ' must not have refs')
     invariant(!this._patches, this._name + ' must not have patches')
 
-    const prevState = this._state
-
     const connection = this._handler._connection
     if (this._subscribed && connection.connected) {
       connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, this._name)
     }
 
     this._subscribed = false
-    this._state = Record.STATE.CLIENT
-
-    if (this._state !== prevState) {
-      this._emitUpdate()
-    }
-  }
-
-  _subscribe() {
-    invariant(this._refs, this._name + ' missing refs')
-
-    if (!this._pending) {
-      this._pending = true
+    if (this._state > Record.STATE.CLIENT) {
+      this._state = Record.STATE.CLIENT
       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)
-      this._subscribed = true
-    }
   }
 
   _update(nextData) {
@@ -318,46 +309,36 @@ class Record {
   _onUpdate([, version, data]) {
     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
     }
 
-    if (this._patches) {
-      this._version = version
-      this._data = jsonPath.parse(data)
-
-      if (this._version.charAt(0) !== 'I') {
-        let patchData = this._data
-        for (let n = 0; n < this._patches.length; n += 2) {
-          patchData = jsonPath.set(patchData, this._patches[n + 0], this._patches[n + 1], false)
-        }
-        this._update(patchData)
-      }
-
-      this._patches = null
-    } else if (version.charAt(0) === 'I' || utils.compareRev(version, this._version) > 0) {
-      this._version = version
+    if (
+      (version.charAt(0) === 'I' && this._version !== version) ||
+      utils.compareRev(version, this._version) > 0
+    ) {
       this._data = jsonPath.set(this._data, null, jsonPath.parse(data), true)
+      this._version = version
     }
 
-    if (this._pending) {
-      this._pending = false
-      this._handler._onPending(this)
+    invariant(this._version, 'must have version')
+    invariant(this._data, 'must have data')
+
+    if (this._patches && this._version.charAt(0) !== 'I') {
+      let patchData = this._data
+      for (let n = 0; n < this._patches.length; n += 2) {
+        patchData = jsonPath.set(patchData, this._patches[n + 0], this._patches[n + 1], false)
+      }
+      this._update(patchData)
     }
+    this._patches = null
 
     if (this._state < Record.STATE.SERVER) {
       this._state = this._version.charAt(0) === 'I' ? Record.STATE.STALE : Record.STATE.SERVER
-    }
-
-    if (
-      this._data !== prevData ||
-      this._version !== prevVersion ||
-      this._state !== prevState ||
-      this._pending !== prevPending
-    ) {
+      this._handler._onPending(this)
+      this._emitUpdate()
+    } else if (this._data !== prevData || this._version !== prevVersion) {
       this._emitUpdate()
     }
   }