@nxtedition/deepstream.io-client-js 24.4.1 → 24.4.3

package/package.json

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

package/src/event/event-handler.js

@@ -4,7 +4,7 @@ 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 rxjs from 'rxjs'
+import * as rxjs from 'rxjs'
 
 const EventHandler = function (options, connection, client) {
   this._options = options

package/src/message/connection.js

@@ -26,6 +26,7 @@ export default function Connection(client, url, options) {
     action: null,
     data: null,
   }
+  this._decoder = new globalThis.TextDecoder()
   this._recvQueue = new FixedQueue()
   this._reconnectTimeout = null
   this._reconnectionAttempt = 0
@@ -88,19 +89,22 @@ Connection.prototype.close = function () {
 }
 
 Connection.prototype._createEndpoint = function () {
-  this._endpoint = NodeWebSocket
-    ? new NodeWebSocket(this._url, {
-        generateMask() {},
-      })
-    : new BrowserWebSocket(this._url)
+  if (utils.isNode) {
+    this._endpoint = new NodeWebSocket(this._url, {
+      generateMask() {},
+    })
+    this._endpoint.binaryType = 'nodebuffer'
+  } else {
+    this._endpoint = new BrowserWebSocket(this._url)
+    this._endpoint.binaryType = 'arraybuffer'
+  }
+
   this._corked = false
 
   this._endpoint.onopen = this._onOpen.bind(this)
   this._endpoint.onerror = this._onError.bind(this)
   this._endpoint.onclose = this._onClose.bind(this)
-  this._endpoint.onmessage = BrowserWebSocket
-    ? ({ data }) => this._onMessage(typeof data === 'string' ? data : Buffer.from(data).toString())
-    : ({ data }) => this._onMessage(typeof data === 'string' ? data : data.toString())
+  this._endpoint.onmessage = ({ data }) => this._onMessage(this._decoder.decode(data))
 }
 
 Connection.prototype.send = function (message) {
@@ -161,7 +165,7 @@ Connection.prototype._sendAuthParams = function () {
   this._setState(C.CONNECTION_STATE.AUTHENTICATING)
   const authMessage = messageBuilder.getMsg(C.TOPIC.AUTH, C.ACTIONS.REQUEST, [
     this._authParams,
-    '24.4.0',
+    '24.4.3',
     utils.isNode
       ? `Node/${process.version}`
       : globalThis.navigator && globalThis.navigator.userAgent,

package/src/record/record-handler.js

@@ -2,12 +2,11 @@ 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 * as 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'
 
@@ -472,7 +471,7 @@ class RecordHandler {
       // TODO (fix): Missing sync..
       return new Promise((resolve, reject) => {
         this.observe(...args)
-          .pipe(rx.first())
+          .pipe(rxjs.first())
           .subscribe({
             next: resolve,
             error: reject,
@@ -488,7 +487,7 @@ class RecordHandler {
   get2(...args) {
     return new Promise((resolve, reject) => {
       this.observe2(...args)
-        .pipe(rx.first())
+        .pipe(rxjs.first())
         .subscribe({
           next: resolve,
           error: reject,