hacker-lobby 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hacker-lobby",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Multiplayer terminal chat application",
   "main": "index.js",
   "type": "module",

package/src/worker.js

@@ -1,6 +1,3 @@
-// Active SSE connection writers
-const activeConnections = new Set();
-
 // Regex to match ANSI escape sequences (control codes, color formatting, etc.)
 const ansiRegex = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
 
@@ -14,6 +11,52 @@ function sanitizeAnsi(str) {
   return str.replace(ansiRegex, '');
 }
 
+/**
+ * Periodically polls the D1 database for new messages and writes them to the SSE stream.
+ * This ensures multi-isolate reliability since Cloudflare Workers are stateless.
+ * @param {WritableStreamDefaultWriter} writer
+ * @param {Object} env
+ * @param {Request} request
+ */
+async function pollAndStream(writer, env, request) {
+  const encoder = new TextEncoder();
+  try {
+    const initialResult = await env.DB.prepare('SELECT MAX(id) as maxId FROM messages').first();
+    let lastSeenId = initialResult?.maxId || 0;
+
+    // Send initial handshake
+    await writer.write(encoder.encode(': ok\n\n'));
+
+    while (!request.signal.aborted) {
+      const { results } = await env.DB.prepare(
+        'SELECT id, username, content, created_at FROM messages WHERE id > ? ORDER BY id ASC'
+      )
+        .bind(lastSeenId)
+        .all();
+
+      if (results && results.length > 0) {
+        for (const msg of results) {
+          const payload = JSON.stringify({
+            username: msg.username,
+            content: msg.content,
+            created_at: msg.created_at,
+          });
+          await writer.write(encoder.encode(`data: ${payload}\n\n`));
+          lastSeenId = msg.id;
+        }
+      }
+
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+    }
+  } catch (err) {
+    console.error('SSE Stream error:', err);
+  } finally {
+    try {
+      await writer.close();
+    } catch (_) {}
+  }
+}
+
 export default {
   /**
    * Fetch handler for Cloudflare Worker.
@@ -59,20 +102,8 @@ export default {
       const { readable, writable } = new TransformStream();
       const writer = writable.getWriter();
 
-      // Add writer to active connections tracking
-      activeConnections.add(writer);
-
-      // Handle connection disconnect to prevent memory leaks
-      request.signal.addEventListener('abort', () => {
-        activeConnections.delete(writer);
-        try {
-          writer.close();
-        } catch (_) {}
-      });
-
-      // Keep-alive or immediate connection handshake
-      const encoder = new TextEncoder();
-      writer.write(encoder.encode(': ok\n\n')).catch(() => {});
+      // Start the D1 polling loop in the background, keeping it alive with ctx.waitUntil
+      ctx.waitUntil(pollAndStream(writer, env, request));
 
       return new Response(readable, {
         headers: {
@@ -121,29 +152,6 @@ export default {
           .bind(sanitizedUser, sanitizedText)
           .run();
 
-        // Broadcast the message payload to all active SSE subscribers
-        const encoder = new TextEncoder();
-        const payload = JSON.stringify({
-          username: sanitizedUser,
-          content: sanitizedText,
-          created_at: new Date().toISOString(),
-        });
-        const messageChunk = encoder.encode(`data: ${payload}\n\n`);
-
-        const broadcastPromises = Array.from(activeConnections).map(async (w) => {
-          try {
-            await w.write(messageChunk);
-          } catch (_) {
-            activeConnections.delete(w);
-            try {
-              w.close();
-            } catch (__) {}
-          }
-        });
-        
-        // Wait for all active broadcasts
-        await Promise.all(broadcastPromises);
-
         return jsonResponse({
           success: true,
           message: 'Message sent successfully',