-
diff --git a/src/routes/(app)/mappools/[id]/+page.server.ts b/src/routes/(app)/mappools/[id]/+page.server.ts
index e2a05b0..5eb2b71 100644
--- a/src/routes/(app)/mappools/[id]/+page.server.ts
+++ b/src/routes/(app)/mappools/[id]/+page.server.ts
@@ -63,19 +63,18 @@ export const actions: Actions = {
return { error: 'Beatmap ID and category are required' };
}
- // Parse URL if needed
- const urlMatch = beatmapId.match(/beatmaps\/(\d+)/);
- const setMatch = beatmapId.match(/beatmapsets\/\d+#\w+\/(\d+)/);
- if (urlMatch) beatmapId = urlMatch[1];
- else if (setMatch) beatmapId = setMatch[1];
+ const urlMatch = beatmapId.match(/beatmaps\/(\d+)/);
+ const setMatch = beatmapId.match(/beatmapsets\/\d+#\w+\/(\d+)/);
+ if (urlMatch) beatmapId = urlMatch[1];
+ else if (setMatch) beatmapId = setMatch[1];
- // Strip non-numeric
if (!/^\d+$/.test(beatmapId)) {
return { error: 'Invalid beatmap ID' };
}
+ let beatmap;
try {
- await getBeatmap(beatmapId);
+ beatmap = await getBeatmap(beatmapId);
} catch {
return { error: 'Beatmap not found on osu!' };
}
@@ -92,6 +91,7 @@ export const actions: Actions = {
beatmapId,
category,
orderInCategory: existing.length + 1,
+ starRating: beatmap.difficulty_rating,
mods: category === 'NM' || category === 'TB' || category === 'FM' ? [] : [category]
});
diff --git a/src/routes/(app)/matches/+page.server.ts b/src/routes/(app)/matches/+page.server.ts
new file mode 100644
index 0000000..07f899d
--- /dev/null
+++ b/src/routes/(app)/matches/+page.server.ts
@@ -0,0 +1,71 @@
+import { db } from '$lib/server/db';
+import { match } from '$lib/server/db/schema';
+import { redirect } from '@sveltejs/kit';
+import { desc } from 'drizzle-orm';
+import { createMatch } from '$lib/server/match/engine';
+import { initMatchLobby } from '$lib/server/match/orchestrator';
+import type { PageServerLoad, Actions } from './$types';
+
+export const load: PageServerLoad = async ({ locals }) => {
+ if (!locals.user) redirect(302, '/');
+
+ const matches = await db.query.match.findMany({
+ with: { participants: { with: { team: true } } },
+ orderBy: desc(match.createdAt),
+ limit: 50
+ });
+
+ const teams = await db.query.team.findMany({
+ orderBy: (t, { asc }) => [asc(t.name)]
+ });
+
+ const mappools = await db.query.mappool.findMany({
+ with: { slots: true },
+ orderBy: (m, { desc }) => [desc(m.createdAt)]
+ });
+
+ return { matches, teams, mappools };
+};
+
+export const actions: Actions = {
+ createMatch: async ({ request, locals }) => {
+ if (!locals.user) redirect(302, '/');
+
+ const form = await request.formData();
+ const name = form.get('name')?.toString()?.trim() || 'Custom Match';
+ const team1Id = form.get('team1')?.toString();
+ const team2Id = form.get('team2')?.toString();
+ const mappoolId = form.get('mappool')?.toString();
+ const bestOf = parseInt(form.get('bestOf')?.toString() ?? '7');
+
+ console.log('[Matches] CREATE:', { name, team1Id, team2Id, mappoolId, bestOf });
+
+ if (!team1Id || !team2Id || !mappoolId) {
+ return { error: 'All fields are required' };
+ }
+
+ // Same team is allowed for testing/dev
+
+ let result;
+ try {
+ result = await createMatch({
+ name,
+ config: { bestOf, teamSize: 1, scoringType: 'score' },
+ mappoolId,
+ teams: [team1Id, team2Id],
+ createdBy: locals.user.id
+ });
+ console.log('[Matches] Created:', result.id);
+ } catch (e: any) {
+ console.error('[Matches] Error:', e);
+ return { error: e.message };
+ }
+
+ // Create IRC lobby in background (don't block redirect)
+ initMatchLobby(result.id).catch((err) => {
+ console.error('[Matches] IRC lobby failed:', err.message);
+ });
+
+ redirect(303, `/matches/${result.id}`);
+ }
+};
diff --git a/src/routes/(app)/matches/+page.svelte b/src/routes/(app)/matches/+page.svelte
new file mode 100644
index 0000000..482c62f
--- /dev/null
+++ b/src/routes/(app)/matches/+page.svelte
@@ -0,0 +1,188 @@
+
+
+- {#if data.user} - Welcome back, {data.user.name} - {:else} - Welcome to VASH - {/if} -
-Automated esports match management for osu!
+ {#if !data.user} + + {:else} + +
+
- + Welcome back, {data.user.name} +
+
+
+
+
+ ELO
+{data.rating?.elo ?? 1000}
+
+
+ W / L
++ {data.rating?.wins ?? 0} + / + {data.rating?.losses ?? 0} +
+
-
-
+
+
+
+ {/if}
⚔
- Matches
-Create and manage competitive matches
- + +
+ {#if data.queueStatus?.inQueue}
+
-
-
+
+
+
+
+ In Queue
++ Searching for opponent... + {queueTimer} +
++ {data.queueStatus.queueSize} player{data.queueStatus.queueSize !== 1 ? 's' : ''} in queue +
+
+
+ {:else}
+
+
+
+
+ Matchmaking active
+
+
+ {/if}
+
+
+
+ Ranked Queue
++ {#if data.poolCount > 0} + 1v1 · Best of 7 · + {data.queueStatus?.queueSize ?? 0} searching + {:else} + No mappools available — create one first + {/if} +
+♫
- Mappools
-Build and share beatmap pools
- + +
+
+ Recent Matches
+
+ {#each data.recentMatches as m}
+ {@const p1 = m.participants[0]}
+ {@const p2 = m.participants[1]}
+ {@const isUserP1 = p1?.players.some((pl) => pl.userId === data.user?.id)}
+ {@const userP = isUserP1 ? p1 : p2}
+ {@const oppP = isUserP1 ? p2 : p1}
+ {@const won = m.winnerId === userP?.teamId}
+ {@const lost = m.winnerId && m.winnerId !== userP?.teamId}
-
-
+
+
+ ⚑
- Teams
-Manage your teams and rosters
- -
+
+ {#if p1 && p2}
+
+ {m.name}
+ {stateLabel(m.state)}
+
+
+ {userP?.team.name ?? '?'} vs {oppP?.team.name ?? '?'}
+
+
+ {p1.score}
+ -
+ {p2.score}
+
+ {/if}
+ {new Date(m.createdAt).toLocaleDateString()}
+
+ {:else}
+
+
+ {/each}
+ No matches yet. Join the queue!
+
+
diff --git a/src/routes/(app)/matches/[id]/+page.server.ts b/src/routes/(app)/matches/[id]/+page.server.ts
new file mode 100644
index 0000000..f69cdaf
--- /dev/null
+++ b/src/routes/(app)/matches/[id]/+page.server.ts
@@ -0,0 +1,136 @@
+import { getMatchFull, submitRoll, pickMap, cancelMatch } from '$lib/server/match/engine';
+import { playPickedMap, closeLobby, forceStartGame } from '$lib/server/match/orchestrator';
+import { getLobby } from '$lib/server/bancho/client';
+import { error, redirect } from '@sveltejs/kit';
+import { getBeatmap } from '$lib/server/osu/api';
+import type { PageServerLoad, Actions } from './$types';
+
+export const load: PageServerLoad = async ({ params, locals }) => {
+ if (!locals.user) redirect(302, '/');
+
+ let m;
+ try {
+ m = await getMatchFull(params.id);
+ } catch {
+ error(404, 'Match not found');
+ }
+
+ // Build beatmap metadata cache for all slots in the mappool
+ const beatmapCache: Record
+
+
+
+ {#if creating}
+
+ {/if}
+
+
+
+
+
+ Matches
+All matches
+
+ {#each data.matches as m}
+ {@const p1 = m.participants[0]}
+ {@const p2 = m.participants[1]}
+
+
+
+
+
+ {#if p1 && p2}
+
+ {m.name}
+
+ {m.state}
+
+
+ + {p1?.team.name ?? '?'} vs {p2?.team.name ?? '?'} + · {new Date(m.createdAt).toLocaleDateString()} +
+
+ {p1.score}
+ -
+ {p2.score}
+
+ {/if}
+
+ {:else}
+
+
+ {/each}
+ No matches yet
+
+
+
diff --git a/src/routes/api/matches/+server.ts b/src/routes/api/matches/+server.ts
new file mode 100644
index 0000000..abf3e5e
--- /dev/null
+++ b/src/routes/api/matches/+server.ts
@@ -0,0 +1,41 @@
+import { json, error } from '@sveltejs/kit';
+import { db } from '$lib/server/db';
+import { createMatch } from '$lib/server/match/engine';
+import type { RequestHandler } from './$types';
+
+export const GET: RequestHandler = async ({ locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ const matches = await db.query.match.findMany({
+ with: {
+ participants: { with: { team: true } }
+ },
+ orderBy: (m, { desc }) => [desc(m.createdAt)]
+ });
+
+ return json(matches);
+};
+
+export const POST: RequestHandler = async ({ request, locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ const body = await request.json();
+ const { name, config, mappoolId, teams } = body;
+
+ if (!name || !config || !mappoolId || !teams?.length) {
+ error(400, 'Missing required fields');
+ }
+
+ try {
+ const result = await createMatch({
+ name,
+ config,
+ mappoolId,
+ teams,
+ createdBy: locals.user.id
+ });
+ return json(result, { status: 201 });
+ } catch (e) {
+ error(400, e.message);
+ }
+};
diff --git a/src/routes/api/matches/[id]/+server.ts b/src/routes/api/matches/[id]/+server.ts
new file mode 100644
index 0000000..b712ae4
--- /dev/null
+++ b/src/routes/api/matches/[id]/+server.ts
@@ -0,0 +1,25 @@
+import { json, error } from '@sveltejs/kit';
+import { getMatchFull, cancelMatch } from '$lib/server/match/engine';
+import type { RequestHandler } from './$types';
+
+export const GET: RequestHandler = async ({ params, locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ try {
+ const m = await getMatchFull(params.id);
+ return json(m);
+ } catch (e) {
+ error(404, e.message);
+ }
+};
+
+export const DELETE: RequestHandler = async ({ params, locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ try {
+ const m = await cancelMatch(params.id);
+ return json(m);
+ } catch (e) {
+ error(400, e.message);
+ }
+};
diff --git a/src/routes/api/matches/[id]/lobby/+server.ts b/src/routes/api/matches/[id]/lobby/+server.ts
new file mode 100644
index 0000000..bcd4c93
--- /dev/null
+++ b/src/routes/api/matches/[id]/lobby/+server.ts
@@ -0,0 +1,16 @@
+import { json, error } from '@sveltejs/kit';
+import { moveToLobby } from '$lib/server/match/engine';
+import type { RequestHandler } from './$types';
+
+export const POST: RequestHandler = async ({ params, request, locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ const body = await request.json().catch(() => ({}));
+
+ try {
+ const m = await moveToLobby(params.id, body.osuLobbyId);
+ return json(m);
+ } catch (e) {
+ error(400, e.message);
+ }
+};
diff --git a/src/routes/api/matches/[id]/pick/+server.ts b/src/routes/api/matches/[id]/pick/+server.ts
new file mode 100644
index 0000000..808679f
--- /dev/null
+++ b/src/routes/api/matches/[id]/pick/+server.ts
@@ -0,0 +1,19 @@
+import { json, error } from '@sveltejs/kit';
+import { pickMap } from '$lib/server/match/engine';
+import type { RequestHandler } from './$types';
+
+export const POST: RequestHandler = async ({ params, request, locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ const { participantId, mappoolSlotId } = await request.json();
+ if (!participantId || !mappoolSlotId) {
+ error(400, 'participantId and mappoolSlotId required');
+ }
+
+ try {
+ const game = await pickMap(params.id, participantId, mappoolSlotId);
+ return json(game);
+ } catch (e) {
+ error(400, e.message);
+ }
+};
diff --git a/src/routes/api/matches/[id]/roll/+server.ts b/src/routes/api/matches/[id]/roll/+server.ts
new file mode 100644
index 0000000..d2bf742
--- /dev/null
+++ b/src/routes/api/matches/[id]/roll/+server.ts
@@ -0,0 +1,19 @@
+import { json, error } from '@sveltejs/kit';
+import { submitRoll } from '$lib/server/match/engine';
+import type { RequestHandler } from './$types';
+
+export const POST: RequestHandler = async ({ params, request, locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ const { participantId, value } = await request.json();
+ if (!participantId || value == null) {
+ error(400, 'participantId and value required');
+ }
+
+ try {
+ const m = await submitRoll(params.id, participantId, value);
+ return json(m);
+ } catch (e) {
+ error(400, e.message);
+ }
+};
diff --git a/src/routes/api/matches/[id]/rolling/+server.ts b/src/routes/api/matches/[id]/rolling/+server.ts
new file mode 100644
index 0000000..b3b538e
--- /dev/null
+++ b/src/routes/api/matches/[id]/rolling/+server.ts
@@ -0,0 +1,14 @@
+import { json, error } from '@sveltejs/kit';
+import { moveToRolling } from '$lib/server/match/engine';
+import type { RequestHandler } from './$types';
+
+export const POST: RequestHandler = async ({ params, locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ try {
+ const m = await moveToRolling(params.id);
+ return json(m);
+ } catch (e) {
+ error(400, e.message);
+ }
+};
diff --git a/src/routes/api/matches/[id]/score/+server.ts b/src/routes/api/matches/[id]/score/+server.ts
new file mode 100644
index 0000000..8ceafe1
--- /dev/null
+++ b/src/routes/api/matches/[id]/score/+server.ts
@@ -0,0 +1,19 @@
+import { json, error } from '@sveltejs/kit';
+import { submitGameScores } from '$lib/server/match/engine';
+import type { RequestHandler } from './$types';
+
+export const POST: RequestHandler = async ({ request, locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ const { matchGameId, scores } = await request.json();
+ if (!matchGameId || !scores?.length) {
+ error(400, 'matchGameId and scores required');
+ }
+
+ try {
+ const m = await submitGameScores(matchGameId, scores);
+ return json(m);
+ } catch (e) {
+ error(400, e.message);
+ }
+};
diff --git a/src/routes/api/queue/+server.ts b/src/routes/api/queue/+server.ts
new file mode 100644
index 0000000..6715e2e
--- /dev/null
+++ b/src/routes/api/queue/+server.ts
@@ -0,0 +1,42 @@
+import { json, error } from '@sveltejs/kit';
+import { joinQueue, leaveQueue, getQueueStatus } from '$lib/server/match/engine';
+import { db } from '$lib/server/db';
+import { team, teamMember } from '$lib/server/db/schema';
+import { eq, and } from 'drizzle-orm';
+import type { RequestHandler } from './$types';
+
+export const GET: RequestHandler = async ({ locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ const status = await getQueueStatus(locals.user.id);
+ return json(status);
+};
+
+export const POST: RequestHandler = async ({ locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ // Find user's personal team
+ const membership = await db.query.teamMember.findFirst({
+ where: eq(teamMember.userId, locals.user.id),
+ with: { team: true }
+ });
+
+ const personalTeam = membership?.team;
+ if (!personalTeam?.isPersonal) {
+ error(400, 'No personal team found');
+ }
+
+ try {
+ const result = await joinQueue(locals.user.id, personalTeam.id);
+ return json({ matched: !!result, match: result });
+ } catch (e) {
+ error(400, e.message);
+ }
+};
+
+export const DELETE: RequestHandler = async ({ locals }) => {
+ if (!locals.user) error(401, 'Not logged in');
+
+ await leaveQueue(locals.user.id);
+ return json({ ok: true });
+};
+ ←
+
+
+
+ {#if p1 && p2}
+
+
+ {stateLabel(m.state)}
+
+ {#if !['FINISHED', 'CANCELLED'].includes(m.state)}
+
+ {/if}
+ {m.name || 'Match'}
++ Best of {config.bestOf} · First to {winsNeeded} + {#if m.osuLobbyId} + · osu! mp/{m.osuLobbyId} + {/if} +
+
+
+
+ {/if}
+
+
+ {#if m.state === 'ROLLING'}
+
+ {#if p1.team.avatarUrl}
+ 
+ {/if}
+
+
+ vs
+
+
+
+
+ {p1.score}
+ {p1.team.name}
+ {#if p1.rollValue != null} +Roll: {p1.rollValue}{p1.pickOrder === 1 ? ' ★' : ''}
+ {/if} +
+ {p2.score}
+ 
+ {/if}
+
+
+
+ {#if p2.team.avatarUrl}
+ {p2.team.name}
+ {#if p2.rollValue != null} +{p2.pickOrder === 1 ? '★ ' : ''}Roll: {p2.rollValue}
+ {/if} +
+
+ {/if}
+
+
+ {#if m.state === 'PICKING'}
+
+
+ 🎲 Roll Phase
+Highest roll picks first
+ +
+ {#each m.participants as p}
+
+
+ {#if canRoll}
+
+
+
+ {/each}
+ {p.team.name}
+ {#if p.rollValue != null} +{p.rollValue}
+ {:else} +—
+ {/if} +or type !roll in osu! chat
Waiting for all rolls...
+ {/if} +
+
+ {/if}
+
+
+ {#if m.state === 'PLAYING'}
+ {@const currentGame = m.games[m.games.length - 1]}
+ {@const bm = currentGame ? data.beatmapCache[currentGame.slot?.beatmapId] : null}
+
+
+
+
+
+ {#if pickError}
+ 🎯 Pick a Map
++ {expectedPicker?.team.name}'s turn to pick +
+
+ or type !pick NM1 in osu! chat
+
{pickError}
+ {/if} + +
+ {#each Object.entries(groupedSlots()) as [category, slots]}
+
+
+
+ {category}
+
+
+ {/each}
+
+ {#each slots as slot, i}
+ {@const bm = data.beatmapCache[slot.beatmapId]}
+ {@const isPlayed = playedSlotIds.has(slot.id)}
+
+
+ {/each}
+
+
+
+ {/if}
+
+
+ {#if m.state === 'FINISHED'}
+ {@const winner = m.participants.find((p: any) => p.teamId === m.winnerId)}
+
+
+ {#if bm}
+
+
+
+
+ Now Playing
+ {bm.artist} - {bm.title} [{bm.version}]
+★{bm.starRating.toFixed(1)} · {bm.bpm}bpm · {formatLength(bm.totalLength)}
+ {/if} ++ Waiting for players to ready up & play in osu!... +
+ + + +
+
+ {/if}
+
+
+ {#if m.games.length > 0}
+
+
+ 🏆
+ + {winner?.team.name} wins! +
++ {p1?.score} – {p2?.score} +
+ + +
+ {#each m.games as game}
+ {@const bm = data.beatmapCache[game.slot?.beatmapId]}
+ {@const winnerP = m.participants.find((p: any) => p.id === game.winnerParticipantId)}
+
+
+
+ Back to Dashboard
+
+
+ {game.slot?.category}{game.slot?.orderInCategory}
+ {bm ? `${bm.artist} - ${bm.title}` : `#${game.slot?.beatmapId}`}
+ {winnerP?.team.name}
+
+ {/each}
+
+
+ {/if}
+
+
+ {#if m.state === 'CREATED'}
+ Games Played
+
+ {#each m.games as game}
+ {@const bm = data.beatmapCache[game.slot?.beatmapId]}
+ {@const pickerTeam = m.participants.find((p: any) => p.id === game.pickedByParticipantId)?.team}
+ {@const winnerTeam = m.participants.find((p: any) => p.id === game.winnerParticipantId)?.team}
+
+
+
+ {game.gameNumber}
+ {#if bm?.listCoverUrl}
+ 
+ {/if}
+
+ {/each}
+
+ {#if bm}
+
+
+ {#if game.state === 'FINISHED' && p1 && p2}
+ {@const p1Score = game.scores.filter((s: any) => s.player?.participantId === p1.id).reduce((sum: number, s: any) => sum + s.score, 0)}
+ {@const p2Score = game.scores.filter((s: any) => s.player?.participantId === p2.id).reduce((sum: number, s: any) => sum + s.score, 0)}
+ {bm.artist} - {bm.title} [{bm.version}]
+ {/if} +
+ {game.slot?.category}{game.slot?.orderInCategory}
+ {#if pickerTeam}Picked by {pickerTeam.name}{/if}
+
+
+ {p1Score.toLocaleString()}
+ -
+ {p2Score.toLocaleString()}
+
+ {:else if game.state === 'PLAYING'}
+ Live
+ {/if}
+
+ {#if winnerTeam}
+ ✓ {winnerTeam.name}
+ {/if}
+
+
+ {/if}
+
+ {#if m.state === 'LOBBY'}
+ Creating osu! lobby...
+
+
+ {/if}
+
+ {#if m.state === 'CANCELLED'}
+ Lobby created. Waiting for players to join...
+ {#if m.osuLobbyId} + + {/if} +
+
+ {/if}
+This match was cancelled.
+