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

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "24.3.1",
+  "version": "24.3.3",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
+  "type": "module",
   "bugs": {
     "url": "https://github.com/deepstreamIO/deepstream.io-client-js/issues"
   },
@@ -64,6 +65,7 @@
     "invariant": "^2.2.4",
     "lodash.clonedeep": "^4.5.0",
     "utf-8-validate": "^6.0.3",
+    "varint": "^6.0.0",
     "ws": "^8.13.0",
     "xuid": "^4.1.2",
     "xxhash-wasm": "^1.0.2"

package/src/client.js

@@ -1,12 +1,12 @@
-const C = require('./constants/constants')
-const Emitter = require('component-emitter2')
-const Connection = require('./message/connection')
-const EventHandler = require('./event/event-handler')
-const RpcHandler = require('./rpc/rpc-handler')
-const RecordHandler = require('./record/record-handler')
-const defaultOptions = require('./default-options')
-const xuid = require('xuid')
-const utils = require('./utils/utils')
+import * as C from './constants/constants.js'
+import Emitter from 'component-emitter2'
+import Connection from './message/connection.js'
+import EventHandler from './event/event-handler.js'
+import RpcHandler from './rpc/rpc-handler.js'
+import RecordHandler from './record/record-handler.js'
+import defaultOptions from './default-options.js'
+import xuid from 'xuid'
+import * as utils from './utils/utils.js'
 
 const Client = function (url, options) {
   this._url = url
@@ -135,4 +135,4 @@ Client.prototype.isSameOrNewer = utils.isSameOrNewer
 Client.prototype.CONSTANTS = C
 createDeepstream.CONSTANTS = C
 
-module.exports = createDeepstream
+export default createDeepstream

package/src/constants/constants.js

@@ -1,98 +1,98 @@
-module.exports.CONNECTION_STATE = {}
+export const CONNECTION_STATE = {}
 
-module.exports.CONNECTION_STATE.CLOSED = 'CLOSED'
-module.exports.CONNECTION_STATE.AWAITING_CONNECTION = 'AWAITING_CONNECTION'
-module.exports.CONNECTION_STATE.CHALLENGING = 'CHALLENGING'
-module.exports.CONNECTION_STATE.AWAITING_AUTHENTICATION = 'AWAITING_AUTHENTICATION'
-module.exports.CONNECTION_STATE.AUTHENTICATING = 'AUTHENTICATING'
-module.exports.CONNECTION_STATE.OPEN = 'OPEN'
-module.exports.CONNECTION_STATE.ERROR = 'ERROR'
-module.exports.CONNECTION_STATE.RECONNECTING = 'RECONNECTING'
+CONNECTION_STATE.CLOSED = 'CLOSED'
+CONNECTION_STATE.AWAITING_CONNECTION = 'AWAITING_CONNECTION'
+CONNECTION_STATE.CHALLENGING = 'CHALLENGING'
+CONNECTION_STATE.AWAITING_AUTHENTICATION = 'AWAITING_AUTHENTICATION'
+CONNECTION_STATE.AUTHENTICATING = 'AUTHENTICATING'
+CONNECTION_STATE.OPEN = 'OPEN'
+CONNECTION_STATE.ERROR = 'ERROR'
+CONNECTION_STATE.RECONNECTING = 'RECONNECTING'
 
-module.exports.RECORD_STATE = {}
-module.exports.RECORD_STATE.VOID = 0
-module.exports.RECORD_STATE.CLIENT = 1
-module.exports.RECORD_STATE.SERVER = 2
-module.exports.RECORD_STATE.STALE = 3
-module.exports.RECORD_STATE.PROVIDER = 4
+export const RECORD_STATE = {}
+RECORD_STATE.VOID = 0
+RECORD_STATE.CLIENT = 1
+RECORD_STATE.SERVER = 2
+RECORD_STATE.STALE = 3
+RECORD_STATE.PROVIDER = 4
 
-module.exports.RECORD_STATE_NAME = []
-for (const [key, val] of Object.entries(module.exports.RECORD_STATE)) {
-  module.exports.RECORD_STATE_NAME[val] = key
+export const RECORD_STATE_NAME = []
+for (const [key, val] of Object.entries(RECORD_STATE)) {
+  RECORD_STATE_NAME[val] = key
 }
 
-module.exports.MESSAGE_SEPERATOR = String.fromCharCode(30) // ASCII Record Seperator 1E
-module.exports.MESSAGE_PART_SEPERATOR = String.fromCharCode(31) // ASCII Unit Separator 1F
+export const MESSAGE_SEPERATOR = String.fromCharCode(30) // ASCII Record Seperator 1E
+export const MESSAGE_PART_SEPERATOR = String.fromCharCode(31) // ASCII Unit Separator 1F
 
-module.exports.TYPES = {}
-module.exports.TYPES.STRING = 'S'
-module.exports.TYPES.OBJECT = 'O'
-module.exports.TYPES.NUMBER = 'N'
-module.exports.TYPES.NULL = 'L'
-module.exports.TYPES.TRUE = 'T'
-module.exports.TYPES.FALSE = 'F'
-module.exports.TYPES.UNDEFINED = 'U'
+export const TYPES = {}
+TYPES.STRING = 'S'
+TYPES.OBJECT = 'O'
+TYPES.NUMBER = 'N'
+TYPES.NULL = 'L'
+TYPES.TRUE = 'T'
+TYPES.FALSE = 'F'
+TYPES.UNDEFINED = 'U'
 
-module.exports.TOPIC = {}
-module.exports.TOPIC.CONNECTION = 'C'
-module.exports.TOPIC.AUTH = 'A'
-module.exports.TOPIC.ERROR = 'X'
-module.exports.TOPIC.EVENT = 'E'
-module.exports.TOPIC.RECORD = 'R'
-module.exports.TOPIC.RPC = 'P'
-module.exports.TOPIC.PRIVATE = 'PRIVATE/'
+export const TOPIC = {}
+TOPIC.CONNECTION = 'C'
+TOPIC.AUTH = 'A'
+TOPIC.ERROR = 'X'
+TOPIC.EVENT = 'E'
+TOPIC.RECORD = 'R'
+TOPIC.RPC = 'P'
+TOPIC.PRIVATE = 'PRIVATE/'
 
-module.exports.EVENT = {}
-module.exports.EVENT.CONNECTION_ERROR = 'connectionError'
-module.exports.EVENT.CONNECTION_STATE_CHANGED = 'connectionStateChanged'
-module.exports.EVENT.CONNECTED = 'connected'
-module.exports.EVENT.MAX_RECONNECTION_ATTEMPTS_REACHED = 'MAX_RECONNECTION_ATTEMPTS_REACHED'
-module.exports.EVENT.CONNECTION_AUTHENTICATION_TIMEOUT = 'CONNECTION_AUTHENTICATION_TIMEOUT'
-module.exports.EVENT.NO_RPC_PROVIDER = 'NO_RPC_PROVIDER'
-module.exports.EVENT.RPC_ERROR = 'RPC_ERROR'
-module.exports.EVENT.TIMEOUT = 'TIMEOUT'
-module.exports.EVENT.UNSOLICITED_MESSAGE = 'UNSOLICITED_MESSAGE'
-module.exports.EVENT.MESSAGE_DENIED = 'MESSAGE_DENIED'
-module.exports.EVENT.NOT_CONNECTED = 'NOT_CONNECTED'
-module.exports.EVENT.MESSAGE_PARSE_ERROR = 'MESSAGE_PARSE_ERROR'
-module.exports.EVENT.NOT_AUTHENTICATED = 'NOT_AUTHENTICATED'
-module.exports.EVENT.MESSAGE_PERMISSION_ERROR = 'MESSAGE_PERMISSION_ERROR'
-module.exports.EVENT.LISTENER_EXISTS = 'LISTENER_EXISTS'
-module.exports.EVENT.PROVIDER_ERROR = 'PROVIDER_ERROR'
-module.exports.EVENT.CACHE_ERROR = 'CACHE_ERROR'
-module.exports.EVENT.UPDATE_ERROR = 'UPDATE_ERROR'
-module.exports.EVENT.USER_ERROR = 'USER_ERROR'
-module.exports.EVENT.REF_ERROR = 'REF_ERROR'
-module.exports.EVENT.PROVIDER_EXISTS = 'PROVIDER_EXISTS'
-module.exports.EVENT.NOT_LISTENING = 'NOT_LISTENING'
-module.exports.EVENT.NOT_PROVIDING = 'NOT_PROVIDING'
-module.exports.EVENT.LISTENER_ERROR = 'LISTENER_ERROR'
-module.exports.EVENT.TOO_MANY_AUTH_ATTEMPTS = 'TOO_MANY_AUTH_ATTEMPTS'
-module.exports.EVENT.IS_CLOSED = 'IS_CLOSED'
-module.exports.EVENT.RECORD_NOT_FOUND = 'RECORD_NOT_FOUND'
-module.exports.EVENT.NOT_SUBSCRIBED = 'NOT_SUBSCRIBED'
+export const EVENT = {}
+EVENT.CONNECTION_ERROR = 'connectionError'
+EVENT.CONNECTION_STATE_CHANGED = 'connectionStateChanged'
+EVENT.CONNECTED = 'connected'
+EVENT.MAX_RECONNECTION_ATTEMPTS_REACHED = 'MAX_RECONNECTION_ATTEMPTS_REACHED'
+EVENT.CONNECTION_AUTHENTICATION_TIMEOUT = 'CONNECTION_AUTHENTICATION_TIMEOUT'
+EVENT.NO_RPC_PROVIDER = 'NO_RPC_PROVIDER'
+EVENT.RPC_ERROR = 'RPC_ERROR'
+EVENT.TIMEOUT = 'TIMEOUT'
+EVENT.UNSOLICITED_MESSAGE = 'UNSOLICITED_MESSAGE'
+EVENT.MESSAGE_DENIED = 'MESSAGE_DENIED'
+EVENT.NOT_CONNECTED = 'NOT_CONNECTED'
+EVENT.MESSAGE_PARSE_ERROR = 'MESSAGE_PARSE_ERROR'
+EVENT.NOT_AUTHENTICATED = 'NOT_AUTHENTICATED'
+EVENT.MESSAGE_PERMISSION_ERROR = 'MESSAGE_PERMISSION_ERROR'
+EVENT.LISTENER_EXISTS = 'LISTENER_EXISTS'
+EVENT.PROVIDER_ERROR = 'PROVIDER_ERROR'
+EVENT.CACHE_ERROR = 'CACHE_ERROR'
+EVENT.UPDATE_ERROR = 'UPDATE_ERROR'
+EVENT.USER_ERROR = 'USER_ERROR'
+EVENT.REF_ERROR = 'REF_ERROR'
+EVENT.PROVIDER_EXISTS = 'PROVIDER_EXISTS'
+EVENT.NOT_LISTENING = 'NOT_LISTENING'
+EVENT.NOT_PROVIDING = 'NOT_PROVIDING'
+EVENT.LISTENER_ERROR = 'LISTENER_ERROR'
+EVENT.TOO_MANY_AUTH_ATTEMPTS = 'TOO_MANY_AUTH_ATTEMPTS'
+EVENT.IS_CLOSED = 'IS_CLOSED'
+EVENT.RECORD_NOT_FOUND = 'RECORD_NOT_FOUND'
+EVENT.NOT_SUBSCRIBED = 'NOT_SUBSCRIBED'
 
-module.exports.ACTIONS = {}
-module.exports.ACTIONS.PING = 'PI'
-module.exports.ACTIONS.PONG = 'PO'
-module.exports.ACTIONS.ACK = 'A'
-module.exports.ACTIONS.REDIRECT = 'RED'
-module.exports.ACTIONS.CHALLENGE = 'CH'
-module.exports.ACTIONS.CHALLENGE_RESPONSE = 'CHR'
-module.exports.ACTIONS.READ = 'R'
-module.exports.ACTIONS.UPDATE = 'U'
-module.exports.ACTIONS.SUBSCRIBE = 'S'
-module.exports.ACTIONS.SYNC = 'SY'
-module.exports.ACTIONS.UNSUBSCRIBE = 'US'
-module.exports.ACTIONS.SUBSCRIPTION_FOR_PATTERN_FOUND = 'SP'
-module.exports.ACTIONS.SUBSCRIPTION_FOR_PATTERN_REMOVED = 'SR'
-module.exports.ACTIONS.SUBSCRIPTION_HAS_PROVIDER = 'SH'
-module.exports.ACTIONS.LISTEN = 'L'
-module.exports.ACTIONS.UNLISTEN = 'UL'
-module.exports.ACTIONS.LISTEN_ACCEPT = 'LA'
-module.exports.ACTIONS.LISTEN_REJECT = 'LR'
-module.exports.ACTIONS.EVENT = 'EVT'
-module.exports.ACTIONS.ERROR = 'E'
-module.exports.ACTIONS.REQUEST = 'REQ'
-module.exports.ACTIONS.RESPONSE = 'RES'
-module.exports.ACTIONS.REJECTION = 'REJ'
+export const ACTIONS = {}
+ACTIONS.PING = 'PI'
+ACTIONS.PONG = 'PO'
+ACTIONS.ACK = 'A'
+ACTIONS.REDIRECT = 'RED'
+ACTIONS.CHALLENGE = 'CH'
+ACTIONS.CHALLENGE_RESPONSE = 'CHR'
+ACTIONS.READ = 'R'
+ACTIONS.UPDATE = 'U'
+ACTIONS.SUBSCRIBE = 'S'
+ACTIONS.SYNC = 'SY'
+ACTIONS.UNSUBSCRIBE = 'US'
+ACTIONS.SUBSCRIPTION_FOR_PATTERN_FOUND = 'SP'
+ACTIONS.SUBSCRIPTION_FOR_PATTERN_REMOVED = 'SR'
+ACTIONS.SUBSCRIPTION_HAS_PROVIDER = 'SH'
+ACTIONS.LISTEN = 'L'
+ACTIONS.UNLISTEN = 'UL'
+ACTIONS.LISTEN_ACCEPT = 'LA'
+ACTIONS.LISTEN_REJECT = 'LR'
+ACTIONS.EVENT = 'EVT'
+ACTIONS.ERROR = 'E'
+ACTIONS.REQUEST = 'REQ'
+ACTIONS.RESPONSE = 'RES'
+ACTIONS.REJECTION = 'REJ'

package/src/default-options.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   reconnectIntervalIncrement: 1e3,
   maxReconnectInterval: 6e3,
   maxReconnectAttempts: Infinity,

package/src/event/event-handler.js

@@ -1,10 +1,10 @@
-const messageBuilder = require('../message/message-builder')
-const messageParser = require('../message/message-parser')
-const C = require('../constants/constants')
-const MulticastListener = require('../utils/multicast-listener')
-const UnicastListener = require('../utils/unicast-listener')
-const EventEmitter = require('component-emitter2')
-const rxjs = require('rxjs')
+import * as C from '../constants/constants.js'
+import * as messageBuilder from '../message/message-builder.js'
+import 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 rxjs from 'rxjs'
 
 const EventHandler = function (options, connection, client) {
   this._options = options
@@ -164,4 +164,4 @@ EventHandler.prototype._onConnectionStateChange = function (connected) {
   }
 }
 
-module.exports = EventHandler
+export default EventHandler

package/src/message/connection.js

@@ -1,13 +1,15 @@
+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 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 NodeWebSocket = utils.isNode ? await import('ws').then((x) => x.default) : null
+
+const HASHER = await xxhash()
 
 const Connection = function (client, url, options) {
   this._client = client
@@ -30,7 +32,6 @@ const Connection = function (client, url, options) {
   this._recvQueue = new FixedQueue()
   this._reconnectTimeout = null
   this._reconnectionAttempt = 0
-  this._endpoint = null
 
   this._processingRecv = false
   this._recvMessages = this._recvMessages.bind(this)
@@ -39,11 +40,9 @@ const Connection = function (client, url, options) {
 
   this._state = C.CONNECTION_STATE.CLOSED
 
-  this.hasher = null
-  xxhash().then((hasher) => {
-    this.hasher = hasher
-    this._createEndpoint()
-  })
+  this.hasher = HASHER
+
+  this._createEndpoint()
 }
 
 Emitter(Connection.prototype)
@@ -152,8 +151,8 @@ Connection.prototype.send = function (message) {
 Connection.prototype._submit = function (message) {
   const { maxPacketSize } = this._options
 
-  if (message.length > maxPacketSize) {
-    const err = new Error(`Packet to big: ${message.length} > ${maxPacketSize}`)
+  if (message.byteLength > maxPacketSize) {
+    const err = new Error(`Packet to big: ${message.byteLength} > ${maxPacketSize}`)
     this._client._$onError(C.TOPIC.CONNECTION, C.EVENT.CONNECTION_ERROR, err)
     return false
   } else if (this._endpoint.readyState === this._endpoint.OPEN) {
@@ -171,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,
-    pkg.version,
+    '24.3.1', // TODO (fix): How to read from package.json?
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,
@@ -365,4 +364,4 @@ Connection.prototype._clearReconnect = function () {
   this._reconnectionAttempt = 0
 }
 
-module.exports = Connection
+export default Connection

package/src/message/message-builder.js

@@ -1,4 +1,5 @@
-const C = require('../constants/constants')
+import * as C from '../constants/constants.js'
+import varint from 'varint'
 
 const poolEncoder = new TextEncoder()
 
@@ -8,7 +9,7 @@ let poolView
 let poolOffset
 
 function reallocPool(size) {
-  poolSize = size ?? poolSize ?? 1024 * 1024
+  poolSize = size || poolSize || 1024 * 1024
   poolBuffer = new Uint8Array(new ArrayBuffer(poolSize))
   poolView = new DataView(poolBuffer.buffer)
   poolOffset = 0
@@ -22,14 +23,12 @@ function alignPool() {
   }
 }
 
-reallocPool()
-
-module.exports.getMsg = function (topic, action, data) {
+export function getMsg(topic, action, data) {
   if (data && !(data instanceof Array)) {
     throw new Error('data must be an array')
   }
 
-  if (poolOffset + poolSize / 16 >= poolSize) {
+  if (!poolSize || poolOffset + poolSize / 16 >= poolSize) {
     reallocPool()
   } else {
     alignPool()
@@ -37,6 +36,11 @@ module.exports.getMsg = function (topic, action, data) {
 
   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++) {
@@ -46,37 +50,48 @@ module.exports.getMsg = function (topic, action, data) {
   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
         const res = poolEncoder.encodeInto(
           JSON.stringify(data[i]),
           new Uint8Array(poolBuffer.buffer, poolOffset)
         )
-        poolOffset += res.written
+        len = res.written
       } else if (type === 'bigint') {
         poolBuffer[poolOffset++] = 31
         poolView.setBigUint64(poolOffset, data[i], false)
-        poolOffset += 8
+        len = 8
       } else if (type === 'string') {
         poolBuffer[poolOffset++] = 31
         const res = poolEncoder.encodeInto(data[i], new Uint8Array(poolBuffer.buffer, poolOffset))
-        poolOffset += res.written
+        len = res.written
       } 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) {
         reallocPool(start === 0 ? poolSize * 2 : poolSize)
-        return this.getMsg(topic, action, data)
+        return getMsg(topic, action, data)
       }
     }
   }
+
   return new Uint8Array(poolBuffer.buffer, start, poolOffset - start)
 }
 
-module.exports.typed = function (value) {
+export function typed(value) {
   const type = typeof value
 
   if (type === 'string') {

package/src/message/message-parser.js

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

package/src/record/record-handler.js

@@ -1,15 +1,15 @@
-const Record = require('./record')
-const MulticastListener = require('../utils/multicast-listener')
-const UnicastListener = require('../utils/unicast-listener')
-const C = require('../constants/constants')
-const rxjs = require('rxjs')
-const invariant = require('invariant')
-const EventEmitter = require('component-emitter2')
-const jsonPath = require('@nxtedition/json-path')
-const utils = require('../utils/utils')
-const rx = require('rxjs/operators')
-const xuid = require('xuid')
-const timers = require('../utils/timers')
+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 rxjs from 'rxjs'
+import invariant from 'invariant'
+import EventEmitter from 'component-emitter2'
+import jsonPath from '@nxtedition/json-path'
+import * as utils from '../utils/utils.js'
+import rx from 'rxjs/operators'
+import xuid from 'xuid'
+import * as timers from '../utils/timers.js'
 
 const kEmpty = Symbol('kEmpty')
 
@@ -101,6 +101,7 @@ class RecordHandler {
     this._pruning = new Set()
     this._patching = new Map()
     this._updating = new Map()
+    this._encoder = new TextEncoder()
 
     this._connected = 0
     this._stats = {
@@ -206,6 +207,12 @@ class RecordHandler {
     }
   }
 
+  _getKey(name) {
+    return name.length <= 8 && this._encoder.encode(name).byteLength === 8
+      ? name
+      : this._connection.hasher.h64(name)
+  }
+
   /**
    * @param {string} name
    * @returns {Record}
@@ -219,7 +226,7 @@ class RecordHandler {
     let record = this._records.get(name)
 
     if (!record) {
-      record = new Record(name, this)
+      record = new Record(this._getKey(name), name, this)
       this._stats.records += 1
       this._stats.created += 1
       this._records.set(name, record)
@@ -650,4 +657,4 @@ class RecordHandler {
   }
 }
 
-module.exports = RecordHandler
+export default RecordHandler

package/src/record/record.js

@@ -1,24 +1,24 @@
-const jsonPath = require('@nxtedition/json-path')
-const utils = require('../utils/utils')
-const C = require('../constants/constants')
-const messageParser = require('../message/message-parser')
-const xuid = require('xuid')
-const invariant = require('invariant')
-const cloneDeep = require('lodash.clonedeep')
-const timers = require('../utils/timers')
+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 xuid from 'xuid'
+import invariant from 'invariant'
+import cloneDeep from 'lodash.clonedeep'
+import * as timers from '../utils/timers.js'
 
-const encoder = new TextEncoder()
+// const encoder = new TextEncoder()
 
 class Record {
   static STATE = C.RECORD_STATE
 
-  constructor(name, handler) {
+  constructor(key, name, handler) {
     const connection = handler._connection
 
     this._handler = handler
 
     this._name = name
-    this._key = name
+    this._key = key
     this._version = ''
     this._data = jsonPath.EMPTY
     this._state = C.RECORD_STATE.VOID
@@ -28,7 +28,6 @@ class Record {
 
     /** @type Map? */ this._updating = null
     /** @type Array? */ this._patching = null
-    this._hashName()
     this._subscribed = connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [
       this._name,
       this._key,
@@ -316,16 +315,6 @@ class Record {
       })
   }
 
-  _hashName() {
-    // TODO (fix): It's hacky that hasher is not always available...
-    this._key =
-      typeof this._key === 'bigint'
-        ? this._key
-        : this._name.length <= 8 && encoder.encode(this._name).byteLength === 8
-        ? this._name
-        : this._handler.connection.hasher?.h64(this._name)
-  }
-
   _$onMessage(message) {
     if (message.action === C.ACTIONS.UPDATE) {
       this._onUpdate(message.data)
@@ -342,7 +331,6 @@ class Record {
     const connection = this._handler._connection
 
     if (connected) {
-      this._hashName()
       this._subscribed =
         this._refs > 0 &&
         connection.sendMsg(C.TOPIC.RECORD, C.ACTIONS.SUBSCRIBE, [this._name, this._key])
@@ -593,4 +581,4 @@ Object.defineProperty(Record.prototype, 'hasProvider', {
   },
 })
 
-module.exports = Record
+export default Record

package/src/rpc/rpc-handler.js

@@ -1,8 +1,8 @@
-const C = require('../constants/constants')
-const RpcResponse = require('./rpc-response')
-const messageParser = require('../message/message-parser')
-const messageBuilder = require('../message/message-builder')
-const xuid = require('xuid')
+import * as C from '../constants/constants.js'
+import RpcResponse from './rpc-response.js'
+import messageParser from '../message/message-parser.js'
+import * as messageBuilder from '../message/message-builder.js'
+import xuid from 'xuid'
 
 const RpcHandler = function (options, connection, client) {
   this._options = options
@@ -175,4 +175,4 @@ RpcHandler.prototype._onConnectionStateChange = function (connected) {
   }
 }
 
-module.exports = RpcHandler
+export default RpcHandler

package/src/rpc/rpc-response.js

@@ -1,5 +1,5 @@
-const C = require('../constants/constants')
-const messageBuilder = require('../message/message-builder')
+import * as C from '../constants/constants.js'
+import * as messageBuilder from '../message/message-builder.js'
 
 const RpcResponse = function (connection, name, id) {
   this._connection = connection
@@ -44,4 +44,4 @@ RpcResponse.prototype.send = function (data) {
   ])
 }
 
-module.exports = RpcResponse
+export default RpcResponse

package/src/utils/fixed-queue.js

@@ -1,5 +1,3 @@
-'use strict'
-
 // Currently optimal queue size, tested on V8 6.0 - 6.6. Must be power of two.
 const kSize = 2048
 const kMask = kSize - 1
@@ -82,7 +80,7 @@ class FixedCircularBuffer {
   }
 }
 
-module.exports = class FixedQueue {
+export default class FixedQueue {
   constructor() {
     this.head = this.tail = new FixedCircularBuffer()
   }

package/src/utils/multicast-listener.js

@@ -1,5 +1,5 @@
-const C = require('../constants/constants')
-const rxjs = require('rxjs')
+import * as C from '../constants/constants.js'
+import rxjs from 'rxjs'
 
 class Listener {
   constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
@@ -229,4 +229,4 @@ class Listener {
   }
 }
 
-module.exports = Listener
+export default Listener

package/src/utils/timers.js

@@ -1,7 +1,3 @@
-// undici timers
-
-'use strict'
-
 let fastNow = Date.now()
 let fastNowTimeout
 
@@ -44,8 +40,8 @@ function refreshTimeout() {
   if (fastNowTimeout && fastNowTimeout.refresh) {
     fastNowTimeout.refresh()
   } else {
-    clearTimeout(fastNowTimeout)
-    fastNowTimeout = setTimeout(onTimeout, 1e3)
+    globalThis.clearTimeout(fastNowTimeout)
+    fastNowTimeout = globalThis.setTimeout(onTimeout, 1e3)
     if (fastNowTimeout.unref) {
       fastNowTimeout.unref()
     }
@@ -83,15 +79,16 @@ class Timeout {
   }
 }
 
-module.exports = {
-  setTimeout(callback, delay, opaque) {
-    return delay < 1e3 ? setTimeout(callback, delay, opaque) : new Timeout(callback, delay, opaque)
-  },
-  clearTimeout(timeout) {
-    if (timeout instanceof Timeout) {
-      timeout.clear()
-    } else {
-      clearTimeout(timeout)
-    }
-  },
+export function setTimeout(callback, delay, opaque) {
+  return delay < 1e3
+    ? globalThis.setTimeout(callback, delay, opaque)
+    : new Timeout(callback, delay, opaque)
+}
+
+export function clearTimeout(timeout) {
+  if (timeout instanceof Timeout) {
+    timeout.clear()
+  } else {
+    globalThis.clearTimeout(timeout)
+  }
 }

package/src/utils/unicast-listener.js

@@ -1,6 +1,6 @@
-const C = require('../constants/constants')
-const rx = require('rxjs/operators')
-const rxjs = require('rxjs')
+import * as C from '../constants/constants.js'
+import rx from 'rxjs/operators'
+import rxjs from 'rxjs'
 
 const PIPE = rxjs.pipe(
   rx.map((value) => {
@@ -127,4 +127,4 @@ class Listener {
   }
 }
 
-module.exports = Listener
+export default Listener

package/src/utils/utils.js

@@ -1,11 +1,8 @@
 const NODE_ENV = typeof process !== 'undefined' && process.env && process.env.NODE_ENV
-const isNode = typeof process !== 'undefined' && process.toString() === '[object process]'
-const isProduction = NODE_ENV === 'production'
+export const isNode = typeof process !== 'undefined' && process.toString() === '[object process]'
+export const isProduction = NODE_ENV === 'production'
 
-module.exports.isNode = isNode
-module.exports.isProduction = isProduction
-
-module.exports.deepFreeze = function (o) {
+export function deepFreeze(o) {
   if (isProduction) {
     return o
   }
@@ -16,12 +13,12 @@ module.exports.deepFreeze = function (o) {
 
   Object.freeze(o)
 
-  Object.getOwnPropertyNames(o).forEach((prop) => module.exports.deepFreeze(o[prop]))
+  Object.getOwnPropertyNames(o).forEach((prop) => deepFreeze(o[prop]))
 
   return o
 }
 
-module.exports.splitRev = function (s) {
+export function splitRev(s) {
   if (!s) {
     return [-1, '00000000000000']
   }
@@ -32,7 +29,7 @@ module.exports.splitRev = function (s) {
   return [ver.charAt(0) === 'I' ? Infinity : parseInt(ver, 10), s.slice(i + 1)]
 }
 
-module.exports.isPlainObject = function (value, isPlainJSON) {
+export function isPlainObject(value, isPlainJSON) {
   if (isPlainJSON) {
     return value && typeof value === 'object' && !Array.isArray(value)
   }
@@ -53,13 +50,13 @@ module.exports.isPlainObject = function (value, isPlainJSON) {
   return Object.getPrototypeOf(value) === proto
 }
 
-module.exports.isSameOrNewer = function (a, b) {
-  const [av, ar] = module.exports.splitRev(a)
-  const [bv, br] = module.exports.splitRev(b)
+export function isSameOrNewer(a, b) {
+  const [av, ar] = splitRev(a)
+  const [bv, br] = splitRev(b)
   return av > bv || (av === bv && ar >= br)
 }
 
-module.exports.shallowCopy = function (obj) {
+export function shallowCopy(obj) {
   if (Array.isArray(obj)) {
     return obj.slice(0)
   }
@@ -72,15 +69,15 @@ module.exports.shallowCopy = function (obj) {
   return copy
 }
 
-module.exports.setTimeout = function (callback, timeoutDuration) {
+export function setTimeout(callback, timeoutDuration) {
   if (timeoutDuration !== null) {
-    return setTimeout(callback, timeoutDuration)
+    return globalThis.setTimeout(callback, timeoutDuration)
   } else {
     return -1
   }
 }
 
-module.exports.setInterval = function (callback, intervalDuration) {
+export function setInterval(callback, intervalDuration) {
   if (intervalDuration !== null) {
     return setInterval(callback, intervalDuration)
   } else {
@@ -88,7 +85,7 @@ module.exports.setInterval = function (callback, intervalDuration) {
   }
 }
 
-module.exports.compareRev = function compareRev(a, b) {
+export function compareRev(a, b) {
   if (!a) {
     return b ? -1 : 0
   }
@@ -118,7 +115,7 @@ module.exports.compareRev = function compareRev(a, b) {
   return 0
 }
 
-module.exports.AbortError = class AbortError extends Error {
+export class AbortError extends Error {
   constructor() {
     super('The operation was aborted')
     this.code = 'ABORT_ERR'
@@ -130,7 +127,7 @@ function defaultSchedule(fn) {
   setTimeout(fn, 0)
 }
 
-module.exports.schedule = isNode ? defaultSchedule : window.requestIdleCallback
+export const schedule = isNode ? defaultSchedule : window.requestIdleCallback
 
 const abortSignals = new WeakMap()
 const onAbort = function () {
@@ -142,7 +139,7 @@ const onAbort = function () {
   }
 }
 
-module.exports.addAbortListener = function addAbortListener(signal, handler) {
+export function addAbortListener(signal, handler) {
   if (!signal) {
     return
   }
@@ -160,7 +157,7 @@ module.exports.addAbortListener = function addAbortListener(signal, handler) {
   }
 }
 
-module.exports.removeAbortListener = function removeAbortListener(signal, handler) {
+export function removeAbortListener(signal, handler) {
   if (!signal) {
     return
   }