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

package/package.json

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

package/src/constants/constants.js

@@ -10,6 +10,7 @@ module.exports.CONNECTION_STATE.ERROR = 'ERROR'
 module.exports.CONNECTION_STATE.RECONNECTING = 'RECONNECTING'
 
 module.exports.RECORD_STATE = {}
+module.exports.RECORD_STATE.INIT = -1
 module.exports.RECORD_STATE.VOID = 0
 module.exports.RECORD_STATE.CLIENT = 1
 module.exports.RECORD_STATE.PENDING = 2

package/src/message/connection.js

@@ -363,6 +363,7 @@ Connection.prototype._setState = function (state) {
     this._client.emit(C.EVENT.CONNECTED, true)
   } else if (state === C.CONNECTION_STATE.RECONNECTING || state === C.CONNECTION_STATE.CLOSED) {
     this._client.emit(C.EVENT.CONNECTED, false)
+    this._reset()
   }
 }
 

package/src/record/record-handler.js

@@ -58,7 +58,7 @@ class RecordHandler {
         invariant(rec.refs === 0, 'cannot prune referenced record')
         invariant(!this._pending.has(rec), 'cannot prune pending record')
 
-        rec._unsubscribe()
+        rec._$dispose()
         this._records.delete(rec.name)
         this._stats.destroyed++
       }
@@ -77,24 +77,20 @@ class RecordHandler {
   }
 
   _onRef(rec) {
-    if (rec.refs === 0 && !this._pending.has(rec)) {
+    if (rec.refs === 0) {
       this._pruning.add(rec)
     } else if (rec.refs === 1) {
       this._pruning.delete(rec)
     }
   }
 
-  _onPending(rec) {
-    if (rec.state > C.RECORD_STATE.PENDING) {
-      this._pending.delete(rec)
-      if (rec.refs === 0) {
-        this._pruning.add(rec)
-      }
-    } else {
+  _onState(rec, prevState) {
+    // TODO (perf): avoid pending.has
+    if (rec.state < Record.STATE.SERVER && !this._pending.has(rec)) {
       this._pending.add(rec)
-      if (rec.refs === 0) {
-        this._pruning.delete(rec)
-      }
+      rec.ref()
+    } else if (this._pending.delete(rec)) {
+      rec.unref()
     }
   }
 
@@ -179,11 +175,15 @@ class RecordHandler {
         }
       }
 
+      const xs = new Set()
+
       const onUpdate = (rec) => {
         if (rec.state < C.RECORD_STATE.SERVER) {
           return
         }
 
+        xs.delete(rec.name)
+
         rec.unsubscribe(onUpdate)
         rec.unref()
         counter -= 1
@@ -193,8 +193,9 @@ class RecordHandler {
 
       for (const rec of this._pending) {
         if (rec.state < C.RECORD_STATE.SERVER) {
-          rec.ref()
+          xs.add(rec.name)
           rec.subscribe(onUpdate)
+          rec.ref()
           counter += 1
         }
       }

package/src/record/record.js

@@ -23,7 +23,7 @@ class Record {
     this._updating = null
     this._patches = null
 
-    this._handler._onPending(this)
+    this._handler._onState(this, Record.STATE.INIT)
 
     this._subscribe()
   }
@@ -49,22 +49,26 @@ class Record {
   }
 
   ref() {
+    const prevRefs = this._refs
+
     this._refs += 1
-    if (this._refs === 1) {
+    if (this._refs === 1 && !this._subscribed) {
       this._subscribe()
     }
 
-    this._handler._onRef(this)
+    this._handler._onRef(this, prevRefs)
 
     return this
   }
 
   unref() {
-    invariant(this._refs > 0, this._name + ' missing refs')
+    invariant(this._refs > 0, 'missing refs')
+
+    const prevRefs = this._refs
 
     this._refs -= 1
 
-    this._handler._onRef(this)
+    this._handler._onRef(this, prevRefs)
 
     return this
   }
@@ -99,7 +103,11 @@ class Record {
   }
 
   set(pathOrData, dataOrNil) {
-    invariant(this._refs > 0, this._name + ' missing refs')
+    const prevState = this._state
+    const prevData = this._data
+    const prevVersion = this._version
+
+    invariant(this._refs > 0, 'missing refs')
 
     if (this._version.charAt(0) === 'I' || this._name.startsWith('_')) {
       this._error(C.EVENT.USER_ERROR, 'cannot set')
@@ -123,20 +131,22 @@ class Record {
       throw new Error('invalid argument: path')
     }
 
+    this._update(jsonPath.set(this._data, path, data, false))
+
     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))) {
+      this._handler._onState(this, prevState)
+      this._emitUpdate()
+    } else if (this._data !== prevData || this._version !== prevVersion) {
       this._emitUpdate()
     }
   }
 
   // TODO (fix): timeout + signal
   when(stateOrNull) {
-    invariant(this._refs > 0, this._name + ' missing refs')
+    invariant(this._refs > 0, 'missing refs')
 
     const state = stateOrNull == null ? Record.STATE.SERVER : stateOrNull
 
@@ -167,7 +177,7 @@ class Record {
   }
 
   update(pathOrUpdater, updaterOrNil) {
-    invariant(this._refs > 0, this._name + ' missing refs')
+    invariant(this._refs > 0, 'missing refs')
 
     if (this._version.charAt(0) === 'I') {
       this._handler._client._$onError(C.TOPIC.RECORD, C.EVENT.UPDATE_ERROR, 'cannot update', [
@@ -205,17 +215,6 @@ class Record {
       })
   }
 
-  _emitUpdate() {
-    try {
-      this._subscriptionsEmitting = true
-      for (const fn of this._subscriptions) {
-        fn(this)
-      }
-    } finally {
-      this._subscriptionsEmitting = false
-    }
-  }
-
   _$onMessage(message) {
     if (message.action === C.ACTIONS.UPDATE) {
       this._onUpdate(message.data)
@@ -231,6 +230,8 @@ class Record {
   _$onConnectionStateChange() {
     const connection = this._handler._connection
     if (connection.connected) {
+      invariant(!this._subscribed, 'must not be subscribed')
+
       if (this._refs > 0) {
         this._subscribe()
       }
@@ -241,19 +242,20 @@ class Record {
         }
       }
     } else {
-      this._subscribed = false
-      if (this._state > Record.STATE.CLIENT) {
-        this._state = Record.STATE.CLIENT
-        this._handler._onPending(this)
-        this._emitUpdate()
-      }
+      this._unsubscribe()
     }
   }
 
-  _subscribe() {
-    invariant(this._refs, this._name + ' missing refs')
+  _$dispose() {
+    this._unsubscribe()
+  }
 
+  _subscribe() {
     const connection = this._handler._connection
+
+    invariant(this._refs, 'missing refs')
+    invariant(!this._subscribed, 'must not be subscribed')
+
     if (!this._subscribed && connection.connected) {
       connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
       this._subscribed = true
@@ -261,18 +263,21 @@ class Record {
   }
 
   _unsubscribe() {
-    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
+
+    invariant(!connection.connected || !this._refs, 'must not have refs')
+    invariant(!connection.connected || !this._patches, 'must not have patches')
+    invariant(!connection.connected || this._subscribed, 'must be subscribed')
+
     if (this._subscribed && connection.connected) {
       connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, this._name)
+      this._subscribed = false
     }
 
-    this._subscribed = false
     if (this._state > Record.STATE.CLIENT) {
       this._state = Record.STATE.CLIENT
-      this._handler._onPending(this)
+      this._handler._onState(this, prevState)
       this._emitUpdate()
     }
   }
@@ -304,6 +309,7 @@ class Record {
   }
 
   _onUpdate([, version, data]) {
+    const prevState = this._state
     const prevData = this._data
     const prevVersion = this._version
 
@@ -334,7 +340,7 @@ class Record {
 
     if (this._state < Record.STATE.SERVER) {
       this._state = this._version.charAt(0) === 'I' ? Record.STATE.STALE : Record.STATE.SERVER
-      this._handler._onPending(this)
+      this._handler._onState(this, prevState)
       this._emitUpdate()
     } else if (this._data !== prevData || this._version !== prevVersion) {
       this._emitUpdate()
@@ -342,19 +348,19 @@ class Record {
   }
 
   _onSubscriptionHasProvider([, hasProvider]) {
-    if (this._state < Record.STATE.SERVER) {
-      return
-    }
-
-    const provided = hasProvider && messageParser.convertTyped(hasProvider, this._handler._client)
-    const state = provided
-      ? Record.STATE.PROVIDER
-      : this._version.charAt(0) === 'I'
-      ? Record.STATE.STALE
-      : Record.STATE.SERVER
-
-    if (this._state !== state) {
-      this._state = state
+    const prevState = this._state
+
+    this._state =
+      hasProvider &&
+      messageParser.convertTyped(hasProvider, this._handler._client) &&
+      this._state >= Record.STATE.SERVER
+        ? Record.STATE.PROVIDER
+        : this._version.charAt(0) === 'I'
+        ? Record.STATE.STALE
+        : Record.STATE.SERVER
+
+    if (this._state !== prevState) {
+      this._handler._onState(this, prevState)
       this._emitUpdate()
     }
   }
@@ -376,6 +382,17 @@ class Record {
     }
     return `${start}-${revid}`
   }
+
+  _emitUpdate() {
+    this._subscriptionsEmitting = true
+    try {
+      for (const fn of this._subscriptions) {
+        fn(this)
+      }
+    } finally {
+      this._subscriptionsEmitting = false
+    }
+  }
 }
 
 // Compat