notifications init

client/src/socket.jsx

@@ -197,9 +197,10 @@ function createSocket(events) {
         events.setItemInfo(info);
     }
 
+    let pongTimeout;
     function onPong() {
         events.setPing(Date.now() - ping);
-        setTimeout(sendPing, 1000);
+        pongTimeout = setTimeout(sendPing, 1000);
     }
 
     // -------------
@@ -253,41 +254,52 @@ function createSocket(events) {
         return handlers[msgType](params);
     }
 
+    // Connection opened
+    function onOpen() {
+        toast.info({
+            message: 'connected',
+            position: 'topRight',
+        });
+
+        sendPing();
+        sendItemInfo();
+
+        return true;
+    }
+
+    function onError(event) {
+        console.error('WebSocket error', event);
+    }
+
+    function onClose(event) {
+        console.error('WebSocket closed', event);
+        toast.warning({
+            message: 'disconnected',
+            position: 'topRight',
+        });
+        return setTimeout(connect, 5000);
+    }
+
     function connect() {
+        if (ws) {
+            clearGameStateTimeout();
+            clearInstanceStateTimeout();
+            clearTimeout(pongTimeout);
+            ws.removeEventListener('open', onOpen);
+            ws.removeEventListener('message', onMessage);
+            ws.removeEventListener('error', onError);
+            ws.removeEventListener('close', onClose);
+            ws = null;
+        }
+
         ws = new WebSocket(SOCKET_URL);
         ws.binaryType = 'arraybuffer';
 
-        // Connection opened
-        ws.addEventListener('open', () => {
-            toast.info({
-                message: 'connected',
-                position: 'topRight',
-            });
-
-            sendPing();
-            sendItemInfo();
-
-            return true;
-        });
-
         // Listen for messages
+        ws.addEventListener('open', onOpen);
         ws.addEventListener('message', onMessage);
-
-        ws.addEventListener('error', (event) => {
-            console.error('WebSocket error', event);
-            // account = null;
-            // return setTimeout(connect, 5000);
-        });
-
-        ws.addEventListener('close', (event) => {
-            console.error('WebSocket closed', event);
-            toast.warning({
-                message: 'disconnected',
-                position: 'topRight',
-            });
-            return setTimeout(connect, 5000);
-        });
-
+        ws.addEventListener('error', onError);
+        ws.addEventListener('close', onClose);
         return ws;
     }