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

package/package.json

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

package/src/event/event-handler.js

@@ -1,6 +1,6 @@
 import * as C from '../constants/constants.js'
 import * as messageBuilder from '../message/message-builder.js'
-import messageParser from '../message/message-parser.js'
+import { convertTyped } from '../message/message-parser.js'
 import MulticastListener from '../utils/multicast-listener.js'
 import UnicastListener from '../utils/unicast-listener.js'
 import EventEmitter from 'component-emitter2'
@@ -143,7 +143,7 @@ EventHandler.prototype._$handle = function (message) {
 
   if (message.action === C.ACTIONS.EVENT) {
     if (message.data && message.data.length === 2) {
-      this._emitter.emit(name, messageParser.convertTyped(data, this._client))
+      this._emitter.emit(name, convertTyped(data, this._client))
     } else {
       this._emitter.emit(name)
     }

package/src/message/connection.js

@@ -1,10 +1,11 @@
 import * as utils from '../utils/utils.js'
-import messageParser from './message-parser.js'
+import { convertTyped } from './message-parser.js'
 import * as messageBuilder from './message-builder.js'
 import * as C from '../constants/constants.js'
 import xxhash from 'xxhash-wasm'
 import FixedQueue from '../utils/fixed-queue.js'
 import Emitter from 'component-emitter2'
+import varint from 'varint'
 
 const BrowserWebSocket = globalThis.WebSocket || globalThis.MozWebSocket
 const NodeWebSocket = utils.isNode ? await import('ws').then((x) => x.default) : null
@@ -23,12 +24,8 @@ const Connection = function (client, url, options) {
   this._tooManyAuthAttempts = false
   this._connectionAuthenticationTimeout = false
   this._challengeDenied = false
-  this._message = {
-    raw: null,
-    topic: null,
-    action: null,
-    data: null,
-  }
+  this._decoder = new TextDecoder()
+  this._encoder = new TextEncoder()
   this._recvQueue = new FixedQueue()
   this._reconnectTimeout = null
   this._reconnectionAttempt = 0
@@ -106,9 +103,8 @@ Connection.prototype._createEndpoint = function () {
   this._endpoint.onerror = this._onError.bind(this)
   this._endpoint.onclose = this._onClose.bind(this)
 
-  const decoder = new TextDecoder()
   this._endpoint.onmessage = ({ data }) => {
-    this._onMessage(typeof data === 'string' ? data : decoder.decode(data))
+    this._onMessage(data)
   }
 }
 
@@ -117,12 +113,7 @@ Connection.prototype.send = function (message) {
 
   if (message.length > maxPacketSize) {
     const err = new Error(`Packet to big: ${message.length} > ${maxPacketSize}`)
-    this._client._$onError(
-      C.TOPIC.CONNECTION,
-      C.EVENT.CONNECTION_ERROR,
-      err,
-      message.split(C.MESSAGE_PART_SEPERATOR).map((x) => x.slice(0, 256))
-    )
+    this._client._$onError(C.TOPIC.CONNECTION, C.EVENT.CONNECTION_ERROR, err, message)
     return false
   }
 
@@ -170,7 +161,7 @@ Connection.prototype._sendAuthParams = function () {
   this._setState(C.CONNECTION_STATE.AUTHENTICATING)
   const authMessage = messageBuilder.getMsg(C.TOPIC.AUTH, C.ACTIONS.REQUEST, [
     this._authParams,
-    '24.3.1', // TODO (fix): How to read from package.json?
+    '25.0.0', // TODO (fix): How to read from package.json?
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,
@@ -215,13 +206,57 @@ Connection.prototype._onClose = function () {
   }
 }
 
-Connection.prototype._onMessage = function (data) {
-  // Remove MESSAGE_SEPERATOR if exists.
-  if (data.charCodeAt(data.length - 1) === 30) {
-    data = data.slice(0, -1)
+Connection.prototype._onMessage = function (raw) {
+  if (typeof raw === 'string') {
+    raw = this._encoder.encode(raw)
+  }
+
+  raw = new Uint8Array(raw)
+  const len = raw.byteLength
+
+  const start = 0
+
+  let pos = start
+
+  let headerSize = 0
+  if (raw[pos] >= 128) {
+    headerSize = raw[pos] - 128
+    pos += headerSize
+  }
+
+  const topic = String.fromCharCode(raw[pos++])
+  pos++
+
+  let action = ''
+  while (pos < len && raw[pos] !== 31) {
+    action += String.fromCharCode(raw[pos++])
   }
+  pos++
 
-  this._recvQueue.push(data)
+  // TODO (fix): Validate topic and action
+
+  let data
+
+  // TODO (fix): Don't stringify binary data...
+
+  if (headerSize > 0) {
+    data = []
+    let headerPos = start + 1
+    while (headerPos < headerSize) {
+      const len = varint.decode(raw, headerPos)
+      headerPos += varint.decode.bytes
+      if (len === 0) {
+        break
+      }
+      data.push(this._decoder.decode(raw.subarray(pos, pos + len - 1)))
+      pos += len
+    }
+  } else {
+    data =
+      pos < len ? this._decoder.decode(raw.subarray(pos, len)).split(C.MESSAGE_PART_SEPERATOR) : []
+  }
+
+  this._recvQueue.push({ topic, action, data })
   if (!this._processingRecv) {
     this._processingRecv = true
     this._schedule(this._recvMessages)
@@ -245,20 +280,19 @@ Connection.prototype._recvMessages = function (deadline) {
       continue
     }
 
-    if (this._logger) {
-      this._logger.trace(message, 'receive')
+    if (message === C.TOPIC.ERROR) {
+      this._client._$onError(C.TOPIC.ERROR, message.action, new Error('Message error'), message)
+      continue
     }
 
-    messageParser.parseMessage(message, this._client, this._message)
-
-    this.emit('recv', this._message)
+    this.emit('recv', message)
 
-    if (this._message.topic === C.TOPIC.CONNECTION) {
-      this._handleConnectionResponse(this._message)
-    } else if (this._message.topic === C.TOPIC.AUTH) {
-      this._handleAuthResponse(this._message)
+    if (message.topic === C.TOPIC.CONNECTION) {
+      this._handleConnectionResponse(message)
+    } else if (message.topic === C.TOPIC.AUTH) {
+      this._handleAuthResponse(message)
     } else {
-      this._client._$onMessage(this._message)
+      this._client._$onMessage(message)
     }
   }
 
@@ -315,7 +349,7 @@ Connection.prototype._getAuthData = function (data) {
   if (data === undefined) {
     return null
   } else {
-    return messageParser.convertTyped(data, this._client)
+    return convertTyped(data, this._client)
   }
 }
 

package/src/message/message-parser.js

@@ -1,10 +1,6 @@
 import * as C from '../constants/constants.js'
 
-const MessageParser = function () {
-  this._actions = this._getActions()
-}
-
-MessageParser.prototype.convertTyped = function (value, client) {
+export function convertTyped(value, client) {
   const type = value.charAt(0)
 
   if (type === C.TYPES.STRING) {
@@ -44,48 +40,3 @@ MessageParser.prototype.convertTyped = function (value, client) {
 
   return undefined
 }
-
-MessageParser.prototype._getActions = function () {
-  const actions = {}
-
-  for (const key in C.ACTIONS) {
-    actions[C.ACTIONS[key]] = key
-  }
-
-  return actions
-}
-
-MessageParser.prototype.parseMessage = function (message, client, result) {
-  const parts = message.split(C.MESSAGE_PART_SEPERATOR)
-
-  if (parts.length < 2) {
-    client._$onError(
-      C.TOPIC.ERROR,
-      C.EVENT.MESSAGE_PARSE_ERROR,
-      new Error('Insufficiant message parts')
-    )
-    return null
-  }
-
-  if (parts[0] === C.TOPIC.ERROR) {
-    client._$onError(C.TOPIC.ERROR, parts[1], new Error('Message error'), message)
-    return null
-  }
-
-  if (this._actions[parts[1]] === undefined) {
-    client._$onError(
-      C.TOPIC.ERROR,
-      C.EVENT.MESSAGE_PARSE_ERROR,
-      new Error('Unknown action'),
-      message
-    )
-    return null
-  }
-
-  result.raw = message
-  result.topic = parts[0]
-  result.action = parts[1]
-  result.data = parts.splice(2)
-}
-
-export default new MessageParser()

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

@@ -1,7 +1,7 @@
 import jsonPath from '@nxtedition/json-path'
 import * as utils from '../utils/utils.js'
 import * as C from '../constants/constants.js'
-import messageParser from '../message/message-parser.js'
+import { convertTyped } from '../message/message-parser.js'
 import xuid from 'xuid'
 import invariant from 'invariant'
 import cloneDeep from 'lodash.clonedeep'
@@ -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} */
@@ -476,7 +470,7 @@ class Record {
     const prevState = this._state
 
     this._state =
-      hasProvider && messageParser.convertTyped(hasProvider, this._handler._client)
+      hasProvider && convertTyped(hasProvider, this._handler._client)
         ? C.RECORD_STATE.PROVIDER
         : this._version.charAt(0) === 'I'
         ? C.RECORD_STATE.STALE

package/src/rpc/rpc-handler.js

@@ -1,6 +1,6 @@
 import * as C from '../constants/constants.js'
 import RpcResponse from './rpc-response.js'
-import messageParser from '../message/message-parser.js'
+import { convertTyped } from '../message/message-parser.js'
 import * as messageBuilder from '../message/message-builder.js'
 import xuid from 'xuid'
 
@@ -111,7 +111,7 @@ RpcHandler.prototype._respond = function (message) {
   if (callback) {
     let promise
     try {
-      promise = Promise.resolve(callback(messageParser.convertTyped(data, this._client), response))
+      promise = Promise.resolve(callback(convertTyped(data, this._client), response))
     } catch (err) {
       promise = Promise.reject(err)
     }
@@ -156,7 +156,7 @@ RpcHandler.prototype._$handle = function (message) {
         })
       )
     } else {
-      rpc.callback(null, messageParser.convertTyped(data, this._client))
+      rpc.callback(null, convertTyped(data, this._client))
     }
   }
 }

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)