Skip to content

Commit bbedea5

Browse files
fix: dev client script being loaded twice (#1944)
1 parent 206d500 commit bbedea5

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed
Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
let ws: WebSocket;
22

3-
let closed = false;
4-
53
let reconnectTimer: number;
64
const backoff = [
75
0,
@@ -25,7 +23,7 @@ const backoff = [
2523
];
2624
let backoffIdx = 0;
2725
function reconnect() {
28-
if (!closed) return;
26+
if (ws.readyState !== ws.CLOSED) return;
2927

3028
reconnectTimer = setTimeout(() => {
3129
if (backoffIdx === 0) {
@@ -39,7 +37,6 @@ function reconnect() {
3937

4038
try {
4139
connect(true);
42-
closed = false;
4340
clearTimeout(reconnectTimer);
4441
} catch (_err) {
4542
reconnect();
@@ -54,18 +51,19 @@ function connect(forceReload?: boolean) {
5451
);
5552

5653
ws.addEventListener("open", () => {
57-
console.log(
58-
`%c Fresh %c Connected to development server.`,
59-
"background-color: #86efac; color: black",
60-
"color: inherit",
61-
);
6254
if (forceReload) {
6355
location.reload();
56+
} else {
57+
backoffIdx = 0;
58+
console.log(
59+
`%c Fresh %c Connected to development server.`,
60+
"background-color: #86efac; color: black",
61+
"color: inherit",
62+
);
6463
}
6564
});
6665

6766
ws.addEventListener("close", () => {
68-
closed = true;
6967
reconnect();
7068
});
7169

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import "preact/debug";
2-
import "./client.ts";
2+
import "../client.ts";
33
export * from "./main.ts";

0 commit comments

Comments
 (0)