websocket: fix heartbeat reconnect (#529)

solidjs-community · Oct 26, 2023 · 19993d2 · 19993d2
2 parents 70f0400 + a3fc429
commit 19993d2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.changeset/eighty-sheep-travel.md b/.changeset/eighty-sheep-travel.md
@@ -0,0 +1,5 @@
+---
+"@solid-primitives/websocket": minor
+---
+
+bugfix: setup heartbeat after reconnect
diff --git a/packages/websocket/src/index.ts b/packages/websocket/src/index.ts
@@ -195,12 +195,13 @@ export const makeHeartbeatWS = (
     clearTimers();
     pongtimer = setTimeout(ws.reconnect, options.wait || 1500);
   };
-  ws.addEventListener("close", clearTimers);
   const receiveMessage = () => {
     clearTimers();
     pingtimer = setTimeout(() => ws.send(options.message || "ping"), options.interval || 1000);
   };
+  ws.addEventListener("close", clearTimers);
   ws.addEventListener("message", receiveMessage);
-  setTimeout(receiveMessage, options.interval || 1000);
+  ws.addEventListener("open", () => setTimeout(receiveMessage, options.interval || 1000));
   return ws;
 };
+