stan/esports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enhance queue management with recent match redirection and leaderboard link

Browse Source
This commit is contained in:
Stan Runge
2026-02-28 20:10:31 +01:00
parent a50bc4c57c
commit 307c41e4ea
2 changed files with 100 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/lib/server/match/engine.ts
View File

@@ -7,9 +7,9 @@ import {
matchGameScore,
matchQueue,
playerRating,
teamMember,
teamMember
} from '$lib/server/db/schema';
import { eq, asc, sql } from 'drizzle-orm';
import { eq, asc, sql, desc, and, inArray } from 'drizzle-orm';
import { MATCH_STATES, GAME_STATES, type MatchConfig } from './types';
// ── Queue ───────────────────────────────────────────────────────────────
@@ -54,13 +54,55 @@ export async function getQueueStatus(userId: string) {
.select({ count: sql<number>`count(*)` })
.from(matchQueue);
// If NOT in queue, check if there's a recent active match for this user
// (they may have been matched while polling)
let matchedMatchId: string | null = null;
if (!entry) {
matchedMatchId = await findRecentActiveMatch(userId);
}
return {
inQueue: !!entry,
queueSize: Number(count[0].count),
joinedAt: entry?.joinedAt ?? null
joinedAt: entry?.joinedAt ?? null,
matchedMatchId
};
}
/**
* Find a recent active (non-finished) match for this user.
* Used to redirect players who were matched via queue while polling.
*/
async function findRecentActiveMatch(userId: string): Promise<string | null> {
// Find matchParticipantPlayer records for this user
const playerEntries = await db.query.matchParticipantPlayer.findMany({
where: eq(matchParticipantPlayer.userId, userId),
with: {
participant: {
with: {
match: true
}
}
}
});
// Find the most recent match that's still active (not finished/cancelled)
const activeStates = [
MATCH_STATES.CREATED,
MATCH_STATES.LOBBY,
MATCH_STATES.ROLLING,
MATCH_STATES.PICKING,
MATCH_STATES.PLAYING
];
const activeMatches = playerEntries
.filter((pe) => activeStates.includes(pe.participant.match.state as any))
.map((pe) => pe.participant.match)
.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
return activeMatches[0]?.id ?? null;
}
async function tryMatchFromQueue() {
const queue = await db.query.matchQueue.findMany({
orderBy: asc(matchQueue.elo)
@@ -69,7 +111,7 @@ async function tryMatchFromQueue() {
if (queue.length < 2) return null;
// Find closest ELO pair
let bestPair: [typeof queue[0], typeof queue[0]] | null = null;
let bestPair: [(typeof queue)[0], (typeof queue)[0]] | null = null;
let smallestGap = Infinity;
for (let i = 0; i < queue.length - 1; i++) {
@@ -100,6 +142,17 @@ async function tryMatchFromQueue() {
createdBy: 'system'
});
// Start the IRC lobby in the background
// Import dynamically to avoid circular dependency
try {
const { initMatchLobby } = await import('./orchestrator');
initMatchLobby(created.id).catch((err) => {
console.error('[Queue] IRC lobby creation failed:', err.message);
});
} catch (err: any) {
console.error('[Queue] Failed to import orchestrator:', err.message);
}
return created;
}
@@ -112,7 +165,6 @@ async function selectMappoolForRating(avgElo: number) {
if (pools.length === 0) return null;
// Map ELO range (e.g. 800-1200) to star rating range (e.g. 3-7)
// Simple linear: ELO 800 → 3★, ELO 1200 → 7★
const targetStars = 3 + ((avgElo - 800) / 400) * 4;
const clampedTarget = Math.max(2, Math.min(8, targetStars));
@@ -413,10 +465,7 @@ export async function submitGameScores(
// ── ELO ─────────────────────────────────────────────────────────────────
async function updateElo(
participants: { id: string; teamId: string }[],
winnerId: string
) {
async function updateElo(participants: { id: string; teamId: string }[], winnerId: string) {
for (const p of participants) {
const players = await db.query.matchParticipantPlayer.findMany({
where: eq(matchParticipantPlayer.participantId, p.id)

56
src/routes/(app)/+page.svelte
View File

@@ -14,13 +14,25 @@
};
// Queue state
let queueStatus = $state<{ inQueue: boolean; queueSize: number } | null>(null);
let queueStatus = $state<{
inQueue: boolean;
queueSize: number;
matchedMatchId?: string | null;
} | null>(null);
let queueLoading = $state(false);
async function fetchQueueStatus() {
try {
const res = await fetch('/api/queue');
if (res.ok) queueStatus = await res.json();
if (res.ok) {
const status = await res.json();
queueStatus = status;
// If we were in queue and now got matched, redirect to the match
if (!status.inQueue && status.matchedMatchId) {
window.location.href = `/matches/${status.matchedMatchId}`;
}
}
} catch {}
}
@@ -28,9 +40,9 @@
queueLoading = true;
try {
const res = await fetch('/api/queue', { method: 'POST' });
const data = await res.json();
if (data.matched && data.match) {
window.location.href = `/matches/${data.match.id}`;
const result = await res.json();
if (result.matched && result.match) {
window.location.href = `/matches/${result.match.id}`;
return;
}
await fetchQueueStatus();
@@ -47,11 +59,11 @@
queueLoading = false;
}
// Poll queue status while on dashboard
// Poll queue status while on dashboard (faster when in queue)
$effect(() => {
if (data.user) {
fetchQueueStatus();
const interval = setInterval(fetchQueueStatus, 5000);
const interval = setInterval(fetchQueueStatus, queueStatus?.inQueue ? 2000 : 5000);
return () => clearInterval(interval);
}
});
@@ -81,8 +93,8 @@
Welcome to <span class="text-accent">Vash Esports</span>
</h1>
<p class="mt-3 max-w-md text-text-secondary">
Automated tournament match management for osu! — lobbies, mappools, picks, bans, and
ELO tracking all in one place.
Automated tournament match management for osu! — lobbies, mappools, picks, bans, and ELO
tracking all in one place.
</p>
<a
href="/login"
@@ -95,7 +107,7 @@
</p>
</div>
<!-- ── DASHBOARD (logged in) ── -->
<!-- ── DASHBOARD (logged in) ── -->
{:else}
<div class="mx-auto max-w-5xl">
<div>
@@ -215,12 +227,13 @@
href="/matches"
class="flex items-center gap-3 rounded-lg border border-border bg-surface-800 p-3 transition-colors hover:border-accent/40 hover:bg-surface-700"
>
<span class="flex h-8 w-8 items-center justify-center rounded-md bg-accent/10 text-accent"
<span
class="flex h-8 w-8 items-center justify-center rounded-md bg-accent/10 text-accent"
>⚔</span
>
<div>
<p class="text-sm font-600">New Match</p>
<p class="text-xs text-text-secondary">Start a 1v1</p>
<p class="text-sm font-600">Matches</p>
<p class="text-xs text-text-secondary">View all matches</p>
</div>
</a>
<a
@@ -249,6 +262,19 @@
<p class="text-xs text-text-secondary">Manage rosters</p>
</div>
</a>
<a
href="/leaderboard"
class="flex items-center gap-3 rounded-lg border border-border bg-surface-800 p-3 transition-colors hover:border-accent/40 hover:bg-surface-700"
>
<span
class="flex h-8 w-8 items-center justify-center rounded-md bg-yellow-500/10 text-yellow-400"
>🏆</span
>
<div>
<p class="text-sm font-600">Leaderboard</p>
<p class="text-xs text-text-secondary">Rankings & stats</p>
</div>
</a>
</div>
</div>
@@ -301,7 +327,9 @@
{:else}
<div class="rounded-lg border border-dashed border-border py-8 text-center">
<p class="text-sm text-text-secondary">
No matches yet. <a href="/matches" class="text-accent hover:underline">Create one</a>
No matches yet. <a href="/matches" class="text-accent hover:underline"
>Create one</a
>
</p>
</div>
{/each}