@resolveio/client-lib-core 15.1.2 → 15.1.4

package/fesm2020/resolveio-client-lib-core.mjs

@@ -232,6 +232,50 @@ class SocketService {
         this.onconnecting = function () { };
         this.onmessage = function (event) { };
         this.onerror = function (event) { };
+        this.onOpenHandler = (event) => {
+            clearTimeout(this.timeout);
+            this.timeout = null;
+            this.log(new Date(), 'WS', 'onopen', this.url);
+            this.readyState = WebSocket.OPEN;
+            this.readyState$.next(this.readyState);
+            this.onopen(event);
+            this.startPinging();
+        };
+        this.onCloseHandler = (event) => {
+            if (this.timeout) {
+                clearTimeout(this.timeout);
+            }
+            this.timeout = null;
+            this.ws.removeEventListener('open', this.onOpenHandler);
+            this.ws.removeEventListener('close', this.onCloseHandler);
+            this.ws.removeEventListener('message', this.onMessageHandler);
+            this.ws.removeEventListener('error', this.onErrorHandler);
+            this.ws = null;
+            this.readyState = WebSocket.CLOSED;
+            this.readyState$.next(this.readyState);
+            this.log(new Date(), 'WS', 'onclose', this.url);
+            this.onclose(event);
+            setTimeout(() => {
+                this.connect();
+            }, this.reconnectInterval);
+            this.stopPinging();
+        };
+        this.onMessageHandler = (event) => {
+            if (event.data === 'pong') {
+                this.log(new Date(), 'WS', 'pong received');
+                clearTimeout(this.pongTimeout);
+            }
+            else {
+                let messageData = JSON.parse(event.data);
+                messageData = this.convertUTCDateToLocalDate(messageData);
+                this.onmessage(messageData);
+            }
+        };
+        this.onErrorHandler = (event) => {
+            this.log(new Date(), 'WS', 'onerror', this, event);
+            this.onerror(event);
+            this.close();
+        };
         document.addEventListener('visibilitychange', this.handleVisibilityChange.bind(this));
     }
     openSocket(environment, protocols) {
@@ -253,46 +297,10 @@ class SocketService {
                 this.log(new Date(), 'WS', 'connection-timeout', this.url);
                 this.close();
             }, this.timeoutInterval);
-            this.ws.onopen = (event) => {
-                clearTimeout(this.timeout);
-                this.timeout = null;
-                this.log(new Date(), 'WS', 'onopen', this.url);
-                this.readyState = WebSocket.OPEN;
-                this.readyState$.next(this.readyState);
-                this.onopen(event);
-                this.startPinging();
-            };
-            this.ws.onclose = (event) => {
-                if (this.timeout) {
-                    clearTimeout(this.timeout);
-                }
-                this.timeout = null;
-                this.ws = null;
-                this.readyState = WebSocket.CLOSED;
-                this.readyState$.next(this.readyState);
-                this.log(new Date(), 'WS', 'onclose', this.url);
-                this.onclose(event);
-                setTimeout(() => {
-                    this.reconnect();
-                }, this.reconnectInterval);
-                this.stopPinging();
-            };
-            this.ws.onmessage = (event) => {
-                if (event.data === 'pong') {
-                    this.log(new Date(), 'WS', 'pong received');
-                    clearTimeout(this.pongTimeout);
-                }
-                else {
-                    let messageData = JSON.parse(event.data);
-                    messageData = this.convertUTCDateToLocalDate(messageData);
-                    this.onmessage(messageData);
-                }
-            };
-            this.ws.onerror = (event) => {
-                this.log(new Date(), 'WS', 'onerror', this, event);
-                this.onerror(event);
-                this.close();
-            };
+            this.ws.onopen = this.onOpenHandler;
+            this.ws.onclose = this.onCloseHandler;
+            this.ws.onmessage = this.onMessageHandler;
+            this.ws.onerror = this.onErrorHandler;
         }
     }
     convertUTCDateToLocalDate(data) {