Compare commits

..
4 Commits
Author SHA1 Message Date
dahyeon 2bac89d3dc chore(deps): resolve high audit findings
Upgrade direct dependencies and pin patched transitive versions so the high-severity pnpm audit gate passes. Document the dev-only brace-expansion exception and the separate Mongoose type-migration follow-up.
2026-07-25 01:51:00 -07:00
dahyeon ca786fd80a fix(dakao): hide started matches from schedule 2026-07-25 01:01:57 -07:00
dahyeon a4215f86fb fix(web): satisfy React hook lint rules 2026-07-24 22:36:53 -07:00
dahyeon bb68be14fa fix(api): eliminate unsafe lint warnings 2026-07-24 22:16:53 -07:00
28 changed files with 2329 additions and 1894 deletions

No files matched your search

+8 -8
View File
@@ -29,20 +29,20 @@
}, },
"dependencies": { "dependencies": {
"@lolympus/contracts": "workspace:*", "@lolympus/contracts": "workspace:*",
"@nestjs/common": "^11.0.1", "@nestjs/common": "^11.1.28",
"@nestjs/config": "^4.0.4", "@nestjs/config": "^4.0.4",
"@nestjs/core": "^11.0.1", "@nestjs/core": "^11.1.28",
"@nestjs/platform-express": "^11.0.1", "@nestjs/platform-express": "^11.1.28",
"@nestjs/platform-socket.io": "^11.1.19", "@nestjs/platform-socket.io": "^11.1.28",
"@nestjs/swagger": "^11.2.7", "@nestjs/swagger": "^11.4.6",
"@nestjs/websockets": "^11.1.19", "@nestjs/websockets": "^11.1.28",
"@socket.io/redis-adapter": "^8.3.0", "@socket.io/redis-adapter": "^8.3.0",
"class-transformer": "^0.5.1", "class-transformer": "^0.5.1",
"class-validator": "^0.15.1", "class-validator": "^0.15.1",
"jose": "^6.2.2", "jose": "^6.2.2",
"mongoose": "^9.4.1", "mongoose": "9.4.1",
"nats": "^2.29.3", "nats": "^2.29.3",
"newrelic": "^14.3.0", "newrelic": "^14.3.3",
"redis": "^5.12.1", "redis": "^5.12.1",
"reflect-metadata": "^0.2.2", "reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1", "rxjs": "^7.8.1",
@@ -2,6 +2,30 @@ import mongoose from 'mongoose';
import { AuctionService } from './auction.service'; import { AuctionService } from './auction.service';
describe('AuctionService', () => { describe('AuctionService', () => {
function requireRecord(
value: unknown,
label: string,
): Record<string, unknown> {
if (!value || typeof value !== 'object' || Array.isArray(value)) {
throw new Error(`${label} must be an object.`);
}
return value as Record<string, unknown>;
}
function requireArray(value: unknown, label: string): unknown[] {
if (!Array.isArray(value)) {
throw new Error(`${label} must be an array.`);
}
return value as unknown[];
}
function parseJsonRecord(value: unknown, label: string) {
if (typeof value !== 'string') {
throw new Error(`${label} must be a JSON string.`);
}
return requireRecord(JSON.parse(value) as unknown, label);
}
function createService(models: Record<string, unknown>) { function createService(models: Record<string, unknown>) {
const auctionHistoryModel = { const auctionHistoryModel = {
findOne: jest.fn().mockReturnValue({ findOne: jest.fn().mockReturnValue({
@@ -1007,7 +1031,12 @@ describe('AuctionService', () => {
); );
const transitionInput = const transitionInput =
auctionRedisCommandService.applyTransition.mock.calls[0][1]; auctionRedisCommandService.applyTransition.mock.calls[0][1];
expect(JSON.parse(transitionInput.durabilityPayloadJson)).toMatchObject({ expect(
parseJsonRecord(
transitionInput.durabilityPayloadJson,
'durabilityPayloadJson',
),
).toMatchObject({
afterAuctionMongoProjection: expect.objectContaining({ afterAuctionMongoProjection: expect.objectContaining({
phase: 'bidding', phase: 'bidding',
revision: 2, revision: 2,
@@ -1178,17 +1207,40 @@ describe('AuctionService', () => {
const transitionInput = const transitionInput =
auctionRedisCommandService.applyTransition.mock.calls[0][1]; auctionRedisCommandService.applyTransition.mock.calls[0][1];
const durabilityPayload = JSON.parse(transitionInput.durabilityPayloadJson); const durabilityPayload = parseJsonRecord(
expect(durabilityPayload.snapshotBefore).toMatchObject({ transitionInput.durabilityPayloadJson,
'durabilityPayloadJson',
);
const snapshotBefore = requireRecord(
durabilityPayload.snapshotBefore,
'snapshotBefore',
);
const snapshotBeforeTeams = requireArray(
snapshotBefore.auctionTeams,
'snapshotBefore.auctionTeams',
);
const snapshotBeforeTeam = requireRecord(
snapshotBeforeTeams[0],
'snapshotBefore.auctionTeams[0]',
);
const afterAuctionMongoProjection = requireRecord(
durabilityPayload.afterAuctionMongoProjection,
'afterAuctionMongoProjection',
);
const projectedTeams = requireArray(
afterAuctionMongoProjection.auctionTeams,
'afterAuctionMongoProjection.auctionTeams',
);
const projectedTeam = requireRecord(
projectedTeams[0],
'afterAuctionMongoProjection.auctionTeams[0]',
);
expect(snapshotBefore).toMatchObject({
phase: 'bidding', phase: 'bidding',
revision: 4, revision: 4,
}); });
expect(durabilityPayload.snapshotBefore.auctionTeams[0].members).toEqual( expect(snapshotBeforeTeam.members).toEqual([]);
[], expect(projectedTeam.members).toEqual([
);
expect(
durabilityPayload.afterAuctionMongoProjection.auctionTeams[0].members,
).toEqual([
expect.objectContaining({ expect.objectContaining({
memberAcquisitionBidPointAmount: 120, memberAcquisitionBidPointAmount: 120,
userId: playerUserId.toString(), userId: playerUserId.toString(),
@@ -1396,7 +1448,12 @@ describe('AuctionService', () => {
}); });
const [, transitionInput] = const [, transitionInput] =
auctionRedisCommandService.applyTransition.mock.calls.at(-1) ?? []; auctionRedisCommandService.applyTransition.mock.calls.at(-1) ?? [];
expect(JSON.parse(transitionInput.durabilityPayloadJson)).toMatchObject({ expect(
parseJsonRecord(
transitionInput.durabilityPayloadJson,
'durabilityPayloadJson',
),
).toMatchObject({
afterAuctionMongoProjection: { afterAuctionMongoProjection: {
matchSideEffectStatus: 'pending', matchSideEffectStatus: 'pending',
phase: 'complete', phase: 'complete',
@@ -2567,7 +2624,10 @@ describe('AuctionService', () => {
durationSeconds: 30, durationSeconds: 30,
mode: 'set-relative', mode: 'set-relative',
}); });
const durabilityPayload = JSON.parse(transitionInput.durabilityPayloadJson); const durabilityPayload = parseJsonRecord(
transitionInput.durabilityPayloadJson,
'durabilityPayloadJson',
);
expect(durabilityPayload).toMatchObject({ expect(durabilityPayload).toMatchObject({
auctionActionType: 'undo', auctionActionType: 'undo',
historyMutation: { historyMutation: {
@@ -429,8 +429,14 @@ export function applyCompetitionDomainInvariantIndexes(
} }
} }
export type CompetitionModelName =
| 'competition'
| 'competitionFact'
| 'competitionOutbox'
| 'tournamentCodeAssignment';
export const competitionModelDefinitions: Array<{ export const competitionModelDefinitions: Array<{
name: string; name: CompetitionModelName;
schema: mongoose.Schema; schema: mongoose.Schema;
schemaName: string; schemaName: string;
}> = [ }> = [
@@ -1,4 +1,8 @@
import { projectCompetition } from './competition-projector'; import { projectCompetition } from './competition-projector';
import {
CompetitionDomainError,
type CompetitionDomainErrorCode,
} from './domain-error';
import { generateSeriesGraph } from './series-graph'; import { generateSeriesGraph } from './series-graph';
describe('projectCompetition', () => { describe('projectCompetition', () => {
@@ -323,7 +327,8 @@ describe('projectCompetition', () => {
'team-1', 'team-1',
); );
expect(() => expectCompetitionDomainError(
() =>
projectCompetition({ projectCompetition({
competitionId, competitionId,
revision: 1, revision: 1,
@@ -333,10 +338,7 @@ describe('projectCompetition', () => {
seriesGraph, seriesGraph,
facts: [{ ...accepted, seriesId: 'series-does-not-exist' }], facts: [{ ...accepted, seriesId: 'series-does-not-exist' }],
}), }),
).toThrow( 'GAME_SERIES_MISMATCH',
expect.objectContaining({
code: 'GAME_SERIES_MISMATCH',
}),
); );
}); });
@@ -356,7 +358,8 @@ describe('projectCompetition', () => {
'team-1', 'team-1',
); );
expect(() => expectCompetitionDomainError(
() =>
projectCompetition({ projectCompetition({
competitionId, competitionId,
revision: 1, revision: 1,
@@ -366,10 +369,7 @@ describe('projectCompetition', () => {
seriesGraph, seriesGraph,
facts: [{ ...accepted, gameSlotId: 'slot-does-not-exist' }], facts: [{ ...accepted, gameSlotId: 'slot-does-not-exist' }],
}), }),
).toThrow( 'GAME_SLOT_INVALID',
expect.objectContaining({
code: 'GAME_SLOT_INVALID',
}),
); );
}); });
@@ -382,7 +382,8 @@ describe('projectCompetition', () => {
}; };
const seriesGraph = generateSeriesGraph({ competitionId, teams, format }); const seriesGraph = generateSeriesGraph({ competitionId, teams, format });
expect(() => expectCompetitionDomainError(
() =>
projectCompetition({ projectCompetition({
competitionId, competitionId,
revision: 1, revision: 1,
@@ -408,10 +409,7 @@ describe('projectCompetition', () => {
}, },
], ],
}), }),
).toThrow( 'ADJUDICATION_INVALID',
expect.objectContaining({
code: 'ADJUDICATION_INVALID',
}),
); );
}); });
@@ -617,3 +615,23 @@ interface GameSlotLike {
id: string; id: string;
ordinal: number; ordinal: number;
} }
function expectCompetitionDomainError(
action: () => unknown,
expectedCode: CompetitionDomainErrorCode,
): void {
let thrown: unknown;
try {
action();
} catch (error: unknown) {
thrown = error;
}
expect(thrown).toBeInstanceOf(CompetitionDomainError);
if (!(thrown instanceof CompetitionDomainError)) {
throw new Error(
`Expected CompetitionDomainError, received ${String(thrown)}`,
);
}
expect(thrown.code).toBe(expectedCode);
}
@@ -1,6 +1,7 @@
import { import {
assertReversalPreview, assertReversalPreview,
buildReversalFacts, buildReversalFacts,
CompetitionReversalError,
previewSeriesReversal, previewSeriesReversal,
} from './competition-reversal'; } from './competition-reversal';
@@ -19,7 +20,8 @@ describe('Competition reversal planning', () => {
]; ];
it('rejects strict reversal when a descendant has result activity', () => { it('rejects strict reversal when a descendant has result activity', () => {
expect(() => expectCompetitionReversalError(
() =>
previewSeriesReversal({ previewSeriesReversal({
competitionId: 'competition-1', competitionId: 'competition-1',
revision: 2, revision: 2,
@@ -29,8 +31,7 @@ describe('Competition reversal planning', () => {
facts, facts,
assignments, assignments,
}), }),
).toThrow( 'REVERSAL_DESCENDANT_ACTIVITY',
expect.objectContaining({ code: 'REVERSAL_DESCENDANT_ACTIVITY' }),
); );
}); });
@@ -105,7 +106,8 @@ describe('Competition reversal planning', () => {
assignments, assignments,
}); });
expect(() => expectCompetitionReversalError(
() =>
assertReversalPreview( assertReversalPreview(
{ {
competitionId: 'competition-1', competitionId: 'competition-1',
@@ -118,7 +120,8 @@ describe('Competition reversal planning', () => {
}, },
preview.impactHash, preview.impactHash,
), ),
).toThrow(expect.objectContaining({ code: 'REVERSAL_PREVIEW_STALE' })); 'REVERSAL_PREVIEW_STALE',
);
}); });
it('emits one append-only reversal fact for every active result fact', () => { it('emits one append-only reversal fact for every active result fact', () => {
@@ -160,6 +163,26 @@ describe('Competition reversal planning', () => {
}); });
}); });
function expectCompetitionReversalError(
action: () => unknown,
expectedCode: CompetitionReversalError['code'],
): void {
let thrown: unknown;
try {
action();
} catch (error: unknown) {
thrown = error;
}
expect(thrown).toBeInstanceOf(CompetitionReversalError);
if (!(thrown instanceof CompetitionReversalError)) {
throw new Error(
`Expected CompetitionReversalError, received ${String(thrown)}`,
);
}
expect(thrown.code).toBe(expectedCode);
}
function series(id: string, sources: Array<Record<string, unknown>>) { function series(id: string, sources: Array<Record<string, unknown>>) {
return { return {
id, id,
@@ -22,6 +22,33 @@ function makeHandler(params: {
} }
describe('MatchListHandler', () => { describe('MatchListHandler', () => {
afterEach(() => {
jest.useRealTimers();
});
it('queries only matches scheduled at or after command processing time', async () => {
const now = new Date('2026-07-25T07:30:00.000Z');
jest.useFakeTimers().setSystemTime(now);
const communityId = objectId('111111111111111111111111');
const list = jest.fn().mockResolvedValue([]);
const handler = makeHandler({
matchService: { list },
});
await handler.handle({
communityId,
senderUserId: 'kakao-user-1',
senderNickname: '프리리',
});
expect(list).toHaveBeenCalledWith({
communityId,
status: 'recruiting',
scheduledFrom: now,
limit: 10,
});
});
it('prints short codes, compact KST dates, and short links', async () => { it('prints short codes, compact KST dates, and short links', async () => {
const match = { const match = {
_id: objectId('333333333333333333333333'), _id: objectId('333333333333333333333333'),
@@ -19,9 +19,11 @@ export class MatchListHandler {
senderUserId: string; senderUserId: string;
senderNickname: string; senderNickname: string;
}): Promise<DakaoSegment[]> { }): Promise<DakaoSegment[]> {
const scheduledFrom = new Date();
const matches = await this.matchService.list({ const matches = await this.matchService.list({
communityId: params.communityId, communityId: params.communityId,
status: 'recruiting', status: 'recruiting',
scheduledFrom,
limit: 10, limit: 10,
}); });
@@ -2,7 +2,10 @@ import { Injectable, Logger, Scope, OnModuleInit } from '@nestjs/common';
import mongoose from 'mongoose'; import mongoose from 'mongoose';
import { applyMongoosePerformancePlugin } from '../observability/mongoose-performance.plugin'; import { applyMongoosePerformancePlugin } from '../observability/mongoose-performance.plugin';
import { SecretService } from '../secret/secret.service'; import { SecretService } from '../secret/secret.service';
import { tournamentModelDefinitions, TournamentModelTypes } from './schema'; import {
tournamentModelDefinitions,
type TournamentModelTypes,
} from './schema';
export function resolveMongoDbName(nodeEnv = process.env.NODE_ENV): string { export function resolveMongoDbName(nodeEnv = process.env.NODE_ENV): string {
if (nodeEnv === 'prod') return 'lolympus'; if (nodeEnv === 'prod') return 'lolympus';
@@ -42,7 +45,8 @@ export class ConnectionService implements OnModuleInit {
private connectionPromise: Promise<mongoose.Connection> | null = null; private connectionPromise: Promise<mongoose.Connection> | null = null;
constructor(private readonly secretService: SecretService) {} constructor(private readonly secretService: SecretService) {}
private tournamentModels: Map<string, mongoose.Model<any>> | null = null; private tournamentModels: Map<keyof TournamentModelTypes, unknown> | null =
null;
public async getConnection(): Promise<mongoose.Connection> { public async getConnection(): Promise<mongoose.Connection> {
if ( if (
@@ -89,14 +93,18 @@ export class ConnectionService implements OnModuleInit {
modelKey: K, modelKey: K,
): Promise<mongoose.Model<TournamentModelTypes[K]>> { ): Promise<mongoose.Model<TournamentModelTypes[K]>> {
const connection = await this.getConnection(); const connection = await this.getConnection();
if (this.tournamentModels) if (this.tournamentModels) {
return this.tournamentModels.get(modelKey) as mongoose.Model< return this.requireTournamentModel(this.tournamentModels, modelKey);
TournamentModelTypes[K] }
>;
const models = new Map<K, mongoose.Model<TournamentModelTypes[K]>>(); const models = new Map<keyof TournamentModelTypes, unknown>();
tournamentModelDefinitions.forEach((modelDefinition) => { tournamentModelDefinitions.forEach((modelDefinition) => {
if (!(modelDefinition.schema instanceof mongoose.Schema)) {
throw new Error(
`Invalid Mongoose schema for model ${modelDefinition.name}.`,
);
}
applyMongoosePerformancePlugin(modelDefinition.schema); applyMongoosePerformancePlugin(modelDefinition.schema);
// 이미 생성된 경우 컴파일 스킵. // 이미 생성된 경우 컴파일 스킵.
if ( if (
@@ -106,14 +114,14 @@ export class ConnectionService implements OnModuleInit {
) )
) { ) {
models.set( models.set(
modelDefinition.name as K, modelDefinition.name,
connection.models[modelDefinition.name], connection.models[modelDefinition.name],
); );
return; return;
} else { } else {
models.set( models.set(
modelDefinition.name as K, modelDefinition.name,
connection.model<TournamentModelTypes[K]>( connection.model(
modelDefinition.name, modelDefinition.name,
modelDefinition.schema, modelDefinition.schema,
modelDefinition.schemaName, modelDefinition.schemaName,
@@ -123,7 +131,18 @@ export class ConnectionService implements OnModuleInit {
}); });
this.tournamentModels = models; this.tournamentModels = models;
return models.get(modelKey) as mongoose.Model<TournamentModelTypes[K]>; return this.requireTournamentModel(models, modelKey);
}
private requireTournamentModel<K extends keyof TournamentModelTypes>(
models: ReadonlyMap<keyof TournamentModelTypes, unknown>,
modelKey: K,
): mongoose.Model<TournamentModelTypes[K]> {
const model = models.get(modelKey);
if (model === undefined) {
throw new Error(`Mongoose model ${modelKey} is not registered.`);
}
return model as mongoose.Model<TournamentModelTypes[K]>;
} }
public async createSession( public async createSession(
@@ -253,9 +253,7 @@ function migrateResult(result: Record<string, unknown>) {
seriesResults.length > 0 ? seriesResults : buildSeries(games); seriesResults.length > 0 ? seriesResults : buildSeries(games);
if (typeof migrated.winnerTeamIndex !== 'number') { if (typeof migrated.winnerTeamIndex !== 'number') {
const migratedSeriesResults = Array.isArray(migrated.seriesResults) const migratedSeriesResults = asArray(migrated.seriesResults);
? migrated.seriesResults
: [];
migrated.winnerTeamIndex = migrated.winnerTeamIndex =
resolveWinnerTeamIndex(migratedSeriesResults) ?? resolveWinnerTeamIndex(migratedSeriesResults) ??
(isSide(migrated.winnerSide) (isSide(migrated.winnerSide)
@@ -117,7 +117,9 @@ function createDb(params: {
function matchesFilter(doc: Doc, filter: Record<string, unknown>): boolean { function matchesFilter(doc: Doc, filter: Record<string, unknown>): boolean {
const clauses = filter.$or; const clauses = filter.$or;
if (Array.isArray(clauses)) { if (Array.isArray(clauses)) {
return clauses.some((clause) => matchesFilter(doc, clause)); return (clauses as unknown[]).some(
(clause) => isRecord(clause) && matchesFilter(doc, clause),
);
} }
return Object.entries(filter).every(([key, value]) => { return Object.entries(filter).every(([key, value]) => {
@@ -11,7 +11,11 @@ import {
} from '../../../double-elimination/double-elimination.util'; } from '../../../double-elimination/double-elimination.util';
import { TOURNAMENT_CODE_EXPIRY_MARGIN_MS } from '../../../tournament-code/tournament-code.constants'; import { TOURNAMENT_CODE_EXPIRY_MARGIN_MS } from '../../../tournament-code/tournament-code.constants';
import { ConnectionService } from '../connection.service'; import { ConnectionService } from '../connection.service';
import type { MatchDocument, TournamentCodeDocument } from '../schema'; import type {
MatchDocument,
TournamentCode,
TournamentCodeDocument,
} from '../schema';
import { SecretModule } from '../../secret/secret.module'; import { SecretModule } from '../../secret/secret.module';
interface CliOptions { interface CliOptions {
@@ -334,7 +338,7 @@ function printPlan(plan: MatchRepairPlan) {
async function applyPlan( async function applyPlan(
match: MatchDocument, match: MatchDocument,
plan: MatchRepairPlan, plan: MatchRepairPlan,
TournamentCodeModel: mongoose.Model<any>, TournamentCodeModel: mongoose.Model<TournamentCode>,
session: mongoose.ClientSession, session: mongoose.ClientSession,
) { ) {
if (plan.skippedReason) return; if (plan.skippedReason) return;
@@ -2485,7 +2485,9 @@ MatchStatsSchema.index({ communityId: 1, userIds: 1 });
MatchStatsSchema.index({ communityId: 1, userIds: 1, scheduledAt: -1 }); MatchStatsSchema.index({ communityId: 1, userIds: 1, scheduledAt: -1 });
MatchStatsSchema.index({ communityId: 1, championIds: 1 }); MatchStatsSchema.index({ communityId: 1, championIds: 1 });
export const tournamentModelDefinitions: ModelDefinition[] = [ export const tournamentModelDefinitions: Array<
ModelDefinition & { name: keyof TournamentModelTypes }
> = [
...competitionModelDefinitions, ...competitionModelDefinitions,
{ name: 'identity', schema: IdentitySchema, schemaName: 'identity' }, { name: 'identity', schema: IdentitySchema, schemaName: 'identity' },
{ name: 'community', schema: CommunitySchema, schemaName: 'community' }, { name: 'community', schema: CommunitySchema, schemaName: 'community' },
+1 -1
View File
@@ -1,5 +1,5 @@
export interface ModelDefinition { export interface ModelDefinition {
name: string; name: string;
schema: mongoose.Schema<any>; schema: unknown;
schemaName?: string; schemaName?: string;
} }
@@ -34,10 +34,13 @@ type SchemaWithPerformanceMarker = mongoose.Schema & {
[PERFORMANCE_PLUGIN_APPLIED]?: boolean; [PERFORMANCE_PLUGIN_APPLIED]?: boolean;
}; };
export function applyMongoosePerformancePlugin(schema: mongoose.Schema): void { export function applyMongoosePerformancePlugin(schemaValue: unknown): void {
const markedSchema = schema as SchemaWithPerformanceMarker; if (!(schemaValue instanceof mongoose.Schema)) {
if (markedSchema[PERFORMANCE_PLUGIN_APPLIED]) return; throw new TypeError('Mongoose performance plugin requires a Schema.');
markedSchema[PERFORMANCE_PLUGIN_APPLIED] = true; }
const schema = schemaValue as SchemaWithPerformanceMarker;
if (schema[PERFORMANCE_PLUGIN_APPLIED]) return;
schema[PERFORMANCE_PLUGIN_APPLIED] = true;
schema.pre(QUERY_OPERATION_REGEX, function () { schema.pre(QUERY_OPERATION_REGEX, function () {
const query = this as QueryWithPerformanceState; const query = this as QueryWithPerformanceState;
@@ -5,7 +5,9 @@ describe('MatchService', () => {
function createServiceWithCreateModels() { function createServiceWithCreateModels() {
const createdPayloads: Record<string, unknown>[] = []; const createdPayloads: Record<string, unknown>[] = [];
const MatchModel = { const MatchModel = {
create: jest.fn().mockImplementation(async (payload) => { create: jest
.fn()
.mockImplementation(async (payload: Record<string, unknown>) => {
createdPayloads.push(payload); createdPayloads.push(payload);
return payload; return payload;
}), }),
+7 -7
View File
@@ -19,15 +19,15 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@lolympus/contracts": "workspace:*",
"@azure/msal-browser": "^5.8.0", "@azure/msal-browser": "^5.8.0",
"@azure/msal-react": "^5.3.1", "@azure/msal-react": "^5.3.1",
"@newrelic/browser-agent": "^1.316.0", "@lolympus/contracts": "workspace:*",
"@newrelic/browser-agent": "^1.318.0",
"@tanstack/react-query": "^5.100.1", "@tanstack/react-query": "^5.100.1",
"lucide-react": "^1.14.0", "lucide-react": "^1.14.0",
"react": "^19.2.4", "react": "^19.2.8",
"react-dom": "^19.2.4", "react-dom": "^19.2.8",
"react-router": "^7.14.0", "react-router": "^8.3.0",
"recharts": "^3.8.1", "recharts": "^3.8.1",
"socket.io-client": "^4.8.3" "socket.io-client": "^4.8.3"
}, },
@@ -46,7 +46,7 @@
"tailwindcss": "^4.2.2", "tailwindcss": "^4.2.2",
"typescript": "~6.0.2", "typescript": "~6.0.2",
"typescript-eslint": "^8.58.0", "typescript-eslint": "^8.58.0",
"vite": "^8.0.4", "vite": "^8.1.5",
"wrangler": "^4.85.0" "wrangler": "^4.114.0"
} }
} }
+100 -62
View File
@@ -1,4 +1,4 @@
import { useEffect, useRef, useState } from 'react'; import { useCallback, useEffect, useRef, useState } from 'react';
import { io, type Socket } from 'socket.io-client'; import { io, type Socket } from 'socket.io-client';
import { API_BASE_URL, useAuthUserId } from '../config'; import { API_BASE_URL, useAuthUserId } from '../config';
import { acquireAccessToken } from '../lib/auth/token-provider'; import { acquireAccessToken } from '../lib/auth/token-provider';
@@ -140,6 +140,9 @@ function mergeChatMessages(
export function useAuctionSocket(matchId: string | undefined) { export function useAuctionSocket(matchId: string | undefined) {
const authUserId = useAuthUserId(); const authUserId = useAuthUserId();
const connectionKey = matchId
? JSON.stringify([matchId, authUserId ?? null])
: null;
const socketRef = useRef<Socket | null>(null); const socketRef = useRef<Socket | null>(null);
const pendingBidTimeoutsRef = useRef< const pendingBidTimeoutsRef = useRef<
Record<string, ReturnType<typeof setTimeout>> Record<string, ReturnType<typeof setTimeout>>
@@ -166,9 +169,14 @@ export function useAuctionSocket(matchId: string | undefined) {
Record<string, { action: string }> Record<string, { action: string }>
>({}); >({});
const [resetAt, setResetAt] = useState<number | null>(null); const [resetAt, setResetAt] = useState<number | null>(null);
const [connectionStatus, setConnectionStatus] = const [connectionState, setConnectionState] = useState<{
useState<ConnectionStatus>('idle'); key: string;
const [error, setError] = useState<string | null>(null); status: ConnectionStatus;
}>({ key: '', status: 'idle' });
const [errorState, setErrorState] = useState<{
key: string;
message: string | null;
}>({ key: '', message: null });
const [serverTimeOffsetMs, setServerTimeOffsetMs] = useState(0); const [serverTimeOffsetMs, setServerTimeOffsetMs] = useState(0);
const [serverRoundTripMs, setServerRoundTripMs] = useState<number | null>( const [serverRoundTripMs, setServerRoundTripMs] = useState<number | null>(
null, null,
@@ -176,19 +184,13 @@ export function useAuctionSocket(matchId: string | undefined) {
const [bidLatencyDiagnostics, setBidLatencyDiagnostics] = const [bidLatencyDiagnostics, setBidLatencyDiagnostics] =
useState<BidLatencyDiagnostics | null>(null); useState<BidLatencyDiagnostics | null>(null);
function syncLatestConfirmedBidPointAmountFromAuction( const commitAuctionState = useCallback(
nextAuction: ApiAuction, (nextAuction: ApiAuction, source = 'socket-state'): boolean => {
) {
latestConfirmedBidPointAmountRef.current =
resolveCurrentBidPointAmount(nextAuction);
}
function commitAuctionState(
nextAuction: ApiAuction,
source = 'socket-state',
): boolean {
const currentAuction = latestAuctionRef.current; const currentAuction = latestAuctionRef.current;
const applied = shouldApplyIncomingAuctionState(currentAuction, nextAuction); const applied = shouldApplyIncomingAuctionState(
currentAuction,
nextAuction,
);
const currentRevision = const currentRevision =
typeof currentAuction?.revision === 'number' typeof currentAuction?.revision === 'number'
? currentAuction.revision ? currentAuction.revision
@@ -217,12 +219,15 @@ export function useAuctionSocket(matchId: string | undefined) {
} }
latestAuctionRef.current = nextAuction; latestAuctionRef.current = nextAuction;
syncLatestConfirmedBidPointAmountFromAuction(nextAuction); latestConfirmedBidPointAmountRef.current =
resolveCurrentBidPointAmount(nextAuction);
setAuction(nextAuction); setAuction(nextAuction);
return true; return true;
} },
[matchId],
);
function commitBidDelta(payload: BidDeltaPayload): boolean { const commitBidDelta = useCallback((payload: BidDeltaPayload): boolean => {
const currentAuction = latestAuctionRef.current; const currentAuction = latestAuctionRef.current;
const nextAuction = applyBidDelta(currentAuction, payload); const nextAuction = applyBidDelta(currentAuction, payload);
if (!nextAuction || nextAuction === currentAuction) { if (!nextAuction || nextAuction === currentAuction) {
@@ -230,10 +235,18 @@ export function useAuctionSocket(matchId: string | undefined) {
} }
latestAuctionRef.current = nextAuction; latestAuctionRef.current = nextAuction;
syncLatestConfirmedBidPointAmountFromAuction(nextAuction); latestConfirmedBidPointAmountRef.current =
resolveCurrentBidPointAmount(nextAuction);
setAuction(nextAuction); setAuction(nextAuction);
return true; return true;
} }, []);
const setError = useCallback(
(message: string | null) => {
setErrorState({ key: connectionKey ?? '', message });
},
[connectionKey],
);
function applyFallbackServerTimestamp(currentServerTimestampMS?: number) { function applyFallbackServerTimestamp(currentServerTimestampMS?: number) {
if (hasSyncedServerTimeRef.current) return; if (hasSyncedServerTimeRef.current) return;
@@ -345,14 +358,47 @@ export function useAuctionSocket(matchId: string | undefined) {
}); });
} }
const clearPendingBidRequest = useCallback((bidRequestId: string) => {
const timeoutId = pendingBidTimeoutsRef.current[bidRequestId];
if (timeoutId) clearTimeout(timeoutId);
delete pendingBidTimeoutsRef.current[bidRequestId];
setPendingBidRequests((current) => {
const next = { ...current };
delete next[bidRequestId];
return next;
});
}, []);
const clearPendingActionRequest = useCallback(
(auctionActionRequestId: string) => {
const timeoutId =
pendingActionTimeoutsRef.current[auctionActionRequestId];
if (timeoutId) clearTimeout(timeoutId);
delete pendingActionTimeoutsRef.current[auctionActionRequestId];
setPendingActionRequests((current) => {
const next = { ...current };
delete next[auctionActionRequestId];
return next;
});
},
[],
);
const clearPendingActionRequests = useCallback(() => {
Object.values(pendingActionTimeoutsRef.current).forEach((timeoutId) =>
clearTimeout(timeoutId),
);
pendingActionTimeoutsRef.current = {};
setPendingActionRequests({});
}, []);
useEffect(() => { useEffect(() => {
if (!matchId) { if (!matchId || !connectionKey) {
return; return;
} }
const activeConnectionKey = connectionKey;
let disposed = false; let disposed = false;
setConnectionStatus('connecting');
setError(null);
void (async () => { void (async () => {
const accessToken = await acquireAccessToken().catch((error) => { const accessToken = await acquireAccessToken().catch((error) => {
@@ -373,7 +419,11 @@ export function useAuctionSocket(matchId: string | undefined) {
socketRef.current = socket; socketRef.current = socket;
socket.on('connect', () => { socket.on('connect', () => {
setConnectionStatus('connected'); setConnectionState({
key: activeConnectionKey,
status: 'connected',
});
setError(null);
socket.emit('join', { matchId }); socket.emit('join', { matchId });
requestServerTimeSync(socket); requestServerTimeSync(socket);
if (timeSyncIntervalRef.current) { if (timeSyncIntervalRef.current) {
@@ -387,7 +437,10 @@ export function useAuctionSocket(matchId: string | undefined) {
socket.on('disconnect', () => { socket.on('disconnect', () => {
clearTimeSyncTimers(); clearTimeSyncTimers();
setConnectionStatus('disconnected'); setConnectionState({
key: activeConnectionKey,
status: 'disconnected',
});
}); });
socket.on('state', (nextAuction: ApiAuction) => { socket.on('state', (nextAuction: ApiAuction) => {
@@ -520,42 +573,20 @@ export function useAuctionSocket(matchId: string | undefined) {
hasSyncedServerTimeRef.current = false; hasSyncedServerTimeRef.current = false;
setPendingBidRequests({}); setPendingBidRequests({});
setPendingActionRequests({}); setPendingActionRequests({});
setConnectionStatus('idle');
setServerTimeOffsetMs(0); setServerTimeOffsetMs(0);
setServerRoundTripMs(null); setServerRoundTripMs(null);
setBidLatencyDiagnostics(null); setBidLatencyDiagnostics(null);
}; };
}, [authUserId, matchId]); }, [
authUserId,
function clearPendingBidRequest(bidRequestId: string) { clearPendingActionRequests,
const timeoutId = pendingBidTimeoutsRef.current[bidRequestId]; clearPendingBidRequest,
if (timeoutId) clearTimeout(timeoutId); commitAuctionState,
delete pendingBidTimeoutsRef.current[bidRequestId]; commitBidDelta,
setPendingBidRequests((current) => { connectionKey,
const next = { ...current }; matchId,
delete next[bidRequestId]; setError,
return next; ]);
});
}
function clearPendingActionRequest(auctionActionRequestId: string) {
const timeoutId = pendingActionTimeoutsRef.current[auctionActionRequestId];
if (timeoutId) clearTimeout(timeoutId);
delete pendingActionTimeoutsRef.current[auctionActionRequestId];
setPendingActionRequests((current) => {
const next = { ...current };
delete next[auctionActionRequestId];
return next;
});
}
function clearPendingActionRequests() {
Object.values(pendingActionTimeoutsRef.current).forEach((timeoutId) =>
clearTimeout(timeoutId),
);
pendingActionTimeoutsRef.current = {};
setPendingActionRequests({});
}
function emit(eventName: string, payload?: unknown) { function emit(eventName: string, payload?: unknown) {
const socket = socketRef.current; const socket = socketRef.current;
@@ -737,9 +768,16 @@ export function useAuctionSocket(matchId: string | undefined) {
const currentAuction = auction; const currentAuction = auction;
const visibleAuction = const visibleAuction =
currentAuction && currentAuction.matchId === matchId ? currentAuction : null; currentAuction && currentAuction.matchId === matchId ? currentAuction : null;
const visibleConnectionStatus: ConnectionStatus = matchId const visibleConnectionStatus: ConnectionStatus =
? connectionStatus connectionKey === null
: 'idle'; ? 'idle'
: connectionState.key === connectionKey
? connectionState.status
: 'connecting';
const visibleError =
connectionKey !== null && errorState.key === connectionKey
? errorState.message
: null;
return { return {
auction: visibleAuction, auction: visibleAuction,
@@ -750,7 +788,7 @@ export function useAuctionSocket(matchId: string | undefined) {
pendingBidRequests, pendingBidRequests,
resetAt, resetAt,
connectionStatus: visibleConnectionStatus, connectionStatus: visibleConnectionStatus,
error, error: visibleError,
bidLatencyDiagnostics, bidLatencyDiagnostics,
serverRoundTripMs: matchId ? serverRoundTripMs : null, serverRoundTripMs: matchId ? serverRoundTripMs : null,
serverTimeOffsetMs: matchId ? serverTimeOffsetMs : 0, serverTimeOffsetMs: matchId ? serverTimeOffsetMs : 0,
+37 -19
View File
@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from 'react'; import { useEffect, useRef, useState } from 'react';
import { io, type Socket } from 'socket.io-client'; import { io } from 'socket.io-client';
import { API_BASE_URL } from '../config'; import { API_BASE_URL } from '../config';
import type { ApiRiotRefreshEvent } from './types'; import type { ApiRiotRefreshEvent } from './types';
@@ -19,37 +19,43 @@ export function useRiotRefreshSocket({
parentJobId?: string; parentJobId?: string;
onEvent: (event: ApiRiotRefreshEvent) => void; onEvent: (event: ApiRiotRefreshEvent) => void;
}) { }) {
const socketRef = useRef<Socket | null>(null); const subscriptionKey =
puuid || parentJobId ? JSON.stringify([puuid, parentJobId]) : null;
const onEventRef = useRef(onEvent); const onEventRef = useRef(onEvent);
const [connectionStatus, setConnectionStatus] = const [connectionState, setConnectionState] = useState<{
useState<ConnectionStatus>('idle'); key: string;
const [error, setError] = useState<string | null>(null); status: ConnectionStatus;
error: string | null;
}>({ key: '', status: 'idle', error: null });
useEffect(() => { useEffect(() => {
onEventRef.current = onEvent; onEventRef.current = onEvent;
}, [onEvent]); }, [onEvent]);
useEffect(() => { useEffect(() => {
if (!puuid && !parentJobId) { if (!subscriptionKey) {
setConnectionStatus('idle');
return; return;
} }
setConnectionStatus('connecting');
setError(null);
const socket = io(`${API_BASE_URL}/riot-refresh`, { const socket = io(`${API_BASE_URL}/riot-refresh`, {
transports: ['websocket'], transports: ['websocket'],
}); });
socketRef.current = socket;
socket.on('connect', () => { socket.on('connect', () => {
setConnectionStatus('connected'); setConnectionState({
key: subscriptionKey,
status: 'connected',
error: null,
});
socket.emit('subscribe', { puuid, parentJobId }); socket.emit('subscribe', { puuid, parentJobId });
}); });
socket.on('disconnect', () => { socket.on('disconnect', () => {
setConnectionStatus('disconnected'); setConnectionState((current) => ({
key: subscriptionKey,
status: 'disconnected',
error: current.key === subscriptionKey ? current.error : null,
}));
}); });
socket.on('riot-refresh', (event: ApiRiotRefreshEvent) => { socket.on('riot-refresh', (event: ApiRiotRefreshEvent) => {
@@ -57,17 +63,29 @@ export function useRiotRefreshSocket({
}); });
socket.on('error', (payload: { message?: string }) => { socket.on('error', (payload: { message?: string }) => {
setConnectionStatus('error'); setConnectionState({
setError(payload.message ?? '전적 갱신 소켓 연결 중 오류가 발생했습니다.'); key: subscriptionKey,
status: 'error',
error:
payload.message ?? '전적 갱신 소켓 연결 중 오류가 발생했습니다.',
});
}); });
return () => { return () => {
socket.removeAllListeners(); socket.removeAllListeners();
socket.disconnect(); socket.disconnect();
socketRef.current = null;
setConnectionStatus('idle');
}; };
}, [parentJobId, puuid]); }, [parentJobId, puuid, subscriptionKey]);
return { connectionStatus, error }; const hasCurrentConnection =
subscriptionKey !== null && connectionState.key === subscriptionKey;
return {
connectionStatus:
subscriptionKey === null
? 'idle'
: hasCurrentConnection
? connectionState.status
: 'connecting',
error: hasCurrentConnection ? connectionState.error : null,
};
} }
+17 -7
View File
@@ -1,20 +1,30 @@
import { useEffect, useState } from 'react'; import { useState } from 'react';
import { useQueryClient } from '@tanstack/react-query'; import { useQueryClient } from '@tanstack/react-query';
import { setAuthUserId, useAuthUserId } from '../config'; import { setAuthUserId, useAuthUserId } from '../config';
export default function DevAuthSwitcher() { export default function DevAuthSwitcher() {
const authUserId = useAuthUserId(); const authUserId = useAuthUserId();
const queryClient = useQueryClient();
const [inputValue, setInputValue] = useState(authUserId ?? '');
useEffect(() => {
setInputValue(authUserId ?? '');
}, [authUserId]);
if (!import.meta.env.DEV) { if (!import.meta.env.DEV) {
return null; return null;
} }
return (
<DevAuthSwitcherForm
key={authUserId ?? 'no-auth-user'}
authUserId={authUserId}
/>
);
}
function DevAuthSwitcherForm({
authUserId,
}: {
authUserId: string | null;
}) {
const queryClient = useQueryClient();
const [inputValue, setInputValue] = useState(authUserId ?? '');
function updateAuthUserId(nextValue: string | null) { function updateAuthUserId(nextValue: string | null) {
setAuthUserId(nextValue); setAuthUserId(nextValue);
void queryClient.invalidateQueries(); void queryClient.invalidateQueries();
+1 -44
View File
@@ -1,21 +1,9 @@
import type { ApiTierInfo } from "../api/types"; import type { ApiTierInfo } from "../api/types";
import { formatRankBadge, formatRankDetail } from "./rankBadgeUtils";
type RankBadgeSize = "sm" | "md"; type RankBadgeSize = "sm" | "md";
type RankBadgeTooltipPlacement = "left" | "bottom"; type RankBadgeTooltipPlacement = "left" | "bottom";
const TIER_NAMES: Record<string, string> = {
IRON: "아이언",
BRONZE: "브론즈",
SILVER: "실버",
GOLD: "골드",
PLATINUM: "플래티넘",
EMERALD: "에메랄드",
DIAMOND: "다이아몬드",
MASTER: "마스터",
GRANDMASTER: "그랜드마스터",
CHALLENGER: "챌린저",
};
const SIZE_CLASSES: Record<RankBadgeSize, string> = { const SIZE_CLASSES: Record<RankBadgeSize, string> = {
sm: "h-[17px] min-w-[18px]", sm: "h-[17px] min-w-[18px]",
md: "h-[18px] min-w-[20px]", md: "h-[18px] min-w-[20px]",
@@ -26,21 +14,6 @@ const TOOLTIP_CLASSES: Record<RankBadgeTooltipPlacement, string> = {
bottom: "tooltip-bottom", bottom: "tooltip-bottom",
}; };
function normalizeRank(rank: string | undefined) {
switch (rank) {
case "I":
return "1";
case "II":
return "2";
case "III":
return "3";
case "IV":
return "4";
default:
return rank;
}
}
function rankBadgeClass(tier: ApiTierInfo | undefined) { function rankBadgeClass(tier: ApiTierInfo | undefined) {
switch (tier?.tier) { switch (tier?.tier) {
case "CHALLENGER": case "CHALLENGER":
@@ -68,22 +41,6 @@ function rankBadgeClass(tier: ApiTierInfo | undefined) {
} }
} }
export function formatRankBadge(tier: ApiTierInfo | undefined) {
if (!tier) return "U";
const tierInitial =
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
const rank = normalizeRank(tier.rank);
return rank ? `${tierInitial}${rank}` : tierInitial;
}
export function formatRankDetail(tier: ApiTierInfo | undefined) {
if (!tier) return "랭크 정보 없음";
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
const rank = normalizeRank(tier.rank);
const label = rank ? `${tierName} ${rank}` : tierName;
return `${label} - ${tier.leaguePoints} LP`;
}
export function RankBadge({ export function RankBadge({
tier, tier,
size = "md", size = "md",
+21 -9
View File
@@ -67,6 +67,7 @@ const TIER_COMPACT_NAMES: Record<string, string> = {
}; };
type PeriodKey = "30" | "90" | "all"; type PeriodKey = "30" | "90" | "all";
type PeriodFilter = { key: PeriodKey; cutoffTimestamp: number };
type SummaryVariant = "footer" | "inline"; type SummaryVariant = "footer" | "inline";
type SummaryDirection = "up" | "down" | "flat"; type SummaryDirection = "up" | "down" | "flat";
@@ -314,18 +315,17 @@ export default function TierHistoryChart({
const [queue, setQueue] = useState( const [queue, setQueue] = useState(
availableQueues[0] ?? "RANKED_SOLO_5x5", availableQueues[0] ?? "RANKED_SOLO_5x5",
); );
const [period, setPeriod] = useState<PeriodKey>("all"); const [periodFilter, setPeriodFilter] = useState<PeriodFilter>({
key: "all",
cutoffTimestamp: 0,
});
const period = periodFilter.key;
const activeQueue = availableQueues.includes(queue) const activeQueue = availableQueues.includes(queue)
? queue ? queue
: (availableQueues[0] ?? "RANKED_SOLO_5x5"); : (availableQueues[0] ?? "RANKED_SOLO_5x5");
const points = useMemo<ChartPoint[]>(() => { const points = useMemo<ChartPoint[]>(() => {
const periodDays =
PERIOD_OPTIONS.find((option) => option.key === period)?.days ?? null;
const cutoff =
periodDays === null ? 0 : Date.now() - periodDays * 24 * 60 * 60 * 1000;
return entries return entries
.filter((entry) => entry.queueType === activeQueue) .filter((entry) => entry.queueType === activeQueue)
.map((entry) => ({ .map((entry) => ({
@@ -337,9 +337,9 @@ export default function TierHistoryChart({
wins: entry.wins, wins: entry.wins,
losses: entry.losses, losses: entry.losses,
})) }))
.filter((point) => point.ts >= cutoff) .filter((point) => point.ts >= periodFilter.cutoffTimestamp)
.sort((left, right) => left.ts - right.ts); .sort((left, right) => left.ts - right.ts);
}, [entries, activeQueue, period]); }, [entries, activeQueue, periodFilter.cutoffTimestamp]);
// 티어 경계(가로 점선) 후보 — 데이터 범위 안에 드는 티어 floor만. // 티어 경계(가로 점선) 후보 — 데이터 범위 안에 드는 티어 floor만.
const tierLines = useMemo(() => { const tierLines = useMemo(() => {
@@ -408,7 +408,19 @@ export default function TierHistoryChart({
<select <select
className="h-7 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none" className="h-7 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none"
value={period} value={period}
onChange={(event) => setPeriod(event.target.value as PeriodKey)} onChange={(event) => {
const nextPeriod = event.target.value as PeriodKey;
const days =
PERIOD_OPTIONS.find((option) => option.key === nextPeriod)
?.days ?? null;
setPeriodFilter({
key: nextPeriod,
cutoffTimestamp:
days === null
? 0
: Date.now() - days * 24 * 60 * 60 * 1000,
});
}}
> >
{PERIOD_OPTIONS.map((option) => ( {PERIOD_OPTIONS.map((option) => (
<option key={option.key} value={option.key}> <option key={option.key} value={option.key}>
+45
View File
@@ -0,0 +1,45 @@
import type { ApiTierInfo } from "../api/types";
const TIER_NAMES: Record<string, string> = {
IRON: "아이언",
BRONZE: "브론즈",
SILVER: "실버",
GOLD: "골드",
PLATINUM: "플래티넘",
EMERALD: "에메랄드",
DIAMOND: "다이아몬드",
MASTER: "마스터",
GRANDMASTER: "그랜드마스터",
CHALLENGER: "챌린저",
};
function normalizeRank(rank: string | undefined) {
switch (rank) {
case "I":
return "1";
case "II":
return "2";
case "III":
return "3";
case "IV":
return "4";
default:
return rank;
}
}
export function formatRankBadge(tier: ApiTierInfo | undefined) {
if (!tier) return "U";
const tierInitial =
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
const rank = normalizeRank(tier.rank);
return rank ? `${tierInitial}${rank}` : tierInitial;
}
export function formatRankDetail(tier: ApiTierInfo | undefined) {
if (!tier) return "랭크 정보 없음";
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
const rank = normalizeRank(tier.rank);
const label = rank ? `${tierName} ${rank}` : tierName;
return `${label} - ${tier.leaguePoints} LP`;
}
+35 -17
View File
@@ -2,6 +2,7 @@ import {
lazy, lazy,
memo, memo,
Suspense, Suspense,
useCallback,
useEffect, useEffect,
useLayoutEffect, useLayoutEffect,
useMemo, useMemo,
@@ -51,7 +52,8 @@ import {
teamIndexLabel, teamIndexLabel,
} from "../lib/league"; } from "../lib/league";
import { internalMatchGamePath } from "../lib/internal-match-routes"; import { internalMatchGamePath } from "../lib/internal-match-routes";
import { formatRankDetail, RankBadge } from "../components/RankBadge"; import { RankBadge } from "../components/RankBadge";
import { formatRankDetail } from "../components/rankBadgeUtils";
import type { import type {
ApiAuction, ApiAuction,
ApiAuctionChatMessage, ApiAuctionChatMessage,
@@ -1616,7 +1618,6 @@ function BidControls({
serverTimeOffsetMs: number; serverTimeOffsetMs: number;
onBid: (teamIndex: number, amount: number) => void; onBid: (teamIndex: number, amount: number) => void;
}) { }) {
const [bidAmount, setBidAmount] = useState(100);
const minBid = state.currentBid + AUCTION_MIN_BID_POINTS; const minBid = state.currentBid + AUCTION_MIN_BID_POINTS;
const activeTeam = captainRole const activeTeam = captainRole
? state.teams.find((team) => team.teamIndex === captainRole.teamIndex) ? state.teams.find((team) => team.teamIndex === captainRole.teamIndex)
@@ -1627,6 +1628,23 @@ function BidControls({
? getReservedPointsAfterCurrentBid(activeTeam) ? getReservedPointsAfterCurrentBid(activeTeam)
: 0; : 0;
const maxBid = activeTeam ? getMaxBidForTeam(activeTeam) : 0; const maxBid = activeTeam ? getMaxBidForTeam(activeTeam) : 0;
const defaultBidAmount = Math.max(minBid, Math.ceil(minBid / 10) * 10);
const bidContextKey = `${activeTeam?.teamIndex ?? "spectator"}:${maxBid}:${minBid}`;
const [bidDraft, setBidDraft] = useState({
contextKey: bidContextKey,
amount: activeTeam
? Math.min(maxBid, defaultBidAmount)
: defaultBidAmount,
});
const bidAmount =
bidDraft.contextKey === bidContextKey
? bidDraft.amount
: activeTeam
? Math.min(maxBid, defaultBidAmount)
: defaultBidAmount;
const setBidAmount = (amount: number) => {
setBidDraft({ contextKey: bidContextKey, amount });
};
const canAffordNextBid = !isActiveTeamFull && maxBid >= minBid; const canAffordNextBid = !isActiveTeamFull && maxBid >= minBid;
const isBidExpired = useIsDeadlineExpired( const isBidExpired = useIsDeadlineExpired(
state.deadline, state.deadline,
@@ -1637,11 +1655,6 @@ function BidControls({
? Math.min(maxBid, Math.max(minBid, bidAmount)) ? Math.min(maxBid, Math.max(minBid, bidAmount))
: Math.max(minBid, bidAmount); : Math.max(minBid, bidAmount);
useEffect(() => {
const nextBid = Math.max(minBid, Math.ceil(minBid / 10) * 10);
setBidAmount(activeTeam ? Math.min(maxBid, nextBid) : nextBid);
}, [activeTeam, maxBid, minBid]);
if (state.phase !== "bidding") return null; if (state.phase !== "bidding") return null;
if (!activeTeam) { if (!activeTeam) {
@@ -1843,7 +1856,10 @@ export default function AuctionPage() {
const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID); const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID);
const socket = useAuctionSocket(id); const socket = useAuctionSocket(id);
const captainTeamIndex = useDevCaptainTeamIndex(); const captainTeamIndex = useDevCaptainTeamIndex();
const [assignedPosition, setAssignedPosition] = useState<Position>("MID"); const [assignedPositionDraft, setAssignedPositionDraft] = useState<{
playerId: string | null;
position: Position;
}>({ playerId: null, position: "MID" });
const [showCancelModal, setShowCancelModal] = useState(false); const [showCancelModal, setShowCancelModal] = useState(false);
const [cancelConfirmText, setCancelConfirmText] = useState(""); const [cancelConfirmText, setCancelConfirmText] = useState("");
const [undoTargetSequence, setUndoTargetSequence] = useState<number | null>( const [undoTargetSequence, setUndoTargetSequence] = useState<number | null>(
@@ -1853,7 +1869,7 @@ export default function AuctionPage() {
const historyBackTo = `${location.pathname}${location.search}${location.hash}`; const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
const canConfirmAuctionCancel = cancelConfirmText.trim() === "예"; const canConfirmAuctionCancel = cancelConfirmText.trim() === "예";
async function clearAuctionDataAfterCancel() { const clearAuctionDataAfterCancel = useCallback(async () => {
if (!id) return; if (!id) return;
const auctionQueryKey = ["auction", DEFAULT_COMMUNITY_ID, id] as const; const auctionQueryKey = ["auction", DEFAULT_COMMUNITY_ID, id] as const;
const auctionHistoryQueryKey = [ const auctionHistoryQueryKey = [
@@ -1878,7 +1894,7 @@ export default function AuctionPage() {
queryKey: ["match", DEFAULT_COMMUNITY_ID, id], queryKey: ["match", DEFAULT_COMMUNITY_ID, id],
exact: true, exact: true,
}); });
} }, [id, queryClient]);
useEffect(() => { useEffect(() => {
if (!showCancelModal) return; if (!showCancelModal) return;
@@ -1893,6 +1909,14 @@ export default function AuctionPage() {
: null, : null,
[liveAuction, matchQuery.data], [liveAuction, matchQuery.data],
); );
const currentPlayerId = auctionState?.currentPlayer?.id ?? null;
const assignedPosition =
assignedPositionDraft.playerId === currentPlayerId
? assignedPositionDraft.position
: (auctionState?.currentPlayer?.mainPosition ?? "MID");
const setAssignedPosition = (position: Position) => {
setAssignedPositionDraft({ playerId: currentPlayerId, position });
};
const availableTeamIndexes = useMemo(() => { const availableTeamIndexes = useMemo(() => {
const indexes = new Set( const indexes = new Set(
(auctionState?.teams ?? []).map((team) => team.teamIndex), (auctionState?.teams ?? []).map((team) => team.teamIndex),
@@ -1907,12 +1931,6 @@ export default function AuctionPage() {
}; };
const chatSenderLabel = resolveChatSenderLabel(currentUser, captainRole); const chatSenderLabel = resolveChatSenderLabel(currentUser, captainRole);
useEffect(() => {
if (auctionState?.currentPlayer) {
setAssignedPosition(auctionState.currentPlayer.mainPosition);
}
}, [auctionState?.currentPlayer?.id]);
useEffect(() => { useEffect(() => {
if (availableTeamIndexes.length === 0) return; if (availableTeamIndexes.length === 0) return;
if ( if (
@@ -1928,7 +1946,7 @@ export default function AuctionPage() {
void clearAuctionDataAfterCancel().finally(() => { void clearAuctionDataAfterCancel().finally(() => {
navigate(`/match/${id}`, { replace: true }); navigate(`/match/${id}`, { replace: true });
}); });
}, [id, navigate, socket.resetAt]); }, [clearAuctionDataAfterCancel, id, navigate, socket.resetAt]);
if (!DEFAULT_COMMUNITY_ID) { if (!DEFAULT_COMMUNITY_ID) {
return ( return (
+54 -34
View File
@@ -1,4 +1,4 @@
import { useEffect, useMemo, useState } from 'react'; import { useMemo, useState } from 'react';
import { useQueryClient } from '@tanstack/react-query'; import { useQueryClient } from '@tanstack/react-query';
import { Link, useParams } from 'react-router'; import { Link, useParams } from 'react-router';
import { import {
@@ -8,11 +8,17 @@ import {
useMe, useMe,
useStartLegacyImport, useStartLegacyImport,
} from '../../api/hooks'; } from '../../api/hooks';
import type { LegacyImportJob, StartLegacyImportRequest } from '../../api/types'; import type {
LegacyImportJob,
LegacyImportMemberWindow,
StartLegacyImportRequest,
} from '../../api/types';
import { DEFAULT_COMMUNITY_ID } from '../../config'; import { DEFAULT_COMMUNITY_ID } from '../../config';
const DEFAULT_START = '2024-05-01T00:00:00.000Z'; const DEFAULT_START = '2024-05-01T00:00:00.000Z';
type MemberWindowOverride = { startTime: string; endTime: string };
function toInputValue(value: string) { function toInputValue(value: string) {
const date = new Date(value); const date = new Date(value);
const local = new Date(date.getTime() - date.getTimezoneOffset() * 60_000); const local = new Date(date.getTime() - date.getTimezoneOffset() * 60_000);
@@ -44,6 +50,15 @@ function progress(job: LegacyImportJob) {
return Math.round((job.processedMembers / job.totalMembers) * 100); return Math.round((job.processedMembers / job.totalMembers) * 100);
} }
function defaultMemberOverride(
member: LegacyImportMemberWindow,
): MemberWindowOverride {
return {
startTime: toInputValue(member.startTime),
endTime: toInputValue(member.endTime),
};
}
function JobCard({ function JobCard({
job, job,
onCancel, onCancel,
@@ -111,7 +126,7 @@ export default function LegacyImportPage() {
const [windowEnd, setWindowEnd] = useState(''); const [windowEnd, setWindowEnd] = useState('');
const [message, setMessage] = useState<string | null>(null); const [message, setMessage] = useState<string | null>(null);
const [overrides, setOverrides] = useState< const [overrides, setOverrides] = useState<
Record<string, { startTime: string; endTime: string }> Record<string, MemberWindowOverride>
>({}); >({});
const currentUser = const currentUser =
meQuery.data?.memberships.find( meQuery.data?.memberships.find(
@@ -131,20 +146,6 @@ export default function LegacyImportPage() {
const cancelMutation = useCancelLegacyImport(communityId); const cancelMutation = useCancelLegacyImport(communityId);
const members = membersQuery.data?.members ?? []; const members = membersQuery.data?.members ?? [];
useEffect(() => {
setOverrides(
Object.fromEntries(
members.map((member) => [
member.userId,
{
startTime: toInputValue(member.startTime),
endTime: toInputValue(member.endTime),
},
]),
),
);
}, [members]);
const manageableMemberships = const manageableMemberships =
meQuery.data?.memberships.filter((membership) => { meQuery.data?.memberships.filter((membership) => {
const role = membership.user.role; const role = membership.user.role;
@@ -180,11 +181,15 @@ export default function LegacyImportPage() {
const payload: StartLegacyImportRequest = { const payload: StartLegacyImportRequest = {
windowStart: fromInputValue(windowStart), windowStart: fromInputValue(windowStart),
windowEnd: fromInputValue(windowEnd), windowEnd: fromInputValue(windowEnd),
memberOverrides: members.map((member) => ({ memberOverrides: members.map((member) => {
const override =
overrides[member.userId] ?? defaultMemberOverride(member);
return {
userId: member.userId, userId: member.userId,
startTime: fromInputValue(overrides[member.userId]?.startTime ?? ''), startTime: fromInputValue(override.startTime),
endTime: fromInputValue(overrides[member.userId]?.endTime ?? ''), endTime: fromInputValue(override.endTime),
})), };
}),
}; };
startMutation.mutate(payload, { startMutation.mutate(payload, {
onSuccess: async (result) => { onSuccess: async (result) => {
@@ -323,8 +328,14 @@ export default function LegacyImportPage() {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{members.map((member) => ( {members.map((member) => {
<tr key={member.userId} className="border-b border-base-content/5"> const override =
overrides[member.userId] ?? defaultMemberOverride(member);
return (
<tr
key={member.userId}
className="border-b border-base-content/5"
>
<td className="px-3 py-2 text-sm font-bold"> <td className="px-3 py-2 text-sm font-bold">
{member.displayName} {member.displayName}
</td> </td>
@@ -337,16 +348,20 @@ export default function LegacyImportPage() {
<td className="px-3 py-2"> <td className="px-3 py-2">
<input <input
type="datetime-local" type="datetime-local"
value={overrides[member.userId]?.startTime ?? ''} value={override.startTime}
onChange={(event) => onChange={(event) =>
setOverrides((current) => ({ setOverrides((current) => {
const currentOverride =
current[member.userId] ??
defaultMemberOverride(member);
return {
...current, ...current,
[member.userId]: { [member.userId]: {
...current[member.userId], ...currentOverride,
startTime: event.target.value, startTime: event.target.value,
endTime: current[member.userId]?.endTime ?? '',
}, },
})) };
})
} }
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs" className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
/> />
@@ -354,22 +369,27 @@ export default function LegacyImportPage() {
<td className="px-3 py-2"> <td className="px-3 py-2">
<input <input
type="datetime-local" type="datetime-local"
value={overrides[member.userId]?.endTime ?? ''} value={override.endTime}
onChange={(event) => onChange={(event) =>
setOverrides((current) => ({ setOverrides((current) => {
const currentOverride =
current[member.userId] ??
defaultMemberOverride(member);
return {
...current, ...current,
[member.userId]: { [member.userId]: {
...current[member.userId], ...currentOverride,
startTime: current[member.userId]?.startTime ?? '',
endTime: event.target.value, endTime: event.target.value,
}, },
})) };
})
} }
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs" className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
/> />
</td> </td>
</tr> </tr>
))} );
})}
{members.length === 0 && ( {members.length === 0 && (
<tr> <tr>
<td colSpan={5} className="px-4 py-8 text-center text-sm text-base-content/35"> <td colSpan={5} className="px-4 py-8 text-center text-sm text-base-content/35">
+32
View File
@@ -0,0 +1,32 @@
# Dependency Audit Exceptions
## GHSA-mh99-v99m-4gvg
- Package: `brace-expansion`
- Scope: development tooling only (`eslint`, `jest`, and `@nestjs/cli` through
`minimatch`/`glob`)
- Production exposure: none; `pnpm audit --prod --audit-level high` reports no
high or critical findings
- Reason: the only patched release is `brace-expansion@5.0.8`, whose CommonJS
API is incompatible with the affected `minimatch@3` and `minimatch@9`
consumers
- Mitigation: repository-controlled glob patterns are trusted; no
attacker-controlled input is passed to these development tools
- Review date: 2026-08-25
- Removal condition: remove the audit exception once the upstream toolchain
supports `brace-expansion@5.0.8` or publishes compatible patched releases
## Tracked remediation
### GHSA-664h-wqgq-64gw
- Package: `mongoose@9.4.1`
- Severity: moderate
- Patched version: `>=9.7.2`
- Status: not ignored; it remains visible in a full audit and does not fail the
high-severity CI gate
- Upgrade blocker: Mongoose 9.7.x tightens create and query types and currently
causes API compilation failures across the model layer
- Next action: migrate the affected model create/query types, then upgrade
Mongoose in a dedicated change
- Review date: 2026-08-25
+67
View File
@@ -0,0 +1,67 @@
# Spec: Dakao Upcoming Internal Match List
## Objective
When a user sends `!내전 일정`, return only recruiting matches whose scheduled
start is not earlier than the command processing time. Matches that have already
started must not consume the ten-result query limit or appear in the response.
## Approved Product Decisions
- Capture the command processing time once before querying matches.
- Exclude `scheduledAt < now`.
- Include `scheduledAt === now` and future matches.
- Apply the boundary only to the Dakao `!내전 일정` command.
- Preserve the existing recruiting status, result limit, ordering, formatting,
short-code generation, and short-link behavior.
## Commands
- Focused test:
`pnpm --filter api exec jest src/modules/dakao/handlers/match-list.handler.spec.ts --runInBand`
- API lint:
`pnpm --filter api exec eslint "{src,apps,libs,test}/**/*.ts" --max-warnings=0`
- API build: `pnpm --filter api build`
## Project Structure
- `apps/api/src/modules/dakao/handlers/match-list.handler.ts` owns the command
query and response formatting.
- `apps/api/src/modules/dakao/handlers/match-list.handler.spec.ts` verifies the
command boundary and presentation.
- `apps/api/src/modules/match/match.service.ts` translates `scheduledFrom` into a
MongoDB `$gte` filter.
## Code Style
Pass the captured boundary through the existing list contract:
```ts
const scheduledFrom = new Date();
await matchService.list({ communityId, scheduledFrom });
```
## Testing Strategy
- Freeze the system clock in the handler unit test.
- Assert that the exact frozen time is passed as `scheduledFrom`.
- Rely on the existing `MatchService` test that verifies `scheduledFrom` becomes
`{ scheduledAt: { $gte: scheduledFrom } }`.
- Run the focused handler test, full API lint, and API build.
## Boundaries
- Always: filter before applying the result limit and use one captured time.
- Ask first: change ordering, statuses, limit, or response wording.
- Never: hide the requirement with an ESLint exception or filter only after the
limited database query.
## Success Criteria
- A match scheduled before command processing time is not queried.
- A match scheduled exactly at command processing time remains eligible.
- Existing command formatting and link tests continue to pass.
## Open Questions
None.
+21 -1
View File
@@ -26,6 +26,26 @@
}, },
"packageManager": "pnpm@10.4.1", "packageManager": "pnpm@10.4.1",
"dependencies": { "dependencies": {
"@infisical/sdk": "^5.0.0" "@infisical/sdk": "^5.0.2"
},
"pnpm": {
"auditConfig": {
"ignoreGhsas": [
"GHSA-mh99-v99m-4gvg"
]
},
"overrides": {
"@babel/core@7.29.0": "7.29.6",
"brace-expansion@1.1.13": "1.1.16",
"brace-expansion@2.0.3": "2.1.2",
"brace-expansion@5.0.5": "5.0.8",
"engine.io@6.6.6": "6.6.7",
"fast-uri@3.1.0": "3.1.4",
"form-data@4.0.5": "4.0.6",
"js-yaml@4.1.1": "4.3.0",
"js-yaml@5.2.1": "5.2.2",
"qs@6.15.1": "6.15.2",
"ws@8.18.3": "8.21.0"
}
} }
} }
+1662 -1630
View File
File diff suppressed because it is too large. Load diff