Current run management

src/app/api/run/route.ts

@@ -32,7 +32,7 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
 
     client.send(JSON.stringify({ requestId, ok: true }));
 
-    console.log(`User ${session[1].username} connected to live run`);
+    let currentRun: string | undefined;
 
     client.on("message", async (raw) => {
       try {
@@ -54,6 +54,18 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
               return;
             }
 
+            if (currentRun) {
+              client.send(
+                JSON.stringify({
+                  requestId,
+                  ok: false,
+                  error:
+                    "Cannot do multiple runs at a time, please delete or submit the current run",
+                }),
+              );
+              return;
+            }
+
             const runId = randomUUID();
 
             await Core.addLiveRun({
@@ -79,14 +91,20 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
 
           /* ---------------- DELETE ---------------- */
           case "move": {
-            const { runId, moves, file, language } = msg;
+            const { moves, file, language } = msg;
 
-            if (
+            if (!currentRun) {
-              !runId ||
+              client.send(
-              !moves ||
+                JSON.stringify({
-              file === undefined ||
+                  requestId,
-              language === undefined
+                  ok: false,
-            ) {
+                  error: "No current run, please create a run first",
+                }),
+              );
+              return;
+            }
+
+            if (!moves || file === undefined || language === undefined) {
               client.send(
                 JSON.stringify({
                   requestId,
@@ -97,7 +115,7 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
               return;
             }
 
-            const liveRun = await Core.getLiveRun(runId);
+            const liveRun = await Core.getLiveRun(currentRun);
 
             if (!liveRun) {
               client.send(
@@ -131,20 +149,18 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
 
           /* ---------------- SUBMIT ---------------- */
           case "submit": {
-            const { runId } = msg;
+            if (!currentRun) {
-
-            if (!runId) {
               client.send(
                 JSON.stringify({
                   requestId,
                   ok: false,
-                  error: "runId required",
+                  error: "No current run, please create a run first",
                 }),
               );
               return;
             }
 
-            const liveRun = await Core.getLiveRun(runId);
+            const liveRun = await Core.getLiveRun(currentRun);
 
             if (!liveRun) {
               client.send(
@@ -172,20 +188,18 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
 
           /* ---------------- DELETE ---------------- */
           case "delete": {
-            const { runId } = msg;
+            if (!currentRun) {
-
-            if (!runId) {
               client.send(
                 JSON.stringify({
                   requestId,
                   ok: false,
-                  error: "runId required",
+                  error: "No current run, please create a run first",
                 }),
               );
               return;
             }
 
-            const run = await Core.removeLiveRun(runId);
+            const run = await Core.removeLiveRun(currentRun);
 
             client.send(
               JSON.stringify({
@@ -199,8 +213,18 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
           }
 
           case "getText":
-            const { runId } = msg;
+            if (!currentRun) {
-            const data = await redis.get(`liveRunText:${runId}`);
+              client.send(
+                JSON.stringify({
+                  requestId,
+                  ok: false,
+                  error: "No current run, please create a run first",
+                }),
+              );
+              return;
+            }
+
+            const data = await redis.get(`liveRunText:${currentRun}`);
 
             client.send(
               JSON.stringify({
@@ -231,10 +255,13 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
         );
       }
     });
-  });
 
-  client.on("close", () => {
+    client.on("close", async () => {
-    // optional cleanup
+      if (!currentRun) return;
+
+      Core.removeLiveRun(currentRun);
+      await redis.del(`liveRunText:${currentRun}`);
+    });
   });
 }