@eleven-am/pondsocket-client 0.0.18 → 0.0.19

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_disconnecting, _PondClient_createPublisher, _PondClient_handleAcknowledge, _PondClient_init;
+var _PondClient_instances, _PondClient_channels, _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,7 +18,6 @@ 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);
@@ -27,7 +26,7 @@ class PondClient {
             address = new URL(window.location.toString());
             address.pathname = endpoint;
         }
-        __classPrivateFieldSet(this, _PondClient_disconnecting, false, "f");
+        this._disconnecting = false;
         const query = new URLSearchParams(params);
         address.search = query.toString();
         const protocol = address.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -43,25 +42,22 @@ class PondClient {
     /**
      * @desc Connects to the server and returns the socket.
      */
-    connect(backoff = 1) {
-        __classPrivateFieldSet(this, _PondClient_disconnecting, false, "f");
+    connect() {
+        this._disconnecting = false;
         const socket = new WebSocket(this._address.toString());
-        socket.onopen = () => {
-            backoff = 1;
-            this._connectionState.publish(true);
-        };
         socket.onmessage = (message) => {
             const data = JSON.parse(message.data);
             this._broadcaster.publish(data);
         };
+        socket.onerror = () => socket.close();
         socket.onclose = () => {
             this._connectionState.publish(false);
-            if (__classPrivateFieldGet(this, _PondClient_disconnecting, "f")) {
+            if (this._disconnecting) {
                 return;
             }
             setTimeout(() => {
-                this.connect(backoff * 2);
-            }, backoff * 1000);
+                this.connect();
+            }, 1000);
         };
         this._socket = socket;
     }
@@ -78,7 +74,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");
+        this._disconnecting = true;
         (_a = this._socket) === null || _a === void 0 ? void 0 : _a.close();
         __classPrivateFieldSet(this, _PondClient_channels, {}, "f");
     }
@@ -104,7 +100,7 @@ class PondClient {
         return this._connectionState.subscribe(callback);
     }
 }
-_PondClient_channels = new WeakMap(), _PondClient_disconnecting = new WeakMap(), _PondClient_instances = new WeakSet(), _PondClient_createPublisher = function _PondClient_createPublisher() {
+_PondClient_channels = new WeakMap(), _PondClient_instances = new WeakSet(), _PondClient_createPublisher = function _PondClient_createPublisher() {
     return (message) => {
         if (this._connectionState.value) {
             this._socket.send(JSON.stringify(message));
@@ -120,6 +116,9 @@ _PondClient_channels = new WeakMap(), _PondClient_disconnecting = new WeakMap(),
         if (message.event === pondsocket_common_1.Events.ACKNOWLEDGE) {
             __classPrivateFieldGet(this, _PondClient_instances, "m", _PondClient_handleAcknowledge).call(this, message);
         }
+        else if (message.event === pondsocket_common_1.Events.CONNECTION && message.action === pondsocket_common_1.ServerActions.CONNECT) {
+            this._connectionState.publish(true);
+        }
     });
 };
 exports.default = PondClient;

package/browser/client.test.js

@@ -36,16 +36,46 @@ describe('PondClient', () => {
     test('connect method should set up WebSocket events', () => {
         pondClient.connect();
         const mockWebSocket = pondClient['_socket'];
-        expect(mockWebSocket.onopen).toBeInstanceOf(Function);
         expect(mockWebSocket.onmessage).toBeInstanceOf(Function);
         expect(mockWebSocket.onclose).toBeInstanceOf(Function);
     });
+    test('it should publish messages received from the server', () => {
+        pondClient.connect();
+        const mockWebSocket = pondClient['_socket'];
+        const broadcasterSpy = jest.spyOn(pondClient['_broadcaster'], 'publish');
+        mockWebSocket.onmessage({ data: JSON.stringify({ event: 'exampleEvent' }) });
+        expect(broadcasterSpy).toHaveBeenCalledTimes(1);
+        expect(broadcasterSpy).toHaveBeenCalledWith({ event: 'exampleEvent' });
+    });
+    test('socket should only pass to publish state when acknowledged event is received', () => {
+        pondClient.connect();
+        const mockWebSocket = pondClient['_socket'];
+        const mockCallback = jest.fn();
+        pondClient.onConnectionChange(mockCallback);
+        expect(mockCallback).not.toHaveBeenCalled();
+        const acknowledgeEvent = {
+            event: pondsocket_common_1.Events.CONNECTION,
+            action: pondsocket_common_1.ServerActions.CONNECT,
+            channelName: 'exampleChannel',
+            requestId: '123',
+            payload: {},
+        };
+        mockWebSocket.onmessage({ data: JSON.stringify(acknowledgeEvent) });
+        expect(mockCallback).toHaveBeenCalledWith(true);
+    });
     test('disconnect method should close the socket and leave all channels', () => {
         const mockCallback = jest.fn();
         pondClient.onConnectionChange(mockCallback);
         pondClient.connect();
         const mockWebSocket = pondClient['_socket'];
-        mockWebSocket.onopen();
+        const acknowledgeEvent = {
+            event: pondsocket_common_1.Events.CONNECTION,
+            action: pondsocket_common_1.ServerActions.CONNECT,
+            channelName: 'exampleChannel',
+            requestId: '123',
+            payload: {},
+        };
+        mockWebSocket.onmessage({ data: JSON.stringify(acknowledgeEvent) });
         expect(mockCallback).toHaveBeenCalledWith(true);
         const channel = pondClient.createChannel('exampleChannel');
         const spyOnLeave = jest.spyOn(channel, 'leave');
@@ -83,7 +113,14 @@ describe('PondClient', () => {
         pondClient.connect();
         const mockWebSocket = pondClient['_socket'];
         const channel = pondClient.createChannel('exampleChannel');
-        mockWebSocket.onopen();
+        const acknowledgeEvent = {
+            event: pondsocket_common_1.Events.CONNECTION,
+            action: pondsocket_common_1.ServerActions.CONNECT,
+            channelName: 'exampleChannel',
+            requestId: '123',
+            payload: {},
+        };
+        mockWebSocket.onmessage({ data: JSON.stringify(acknowledgeEvent) });
         channel.join();
         expect(mockWebSocket.send).toHaveBeenCalledTimes(1);
         const sentObject = mockWebSocket.send.mock.calls[0][0];
@@ -110,13 +147,4 @@ describe('PondClient', () => {
         yield new Promise((resolve) => setTimeout(resolve, 2000));
         expect(connectSpy).toHaveBeenCalledTimes(1);
     }));
-    test('it should publish messages received from the server', () => {
-        pondClient.connect();
-        const mockWebSocket = pondClient['_socket'];
-        const broadcasterSpy = jest.spyOn(pondClient['_broadcaster'], 'publish');
-        mockWebSocket.onopen();
-        mockWebSocket.onmessage({ data: JSON.stringify({ event: 'exampleEvent' }) });
-        expect(broadcasterSpy).toHaveBeenCalledTimes(1);
-        expect(broadcasterSpy).toHaveBeenCalledWith({ event: 'exampleEvent' });
-    });
 });

package/node/node.js

@@ -11,21 +11,23 @@ class PondClient extends client_1.default {
      * @desc Connects to the server and returns the socket.
      */
     connect(backoff = 1) {
+        this._disconnecting = false;
         const socket = new WebSocket(this._address.toString());
-        socket.onopen = () => {
-            this._connectionState.publish(true);
-        };
+        socket.onopen = () => this._connectionState.publish(true);
         socket.onmessage = (message) => {
             const data = JSON.parse(message.data);
             this._broadcaster.publish(data);
         };
-        socket.onerror = () => {
+        socket.onerror = () => socket.close();
+        socket.onclose = () => {
             this._connectionState.publish(false);
+            if (this._disconnecting) {
+                return;
+            }
             setTimeout(() => {
-                this.connect(backoff * 2);
-            }, backoff * 1000);
+                this.connect();
+            }, 1000);
         };
-        this._socket = socket;
     }
 }
 exports.default = PondClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket-client",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -29,7 +29,7 @@
     "pipeline": "npm run test && npm run build && npm run push"
   },
   "dependencies": {
-    "@eleven-am/pondsocket-common": "^0.0.15",
+    "@eleven-am/pondsocket-common": "^0.0.18",
     "websocket": "^1.0.34"
   },
   "devDependencies": {