@nxtedition/deepstream.io-client-js 24.0.3 → 24.0.5

package/package.json

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

package/src/record/record-handler.js

@@ -62,7 +62,6 @@ class RecordHandler {
     this._client = client
     this._records = new Map()
     this._listeners = new Map()
-    this._pending = new Map()
     this._pruning = new Set()
 
     this._connected = 0
@@ -90,8 +89,6 @@ class RecordHandler {
 
     this._client.on(C.EVENT.CONNECTED, this._onConnectionStateChange.bind(this))
 
-    this._pruningTimeout = null
-
     const _prune = () => {
       const pruning = this._pruning
       this._pruning = new Set()
@@ -105,24 +102,20 @@ class RecordHandler {
       this._stats.records -= pruning.size
       this._stats.destroyed += pruning.size
 
-      if (this._pruningTimeout) {
-        this._pruningTimeout.refresh()
-      } else {
-        this._pruningTimeout = timers.setTimeout(_prune, 1e3)
-      }
+      this._pruningTimeout.refresh()
     }
 
-    _prune()
+    this._pruningTimeout = timers.setTimeout(_prune, 1e3)
   }
 
-  _onPruning(rec, isPruning) {
-    if (isPruning) {
+  _onPruning(rec, value) {
+    if (value) {
       this._stats.pruning += 1
     } else {
       this._stats.pruning -= 1
     }
 
-    if (isPruning) {
+    if (value) {
       this._pruning.add(rec)
     } else {
       this._pruning.delete(rec)
@@ -135,15 +128,6 @@ class RecordHandler {
     } 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)
-    }
   }
 
   _onUpdating(rec, value) {
@@ -229,25 +213,11 @@ class RecordHandler {
 
   sync() {
     // TODO (fix): Sync patching & updating?
+    // TODO (fix): Ensure no pending?
     return new Promise((resolve) => {
-      let counter = this._pending.size + 1
-
-      const maybeSync = () => {
-        counter -= 1
-        if (counter > 0) {
-          return
-        }
-
-        const token = xuid()
-        this._syncEmitter.once(token, resolve)
-        this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
-      }
-
-      for (const callbacks of this._pending.values()) {
-        callbacks.push(maybeSync)
-      }
-
-      maybeSync()
+      const token = xuid()
+      this._syncEmitter.once(token, resolve)
+      this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SYNC, [token])
     })
   }
 
@@ -314,12 +284,18 @@ class RecordHandler {
    * @returns {rxjs.Observable<{ name: string, version: string, state: Number, data: any}>}
    */
   observe2(...args) {
-    return this._observe(null, ...args)
+    return this._observe(
+      {
+        timeout: 10 * 60e3,
+      },
+      ...args
+    )
   }
 
   /**
    * @returns {rxjs.Observable}
    */
+  // TODO (perf): Avoid rest parameters.
   _observe(defaults, name, ...args) {
     let path
     let state = defaults ? defaults.state : undefined
@@ -365,6 +341,7 @@ class RecordHandler {
       state = C.RECORD_STATE[state.toUpperCase()]
     }
 
+    // TODO (perf): Avoid subscribe closure allocation.
     return new rxjs.Observable((subscriber) => {
       const subscription = {
         subscriber,
@@ -396,19 +373,21 @@ class RecordHandler {
         },
       }
 
-      subscription.record = this.getRecord(name).subscribe(onUpdate, subscription)
+      const record = (subscription.record = this.getRecord(name).subscribe(onUpdate, subscription))
 
-      if (timeout && subscription.state && subscription.record.state < subscription.state) {
+      if (timeout && state && record.state < state) {
+        // TODO (perf): Avoid Timer allocation.
         subscription.timeout = timers.setTimeout(onTimeout, timeout, subscription)
       }
 
-      if (subscription.record.version) {
-        onUpdate(subscription.record, subscription)
+      if (record.version) {
+        onUpdate(record, subscription)
       }
 
-      if (subscription.signal) {
-        subscription.abort = () => subscription.subscriber.error(new utils.AbortError())
-        utils.addAbortListener(subscription.signal, subscription.abort)
+      if (signal) {
+        // TODO (perf): Avoid abort closure allocation.
+        subscription.abort = () => subscriber.error(new utils.AbortError())
+        utils.addAbortListener(signal, subscription.abort)
       }
 
       return subscription

package/src/record/record.js

@@ -19,8 +19,8 @@ class Record {
     this._refs = 0
     this._subscriptions = []
     this._emitting = false
-    this._updating = null
-    this._patching = null
+    /** @type Map? */ this._updating = null
+    /** @type Array? */ this._patching = null
     this._pending = false
     this._subscribed = this._sendMsg1(C.ACTIONS.SUBSCRIBE, this._name)
 
@@ -160,7 +160,11 @@ class Record {
         this._patching.splice(0)
       }
 
-      this._patching.push(path, cloneDeep(data))
+      if (this._patching) {
+        this._patching.push(path, cloneDeep(data))
+      } else {
+        throw new Error('invalid state')
+      }
     } else {
       this._update(jsonPath.set(this._data, path, data, false))
     }
@@ -311,7 +315,11 @@ class Record {
       this._onUpdating(true)
     }
 
-    this._updating.set(nextVersion, update)
+    if (this._updating) {
+      this._updating.set(nextVersion, update)
+    } else {
+      throw new Error('invalid state')
+    }
 
     connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, update)
 
@@ -396,10 +404,8 @@ class Record {
   _onPending(value) {
     if (value) {
       this._pending = true
-      this.ref()
     } else {
       this._pending = false
-      this.unref()
     }
 
     this._handler._onPending(this, value)
@@ -448,23 +454,15 @@ class Record {
 
   _emitUpdate() {
     this._emitting = true
-    try {
-      const arr = this._subscriptions
-      const len = arr.length
-
-      for (let n = 0; n < len; n += 2) {
-        try {
-          arr[n + 0](this, arr[n + 1])
-        } catch (err) {
-          this._error(
-            C.EVENT.USER_ERROR,
-            Object.assign(new Error('user callback failed'), { cause: err })
-          )
-        }
-      }
-    } finally {
-      this._emitting = false
+
+    const arr = this._subscriptions
+    const len = arr.length
+
+    for (let n = 0; n < len; n += 2) {
+      arr[n + 0](this, arr[n + 1])
     }
+
+    this._emitting = false
   }
 }