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

package/package.json

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

package/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

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 * 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'

package/src/message/connection.js

@@ -1,15 +1,15 @@
+import * as utils from '../utils/utils.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 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) {
+
+export default function Connection(client, url, options) {
   this._client = client
   this._options = options
   this._logger = options.logger
@@ -166,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,
-    pkg.version,
+    '26.0.0',
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,
@@ -365,5 +365,3 @@ Connection.prototype._clearReconnect = function () {
   }
   this._reconnectionAttempt = 0
 }
-
-module.exports = Connection

package/src/message/message-builder.js

@@ -1,8 +1,8 @@
-const C = require('../constants/constants')
+import * as C from '../constants/constants.js'
 
 const SEP = C.MESSAGE_PART_SEPERATOR
 
-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')
   }
@@ -22,7 +22,7 @@ module.exports.getMsg = function (topic, action, data) {
   return sendData.join(SEP)
 }
 
-module.exports.typed = function (value) {
+export function typed(value) {
   const type = typeof value
 
   if (type === 'string') {

package/src/message/message-parser.js

@@ -1,10 +1,12 @@
-const C = require('../constants/constants')
+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)
 }
-
-module.exports = new MessageParser()

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 * as messageParser from '../message/message-parser.js'
 import * as messageBuilder from '../message/message-builder.js'
 import xuid from 'xuid'
 

package/src/utils/multicast-listener.js

@@ -1,7 +1,7 @@
 import * as C from '../constants/constants.js'
 import rxjs from 'rxjs'
 
-class Listener {
+export default class Listener {
   constructor(topic, pattern, callback, handler, { recursive = false, stringify = null } = {}) {
     this._topic = topic
     this._pattern = pattern
@@ -101,7 +101,7 @@ class Listener {
         this._connection.sendMsg(
           this._topic,
           accepted ? C.ACTIONS.LISTEN_ACCEPT : C.ACTIONS.LISTEN_REJECT,
-          [this._pattern, provider.key],
+          [this._pattern, provider.name],
         )
 
         provider.version = null
@@ -228,5 +228,3 @@ class Listener {
     this._subscriptions.clear()
   }
 }
-
-export default Listener

package/src/utils/unicast-listener.js

@@ -21,7 +21,7 @@ const PIPE = rxjs.pipe(
   rx.distinctUntilChanged(),
 )
 
-class Listener {
+export default class Listener {
   constructor(topic, pattern, callback, handler, opts) {
     if (opts.recursive) {
       throw new Error('invalid argument: recursive')
@@ -126,5 +126,3 @@ class Listener {
     this._connection.sendMsg(this._topic, C.ACTIONS.UNLISTEN, [this._pattern])
   }
 }
-
-export default Listener