copilot socket fixes
This commit is contained in:
parent
214667d85d
commit
bfeb85b674
@ -8,14 +8,37 @@ export const FileListen =(inPath:string, inHandler:()=>void)=>
|
|||||||
FileListeners.set(inPath, members);
|
FileListeners.set(inPath, members);
|
||||||
};
|
};
|
||||||
|
|
||||||
const Socket:WebSocket = new WebSocket("ws://"+document.location.host);
|
let socket: WebSocket;
|
||||||
Socket.addEventListener('message', async(event:{data:string})=>
|
let socketTimer: number | undefined;
|
||||||
{
|
let reconnectAttempts = 0;
|
||||||
// When a file changes, dynamically re-import it to get the updated members
|
|
||||||
// send the updated members to any listeners for that file
|
function connect() {
|
||||||
const reImport = await import(document.location.origin+event.data+"?reload="+Math.random());
|
socket = new WebSocket("ws://" + location.host);
|
||||||
FileListeners.get(event.data)?.forEach(reExport=>reExport(reImport));
|
socket.addEventListener("open", () => {
|
||||||
HMR.update();
|
reconnectAttempts = 0;
|
||||||
});
|
socketTimer = window.setInterval(() => {
|
||||||
Socket.addEventListener("error", ()=>{clearInterval(SocketTimer); console.log("HMR socket lost")})
|
if (socket.readyState === WebSocket.OPEN) socket.send("ping");
|
||||||
const SocketTimer = setInterval(()=>{Socket.send("ping")}, 5000);
|
}, 5000);
|
||||||
|
});
|
||||||
|
socket.addEventListener("message", async (ev) => {
|
||||||
|
try {
|
||||||
|
const reImport = await import(location.origin + ev.data + "?reload=" + Math.random());
|
||||||
|
FileListeners.get(ev.data)?.forEach(h => h(reImport));
|
||||||
|
HMR.update();
|
||||||
|
} catch (e) {
|
||||||
|
console.error("HMR import failed for", ev.data, e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
socket.addEventListener("close", () => {
|
||||||
|
if (socketTimer) { clearInterval(socketTimer); socketTimer = undefined; }
|
||||||
|
// simple exponential backoff reconnect
|
||||||
|
reconnectAttempts++;
|
||||||
|
const delay = Math.min(30000, 500 * (2 ** (reconnectAttempts - 1)));
|
||||||
|
setTimeout(connect, delay);
|
||||||
|
});
|
||||||
|
socket.addEventListener("error", () => {
|
||||||
|
if (socketTimer) { clearInterval(socketTimer); socketTimer = undefined; }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
connect();
|
34
server.ts
34
server.ts
@ -118,6 +118,7 @@ const JSResponse =(body:string)=>
|
|||||||
return new Response(stream, JSHead);
|
return new Response(stream, JSHead);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Deno.serve(async(req:Request)=>
|
Deno.serve(async(req:Request)=>
|
||||||
{
|
{
|
||||||
if(req.headers.get("upgrade") == "websocket")
|
if(req.headers.get("upgrade") == "websocket")
|
||||||
@ -127,11 +128,11 @@ Deno.serve(async(req:Request)=>
|
|||||||
const { response, socket } = Deno.upgradeWebSocket(req);
|
const { response, socket } = Deno.upgradeWebSocket(req);
|
||||||
socket.onopen = () => SocketsLive.add(socket);
|
socket.onopen = () => SocketsLive.add(socket);
|
||||||
socket.onclose = () => SocketsLive.delete(socket);
|
socket.onclose = () => SocketsLive.delete(socket);
|
||||||
|
socket.onerror = (e) => { console.log("socket error", e); SocketsLive.delete(socket); };
|
||||||
socket.onmessage = () => {};
|
socket.onmessage = () => {};
|
||||||
socket.onerror = (e) => {console.log("Socket errored:", e);SocketsLive.delete(socket);}
|
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
catch(e){ console.log("Socket errored:", e); }
|
catch(e){ console.log("upgradeWebSocket failed", e); }
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = new URL(req.url);
|
const url = new URL(req.url);
|
||||||
@ -172,31 +173,22 @@ Deno.serve(async(req:Request)=>
|
|||||||
return new Response();
|
return new Response();
|
||||||
});
|
});
|
||||||
|
|
||||||
const SocketsLive:Set<WebSocket> = new Set();
|
const SocketsLive = new Set<WebSocket>();
|
||||||
const SocketsSend =(inData:string)=>
|
|
||||||
{
|
const SocketsSend = (inData: string) => {
|
||||||
// iterate over a snapshot so we can remove while iterating
|
for (const socket of Array.from(SocketsLive)) {
|
||||||
for (const socket of Array.from(SocketsLive))
|
try {
|
||||||
{
|
if (socket.readyState === WebSocket.OPEN) {
|
||||||
try
|
|
||||||
{
|
|
||||||
if (socket.readyState === WebSocket.OPEN)
|
|
||||||
{
|
|
||||||
socket.send(inData);
|
socket.send(inData);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// not open any more — remove it
|
|
||||||
SocketsLive.delete(socket);
|
SocketsLive.delete(socket);
|
||||||
}
|
}
|
||||||
}
|
} catch (e) {
|
||||||
catch (err)
|
console.log("socket send failed:", e);
|
||||||
{
|
|
||||||
console.log("Failed to send to socket:", err);
|
|
||||||
SocketsLive.delete(socket);
|
SocketsLive.delete(socket);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
const Watcher =async()=>
|
const Watcher =async()=>
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user