Merge pull request #21 from orus-dev/bug-patches

Bug patches

Dockerfile

@@ -0,0 +1,18 @@
+FROM node:20-alpine
+
+WORKDIR /app
+
+# Install deps
+COPY package.json package-lock.json ./
+RUN npm ci
+
+# Copy source
+COPY . .
+
+# Build app
+RUN npm run build
+
+ENV NODE_ENV=production
+EXPOSE 3000
+
+CMD ["npm", "run", "start"]

package-lock.json

@@ -7,6 +7,7 @@
     "": {
       "name": "dev-run",
       "version": "0.1.0",
+      "hasInstallScript": true,
       "dependencies": {
         "@codemirror/lang-go": "^6.0.1",
         "@codemirror/lang-java": "^6.0.2",
@@ -43,7 +44,8 @@
         "@radix-ui/react-toggle-group": "^1.1.10",
         "@radix-ui/react-tooltip": "^1.2.7",
         "@supabase/ssr": "^0.8.0",
-        "@supabase/supabase-js": "^2.94.1",
+        "@supabase/supabase-js": "^2.95.3",
+        "@types/js-cookie": "^3.0.6",
         "@uiw/codemirror-theme-vscode": "^4.25.4",
         "@uiw/react-codemirror": "^4.25.4",
         "axios": "^1.13.5",
@@ -53,6 +55,7 @@
         "date-fns": "^4.1.0",
         "embla-carousel-react": "^8.6.0",
         "ioredis": "^5.9.2",
+        "js-cookie": "^3.0.5",
         "lucide-react": "^0.563.0",
         "next": "16.1.6",
         "next-ws": "^2.1.16",
@@ -3458,9 +3461,9 @@
       "license": "MIT"
     },
     "node_modules/@supabase/auth-js": {
-      "version": "2.94.1",
-      "resolved": "https://registry.npmjs.org/@supabase/auth-js/-/auth-js-2.94.1.tgz",
-      "integrity": "sha512-Wt/SdmAtNNiqrcBbPlzWojLcE1bQ9OYb8PTaYF6QccFX5JeXZI0sZ01MLNE+E83UK6cK0lw4YznX0D2g08UQng==",
+      "version": "2.95.3",
+      "resolved": "https://registry.npmjs.org/@supabase/auth-js/-/auth-js-2.95.3.tgz",
+      "integrity": "sha512-vD2YoS8E2iKIX0F7EwXTmqhUpaNsmbU6X2R0/NdFcs02oEfnHyNP/3M716f3wVJ2E5XHGiTFXki6lRckhJ0Thg==",
       "license": "MIT",
       "dependencies": {
         "tslib": "2.8.1"
@@ -3470,9 +3473,9 @@
       }
     },
     "node_modules/@supabase/functions-js": {
-      "version": "2.94.1",
-      "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.94.1.tgz",
-      "integrity": "sha512-A7Bx0gnclDNZ4m8+mnO2IEEzMxtUSg7cpPEBF6Ek1LpjIQkC7vvoidiV/RuntnKX43IiVcWV1f2FsAppMagEmQ==",
+      "version": "2.95.3",
+      "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.95.3.tgz",
+      "integrity": "sha512-uTuOAKzs9R/IovW1krO0ZbUHSJnsnyJElTXIRhjJTqymIVGcHzkAYnBCJqd7468Fs/Foz1BQ7Dv6DCl05lr7ig==",
       "license": "MIT",
       "dependencies": {
         "tslib": "2.8.1"
@@ -3482,9 +3485,9 @@
       }
     },
     "node_modules/@supabase/postgrest-js": {
-      "version": "2.94.1",
-      "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-2.94.1.tgz",
-      "integrity": "sha512-N6MTghjHnMZddT48rAj8dIFgedCU97cc1ahQM74Tc+DF4UH7y2+iEfdYV3unJsylpaiWlu92Fy8Lj14Jbrmxog==",
+      "version": "2.95.3",
+      "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-2.95.3.tgz",
+      "integrity": "sha512-LTrRBqU1gOovxRm1vRXPItSMPBmEFqrfTqdPTRtzOILV4jPSueFz6pES5hpb4LRlkFwCPRmv3nQJ5N625V2Xrg==",
       "license": "MIT",
       "dependencies": {
         "tslib": "2.8.1"
@@ -3494,9 +3497,9 @@
       }
     },
     "node_modules/@supabase/realtime-js": {
-      "version": "2.94.1",
-      "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.94.1.tgz",
-      "integrity": "sha512-Wq8olpCAGmN4y2DH2kUdlcakdzNHRCde72BFS8zK5ub46bBeSUoE9DqrfeNFWKaF2gCE/cmK8aTUTorZD9jdtQ==",
+      "version": "2.95.3",
+      "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.95.3.tgz",
+      "integrity": "sha512-D7EAtfU3w6BEUxDACjowWNJo/ZRo7sDIuhuOGKHIm9FHieGeoJV5R6GKTLtga/5l/6fDr2u+WcW/m8I9SYmaIw==",
       "license": "MIT",
       "dependencies": {
         "@types/phoenix": "^1.6.6",
@@ -3521,9 +3524,9 @@
       }
     },
     "node_modules/@supabase/storage-js": {
-      "version": "2.94.1",
-      "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.94.1.tgz",
-      "integrity": "sha512-/Mi18LGyrugPwtfqETfAqEGcBQotY/7IMsTGYgEFdqr8cQq280BVQWjN2wI9KibWtshPp0Ryvil5Uzd5YfM7kA==",
+      "version": "2.95.3",
+      "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.95.3.tgz",
+      "integrity": "sha512-4GxkJiXI3HHWjxpC3sDx1BVrV87O0hfX+wvJdqGv67KeCu+g44SPnII8y0LL/Wr677jB7tpjAxKdtVWf+xhc9A==",
       "license": "MIT",
       "dependencies": {
         "iceberg-js": "^0.8.1",
@@ -3534,16 +3537,16 @@
       }
     },
     "node_modules/@supabase/supabase-js": {
-      "version": "2.94.1",
-      "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.94.1.tgz",
-      "integrity": "sha512-87vOY8n3WHB3m+a/KeySj07djOQVuRA5qgX5E7db1eDkaZ1of5M+3t/tv6eYYy4BfqxuHMZuCe5uVrO/oyvoow==",
+      "version": "2.95.3",
+      "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.95.3.tgz",
+      "integrity": "sha512-Fukw1cUTQ6xdLiHDJhKKPu6svEPaCEDvThqCne3OaQyZvuq2qjhJAd91kJu3PXLG18aooCgYBaB6qQz35hhABg==",
       "license": "MIT",
       "dependencies": {
-        "@supabase/auth-js": "2.94.1",
-        "@supabase/functions-js": "2.94.1",
-        "@supabase/postgrest-js": "2.94.1",
-        "@supabase/realtime-js": "2.94.1",
-        "@supabase/storage-js": "2.94.1"
+        "@supabase/auth-js": "2.95.3",
+        "@supabase/functions-js": "2.95.3",
+        "@supabase/postgrest-js": "2.95.3",
+        "@supabase/realtime-js": "2.95.3",
+        "@supabase/storage-js": "2.95.3"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -3892,6 +3895,12 @@
       "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
       "license": "MIT"
     },
+    "node_modules/@types/js-cookie": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-3.0.6.tgz",
+      "integrity": "sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==",
+      "license": "MIT"
+    },
     "node_modules/@types/node": {
       "version": "20.19.32",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.32.tgz",
@@ -4927,6 +4936,15 @@
         "jiti": "lib/jiti-cli.mjs"
       }
     },
+    "node_modules/js-cookie": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",

package.json

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev --turbopack",
-    "build": "npm run build:lib && next build",
-    "postinstall": "npm run ws -- -y",
-    "ws": "npx --yes next-ws-cli@latest patch"
+    "build": "next build",
+    "start": "next start",
+    "dev": "next dev",
+    "postinstall": "next-ws patch"
   },
   "dependencies": {
     "@codemirror/lang-go": "^6.0.1",
@@ -44,7 +44,8 @@
     "@radix-ui/react-toggle-group": "^1.1.10",
     "@radix-ui/react-tooltip": "^1.2.7",
     "@supabase/ssr": "^0.8.0",
-    "@supabase/supabase-js": "^2.94.1",
+    "@supabase/supabase-js": "^2.95.3",
+    "@types/js-cookie": "^3.0.6",
     "@uiw/codemirror-theme-vscode": "^4.25.4",
     "@uiw/react-codemirror": "^4.25.4",
     "axios": "^1.13.5",
@@ -54,6 +55,7 @@
     "date-fns": "^4.1.0",
     "embla-carousel-react": "^8.6.0",
     "ioredis": "^5.9.2",
+    "js-cookie": "^3.0.5",
     "lucide-react": "^0.563.0",
     "next": "16.1.6",
     "next-ws": "^2.1.16",

src/app/api/auth/callback/route.ts

@@ -1,9 +1,11 @@
 // app/auth/callback/route.ts
 import { NextRequest, NextResponse } from "next/server";
 import { createClient } from "@/lib/supabase/server";
+import { getOrigin } from "@/lib/origin/server";
 
 export async function GET(req: NextRequest) {
   const code = req.nextUrl.searchParams.get("code");
+  const { httpOrigin } = await getOrigin();
 
   if (!code) {
     return NextResponse.json({ error: "code param required" }, { status: 400 });
@@ -18,5 +20,5 @@ export async function GET(req: NextRequest) {
     return NextResponse.json({ error: error.message }, { status: 500 });
   }
 
-  return NextResponse.redirect(new URL("/runs", req.url));
+  return NextResponse.redirect(`${httpOrigin}/problems`);
 }

src/app/api/run/move/route.ts

@@ -1,33 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { createClient } from "@/lib/supabase/server";
-import * as Core from "@/modules/live-run/core";
-import { getSession } from "@/modules/account/core";
-
-export async function POST(req: NextRequest) {
-  const { runId, moves, file, language } = await req.json();
-
-  if (!runId || !moves || file === undefined || language === undefined)
-    return NextResponse.json(
-      { error: "body requires runId, moves, file and language" },
-      { status: 400 },
-    );
-
-  const supabase = await createClient();
-
-  const session = await getSession(supabase);
-
-  if (!session)
-    return NextResponse.json({ error: "Invalid session" }, { status: 401 });
-
-  const liveRun = await Core.getLiveRun(runId);
-
-  if (!liveRun)
-    return NextResponse.json(
-      { error: "Run is not live or does not exist" },
-      { status: 401 },
-    );
-
-  const run = await Core.addLiveRunEvent(liveRun.id, file, language, moves);
-
-  return NextResponse.json({ ok: true, run });
-}

src/app/api/run/route.ts

@@ -1,80 +1,238 @@
-import { NextRequest, NextResponse } from "next/server";
-import { createClient } from "@/lib/supabase/server";
-import * as Core from "@/modules/live-run/core";
-import { getSession } from "@/modules/account/core";
+import { WebSocketServer, WebSocket } from "ws";
 import { randomUUID } from "crypto";
+import { createClientCookie } from "@/lib/supabase/server";
+import { getSession } from "@/modules/account/core";
+import * as Core from "@/modules/live-run/core";
+import { ClientMessage } from "./types";
+import { redis } from "@/lib/redis";
+import { User } from "@supabase/supabase-js";
+import { UserProfile } from "@/modules/user/types";
+import { NextRequest } from "next/server";
 
-export async function PUT(req: NextRequest) {
-  const { problem, category } = await req.json();
+export function UPGRADE(client: WebSocket, server: WebSocketServer) {
+  let authenticated = false;
+  let session: [User, UserProfile] | null = null;
+  let currentRun: string | undefined;
 
+  // Heartbeat
+  let isAlive = true;
+  const heartbeat = setInterval(() => {
+    if (!isAlive) {
+      console.log("Client did not respond to ping, terminating");
+      return closeClient("Heartbeat timeout");
+    }
+    isAlive = false;
+    if (client.readyState === WebSocket.OPEN) client.ping();
+  }, 15000);
+
+  client.on("pong", () => {
+    isAlive = true;
+  });
+
+  const closeClient = (reason?: string) => {
+    if (reason) console.warn("Closing client:", reason);
+    try {
+      client.close();
+      setTimeout(() => {
+        if (client.readyState !== WebSocket.CLOSED) client.terminate();
+      }, 1000);
+    } catch {}
+  };
+
+  const cleanupRun = async () => {
+    if (currentRun) {
+      try {
+        await Core.removeLiveRun(currentRun);
+      } catch (err) {
+        console.error("Error cleaning up run:", err);
+      }
+      currentRun = undefined;
+    }
+  };
+
+  client.on("message", async (raw) => {
+    let requestId: string | undefined;
+
+    try {
+      const msg = JSON.parse(raw.toString());
+      requestId = msg.requestId;
+
+      // AUTHENTICATION
+      if (!authenticated) {
+        const { cookies } = msg as { cookies?: Record<string, string> };
+        if (!cookies) return closeClient("Missing cookies");
+
+        const supabase = await createClientCookie(
+          new Map(Object.entries(cookies)),
+        );
+        session = await getSession(supabase);
+        if (!session) return closeClient("Invalid session");
+
+        authenticated = true;
+        return client.send(JSON.stringify({ requestId, ok: true }));
+      }
+
+      if (!session) return closeClient("Session unexpectedly null");
+
+      // POST-AUTH MESSAGE HANDLING
+      const { type, ...payload } = msg as ClientMessage;
+
+      switch (type) {
+        case "create": {
+          const { problem, category } = payload as any;
           if (!problem || !category)
-    return NextResponse.json(
-      { error: "body requires problem and category" },
-      { status: 400 },
+            return client.send(
+              JSON.stringify({
+                requestId,
+                ok: false,
+                error: "problem and category required",
+              }),
+            );
+          if (currentRun)
+            return client.send(
+              JSON.stringify({
+                requestId,
+                ok: false,
+                error:
+                  "Cannot do multiple runs, delete/submit current run first",
+              }),
             );
 
-  const supabase = await createClient();
-
-  const session = await getSession(supabase);
-
-  if (!session)
-    return NextResponse.json({ error: "Invalid session" }, { status: 401 });
-
           const runId = randomUUID();
-
           await Core.addLiveRun({
+            id: runId,
             problem,
             category,
-    id: runId,
             username: session[1].username,
             views: 0,
-    start: new Date().getTime(),
+            start: Date.now(),
             runsCount: 0,
           });
 
-  return NextResponse.json({ ok: true, runId });
+          currentRun = runId;
+          return client.send(
+            JSON.stringify({
+              requestId,
+              ok: true,
+              type: "create",
+              data: { runId },
+            }),
+          );
         }
 
-export async function POST(req: NextRequest) {
-  const { runId } = await req.json();
-
-  if (!runId)
-    return NextResponse.json({ error: "body requires runId" }, { status: 400 });
-
-  const supabase = await createClient();
-
-  const session = await getSession(supabase);
-
-  if (!session)
-    return NextResponse.json({ error: "Invalid session" }, { status: 401 });
-
-  const liveRun = await Core.getLiveRun(runId);
-
-  if (!liveRun)
-    return NextResponse.json(
-      { error: "Run is not live or does not exist" },
-      { status: 401 },
+        case "move": {
+          if (!currentRun)
+            return client.send(
+              JSON.stringify({ requestId, ok: false, error: "No current run" }),
             );
 
-  const run = await Core.submitRun(supabase, liveRun, session[0].id);
+          const { moves, file, language } = payload as any;
+          if (!moves || file === undefined || language === undefined)
+            return client.send(
+              JSON.stringify({
+                requestId,
+                ok: false,
+                error: "moves, file, and language required",
+              }),
+            );
 
-  return NextResponse.json({ ok: true, run });
+          const liveRun = await Core.getLiveRun(currentRun);
+          if (!liveRun)
+            return client.send(
+              JSON.stringify({ requestId, ok: false, error: "Run not live" }),
+            );
+
+          const run = await Core.addLiveRunEvent(
+            liveRun.id,
+            file,
+            language,
+            moves,
+          );
+          return client.send(
+            JSON.stringify({ requestId, ok: true, type: "move", data: run }),
+          );
         }
 
-export async function DELETE(req: NextRequest) {
-  const runId = req.nextUrl.searchParams.get("runId");
+        case "submit": {
+          if (!currentRun)
+            return client.send(
+              JSON.stringify({ requestId, ok: false, error: "No current run" }),
+            );
 
-  if (!runId)
-    return NextResponse.json({ error: "missing ?runId=" }, { status: 400 });
+          const liveRun = await Core.getLiveRun(currentRun);
+          if (!liveRun)
+            return client.send(
+              JSON.stringify({ requestId, ok: false, error: "Run not live" }),
+            );
 
-  const supabase = await createClient();
+          const run = await Core.submitRun(liveRun, session[0].id);
+          currentRun = undefined;
+          return client.send(
+            JSON.stringify({ requestId, ok: true, type: "submit", data: run }),
+          );
+        }
 
-  const session = await getSession(supabase);
+        case "delete": {
+          if (!currentRun)
+            return client.send(
+              JSON.stringify({ requestId, ok: false, error: "No current run" }),
+            );
 
-  if (!session)
-    return NextResponse.json({ error: "Invalid session" }, { status: 401 });
+          await cleanupRun();
+          return client.send(
+            JSON.stringify({
+              requestId,
+              ok: true,
+              type: "delete",
+              data: { id: currentRun },
+            }),
+          );
+        }
 
-  const run = await Core.removeLiveRun(runId);
+        case "getText": {
+          if (!currentRun)
+            return client.send(
+              JSON.stringify({ requestId, ok: false, error: "No current run" }),
+            );
 
-  return NextResponse.json({ ok: true, run });
+          const data = await redis.get(`liveRunText:${currentRun}`);
+          return client.send(JSON.stringify({ requestId, ok: true, data }));
+        }
+
+        default:
+          return client.send(
+            JSON.stringify({
+              requestId,
+              ok: false,
+              error: "Unknown message type",
+            }),
+          );
+      }
+    } catch (err) {
+      console.error(err);
+      if (requestId)
+        client.send(
+          JSON.stringify({ requestId, ok: false, error: "Malformed message" }),
+        );
+      closeClient("Malformed message");
+    }
+  });
+
+  client.on("close", async () => {
+    clearInterval(heartbeat);
+    await cleanupRun();
+  });
+
+  client.on("error", (err) => {
+    console.error("WebSocket error:", err);
+    clearInterval(heartbeat);
+    closeClient("WebSocket error");
+  });
+}
+
+export function GET(req: NextRequest) {
+  const headers = new Headers();
+  headers.set("Connection", "Upgrade");
+  headers.set("Upgrade", "websocket");
+  return new Response("Upgrade Required", { status: 426, headers });
 }

src/app/api/run/types.ts

@@ -0,0 +1,32 @@
+import { LiveRunMove } from "@/modules/live-run/types";
+
+export type ClientMessage = { requestId: string } & (
+  | {
+      type: "create";
+      problem: string;
+      category: "any%" | "100%";
+    }
+  | {
+      type: "move";
+      runId: string;
+      file: string;
+      language: string;
+      moves: LiveRunMove[];
+    }
+  | {
+      type: "submit";
+      runId: string;
+    }
+  | {
+      type: "delete";
+      runId: string;
+    }
+  | {
+      type: "getText";
+      runId: string;
+    }
+);
+
+export type ServerMessage =
+  | { ok: true; type: string; data?: any }
+  | { ok: false; error: string };

src/app/api/view-run/route.ts

@@ -1,66 +1,63 @@
+// ws/liveRun.ts
 import { WebSocketServer, WebSocket } from "ws";
-import Redis from "ioredis";
-import { NextRequest, NextResponse } from "next/server";
+import { NextRequest } from "next/server";
 import { LiveRunEvent } from "@/modules/live-run/types";
-import { getLiveRun, updateLiveRunViews } from "@/modules/live-run/core";
+import { updateLiveRunViews } from "@/modules/live-run/core";
+import { redis, redisSubscriber } from "@/lib/redis";
 
-export function GET(req: NextRequest) {
-  const headers = new Headers();
-  headers.set("Connection", "Upgrade");
-  headers.set("Upgrade", "websocket");
-  return new Response("Upgrade Required", { status: 426, headers });
+// Map of runId → Set of WebSockets
+const runSubscribers: Map<string, Set<WebSocket>> = new Map();
+
+// Handle incoming Pub/Sub messages
+redisSubscriber.on("message", (channel, message) => {
+  const runId = channel.split(":")[1];
+  const sockets = runSubscribers.get(runId);
+  if (!sockets) return;
+
+  const data: LiveRunEvent = JSON.parse(message);
+
+  sockets.forEach((ws) => {
+    if (ws.readyState === WebSocket.OPEN) {
+      ws.send(JSON.stringify({ ...data, text: null }));
     }
+  });
+});
 
-export function UPGRADE(client: WebSocket, server: WebSocketServer) {
-  const subscriber = new Redis();
+export async function UPGRADE(client: WebSocket, server: WebSocketServer) {
   let runId: string;
 
+  // Receive runId from client
   client.once("message", async (message) => {
     runId = message.toString();
 
+    // Track view count
     await updateLiveRunViews(runId, 1);
 
-    let lastEvent: LiveRunEvent | null = null;
-
-    const sendText = async () => {
-      const text = await subscriber.get(`liveRunText:${runId}`);
-
-      if (client.readyState === WebSocket.OPEN) {
+    // Send initial text
+    const text = await redis.get(`liveRunText:${runId}`);
     client.send(
-          JSON.stringify({
-            file: lastEvent?.file,
-            language: lastEvent?.language,
-            moves: [],
-            text,
-          }),
+      JSON.stringify({ file: null, language: null, moves: [], text }),
     );
+
+    // Add WebSocket to subscribers
+    if (!runSubscribers.has(runId)) {
+      runSubscribers.set(runId, new Set());
+      await redisSubscriber.subscribe(`liveRunEvent:${runId}`);
     }
-    };
-
-    sendText();
-
-    client.on("message", sendText);
-
-    subscriber.subscribe(`liveRunEvent:${runId}`, (err, count) => {
-      if (err) {
-        console.error("Failed to subscribe", err);
-        client.close(1011, "Redis subscription failed");
-      }
-    });
-
-    subscriber.on("message", (channel, message) => {
-      const data: LiveRunEvent = JSON.parse(message);
-
-      lastEvent = data;
-      if (client.readyState === WebSocket.OPEN) {
-        client.send(JSON.stringify({ ...data, text: null }));
-      }
-    });
+    runSubscribers.get(runId)!.add(client);
   });
 
+  // Handle client disconnect
   client.once("close", async () => {
-    if (runId) await subscriber.unsubscribe(`liveRun:${runId}`);
-    subscriber.quit();
+    const set = runSubscribers.get(runId);
+    if (set) {
+      set.delete(client);
+      if (set.size === 0) {
+        await redisSubscriber.unsubscribe(`liveRunEvent:${runId}`);
+        runSubscribers.delete(runId);
+      }
+    }
+
     await updateLiveRunViews(runId, -1);
   });
 
@@ -68,3 +65,10 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
     console.error("WebSocket error:", err);
   });
 }
+
+export function GET(req: NextRequest) {
+  const headers = new Headers();
+  headers.set("Connection", "Upgrade");
+  headers.set("Upgrade", "websocket");
+  return new Response("Upgrade Required", { status: 426, headers });
+}

src/app/leaderboard/components/LeaderboardRow.tsx

@@ -48,7 +48,7 @@ const LeaderboardRow = ({
         </div>
       </td>
 
-      {/* Wins */}
+      {/* World Records */}
       <td className="py-4 px-4 text-center font-mono font-semibold text-primary">
         {run.wins}
       </td>

src/app/leaderboard/page.tsx

@@ -78,9 +78,9 @@ export default function Leaderboard() {
                 {/* Runner / Username */}
                 <TableHead className="py-4 px-4 text-left">Runner</TableHead>
 
-                {/* Wins */}
+                {/* World Records */}
                 <TableHead className="py-4 px-4 w-24 text-center">
-                  Wins
+                  World Records
                 </TableHead>
 
                 {/* Podiums */}

src/app/problems/page.tsx

@@ -9,6 +9,7 @@ import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
 import useAction from "@/hook/use-action";
 import { getProblems } from "@/modules/problems/actions";
 import axios from "axios";
+import Cookies from "js-cookie";
 
 export default function Problems() {
   const [problems] = useAction(getProblems);
@@ -16,7 +17,7 @@ export default function Problems() {
   useEffect(() => {
     (async () => {
       await axios.post("http://127.0.0.1:63780/auth", {
-        saveCookies: document.cookie,
+        saveCookies: Cookies.get(),
       });
     })().catch(() => {});
   }, []);

src/app/runs/[runId]/components/Editor.tsx

@@ -11,7 +11,7 @@ import { java } from "@codemirror/lang-java";
 import { useEffect, useRef, useState } from "react";
 import { LiveRun, LiveRunEvent, LiveRunMove } from "@/modules/live-run/types";
 import useAction from "@/hook/use-action";
-import { getOrigin } from "@/modules/getOrigin";
+import { getOrigin } from "@/lib/origin/client";
 
 type Language =
   | "javascript"
@@ -56,9 +56,9 @@ export default function Editor({
 
   // WebSocket connection
   useEffect(() => {
-    if (!run || !origin?.host) return;
+    if (!run || !origin?.wsOrigin) return;
 
-    const ws = new WebSocket(`ws://${origin.host}/api/view-run`);
+    const ws = new WebSocket(`${origin.wsOrigin}/api/view-run`);
 
     ws.onopen = () => {
       ws.send(run.id);
@@ -100,7 +100,7 @@ export default function Editor({
     };
 
     return () => ws.close();
-  }, [run, ]);
+  }, [run]);
 
   return (
     <CodeMirror

src/app/runs/components/LiveRunRow.tsx

@@ -21,7 +21,7 @@ export default function LiveRunRow({
   const [problem] = useAction(() => getProblem(run.problem));
 
   const now = new Date().getTime() + 1000;
-  const isTop = run.views > 5;
+  const isTop = run.views >= 5;
 
   return (
     <TableRow

src/app/runs/page.tsx

@@ -9,15 +9,30 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import LiveRunRow from "./components/LiveRunRow";
-import useAction, { useActionInterval } from "@/hook/use-action";
+import { useActionInterval } from "@/hook/use-action";
 import { getLiveRuns } from "@/modules/live-run/actions";
 import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
 
 export default function LiveRuns() {
   const [liveRuns] = useActionInterval(getLiveRuns, 1500);
 
-  // Sort top runners (status === 'pb') to the top
-  const sortedRuns = [...(liveRuns || [])];
+  const sortedRuns = (liveRuns || []).sort((a, b) => {
+    const aTrending = a.views >= 5;
+    const bTrending = b.views >= 5;
+
+    if (aTrending && bTrending) {
+      // Both trending → sort by views descending, then timestamp descending
+      if (b.views !== a.views) return b.views - a.views;
+      return b.start - a.start;
+    } else if (aTrending) {
+      return -1; // a goes first
+    } else if (bTrending) {
+      return 1; // b goes first
+    } else {
+      // Neither trending → sort by timestamp descending
+      return b.start - a.start;
+    }
+  });
 
   return (
     <div className="min-h-screen pt-24 pb-16">
@@ -26,7 +41,7 @@ export default function LiveRuns() {
         <div>
           <h1 className="text-4xl font-bold">Live Runs</h1>
           <p className="text-muted-foreground">
-            42 live runs · Streaming in real time
+            {liveRuns?.length} live runs · Streaming in real time
           </p>
         </div>
 

src/lib/origin/client.ts

@@ -0,0 +1,7 @@
+"use server";
+
+import * as Core from "./server";
+
+export async function getOrigin() {
+  return Core.getOrigin();
+}

src/lib/origin/server.ts

@@ -0,0 +1,29 @@
+import "server-only";
+
+import { headers } from "next/headers";
+
+export async function getOrigin(): Promise<{
+  protocol: string;
+  host: string;
+  wsProtocol: string;
+  httpOrigin: string;
+  wsOrigin: string;
+}> {
+  const h = await headers();
+  const host = process.env.ORIGIN || h.get(":authority") || "localhost:3000";
+  const protocol =
+    process.env.ORIGIN_PROTO ||
+    h.get("x-forwarded-proto") ||
+    h.get(":scheme") ||
+    "https";
+
+  const wsProtocol = protocol === "https" ? "wss" : "ws";
+
+  return {
+    protocol,
+    host,
+    wsProtocol,
+    httpOrigin: `${protocol}://${host}`,
+    wsOrigin: `${wsProtocol}://${host}`,
+  };
+}

src/lib/redis.ts

@@ -2,3 +2,13 @@ import "server-only";
 import Redis from "ioredis";
 
 export const redis = new Redis(process.env.REDIS_URL!);
+
+export const redisSubscriber = new Redis(process.env.REDIS_URL!);
+
+redis.on("error", (err) => {
+  console.error("Redis error:", err);
+});
+
+redisSubscriber.on("error", (err) => {
+  console.error("Redis subscriber error:", err);
+});

src/lib/supabase/server.ts

@@ -1,9 +1,8 @@
-"use server";
-
 import "server-only";
 
 import { createServerClient, type CookieOptions } from "@supabase/ssr";
 import { cookies } from "next/headers";
+import { createClient as createSimpleClient } from "@supabase/supabase-js";
 
 export async function createClient() {
   const cookieStore = await cookies();
@@ -27,24 +26,27 @@ export async function createClient() {
   );
 }
 
-export async function createClientApi() {
-  const cookieStore = await cookies();
-
+export async function createClientCookie(cookies: Map<string, string>) {
   return createServerClient(
     process.env.SUPABASE_URL!,
     process.env.SUPABASE_SECRET_KEY!,
     {
       cookies: {
         get(name: string) {
-          return cookieStore.get(name)?.value;
+          return cookies.get(name) || null;
         },
-        set(name: string, value: string, options: CookieOptions) {
-          cookieStore.set(name, value, options);
+        set(name: string, value: string) {
+          cookies.set(name, value);
         },
         remove(name: string, options: CookieOptions) {
-          cookieStore.set(name, "", options);
+          cookies.delete(name);
         },
       },
     },
   );
 }
+
+export const supabaseApiClient = createSimpleClient(
+  process.env.SUPABASE_URL!,
+  process.env.SUPABASE_SECRET_KEY!,
+);

src/modules/account/actions.ts

@@ -1,21 +1,19 @@
 "use server";
 
+import { getOrigin } from "@/lib/origin/server";
 import * as Core from "./core";
 import { createClient } from "@/lib/supabase/server";
-import { headers } from "next/headers";
 import { redirect } from "next/navigation";
 
 export async function signInWithGitHub() {
   const supabase = await createClient();
 
-  const h = await headers();
-  const host = h.get("host");
-  const protocol = h.get("x-forwarded-proto") ?? "https";
+  const { httpOrigin } = await getOrigin();
 
   const { data, error } = await supabase.auth.signInWithOAuth({
     provider: "github",
     options: {
-      redirectTo: `${protocol}://${host}/api/auth/callback`,
+      redirectTo: `${httpOrigin}/api/auth/callback`,
     },
   });
 

src/modules/account/core.ts

@@ -1,7 +1,6 @@
-"use server";
+import "server-only";
 
 import { SupabaseClient, User } from "@supabase/supabase-js";
-import "server-only";
 import { UserProfile } from "../user/types";
 
 export async function signInWithGitHub(supabase: SupabaseClient) {

src/modules/getOrigin.ts

@@ -1,11 +0,0 @@
-"use server";
-
-import { headers } from "next/headers";
-
-export async function getOrigin(): Promise<{ protocol: string; host: string }> {
-  const h = await headers();
-  const host = h.get("host") || "localhost:3000";
-  const protocol = h.get("x-forwarded-proto") ?? "https";
-
-  return { protocol, host };
-}

src/modules/leaderboard/core.ts

@@ -1,7 +1,6 @@
-"use server";
+import "server-only";
 
 import { SupabaseClient } from "@supabase/supabase-js";
-import "server-only";
 import { LeaderboardUser } from "./types";
 
 export async function getGlobalLeaderboard(

src/modules/live-run/core.ts

@@ -1,11 +1,9 @@
-"use server";
-
 import "server-only";
+
 import { LiveRun, LiveRunMove } from "./types";
-import { SupabaseClient } from "@supabase/supabase-js";
 import { redis } from "@/lib/redis";
-import Redis from "ioredis";
 import { applyMoves } from "@/lib/move";
+import { supabaseApiClient } from "@/lib/supabase/server";
 
 /** -------------------- Live Runs in Redis -------------------- */
 
@@ -46,6 +44,7 @@ export async function updateLiveRunViews(
 ): Promise<number | null> {
   const run = await getLiveRun(id);
   if (!run) return null;
+  if (run.views === 0 && increment < 0) return null;
   run.views += increment;
   await redis.set(`liveRun:${run.id}`, JSON.stringify(run));
   return run.views;
@@ -65,7 +64,7 @@ export async function getLiveRuns(): Promise<LiveRun[]> {
  * Remove a live run from Redis
  */
 export async function removeLiveRun(id: string) {
-  await redis.del(`liveRun:${id}`, `liveRunEvent:${id}`);
+  await redis.del(`liveRun:${id}`, `liveRunEvent:${id}`, `liveRunText:${id}`);
 }
 
 /** -------------------- Live Run Moves -------------------- */
@@ -79,8 +78,6 @@ export async function addLiveRunEvent(
   language: string,
   moves: LiveRunMove[],
 ) {
-  const redis = new Redis();
-
   // Make sure the live run exists
   const runExists = await redis.exists(`liveRun:${runId}`);
   if (!runExists) throw "Invalid live run";
@@ -109,15 +106,11 @@ export async function addLiveRunEvent(
  * Submit a run to Supabase (persistent storage)
  * and remove it from Redis
  */
-export async function submitRun(
-  supabase: SupabaseClient,
-  run: LiveRun,
-  user_id: string,
-) {
+export async function submitRun(run: LiveRun, user_id: string) {
   const now = new Date();
   const durationMs = now.getTime() - run.start;
 
-  const { data, error } = await supabase
+  const { data, error } = await supabaseApiClient
     .from("runs")
     .insert([
       {

src/modules/problems/core.ts

@@ -1,6 +1,5 @@
-"use server";
-
 import "server-only";
+
 import { Problem, ProblemDefinition } from "./types";
 
 const problems: ProblemDefinition[] = [

src/modules/user/core.ts

@@ -1,3 +1 @@
-"use server";
-
 import "server-only";