@nxtedition/deepstream.io-client-js 24.2.3 → 24.2.5

package/package.json

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

package/src/message/connection.js

@@ -101,19 +101,22 @@ Connection.prototype.close = function () {
 }
 
 Connection.prototype._createEndpoint = function () {
-  this._endpoint = NodeWebSocket
-    ? new NodeWebSocket(this._url, {
-        generateMask() {},
-      })
-    : new BrowserWebSocket(this._url)
+  if (NodeWebSocket) {
+    this._endpoint = new NodeWebSocket(this._url, {
+      generateMask() {},
+    })
+  } else {
+    this._endpoint = new BrowserWebSocket(this._url)
+    this._endpoint.binaryType = 'arraybuffer'
+  }
   this._corked = false
 
   this._endpoint.onopen = this._onOpen.bind(this)
   this._endpoint.onerror = this._onError.bind(this)
   this._endpoint.onclose = this._onClose.bind(this)
   this._endpoint.onmessage = BrowserWebSocket
-    ? ({ data }) => this._onMessage(typeof data === 'string' ? data : Buffer.from(data).toString())
-    : ({ data }) => this._onMessage(typeof data === 'string' ? data : data.toString())
+    ? ({ data }) => this._onMessage(Buffer.from(data))
+    : ({ data }) => this._onMessage(data)
 }
 
 Connection.prototype.send = function (message) {
@@ -249,20 +252,20 @@ Connection.prototype._recvMessages = function (deadline) {
       continue
     }
 
-    if (this._logger) {
-      this._logger.trace(message, 'receive')
-    }
+    try {
+      messageParser.parseMessage(message, this._client, this._message)
 
-    messageParser.parseMessage(message, this._client, this._message)
+      this.emit('recv', this._message)
 
-    this.emit('recv', this._message)
-
-    if (this._message.topic === C.TOPIC.CONNECTION) {
-      this._handleConnectionResponse(this._message)
-    } else if (this._message.topic === C.TOPIC.AUTH) {
-      this._handleAuthResponse(this._message)
-    } else {
-      this._client._$onMessage(this._message)
+      if (this._message.topic === C.TOPIC.CONNECTION) {
+        this._handleConnectionResponse(this._message)
+      } else if (this._message.topic === C.TOPIC.AUTH) {
+        this._handleAuthResponse(this._message)
+      } else {
+        this._client._$onMessage(this._message)
+      }
+    } catch (err) {
+      this._onError(err)
     }
   }
 

package/src/record/record-handler.js

@@ -97,11 +97,19 @@ class RecordHandler {
     this._connection = connection
     this._client = client
     this._records = new Map()
+    this._cache = new Map()
     this._listeners = new Map()
     this._pruning = new Set()
     this._patching = new Map()
     this._updating = new Map()
 
+    this._registry = new FinalizationRegistry((name) => {
+      const entry = this._cache.get(name)
+      if (entry && entry.deref && entry.deref() === undefined) {
+        this._cache.delete(name)
+      }
+    })
+
     this._connected = 0
     this._stats = {
       updating: 0,
@@ -134,6 +142,11 @@ class RecordHandler {
       for (const rec of pruning) {
         rec._$dispose()
         this._records.delete(rec.name)
+
+        if (!this._cache.has(rec.name)) {
+          this._cache.set(rec.name, new WeakRef(rec))
+          this._registry.register(rec, rec.name)
+        }
       }
 
       this._stats.pruning -= pruning.size
@@ -219,7 +232,7 @@ class RecordHandler {
     let record = this._records.get(name)
 
     if (!record) {
-      record = new Record(name, this)
+      record = this._cache.get(name)?.deref() ?? new Record(name, this)
       this._stats.records += 1
       this._stats.created += 1
       this._records.set(name, record)

package/src/record/record.js

@@ -11,10 +11,7 @@ class Record {
   static STATE = C.RECORD_STATE
 
   constructor(name, handler) {
-    const connection = handler._connection
-
     this._handler = handler
-
     this._name = name
     this._version = ''
     this._data = jsonPath.EMPTY
@@ -24,7 +21,7 @@ class Record {
     this._emitting = false
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
-    this._subscribed = connection.sendMsg1(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, this._name)
+    this._subscribed = false
   }
 
   /** @type {string} */
@@ -205,17 +202,17 @@ class Record {
 
     return new Promise((resolve, reject) => {
       if (this._state >= state) {
-        resolve(null)
+        resolve(this)
         return
       }
 
       let timeoutHandle
 
-      const onDone = (err, val) => {
+      const onDone = (err) => {
         if (err) {
           reject(err)
         } else {
-          resolve(val)
+          resolve(this)
         }
 
         this.unref()
@@ -231,7 +228,7 @@ class Record {
 
       const onUpdate = () => {
         if (this._state >= state) {
-          onDone(null, null)
+          onDone(null)
         }
       }