fixes

Author: ronag

src/client.js

@@ -127,12 +127,10 @@ Client.prototype._getOptions = function (options) {
   return mergedOptions
 }
 
-function createDeepstream(url, options) {
+export default function createDeepstream(url, options) {
   return new Client(url, options)
 }
 
 Client.prototype.isSameOrNewer = utils.isSameOrNewer
 Client.prototype.CONSTANTS = C
 createDeepstream.CONSTANTS = C
-
-export default createDeepstream

src/event/event-handler.js

@@ -1,10 +1,10 @@
-import * as messageBuilder from '../message/message-builder.js'
-import messageParser from '../message/message-parser.js'
 import * as C from '../constants/constants.js'
+import * as messageBuilder from '../message/message-builder.js'
+import * as messageParser from '../message/message-parser.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

src/message/connection.js

@@ -1,16 +1,15 @@
 import * as utils from '../utils/utils.js'
-import messageParser from './message-parser.js'
+import * as 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 Connection = function (client, url, options) {
+export default function Connection(client, url, options) {
   this._client = client
   this._options = options
   this._logger = options.logger
@@ -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,
-    '27.0.0',
+    '26.0.0',
     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)
@@ -365,5 +365,3 @@ Connection.prototype._clearReconnect = function () {
   }
   this._reconnectionAttempt = 0
 }
-
-export default Connection

src/message/message-builder.js

@@ -1,16 +1,18 @@
 import * as C from '../constants/constants.js'
-import varint from 'varint'
 import * as utils from '../utils/utils.js'
+import varint from 'varint'
 
 const poolEncoder = new globalThis.TextEncoder()
 
-let poolSize
+// TODO (fix): Don't assume maxMesageSize is 1MB
+const maxMessageSize = 1024 * 1024
+const poolSize = maxMessageSize * 4
+
 let poolBuffer
 let poolView
 let poolOffset
 
-function allocPool(size) {
-  poolSize = size || poolSize || 1024 * 1024
+function reallocPool() {
   poolBuffer = utils.isNode
     ? globalThis.Buffer.allocUnsafe(poolSize)
     : new Uint8Array(new ArrayBuffer(poolSize))
@@ -40,8 +42,8 @@ export function getMsg(topic, action, data) {
     throw new Error('data must be an array')
   }
 
-  if (!poolSize || poolOffset + poolSize / 16 >= poolSize) {
-    allocPool()
+  if (!poolBuffer || poolOffset + maxMessageSize > poolSize) {
+    reallocPool()
   } else {
     alignPool()
   }
@@ -84,12 +86,11 @@ export function getMsg(topic, action, data) {
       varint.encode(len + 1, poolBuffer, headerPos)
       headerPos += varint.encode.bytes
       if (headerPos - start >= headerSize) {
-        throw new Error(`header too large: ${headerPos - start} ${headerSize}`)
+        throw new Error('header too large')
       }
 
-      if (poolOffset >= poolBuffer.length) {
-        allocPool(start === 0 ? poolSize * 2 : poolSize)
-        return getMsg(topic, action, data)
+      if (poolOffset >= poolSize) {
+        throw new Error('message too large')
       }
     }
   }

src/message/message-parser.js

@@ -1,10 +1,12 @@
 import * as C from '../constants/constants.js'
 
-const MessageParser = function () {
-  this._actions = this._getActions()
+const actions = {}
+
+for (const key in C.ACTIONS) {
+  actions[C.ACTIONS[key]] = key
 }
 
-MessageParser.prototype.convertTyped = function (value, client) {
+export function convertTyped(value, client) {
   const type = value.charAt(0)
 
   if (type === C.TYPES.STRING) {
@@ -45,17 +47,7 @@ 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) {
+export function parseMessage(message, client, result) {
   const parts = message.split(C.MESSAGE_PART_SEPERATOR)
 
   if (parts.length < 2) {
@@ -72,7 +64,7 @@ MessageParser.prototype.parseMessage = function (message, client, result) {
     return null
   }
 
-  if (this._actions[parts[1]] === undefined) {
+  if (actions[parts[1]] === undefined) {
     client._$onError(
       C.TOPIC.ERROR,
       C.EVENT.MESSAGE_PARSE_ERROR,
@@ -87,5 +79,3 @@ MessageParser.prototype.parseMessage = function (message, client, result) {
   result.action = parts[1]
   result.data = parts.splice(2)
 }
-
-export default new MessageParser()

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'
@@ -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)

src/record/record.js

@@ -1,50 +1,37 @@
 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) {
-    if (!name?.length || typeof name !== 'string') {
-      throw new Error('invalid argument: name')
-    }
-
     const connection = handler._connection
 
     this._handler = handler
-
     this._name = name
-    this._key = utils.h64(name)
     this._version = ''
     this._data = jsonPath.EMPTY
     this._state = C.RECORD_STATE.VOID
     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,
-      this._key,
-    ])
+    this._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
   }
 
   /** @type {string} */
   get name() {
     return this._name
   }
 
-  /** @type {bigint} */
-  get key() {
-    return this._key
-  }
-
   /** @type {string} */
   get version() {
     return this._version
@@ -75,8 +62,7 @@ export default class Record {
     if (this._refs === 1) {
       this._handler._onPruning(this, false)
       this._subscribed =
-        this._subscribed ||
-        connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name, this._key])
+        this._subscribed || connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
     }
     return this
   }
@@ -338,8 +324,7 @@ export default class Record {
 
     if (connected) {
       this._subscribed =
-        this._refs > 0 &&
-        connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._key, this._name])
+        this._refs > 0 && connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name])
 
       if (this._updating) {
         for (const update of this._updating.values()) {
@@ -364,7 +349,7 @@ export default class Record {
     invariant(!this._updating, 'must not have updates')
 
     if (this._subscribed) {
-      connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, [this._key])
+      connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.UNSUBSCRIBE, [this._name])
       this._subscribed = false
     }
 
@@ -386,7 +371,7 @@ export default class Record {
     const prevVersion = this._version
     const nextVersion = this._makeVersion(parseInt(prevVersion) + 1)
 
-    const update = [this._key, nextVersion, jsonPath.stringify(nextData), prevVersion]
+    const update = [this._name, nextVersion, jsonPath.stringify(nextData), prevVersion]
 
     if (!this._updating) {
       this._onUpdating(true)
@@ -437,7 +422,7 @@ export default class Record {
       this._onPatching(false)
     }
 
-    if (this._state < C.RECORD_STATE.PROVIDER && hasProvider === 'T') {
+    if (hasProvider === 'T') {
       this._state = C.RECORD_STATE.PROVIDER
     } else if (this._state < C.RECORD_STATE.SERVER) {
       this._state = this._version.charAt(0) === 'I' ? C.RECORD_STATE.STALE : C.RECORD_STATE.SERVER
@@ -588,3 +573,5 @@ Object.defineProperty(Record.prototype, 'hasProvider', {
     return this.state >= C.RECORD_STATE.PROVIDER
   },
 })
+
+export default Record