@nxtedition/deepstream.io-client-js 26.0.13 → 26.0.14

package/package.json

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

package/src/event/event-handler.js

@@ -1,10 +1,10 @@
+import * as C from '../constants/constants.js'
 import * as messageBuilder from '../message/message-builder.js'
 import messageParser from '../message/message-parser.js'
-import * as C from '../constants/constants.js'
 import MulticastListener from '../utils/multicast-listener.js'
 import UnicastListener from '../utils/unicast-listener.js'
 import EventEmitter from 'component-emitter2'
-import * as rxjs from 'rxjs'
+import rxjs from 'rxjs'
 
 const EventHandler = function (options, connection, client) {
   this._options = options

package/src/message/connection.js

@@ -1,14 +1,13 @@
-import * as utils from '../utils/utils.js'
-import messageParser 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'
-
-const HASHER = await xxhash()
-const NodeWebSocket = utils.isNode ? await import('ws').then((x) => x.default) : null
 const BrowserWebSocket = globalThis.WebSocket || globalThis.MozWebSocket
+const utils = require('../utils/utils')
+const NodeWebSocket = utils.isNode ? require('ws') : null
+const messageParser = require('./message-parser')
+const messageBuilder = require('./message-builder')
+const C = require('../constants/constants')
+const pkg = require('../../package.json')
+const xxhash = require('xxhash-wasm')
+const FixedQueue = require('../utils/fixed-queue')
+const Emitter = require('component-emitter2')
 
 const Connection = function (client, url, options) {
   this._client = client
@@ -40,9 +39,11 @@ const Connection = function (client, url, options) {
 
   this._state = C.CONNECTION_STATE.CLOSED
 
-  this.hasher = HASHER
-
-  this._createEndpoint()
+  this.hasher = null
+  xxhash().then((hasher) => {
+    this.hasher = hasher
+    this._createEndpoint()
+  })
 }
 
 Emitter(Connection.prototype)
@@ -86,30 +87,25 @@ Connection.prototype.close = function () {
   this._endpoint?.close()
 
   if (this._reconnectTimeout) {
-    globalThis.clearTimeout(this._reconnectTimeout)
+    clearTimeout(this._reconnectTimeout)
     this._reconnectTimeout = null
   }
 }
 
 Connection.prototype._createEndpoint = function () {
-  if (utils.isNode) {
-    this._endpoint = new NodeWebSocket(this._url, {
-      generateMask() {},
-    })
-  } else {
-    this._endpoint = new BrowserWebSocket(this._url)
-    this._endpoint.binaryType = 'arraybuffer'
-  }
+  this._endpoint = NodeWebSocket
+    ? new NodeWebSocket(this._url, {
+        generateMask() {},
+      })
+    : new BrowserWebSocket(this._url)
   this._corked = false
 
   this._endpoint.onopen = this._onOpen.bind(this)
   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._endpoint.onmessage = BrowserWebSocket
+    ? ({ data }) => this._onMessage(typeof data === 'string' ? data : Buffer.from(data).toString())
+    : ({ data }) => this._onMessage(typeof data === 'string' ? data : data.toString())
 }
 
 Connection.prototype.send = function (message) {
@@ -136,7 +132,7 @@ Connection.prototype.send = function (message) {
   if (this._endpoint._socket && !this._corked) {
     this._endpoint._socket.cork()
     this._corked = true
-    globalThis.setTimeout(() => {
+    setTimeout(() => {
       this._endpoint._socket.uncork()
       this._corked = false
     }, 1)
@@ -170,7 +166,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.0',
+    pkg.version,
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,
@@ -245,6 +241,10 @@ Connection.prototype._recvMessages = function (deadline) {
       continue
     }
 
+    if (this._logger) {
+      this._logger.trace(message, 'receive')
+    }
+
     messageParser.parseMessage(message, this._client, this._message)
 
     this.emit('recv', this._message)
@@ -366,4 +366,4 @@ Connection.prototype._clearReconnect = function () {
   this._reconnectionAttempt = 0
 }
 
-export default Connection
+module.exports = Connection

package/src/message/message-builder.js

@@ -1,103 +1,28 @@
-import * as C from '../constants/constants.js'
-import varint from 'varint'
-import * as utils from '../utils/utils.js'
+const C = require('../constants/constants')
 
-const poolEncoder = new globalThis.TextEncoder()
+const SEP = C.MESSAGE_PART_SEPERATOR
 
-let poolSize
-let poolBuffer
-let poolView
-let poolOffset
-
-function allocPool(size) {
-  poolSize = size || poolSize || 1024 * 1024
-  poolBuffer = utils.isNode
-    ? globalThis.Buffer.allocUnsafe(poolSize)
-    : new Uint8Array(new ArrayBuffer(poolSize))
-  poolView = new DataView(poolBuffer.buffer)
-  poolOffset = 0
-}
-
-function alignPool() {
-  // Ensure aligned slices
-  if (poolOffset & 0x7) {
-    poolOffset |= 0x7
-    poolOffset++
-  }
-}
-
-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) {
+module.exports.getMsg = function (topic, action, data) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
 
-  if (!poolSize || poolOffset + poolSize / 16 >= poolSize) {
-    allocPool()
-  } else {
-    alignPool()
-  }
-
-  const start = poolOffset
-
-  const headerSize = 8
-  poolBuffer[poolOffset++] = 128 + headerSize
-  let headerPos = poolOffset
-  poolOffset += headerSize - 1
-
-  poolBuffer[poolOffset++] = topic.charCodeAt(0)
-  poolBuffer[poolOffset++] = 31
-  for (let n = 0; n < action.length; n++) {
-    poolBuffer[poolOffset++] = action.charCodeAt(n)
-  }
+  const sendData = [topic, action]
 
   if (data) {
     for (let i = 0; i < data.length; i++) {
-      const type = typeof data[i]
-      let len
-      if (data[i] == null) {
-        poolBuffer[poolOffset++] = 31
-        len = 0
-      } else if (type === 'object') {
-        poolBuffer[poolOffset++] = 31
-        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
-        len = writeString(poolBuffer, data[i], poolOffset)
+      if (typeof data[i] === 'object') {
+        sendData.push(JSON.stringify(data[i]))
       } else {
-        throw new Error('invalid data')
-      }
-      poolOffset += len
-
-      varint.encode(len + 1, poolBuffer, headerPos)
-      headerPos += varint.encode.bytes
-      if (headerPos - start >= headerSize) {
-        throw new Error(`header too large: ${headerPos - start} ${headerSize}`)
-      }
-
-      if (poolOffset >= poolBuffer.length) {
-        allocPool(start === 0 ? poolSize * 2 : poolSize)
-        return getMsg(topic, action, data)
+        sendData.push(data[i])
       }
     }
   }
 
-  return new Uint8Array(poolBuffer.buffer, start, poolOffset - start)
+  return sendData.join(SEP)
 }
 
-export function typed(value) {
+module.exports.typed = function (value) {
   const type = typeof value
 
   if (type === 'string') {

package/src/message/message-parser.js

@@ -1,4 +1,4 @@
-import * as C from '../constants/constants.js'
+const C = require('../constants/constants')
 
 const MessageParser = function () {
   this._actions = this._getActions()
@@ -88,4 +88,4 @@ MessageParser.prototype.parseMessage = function (message, client, result) {
   result.data = parts.splice(2)
 }
 
-export default new MessageParser()
+module.exports = new MessageParser()

package/src/record/record-handler.js

@@ -2,7 +2,7 @@ import Record from './record.js'
 import MulticastListener from '../utils/multicast-listener.js'
 import UnicastListener from '../utils/unicast-listener.js'
 import * as C from '../constants/constants.js'
-import * as rxjs from 'rxjs'
+import rxjs from 'rxjs'
 import invariant from 'invariant'
 import EventEmitter from 'component-emitter2'
 import jsonPath from '@nxtedition/json-path'

package/src/record/record.js

@@ -1,20 +1,19 @@
 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 * as messageParser from '../message/message-parser.js'
 import xuid from 'xuid'
 import invariant from 'invariant'
 import cloneDeep from 'lodash.clonedeep'
 import * as timers from '../utils/timers.js'
 
-export default class Record {
+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
@@ -22,6 +21,7 @@ export default class Record {
     this._refs = 0
     this._subscriptions = []
     this._emitting = false
+
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
     this._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
@@ -389,7 +389,7 @@ export default class Record {
     this._version = nextVersion
   }
 
-  _onUpdate([, version, data, hasProvider]) {
+  _onUpdate([, version, data]) {
     const prevData = this._data
     const prevVersion = this._version
     const prevState = this._state
@@ -422,9 +422,7 @@ export default 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
     }
 
@@ -573,3 +571,5 @@ Object.defineProperty(Record.prototype, 'hasProvider', {
     return this.state >= C.RECORD_STATE.PROVIDER
   },
 })
+
+export default Record

package/src/utils/multicast-listener.js

@@ -1,5 +1,5 @@
 import * as C from '../constants/constants.js'
-import * as rxjs from 'rxjs'
+import rxjs from 'rxjs'
 
 class Listener {
   constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
@@ -68,7 +68,7 @@ class Listener {
         if (this.connected && provider.accepted) {
           this._connection.sendMsg(this._topic, C.ACTIONS.LISTEN_REJECT, [
             this._pattern,
-            provider.name,
+            provider.key,
           ])
         }
 
@@ -77,7 +77,7 @@ class Listener {
         provider.accepted = false
         provider.sending = false
 
-        globalThis.clearTimeout(provider.timeout)
+        clearTimeout(provider.timeout)
         provider.timeout = null
 
         provider.patternSubscription?.unsubscribe()
@@ -101,7 +101,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 +157,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,
               ])

package/src/utils/unicast-listener.js

@@ -1,8 +1,9 @@
 import * as C from '../constants/constants.js'
-import * as rxjs from 'rxjs'
+import rx from 'rxjs/operators'
+import rxjs from 'rxjs'
 
 const PIPE = rxjs.pipe(
-  rxjs.map((value) => {
+  rx.map((value) => {
     let data
     if (value && typeof value === 'string') {
       if (value.charAt(0) !== '{' && value.charAt(0) !== '[') {
@@ -17,7 +18,7 @@ const PIPE = rxjs.pipe(
 
     return data
   }),
-  rxjs.distinctUntilChanged(),
+  rx.distinctUntilChanged(),
 )
 
 class Listener {

package/src/utils/utils.js

@@ -79,7 +79,7 @@ export function setTimeout(callback, timeoutDuration) {
 
 export function setInterval(callback, intervalDuration) {
   if (intervalDuration !== null) {
-    return globalThis.setInterval(callback, intervalDuration)
+    return setInterval(callback, intervalDuration)
   } else {
     return -1
   }