mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-02 15:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reconnect logic

Browse Source 
Former-commit-id: 67fc1488169e9779794b23600401f70a1e812cad
This commit is contained in:
Jarred Sumner
2021-08-15 21:43:53 -07:00
parent 197b3ee34d
commit db4caf0d42
1 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/runtime/hmr.ts
View File

@@ -390,16 +390,39 @@ var __HMRModule, __FastRefreshModule, __HMRClient;
};
}
nextReconnectAttempt = 0;
reconnectDelay = 16;
debouncedReconnect = () => {
if (
this.socket &&
(this.socket.readyState == this.socket.OPEN ||
this.socket.readyState == this.socket.CONNECTING)
)
return;
this.nextReconnectAttempt = setTimeout(
this.attemptReconnect,
this.reconnectDelay
);
};
attemptReconnect = () => {
globalThis.clearTimeout(this.nextReconnectAttempt);
if (
this.socket &&
(this.socket.readyState == this.socket.OPEN ||
this.socket.readyState == this.socket.CONNECTING)
)
return;
this.connect();
this.reconnectDelay += Math.floor(Math.random() * 128);
};
connect() {
clientStartTime = performance.now();
if (this.reconnect) {
globalThis.clearInterval(this.reconnect);
this.reconnect = 0;
}
const baseURL = new URL(location.origin + "/_api.hmr");
baseURL.protocol = location.protocol === "https" ? "wss" : "ws";
baseURL.protocol = location.protocol === "https:" ? "wss" : "ws";
this.socket = new WebSocket(baseURL.toString(), ["speedy-hmr"]);
this.socket.binaryType = "arraybuffer";
this.socket.onclose = this.handleClose;
@@ -460,8 +483,7 @@ var __HMRModule, __FastRefreshModule, __HMRClient;
if (this.reconnect !== 0) {
return;
}
this.reconnect = setInterval(this.connect, 500) as any as number;
this.debouncedReconnect();
};
handleBuildSuccess(buffer: ByteBuffer, timestamp: number) {
@@ -645,9 +667,15 @@ var __HMRModule, __FastRefreshModule, __HMRClient;
buildCommandUArray = new Uint32Array(1);
buildCommandUArrayEight = new Uint8Array(this.buildCommandUArray.buffer);
// On open, reset the delay for reconnecting
handleOpen = (event: Event) => {
globalThis.clearInterval(this.reconnect);
this.reconnect = 0;
globalThis.clearTimeout(this.nextReconnectAttempt);
setTimeout(() => {
if (this.socket && this.socket.readyState == this.socket.OPEN) {
globalThis.clearTimeout(this.nextReconnectAttempt);
this.reconnectDelay = 16;
}
}, 16);
};
handleMessage = (event: MessageEvent) => {
@@ -699,11 +727,7 @@ var __HMRModule, __FastRefreshModule, __HMRClient;
return;
}
this.reconnect = globalThis.setInterval(
this.connect,
500
) as any as number;
__hmrlog.warn("HMR disconnected. Attempting to reconnect.");
this.debouncedReconnect();
};
}
let pendingUpdateCount = 0;
@@ -836,9 +860,9 @@ var __HMRModule, __FastRefreshModule, __HMRClient;
// We must find a React Refresh boundary. This is a module that only exports React components.
// If we do not find a React Refresh boundary, we must instead perform a full page reload.
for (
let i = HMRModule.dependencies.graph_used - 1;
i > this.module_index;
i--
let i = 0;
i <= this.module_index;
i++ // let i = HMRModule.dependencies.graph_used - 1; // i > this.module_index; // i--
) {
let handled =
!HMRModule.dependencies.modules[i].exports.__hmrDisable;
@@ -1136,6 +1160,7 @@ var __HMRModule, __FastRefreshModule, __HMRClient;
},
};
// __HMRModule = FastRefreshModule;
__HMRModule = HMRModule;
__FastRefreshModule = FastRefreshModule;
__HMRClient = HMRClient;