Real heartbeat timeouts server -> client

main.go

@@ -623,8 +623,7 @@ func writeInitial(client *client, w http.ResponseWriter, flusher http.Flusher) {
 }
 
 func writeHeartbeat(w http.ResponseWriter, flusher http.Flusher) {
-	fmt.Fprintf(w, ":\n\n")
+	writeEvent(&event{}, w, flusher)
-	flusher.Flush()
 }
 
 func writeEvent(e *event, w http.ResponseWriter, flusher http.Flusher) {

static/remote.js

@@ -74,7 +74,15 @@ function watch(roomId, clientId, adminSecret, prnt) {
 }
 function createEventSource(url) {
     const es = new EventSource(url.toString());
+    let lastMessage = performance.now();
+    const intId = setInterval(() => {
+        if (performance.now() - lastMessage > 10000) {
+            console.warn("timeout");
+            es.dispatchEvent(new Event("error"));
+        }
+    }, 1000);
     es.addEventListener("open", () => {
+        console.info("connected");
         messageBus.dispatchEvent(new Event("open"));
     });
     es.addEventListener("message", (e) => {
@@ -82,10 +90,12 @@ function createEventSource(url) {
             data: e.data,
             lastEventId: e.lastEventId,
         }));
+        lastMessage = performance.now();
     });
     es.addEventListener("error", () => {
         console.warn("disconnected");
         es.close();
+        clearInterval(intId);
         setTimeout(() => createEventSource(url), 3000);
         messageBus.dispatchEvent(new Event("error"));
     });

static/remote.ts

@@ -159,7 +159,17 @@ function watch(roomId: string, clientId: string, adminSecret: string | null, prn
 function createEventSource(url: URL) {
 	const es = new EventSource(url.toString());
 
+	let lastMessage = performance.now();
+
+	const intId = setInterval(() => {
+		if (performance.now() - lastMessage > 10000) {
+			console.warn("timeout");
+			es.dispatchEvent(new Event("error"));
+		}
+	}, 1000);
+
 	es.addEventListener("open", () => {
+		console.info("connected");
 		messageBus.dispatchEvent(new Event("open"));
 	});
 
@@ -168,11 +178,16 @@ function createEventSource(url: URL) {
 			data: e.data,
 			lastEventId: e.lastEventId,
 		}));
+
+		lastMessage = performance.now();
 	});
 
 	es.addEventListener("error", () => {
 		console.warn("disconnected");
+
 		es.close();
+		clearInterval(intId);
+
 		setTimeout(() => createEventSource(url), 3000);
 
 		messageBus.dispatchEvent(new Event("error"));