@nxtedition/deepstream.io-client-js 24.3.3 → 24.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.3.3",
+  "version": "24.3.4",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",

package/src/record/record-handler.js

@@ -207,7 +207,7 @@ class RecordHandler {
     }
   }
 
-  _getKey(name) {
+  getKey(name) {
     return name.length <= 8 && this._encoder.encode(name).byteLength === 8
       ? name
       : this._connection.hasher.h64(name)
@@ -226,7 +226,7 @@ class RecordHandler {
     let record = this._records.get(name)
 
     if (!record) {
-      record = new Record(this._getKey(name), name, this)
+      record = new Record(this.getKey(name), name, this)
       this._stats.records += 1
       this._stats.created += 1
       this._records.set(name, record)

package/src/record/record.js

@@ -13,10 +13,7 @@ class Record {
   static STATE = C.RECORD_STATE
 
   constructor(key, name, handler) {
-    const connection = handler._connection
-
     this._handler = handler
-
     this._name = name
     this._key = key
     this._version = ''
@@ -28,10 +25,7 @@ class Record {
 
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
-    this._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [
-      this._name,
-      this._key,
-    ])
+    this._subscribed = false
   }
 
   /** @type {string} */

package/src/utils/multicast-listener.js

@@ -56,6 +56,7 @@ class Listener {
       // TODO (refactor): Move to class
       const provider = {
         name,
+        key: this._handler.getKey(name),
         value$: null,
         sending: false,
         accepted: false,
@@ -68,7 +69,7 @@ class Listener {
         if (this.connected && provider.accepted) {
           this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [
             this._pattern,
-            provider.name,
+            provider.key,
           ])
         }
 
@@ -101,7 +102,7 @@ class Listener {
         this._connection.sendMsg(
           this._topic,
           accepted ? C.ACTIONS.LISTEN_ACCEPT : C.ACTIONS.LISTEN_REJECT,
-          [this._pattern, provider.name]
+          [this._pattern, provider.key]
         )
 
         provider.version = null
@@ -157,7 +158,7 @@ class Listener {
             if (provider.version !== version) {
               provider.version = version
               this._connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UPDATE, [
-                provider.name,
+                provider.key,
                 version,
                 body,
               ])
@@ -218,7 +219,11 @@ class Listener {
   }
 
   _error(name, err) {
-    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [this._pattern, name])
+    this._client._$onError(this._topic, C.EVENT.LISTENER_ERROR, err, [
+      this._pattern,
+      name,
+      this._handler.getKey(name),
+    ])
   }
 
   _reset() {

package/src/utils/unicast-listener.js

@@ -68,27 +68,29 @@ class Listener {
         value$ = rxjs.throwError(() => err)
       }
 
+      const key = this._handler.getKey(name)
+
       if (value$) {
         const subscription = value$.pipe(PIPE).subscribe({
           next: (data) => {
             if (data == null) {
-              this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
+              this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
               this._subscriptions.delete(name)
               subscription.unsubscribe()
             } else {
               const version = `INF-${this._connection.hasher.h64ToString(data)}`
-              this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [name, version, data])
+              this._connection.sendMsg(this._topic, C.ACTIONS.UPDATE, [key, version, data])
             }
           },
           error: (err) => {
             this._error(name, err)
-            this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
+            this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
             this._subscriptions.delete(name)
           },
         })
         this._subscriptions.set(name, subscription)
       } else {
-        this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, name])
+        this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [this._pattern, key])
       }
     } else if (message.action === C.ACTIONS.LISTEN_REJECT) {
       const subscription = this._subscriptions.get(name)