@eleven-am/pondsocket-client 0.0.16 → 0.0.17

package/browser/client.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PondClient_instances, _PondClient_channels, _PondClient_createPublisher, _PondClient_handleAcknowledge, _PondClient_init;
+var _PondClient_instances, _PondClient_channels, _PondClient_disconnecting, _PondClient_createPublisher, _PondClient_handleAcknowledge, _PondClient_init;
 Object.defineProperty(exports, "__esModule", { value: true });
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
 const channel_1 = require("../core/channel");
@@ -18,6 +18,7 @@ class PondClient {
     constructor(endpoint, params = {}) {
         _PondClient_instances.add(this);
         _PondClient_channels.set(this, void 0);
+        _PondClient_disconnecting.set(this, void 0);
         let address;
         try {
             address = new URL(endpoint);
@@ -26,6 +27,7 @@ class PondClient {
             address = new URL(window.location.toString());
             address.pathname = endpoint;
         }
+        __classPrivateFieldSet(this, _PondClient_disconnecting, false, "f");
         const query = new URLSearchParams(params);
         address.search = query.toString();
         const protocol = address.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -42,6 +44,7 @@ class PondClient {
      * @desc Connects to the server and returns the socket.
      */
     connect(backoff = 1) {
+        __classPrivateFieldSet(this, _PondClient_disconnecting, false, "f");
         const socket = new WebSocket(this._address.toString());
         socket.onopen = () => {
             this._connectionState.publish(true);
@@ -50,8 +53,11 @@ class PondClient {
             const data = JSON.parse(message.data);
             this._broadcaster.publish(data);
         };
-        socket.onerror = () => {
+        socket.onclose = () => {
             this._connectionState.publish(false);
+            if (__classPrivateFieldGet(this, _PondClient_disconnecting, "f")) {
+                return;
+            }
             setTimeout(() => {
                 this.connect(backoff * 2);
             }, backoff * 1000);
@@ -71,6 +77,7 @@ class PondClient {
         var _a;
         Object.values(__classPrivateFieldGet(this, _PondClient_channels, "f")).forEach((channel) => channel.leave());
         this._connectionState.publish(false);
+        __classPrivateFieldSet(this, _PondClient_disconnecting, true, "f");
         (_a = this._socket) === null || _a === void 0 ? void 0 : _a.close();
         __classPrivateFieldSet(this, _PondClient_channels, {}, "f");
     }
@@ -96,7 +103,7 @@ class PondClient {
         return this._connectionState.subscribe(callback);
     }
 }
-_PondClient_channels = new WeakMap(), _PondClient_instances = new WeakSet(), _PondClient_createPublisher = function _PondClient_createPublisher() {
+_PondClient_channels = new WeakMap(), _PondClient_disconnecting = new WeakMap(), _PondClient_instances = new WeakSet(), _PondClient_createPublisher = function _PondClient_createPublisher() {
     return (message) => {
         if (this._connectionState.value) {
             this._socket.send(JSON.stringify(message));

package/browser/client.test.js

@@ -38,7 +38,7 @@ describe('PondClient', () => {
         const mockWebSocket = pondClient['_socket'];
         expect(mockWebSocket.onopen).toBeInstanceOf(Function);
         expect(mockWebSocket.onmessage).toBeInstanceOf(Function);
-        expect(mockWebSocket.onerror).toBeInstanceOf(Function);
+        expect(mockWebSocket.onclose).toBeInstanceOf(Function);
     });
     test('disconnect method should close the socket and leave all channels', () => {
         const mockCallback = jest.fn();
@@ -101,12 +101,12 @@ describe('PondClient', () => {
         let mockWebSocket = pondClient['_socket'];
         expect(connectSpy).toHaveBeenCalledTimes(1);
         connectSpy.mockClear();
-        mockWebSocket.onerror();
+        mockWebSocket.onclose();
         yield new Promise((resolve) => setTimeout(resolve, 1000));
         expect(connectSpy).toHaveBeenCalledTimes(1);
         connectSpy.mockClear();
         mockWebSocket = pondClient['_socket'];
-        mockWebSocket.onerror();
+        mockWebSocket.onclose();
         yield new Promise((resolve) => setTimeout(resolve, 2000));
         expect(connectSpy).toHaveBeenCalledTimes(1);
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket-client",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",