@nxtedition/deepstream.io-client-js 26.0.7 → 26.0.8

package/package.json

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

package/src/message/connection.js

@@ -170,7 +170,7 @@ Connection.prototype._sendAuthParams = function () {
   this._setState(C.CONNECTION_STATE.AUTHENTICATING)
   const authMessage = messageBuilder.getMsg(C.TOPIC.AUTH, C.ACTIONS.REQUEST, [
     this._authParams,
-    '26.0.5', // TODO (fix): How to read from package.json?
+    '26.0.8', // TODO (fix): How to read from package.json?
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,

package/src/message/message-builder.js

@@ -1,6 +1,5 @@
 import * as C from '../constants/constants.js'
 import varint from 'varint'
-import * as utils from '../utils/utils.js'
 
 const poolEncoder = new TextEncoder()
 
@@ -9,11 +8,9 @@ let poolBuffer
 let poolView
 let poolOffset
 
-function allocPool(size) {
+function reallocPool(size) {
   poolSize = size || poolSize || 1024 * 1024
-  poolBuffer = utils.isNode
-    ? globalThis.Buffer.allocUnsafe(poolSize)
-    : new Uint8Array(new ArrayBuffer(poolSize))
+  poolBuffer = new Uint8Array(new ArrayBuffer(poolSize))
   poolView = new DataView(poolBuffer.buffer)
   poolOffset = 0
 }
@@ -26,22 +23,13 @@ function alignPool() {
   }
 }
 
-function writeString(dst, str, offset) {
-  if (utils.isNode) {
-    return dst.write(str, offset)
-  } else {
-    const res = poolEncoder.encodeInto(str, new Uint8Array(dst.buffer, offset))
-    return res.written
-  }
-}
-
 export function getMsg(topic, action, data) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
 
   if (!poolSize || poolOffset + poolSize / 16 >= poolSize) {
-    allocPool()
+    reallocPool()
   } else {
     alignPool()
   }
@@ -68,14 +56,19 @@ export function getMsg(topic, action, data) {
         len = 0
       } else if (type === 'object') {
         poolBuffer[poolOffset++] = 31
-        len = writeString(poolBuffer, JSON.stringify(data[i]), poolOffset)
+        const res = poolEncoder.encodeInto(
+          JSON.stringify(data[i]),
+          new Uint8Array(poolBuffer.buffer, poolOffset),
+        )
+        len = res.written
       } else if (type === 'bigint') {
         poolBuffer[poolOffset++] = 31
         poolView.setBigUint64(poolOffset, data[i], false)
         len = 8
       } else if (type === 'string') {
         poolBuffer[poolOffset++] = 31
-        len = writeString(poolBuffer, data[i], poolOffset)
+        const res = poolEncoder.encodeInto(data[i], new Uint8Array(poolBuffer.buffer, poolOffset))
+        len = res.written
       } else {
         throw new Error('invalid data')
       }
@@ -89,7 +82,7 @@ export function getMsg(topic, action, data) {
       }
 
       if (poolOffset >= poolBuffer.length) {
-        allocPool(start === 0 ? poolSize * 2 : poolSize)
+        reallocPool(start === 0 ? poolSize * 2 : poolSize)
         return getMsg(topic, action, data)
       }
     }

package/src/record/record-handler.js

@@ -208,11 +208,9 @@ class RecordHandler {
   }
 
   getKey(name) {
-    if (name.length > 8) {
-      return this._connection.hasher.h64(name)
-    }
-    const buf = this._encoder.encode(name)
-    return buf.byteLength === 8 ? utils.readBigUInt64BE(buf) : this._connection.hasher.h64Raw(buf)
+    return name.length <= 8 && this._encoder.encode(name).byteLength === 8
+      ? name
+      : this._connection.hasher.h64(name)
   }
 
   /**

package/src/record/record.js

@@ -392,7 +392,7 @@ class Record {
     this._version = nextVersion
   }
 
-  _onUpdate([, version, data, hasProvider]) {
+  _onUpdate([, version, data]) {
     const prevData = this._data
     const prevVersion = this._version
     const prevState = this._state
@@ -425,9 +425,7 @@ class Record {
       this._onPatching(false)
     }
 
-    if (this._state < C.RECORD_STATE.PROVIDER && hasProvider === 'T') {
-      this._state = C.RECORD_STATE.PROVIDER
-    } else if (this._state < C.RECORD_STATE.SERVER) {
+    if (this._state < C.RECORD_STATE.SERVER) {
       this._state = this._version.charAt(0) === 'I' ? C.RECORD_STATE.STALE : C.RECORD_STATE.SERVER
     }
 

package/src/utils/multicast-listener.js

@@ -186,7 +186,6 @@ class Listener {
     } else if (message.action === C.ACTIONS.LISTEN_ACCEPT) {
       const provider = this._subscriptions.get(name)
       if (!provider?.value$) {
-        this._error(name, 'invalid accept: listener missing')
         return
       }
 
@@ -220,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/utils.js

@@ -174,14 +174,3 @@ export function removeAbortListener(signal, handler) {
     }
   }
 }
-
-export function readBigUInt64BE(buf, offset = 0) {
-  const first = buf[offset]
-  const last = buf[offset + 7]
-
-  const hi = first * 2 ** 24 + buf[++offset] * 2 ** 16 + buf[++offset] * 2 ** 8 + buf[++offset]
-
-  const lo = buf[++offset] * 2 ** 24 + buf[++offset] * 2 ** 16 + buf[++offset] * 2 ** 8 + last
-
-  return (BigInt(hi) << 32n) + BigInt(lo)
-}