@nxtedition/deepstream.io-client-js 23.4.57 → 23.4.58

package/package.json

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

package/src/record/record-handler.js

@@ -24,7 +24,7 @@ class RecordHandler {
     this._client = client
     this._records = new Map()
     this._listeners = new Map()
-    this._pending = new Set()
+    this._pending = new Map()
     this._pruning = new Set()
 
     this._connected = 0
@@ -32,10 +32,14 @@ class RecordHandler {
       updating: 0,
       created: 0,
       destroyed: 0,
+      records: 0,
+      pending: 0,
+      pruning: 0,
+      patching: 0,
     }
 
     this._syncEmitter = new EventEmitter()
-    this._pendingEmitter = new EventEmitter()
+    this._readyEmitter = new EventEmitter()
 
     this.set = this.set.bind(this)
     this.get = this.get.bind(this)
@@ -56,8 +60,10 @@ class RecordHandler {
 
       for (const rec of pruning) {
         rec._$dispose()
+
+        this._stats.records -= 1
+        this._stats.destroyed += 1
         this._records.delete(rec.name)
-        this._stats.destroyed++
       }
 
       if (this._pruningTimeout) {
@@ -71,6 +77,12 @@ class RecordHandler {
   }
 
   _onPruning(rec, isPruning) {
+    if (isPruning) {
+      this._stats.pruning += 1
+    } else {
+      this._stats.pruning -= 1
+    }
+
     if (isPruning) {
       this._pruning.add(rec)
     } else {
@@ -78,13 +90,37 @@ class RecordHandler {
     }
   }
 
-  _onPending(rec, isPending) {
-    if (isPending) {
-      this._pending.add(rec)
+  _onPending(rec, value) {
+    if (value) {
+      this._stats.pending += 1
     } else {
+      this._stats.pending -= 1
+    }
+
+    if (value) {
+      this._pending.set(rec, [])
+    } else {
+      for (const callback of this._pending.get(rec)) {
+        callback()
+      }
       this._pending.delete(rec)
     }
-    this._pendingEmitter.emit(rec.name, isPending)
+  }
+
+  _onUpdating(rec, value) {
+    if (value) {
+      this._stats.updating += 1
+    } else {
+      this._stats.updating -= 1
+    }
+  }
+
+  _onPatching(rec, value) {
+    if (value) {
+      this._stats.patching += 1
+    } else {
+      this._stats.patching -= 1
+    }
   }
 
   get connected() {
@@ -92,32 +128,25 @@ class RecordHandler {
   }
 
   get stats() {
-    return {
-      ...this._stats,
-      listeners: this._listeners.size,
-      records: this._records.size,
-      pruning: this._pruning.size,
-      pending: this._pending.size,
-    }
+    return this._stats
   }
 
   getRecord(name) {
     invariant(
-      typeof name === 'string' && name.length > 0 && !name.includes('[object Object]'),
+      typeof name === 'string' && name.length > 0 && name !== '[object Object]',
       `invalid name ${name}`
     )
 
     let record = this._records.get(name)
 
     if (!record) {
-      record = new Record(name, this).ref()
+      record = new Record(name, this)
+      this._stats.records += 1
+      this._stats.created += 1
       this._records.set(name, record)
-      this._stats.created++
-    } else {
-      record.ref()
     }
 
-    return record
+    return record.ref()
   }
 
   provide(pattern, callback, options) {
@@ -144,18 +173,24 @@ class RecordHandler {
         ? new UnicastListener(C.TOPIC.RECORD, pattern, callback, this, options)
         : new MulticastListener(C.TOPIC.RECORD, pattern, callback, this, options)
 
+    this._stats.listeners += 1
     this._listeners.set(pattern, listener)
+
     return () => {
       listener._$destroy()
+
+      this._stats.listeners -= 1
       this._listeners.delete(pattern)
     }
   }
 
   sync() {
+    // TODO (fix): Sync patching & updating?
     return new Promise((resolve) => {
-      let counter = this._pending.size
+      let counter = this._pending.size + 1
 
       const maybeSync = () => {
+        counter -= 1
         if (counter > 0) {
           return
         }
@@ -165,12 +200,8 @@ class RecordHandler {
         this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
       }
 
-      for (const rec of this._pending) {
-        this._pendingEmitter.once(rec.name, (isPending) => {
-          invariant(!isPending, 'unexpected pending state')
-          counter -= 1
-          maybeSync()
-        })
+      for (const callbacks of this._pending.values()) {
+        callbacks.push(maybeSync)
       }
 
       maybeSync()

package/src/record/record.js

@@ -15,8 +15,8 @@ class Record {
     this._name = name
     this._version = ''
     this._data = jsonPath.EMPTY
-    this._state = Record.STATE.VOID
-    this._refs = 1
+    this._state = C.RECORD_STATE.VOID
+    this._refs = 0
     this._subscriptions = []
     this._emitting = false
     this._updating = null
@@ -51,10 +51,7 @@ class Record {
     this._refs += 1
     if (this._refs === 1) {
       this._handler._onPruning(this, false)
-    }
-
-    if (!this._subscribed) {
-      this._subscribed = this._sendMsg1(C.ACTIONS.SUBSCRIBE, this._name)
+      this._subscribed = this._subscribed || this._sendMsg1(C.ACTIONS.SUBSCRIBE, this._name)
     }
 
     return this
@@ -63,7 +60,7 @@ class Record {
   unref() {
     invariant(this._refs > 0, 'missing refs')
     invariant(this._refs > 0 || !this._patching, 'must not have patches')
-    invariant(this._refs > 0 || this._state >= Record.STATE.SERVER, 'must be ready')
+    invariant(this._refs > 0 || this._state >= C.RECORD_STATE.SERVER, 'must be ready')
 
     this._refs -= 1
     if (this._refs === 0) {
@@ -130,10 +127,9 @@ class Record {
       throw new Error('invalid argument: path')
     }
 
-    if (this._state < Record.STATE.SERVER) {
-      if (!this._patching) {
-        this.ref()
-        this._patching = []
+    if (this._state < C.RECORD_STATE.SERVER) {
+      if (this._patching == null) {
+        this._onPatching(true)
       } else if (path) {
         this._patching.splice(0)
       }
@@ -152,7 +148,7 @@ class Record {
   when(stateOrNull) {
     invariant(this._refs > 0, 'missing refs')
 
-    const state = stateOrNull == null ? Record.STATE.SERVER : stateOrNull
+    const state = stateOrNull == null ? C.RECORD_STATE.SERVER : stateOrNull
 
     if (!Number.isFinite(state) || state < 0) {
       throw new Error('invalid argument: state')
@@ -208,7 +204,7 @@ class Record {
     }
 
     this.ref()
-    return this.when(Record.STATE.SERVER)
+    return this.when(C.RECORD_STATE.SERVER)
       .then(() => {
         const prev = this.get(path)
         const next = updater(prev, this._version)
@@ -248,8 +244,8 @@ class Record {
       this._onPending(true)
     }
 
-    if (this._state > Record.STATE.CLIENT) {
-      this._state = Record.STATE.CLIENT
+    if (this._state > C.RECORD_STATE.CLIENT) {
+      this._state = C.RECORD_STATE.CLIENT
       this._emitUpdate()
     }
   }
@@ -286,12 +282,10 @@ class Record {
     const update = [this._name, nextVersion, jsonPath.stringify(nextData), prevVersion]
 
     if (!this._updating) {
-      this._updating = new Map()
-      this.ref()
+      this._onUpdating(true)
     }
 
     this._updating.set(nextVersion, update)
-    this._handler._stats.updating += 1
 
     connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, update)
 
@@ -304,12 +298,8 @@ class Record {
     const prevVersion = this._version
     const prevState = this._state
 
-    if (this._updating?.delete(version)) {
-      this._handler._stats.updating -= 1
-      if (this._updating.size === 0) {
-        this._updating = null
-        this.unref()
-      }
+    if (this._updating && this._updating.delete(version) && this._updating.size === 0) {
+      this._onUpdating(false)
     }
 
     if (
@@ -324,7 +314,7 @@ class Record {
     invariant(this._version, 'must have version')
     invariant(this._data, 'must have data')
 
-    if (this._patching) {
+    if (this._patching != null) {
       if (this._version.charAt(0) !== 'I') {
         let patchData = this._data
         for (let n = 0; n < this._patching.length; n += 2) {
@@ -333,8 +323,7 @@ class Record {
         this._update(patchData)
       }
 
-      this._patching = null
-      this.unref()
+      this._onPatching(false)
     }
 
     if (this._state < C.RECORD_STATE.SERVER) {
@@ -350,19 +339,44 @@ class Record {
     }
   }
 
-  _onPending(value) {
-    if (this._pending === value) {
-      return
+  _onPatching(value) {
+    invariant(this._refs > 0, 'missing refs')
+
+    if (value) {
+      this._patching = []
+      this._refs += 1
+    } else {
+      this._patching = null
+      this._refs -= 1
     }
 
-    this._pending = value
     this._handler._onPending(this, value)
+  }
+
+  _onUpdating(value) {
+    invariant(this._refs > 0, 'missing refs')
 
     if (value) {
-      this.ref()
+      this._updating = new Map()
+      this._refs += 1
     } else {
-      this.unref()
+      this._updating = null
+      this._refs -= 1
     }
+
+    this._handler._onUpdating(this, value)
+  }
+
+  _onPending(value) {
+    if (value) {
+      this._pending = true
+      this._refs += 1
+    } else {
+      this._pending = false
+      this._refs -= 1
+    }
+
+    this._handler._onPending(this, value)
   }
 
   _onSubscriptionHasProvider([, hasProvider]) {
@@ -448,7 +462,7 @@ Object.defineProperty(Record.prototype, 'empty', {
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'ready', {
   get: function ready() {
-    return this._state >= Record.STATE.SERVER
+    return this._state >= C.RECORD_STATE.SERVER
   },
 })
 
@@ -476,7 +490,7 @@ Object.defineProperty(Record.prototype, 'stale', {
 // TODO (fix): Remove
 Object.defineProperty(Record.prototype, 'isReady', {
   get: function isReady() {
-    return this._state >= Record.STATE.SERVER
+    return this._state >= C.RECORD_STATE.SERVER
   },
 })