From a764b6f0314512a1c0bef37e2dac9fc96474bb5b Mon Sep 17 00:00:00 2001
From: pagoru <pagoru@gmail.com>
Date: Fri, 11 Oct 2024 18:06:52 +0200
Subject: [PATCH] fix: added event reconnecting + remove events - fix #4

---
 src/client.ts | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index 02aad56..4146beb 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -74,31 +74,22 @@ export const getClientSocket = ({
       try {
         if (isConnected) return resolve();
 
-        !silent && reconnects === 0 && console.log(`Connecting to ${url}!`);
-        socket = new WebSocket(url, protocols);
-
-        // Connection opened
-        socket.addEventListener("open", () => {
+        const $onOpen = () => {
           isConnected = true;
           !silent && console.log(`Connected to ${url}!`);
           emitEventCallback("connected");
           resolve();
           reconnects = 0;
-        });
-
-        // Listen for messages
-        socket.addEventListener("message", ({ data }) => {
+        };
+        const $onMessage = ({ data }: any) => {
           const { event, message } = JSON.parse(data);
           if (!events[event]) return;
 
           emitEventCallback(event, message);
-        });
-
-        socket.addEventListener("error", (message) =>
-          emitEventCallback("error", message),
-        );
-
-        socket.addEventListener("close", (message) => {
+        };
+        const $onError = (message: unknown) =>
+          emitEventCallback("error", message);
+        const $onClose = (message: unknown) => {
           !silent && isConnected && console.log(`Disconnected from ${url}!`);
 
           // resovle if it's already closed
@@ -106,6 +97,7 @@ export const getClientSocket = ({
 
           isConnected = false;
           if (reconnect && reconnectIntents > reconnects) {
+            emitEventCallback("reconnecting");
             reconnects++;
             !silent &&
               console.log(
@@ -119,7 +111,22 @@ export const getClientSocket = ({
           }
           emitEventCallback("disconnected", message);
           resolve();
-        });
+        };
+
+        if (socket) {
+          socket.removeEventListener("open", $onOpen);
+          socket.removeEventListener("message", $onMessage);
+          socket.removeEventListener("error", $onError);
+          socket.removeEventListener("close", $onClose);
+        }
+
+        !silent && reconnects === 0 && console.log(`Connecting to ${url}!`);
+        socket = new WebSocket(url, protocols);
+
+        socket.addEventListener("open", $onOpen);
+        socket.addEventListener("message", $onMessage);
+        socket.addEventListener("error", $onError);
+        socket.addEventListener("close", $onClose);
       } catch (e) {
         reject(e);
       }