@nxtedition/deepstream.io-client-js 25.0.0 → 25.0.2

package/package.json

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

package/src/message/connection.js

@@ -209,9 +209,10 @@ Connection.prototype._onClose = function () {
 Connection.prototype._onMessage = function (raw) {
   if (typeof raw === 'string') {
     raw = this._encoder.encode(raw)
+  } else if (!utils.isNode) {
+    raw = new Uint8Array(raw)
   }
 
-  raw = new Uint8Array(raw)
   const len = raw.byteLength
 
   const start = 0
@@ -224,11 +225,13 @@ Connection.prototype._onMessage = function (raw) {
     pos += headerSize
   }
 
+  // TODO (perf): Use numbers instead of string..
   const topic = String.fromCharCode(raw[pos++])
   pos++
 
   let action = ''
   while (pos < len && raw[pos] !== 31) {
+    // TODO (perf): Use numbers instead of string..
     action += String.fromCharCode(raw[pos++])
   }
   pos++

package/src/message/message-builder.js

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