Generated
+24
-24
@@ -44,7 +44,7 @@
|
||||
"@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",
|
||||
@@ -3461,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"
|
||||
@@ -3473,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"
|
||||
@@ -3485,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"
|
||||
@@ -3497,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",
|
||||
@@ -3524,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",
|
||||
@@ -3537,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"
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@
|
||||
"@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",
|
||||
|
||||
+139
-147
@@ -4,65 +4,101 @@ 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 { NextRequest } from "next/server";
|
||||
import { redis } 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 });
|
||||
}
|
||||
import { User } from "@supabase/supabase-js";
|
||||
import { UserProfile } from "@/modules/user/types";
|
||||
import { NextRequest } from "next/server";
|
||||
|
||||
export function UPGRADE(client: WebSocket, server: WebSocketServer) {
|
||||
client.once("message", async (raw) => {
|
||||
const {
|
||||
cookies,
|
||||
requestId,
|
||||
}: { cookies: Record<string, string>; requestId: string } = JSON.parse(
|
||||
raw.toString(),
|
||||
);
|
||||
let authenticated = false;
|
||||
let session: [User, UserProfile] | null = null;
|
||||
let currentRun: string | undefined;
|
||||
|
||||
if (!cookies) {
|
||||
client.send(JSON.stringify({ ok: false, error: "Missing cookies" }));
|
||||
// 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();
|
||||
return;
|
||||
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);
|
||||
}
|
||||
|
||||
const supabase = await createClientCookie(new Map(Object.entries(cookies)));
|
||||
const session = await getSession(supabase);
|
||||
|
||||
if (!session) {
|
||||
client.send(JSON.stringify({ ok: false, error: "Invalid session" }));
|
||||
return;
|
||||
currentRun = undefined;
|
||||
}
|
||||
|
||||
client.send(JSON.stringify({ requestId, ok: true }));
|
||||
|
||||
console.log(`User ${session[1].username} connected to live run`);
|
||||
};
|
||||
|
||||
client.on("message", async (raw) => {
|
||||
let requestId: string | undefined;
|
||||
|
||||
try {
|
||||
const { requestId, ...msg }: ClientMessage = JSON.parse(raw.toString());
|
||||
const msg = JSON.parse(raw.toString());
|
||||
requestId = msg.requestId;
|
||||
|
||||
switch (msg.type) {
|
||||
/* ---------------- CREATE ---------------- */
|
||||
// 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 } = msg;
|
||||
|
||||
if (!problem || !category) {
|
||||
client.send(
|
||||
const { problem, category } = payload as any;
|
||||
if (!problem || !category)
|
||||
return client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
error: "problem and category required",
|
||||
}),
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (currentRun)
|
||||
return client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
error:
|
||||
"Cannot do multiple runs, delete/submit current run first",
|
||||
}),
|
||||
);
|
||||
|
||||
const runId = randomUUID();
|
||||
|
||||
await Core.addLiveRun({
|
||||
id: runId,
|
||||
problem,
|
||||
@@ -73,7 +109,8 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
|
||||
runsCount: 0,
|
||||
});
|
||||
|
||||
client.send(
|
||||
currentRun = runId;
|
||||
return client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: true,
|
||||
@@ -81,41 +118,29 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
|
||||
data: { runId },
|
||||
}),
|
||||
);
|
||||
break;
|
||||
}
|
||||
|
||||
/* ---------------- DELETE ---------------- */
|
||||
case "move": {
|
||||
const { runId, moves, file, language } = msg;
|
||||
if (!currentRun)
|
||||
return client.send(
|
||||
JSON.stringify({ requestId, ok: false, error: "No current run" }),
|
||||
);
|
||||
|
||||
if (
|
||||
!runId ||
|
||||
!moves ||
|
||||
file === undefined ||
|
||||
language === undefined
|
||||
) {
|
||||
client.send(
|
||||
const { moves, file, language } = payload as any;
|
||||
if (!moves || file === undefined || language === undefined)
|
||||
return client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
error: "body requires runId, moves, file and language",
|
||||
error: "moves, file, and language required",
|
||||
}),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const liveRun = await Core.getLiveRun(runId);
|
||||
|
||||
if (!liveRun) {
|
||||
client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
error: "Run is not live or does not exist",
|
||||
}),
|
||||
const liveRun = await Core.getLiveRun(currentRun);
|
||||
if (!liveRun)
|
||||
return client.send(
|
||||
JSON.stringify({ requestId, ok: false, error: "Run not live" }),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const run = await Core.addLiveRunEvent(
|
||||
liveRun.id,
|
||||
@@ -123,103 +148,59 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
|
||||
language,
|
||||
moves,
|
||||
);
|
||||
|
||||
client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: true,
|
||||
type: "move",
|
||||
data: run,
|
||||
}),
|
||||
return client.send(
|
||||
JSON.stringify({ requestId, ok: true, type: "move", data: run }),
|
||||
);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
/* ---------------- SUBMIT ---------------- */
|
||||
case "submit": {
|
||||
const { runId } = msg;
|
||||
if (!currentRun)
|
||||
return client.send(
|
||||
JSON.stringify({ requestId, ok: false, error: "No current run" }),
|
||||
);
|
||||
|
||||
if (!runId) {
|
||||
client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
error: "runId required",
|
||||
}),
|
||||
const liveRun = await Core.getLiveRun(currentRun);
|
||||
if (!liveRun)
|
||||
return client.send(
|
||||
JSON.stringify({ requestId, ok: false, error: "Run not live" }),
|
||||
);
|
||||
|
||||
const run = await Core.submitRun(liveRun, session[0].id);
|
||||
currentRun = undefined;
|
||||
return client.send(
|
||||
JSON.stringify({ requestId, ok: true, type: "submit", data: run }),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const liveRun = await Core.getLiveRun(runId);
|
||||
|
||||
if (!liveRun) {
|
||||
client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
error: "Run is not live or does not exist",
|
||||
}),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const run = await Core.submitRun(supabase, liveRun, session[0].id);
|
||||
|
||||
client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: true,
|
||||
type: "submit",
|
||||
data: run,
|
||||
}),
|
||||
);
|
||||
break;
|
||||
}
|
||||
|
||||
/* ---------------- DELETE ---------------- */
|
||||
case "delete": {
|
||||
const { runId } = msg;
|
||||
|
||||
if (!runId) {
|
||||
client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
error: "runId required",
|
||||
}),
|
||||
if (!currentRun)
|
||||
return client.send(
|
||||
JSON.stringify({ requestId, ok: false, error: "No current run" }),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const run = await Core.removeLiveRun(runId);
|
||||
|
||||
client.send(
|
||||
await cleanupRun();
|
||||
return client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: true,
|
||||
type: "delete",
|
||||
data: run,
|
||||
data: { id: currentRun },
|
||||
}),
|
||||
);
|
||||
break;
|
||||
}
|
||||
|
||||
case "getText":
|
||||
const { runId } = msg;
|
||||
const data = await redis.get(`liveRunText:${runId}`);
|
||||
|
||||
client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: true,
|
||||
data,
|
||||
}),
|
||||
case "getText": {
|
||||
if (!currentRun)
|
||||
return client.send(
|
||||
JSON.stringify({ requestId, ok: false, error: "No current run" }),
|
||||
);
|
||||
break;
|
||||
|
||||
const data = await redis.get(`liveRunText:${currentRun}`);
|
||||
return client.send(JSON.stringify({ requestId, ok: true, data }));
|
||||
}
|
||||
|
||||
default:
|
||||
client.send(
|
||||
return client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
@@ -229,18 +210,29 @@ export function UPGRADE(client: WebSocket, server: WebSocketServer) {
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
if (requestId)
|
||||
client.send(
|
||||
JSON.stringify({
|
||||
requestId,
|
||||
ok: false,
|
||||
error: "Malformed message",
|
||||
}),
|
||||
JSON.stringify({ requestId, ok: false, error: "Malformed message" }),
|
||||
);
|
||||
closeClient("Malformed message");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
client.on("close", () => {
|
||||
// optional cleanup
|
||||
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 });
|
||||
}
|
||||
|
||||
@@ -1,67 +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 { updateLiveRunViews } from "@/modules/live-run/core";
|
||||
import { redis } from "@/lib/redis";
|
||||
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(process.env.REDIS_URL!);
|
||||
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 () => {
|
||||
// Send initial text
|
||||
const text = await redis.get(`liveRunText:${runId}`);
|
||||
|
||||
if (client.readyState === WebSocket.OPEN) {
|
||||
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 () => {
|
||||
await subscriber.unsubscribe(`liveRunEvent:${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);
|
||||
});
|
||||
|
||||
@@ -69,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 });
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 */}
|
||||
|
||||
@@ -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
|
||||
|
||||
+19
-4
@@ -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>
|
||||
|
||||
|
||||
@@ -3,6 +3,12 @@ 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);
|
||||
});
|
||||
|
||||
@@ -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();
|
||||
@@ -46,3 +45,8 @@ export async function createClientCookie(cookies: Map<string, string>) {
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
export const supabaseApiClient = createSimpleClient(
|
||||
process.env.SUPABASE_URL!,
|
||||
process.env.SUPABASE_SECRET_KEY!,
|
||||
);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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 -------------------- */
|
||||
@@ -107,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([
|
||||
{
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"use server";
|
||||
|
||||
import "server-only";
|
||||
|
||||
import { Problem, ProblemDefinition } from "./types";
|
||||
|
||||
const problems: ProblemDefinition[] = [
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
"use server";
|
||||
|
||||
import "server-only";
|
||||
|
||||
Reference in New Issue
Block a user