Compare commits
25
Commits
release/67
...
release/73
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6697cd8ea1 | ||
|
|
c435e8a6a5 | ||
|
|
15ae680ec7 | ||
|
|
bdea0287a5 | ||
|
|
b56728f843 | ||
|
|
7f2b34fd4b | ||
|
|
146349beb8 | ||
|
|
326e0c66b6 | ||
|
|
edfb960e97 | ||
|
|
b2d438785b | ||
|
|
b6dad78d02 | ||
|
|
42d4854f9c | ||
|
|
e9081d77c9 | ||
|
|
181beb85e5 | ||
|
|
ebca348723 | ||
|
|
de8bc87940 | ||
|
|
25f3ccad57 | ||
|
|
55ab5b27dc | ||
|
|
1c0af891fa | ||
|
|
528744ebf6 | ||
|
|
bd52160d91 | ||
|
|
c3a3eb46dd | ||
|
|
be5383a2e9 | ||
|
|
ef693fcf4a | ||
|
|
8a9dd37755 |
No files matched your search
+1
-1
@@ -1 +1 @@
|
|||||||
66
|
68
|
||||||
@@ -103,6 +103,12 @@ git push origin main:release/66
|
|||||||
pnpm deploy:web:staging
|
pnpm deploy:web:staging
|
||||||
```
|
```
|
||||||
|
|
||||||
staging Pages 배포 스크립트는 `CF_PAGES_STAGING_BRANCH`가 있으면 그 값을
|
staging/prod Pages 배포 스크립트는 명시 릴리즈 브랜치 환경변수가 있으면 그
|
||||||
사용하고, 없으면 최신 `release/*` 브랜치를 자동으로 선택합니다. 최신 기준은
|
값을 사용하고, 없으면 최신 `release/*` 브랜치를 자동으로 선택합니다. 최신
|
||||||
브랜치가 가리키는 커밋 시각이며, 동률이면 브랜치명 내림차순입니다.
|
기준은 브랜치가 가리키는 커밋 시각이며, 동률이면 브랜치명 내림차순입니다.
|
||||||
|
staging은 선택된 릴리즈 브랜치로 preview 배포를 만들고, prod는 Cloudflare
|
||||||
|
Pages production branch로 업로드해 production 배포를 만듭니다.
|
||||||
|
|
||||||
|
명시 릴리즈 브랜치는 staging은 `CF_PAGES_STAGING_BRANCH`, prod는
|
||||||
|
`CF_PAGES_RELEASE_BRANCH`로 지정합니다. Cloudflare Pages production branch가
|
||||||
|
`main`이 아니면 `CF_PAGES_PRODUCTION_BRANCH`로 지정합니다.
|
||||||
+2
-2
@@ -27,8 +27,8 @@
|
|||||||
|
|
||||||
## Riot Background Refresh
|
## Riot Background Refresh
|
||||||
|
|
||||||
Set `RIOT_BG_REFRESH_ENABLED=true` to refresh stale Riot accounts automatically
|
Stale Riot accounts refresh automatically between KST 03:00 and 10:00.
|
||||||
between KST 03:00 and 10:00. The scheduler picks active users whose
|
The scheduler picks active users whose
|
||||||
`lastRefreshRequestedAt` is older than 6 hours, oldest first, and uses a
|
`lastRefreshRequestedAt` is older than 6 hours, oldest first, and uses a
|
||||||
background-only Riot token bucket capped at roughly 40% of the app rate limit.
|
background-only Riot token bucket capped at roughly 40% of the app rate limit.
|
||||||
|
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ export class AuctionController {
|
|||||||
) {
|
) {
|
||||||
this.assertSameCommunity(currentUser, communityId);
|
this.assertSameCommunity(currentUser, communityId);
|
||||||
await this.auctionService.reset({ matchId, communityId });
|
await this.auctionService.reset({ matchId, communityId });
|
||||||
|
this.auctionGateway.broadcastReset(matchId.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private resolveBidder(
|
private resolveBidder(
|
||||||
|
|||||||
@@ -364,6 +364,11 @@ export class AuctionGateway
|
|||||||
this.syncRoomTimer(matchId, auction);
|
this.syncRoomTimer(matchId, auction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public broadcastReset(matchId: string) {
|
||||||
|
this.clearRoomTimer(matchId);
|
||||||
|
this.server.to(matchId).emit('reset', { matchId });
|
||||||
|
}
|
||||||
|
|
||||||
private emitChatHistory(socket: Socket, auction: AuctionDocument) {
|
private emitChatHistory(socket: Socket, auction: AuctionDocument) {
|
||||||
socket.emit('chat-history', {
|
socket.emit('chat-history', {
|
||||||
messages: (auction.chatMessages ?? []).map((message) =>
|
messages: (auction.chatMessages ?? []).map((message) =>
|
||||||
|
|||||||
@@ -322,6 +322,119 @@ describe('AuctionService', () => {
|
|||||||
expect(randomSpy).toHaveBeenCalled();
|
expect(randomSpy).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('includes tier history in auction player snapshots when starting an auction', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const userIds = Array.from(
|
||||||
|
{ length: 10 },
|
||||||
|
() => new mongoose.Types.ObjectId(),
|
||||||
|
);
|
||||||
|
const participants = userIds.map((userId, index) => ({
|
||||||
|
userId,
|
||||||
|
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||||
|
joinedAt: new Date(index),
|
||||||
|
excluded: false,
|
||||||
|
}));
|
||||||
|
const match = {
|
||||||
|
_id: matchId,
|
||||||
|
communityId,
|
||||||
|
participants,
|
||||||
|
status: 'recruiting',
|
||||||
|
teamBuiltAt: undefined,
|
||||||
|
save: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
const tierHistory = [
|
||||||
|
{
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'GOLD',
|
||||||
|
rank: 'II',
|
||||||
|
leaguePoints: 42,
|
||||||
|
wins: 30,
|
||||||
|
losses: 24,
|
||||||
|
recordedAt: new Date('2026-05-01T00:00:00.000Z'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'PLATINUM',
|
||||||
|
rank: 'IV',
|
||||||
|
leaguePoints: 15,
|
||||||
|
wins: 34,
|
||||||
|
losses: 27,
|
||||||
|
recordedAt: new Date('2026-05-08T00:00:00.000Z'),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
const users = userIds.slice(2).map((userId, index) => ({
|
||||||
|
_id: userId,
|
||||||
|
riotAccounts: [
|
||||||
|
{
|
||||||
|
puuid: `puuid-${index}`,
|
||||||
|
gameName: `Player${index}`,
|
||||||
|
tagLine: 'KR1',
|
||||||
|
profileIconId: index,
|
||||||
|
tiers: [],
|
||||||
|
tierHistory: index === 0 ? tierHistory : [],
|
||||||
|
championMasteries: [],
|
||||||
|
recentStatsSummary: undefined,
|
||||||
|
lastRefreshRequestedAt: new Date(),
|
||||||
|
isPrimary: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}));
|
||||||
|
const auctionCreate = jest.fn().mockImplementation(async (payload) => ({
|
||||||
|
_id: new mongoose.Types.ObjectId(),
|
||||||
|
matchId,
|
||||||
|
toObject: jest.fn().mockReturnValue({ matchId, ...payload }),
|
||||||
|
}));
|
||||||
|
const { service } = createService({
|
||||||
|
match: {
|
||||||
|
findById: jest.fn().mockResolvedValue(match),
|
||||||
|
},
|
||||||
|
user: {
|
||||||
|
find: jest.fn().mockResolvedValue(users),
|
||||||
|
},
|
||||||
|
auction: {
|
||||||
|
findOne: jest.fn().mockResolvedValue(null),
|
||||||
|
create: auctionCreate,
|
||||||
|
},
|
||||||
|
community: {
|
||||||
|
findById: jest.fn().mockReturnValue({
|
||||||
|
select: jest.fn().mockReturnValue({
|
||||||
|
lean: jest.fn().mockReturnValue({
|
||||||
|
exec: jest.fn().mockResolvedValue({
|
||||||
|
riotPlatform: 'kr',
|
||||||
|
riotRegion: 'asia',
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await service.start({
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
captains: [
|
||||||
|
{ teamIndex: 1, userId: userIds[0] },
|
||||||
|
{ teamIndex: 2, userId: userIds[1] },
|
||||||
|
],
|
||||||
|
initialPoints: 1000,
|
||||||
|
maxTimerSeconds: 30,
|
||||||
|
bidExtensionSeconds: 5,
|
||||||
|
topTierThreshold: 'NONE',
|
||||||
|
manualTopTierUserIds: [],
|
||||||
|
});
|
||||||
|
|
||||||
|
const firstPlayerSnapshot = auctionCreate.mock.calls[0][0].order.find(
|
||||||
|
(player: { userId: mongoose.Types.ObjectId }) =>
|
||||||
|
player.userId.equals(userIds[2]),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(firstPlayerSnapshot).toMatchObject({
|
||||||
|
userId: userIds[2],
|
||||||
|
tierHistory,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('rejects bids when the team already has 5 members including captain', async () => {
|
it('rejects bids when the team already has 5 members including captain', async () => {
|
||||||
const matchId = new mongoose.Types.ObjectId();
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
const auction = {
|
const auction = {
|
||||||
|
|||||||
@@ -174,6 +174,7 @@ export class AuctionService {
|
|||||||
profileIconId: primary.profileIconId,
|
profileIconId: primary.profileIconId,
|
||||||
preferredPositions: participant.preferredPositions,
|
preferredPositions: participant.preferredPositions,
|
||||||
tiers: primary.tiers,
|
tiers: primary.tiers,
|
||||||
|
tierHistory: primary.tierHistory ?? [],
|
||||||
masteries: primary.championMasteries,
|
masteries: primary.championMasteries,
|
||||||
recentStatsSummary: primary.recentStatsSummary,
|
recentStatsSummary: primary.recentStatsSummary,
|
||||||
passCount: 0,
|
passCount: 0,
|
||||||
@@ -919,6 +920,7 @@ export class AuctionService {
|
|||||||
'order.$.tagLine': account.tagLine,
|
'order.$.tagLine': account.tagLine,
|
||||||
'order.$.profileIconId': account.profileIconId,
|
'order.$.profileIconId': account.profileIconId,
|
||||||
'order.$.tiers': account.tiers,
|
'order.$.tiers': account.tiers,
|
||||||
|
'order.$.tierHistory': account.tierHistory ?? [],
|
||||||
'order.$.masteries': account.championMasteries,
|
'order.$.masteries': account.championMasteries,
|
||||||
'order.$.recentStatsSummary': account.recentStatsSummary,
|
'order.$.recentStatsSummary': account.recentStatsSummary,
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ function makeQuery<T>(value: T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function makeService(params: {
|
function makeService(params: {
|
||||||
user: Partial<UserDocument>;
|
user: Partial<UserDocument> | null;
|
||||||
community?: Record<string, unknown> | null;
|
community?: Record<string, unknown> | null;
|
||||||
riotAccountService?: Partial<RiotAccountService>;
|
riotAccountService?: Partial<RiotAccountService>;
|
||||||
enrichmentService?: Partial<RiotAccountEnrichmentService>;
|
enrichmentService?: Partial<RiotAccountEnrichmentService>;
|
||||||
@@ -22,6 +22,7 @@ function makeService(params: {
|
|||||||
const findOneAndUpdate = jest
|
const findOneAndUpdate = jest
|
||||||
.fn()
|
.fn()
|
||||||
.mockReturnValue(makeQuery(params.user as UserDocument));
|
.mockReturnValue(makeQuery(params.user as UserDocument));
|
||||||
|
const findOne = jest.fn().mockReturnValue(makeQuery(params.user));
|
||||||
const findById = jest.fn().mockReturnValue({
|
const findById = jest.fn().mockReturnValue({
|
||||||
select: jest.fn().mockReturnValue({
|
select: jest.fn().mockReturnValue({
|
||||||
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
|
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
|
||||||
@@ -29,7 +30,7 @@ function makeService(params: {
|
|||||||
});
|
});
|
||||||
const connectionService = {
|
const connectionService = {
|
||||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
if (name === 'user') return { findOneAndUpdate };
|
if (name === 'user') return { findOneAndUpdate, findOne };
|
||||||
if (name === 'community') return { findById };
|
if (name === 'community') return { findById };
|
||||||
throw new Error(`Unexpected model: ${name}`);
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
}),
|
}),
|
||||||
@@ -51,6 +52,7 @@ function makeService(params: {
|
|||||||
),
|
),
|
||||||
connectionService,
|
connectionService,
|
||||||
findOneAndUpdate,
|
findOneAndUpdate,
|
||||||
|
findOne,
|
||||||
findById,
|
findById,
|
||||||
riotAccountService,
|
riotAccountService,
|
||||||
enrichmentService,
|
enrichmentService,
|
||||||
@@ -168,4 +170,78 @@ describe('DakaoUserService', () => {
|
|||||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||||
expect(save).toHaveBeenCalled();
|
expect(save).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('changes the primary Riot account for the Dakao user', async () => {
|
||||||
|
const save = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const oldPrimary = {
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
gameName: '기존소환사',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: true,
|
||||||
|
} as RiotAccount;
|
||||||
|
const nextPrimary = {
|
||||||
|
puuid: 'puuid-2',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: false,
|
||||||
|
} as RiotAccount;
|
||||||
|
const { service, findOne } = makeService({
|
||||||
|
user: {
|
||||||
|
_id: objectId('222222222222222222222222'),
|
||||||
|
kakaoTalkNickname: '이전닉',
|
||||||
|
riotAccounts: [oldPrimary, nextPrimary],
|
||||||
|
save,
|
||||||
|
} as Partial<UserDocument>,
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await service.changePrimaryRiotAccount({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(findOne).toHaveBeenCalledWith({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
});
|
||||||
|
expect(oldPrimary.isPrimary).toBe(false);
|
||||||
|
expect(nextPrimary.isPrimary).toBe(true);
|
||||||
|
expect(result.riotAccount).toBe(nextPrimary);
|
||||||
|
expect(result.user.kakaoTalkNickname).toBe('프리리');
|
||||||
|
expect(save).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects primary account changes for unregistered Riot accounts', async () => {
|
||||||
|
const save = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const { service } = makeService({
|
||||||
|
user: {
|
||||||
|
_id: objectId('222222222222222222222222'),
|
||||||
|
riotAccounts: [
|
||||||
|
{
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
gameName: '기존소환사',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
save,
|
||||||
|
} as Partial<UserDocument>,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.changePrimaryRiotAccount({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
}),
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
code: 'riot_account_not_found',
|
||||||
|
detail: '프리리#KR1',
|
||||||
|
});
|
||||||
|
expect(save).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -230,6 +230,43 @@ export class DakaoUserService {
|
|||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async changePrimaryRiotAccount(
|
||||||
|
context: ResolveContext,
|
||||||
|
): Promise<ResolveResult> {
|
||||||
|
const requestedGameName = normalizeRiotIdPart(context.gameName);
|
||||||
|
const requestedTagLine = normalizeRiotIdPart(context.tagLine);
|
||||||
|
const detail = `${requestedGameName}#${requestedTagLine}`;
|
||||||
|
|
||||||
|
const user = await this.findUserByKakaoTalkId({
|
||||||
|
communityId: context.communityId,
|
||||||
|
kakaoTalkId: context.kakaoTalkId,
|
||||||
|
});
|
||||||
|
if (!user) {
|
||||||
|
throw new DakaoUserError('riot_account_not_found', detail);
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = user.riotAccounts.find(
|
||||||
|
(account) =>
|
||||||
|
normalizeRiotIdPart(account.gameName).toLowerCase() ===
|
||||||
|
requestedGameName.toLowerCase() &&
|
||||||
|
normalizeRiotIdPart(account.tagLine).toLowerCase() ===
|
||||||
|
requestedTagLine.toLowerCase(),
|
||||||
|
);
|
||||||
|
if (!target) {
|
||||||
|
throw new DakaoUserError('riot_account_not_found', detail);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (context.kakaoTalkNickname.trim()) {
|
||||||
|
user.kakaoTalkNickname = context.kakaoTalkNickname;
|
||||||
|
}
|
||||||
|
for (const account of user.riotAccounts) {
|
||||||
|
account.isPrimary = account.puuid === target.puuid;
|
||||||
|
}
|
||||||
|
await user.save();
|
||||||
|
|
||||||
|
return { user, riotAccount: target };
|
||||||
|
}
|
||||||
|
|
||||||
private toPositionPreferences(positions: Position[]): PositionPreference[] {
|
private toPositionPreferences(positions: Position[]): PositionPreference[] {
|
||||||
return positions.map((position, index) => ({
|
return positions.map((position, index) => ({
|
||||||
position,
|
position,
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
|||||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||||
import { MatchListHandler } from './handlers/match-list.handler';
|
import { MatchListHandler } from './handlers/match-list.handler';
|
||||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||||
|
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [RiotModule, MatchModule],
|
imports: [RiotModule, MatchModule],
|
||||||
@@ -36,6 +37,7 @@ import { PreferredPositionRegisterHandler } from './handlers/preferred-position-
|
|||||||
MatchJoinHandler,
|
MatchJoinHandler,
|
||||||
MatchCancelHandler,
|
MatchCancelHandler,
|
||||||
PreferredPositionRegisterHandler,
|
PreferredPositionRegisterHandler,
|
||||||
|
PrimaryAccountChangeHandler,
|
||||||
],
|
],
|
||||||
exports: [DakaoPublisher],
|
exports: [DakaoPublisher],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
|||||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||||
import { MatchListHandler } from './handlers/match-list.handler';
|
import { MatchListHandler } from './handlers/match-list.handler';
|
||||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||||
|
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||||
import { DakaoInboxService } from './dakao-inbox.service';
|
import { DakaoInboxService } from './dakao-inbox.service';
|
||||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||||
@@ -33,6 +34,7 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
private readonly matchJoinHandler: MatchJoinHandler,
|
private readonly matchJoinHandler: MatchJoinHandler,
|
||||||
private readonly matchCancelHandler: MatchCancelHandler,
|
private readonly matchCancelHandler: MatchCancelHandler,
|
||||||
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
|
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
|
||||||
|
private readonly primaryAccountChangeHandler: PrimaryAccountChangeHandler,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async onModuleInit() {
|
async onModuleInit() {
|
||||||
@@ -126,6 +128,15 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
tagLine: command.tagLine,
|
tagLine: command.tagLine,
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
case 'primary-account-change':
|
||||||
|
segments = await this.primaryAccountChangeHandler.handle({
|
||||||
|
communityId,
|
||||||
|
senderUserId: event.userId,
|
||||||
|
senderNickname,
|
||||||
|
gameName: command.gameName,
|
||||||
|
tagLine: command.tagLine,
|
||||||
|
});
|
||||||
|
break;
|
||||||
case 'match-join':
|
case 'match-join':
|
||||||
segments = await this.matchJoinHandler.handle({
|
segments = await this.matchJoinHandler.handle({
|
||||||
communityId,
|
communityId,
|
||||||
@@ -256,9 +267,9 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
const text = ((): string => {
|
const text = ((): string => {
|
||||||
switch (err.code) {
|
switch (err.code) {
|
||||||
case 'unknown_command':
|
case 'unknown_command':
|
||||||
return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 대표계정변경 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
||||||
case 'usage':
|
case 'usage':
|
||||||
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 대표계정변경 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
||||||
case 'invalid_match_id':
|
case 'invalid_match_id':
|
||||||
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
||||||
case 'invalid_riot_id':
|
case 'invalid_riot_id':
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export class MatchListHandler {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`,
|
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n대표계정변경: !내전 대표계정변경 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||||
|
import { PrimaryAccountChangeHandler } from './primary-account-change.handler';
|
||||||
|
|
||||||
|
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||||
|
|
||||||
|
function makeHandler(dakaoUserService?: Partial<DakaoUserService>) {
|
||||||
|
return new PrimaryAccountChangeHandler({
|
||||||
|
changePrimaryRiotAccount: jest.fn(),
|
||||||
|
...dakaoUserService,
|
||||||
|
} as unknown as DakaoUserService);
|
||||||
|
}
|
||||||
|
|
||||||
|
const baseParams = {
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
senderUserId: 'kakao-user-1',
|
||||||
|
senderNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('PrimaryAccountChangeHandler', () => {
|
||||||
|
it('changes the primary Riot account through DakaoUserService', async () => {
|
||||||
|
const changePrimaryRiotAccount = jest.fn().mockResolvedValue({
|
||||||
|
user: { _id: objectId('222222222222222222222222') },
|
||||||
|
riotAccount: { gameName: '프리리', tagLine: 'KR1' },
|
||||||
|
});
|
||||||
|
const handler = makeHandler({
|
||||||
|
changePrimaryRiotAccount,
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = await handler.handle(baseParams);
|
||||||
|
|
||||||
|
expect(changePrimaryRiotAccount).toHaveBeenCalledWith({
|
||||||
|
communityId: baseParams.communityId,
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
expect(segments).toEqual([
|
||||||
|
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('대표 계정 변경 완료'),
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('대표 계정: 프리리#KR1'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('asks users to register the Riot account first when not found', async () => {
|
||||||
|
const handler = makeHandler({
|
||||||
|
changePrimaryRiotAccount: jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValue(
|
||||||
|
new DakaoUserError('riot_account_not_found', '프리리#KR1'),
|
||||||
|
),
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = await handler.handle(baseParams);
|
||||||
|
|
||||||
|
expect(segments).toEqual([
|
||||||
|
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('먼저 !내전 계정등록'),
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { DakaoSegment } from '../dakao.types';
|
||||||
|
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||||
|
|
||||||
|
interface PrimaryAccountChangeHandlerParams {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
senderUserId: string;
|
||||||
|
senderNickname: string;
|
||||||
|
gameName: string;
|
||||||
|
tagLine: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class PrimaryAccountChangeHandler {
|
||||||
|
constructor(private readonly dakaoUserService: DakaoUserService) {}
|
||||||
|
|
||||||
|
public async handle(
|
||||||
|
params: PrimaryAccountChangeHandlerParams,
|
||||||
|
): Promise<DakaoSegment[]> {
|
||||||
|
try {
|
||||||
|
const resolved = await this.dakaoUserService.changePrimaryRiotAccount({
|
||||||
|
communityId: params.communityId,
|
||||||
|
kakaoTalkId: params.senderUserId,
|
||||||
|
kakaoTalkNickname: params.senderNickname,
|
||||||
|
gameName: params.gameName,
|
||||||
|
tagLine: params.tagLine,
|
||||||
|
});
|
||||||
|
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
kind: 'mention',
|
||||||
|
userId: params.senderUserId,
|
||||||
|
displayText: params.senderNickname,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text:
|
||||||
|
` 대표 계정 변경 완료` +
|
||||||
|
`\n대표 계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}`,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof DakaoUserError) {
|
||||||
|
return this.errorReply(params, this.translateUserError(err));
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private errorReply(
|
||||||
|
params: PrimaryAccountChangeHandlerParams,
|
||||||
|
message: string,
|
||||||
|
): DakaoSegment[] {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
kind: 'mention',
|
||||||
|
userId: params.senderUserId,
|
||||||
|
displayText: params.senderNickname,
|
||||||
|
},
|
||||||
|
{ kind: 'text', text: ` ${message}` },
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private translateUserError(err: DakaoUserError): string {
|
||||||
|
switch (err.code) {
|
||||||
|
case 'invalid_project_id':
|
||||||
|
return '커뮤니티 식별자가 올바르지 않습니다.';
|
||||||
|
case 'community_not_found':
|
||||||
|
return '연결된 커뮤니티를 찾을 수 없습니다.';
|
||||||
|
case 'riot_account_not_found':
|
||||||
|
return `등록된 라이엇 계정을 찾을 수 없습니다 (${err.detail ?? ''}). 먼저 !내전 계정등록 <닉네임>#<태그> 로 계정을 등록해주세요.`;
|
||||||
|
case 'riot_account_already_registered':
|
||||||
|
return `이미 등록된 라이엇 계정이 있습니다 (${err.detail ?? ''}).`;
|
||||||
|
case 'riot_account_conflict':
|
||||||
|
return `이미 다른 사용자가 등록한 라이엇 계정입니다 (${err.detail ?? ''}).`;
|
||||||
|
case 'riot_account_lookup_failed':
|
||||||
|
return '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -121,6 +121,25 @@ describe('parseCommand', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('parses primary account change command', () => {
|
||||||
|
expect(parseCommand('!내전 대표계정변경 프리리#KR1')).toEqual({
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('normalizes primary account change riot id', () => {
|
||||||
|
const decomposedGameName = '프리리'.normalize('NFD');
|
||||||
|
expect(
|
||||||
|
parseCommand(`!내전 대표계정변경 ${decomposedGameName}\u200B#KR1\uFEFF`),
|
||||||
|
).toEqual({
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('normalizes account register riot id', () => {
|
it('normalizes account register riot id', () => {
|
||||||
const decomposedGameName = '프리리'.normalize('NFD');
|
const decomposedGameName = '프리리'.normalize('NFD');
|
||||||
expect(
|
expect(
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ export type DakaoCommand =
|
|||||||
gameName: string;
|
gameName: string;
|
||||||
tagLine: string;
|
tagLine: string;
|
||||||
}
|
}
|
||||||
|
| {
|
||||||
|
kind: 'primary-account-change';
|
||||||
|
gameName: string;
|
||||||
|
tagLine: string;
|
||||||
|
}
|
||||||
| {
|
| {
|
||||||
kind: 'match-join';
|
kind: 'match-join';
|
||||||
matchAndRiotId: string;
|
matchAndRiotId: string;
|
||||||
@@ -70,6 +75,8 @@ export function parseCommand(rawMessage: string): DakaoCommand {
|
|||||||
return parseCancelArgs(args);
|
return parseCancelArgs(args);
|
||||||
case '계정등록':
|
case '계정등록':
|
||||||
return parseAccountRegisterArgs(args);
|
return parseAccountRegisterArgs(args);
|
||||||
|
case '대표계정변경':
|
||||||
|
return parsePrimaryAccountChangeArgs(args);
|
||||||
case '선호포지션등록':
|
case '선호포지션등록':
|
||||||
case '포지션등록':
|
case '포지션등록':
|
||||||
return parsePreferredPositionRegisterArgs(args);
|
return parsePreferredPositionRegisterArgs(args);
|
||||||
@@ -79,6 +86,24 @@ export function parseCommand(rawMessage: string): DakaoCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function parseAccountRegisterArgs(args: string): DakaoCommand {
|
function parseAccountRegisterArgs(args: string): DakaoCommand {
|
||||||
|
const riotId = parseRiotIdArgs(args);
|
||||||
|
return {
|
||||||
|
kind: 'account-register',
|
||||||
|
gameName: riotId.gameName,
|
||||||
|
tagLine: riotId.tagLine,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parsePrimaryAccountChangeArgs(args: string): DakaoCommand {
|
||||||
|
const riotId = parseRiotIdArgs(args);
|
||||||
|
return {
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: riotId.gameName,
|
||||||
|
tagLine: riotId.tagLine,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseRiotIdArgs(args: string): { gameName: string; tagLine: string } {
|
||||||
if (args.length === 0) {
|
if (args.length === 0) {
|
||||||
throw new CommandParseError('usage');
|
throw new CommandParseError('usage');
|
||||||
}
|
}
|
||||||
@@ -94,11 +119,7 @@ function parseAccountRegisterArgs(args: string): DakaoCommand {
|
|||||||
throw new CommandParseError('invalid_riot_id', args);
|
throw new CommandParseError('invalid_riot_id', args);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return { gameName, tagLine };
|
||||||
kind: 'account-register',
|
|
||||||
gameName,
|
|
||||||
tagLine,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseCancelArgs(args: string): DakaoCommand {
|
function parseCancelArgs(args: string): DakaoCommand {
|
||||||
|
|||||||
@@ -593,6 +593,7 @@ export interface AuctionPlayerSnapshot {
|
|||||||
profileIconId: number;
|
profileIconId: number;
|
||||||
preferredPositions: PositionPreference[];
|
preferredPositions: PositionPreference[];
|
||||||
tiers: TierInfo[];
|
tiers: TierInfo[];
|
||||||
|
tierHistory: TierHistoryEntry[];
|
||||||
masteries: ChampionMasteryEntry[];
|
masteries: ChampionMasteryEntry[];
|
||||||
recentStatsSummary?: RiotRecentStatsSummary;
|
recentStatsSummary?: RiotRecentStatsSummary;
|
||||||
passCount: number;
|
passCount: number;
|
||||||
@@ -1531,6 +1532,11 @@ const AuctionPlayerSnapshotSubSchema = new Schema<AuctionPlayerSnapshot>(
|
|||||||
default: [],
|
default: [],
|
||||||
},
|
},
|
||||||
tiers: { type: [TierInfoSubSchema], required: true, default: [] },
|
tiers: { type: [TierInfoSubSchema], required: true, default: [] },
|
||||||
|
tierHistory: {
|
||||||
|
type: [TierHistoryEntrySubSchema],
|
||||||
|
required: true,
|
||||||
|
default: [],
|
||||||
|
},
|
||||||
masteries: {
|
masteries: {
|
||||||
type: [ChampionMasteryEntrySubSchema],
|
type: [ChampionMasteryEntrySubSchema],
|
||||||
required: true,
|
required: true,
|
||||||
|
|||||||
@@ -1,9 +1,4 @@
|
|||||||
import {
|
import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common';
|
||||||
Inject,
|
|
||||||
Injectable,
|
|
||||||
Logger,
|
|
||||||
OnModuleDestroy,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import type { createClient } from 'redis';
|
import type { createClient } from 'redis';
|
||||||
import { GARNET_CLIENT } from './garnet.constants';
|
import { GARNET_CLIENT } from './garnet.constants';
|
||||||
|
|
||||||
@@ -203,6 +198,13 @@ export class GarnetService implements OnModuleDestroy {
|
|||||||
return this.client.xAck(key, group, ids);
|
return this.client.xAck(key, group, ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async deleteStreamEntries(
|
||||||
|
key: string,
|
||||||
|
ids: string | string[],
|
||||||
|
): Promise<number> {
|
||||||
|
return this.client.xDel(key, ids);
|
||||||
|
}
|
||||||
|
|
||||||
public async streamLength(key: string): Promise<number> {
|
public async streamLength(key: string): Promise<number> {
|
||||||
return this.client.xLen(key);
|
return this.client.xLen(key);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,6 +99,18 @@ export class MatchHistoryService {
|
|||||||
losses: tier.losses,
|
losses: tier.losses,
|
||||||
fetchedAt: tier.fetchedAt.toISOString(),
|
fetchedAt: tier.fetchedAt.toISOString(),
|
||||||
})),
|
})),
|
||||||
|
tierHistory: [...context.account.tierHistory]
|
||||||
|
.sort((left, right) => left.recordedAt.getTime() - right.recordedAt.getTime())
|
||||||
|
.map((entry) => ({
|
||||||
|
queueType: entry.queueType,
|
||||||
|
tier: entry.tier,
|
||||||
|
rank: entry.rank,
|
||||||
|
leaguePoints: entry.leaguePoints,
|
||||||
|
wins: entry.wins,
|
||||||
|
losses: entry.losses,
|
||||||
|
recordedAt: entry.recordedAt.toISOString(),
|
||||||
|
season: entry.season,
|
||||||
|
})),
|
||||||
season: context.season,
|
season: context.season,
|
||||||
seasons: this.resolveSeasons(context.community),
|
seasons: this.resolveSeasons(context.community),
|
||||||
lastFetchedAt: lastFetchedAt?.toISOString() ?? null,
|
lastFetchedAt: lastFetchedAt?.toISOString() ?? null,
|
||||||
|
|||||||
@@ -27,6 +27,16 @@ export interface UserHistoryProfileResponse {
|
|||||||
losses: number;
|
losses: number;
|
||||||
fetchedAt: string;
|
fetchedAt: string;
|
||||||
}>;
|
}>;
|
||||||
|
tierHistory: Array<{
|
||||||
|
queueType: string;
|
||||||
|
tier: string;
|
||||||
|
rank?: string;
|
||||||
|
leaguePoints?: number;
|
||||||
|
wins?: number;
|
||||||
|
losses?: number;
|
||||||
|
recordedAt: string;
|
||||||
|
season?: string;
|
||||||
|
}>;
|
||||||
season: HistorySeasonDto;
|
season: HistorySeasonDto;
|
||||||
seasons: HistorySeasonDto[];
|
seasons: HistorySeasonDto[];
|
||||||
lastFetchedAt: string | null;
|
lastFetchedAt: string | null;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { ConfigService } from '@nestjs/config';
|
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import { GarnetService } from '../global/garnet/garnet.service';
|
import { GarnetService } from '../global/garnet/garnet.service';
|
||||||
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
|
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
|
||||||
@@ -30,7 +29,7 @@ function candidate(puuid: string): StaleAccountCandidate {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function makeScheduler(enabled = true) {
|
function makeScheduler() {
|
||||||
const rawClient = {
|
const rawClient = {
|
||||||
sendCommand: jest.fn().mockResolvedValue(1),
|
sendCommand: jest.fn().mockResolvedValue(1),
|
||||||
};
|
};
|
||||||
@@ -42,7 +41,7 @@ function makeScheduler(enabled = true) {
|
|||||||
raw: jest.fn().mockReturnValue(rawClient),
|
raw: jest.fn().mockReturnValue(rawClient),
|
||||||
} as unknown as jest.Mocked<GarnetService> & { raw: jest.Mock };
|
} as unknown as jest.Mocked<GarnetService> & { raw: jest.Mock };
|
||||||
const rateLimiter = {
|
const rateLimiter = {
|
||||||
acquireBackground: jest.fn().mockResolvedValue(undefined),
|
isRefreshWindowOpen: jest.fn().mockResolvedValue(true),
|
||||||
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
||||||
const enrichmentService = {
|
const enrichmentService = {
|
||||||
markRefreshRequested: jest.fn().mockResolvedValue(undefined),
|
markRefreshRequested: jest.fn().mockResolvedValue(undefined),
|
||||||
@@ -51,16 +50,11 @@ function makeScheduler(enabled = true) {
|
|||||||
const staleAccountRepository = {
|
const staleAccountRepository = {
|
||||||
findStaleAccounts: jest.fn().mockResolvedValue([]),
|
findStaleAccounts: jest.fn().mockResolvedValue([]),
|
||||||
} as unknown as jest.Mocked<StaleAccountRepository>;
|
} as unknown as jest.Mocked<StaleAccountRepository>;
|
||||||
const config = {
|
|
||||||
get: jest.fn().mockReturnValue(enabled ? 'true' : 'false'),
|
|
||||||
} as unknown as ConfigService;
|
|
||||||
|
|
||||||
const scheduler = new BackgroundRefreshScheduler(
|
const scheduler = new BackgroundRefreshScheduler(
|
||||||
garnet,
|
garnet,
|
||||||
rateLimiter,
|
rateLimiter,
|
||||||
enrichmentService,
|
enrichmentService,
|
||||||
staleAccountRepository,
|
staleAccountRepository,
|
||||||
config,
|
|
||||||
) as SchedulerInternals;
|
) as SchedulerInternals;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -79,19 +73,40 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
jest.restoreAllMocks();
|
jest.restoreAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('does not schedule ticks when disabled', () => {
|
it('schedules ticks without requiring RIOT_BG_REFRESH_ENABLED', () => {
|
||||||
jest.useFakeTimers();
|
jest.useFakeTimers();
|
||||||
const setIntervalSpy = jest.spyOn(global, 'setInterval');
|
const setIntervalSpy = jest.spyOn(global, 'setInterval');
|
||||||
const { scheduler } = makeScheduler(false);
|
const { scheduler } = makeScheduler();
|
||||||
|
|
||||||
scheduler.onModuleInit();
|
scheduler.onModuleInit();
|
||||||
|
|
||||||
expect(setIntervalSpy).not.toHaveBeenCalled();
|
expect(setIntervalSpy).toHaveBeenCalledTimes(2);
|
||||||
|
scheduler.onModuleDestroy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('does not query stale accounts outside the KST window', async () => {
|
it('uses the dawn refresh gate ratio inside the KST background window', async () => {
|
||||||
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
|
const { scheduler, rateLimiter } = makeScheduler();
|
||||||
|
|
||||||
|
await scheduler.tick();
|
||||||
|
|
||||||
|
expect(rateLimiter.isRefreshWindowOpen).toHaveBeenCalledWith(0.8);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses the opportunistic refresh gate ratio outside the KST background window', async () => {
|
||||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T17:59:59.000Z'));
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T17:59:59.000Z'));
|
||||||
const { scheduler, staleAccountRepository } = makeScheduler();
|
const { scheduler, rateLimiter, staleAccountRepository } = makeScheduler();
|
||||||
|
|
||||||
|
await scheduler.tick();
|
||||||
|
|
||||||
|
expect(rateLimiter.isRefreshWindowOpen).toHaveBeenCalledWith(0.5);
|
||||||
|
expect(staleAccountRepository.findStaleAccounts).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not query stale accounts when the refresh gate is closed', async () => {
|
||||||
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
|
const { scheduler, rateLimiter, staleAccountRepository } = makeScheduler();
|
||||||
|
rateLimiter.isRefreshWindowOpen.mockResolvedValue(false);
|
||||||
|
|
||||||
await scheduler.tick();
|
await scheduler.tick();
|
||||||
|
|
||||||
@@ -108,21 +123,15 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
expect(staleAccountRepository.findStaleAccounts).not.toHaveBeenCalled();
|
expect(staleAccountRepository.findStaleAccounts).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('marks and enriches each stale candidate with background rate tokens', async () => {
|
it('marks and enriches each stale candidate without background precharge', async () => {
|
||||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
const {
|
const { scheduler, enrichmentService, staleAccountRepository } =
|
||||||
scheduler,
|
makeScheduler();
|
||||||
rateLimiter,
|
|
||||||
enrichmentService,
|
|
||||||
staleAccountRepository,
|
|
||||||
} = makeScheduler();
|
|
||||||
const candidates = [candidate('puuid-1'), candidate('puuid-2')];
|
const candidates = [candidate('puuid-1'), candidate('puuid-2')];
|
||||||
staleAccountRepository.findStaleAccounts.mockResolvedValue(candidates);
|
staleAccountRepository.findStaleAccounts.mockResolvedValue(candidates);
|
||||||
|
|
||||||
await scheduler.tick();
|
await scheduler.tick();
|
||||||
|
|
||||||
expect(rateLimiter.acquireBackground).toHaveBeenCalledTimes(2);
|
|
||||||
expect(rateLimiter.acquireBackground).toHaveBeenCalledWith(8);
|
|
||||||
expect(enrichmentService.markRefreshRequested).toHaveBeenCalledTimes(2);
|
expect(enrichmentService.markRefreshRequested).toHaveBeenCalledTimes(2);
|
||||||
expect(enrichmentService.markRefreshRequested).toHaveBeenNthCalledWith(
|
expect(enrichmentService.markRefreshRequested).toHaveBeenNthCalledWith(
|
||||||
1,
|
1,
|
||||||
@@ -136,6 +145,28 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('stops the candidate loop when the refresh gate closes mid-tick', async () => {
|
||||||
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
|
const {
|
||||||
|
scheduler,
|
||||||
|
rateLimiter,
|
||||||
|
enrichmentService,
|
||||||
|
staleAccountRepository,
|
||||||
|
} = makeScheduler();
|
||||||
|
staleAccountRepository.findStaleAccounts.mockResolvedValue([
|
||||||
|
candidate('puuid-1'),
|
||||||
|
candidate('puuid-2'),
|
||||||
|
]);
|
||||||
|
rateLimiter.isRefreshWindowOpen
|
||||||
|
.mockResolvedValueOnce(true)
|
||||||
|
.mockResolvedValueOnce(true)
|
||||||
|
.mockResolvedValueOnce(false);
|
||||||
|
|
||||||
|
await scheduler.tick();
|
||||||
|
|
||||||
|
expect(enrichmentService.enrichRiotAccount).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
it('continues after a candidate throws and records a failure counter', async () => {
|
it('continues after a candidate throws and records a failure counter', async () => {
|
||||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
const { scheduler, rawClient, enrichmentService, staleAccountRepository } =
|
const { scheduler, rawClient, enrichmentService, staleAccountRepository } =
|
||||||
@@ -162,13 +193,8 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
|
|
||||||
it('skips candidates already in failure backoff', async () => {
|
it('skips candidates already in failure backoff', async () => {
|
||||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
const {
|
const { scheduler, garnet, enrichmentService, staleAccountRepository } =
|
||||||
scheduler,
|
makeScheduler();
|
||||||
garnet,
|
|
||||||
rateLimiter,
|
|
||||||
enrichmentService,
|
|
||||||
staleAccountRepository,
|
|
||||||
} = makeScheduler();
|
|
||||||
staleAccountRepository.findStaleAccounts.mockResolvedValue([
|
staleAccountRepository.findStaleAccounts.mockResolvedValue([
|
||||||
candidate('skip-me'),
|
candidate('skip-me'),
|
||||||
]);
|
]);
|
||||||
@@ -179,7 +205,6 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
|
|
||||||
await scheduler.tick();
|
await scheduler.tick();
|
||||||
|
|
||||||
expect(rateLimiter.acquireBackground).not.toHaveBeenCalled();
|
|
||||||
expect(enrichmentService.markRefreshRequested).not.toHaveBeenCalled();
|
expect(enrichmentService.markRefreshRequested).not.toHaveBeenCalled();
|
||||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import {
|
|||||||
OnModuleDestroy,
|
OnModuleDestroy,
|
||||||
OnModuleInit,
|
OnModuleInit,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ConfigService } from '@nestjs/config';
|
|
||||||
import {
|
import {
|
||||||
type EnrichResult,
|
type EnrichResult,
|
||||||
RiotAccountEnrichmentService,
|
RiotAccountEnrichmentService,
|
||||||
@@ -20,11 +19,17 @@ const LEADER_TTL_SECONDS = 90;
|
|||||||
const LEADER_RENEW_INTERVAL_MS = 30_000;
|
const LEADER_RENEW_INTERVAL_MS = 30_000;
|
||||||
const STALE_THRESHOLD_MS = 6 * 60 * 60 * 1000;
|
const STALE_THRESHOLD_MS = 6 * 60 * 60 * 1000;
|
||||||
const PER_TICK_CANDIDATE_LIMIT = 20;
|
const PER_TICK_CANDIDATE_LIMIT = 20;
|
||||||
const ENRICH_COST_TOKENS = 8;
|
const DAWN_USAGE_RATIO = 0.8;
|
||||||
|
const OPPORTUNISTIC_USAGE_RATIO = 0.5;
|
||||||
const FAILURE_BACKOFF_KEY_PREFIX = 'riot:bg:fail';
|
const FAILURE_BACKOFF_KEY_PREFIX = 'riot:bg:fail';
|
||||||
const FAILURE_BACKOFF_THRESHOLD = 3;
|
const FAILURE_BACKOFF_THRESHOLD = 3;
|
||||||
const FAILURE_BACKOFF_TTL_SECONDS = 24 * 60 * 60;
|
const FAILURE_BACKOFF_TTL_SECONDS = 24 * 60 * 60;
|
||||||
|
|
||||||
|
interface RefreshGatePolicy {
|
||||||
|
mode: 'dawn' | 'opportunistic';
|
||||||
|
usageRatio: number;
|
||||||
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class BackgroundRefreshScheduler
|
export class BackgroundRefreshScheduler
|
||||||
implements OnModuleInit, OnModuleDestroy
|
implements OnModuleInit, OnModuleDestroy
|
||||||
@@ -34,26 +39,15 @@ export class BackgroundRefreshScheduler
|
|||||||
private leaderRenewTimer?: NodeJS.Timeout;
|
private leaderRenewTimer?: NodeJS.Timeout;
|
||||||
private tickInProgress = false;
|
private tickInProgress = false;
|
||||||
private readonly consumer = `${process.pid}:${Math.random().toString(36).slice(2)}`;
|
private readonly consumer = `${process.pid}:${Math.random().toString(36).slice(2)}`;
|
||||||
private readonly enabled: boolean;
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly garnet: GarnetService,
|
private readonly garnet: GarnetService,
|
||||||
private readonly rateLimiter: RiotRateLimiterService,
|
private readonly rateLimiter: RiotRateLimiterService,
|
||||||
private readonly enrichmentService: RiotAccountEnrichmentService,
|
private readonly enrichmentService: RiotAccountEnrichmentService,
|
||||||
private readonly staleAccountRepository: StaleAccountRepository,
|
private readonly staleAccountRepository: StaleAccountRepository,
|
||||||
config: ConfigService,
|
) {}
|
||||||
) {
|
|
||||||
this.enabled = config.get<string>('RIOT_BG_REFRESH_ENABLED') === 'true';
|
|
||||||
}
|
|
||||||
|
|
||||||
public onModuleInit(): void {
|
public onModuleInit(): void {
|
||||||
if (!this.enabled) {
|
|
||||||
this.logger.log(
|
|
||||||
'Background Riot refresh is disabled (RIOT_BG_REFRESH_ENABLED).',
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.tickTimer = setInterval(() => void this.safeTick(), TICK_INTERVAL_MS);
|
this.tickTimer = setInterval(() => void this.safeTick(), TICK_INTERVAL_MS);
|
||||||
this.leaderRenewTimer = setInterval(
|
this.leaderRenewTimer = setInterval(
|
||||||
() => void this.renewLeaderIfHeld(),
|
() => void this.renewLeaderIfHeld(),
|
||||||
@@ -87,7 +81,11 @@ export class BackgroundRefreshScheduler
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async tick(): Promise<void> {
|
private async tick(): Promise<void> {
|
||||||
if (!isInKstBackgroundWindow()) return;
|
const initialGate = this.currentRefreshGatePolicy();
|
||||||
|
if (!(await this.rateLimiter.isRefreshWindowOpen(initialGate.usageRatio))) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const isLeader = await this.tryBecomeLeader();
|
const isLeader = await this.tryBecomeLeader();
|
||||||
if (!isLeader) return;
|
if (!isLeader) return;
|
||||||
|
|
||||||
@@ -101,15 +99,20 @@ export class BackgroundRefreshScheduler
|
|||||||
let processed = 0;
|
let processed = 0;
|
||||||
let failed = 0;
|
let failed = 0;
|
||||||
let skipped = 0;
|
let skipped = 0;
|
||||||
|
let currentGate = initialGate;
|
||||||
|
|
||||||
for (const candidate of candidates) {
|
for (const candidate of candidates) {
|
||||||
if (!isInKstBackgroundWindow()) break;
|
currentGate = this.currentRefreshGatePolicy();
|
||||||
|
if (
|
||||||
|
!(await this.rateLimiter.isRefreshWindowOpen(currentGate.usageRatio))
|
||||||
|
) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (await this.isInFailureBackoff(candidate.puuid)) {
|
if (await this.isInFailureBackoff(candidate.puuid)) {
|
||||||
skipped += 1;
|
skipped += 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.rateLimiter.acquireBackground(ENRICH_COST_TOKENS);
|
|
||||||
await this.enrichmentService.markRefreshRequested(
|
await this.enrichmentService.markRefreshRequested(
|
||||||
candidate.userId,
|
candidate.userId,
|
||||||
candidate.puuid,
|
candidate.puuid,
|
||||||
@@ -142,10 +145,18 @@ export class BackgroundRefreshScheduler
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.logger.debug(
|
this.logger.debug(
|
||||||
`Background refresh tick: processed=${processed} failed=${failed} skipped=${skipped} candidates=${candidates.length}`,
|
`Background refresh tick: processed=${processed} failed=${failed} skipped=${skipped} candidates=${candidates.length} mode=${currentGate.mode} ratio=${currentGate.usageRatio}`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private currentRefreshGatePolicy(): RefreshGatePolicy {
|
||||||
|
const isDawn = isInKstBackgroundWindow();
|
||||||
|
return {
|
||||||
|
mode: isDawn ? 'dawn' : 'opportunistic',
|
||||||
|
usageRatio: isDawn ? DAWN_USAGE_RATIO : OPPORTUNISTIC_USAGE_RATIO,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
private async tryBecomeLeader(): Promise<boolean> {
|
private async tryBecomeLeader(): Promise<boolean> {
|
||||||
const current = await this.garnet.getString(LEADER_KEY);
|
const current = await this.garnet.getString(LEADER_KEY);
|
||||||
if (current === this.consumer) {
|
if (current === this.consumer) {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ function execResult<T>(value: T) {
|
|||||||
function makeWorker() {
|
function makeWorker() {
|
||||||
const garnetService = {
|
const garnetService = {
|
||||||
acknowledgeStream: jest.fn().mockResolvedValue(undefined),
|
acknowledgeStream: jest.fn().mockResolvedValue(undefined),
|
||||||
|
deleteStreamEntries: jest.fn().mockResolvedValue(undefined),
|
||||||
} as unknown as jest.Mocked<GarnetService>;
|
} as unknown as jest.Mocked<GarnetService>;
|
||||||
const jobQueueService = {
|
const jobQueueService = {
|
||||||
markProcessing: jest.fn().mockResolvedValue(undefined),
|
markProcessing: jest.fn().mockResolvedValue(undefined),
|
||||||
@@ -74,6 +75,32 @@ function makeWorker() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe('RiotJobWorkerService', () => {
|
describe('RiotJobWorkerService', () => {
|
||||||
|
it('acknowledges and deletes invalid stream entries', async () => {
|
||||||
|
const { worker, garnetService } = makeWorker();
|
||||||
|
|
||||||
|
await (
|
||||||
|
worker as unknown as {
|
||||||
|
processEntry: (
|
||||||
|
stream: string,
|
||||||
|
entry: { id: string; message: Record<string, string> },
|
||||||
|
) => Promise<void>;
|
||||||
|
}
|
||||||
|
).processEntry('riot:queue:high', {
|
||||||
|
id: 'bad-1',
|
||||||
|
message: { job: 'not-json' },
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(garnetService.acknowledgeStream).toHaveBeenCalledWith(
|
||||||
|
'riot:queue:high',
|
||||||
|
RIOT_JOB_GROUP,
|
||||||
|
'bad-1',
|
||||||
|
);
|
||||||
|
expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith(
|
||||||
|
'riot:queue:high',
|
||||||
|
'bad-1',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it('refreshes league entries while processing user history refresh jobs', async () => {
|
it('refreshes league entries while processing user history refresh jobs', async () => {
|
||||||
const { worker, enrichmentService, recentMatchesService, garnetService } =
|
const { worker, enrichmentService, recentMatchesService, garnetService } =
|
||||||
makeWorker();
|
makeWorker();
|
||||||
@@ -91,12 +118,14 @@ describe('RiotJobWorkerService', () => {
|
|||||||
priority: 'high',
|
priority: 'high',
|
||||||
};
|
};
|
||||||
|
|
||||||
await (worker as unknown as {
|
await (
|
||||||
|
worker as unknown as {
|
||||||
processEntry: (
|
processEntry: (
|
||||||
stream: string,
|
stream: string,
|
||||||
entry: { id: string; message: Record<string, string> },
|
entry: { id: string; message: Record<string, string> },
|
||||||
) => Promise<void>;
|
) => Promise<void>;
|
||||||
}).processEntry('riot:queue:high', {
|
}
|
||||||
|
).processEntry('riot:queue:high', {
|
||||||
id: '1-0',
|
id: '1-0',
|
||||||
message: { job: JSON.stringify(job) },
|
message: { job: JSON.stringify(job) },
|
||||||
});
|
});
|
||||||
@@ -112,5 +141,14 @@ describe('RiotJobWorkerService', () => {
|
|||||||
RIOT_JOB_GROUP,
|
RIOT_JOB_GROUP,
|
||||||
'1-0',
|
'1-0',
|
||||||
);
|
);
|
||||||
|
expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith(
|
||||||
|
'riot:queue:high',
|
||||||
|
'1-0',
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
garnetService.acknowledgeStream.mock.invocationCallOrder[0],
|
||||||
|
).toBeLessThan(
|
||||||
|
garnetService.deleteStreamEntries.mock.invocationCallOrder[0],
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -79,10 +79,13 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async processEntry(stream: string, entry: StreamEntry): Promise<void> {
|
private async processEntry(
|
||||||
|
stream: string,
|
||||||
|
entry: StreamEntry,
|
||||||
|
): Promise<void> {
|
||||||
const job = this.parseJob(entry);
|
const job = this.parseJob(entry);
|
||||||
if (!job) {
|
if (!job) {
|
||||||
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id);
|
await this.acknowledgeAndDelete(stream, entry.id);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,7 +137,30 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}`,
|
}`,
|
||||||
);
|
);
|
||||||
} finally {
|
} finally {
|
||||||
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id);
|
await this.acknowledgeAndDelete(stream, entry.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async acknowledgeAndDelete(
|
||||||
|
stream: string,
|
||||||
|
id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, id);
|
||||||
|
await this.deleteAcknowledgedEntry(stream, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async deleteAcknowledgedEntry(
|
||||||
|
stream: string,
|
||||||
|
id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
try {
|
||||||
|
await this.garnetService.deleteStreamEntries(stream, id);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Failed to delete acknowledged Riot job stream entry ${stream} ${id}: ${
|
||||||
|
error instanceof Error ? error.message : error
|
||||||
|
}`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,9 +218,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
return job.kind === 'poll-tournament-result';
|
return job.kind === 'poll-tournament-result';
|
||||||
}
|
}
|
||||||
|
|
||||||
private isLegacyImportJob(
|
private isLegacyImportJob(job: RiotJobPayload): job is LegacyImportMemberJob {
|
||||||
job: RiotJobPayload,
|
|
||||||
): job is LegacyImportMemberJob {
|
|
||||||
return job.kind === 'legacy-import-member';
|
return job.kind === 'legacy-import-member';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,7 +243,8 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
try {
|
try {
|
||||||
await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP);
|
await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
const message =
|
||||||
|
error instanceof Error ? error.message : String(error);
|
||||||
if (!message.includes('BUSYGROUP')) throw error;
|
if (!message.includes('BUSYGROUP')) throw error;
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -70,9 +70,11 @@ function makeAccount(overrides: Partial<FakeAccount> = {}): FakeAccount {
|
|||||||
|
|
||||||
function makeUser(account: FakeAccount) {
|
function makeUser(account: FakeAccount) {
|
||||||
const _id = new mongoose.Types.ObjectId();
|
const _id = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
const save = jest.fn().mockResolvedValue(undefined);
|
const save = jest.fn().mockResolvedValue(undefined);
|
||||||
return {
|
return {
|
||||||
_id,
|
_id,
|
||||||
|
communityId,
|
||||||
riotAccounts: [account],
|
riotAccounts: [account],
|
||||||
save,
|
save,
|
||||||
};
|
};
|
||||||
@@ -86,6 +88,7 @@ function makeService(overrides?: {
|
|||||||
mastery?: Partial<RiotChampionMasteryService>;
|
mastery?: Partial<RiotChampionMasteryService>;
|
||||||
recentMatches?: Partial<RiotRecentMatchesService>;
|
recentMatches?: Partial<RiotRecentMatchesService>;
|
||||||
recentStats?: Partial<RiotRecentStatsService>;
|
recentStats?: Partial<RiotRecentStatsService>;
|
||||||
|
match?: any;
|
||||||
}) {
|
}) {
|
||||||
const user = overrides?.user;
|
const user = overrides?.user;
|
||||||
const userFindById = jest.fn().mockReturnValue({
|
const userFindById = jest.fn().mockReturnValue({
|
||||||
@@ -102,6 +105,11 @@ function makeService(overrides?: {
|
|||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
const matchUpdateManyExec = jest.fn().mockResolvedValue({ modifiedCount: 0 });
|
||||||
|
const matchModel = {
|
||||||
|
updateMany: jest.fn().mockReturnValue({ exec: matchUpdateManyExec }),
|
||||||
|
...overrides?.match,
|
||||||
|
};
|
||||||
const connectionService = {
|
const connectionService = {
|
||||||
getModel: jest.fn().mockImplementation(async (modelName: string) => {
|
getModel: jest.fn().mockImplementation(async (modelName: string) => {
|
||||||
if (modelName === 'user') {
|
if (modelName === 'user') {
|
||||||
@@ -110,6 +118,9 @@ function makeService(overrides?: {
|
|||||||
if (modelName === 'community') {
|
if (modelName === 'community') {
|
||||||
return { findById: communityFindById };
|
return { findById: communityFindById };
|
||||||
}
|
}
|
||||||
|
if (modelName === 'match') {
|
||||||
|
return matchModel;
|
||||||
|
}
|
||||||
throw new Error(`Unexpected model: ${modelName}`);
|
throw new Error(`Unexpected model: ${modelName}`);
|
||||||
}),
|
}),
|
||||||
} as unknown as ConnectionService;
|
} as unknown as ConnectionService;
|
||||||
@@ -160,6 +171,8 @@ function makeService(overrides?: {
|
|||||||
masteryService,
|
masteryService,
|
||||||
recentMatchesService,
|
recentMatchesService,
|
||||||
recentStatsService,
|
recentStatsService,
|
||||||
|
matchModel,
|
||||||
|
matchUpdateManyExec,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -437,6 +450,206 @@ describe('RiotAccountEnrichmentService', () => {
|
|||||||
expect(user.save).toHaveBeenCalledTimes(1);
|
expect(user.save).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('appends tier history when LP changes without tier or rank changes', async () => {
|
||||||
|
const recent = new Date(Date.now() - 60_000);
|
||||||
|
const account = makeAccount({
|
||||||
|
revisionDate: Date.now() - 60_000,
|
||||||
|
tiers: [
|
||||||
|
{
|
||||||
|
leagueId: 'L1',
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'GOLD',
|
||||||
|
rank: 'II',
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
leaguePoints: 10,
|
||||||
|
wins: 20,
|
||||||
|
losses: 12,
|
||||||
|
fetchedAt: recent,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
tierHistory: [
|
||||||
|
{
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'GOLD',
|
||||||
|
rank: 'II',
|
||||||
|
leaguePoints: 10,
|
||||||
|
wins: 20,
|
||||||
|
losses: 12,
|
||||||
|
recordedAt: recent,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
recentStatsFetchedAt: recent,
|
||||||
|
recentStatsSummary: createEmptyRiotRecentStatsSummary(),
|
||||||
|
});
|
||||||
|
const user = makeUser(account);
|
||||||
|
const { service } = makeService({
|
||||||
|
user,
|
||||||
|
league: {
|
||||||
|
getEntriesByPuuid: jest.fn().mockResolvedValue([
|
||||||
|
{
|
||||||
|
leagueId: 'L1',
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'GOLD',
|
||||||
|
rank: 'II',
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
leaguePoints: 44,
|
||||||
|
wins: 21,
|
||||||
|
losses: 12,
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
} as Partial<RiotLeagueService>,
|
||||||
|
});
|
||||||
|
|
||||||
|
await service.refreshLeagueEntries({
|
||||||
|
userId: user._id,
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
platform: 'kr',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(account.tierHistory).toHaveLength(2);
|
||||||
|
expect(account.tierHistory.at(-1)).toMatchObject({
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'GOLD',
|
||||||
|
rank: 'II',
|
||||||
|
leaguePoints: 44,
|
||||||
|
wins: 21,
|
||||||
|
losses: 12,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('syncs refreshed league tier into active match participant snapshots', async () => {
|
||||||
|
const recent = new Date(Date.now() - 60_000);
|
||||||
|
const account = makeAccount({
|
||||||
|
revisionDate: Date.now() - 60_000,
|
||||||
|
tiers: [
|
||||||
|
{
|
||||||
|
leagueId: 'L1',
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'GOLD',
|
||||||
|
rank: 'II',
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
leaguePoints: 1,
|
||||||
|
wins: 1,
|
||||||
|
losses: 1,
|
||||||
|
fetchedAt: recent,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
recentStatsFetchedAt: recent,
|
||||||
|
recentStatsSummary: createEmptyRiotRecentStatsSummary(),
|
||||||
|
});
|
||||||
|
const user = makeUser(account);
|
||||||
|
const { service, matchModel } = makeService({
|
||||||
|
user,
|
||||||
|
league: {
|
||||||
|
getEntriesByPuuid: jest.fn().mockResolvedValue([
|
||||||
|
{
|
||||||
|
leagueId: 'L2',
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'PLATINUM',
|
||||||
|
rank: 'IV',
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
leaguePoints: 20,
|
||||||
|
wins: 10,
|
||||||
|
losses: 8,
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
} as Partial<RiotLeagueService>,
|
||||||
|
});
|
||||||
|
|
||||||
|
await service.refreshLeagueEntries({
|
||||||
|
userId: user._id,
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
platform: 'kr',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(matchModel.updateMany).toHaveBeenCalledWith(
|
||||||
|
{
|
||||||
|
status: { $in: ['recruiting', 'team-built', 'in-progress'] },
|
||||||
|
participants: {
|
||||||
|
$elemMatch: {
|
||||||
|
userId: user._id,
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
$set: {
|
||||||
|
'participants.$[participant].tier': expect.objectContaining({
|
||||||
|
leagueId: 'L2',
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'PLATINUM',
|
||||||
|
rank: 'IV',
|
||||||
|
leaguePoints: 20,
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arrayFilters: [
|
||||||
|
{
|
||||||
|
'participant.userId': user._id,
|
||||||
|
'participant.puuid': 'puuid-1',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('clears active match participant tier when refreshed league entries are empty', async () => {
|
||||||
|
const recent = new Date(Date.now() - 60_000);
|
||||||
|
const account = makeAccount({
|
||||||
|
revisionDate: Date.now() - 60_000,
|
||||||
|
tiers: [
|
||||||
|
{
|
||||||
|
leagueId: 'L1',
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'GOLD',
|
||||||
|
rank: 'II',
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
leaguePoints: 1,
|
||||||
|
wins: 1,
|
||||||
|
losses: 1,
|
||||||
|
fetchedAt: recent,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
recentStatsFetchedAt: recent,
|
||||||
|
recentStatsSummary: createEmptyRiotRecentStatsSummary(),
|
||||||
|
});
|
||||||
|
const user = makeUser(account);
|
||||||
|
const { service, matchModel } = makeService({
|
||||||
|
user,
|
||||||
|
league: {
|
||||||
|
getEntriesByPuuid: jest.fn().mockResolvedValue([]),
|
||||||
|
} as Partial<RiotLeagueService>,
|
||||||
|
});
|
||||||
|
|
||||||
|
await service.refreshLeagueEntries({
|
||||||
|
userId: user._id,
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
platform: 'kr',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(matchModel.updateMany).toHaveBeenCalledWith(
|
||||||
|
{
|
||||||
|
status: { $in: ['recruiting', 'team-built', 'in-progress'] },
|
||||||
|
participants: {
|
||||||
|
$elemMatch: {
|
||||||
|
userId: user._id,
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ $unset: { 'participants.$[participant].tier': '' } },
|
||||||
|
{
|
||||||
|
arrayFilters: [
|
||||||
|
{
|
||||||
|
'participant.userId': user._id,
|
||||||
|
'participant.puuid': 'puuid-1',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it('records failed for individual failing fetches but updates the rest', async () => {
|
it('records failed for individual failing fetches but updates the rest', async () => {
|
||||||
const account = makeAccount();
|
const account = makeAccount();
|
||||||
const user = makeUser(account);
|
const user = makeUser(account);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import mongoose from 'mongoose';
|
|||||||
import { ConnectionService } from '../global/database/connection.service';
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
import {
|
import {
|
||||||
ChampionMasteryEntry,
|
ChampionMasteryEntry,
|
||||||
|
MatchStatus,
|
||||||
RiotAccount,
|
RiotAccount,
|
||||||
TierInfo,
|
TierInfo,
|
||||||
} from '../global/database/schema';
|
} from '../global/database/schema';
|
||||||
@@ -33,6 +34,11 @@ const DEFAULT_SUMMONER_TTL_MS = 24 * 60 * 60 * 1000; // 24h
|
|||||||
const DEFAULT_LEAGUE_TTL_MS = 60 * 60 * 1000; // 1h
|
const DEFAULT_LEAGUE_TTL_MS = 60 * 60 * 1000; // 1h
|
||||||
const DEFAULT_MASTERY_TTL_MS = 6 * 60 * 60 * 1000; // 6h
|
const DEFAULT_MASTERY_TTL_MS = 6 * 60 * 60 * 1000; // 6h
|
||||||
const DEFAULT_RECENT_MATCHES_TTL_MS = 6 * 60 * 60 * 1000; // 6h
|
const DEFAULT_RECENT_MATCHES_TTL_MS = 6 * 60 * 60 * 1000; // 6h
|
||||||
|
const ACTIVE_MATCH_STATUSES: MatchStatus[] = [
|
||||||
|
'recruiting',
|
||||||
|
'team-built',
|
||||||
|
'in-progress',
|
||||||
|
];
|
||||||
|
|
||||||
export interface EnrichOptions {
|
export interface EnrichOptions {
|
||||||
platform?: RiotPlatformRoute;
|
platform?: RiotPlatformRoute;
|
||||||
@@ -117,6 +123,11 @@ export class RiotAccountEnrichmentService {
|
|||||||
|
|
||||||
this.applyLeagueEntries(account, outcome.dto);
|
this.applyLeagueEntries(account, outcome.dto);
|
||||||
await user.save();
|
await user.save();
|
||||||
|
await this.syncActiveMatchParticipantTier(
|
||||||
|
user._id,
|
||||||
|
params.puuid,
|
||||||
|
account.tiers,
|
||||||
|
);
|
||||||
return 'updated';
|
return 'updated';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,6 +254,13 @@ export class RiotAccountEnrichmentService {
|
|||||||
) {
|
) {
|
||||||
await user.save();
|
await user.save();
|
||||||
}
|
}
|
||||||
|
if (leagueOutcome.status === 'updated') {
|
||||||
|
await this.syncActiveMatchParticipantTier(
|
||||||
|
user._id,
|
||||||
|
params.puuid,
|
||||||
|
account.tiers,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
summoner: summonerOutcome.status,
|
summoner: summonerOutcome.status,
|
||||||
@@ -425,7 +443,10 @@ export class RiotAccountEnrichmentService {
|
|||||||
const changed =
|
const changed =
|
||||||
!last ||
|
!last ||
|
||||||
last.tier !== entry.tier ||
|
last.tier !== entry.tier ||
|
||||||
(last.rank ?? '') !== (entry.rank ?? '');
|
(last.rank ?? '') !== (entry.rank ?? '') ||
|
||||||
|
last.leaguePoints !== entry.leaguePoints ||
|
||||||
|
last.wins !== entry.wins ||
|
||||||
|
last.losses !== entry.losses;
|
||||||
if (!changed) continue;
|
if (!changed) continue;
|
||||||
|
|
||||||
account.tierHistory.push({
|
account.tierHistory.push({
|
||||||
@@ -463,6 +484,62 @@ export class RiotAccountEnrichmentService {
|
|||||||
account.matchIdsFetchedAt = fetchedAt;
|
account.matchIdsFetchedAt = fetchedAt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async syncActiveMatchParticipantTier(
|
||||||
|
userId: mongoose.Types.ObjectId,
|
||||||
|
puuid: string,
|
||||||
|
tiers: TierInfo[],
|
||||||
|
): Promise<void> {
|
||||||
|
const MatchModel = await this.connectionService.getModel('match');
|
||||||
|
const tier = this.selectParticipantTier(tiers);
|
||||||
|
const update = tier
|
||||||
|
? { $set: { 'participants.$[participant].tier': tier } }
|
||||||
|
: { $unset: { 'participants.$[participant].tier': '' } };
|
||||||
|
|
||||||
|
await MatchModel.updateMany(
|
||||||
|
{
|
||||||
|
status: { $in: ACTIVE_MATCH_STATUSES },
|
||||||
|
participants: {
|
||||||
|
$elemMatch: {
|
||||||
|
userId,
|
||||||
|
puuid,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
update,
|
||||||
|
{
|
||||||
|
arrayFilters: [
|
||||||
|
{
|
||||||
|
'participant.userId': userId,
|
||||||
|
'participant.puuid': puuid,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
).exec();
|
||||||
|
}
|
||||||
|
|
||||||
|
private selectParticipantTier(tiers: TierInfo[]): TierInfo | undefined {
|
||||||
|
const tier =
|
||||||
|
tiers.find((entry) => entry.queueType === 'RANKED_SOLO_5x5') ?? tiers[0];
|
||||||
|
if (!tier) return undefined;
|
||||||
|
|
||||||
|
return {
|
||||||
|
leagueId: tier.leagueId,
|
||||||
|
queueType: tier.queueType,
|
||||||
|
tier: tier.tier,
|
||||||
|
rank: tier.rank,
|
||||||
|
puuid: tier.puuid,
|
||||||
|
leaguePoints: tier.leaguePoints,
|
||||||
|
wins: tier.wins,
|
||||||
|
losses: tier.losses,
|
||||||
|
veteran: tier.veteran,
|
||||||
|
inactive: tier.inactive,
|
||||||
|
freshBlood: tier.freshBlood,
|
||||||
|
hotStreak: tier.hotStreak,
|
||||||
|
miniSeries: tier.miniSeries,
|
||||||
|
fetchedAt: tier.fetchedAt,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
private tiersOldestAt(tiers: TierInfo[]): number {
|
private tiersOldestAt(tiers: TierInfo[]): number {
|
||||||
if (tiers.length === 0) return 0;
|
if (tiers.length === 0) return 0;
|
||||||
let oldest = Infinity;
|
let oldest = Infinity;
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { RiotClientService } from './riot.client.service';
|
||||||
|
import { RiotLeagueService } from './riot-league.service';
|
||||||
|
import type { RiotLeagueEntryDto, RiotResponseParser } from './riot.types';
|
||||||
|
|
||||||
|
describe('RiotLeagueService', () => {
|
||||||
|
it('accepts Riot league entries without optional leagueId', async () => {
|
||||||
|
const client = {
|
||||||
|
get: jest.fn(
|
||||||
|
async <T>(
|
||||||
|
_path: string,
|
||||||
|
_options: unknown,
|
||||||
|
parser?: RiotResponseParser<T>,
|
||||||
|
) =>
|
||||||
|
parser
|
||||||
|
? parser([
|
||||||
|
{
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'EMERALD',
|
||||||
|
rank: 'I',
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
leaguePoints: 75,
|
||||||
|
wins: 160,
|
||||||
|
losses: 148,
|
||||||
|
},
|
||||||
|
])
|
||||||
|
: ([] as T),
|
||||||
|
),
|
||||||
|
} as unknown as RiotClientService;
|
||||||
|
const service = new RiotLeagueService(client);
|
||||||
|
|
||||||
|
const result = await service.getEntriesByPuuid('puuid-1', {
|
||||||
|
platform: 'kr',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toEqual<RiotLeagueEntryDto[]>([
|
||||||
|
{
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'EMERALD',
|
||||||
|
rank: 'I',
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
leaguePoints: 75,
|
||||||
|
wins: 160,
|
||||||
|
losses: 148,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -36,7 +36,10 @@ function parseEntry(value: unknown, index: number): RiotLeagueEntryDto {
|
|||||||
throw new TypeError(`leagueEntries[${index}] must be an object.`);
|
throw new TypeError(`leagueEntries[${index}] must be an object.`);
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
leagueId: requireString(value.leagueId, `leagueEntries[${index}].leagueId`),
|
leagueId: optionalString(
|
||||||
|
value.leagueId,
|
||||||
|
`leagueEntries[${index}].leagueId`,
|
||||||
|
),
|
||||||
queueType: requireString(
|
queueType: requireString(
|
||||||
value.queueType,
|
value.queueType,
|
||||||
`leagueEntries[${index}].queueType`,
|
`leagueEntries[${index}].queueType`,
|
||||||
@@ -71,6 +74,11 @@ function requireString(value: unknown, path: string): string {
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function optionalString(value: unknown, path: string): string | undefined {
|
||||||
|
if (value === undefined || value === null) return undefined;
|
||||||
|
return requireString(value, path);
|
||||||
|
}
|
||||||
|
|
||||||
function requireNumber(value: unknown, path: string): number {
|
function requireNumber(value: unknown, path: string): number {
|
||||||
if (typeof value !== 'number' || !Number.isFinite(value)) {
|
if (typeof value !== 'number' || !Number.isFinite(value)) {
|
||||||
throw new TypeError(`${path} must be a finite number.`);
|
throw new TypeError(`${path} must be a finite number.`);
|
||||||
|
|||||||
@@ -3,63 +3,156 @@ import { RiotRateLimiterService } from './riot-rate-limiter.service';
|
|||||||
|
|
||||||
function makeService(sendCommand = jest.fn().mockResolvedValue(0)) {
|
function makeService(sendCommand = jest.fn().mockResolvedValue(0)) {
|
||||||
const garnet = {
|
const garnet = {
|
||||||
|
getString: jest.fn().mockResolvedValue(null),
|
||||||
raw: jest.fn().mockReturnValue({ sendCommand }),
|
raw: jest.fn().mockReturnValue({ sendCommand }),
|
||||||
} as unknown as GarnetService;
|
setString: jest.fn().mockResolvedValue(undefined),
|
||||||
|
} as unknown as jest.Mocked<GarnetService>;
|
||||||
return {
|
return {
|
||||||
service: new RiotRateLimiterService(garnet),
|
service: new RiotRateLimiterService(garnet),
|
||||||
|
garnet,
|
||||||
sendCommand,
|
sendCommand,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('RiotRateLimiterService background limiter', () => {
|
function observedState(params: {
|
||||||
|
count120: number;
|
||||||
|
limit120?: number;
|
||||||
|
observedAt: number;
|
||||||
|
windowStartAt: number;
|
||||||
|
}) {
|
||||||
|
return JSON.stringify({
|
||||||
|
count120: params.count120,
|
||||||
|
limit120: params.limit120 ?? 100,
|
||||||
|
observedAt: params.observedAt,
|
||||||
|
windowStartAt: params.windowStartAt,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('RiotRateLimiterService', () => {
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
jest.restoreAllMocks();
|
jest.restoreAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('uses the background key namespace and passes cost to the Lua script', async () => {
|
it('uses global app rate keys and passes cost to the Lua script', async () => {
|
||||||
jest.spyOn(Date, 'now').mockReturnValue(1_000);
|
jest.spyOn(Date, 'now').mockReturnValue(1_000);
|
||||||
const { service, sendCommand } = makeService();
|
const { service, sendCommand } = makeService();
|
||||||
|
|
||||||
await service.acquireBackground(8);
|
await service.acquire('asia', 3);
|
||||||
|
|
||||||
expect(sendCommand).toHaveBeenCalledTimes(1);
|
expect(sendCommand).toHaveBeenCalledTimes(1);
|
||||||
const command = sendCommand.mock.calls[0][0] as string[];
|
const command = sendCommand.mock.calls[0][0] as string[];
|
||||||
expect(command[0]).toBe('EVAL');
|
expect(command[0]).toBe('EVAL');
|
||||||
expect(command[2]).toBe('2');
|
expect(command[2]).toBe('2');
|
||||||
expect(command[3]).toBe('riot:bg:rl:1000');
|
expect(command[3]).toBe('riot:rl:app:1000');
|
||||||
expect(command[4]).toBe('riot:bg:rl:120000');
|
expect(command[4]).toBe('riot:rl:app:120000');
|
||||||
expect(command[5]).toBe('1000');
|
expect(command[5]).toBe('1000');
|
||||||
expect(command[7]).toBe('8');
|
expect(command[7]).toBe('3');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('reads cleaned background usage for both windows', async () => {
|
it('records the 120 second app rate observation from Riot headers', async () => {
|
||||||
jest.spyOn(Date, 'now').mockReturnValue(200_000);
|
jest.spyOn(Date, 'now').mockReturnValue(1_000_000);
|
||||||
const sendCommand = jest
|
const { service, garnet } = makeService();
|
||||||
.fn()
|
|
||||||
.mockImplementation(async (command: string[]) => {
|
|
||||||
if (command[0] === 'ZREMRANGEBYSCORE') return 0;
|
|
||||||
if (command[1] === 'riot:bg:rl:1000') return 3;
|
|
||||||
if (command[1] === 'riot:bg:rl:120000') return 24;
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
const { service } = makeService(sendCommand);
|
|
||||||
|
|
||||||
await expect(service.getBackgroundUsage()).resolves.toEqual({
|
await service.recordAppRateLimitObservation('47:120,3:1', '100:120,20:1');
|
||||||
used1s: 3,
|
|
||||||
used2m: 24,
|
expect(garnet.setString).toHaveBeenCalledTimes(1);
|
||||||
|
const [key, raw, ttl] = garnet.setString.mock.calls[0];
|
||||||
|
expect(key).toBe('riot:app:rl:observed');
|
||||||
|
expect(ttl).toBe(300);
|
||||||
|
expect(JSON.parse(raw)).toEqual({
|
||||||
|
count120: 47,
|
||||||
|
limit120: 100,
|
||||||
|
observedAt: 1_000_000,
|
||||||
|
windowStartAt: 1_000_000,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(sendCommand).toHaveBeenCalledWith([
|
it('resets the inferred window when Riot count decreases or observation is stale', async () => {
|
||||||
'ZREMRANGEBYSCORE',
|
const { service, garnet } = makeService();
|
||||||
'riot:bg:rl:1000',
|
|
||||||
'-inf',
|
jest.spyOn(Date, 'now').mockReturnValue(1_060_000);
|
||||||
'199000',
|
garnet.getString.mockResolvedValueOnce(
|
||||||
]);
|
observedState({
|
||||||
expect(sendCommand).toHaveBeenCalledWith([
|
count120: 80,
|
||||||
'ZREMRANGEBYSCORE',
|
observedAt: 1_050_000,
|
||||||
'riot:bg:rl:120000',
|
windowStartAt: 1_000_000,
|
||||||
'-inf',
|
}),
|
||||||
'80000',
|
);
|
||||||
]);
|
|
||||||
|
await service.recordAppRateLimitObservation('2:120', null);
|
||||||
|
|
||||||
|
expect(JSON.parse(garnet.setString.mock.calls[0][1])).toMatchObject({
|
||||||
|
count120: 2,
|
||||||
|
windowStartAt: 1_060_000,
|
||||||
|
});
|
||||||
|
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1_240_000);
|
||||||
|
garnet.getString.mockResolvedValueOnce(
|
||||||
|
observedState({
|
||||||
|
count120: 20,
|
||||||
|
observedAt: 1_120_000,
|
||||||
|
windowStartAt: 1_000_000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
await service.recordAppRateLimitObservation('25:120', null);
|
||||||
|
|
||||||
|
expect(JSON.parse(garnet.setString.mock.calls[1][1])).toMatchObject({
|
||||||
|
count120: 25,
|
||||||
|
windowStartAt: 1_240_000,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens the refresh gate when there is no active observation', async () => {
|
||||||
|
const { service, garnet } = makeService();
|
||||||
|
|
||||||
|
await expect(service.isRefreshWindowOpen(0.5)).resolves.toBe(true);
|
||||||
|
|
||||||
|
garnet.getString.mockResolvedValueOnce(
|
||||||
|
observedState({
|
||||||
|
count120: 90,
|
||||||
|
observedAt: 1_000_000,
|
||||||
|
windowStartAt: 900_000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1_120_000);
|
||||||
|
|
||||||
|
await expect(service.isRefreshWindowOpen(0.5)).resolves.toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
{ ratio: 0.5, count120: 49, expected: true },
|
||||||
|
{ ratio: 0.5, count120: 50, expected: false },
|
||||||
|
{ ratio: 0.8, count120: 79, expected: true },
|
||||||
|
{ ratio: 0.8, count120: 80, expected: false },
|
||||||
|
])(
|
||||||
|
'checks tail headroom for refresh gate ratio=$ratio count=$count120',
|
||||||
|
async ({ ratio, count120, expected }) => {
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1_070_000);
|
||||||
|
const { service, garnet } = makeService();
|
||||||
|
garnet.getString.mockResolvedValue(
|
||||||
|
observedState({
|
||||||
|
count120,
|
||||||
|
observedAt: 1_069_000,
|
||||||
|
windowStartAt: 1_000_000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
await expect(service.isRefreshWindowOpen(ratio)).resolves.toBe(expected);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('keeps the refresh gate closed before the 120 second window tail', async () => {
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1_050_000);
|
||||||
|
const { service, garnet } = makeService();
|
||||||
|
garnet.getString.mockResolvedValue(
|
||||||
|
observedState({
|
||||||
|
count120: 10,
|
||||||
|
observedAt: 1_049_000,
|
||||||
|
windowStartAt: 1_000_000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
await expect(service.isRefreshWindowOpen(0.8)).resolves.toBe(false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -7,11 +7,19 @@ const APP_LIMITS = [
|
|||||||
{ windowMs: 120_000, max: 90 },
|
{ windowMs: 120_000, max: 90 },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
const BACKGROUND_LIMITS = [
|
const APP_KEY_PREFIX = 'riot:rl:app';
|
||||||
{ windowMs: 1_000, max: 6 },
|
const APP_WINDOW_MS = 120_000;
|
||||||
{ windowMs: 120_000, max: 36 },
|
const TAIL_MS = 60_000;
|
||||||
] as const;
|
const APP_OBSERVED_KEY = 'riot:app:rl:observed';
|
||||||
const BACKGROUND_KEY_PREFIX = 'riot:bg:rl';
|
const APP_OBSERVED_TTL_SECONDS = 300;
|
||||||
|
const DEFAULT_APP_LIMIT_120 = 100;
|
||||||
|
|
||||||
|
interface AppRateObservation {
|
||||||
|
count120: number;
|
||||||
|
limit120: number;
|
||||||
|
observedAt: number;
|
||||||
|
windowStartAt: number;
|
||||||
|
}
|
||||||
|
|
||||||
const ACQUIRE_SCRIPT = `
|
const ACQUIRE_SCRIPT = `
|
||||||
local now = tonumber(ARGV[1])
|
local now = tonumber(ARGV[1])
|
||||||
@@ -81,85 +89,78 @@ export class RiotRateLimiterService {
|
|||||||
|
|
||||||
public async acquire(
|
public async acquire(
|
||||||
route: RiotRegionalRoute | RiotPlatformRoute,
|
route: RiotRegionalRoute | RiotPlatformRoute,
|
||||||
|
cost = 1,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
for (;;) {
|
|
||||||
const now = Date.now();
|
|
||||||
const waitMs = await this.checkAndAdd(route, now, 1);
|
|
||||||
if (waitMs <= 0) return;
|
|
||||||
|
|
||||||
if (waitMs >= 100) {
|
|
||||||
this.logger.warn(
|
|
||||||
`Riot API throttle waiting ${waitMs}ms for route=${route}.`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
await sleep(waitMs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async acquireBackground(cost = 1): Promise<void> {
|
|
||||||
const normalizedCost = normalizeCost(cost);
|
const normalizedCost = normalizeCost(cost);
|
||||||
for (;;) {
|
for (;;) {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const waitMs = await this.checkAndAddBackground(now, normalizedCost);
|
const waitMs = await this.checkAndAdd(now, normalizedCost);
|
||||||
if (waitMs <= 0) return;
|
if (waitMs <= 0) return;
|
||||||
|
|
||||||
if (waitMs >= 100) {
|
if (waitMs >= 100) {
|
||||||
this.logger.warn(
|
this.logger.warn(
|
||||||
`Background Riot throttle waiting ${waitMs}ms (cost=${normalizedCost}).`,
|
`Riot API throttle waiting ${waitMs}ms for route=${route} cost=${normalizedCost}.`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
await sleep(waitMs);
|
await sleep(waitMs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getBackgroundUsage(): Promise<{
|
public async recordAppRateLimitObservation(
|
||||||
used1s: number;
|
countHeader: string | null,
|
||||||
used2m: number;
|
limitHeader?: string | null,
|
||||||
}> {
|
): Promise<void> {
|
||||||
const client = this.garnet.raw();
|
const count120 = parseRateLimitHeader(countHeader, 120);
|
||||||
const now = Date.now();
|
if (count120 === null) return;
|
||||||
const usages = await Promise.all(
|
|
||||||
BACKGROUND_LIMITS.map(async (limit) => {
|
|
||||||
const key = `${BACKGROUND_KEY_PREFIX}:${limit.windowMs}`;
|
|
||||||
await client.sendCommand([
|
|
||||||
'ZREMRANGEBYSCORE',
|
|
||||||
key,
|
|
||||||
'-inf',
|
|
||||||
String(now - limit.windowMs),
|
|
||||||
]);
|
|
||||||
const response = await client.sendCommand(['ZCARD', key]);
|
|
||||||
const count = Number(response ?? 0);
|
|
||||||
return Number.isFinite(count) && count > 0 ? count : 0;
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
const limit120 =
|
||||||
used1s: usages[0] ?? 0,
|
parseRateLimitHeader(limitHeader ?? null, 120) ?? DEFAULT_APP_LIMIT_120;
|
||||||
used2m: usages[1] ?? 0,
|
const now = Date.now();
|
||||||
|
const previous = await this.getAppRateObservation();
|
||||||
|
const windowStartAt =
|
||||||
|
!previous ||
|
||||||
|
now - previous.observedAt >= APP_WINDOW_MS ||
|
||||||
|
count120 < previous.count120
|
||||||
|
? now
|
||||||
|
: previous.windowStartAt;
|
||||||
|
|
||||||
|
const observation: AppRateObservation = {
|
||||||
|
count120,
|
||||||
|
limit120,
|
||||||
|
observedAt: now,
|
||||||
|
windowStartAt,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Concurrent responses can race here. This observation is advisory, so
|
||||||
|
// last-writer-wins is acceptable and self-corrects on the next Riot header.
|
||||||
|
await this.garnet.setString(
|
||||||
|
APP_OBSERVED_KEY,
|
||||||
|
JSON.stringify(observation),
|
||||||
|
APP_OBSERVED_TTL_SECONDS,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async checkAndAdd(
|
public async isRefreshWindowOpen(
|
||||||
route: RiotRegionalRoute | RiotPlatformRoute,
|
usageRatio: number,
|
||||||
now: number,
|
now = Date.now(),
|
||||||
cost: number,
|
): Promise<boolean> {
|
||||||
): Promise<number> {
|
const observation = await this.getAppRateObservation();
|
||||||
|
if (!observation) return true;
|
||||||
|
if (now - observation.observedAt >= APP_WINDOW_MS) return true;
|
||||||
|
|
||||||
|
const ratio = Number.isFinite(usageRatio) ? usageRatio : 0;
|
||||||
|
const headroomOk = observation.count120 < observation.limit120 * ratio;
|
||||||
|
const inTail = now >= observation.windowStartAt + APP_WINDOW_MS - TAIL_MS;
|
||||||
|
return headroomOk && inTail;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async checkAndAdd(now: number, cost: number): Promise<number> {
|
||||||
const keys = APP_LIMITS.map(
|
const keys = APP_LIMITS.map(
|
||||||
(limit) => `riot:rl:${route}:${limit.windowMs}`,
|
(limit) => `${APP_KEY_PREFIX}:${limit.windowMs}`,
|
||||||
);
|
);
|
||||||
return this.checkAndAddWithLimits(keys, APP_LIMITS, now, cost);
|
return this.checkAndAddWithLimits(keys, APP_LIMITS, now, cost);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async checkAndAddBackground(
|
|
||||||
now: number,
|
|
||||||
cost: number,
|
|
||||||
): Promise<number> {
|
|
||||||
const keys = BACKGROUND_LIMITS.map(
|
|
||||||
(limit) => `${BACKGROUND_KEY_PREFIX}:${limit.windowMs}`,
|
|
||||||
);
|
|
||||||
return this.checkAndAddWithLimits(keys, BACKGROUND_LIMITS, now, cost);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async checkAndAddWithLimits(
|
private async checkAndAddWithLimits(
|
||||||
keys: string[],
|
keys: string[],
|
||||||
limits: ReadonlyArray<{ windowMs: number; max: number }>,
|
limits: ReadonlyArray<{ windowMs: number; max: number }>,
|
||||||
@@ -187,6 +188,32 @@ export class RiotRateLimiterService {
|
|||||||
if (!Number.isFinite(waitMs) || waitMs < 0) return 0;
|
if (!Number.isFinite(waitMs) || waitMs < 0) return 0;
|
||||||
return waitMs;
|
return waitMs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async getAppRateObservation(): Promise<AppRateObservation | null> {
|
||||||
|
const raw = await this.garnet.getString(APP_OBSERVED_KEY);
|
||||||
|
if (!raw) return null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(raw) as Partial<AppRateObservation>;
|
||||||
|
if (
|
||||||
|
typeof parsed.count120 !== 'number' ||
|
||||||
|
typeof parsed.limit120 !== 'number' ||
|
||||||
|
typeof parsed.observedAt !== 'number' ||
|
||||||
|
typeof parsed.windowStartAt !== 'number'
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
count120: parsed.count120,
|
||||||
|
limit120: parsed.limit120,
|
||||||
|
observedAt: parsed.observedAt,
|
||||||
|
windowStartAt: parsed.windowStartAt,
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeCost(cost: number): number {
|
function normalizeCost(cost: number): number {
|
||||||
@@ -194,6 +221,24 @@ function normalizeCost(cost: number): number {
|
|||||||
return Math.max(1, Math.floor(cost));
|
return Math.max(1, Math.floor(cost));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function parseRateLimitHeader(
|
||||||
|
header: string | null,
|
||||||
|
windowSeconds: number,
|
||||||
|
): number | null {
|
||||||
|
if (!header) return null;
|
||||||
|
|
||||||
|
for (const rawEntry of header.split(',')) {
|
||||||
|
const [rawCount, rawWindow] = rawEntry.trim().split(':');
|
||||||
|
const count = Number(rawCount);
|
||||||
|
const window = Number(rawWindow);
|
||||||
|
if (window === windowSeconds && Number.isFinite(count) && count >= 0) {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
function sleep(ms: number): Promise<void> {
|
function sleep(ms: number): Promise<void> {
|
||||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import { SecretService } from '../global/secret/secret.service';
|
||||||
|
import { RiotClientService } from './riot.client.service';
|
||||||
|
import { RiotRateLimiterService } from './riot-rate-limiter.service';
|
||||||
|
|
||||||
|
describe('RiotClientService', () => {
|
||||||
|
const originalFetch = global.fetch;
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
global.fetch = originalFetch;
|
||||||
|
jest.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('records Riot app rate limit headers after a response', async () => {
|
||||||
|
const secretService = {
|
||||||
|
get: jest.fn().mockResolvedValue('riot-key'),
|
||||||
|
} as unknown as jest.Mocked<SecretService>;
|
||||||
|
const rateLimiter = {
|
||||||
|
acquire: jest.fn().mockResolvedValue(undefined),
|
||||||
|
recordAppRateLimitObservation: jest.fn().mockResolvedValue(undefined),
|
||||||
|
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
headers: {
|
||||||
|
get: jest.fn((name: string) => {
|
||||||
|
if (name === 'X-App-Rate-Limit-Count') return '47:120,3:1';
|
||||||
|
if (name === 'X-App-Rate-Limit') return '100:120,20:1';
|
||||||
|
return null;
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
json: jest.fn().mockResolvedValue({ ok: true }),
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
} as unknown as Response);
|
||||||
|
const service = new RiotClientService(secretService, rateLimiter);
|
||||||
|
|
||||||
|
await service.get('/lol/status/v4/platform-data', { platform: 'kr' });
|
||||||
|
|
||||||
|
expect(rateLimiter.acquire).toHaveBeenCalledWith('kr');
|
||||||
|
expect(rateLimiter.recordAppRateLimitObservation).toHaveBeenCalledWith(
|
||||||
|
'47:120,3:1',
|
||||||
|
'100:120,20:1',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -140,16 +140,18 @@ export class RiotClientService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const appRateLimitCount = response.headers.get('X-App-Rate-Limit-Count');
|
const appRateLimitCount = response.headers.get('X-App-Rate-Limit-Count');
|
||||||
|
const appRateLimit = response.headers.get('X-App-Rate-Limit');
|
||||||
|
void this.rateLimiter.recordAppRateLimitObservation(
|
||||||
|
appRateLimitCount,
|
||||||
|
appRateLimit,
|
||||||
|
);
|
||||||
if (appRateLimitCount && Math.random() < 0.05) {
|
if (appRateLimitCount && Math.random() < 0.05) {
|
||||||
this.logger.debug(`Riot rate usage ${routeKey}: ${appRateLimitCount}`);
|
this.logger.debug(`Riot rate usage ${routeKey}: ${appRateLimitCount}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const error = await this.createApiError(response, url);
|
const error = await this.createApiError(response, url);
|
||||||
if (
|
if (error.status === 429 && attempt === 0) {
|
||||||
error.status === 429 &&
|
|
||||||
attempt === 0
|
|
||||||
) {
|
|
||||||
await sleep((error.retryAfterSeconds ?? 1) * 1000);
|
await sleep((error.retryAfterSeconds ?? 1) * 1000);
|
||||||
return this.fetchWithRetry(
|
return this.fetchWithRetry(
|
||||||
url,
|
url,
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ export interface RiotSummonerDto {
|
|||||||
|
|
||||||
// League-V4 entries by-puuid 응답
|
// League-V4 entries by-puuid 응답
|
||||||
export interface RiotLeagueEntryDto {
|
export interface RiotLeagueEntryDto {
|
||||||
leagueId: string;
|
leagueId?: string;
|
||||||
queueType: string;
|
queueType: string;
|
||||||
tier: string;
|
tier: string;
|
||||||
rank: string;
|
rank: string;
|
||||||
|
|||||||
+16
-1
@@ -1,5 +1,5 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="ko" data-theme="light">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||||
@@ -7,6 +7,21 @@
|
|||||||
<title>롤림푸스 - 내전 관리</title>
|
<title>롤림푸스 - 내전 관리</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
<script>
|
||||||
|
(() => {
|
||||||
|
let theme = "light";
|
||||||
|
try {
|
||||||
|
theme =
|
||||||
|
window.localStorage.getItem("lolympus.theme") === "dark"
|
||||||
|
? "dark"
|
||||||
|
: "light";
|
||||||
|
} catch {
|
||||||
|
theme = "light";
|
||||||
|
}
|
||||||
|
document.documentElement.dataset.theme = theme;
|
||||||
|
document.documentElement.style.colorScheme = theme;
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
"react": "^19.2.4",
|
"react": "^19.2.4",
|
||||||
"react-dom": "^19.2.4",
|
"react-dom": "^19.2.4",
|
||||||
"react-router": "^7.14.0",
|
"react-router": "^7.14.0",
|
||||||
|
"recharts": "^3.8.1",
|
||||||
"socket.io-client": "^4.8.3"
|
"socket.io-client": "^4.8.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
+27
-2
@@ -1,7 +1,8 @@
|
|||||||
import { BrowserRouter, Link, Route, Routes } from "react-router";
|
import { BrowserRouter, Link, Route, Routes } from "react-router";
|
||||||
import { useMsal } from "@azure/msal-react";
|
import { useMsal } from "@azure/msal-react";
|
||||||
|
import { Moon, Sun } from "lucide-react";
|
||||||
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
||||||
import { DEFAULT_COMMUNITY_ID } from "./config";
|
import { DEFAULT_COMMUNITY_ID, setTheme, useTheme } from "./config";
|
||||||
import { useCommunity } from "./api/hooks";
|
import { useCommunity } from "./api/hooks";
|
||||||
import { isMsalConfigured } from "./lib/auth/msal.config";
|
import { isMsalConfigured } from "./lib/auth/msal.config";
|
||||||
import AuthCallbackPage from "./pages/AuthCallback";
|
import AuthCallbackPage from "./pages/AuthCallback";
|
||||||
@@ -24,7 +25,10 @@ function MsalHeaderActions() {
|
|||||||
|
|
||||||
if (!account) {
|
if (!account) {
|
||||||
return (
|
return (
|
||||||
<Link className="btn btn-primary btn-xs px-3" to="/login">
|
<Link
|
||||||
|
className="btn btn-ghost btn-xs px-2 text-base-content/60 hover:text-base-content"
|
||||||
|
to="/login"
|
||||||
|
>
|
||||||
로그인
|
로그인
|
||||||
</Link>
|
</Link>
|
||||||
);
|
);
|
||||||
@@ -41,6 +45,26 @@ function MsalHeaderActions() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function ThemeToggle() {
|
||||||
|
const theme = useTheme();
|
||||||
|
const nextTheme = theme === "light" ? "dark" : "light";
|
||||||
|
const label = nextTheme === "dark" ? "다크 테마로 전환" : "라이트 테마로 전환";
|
||||||
|
const Icon = nextTheme === "dark" ? Moon : Sun;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span className="tooltip tooltip-bottom" data-tip={label}>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-ghost btn-xs btn-square text-base-content/60 hover:text-base-content"
|
||||||
|
aria-label={label}
|
||||||
|
onClick={() => setTheme(nextTheme)}
|
||||||
|
>
|
||||||
|
<Icon className="h-3.5 w-3.5" aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
|
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
|
||||||
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
|
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
|
||||||
@@ -66,6 +90,7 @@ function App() {
|
|||||||
Set `VITE_DEFAULT_COMMUNITY_ID`
|
Set `VITE_DEFAULT_COMMUNITY_ID`
|
||||||
</span>
|
</span>
|
||||||
)} */}
|
)} */}
|
||||||
|
<ThemeToggle />
|
||||||
{isMsalConfigured && <MsalHeaderActions />}
|
{isMsalConfigured && <MsalHeaderActions />}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -171,6 +171,15 @@ export function useUndoAuction(communityId = DEFAULT_COMMUNITY_ID) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function useResetAuction(communityId = DEFAULT_COMMUNITY_ID) {
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: ({ matchId }: { matchId: string }) =>
|
||||||
|
apiFetch<void>(`/communities/${communityId}/matches/${matchId}/auction`, {
|
||||||
|
method: 'DELETE',
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export function useCreateMatch(communityId = DEFAULT_COMMUNITY_ID) {
|
export function useCreateMatch(communityId = DEFAULT_COMMUNITY_ID) {
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: (body: MatchMutationRequest) =>
|
mutationFn: (body: MatchMutationRequest) =>
|
||||||
@@ -216,6 +225,7 @@ function createUserHistoryPath(
|
|||||||
export function useUserHistoryProfile(
|
export function useUserHistoryProfile(
|
||||||
userId: string | undefined,
|
userId: string | undefined,
|
||||||
communityId = DEFAULT_COMMUNITY_ID,
|
communityId = DEFAULT_COMMUNITY_ID,
|
||||||
|
enabled = true,
|
||||||
) {
|
) {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ['user-history-profile', communityId, userId ?? null],
|
queryKey: ['user-history-profile', communityId, userId ?? null],
|
||||||
@@ -224,7 +234,7 @@ export function useUserHistoryProfile(
|
|||||||
`/communities/${communityId}/users/${userId}/history-profile`,
|
`/communities/${communityId}/users/${userId}/history-profile`,
|
||||||
{ auth: 'none' },
|
{ auth: 'none' },
|
||||||
),
|
),
|
||||||
enabled: Boolean(communityId && userId),
|
enabled: enabled && Boolean(communityId && userId),
|
||||||
retry: false,
|
retry: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import type {
|
|||||||
ApiPositionPreference,
|
ApiPositionPreference,
|
||||||
ApiRiotLaneStats,
|
ApiRiotLaneStats,
|
||||||
ApiRiotRecentStatsSummary,
|
ApiRiotRecentStatsSummary,
|
||||||
|
ApiTierHistoryEntry,
|
||||||
ApiTierInfo,
|
ApiTierInfo,
|
||||||
MatchStatus,
|
MatchStatus,
|
||||||
Position,
|
Position,
|
||||||
@@ -91,6 +92,7 @@ export interface AuctionPlayerView extends ParticipantView {
|
|||||||
level: number;
|
level: number;
|
||||||
points: number;
|
points: number;
|
||||||
}[];
|
}[];
|
||||||
|
tierHistory: ApiTierHistoryEntry[];
|
||||||
recentStats: {
|
recentStats: {
|
||||||
overall: ApiRiotLaneStats;
|
overall: ApiRiotLaneStats;
|
||||||
byLane: Partial<Record<RiotLane, ApiRiotLaneStats>>;
|
byLane: Partial<Record<RiotLane, ApiRiotLaneStats>>;
|
||||||
@@ -236,6 +238,7 @@ function mapAuctionPlayerToView(
|
|||||||
summonerName: player.gameName,
|
summonerName: player.gameName,
|
||||||
tag: player.tagLine,
|
tag: player.tagLine,
|
||||||
tier: selectPrimaryTier(player.tiers),
|
tier: selectPrimaryTier(player.tiers),
|
||||||
|
tierHistory: player.tierHistory ?? [],
|
||||||
mainPosition,
|
mainPosition,
|
||||||
subPosition,
|
subPosition,
|
||||||
profileIconId: player.profileIconId,
|
profileIconId: player.profileIconId,
|
||||||
@@ -288,12 +291,14 @@ function mapAuctionTeamToView(
|
|||||||
...participant,
|
...participant,
|
||||||
passCount: 0,
|
passCount: 0,
|
||||||
masteries: [],
|
masteries: [],
|
||||||
|
tierHistory: [],
|
||||||
recentStats: createEmptyRecentStatsView(),
|
recentStats: createEmptyRecentStatsView(),
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
...createFallbackParticipant(member.userId),
|
...createFallbackParticipant(member.userId),
|
||||||
passCount: 0,
|
passCount: 0,
|
||||||
masteries: [],
|
masteries: [],
|
||||||
|
tierHistory: [],
|
||||||
recentStats: createEmptyRecentStatsView(),
|
recentStats: createEmptyRecentStatsView(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ export interface ApiRiotAccount {
|
|||||||
summonerLevel: number;
|
summonerLevel: number;
|
||||||
isPrimary: boolean;
|
isPrimary: boolean;
|
||||||
tiers: ApiTierInfo[];
|
tiers: ApiTierInfo[];
|
||||||
tierHistory: unknown[];
|
tierHistory: ApiTierHistoryEntry[];
|
||||||
matchIds: string[];
|
matchIds: string[];
|
||||||
championMasteries: ApiChampionMasteryEntry[];
|
championMasteries: ApiChampionMasteryEntry[];
|
||||||
championRecords: Record<string, Record<string, unknown>>;
|
championRecords: Record<string, Record<string, unknown>>;
|
||||||
@@ -247,6 +247,7 @@ export interface ApiAuctionPlayerSnapshot {
|
|||||||
profileIconId: number;
|
profileIconId: number;
|
||||||
preferredPositions: ApiPositionPreference[];
|
preferredPositions: ApiPositionPreference[];
|
||||||
tiers: ApiTierInfo[];
|
tiers: ApiTierInfo[];
|
||||||
|
tierHistory: ApiTierHistoryEntry[];
|
||||||
masteries: ApiChampionMasteryEntry[];
|
masteries: ApiChampionMasteryEntry[];
|
||||||
recentStatsSummary?: ApiRiotRecentStatsSummary;
|
recentStatsSummary?: ApiRiotRecentStatsSummary;
|
||||||
passCount: number;
|
passCount: number;
|
||||||
@@ -460,11 +461,23 @@ export interface ApiUserHistoryProfile {
|
|||||||
profileIconId: number;
|
profileIconId: number;
|
||||||
summonerLevel: number;
|
summonerLevel: number;
|
||||||
tiers: ApiTierInfo[];
|
tiers: ApiTierInfo[];
|
||||||
|
tierHistory: ApiTierHistoryEntry[];
|
||||||
season: ApiHistorySeason;
|
season: ApiHistorySeason;
|
||||||
seasons: ApiHistorySeason[];
|
seasons: ApiHistorySeason[];
|
||||||
lastFetchedAt: string | null;
|
lastFetchedAt: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ApiTierHistoryEntry {
|
||||||
|
queueType: string;
|
||||||
|
tier: string;
|
||||||
|
rank?: string;
|
||||||
|
leaguePoints?: number;
|
||||||
|
wins?: number;
|
||||||
|
losses?: number;
|
||||||
|
recordedAt: string;
|
||||||
|
season?: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface ApiChampionStatsRow {
|
export interface ApiChampionStatsRow {
|
||||||
championId: number;
|
championId: number;
|
||||||
games: number;
|
games: number;
|
||||||
|
|||||||
@@ -26,6 +26,10 @@ interface ChatHistoryPayload {
|
|||||||
messages?: ApiAuctionChatMessage[];
|
messages?: ApiAuctionChatMessage[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface ResetPayload {
|
||||||
|
matchId?: string;
|
||||||
|
}
|
||||||
|
|
||||||
const MAX_CHAT_MESSAGES = 200;
|
const MAX_CHAT_MESSAGES = 200;
|
||||||
|
|
||||||
function mergeChatMessages(
|
function mergeChatMessages(
|
||||||
@@ -47,6 +51,7 @@ export function useAuctionSocket(matchId: string | undefined) {
|
|||||||
const socketRef = useRef<Socket | null>(null);
|
const socketRef = useRef<Socket | null>(null);
|
||||||
const [auction, setAuction] = useState<ApiAuction | null>(null);
|
const [auction, setAuction] = useState<ApiAuction | null>(null);
|
||||||
const [chatMessages, setChatMessages] = useState<ApiAuctionChatMessage[]>([]);
|
const [chatMessages, setChatMessages] = useState<ApiAuctionChatMessage[]>([]);
|
||||||
|
const [resetAt, setResetAt] = useState<number | null>(null);
|
||||||
const [connectionStatus, setConnectionStatus] =
|
const [connectionStatus, setConnectionStatus] =
|
||||||
useState<ConnectionStatus>('idle');
|
useState<ConnectionStatus>('idle');
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
@@ -103,6 +108,14 @@ export function useAuctionSocket(matchId: string | undefined) {
|
|||||||
setChatMessages((current) => mergeChatMessages(current, [message]));
|
setChatMessages((current) => mergeChatMessages(current, [message]));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
socket.on('reset', (payload: ResetPayload) => {
|
||||||
|
if (payload.matchId && payload.matchId !== matchId) return;
|
||||||
|
setAuction(null);
|
||||||
|
setChatMessages([]);
|
||||||
|
setResetAt(Date.now());
|
||||||
|
setError('경매가 취소되었습니다.');
|
||||||
|
});
|
||||||
|
|
||||||
socket.on('error', (payload: { message?: string }) => {
|
socket.on('error', (payload: { message?: string }) => {
|
||||||
setConnectionStatus('error');
|
setConnectionStatus('error');
|
||||||
setError(payload.message ?? '실시간 경매 연결 중 오류가 발생했습니다.');
|
setError(payload.message ?? '실시간 경매 연결 중 오류가 발생했습니다.');
|
||||||
@@ -144,6 +157,7 @@ export function useAuctionSocket(matchId: string | undefined) {
|
|||||||
return {
|
return {
|
||||||
auction: visibleAuction,
|
auction: visibleAuction,
|
||||||
chatMessages: visibleAuction ? chatMessages : [],
|
chatMessages: visibleAuction ? chatMessages : [],
|
||||||
|
resetAt,
|
||||||
connectionStatus: visibleConnectionStatus,
|
connectionStatus: visibleConnectionStatus,
|
||||||
error,
|
error,
|
||||||
placeBid(payload: BidPayload) {
|
placeBid(payload: BidPayload) {
|
||||||
|
|||||||
@@ -0,0 +1,122 @@
|
|||||||
|
import type { ApiTierInfo } from "../api/types";
|
||||||
|
|
||||||
|
type RankBadgeSize = "sm" | "md";
|
||||||
|
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> = {
|
||||||
|
sm: "h-[17px] min-w-[18px]",
|
||||||
|
md: "h-[18px] min-w-[20px]",
|
||||||
|
};
|
||||||
|
|
||||||
|
const TOOLTIP_CLASSES: Record<RankBadgeTooltipPlacement, string> = {
|
||||||
|
left: "tooltip-left",
|
||||||
|
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) {
|
||||||
|
switch (tier?.tier) {
|
||||||
|
case "CHALLENGER":
|
||||||
|
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
|
||||||
|
case "GRANDMASTER":
|
||||||
|
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
|
||||||
|
case "MASTER":
|
||||||
|
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
|
||||||
|
case "DIAMOND":
|
||||||
|
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
|
||||||
|
case "EMERALD":
|
||||||
|
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
|
||||||
|
case "PLATINUM":
|
||||||
|
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
|
||||||
|
case "GOLD":
|
||||||
|
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
|
||||||
|
case "SILVER":
|
||||||
|
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
|
||||||
|
case "BRONZE":
|
||||||
|
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
|
||||||
|
case "IRON":
|
||||||
|
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
|
||||||
|
default:
|
||||||
|
return "border-base-content/30 bg-transparent text-base-content/50";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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({
|
||||||
|
tier,
|
||||||
|
size = "md",
|
||||||
|
tooltipPlacement = "bottom",
|
||||||
|
}: {
|
||||||
|
tier?: ApiTierInfo;
|
||||||
|
size?: RankBadgeSize;
|
||||||
|
tooltipPlacement?: RankBadgeTooltipPlacement;
|
||||||
|
}) {
|
||||||
|
const tooltip = formatRankDetail(tier);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={`tooltip ${TOOLTIP_CLASSES[tooltipPlacement]}`}
|
||||||
|
data-tip={tooltip}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
className={`inline-flex ${SIZE_CLASSES[size]} shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
||||||
|
aria-label={tooltip}
|
||||||
|
>
|
||||||
|
{formatRankBadge(tier)}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
|
||||||
|
return (
|
||||||
|
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
|
||||||
|
<RankBadge tier={tier} />
|
||||||
|
<span className="hidden font-bold text-base-content/55 sm:inline">
|
||||||
|
{formatRankDetail(tier)}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,597 @@
|
|||||||
|
import { useMemo, useState } from "react";
|
||||||
|
import {
|
||||||
|
CartesianGrid,
|
||||||
|
Line,
|
||||||
|
LineChart,
|
||||||
|
ReferenceDot,
|
||||||
|
ReferenceLine,
|
||||||
|
ResponsiveContainer,
|
||||||
|
Tooltip,
|
||||||
|
XAxis,
|
||||||
|
YAxis,
|
||||||
|
} from "recharts";
|
||||||
|
import type { ApiTierHistoryEntry } from "../api/types";
|
||||||
|
|
||||||
|
const TIER_NAMES: Record<string, string> = {
|
||||||
|
IRON: "아이언",
|
||||||
|
BRONZE: "브론즈",
|
||||||
|
SILVER: "실버",
|
||||||
|
GOLD: "골드",
|
||||||
|
PLATINUM: "플래티넘",
|
||||||
|
EMERALD: "에메랄드",
|
||||||
|
DIAMOND: "다이아몬드",
|
||||||
|
MASTER: "마스터",
|
||||||
|
GRANDMASTER: "그랜드마스터",
|
||||||
|
CHALLENGER: "챌린저",
|
||||||
|
};
|
||||||
|
|
||||||
|
// 낮은 티어 → 높은 티어. 인덱스가 사다리값의 기준이 된다.
|
||||||
|
const TIER_ORDER = [
|
||||||
|
"IRON",
|
||||||
|
"BRONZE",
|
||||||
|
"SILVER",
|
||||||
|
"GOLD",
|
||||||
|
"PLATINUM",
|
||||||
|
"EMERALD",
|
||||||
|
"DIAMOND",
|
||||||
|
"MASTER",
|
||||||
|
"GRANDMASTER",
|
||||||
|
"CHALLENGER",
|
||||||
|
];
|
||||||
|
|
||||||
|
const APEX_TIERS = new Set(["MASTER", "GRANDMASTER", "CHALLENGER"]);
|
||||||
|
|
||||||
|
// 한 티어 = 400, 한 디비전(랭크) = 100, LP는 그대로 더한다.
|
||||||
|
const TIER_SPAN = 400;
|
||||||
|
const RANK_SPAN = 100;
|
||||||
|
|
||||||
|
const RANK_INDEX: Record<string, number> = { IV: 0, III: 1, II: 2, I: 3 };
|
||||||
|
const RANK_BY_INDEX = ["IV", "III", "II", "I"];
|
||||||
|
|
||||||
|
const QUEUE_LABELS: Record<string, string> = {
|
||||||
|
RANKED_SOLO_5x5: "솔로랭크",
|
||||||
|
RANKED_FLEX_SR: "자유랭크",
|
||||||
|
};
|
||||||
|
|
||||||
|
const TIER_COMPACT_NAMES: Record<string, string> = {
|
||||||
|
IRON: "I",
|
||||||
|
BRONZE: "B",
|
||||||
|
SILVER: "S",
|
||||||
|
GOLD: "G",
|
||||||
|
PLATINUM: "P",
|
||||||
|
EMERALD: "E",
|
||||||
|
DIAMOND: "D",
|
||||||
|
MASTER: "M",
|
||||||
|
GRANDMASTER: "GM",
|
||||||
|
CHALLENGER: "C",
|
||||||
|
};
|
||||||
|
|
||||||
|
type PeriodKey = "30" | "90" | "all";
|
||||||
|
type SummaryVariant = "footer" | "inline";
|
||||||
|
type SummaryDirection = "up" | "down" | "flat";
|
||||||
|
|
||||||
|
const PERIOD_OPTIONS: { key: PeriodKey; label: string; days: number | null }[] =
|
||||||
|
[
|
||||||
|
{ key: "30", label: "최근 30일", days: 30 },
|
||||||
|
{ key: "90", label: "최근 90일", days: 90 },
|
||||||
|
{ key: "all", label: "전체", days: null },
|
||||||
|
];
|
||||||
|
|
||||||
|
function tierIndex(tier: string) {
|
||||||
|
const index = TIER_ORDER.indexOf(tier);
|
||||||
|
return index === -1 ? 0 : index;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 티어/랭크/LP를 단일 연속 스칼라(사다리값)로 환산한다.
|
||||||
|
function ladderValue(entry: {
|
||||||
|
tier: string;
|
||||||
|
rank?: string;
|
||||||
|
leaguePoints?: number;
|
||||||
|
}) {
|
||||||
|
const base = tierIndex(entry.tier) * TIER_SPAN;
|
||||||
|
const lp = entry.leaguePoints ?? 0;
|
||||||
|
if (APEX_TIERS.has(entry.tier)) {
|
||||||
|
return base + lp;
|
||||||
|
}
|
||||||
|
const rankIdx = RANK_INDEX[entry.rank ?? "IV"] ?? 0;
|
||||||
|
return base + rankIdx * RANK_SPAN + lp;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 formatTierLabel(entry: {
|
||||||
|
tier: string;
|
||||||
|
rank?: string;
|
||||||
|
leaguePoints?: number;
|
||||||
|
}) {
|
||||||
|
const name = TIER_NAMES[entry.tier] ?? entry.tier;
|
||||||
|
if (APEX_TIERS.has(entry.tier)) {
|
||||||
|
return `${name} ${entry.leaguePoints ?? 0}LP`;
|
||||||
|
}
|
||||||
|
const rank = normalizeRank(entry.rank);
|
||||||
|
return `${name}${rank ? ` ${rank}` : ""} · ${entry.leaguePoints ?? 0}LP`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatTierCompactLabel(entry: {
|
||||||
|
tier: string;
|
||||||
|
rank?: string;
|
||||||
|
leaguePoints?: number;
|
||||||
|
}) {
|
||||||
|
const tier = TIER_COMPACT_NAMES[entry.tier] ?? entry.tier;
|
||||||
|
const lp = entry.leaguePoints ?? 0;
|
||||||
|
if (APEX_TIERS.has(entry.tier)) {
|
||||||
|
return `${tier} ${lp}LP`;
|
||||||
|
}
|
||||||
|
const rank = normalizeRank(entry.rank);
|
||||||
|
return `${tier}${rank} ${lp}LP`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatTierShort(tier: string) {
|
||||||
|
return TIER_NAMES[tier] ?? tier;
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatPeriodChange(summary: {
|
||||||
|
first: ChartPoint;
|
||||||
|
last: ChartPoint;
|
||||||
|
direction: SummaryDirection;
|
||||||
|
}) {
|
||||||
|
const marker =
|
||||||
|
summary.direction === "up"
|
||||||
|
? "▲"
|
||||||
|
: summary.direction === "down"
|
||||||
|
? "▼"
|
||||||
|
: "·";
|
||||||
|
return `${formatTierShort(summary.first.tier)} ${marker} ${formatTierShort(summary.last.tier)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatDate(ms: number) {
|
||||||
|
return new Intl.DateTimeFormat("ko-KR", {
|
||||||
|
month: "numeric",
|
||||||
|
day: "numeric",
|
||||||
|
}).format(new Date(ms));
|
||||||
|
}
|
||||||
|
|
||||||
|
type ChartPoint = {
|
||||||
|
ts: number;
|
||||||
|
value: number;
|
||||||
|
tier: string;
|
||||||
|
rank?: string;
|
||||||
|
leaguePoints?: number;
|
||||||
|
wins?: number;
|
||||||
|
losses?: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
type YGuide = {
|
||||||
|
value: number;
|
||||||
|
label: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
function isSamePoint(left: ChartPoint, right: ChartPoint) {
|
||||||
|
return left.ts === right.ts && left.value === right.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
function nearestApexPoint(value: number, points: ChartPoint[]) {
|
||||||
|
const apexPoints = points.filter((point) => APEX_TIERS.has(point.tier));
|
||||||
|
if (apexPoints.length === 0) return null;
|
||||||
|
|
||||||
|
return apexPoints.reduce((best, point) =>
|
||||||
|
Math.abs(point.value - value) < Math.abs(best.value - value) ? point : best,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function compactEntryFromLadderValue(value: number, points: ChartPoint[]) {
|
||||||
|
const rounded = Math.max(0, Math.round(value));
|
||||||
|
const masterBase = tierIndex("MASTER") * TIER_SPAN;
|
||||||
|
|
||||||
|
if (rounded >= masterBase) {
|
||||||
|
const apexPoint = nearestApexPoint(rounded, points);
|
||||||
|
const apexTier = apexPoint?.tier ?? "MASTER";
|
||||||
|
const apexBase = tierIndex(apexTier) * TIER_SPAN;
|
||||||
|
if (rounded >= apexBase) {
|
||||||
|
return {
|
||||||
|
tier: apexTier,
|
||||||
|
leaguePoints: rounded - apexBase,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
tier: "MASTER",
|
||||||
|
leaguePoints: rounded - masterBase,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const tierIdx = Math.min(
|
||||||
|
TIER_ORDER.length - 1,
|
||||||
|
Math.floor(rounded / TIER_SPAN),
|
||||||
|
);
|
||||||
|
const tier = TIER_ORDER[tierIdx];
|
||||||
|
const withinTier = rounded - tierIdx * TIER_SPAN;
|
||||||
|
const rankIdx = Math.min(3, Math.floor(withinTier / RANK_SPAN));
|
||||||
|
|
||||||
|
return {
|
||||||
|
tier,
|
||||||
|
rank: RANK_BY_INDEX[rankIdx],
|
||||||
|
leaguePoints: withinTier - rankIdx * RANK_SPAN,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildAdaptiveYGuides(points: ChartPoint[]): YGuide[] {
|
||||||
|
if (points.length === 0) return [];
|
||||||
|
|
||||||
|
const min = Math.min(...points.map((point) => point.value));
|
||||||
|
const max = Math.max(...points.map((point) => point.value));
|
||||||
|
const paddedMin = min - 60;
|
||||||
|
const paddedMax = max + 60;
|
||||||
|
const steps = [50, 100, 200, 400, 800, 1200];
|
||||||
|
|
||||||
|
for (const step of steps) {
|
||||||
|
const start = Math.ceil(paddedMin / step) * step;
|
||||||
|
const end = Math.floor(paddedMax / step) * step;
|
||||||
|
const count = Math.floor((end - start) / step) + 1;
|
||||||
|
|
||||||
|
if (count >= 2 && count <= 4) {
|
||||||
|
return Array.from({ length: count }, (_, index) => {
|
||||||
|
const value = start + index * step;
|
||||||
|
return {
|
||||||
|
value,
|
||||||
|
label: formatTierCompactLabel(
|
||||||
|
compactEntryFromLadderValue(value, points),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const center = Math.round(((min + max) / 2) / 50) * 50;
|
||||||
|
return [center - 50, center + 50].map((value) => ({
|
||||||
|
value,
|
||||||
|
label: formatTierCompactLabel(compactEntryFromLadderValue(value, points)),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
function TierTooltip({
|
||||||
|
active,
|
||||||
|
payload,
|
||||||
|
}: {
|
||||||
|
active?: boolean;
|
||||||
|
payload?: Array<{ payload: ChartPoint }>;
|
||||||
|
}) {
|
||||||
|
if (!active || !payload?.length) return null;
|
||||||
|
const point = payload[0].payload;
|
||||||
|
const games =
|
||||||
|
point.wins !== undefined && point.losses !== undefined
|
||||||
|
? ` · ${point.wins}승 ${point.losses}패`
|
||||||
|
: "";
|
||||||
|
return (
|
||||||
|
<div className="border border-base-content/15 bg-base-100 px-3 py-2 text-[11px] shadow-lg">
|
||||||
|
<div className="font-bold text-base-content">{formatTierLabel(point)}</div>
|
||||||
|
<div className="mt-0.5 text-base-content/45">
|
||||||
|
{new Intl.DateTimeFormat("ko-KR", {
|
||||||
|
year: "numeric",
|
||||||
|
month: "long",
|
||||||
|
day: "numeric",
|
||||||
|
}).format(new Date(point.ts))}
|
||||||
|
{games}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function TierHistoryChart({
|
||||||
|
entries,
|
||||||
|
className = "border border-base-content/10 bg-base-100 mb-5 overflow-hidden",
|
||||||
|
summaryVariant = "footer",
|
||||||
|
height = 220,
|
||||||
|
showHeader = true,
|
||||||
|
}: {
|
||||||
|
entries: ApiTierHistoryEntry[];
|
||||||
|
className?: string;
|
||||||
|
summaryVariant?: SummaryVariant;
|
||||||
|
height?: number;
|
||||||
|
showHeader?: boolean;
|
||||||
|
}) {
|
||||||
|
// 데이터에 존재하는 큐 목록 (솔로 우선)
|
||||||
|
const availableQueues = useMemo(() => {
|
||||||
|
const queues = new Set(entries.map((entry) => entry.queueType));
|
||||||
|
return ["RANKED_SOLO_5x5", "RANKED_FLEX_SR"].filter((queue) =>
|
||||||
|
queues.has(queue),
|
||||||
|
);
|
||||||
|
}, [entries]);
|
||||||
|
|
||||||
|
const [queue, setQueue] = useState(
|
||||||
|
availableQueues[0] ?? "RANKED_SOLO_5x5",
|
||||||
|
);
|
||||||
|
const [period, setPeriod] = useState<PeriodKey>("all");
|
||||||
|
|
||||||
|
const activeQueue = availableQueues.includes(queue)
|
||||||
|
? queue
|
||||||
|
: (availableQueues[0] ?? "RANKED_SOLO_5x5");
|
||||||
|
|
||||||
|
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
|
||||||
|
.filter((entry) => entry.queueType === activeQueue)
|
||||||
|
.map((entry) => ({
|
||||||
|
ts: new Date(entry.recordedAt).getTime(),
|
||||||
|
value: ladderValue(entry),
|
||||||
|
tier: entry.tier,
|
||||||
|
rank: entry.rank,
|
||||||
|
leaguePoints: entry.leaguePoints,
|
||||||
|
wins: entry.wins,
|
||||||
|
losses: entry.losses,
|
||||||
|
}))
|
||||||
|
.filter((point) => point.ts >= cutoff)
|
||||||
|
.sort((left, right) => left.ts - right.ts);
|
||||||
|
}, [entries, activeQueue, period]);
|
||||||
|
|
||||||
|
// 티어 경계(가로 점선) 후보 — 데이터 범위 안에 드는 티어 floor만.
|
||||||
|
const tierLines = useMemo(() => {
|
||||||
|
if (points.length === 0) return [];
|
||||||
|
const min = Math.min(...points.map((point) => point.value));
|
||||||
|
const max = Math.max(...points.map((point) => point.value));
|
||||||
|
return TIER_ORDER.map((tier, index) => ({
|
||||||
|
tier,
|
||||||
|
value: index * TIER_SPAN,
|
||||||
|
})).filter((line) => line.value >= min - TIER_SPAN && line.value <= max);
|
||||||
|
}, [points]);
|
||||||
|
|
||||||
|
const adaptiveYGuides = useMemo(() => {
|
||||||
|
return summaryVariant === "inline" ? buildAdaptiveYGuides(points) : [];
|
||||||
|
}, [points, summaryVariant]);
|
||||||
|
|
||||||
|
const summary = useMemo(() => {
|
||||||
|
if (points.length === 0) return null;
|
||||||
|
const first = points[0];
|
||||||
|
const last = points[points.length - 1];
|
||||||
|
const peak = points.reduce((best, point) =>
|
||||||
|
point.value > best.value ? point : best,
|
||||||
|
);
|
||||||
|
const direction: SummaryDirection =
|
||||||
|
last.value > first.value
|
||||||
|
? "up"
|
||||||
|
: last.value < first.value
|
||||||
|
? "down"
|
||||||
|
: "flat";
|
||||||
|
return { first, last, peak, direction };
|
||||||
|
}, [points]);
|
||||||
|
|
||||||
|
const xDomain = useMemo(() => {
|
||||||
|
if (summaryVariant !== "inline" || points.length < 2) {
|
||||||
|
return ["dataMin", "dataMax"] as const;
|
||||||
|
}
|
||||||
|
|
||||||
|
const min = points[0].ts;
|
||||||
|
const max = points[points.length - 1].ts;
|
||||||
|
const span = Math.max(1, max - min);
|
||||||
|
const padding = Math.max(span * 0.18, 24 * 60 * 60 * 1000);
|
||||||
|
return [min - padding, max + padding] as const;
|
||||||
|
}, [points, summaryVariant]);
|
||||||
|
|
||||||
|
const header = (
|
||||||
|
<div className="flex flex-wrap items-center justify-between gap-2 border-b border-base-content/10 bg-base-200/40 px-4 py-2.5">
|
||||||
|
<h2 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
||||||
|
티어 변동
|
||||||
|
</h2>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
{availableQueues.length > 1 &&
|
||||||
|
availableQueues.map((option) => (
|
||||||
|
<button
|
||||||
|
key={option}
|
||||||
|
type="button"
|
||||||
|
onClick={() => setQueue(option)}
|
||||||
|
className={`h-7 px-2 text-[11px] font-semibold border transition-colors ${
|
||||||
|
activeQueue === option
|
||||||
|
? "border-primary/30 bg-primary/5 text-primary"
|
||||||
|
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{QUEUE_LABELS[option] ?? option}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
<select
|
||||||
|
className="h-7 border border-base-content/10 bg-base-100 px-2 text-[11px] text-base-content focus:border-primary/30 focus:outline-none"
|
||||||
|
value={period}
|
||||||
|
onChange={(event) => setPeriod(event.target.value as PeriodKey)}
|
||||||
|
>
|
||||||
|
{PERIOD_OPTIONS.map((option) => (
|
||||||
|
<option key={option.key} value={option.key}>
|
||||||
|
{option.label}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className={className}>
|
||||||
|
{showHeader && header}
|
||||||
|
{points.length < 2 ? (
|
||||||
|
<div className="px-4 py-10 text-center text-xs text-base-content/35">
|
||||||
|
티어 변동 기록이 아직 부족해요.
|
||||||
|
<br />
|
||||||
|
정보를 갱신할수록 변화가 쌓여 그래프로 보여드릴게요.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<div className="relative px-2 pt-4 pb-1">
|
||||||
|
<ResponsiveContainer width="100%" height={height}>
|
||||||
|
<LineChart
|
||||||
|
data={points}
|
||||||
|
margin={{
|
||||||
|
top: summaryVariant === "inline" ? 18 : 8,
|
||||||
|
right: summaryVariant === "inline" ? 20 : 16,
|
||||||
|
bottom: 4,
|
||||||
|
left: summaryVariant === "inline" ? 12 : 4,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<CartesianGrid
|
||||||
|
strokeDasharray="3 3"
|
||||||
|
stroke="currentColor"
|
||||||
|
className="text-base-content/5"
|
||||||
|
vertical={false}
|
||||||
|
/>
|
||||||
|
{summaryVariant === "inline"
|
||||||
|
? adaptiveYGuides.map((guide) => (
|
||||||
|
<ReferenceLine
|
||||||
|
key={`${guide.value}-${guide.label}`}
|
||||||
|
y={guide.value}
|
||||||
|
stroke="currentColor"
|
||||||
|
className="text-base-content/12"
|
||||||
|
strokeDasharray="2 4"
|
||||||
|
label={{
|
||||||
|
value: guide.label,
|
||||||
|
position: "insideLeft",
|
||||||
|
fill: "currentColor",
|
||||||
|
fontSize: 10,
|
||||||
|
className: "text-base-content/35",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
: tierLines.map((line) => (
|
||||||
|
<ReferenceLine
|
||||||
|
key={line.tier}
|
||||||
|
y={line.value}
|
||||||
|
stroke="currentColor"
|
||||||
|
className="text-base-content/15"
|
||||||
|
strokeDasharray="2 4"
|
||||||
|
label={{
|
||||||
|
value: formatTierShort(line.tier),
|
||||||
|
position: "insideLeft",
|
||||||
|
fill: "currentColor",
|
||||||
|
fontSize: 10,
|
||||||
|
className: "text-base-content/35",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
<XAxis
|
||||||
|
dataKey="ts"
|
||||||
|
type="number"
|
||||||
|
scale="time"
|
||||||
|
domain={xDomain}
|
||||||
|
tickFormatter={formatDate}
|
||||||
|
tick={{ fontSize: 10, fill: "currentColor" }}
|
||||||
|
className="text-base-content/40"
|
||||||
|
stroke="currentColor"
|
||||||
|
minTickGap={28}
|
||||||
|
/>
|
||||||
|
<YAxis
|
||||||
|
type="number"
|
||||||
|
domain={["dataMin - 60", "dataMax + 60"]}
|
||||||
|
hide
|
||||||
|
/>
|
||||||
|
<Tooltip
|
||||||
|
content={<TierTooltip />}
|
||||||
|
cursor={{
|
||||||
|
stroke: "currentColor",
|
||||||
|
strokeDasharray: "3 3",
|
||||||
|
className: "text-base-content/20",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{summaryVariant === "inline" && summary && (
|
||||||
|
<>
|
||||||
|
{!isSamePoint(summary.peak, summary.last) && (
|
||||||
|
<ReferenceDot
|
||||||
|
x={summary.peak.ts}
|
||||||
|
y={summary.peak.value}
|
||||||
|
r={3}
|
||||||
|
stroke="currentColor"
|
||||||
|
fill="currentColor"
|
||||||
|
className="text-amber-400"
|
||||||
|
label={{
|
||||||
|
value: formatTierCompactLabel(summary.peak),
|
||||||
|
position: "top",
|
||||||
|
fill: "currentColor",
|
||||||
|
fontSize: 10,
|
||||||
|
className: "text-amber-400",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<ReferenceDot
|
||||||
|
x={summary.last.ts}
|
||||||
|
y={summary.last.value}
|
||||||
|
r={3}
|
||||||
|
stroke="currentColor"
|
||||||
|
fill="currentColor"
|
||||||
|
className={
|
||||||
|
isSamePoint(summary.peak, summary.last)
|
||||||
|
? "text-amber-400"
|
||||||
|
: "text-primary"
|
||||||
|
}
|
||||||
|
label={{
|
||||||
|
value: formatTierCompactLabel(summary.last),
|
||||||
|
position: "top",
|
||||||
|
fill: "currentColor",
|
||||||
|
fontSize: 10,
|
||||||
|
className: isSamePoint(summary.peak, summary.last)
|
||||||
|
? "text-amber-400"
|
||||||
|
: "text-primary",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
<Line
|
||||||
|
type="monotone"
|
||||||
|
dataKey="value"
|
||||||
|
stroke="currentColor"
|
||||||
|
className="text-primary"
|
||||||
|
strokeWidth={2}
|
||||||
|
dot={{ r: 2.5, className: "text-primary", fill: "currentColor" }}
|
||||||
|
activeDot={{ r: 4 }}
|
||||||
|
isAnimationActive={false}
|
||||||
|
/>
|
||||||
|
</LineChart>
|
||||||
|
</ResponsiveContainer>
|
||||||
|
</div>
|
||||||
|
{summary && summaryVariant === "footer" && (
|
||||||
|
<div className="flex flex-wrap items-center gap-x-5 gap-y-1 border-t border-base-content/8 px-4 py-2.5 text-[11px]">
|
||||||
|
<span className="text-base-content/45">
|
||||||
|
현재{" "}
|
||||||
|
<span className="font-bold text-base-content/75">
|
||||||
|
{formatTierLabel(summary.last)}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<span className="text-base-content/45">
|
||||||
|
최고{" "}
|
||||||
|
<span className="font-bold text-amber-400">
|
||||||
|
{formatTierLabel(summary.peak)}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<span className="text-base-content/45">
|
||||||
|
기간 변동{" "}
|
||||||
|
<span
|
||||||
|
className={`font-bold ${
|
||||||
|
summary.direction === "up"
|
||||||
|
? "text-green-500"
|
||||||
|
: summary.direction === "down"
|
||||||
|
? "text-red-400"
|
||||||
|
: "text-base-content/55"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{formatPeriodChange(summary)}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -3,8 +3,12 @@ import { useSyncExternalStore } from 'react';
|
|||||||
const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId';
|
const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId';
|
||||||
const DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY = 'lolympus.devCaptainTeamIndex';
|
const DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY = 'lolympus.devCaptainTeamIndex';
|
||||||
const LEGACY_DEV_CAPTAIN_SIDE_STORAGE_KEY = 'lolympus.devCaptainSide';
|
const LEGACY_DEV_CAPTAIN_SIDE_STORAGE_KEY = 'lolympus.devCaptainSide';
|
||||||
|
const THEME_STORAGE_KEY = 'lolympus.theme';
|
||||||
const AUTH_USER_CHANGED_EVENT = 'lolympus:auth-user-changed';
|
const AUTH_USER_CHANGED_EVENT = 'lolympus:auth-user-changed';
|
||||||
const CAPTAIN_SIDE_CHANGED_EVENT = 'lolympus:captain-side-changed';
|
const CAPTAIN_SIDE_CHANGED_EVENT = 'lolympus:captain-side-changed';
|
||||||
|
const THEME_CHANGED_EVENT = 'lolympus:theme-changed';
|
||||||
|
|
||||||
|
export type AppTheme = 'light' | 'dark';
|
||||||
|
|
||||||
export const API_BASE_URL = (
|
export const API_BASE_URL = (
|
||||||
import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3000'
|
import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3000'
|
||||||
@@ -80,6 +84,40 @@ export function setDevCaptainTeamIndex(teamIndex: number | null) {
|
|||||||
dispatchWindowEvent(CAPTAIN_SIDE_CHANGED_EVENT);
|
dispatchWindowEvent(CAPTAIN_SIDE_CHANGED_EVENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function normalizeTheme(value: string | null | undefined): AppTheme {
|
||||||
|
return value === 'dark' ? 'dark' : 'light';
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyTheme(theme: AppTheme) {
|
||||||
|
if (typeof document === 'undefined') return;
|
||||||
|
document.documentElement.dataset.theme = theme;
|
||||||
|
document.documentElement.style.colorScheme = theme;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getTheme(): AppTheme {
|
||||||
|
if (typeof window === 'undefined') return 'light';
|
||||||
|
try {
|
||||||
|
return normalizeTheme(window.localStorage.getItem(THEME_STORAGE_KEY));
|
||||||
|
} catch {
|
||||||
|
return 'light';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setTheme(theme: AppTheme) {
|
||||||
|
if (typeof window === 'undefined') return;
|
||||||
|
try {
|
||||||
|
window.localStorage.setItem(THEME_STORAGE_KEY, theme);
|
||||||
|
} catch {
|
||||||
|
// Keep applying the in-memory document theme even if persistence is blocked.
|
||||||
|
}
|
||||||
|
applyTheme(theme);
|
||||||
|
dispatchWindowEvent(THEME_CHANGED_EVENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function initializeTheme() {
|
||||||
|
applyTheme(getTheme());
|
||||||
|
}
|
||||||
|
|
||||||
export function useAuthUserId(): string | null {
|
export function useAuthUserId(): string | null {
|
||||||
return useSyncExternalStore<string | null>(
|
return useSyncExternalStore<string | null>(
|
||||||
(callback) => subscribeToWindowChanges(AUTH_USER_CHANGED_EVENT, callback),
|
(callback) => subscribeToWindowChanges(AUTH_USER_CHANGED_EVENT, callback),
|
||||||
@@ -95,3 +133,11 @@ export function useDevCaptainTeamIndex(): number | null {
|
|||||||
() => null,
|
() => null,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function useTheme(): AppTheme {
|
||||||
|
return useSyncExternalStore<AppTheme>(
|
||||||
|
(callback) => subscribeToWindowChanges(THEME_CHANGED_EVENT, callback),
|
||||||
|
getTheme,
|
||||||
|
() => 'light',
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,10 +1,15 @@
|
|||||||
@import url("https://fonts.googleapis.com/css2?family=Asta+Sans:wght@300..800&family=Gamja+Flower&display=swap");
|
@import url("https://fonts.googleapis.com/css2?family=Asta+Sans:wght@300..800&family=Gamja+Flower&display=swap");
|
||||||
|
|
||||||
@import "tailwindcss";
|
@import "tailwindcss";
|
||||||
|
@custom-variant dark (&:where([data-theme=dark], [data-theme=dark] *));
|
||||||
@plugin "daisyui" {
|
@plugin "daisyui" {
|
||||||
themes:
|
themes:
|
||||||
light --default,
|
light --default,
|
||||||
dark --prefersdark;
|
dark;
|
||||||
|
}
|
||||||
|
|
||||||
|
html {
|
||||||
|
scrollbar-gutter: stable;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
|||||||
import './index.css';
|
import './index.css';
|
||||||
import App from './App.tsx';
|
import App from './App.tsx';
|
||||||
import { MsalAppProvider } from './lib/auth/MsalAppProvider.tsx';
|
import { MsalAppProvider } from './lib/auth/MsalAppProvider.tsx';
|
||||||
|
import { initializeTheme } from './config.ts';
|
||||||
|
|
||||||
|
initializeTheme();
|
||||||
|
|
||||||
const queryClient = new QueryClient({
|
const queryClient = new QueryClient({
|
||||||
defaultOptions: {
|
defaultOptions: {
|
||||||
|
|||||||
+184
-100
@@ -1,4 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
|
lazy,
|
||||||
|
Suspense,
|
||||||
useEffect,
|
useEffect,
|
||||||
useMemo,
|
useMemo,
|
||||||
useRef,
|
useRef,
|
||||||
@@ -7,15 +9,17 @@ import {
|
|||||||
type KeyboardEvent,
|
type KeyboardEvent,
|
||||||
} from 'react';
|
} from 'react';
|
||||||
import { useQueryClient } from '@tanstack/react-query';
|
import { useQueryClient } from '@tanstack/react-query';
|
||||||
import { SendHorizontal } from 'lucide-react';
|
import { AlertTriangle, SendHorizontal } from 'lucide-react';
|
||||||
import { Link, useLocation, useParams } from 'react-router';
|
import { Link, useLocation, useNavigate, useParams } from 'react-router';
|
||||||
import {
|
import {
|
||||||
useAuction,
|
useAuction,
|
||||||
useAuctionHistory,
|
useAuctionHistory,
|
||||||
useDdragonManifest,
|
useDdragonManifest,
|
||||||
useMatch,
|
useMatch,
|
||||||
useMe,
|
useMe,
|
||||||
|
useResetAuction,
|
||||||
useUndoAuction,
|
useUndoAuction,
|
||||||
|
useUserHistoryProfile,
|
||||||
} from '../api/hooks';
|
} from '../api/hooks';
|
||||||
import {
|
import {
|
||||||
mapApiAuctionToAuctionState,
|
mapApiAuctionToAuctionState,
|
||||||
@@ -40,32 +44,21 @@ import {
|
|||||||
teamIndexColorClasses,
|
teamIndexColorClasses,
|
||||||
teamIndexLabel,
|
teamIndexLabel,
|
||||||
} from '../lib/league';
|
} from '../lib/league';
|
||||||
|
import { RankBadge, ResponsiveTierLabel } from '../components/RankBadge';
|
||||||
import type {
|
import type {
|
||||||
ApiAuction,
|
ApiAuction,
|
||||||
ApiAuctionChatMessage,
|
ApiAuctionChatMessage,
|
||||||
ApiRiotLaneStats,
|
ApiRiotLaneStats,
|
||||||
ApiTierInfo,
|
|
||||||
ApiUser,
|
ApiUser,
|
||||||
Position,
|
Position,
|
||||||
} from '../api/types';
|
} from '../api/types';
|
||||||
|
|
||||||
|
const TierHistoryChart = lazy(() => import('../components/TierHistoryChart'));
|
||||||
|
|
||||||
type CaptainRole = {
|
type CaptainRole = {
|
||||||
teamIndex: number;
|
teamIndex: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
const TIER_NAMES: Record<string, string> = {
|
|
||||||
IRON: '아이언',
|
|
||||||
BRONZE: '브론즈',
|
|
||||||
SILVER: '실버',
|
|
||||||
GOLD: '골드',
|
|
||||||
PLATINUM: '플래티넘',
|
|
||||||
EMERALD: '에메랄드',
|
|
||||||
DIAMOND: '다이아몬드',
|
|
||||||
MASTER: '마스터',
|
|
||||||
GRANDMASTER: '그랜드마스터',
|
|
||||||
CHALLENGER: '챌린저',
|
|
||||||
};
|
|
||||||
|
|
||||||
function formatPoints(value: number) {
|
function formatPoints(value: number) {
|
||||||
return value.toLocaleString();
|
return value.toLocaleString();
|
||||||
}
|
}
|
||||||
@@ -108,90 +101,6 @@ function resolveChatSenderLabel(
|
|||||||
return '관전자';
|
return '관전자';
|
||||||
}
|
}
|
||||||
|
|
||||||
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 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
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`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
|
||||||
switch (tier?.tier) {
|
|
||||||
case 'CHALLENGER':
|
|
||||||
return 'border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200';
|
|
||||||
case 'GRANDMASTER':
|
|
||||||
return 'border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200';
|
|
||||||
case 'MASTER':
|
|
||||||
return 'border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200';
|
|
||||||
case 'DIAMOND':
|
|
||||||
return 'border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200';
|
|
||||||
case 'EMERALD':
|
|
||||||
return 'border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200';
|
|
||||||
case 'PLATINUM':
|
|
||||||
return 'border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200';
|
|
||||||
case 'GOLD':
|
|
||||||
return 'border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200';
|
|
||||||
case 'SILVER':
|
|
||||||
return 'border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200';
|
|
||||||
case 'BRONZE':
|
|
||||||
return 'border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200';
|
|
||||||
case 'IRON':
|
|
||||||
return 'border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300';
|
|
||||||
default:
|
|
||||||
return 'border-base-content/30 bg-transparent text-base-content/50';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
const tooltip = formatRankDetail(tier);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span className="tooltip tooltip-bottom" data-tip={tooltip}>
|
|
||||||
<span
|
|
||||||
className={`inline-flex h-[18px] min-w-[20px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
|
||||||
aria-label={tooltip}
|
|
||||||
>
|
|
||||||
{formatRankBadge(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
return (
|
|
||||||
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
|
|
||||||
<RankBadge tier={tier} />
|
|
||||||
<span className="hidden font-bold text-base-content/55 sm:inline">
|
|
||||||
{formatRankDetail(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function isCurrentBidder(
|
function isCurrentBidder(
|
||||||
currentBidder: AuctionStateView['currentBidder'],
|
currentBidder: AuctionStateView['currentBidder'],
|
||||||
team: Pick<AuctionStateView['teams'][number], 'teamIndex'>,
|
team: Pick<AuctionStateView['teams'][number], 'teamIndex'>,
|
||||||
@@ -480,7 +389,16 @@ function PlayerSpotlight({
|
|||||||
}) {
|
}) {
|
||||||
const { data: ddragon } = useDdragonManifest();
|
const { data: ddragon } = useDdragonManifest();
|
||||||
const player = state.currentPlayer;
|
const player = state.currentPlayer;
|
||||||
|
const historyProfileQuery = useUserHistoryProfile(
|
||||||
|
player?.userId,
|
||||||
|
DEFAULT_COMMUNITY_ID,
|
||||||
|
Boolean(player && player.tierHistory.length === 0),
|
||||||
|
);
|
||||||
if (!player) return null;
|
if (!player) return null;
|
||||||
|
const tierHistory =
|
||||||
|
player.tierHistory.length > 0
|
||||||
|
? player.tierHistory
|
||||||
|
: (historyProfileQuery.data?.tierHistory ?? []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="border border-base-content/10 bg-base-100">
|
<div className="border border-base-content/10 bg-base-100">
|
||||||
@@ -528,6 +446,22 @@ function PlayerSpotlight({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{tierHistory.length > 0 && (
|
||||||
|
<Suspense
|
||||||
|
fallback={
|
||||||
|
<div className="h-[180px] border-b border-base-content/8 bg-base-100" />
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<TierHistoryChart
|
||||||
|
entries={tierHistory}
|
||||||
|
className="border-b border-base-content/8 bg-base-100 overflow-hidden"
|
||||||
|
summaryVariant="inline"
|
||||||
|
height={180}
|
||||||
|
showHeader={false}
|
||||||
|
/>
|
||||||
|
</Suspense>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="grid grid-cols-2 divide-x divide-base-content/5">
|
<div className="grid grid-cols-2 divide-x divide-base-content/5">
|
||||||
<div className="p-4">
|
<div className="p-4">
|
||||||
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
|
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
|
||||||
@@ -728,6 +662,7 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
|
|||||||
export default function AuctionPage() {
|
export default function AuctionPage() {
|
||||||
const { id } = useParams();
|
const { id } = useParams();
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
|
const navigate = useNavigate();
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
const meQuery = useMe();
|
const meQuery = useMe();
|
||||||
const currentUser =
|
const currentUser =
|
||||||
@@ -747,17 +682,42 @@ export default function AuctionPage() {
|
|||||||
refetchInterval: 3000,
|
refetchInterval: 3000,
|
||||||
});
|
});
|
||||||
const undoMutation = useUndoAuction(DEFAULT_COMMUNITY_ID);
|
const undoMutation = useUndoAuction(DEFAULT_COMMUNITY_ID);
|
||||||
|
const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID);
|
||||||
const socket = useAuctionSocket(id);
|
const socket = useAuctionSocket(id);
|
||||||
const captainTeamIndex = useDevCaptainTeamIndex();
|
const captainTeamIndex = useDevCaptainTeamIndex();
|
||||||
const [now, setNow] = useState(() => Date.now());
|
const [now, setNow] = useState(() => Date.now());
|
||||||
const [assignedPosition, setAssignedPosition] = useState<Position>('MID');
|
const [assignedPosition, setAssignedPosition] = useState<Position>('MID');
|
||||||
|
const [showCancelModal, setShowCancelModal] = useState(false);
|
||||||
|
const [cancelConfirmText, setCancelConfirmText] = useState('');
|
||||||
|
const cancelConfirmInputRef = useRef<HTMLInputElement>(null);
|
||||||
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
||||||
|
const canConfirmAuctionCancel = cancelConfirmText.trim() === '예';
|
||||||
|
|
||||||
|
async function invalidateAuctionData() {
|
||||||
|
if (!id) return;
|
||||||
|
await Promise.all([
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: ['auction', DEFAULT_COMMUNITY_ID, id],
|
||||||
|
}),
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: ['auction-history', DEFAULT_COMMUNITY_ID, id],
|
||||||
|
}),
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: ['match', DEFAULT_COMMUNITY_ID, id],
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const timer = window.setInterval(() => setNow(Date.now()), 1000);
|
const timer = window.setInterval(() => setNow(Date.now()), 1000);
|
||||||
return () => window.clearInterval(timer);
|
return () => window.clearInterval(timer);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!showCancelModal) return;
|
||||||
|
cancelConfirmInputRef.current?.focus();
|
||||||
|
}, [showCancelModal]);
|
||||||
|
|
||||||
const liveAuction = pickLatestAuction(socket.auction, auctionQuery.data);
|
const liveAuction = pickLatestAuction(socket.auction, auctionQuery.data);
|
||||||
const auctionState =
|
const auctionState =
|
||||||
liveAuction && matchQuery.data
|
liveAuction && matchQuery.data
|
||||||
@@ -788,6 +748,13 @@ export default function AuctionPage() {
|
|||||||
}
|
}
|
||||||
}, [availableTeamIndexes, captainTeamIndex]);
|
}, [availableTeamIndexes, captainTeamIndex]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!socket.resetAt || !id) return;
|
||||||
|
void invalidateAuctionData().finally(() => {
|
||||||
|
navigate(`/match/${id}`, { replace: true });
|
||||||
|
});
|
||||||
|
}, [id, navigate, socket.resetAt]);
|
||||||
|
|
||||||
if (!DEFAULT_COMMUNITY_ID) {
|
if (!DEFAULT_COMMUNITY_ID) {
|
||||||
return (
|
return (
|
||||||
<main className="max-w-5xl mx-auto px-4 py-20 text-center">
|
<main className="max-w-5xl mx-auto px-4 py-20 text-center">
|
||||||
@@ -862,6 +829,21 @@ export default function AuctionPage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleResetAuction() {
|
||||||
|
if (!id || !canConfirmAuctionCancel) return;
|
||||||
|
resetAuctionMutation.mutate(
|
||||||
|
{ matchId: id },
|
||||||
|
{
|
||||||
|
onSuccess: async () => {
|
||||||
|
setShowCancelModal(false);
|
||||||
|
setCancelConfirmText('');
|
||||||
|
await invalidateAuctionData();
|
||||||
|
navigate(`/match/${id}`, { replace: true });
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const undoPanel = canManageAuction ? (
|
const undoPanel = canManageAuction ? (
|
||||||
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
|
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
|
||||||
@@ -930,6 +912,12 @@ export default function AuctionPage() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{resetAuctionMutation.error instanceof Error && (
|
||||||
|
<div className="mb-4 border border-red-500/20 bg-red-500/10 px-4 py-3 text-sm text-red-500">
|
||||||
|
{resetAuctionMutation.error.message}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="mb-5 flex items-start justify-between flex-wrap gap-3">
|
<div className="mb-5 flex items-start justify-between flex-wrap gap-3">
|
||||||
<div>
|
<div>
|
||||||
<h1 className="text-xl font-bold text-base-content leading-tight">
|
<h1 className="text-xl font-bold text-base-content leading-tight">
|
||||||
@@ -1101,6 +1089,23 @@ export default function AuctionPage() {
|
|||||||
다음 선수
|
다음 선수
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
<div className="border-t border-base-content/10 pt-3">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-outline btn-error btn-sm inline-flex items-center gap-1.5 px-4 text-xs"
|
||||||
|
onClick={() => {
|
||||||
|
setCancelConfirmText('');
|
||||||
|
setShowCancelModal(true);
|
||||||
|
}}
|
||||||
|
disabled={resetAuctionMutation.isPending}
|
||||||
|
>
|
||||||
|
<AlertTriangle className="h-3.5 w-3.5" />
|
||||||
|
경매 진행 취소
|
||||||
|
</button>
|
||||||
|
<p className="mt-2 text-[11px] leading-relaxed text-base-content/35">
|
||||||
|
경매 데이터와 진행 기록을 삭제하고 내전을 모집 상태로 되돌립니다.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{undoPanel}
|
{undoPanel}
|
||||||
@@ -1138,6 +1143,85 @@ export default function AuctionPage() {
|
|||||||
className="h-[420px]"
|
className="h-[420px]"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{showCancelModal && (
|
||||||
|
<div
|
||||||
|
className="fixed inset-0 z-50 flex items-center justify-center bg-black/55 px-4"
|
||||||
|
role="dialog"
|
||||||
|
aria-modal="true"
|
||||||
|
aria-labelledby="auction-cancel-title"
|
||||||
|
>
|
||||||
|
<div className="w-full max-w-md border border-red-500/25 bg-base-100 p-5 shadow-2xl">
|
||||||
|
<div className="flex items-start gap-3">
|
||||||
|
<span className="inline-flex h-9 w-9 shrink-0 items-center justify-center border border-red-500/25 bg-red-500/10 text-red-400">
|
||||||
|
<AlertTriangle className="h-4 w-4" />
|
||||||
|
</span>
|
||||||
|
<div className="min-w-0">
|
||||||
|
<h2
|
||||||
|
id="auction-cancel-title"
|
||||||
|
className="text-base font-bold text-base-content"
|
||||||
|
>
|
||||||
|
경매 진행 취소
|
||||||
|
</h2>
|
||||||
|
<p className="mt-2 text-sm leading-6 text-base-content/60">
|
||||||
|
정말 경매를 취소하고 모집 상태로 되돌리시겠습니까?
|
||||||
|
경매 데이터, 입찰 기록, 팀 배정 정보가 삭제됩니다.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<label
|
||||||
|
htmlFor="auction-cancel-confirm"
|
||||||
|
className="mt-5 block text-[11px] font-bold uppercase tracking-wider text-base-content/40"
|
||||||
|
>
|
||||||
|
계속하려면 예 입력
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="auction-cancel-confirm"
|
||||||
|
ref={cancelConfirmInputRef}
|
||||||
|
value={cancelConfirmText}
|
||||||
|
onChange={(event) => setCancelConfirmText(event.target.value)}
|
||||||
|
onKeyDown={(event) => {
|
||||||
|
if (event.key === 'Escape') {
|
||||||
|
setShowCancelModal(false);
|
||||||
|
setCancelConfirmText('');
|
||||||
|
}
|
||||||
|
if (event.key === 'Enter' && canConfirmAuctionCancel) {
|
||||||
|
handleResetAuction();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
className="mt-2 h-10 w-full border border-base-content/15 bg-base-100 px-3 text-sm text-base-content outline-none transition-colors focus:border-red-400/60"
|
||||||
|
placeholder="예"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div className="mt-5 flex flex-wrap justify-end gap-2">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-ghost btn-sm px-4 text-xs"
|
||||||
|
onClick={() => {
|
||||||
|
setShowCancelModal(false);
|
||||||
|
setCancelConfirmText('');
|
||||||
|
}}
|
||||||
|
disabled={resetAuctionMutation.isPending}
|
||||||
|
>
|
||||||
|
닫기
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-error btn-sm px-4 text-xs"
|
||||||
|
onClick={handleResetAuction}
|
||||||
|
disabled={
|
||||||
|
!canConfirmAuctionCancel || resetAuctionMutation.isPending
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{resetAuctionMutation.isPending
|
||||||
|
? '취소 처리 중...'
|
||||||
|
: '경매 취소 진행'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,12 +14,12 @@ import {
|
|||||||
} from "../api/hooks";
|
} from "../api/hooks";
|
||||||
import {
|
import {
|
||||||
buildDefaultPreferredPositions,
|
buildDefaultPreferredPositions,
|
||||||
formatTierLabel,
|
|
||||||
mapApiMatchToMatchDetail,
|
mapApiMatchToMatchDetail,
|
||||||
type MatchDetailView,
|
type MatchDetailView,
|
||||||
type ParticipantView,
|
type ParticipantView,
|
||||||
type TeamView,
|
type TeamView,
|
||||||
} from "../api/mappers";
|
} from "../api/mappers";
|
||||||
|
import { RankBadge } from "../components/RankBadge";
|
||||||
import { DEFAULT_COMMUNITY_ID, useAuthUserId } from "../config";
|
import { DEFAULT_COMMUNITY_ID, useAuthUserId } from "../config";
|
||||||
import { apiFetch, ApiError } from "../lib/api";
|
import { apiFetch, ApiError } from "../lib/api";
|
||||||
import { profileIconUrl } from "../lib/ddragon";
|
import { profileIconUrl } from "../lib/ddragon";
|
||||||
@@ -176,84 +176,6 @@ function tierByQueue(tiers: ApiTierInfo[], queueType: string) {
|
|||||||
return tiers.find((tier) => tier.queueType === queueType);
|
return tiers.find((tier) => tier.queueType === queueType);
|
||||||
}
|
}
|
||||||
|
|
||||||
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 formatRankTooltip(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return "언랭크";
|
|
||||||
const highTier = ["MASTER", "GRANDMASTER", "CHALLENGER"].includes(tier.tier);
|
|
||||||
const normalizedTier = {
|
|
||||||
...tier,
|
|
||||||
rank: normalizeRank(tier.rank) ?? tier.rank,
|
|
||||||
};
|
|
||||||
const label = highTier
|
|
||||||
? formatTierLabel({ ...normalizedTier, leaguePoints: 0 })
|
|
||||||
: formatTierLabel(normalizedTier);
|
|
||||||
return `${label} - ${tier.leaguePoints}LP`;
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
|
||||||
switch (tier?.tier) {
|
|
||||||
case "CHALLENGER":
|
|
||||||
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
|
|
||||||
case "GRANDMASTER":
|
|
||||||
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
|
|
||||||
case "MASTER":
|
|
||||||
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
|
|
||||||
case "DIAMOND":
|
|
||||||
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
|
|
||||||
case "EMERALD":
|
|
||||||
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
|
|
||||||
case "PLATINUM":
|
|
||||||
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
|
|
||||||
case "GOLD":
|
|
||||||
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
|
|
||||||
case "SILVER":
|
|
||||||
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
|
|
||||||
case "BRONZE":
|
|
||||||
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
|
|
||||||
case "IRON":
|
|
||||||
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
|
|
||||||
default:
|
|
||||||
return "border-base-content/30 bg-transparent text-base-content/50";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
const tooltip = formatRankTooltip(tier);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span className="tooltip tooltip-left" data-tip={tooltip}>
|
|
||||||
<span
|
|
||||||
className={`inline-flex h-[17px] min-w-[18px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
|
||||||
aria-label={tooltip}
|
|
||||||
>
|
|
||||||
{formatRankBadge(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function QueueRankCell({
|
function QueueRankCell({
|
||||||
label,
|
label,
|
||||||
tier,
|
tier,
|
||||||
@@ -262,9 +184,9 @@ function QueueRankCell({
|
|||||||
tier?: ApiTierInfo;
|
tier?: ApiTierInfo;
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex items-center gap-1">
|
<span className="inline-flex w-[54px] items-center gap-1">
|
||||||
<span>{label}</span>
|
<span>{label}</span>
|
||||||
<RankBadge tier={tier} />
|
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -273,7 +195,7 @@ function SoloRankPrefix({ tier }: { tier?: ApiTierInfo }) {
|
|||||||
return (
|
return (
|
||||||
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
|
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
|
||||||
{/* <span>SOLO</span> */}
|
{/* <span>SOLO</span> */}
|
||||||
<RankBadge tier={tier} />
|
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -800,7 +722,13 @@ function TeamCard({
|
|||||||
진행 페이지
|
진행 페이지
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<table className="w-full text-left">
|
<table className="w-full table-fixed text-left">
|
||||||
|
<colgroup>
|
||||||
|
<col className="w-11" />
|
||||||
|
<col />
|
||||||
|
<col className="w-56" />
|
||||||
|
<col className="w-32" />
|
||||||
|
</colgroup>
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="border-b border-base-content/8 bg-base-200/30 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
<tr className="border-b border-base-content/8 bg-base-200/30 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
||||||
<th className="py-2 px-3 w-8">#</th>
|
<th className="py-2 px-3 w-8">#</th>
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ import {
|
|||||||
useMatch,
|
useMatch,
|
||||||
useUserHistoryProfile,
|
useUserHistoryProfile,
|
||||||
} from "../api/hooks";
|
} from "../api/hooks";
|
||||||
import { formatKoreanDate, formatTierLabel } from "../api/mappers";
|
import { formatKoreanDate } from "../api/mappers";
|
||||||
|
import { RankBadge } from "../components/RankBadge";
|
||||||
import type {
|
import type {
|
||||||
ApiMatch,
|
ApiMatch,
|
||||||
ApiMatchGameResult,
|
ApiMatchGameResult,
|
||||||
@@ -45,94 +46,6 @@ function tierByQueue(tiers: ApiTierInfo[], queueType: string) {
|
|||||||
return tiers.find((tier) => tier.queueType === queueType);
|
return tiers.find((tier) => tier.queueType === queueType);
|
||||||
}
|
}
|
||||||
|
|
||||||
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 formatRankTooltip(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return "언랭크";
|
|
||||||
const highTier = ["MASTER", "GRANDMASTER", "CHALLENGER"].includes(tier.tier);
|
|
||||||
const normalizedTier = {
|
|
||||||
...tier,
|
|
||||||
rank: normalizeRank(tier.rank) ?? tier.rank,
|
|
||||||
};
|
|
||||||
const label = highTier
|
|
||||||
? formatTierLabel({ ...normalizedTier, leaguePoints: 0 })
|
|
||||||
: formatTierLabel(normalizedTier);
|
|
||||||
return `${label} - ${tier.leaguePoints}LP`;
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
|
||||||
switch (tier?.tier) {
|
|
||||||
case "CHALLENGER":
|
|
||||||
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
|
|
||||||
|
|
||||||
case "GRANDMASTER":
|
|
||||||
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
|
|
||||||
|
|
||||||
case "MASTER":
|
|
||||||
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
|
|
||||||
|
|
||||||
case "DIAMOND":
|
|
||||||
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
|
|
||||||
|
|
||||||
case "EMERALD":
|
|
||||||
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
|
|
||||||
|
|
||||||
case "PLATINUM":
|
|
||||||
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
|
|
||||||
|
|
||||||
case "GOLD":
|
|
||||||
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
|
|
||||||
|
|
||||||
case "SILVER":
|
|
||||||
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
|
|
||||||
|
|
||||||
case "BRONZE":
|
|
||||||
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
|
|
||||||
|
|
||||||
case "IRON":
|
|
||||||
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
|
|
||||||
|
|
||||||
default:
|
|
||||||
return "border-base-content/30 bg-transparent text-base-content/50";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
const tooltip = formatRankTooltip(tier);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span className="tooltip tooltip-left" data-tip={tooltip}>
|
|
||||||
<span
|
|
||||||
className={`inline-flex h-[17px] min-w-[18px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
|
||||||
aria-label={tooltip}
|
|
||||||
>
|
|
||||||
{formatRankBadge(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function SummonerStatsSummary({
|
function SummonerStatsSummary({
|
||||||
assignedPosition,
|
assignedPosition,
|
||||||
fallbackTier,
|
fallbackTier,
|
||||||
@@ -157,11 +70,11 @@ function SummonerStatsSummary({
|
|||||||
<div className="mt-1 flex items-center justify-end gap-2 text-[10px] font-black text-base-content/35">
|
<div className="mt-1 flex items-center justify-end gap-2 text-[10px] font-black text-base-content/35">
|
||||||
<span className="inline-flex items-center gap-1">
|
<span className="inline-flex items-center gap-1">
|
||||||
<span>SOLO</span>
|
<span>SOLO</span>
|
||||||
<RankBadge tier={soloTier} />
|
<RankBadge tier={soloTier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
<span className="inline-flex items-center gap-1">
|
<span className="inline-flex items-center gap-1">
|
||||||
<span>FLEX</span>
|
<span>FLEX</span>
|
||||||
<RankBadge tier={flexTier} />
|
<RankBadge tier={flexTier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useState } from "react";
|
import { lazy, Suspense, useState } from "react";
|
||||||
import { useQueryClient } from "@tanstack/react-query";
|
import { useQueryClient } from "@tanstack/react-query";
|
||||||
import { ChevronDown, ChevronUp } from "lucide-react";
|
import { ChevronDown, ChevronUp } from "lucide-react";
|
||||||
import { Link, useLocation, useParams, useSearchParams } from "react-router";
|
import { Link, useLocation, useParams, useSearchParams } from "react-router";
|
||||||
@@ -16,7 +16,6 @@ import { useRiotRefreshSocket } from "../api/useRiotRefreshSocket";
|
|||||||
import type {
|
import type {
|
||||||
ApiChampionStatsRow,
|
ApiChampionStatsRow,
|
||||||
ApiEnqueueRefreshResult,
|
ApiEnqueueRefreshResult,
|
||||||
ApiTierInfo,
|
|
||||||
ApiRiotRefreshEvent,
|
ApiRiotRefreshEvent,
|
||||||
ApiRecentMatchTeam,
|
ApiRecentMatchTeam,
|
||||||
ApiRecentMatchTeamParticipant,
|
ApiRecentMatchTeamParticipant,
|
||||||
@@ -43,6 +42,9 @@ import {
|
|||||||
QUEUE_GROUP_TABS,
|
QUEUE_GROUP_TABS,
|
||||||
RANK_FILTER_TABS,
|
RANK_FILTER_TABS,
|
||||||
} from "../lib/riot-history";
|
} from "../lib/riot-history";
|
||||||
|
import { ResponsiveTierLabel } from "../components/RankBadge";
|
||||||
|
// recharts가 무거워 메인 번들에서 분리한다 (전적 페이지에서만 로드).
|
||||||
|
const TierHistoryChart = lazy(() => import("../components/TierHistoryChart"));
|
||||||
|
|
||||||
type ChampionSortKey = "games" | "winRate" | "kda" | "avgCsPerMin";
|
type ChampionSortKey = "games" | "winRate" | "kda" | "avgCsPerMin";
|
||||||
|
|
||||||
@@ -57,19 +59,6 @@ const SORT_LABELS: Record<ChampionSortKey, string> = {
|
|||||||
avgCsPerMin: "분당 CS",
|
avgCsPerMin: "분당 CS",
|
||||||
};
|
};
|
||||||
|
|
||||||
const TIER_NAMES: Record<string, string> = {
|
|
||||||
IRON: "아이언",
|
|
||||||
BRONZE: "브론즈",
|
|
||||||
SILVER: "실버",
|
|
||||||
GOLD: "골드",
|
|
||||||
PLATINUM: "플래티넘",
|
|
||||||
EMERALD: "에메랄드",
|
|
||||||
DIAMOND: "다이아몬드",
|
|
||||||
MASTER: "마스터",
|
|
||||||
GRANDMASTER: "그랜드마스터",
|
|
||||||
CHALLENGER: "챌린저",
|
|
||||||
};
|
|
||||||
|
|
||||||
function resolveBackTo(state: unknown) {
|
function resolveBackTo(state: unknown) {
|
||||||
if (!state || typeof state !== "object") return "/";
|
if (!state || typeof state !== "object") return "/";
|
||||||
const backTo = (state as HistoryLocationState).backTo;
|
const backTo = (state as HistoryLocationState).backTo;
|
||||||
@@ -83,90 +72,6 @@ function resolveBackTo(state: unknown) {
|
|||||||
return backTo;
|
return backTo;
|
||||||
}
|
}
|
||||||
|
|
||||||
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 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
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`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
|
||||||
switch (tier?.tier) {
|
|
||||||
case "CHALLENGER":
|
|
||||||
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
|
|
||||||
case "GRANDMASTER":
|
|
||||||
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
|
|
||||||
case "MASTER":
|
|
||||||
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
|
|
||||||
case "DIAMOND":
|
|
||||||
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
|
|
||||||
case "EMERALD":
|
|
||||||
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
|
|
||||||
case "PLATINUM":
|
|
||||||
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
|
|
||||||
case "GOLD":
|
|
||||||
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
|
|
||||||
case "SILVER":
|
|
||||||
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
|
|
||||||
case "BRONZE":
|
|
||||||
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
|
|
||||||
case "IRON":
|
|
||||||
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
|
|
||||||
default:
|
|
||||||
return "border-base-content/30 bg-transparent text-base-content/50";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
const tooltip = formatRankDetail(tier);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span className="tooltip tooltip-bottom" data-tip={tooltip}>
|
|
||||||
<span
|
|
||||||
className={`inline-flex h-[18px] min-w-[20px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
|
||||||
aria-label={tooltip}
|
|
||||||
>
|
|
||||||
{formatRankBadge(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
return (
|
|
||||||
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
|
|
||||||
<RankBadge tier={tier} />
|
|
||||||
<span className="hidden font-bold text-base-content/55 sm:inline">
|
|
||||||
{formatRankDetail(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatDuration(seconds: number) {
|
function formatDuration(seconds: number) {
|
||||||
const minutes = Math.floor(seconds / 60);
|
const minutes = Math.floor(seconds / 60);
|
||||||
const rest = seconds % 60;
|
const rest = seconds % 60;
|
||||||
@@ -1294,6 +1199,16 @@ export default function UserHistoryPage() {
|
|||||||
)}
|
)}
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
{profile.tierHistory.length > 0 && (
|
||||||
|
<Suspense
|
||||||
|
fallback={
|
||||||
|
<div className="mb-5 h-[180px] border border-base-content/10 bg-base-100" />
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<TierHistoryChart entries={profile.tierHistory} />
|
||||||
|
</Suspense>
|
||||||
|
)}
|
||||||
|
|
||||||
<section className="border border-base-content/10 bg-base-100 mb-5">
|
<section className="border border-base-content/10 bg-base-100 mb-5">
|
||||||
<div className="flex flex-wrap border-b border-base-content/8">
|
<div className="flex flex-wrap border-b border-base-content/8">
|
||||||
{QUEUE_GROUP_TABS.map((tab) => (
|
{QUEUE_GROUP_TABS.map((tab) => (
|
||||||
|
|||||||
+60
-1
@@ -1,10 +1,69 @@
|
|||||||
import { defineConfig } from "vite";
|
import { defineConfig } from "vite";
|
||||||
import react from "@vitejs/plugin-react";
|
import react from "@vitejs/plugin-react";
|
||||||
import tailwindcss from "@tailwindcss/vite";
|
import tailwindcss from "@tailwindcss/vite";
|
||||||
|
import { createRequire } from "node:module";
|
||||||
|
import fs from "node:fs";
|
||||||
|
import path from "node:path";
|
||||||
|
|
||||||
|
const ES_TOOLKIT_COMPAT_RE = /^es-toolkit\/compat\/[A-Za-z0-9_$]+$/;
|
||||||
|
const VIRTUAL_ES_TOOLKIT_COMPAT_PREFIX = "\0es-toolkit-compat-esm:";
|
||||||
|
|
||||||
|
function esToolkitCompatEsm() {
|
||||||
|
return {
|
||||||
|
name: "es-toolkit-compat-esm",
|
||||||
|
enforce: "pre" as const,
|
||||||
|
resolveId(source: string, importer?: string) {
|
||||||
|
if (!importer || !ES_TOOLKIT_COMPAT_RE.test(source)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const requireFromImporter = createRequire(importer);
|
||||||
|
const wrapperPath = requireFromImporter.resolve(source);
|
||||||
|
const wrapperSource = fs.readFileSync(wrapperPath, "utf8");
|
||||||
|
const wrapperMatch = wrapperSource.match(
|
||||||
|
/require\(['"](\.\.\/dist\/compat\/[^'"]+)\.js['"]\)\.([A-Za-z0-9_$]+)/,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!wrapperMatch) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const [, esmPathWithoutExtension, exportName] = wrapperMatch;
|
||||||
|
const esmPath = path.resolve(
|
||||||
|
path.dirname(wrapperPath),
|
||||||
|
`${esmPathWithoutExtension}.mjs`,
|
||||||
|
);
|
||||||
|
|
||||||
|
return `${VIRTUAL_ES_TOOLKIT_COMPAT_PREFIX}${encodeURIComponent(
|
||||||
|
exportName,
|
||||||
|
)}:${encodeURIComponent(esmPath)}`;
|
||||||
|
},
|
||||||
|
load(id: string) {
|
||||||
|
if (!id.startsWith(VIRTUAL_ES_TOOLKIT_COMPAT_PREFIX)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const [encodedExportName, encodedEsmPath] = id
|
||||||
|
.slice(VIRTUAL_ES_TOOLKIT_COMPAT_PREFIX.length)
|
||||||
|
.split(":");
|
||||||
|
const exportName = decodeURIComponent(encodedExportName);
|
||||||
|
const esmPath = decodeURIComponent(encodedEsmPath);
|
||||||
|
|
||||||
|
return `export { ${exportName} as default, ${exportName} } from ${JSON.stringify(
|
||||||
|
esmPath,
|
||||||
|
)};`;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// https://vite.dev/config/
|
// https://vite.dev/config/
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [react(), tailwindcss()],
|
plugins: [esToolkitCompatEsm(), react(), tailwindcss()],
|
||||||
|
optimizeDeps: {
|
||||||
|
rolldownOptions: {
|
||||||
|
plugins: [esToolkitCompatEsm()],
|
||||||
|
},
|
||||||
|
},
|
||||||
server: {
|
server: {
|
||||||
host: "0.0.0.0",
|
host: "0.0.0.0",
|
||||||
allowedHosts: ["126.dahyeon.us"],
|
allowedHosts: ["126.dahyeon.us"],
|
||||||
|
|||||||
Generated
+313
@@ -159,6 +159,9 @@ importers:
|
|||||||
react-router:
|
react-router:
|
||||||
specifier: ^7.14.0
|
specifier: ^7.14.0
|
||||||
version: 7.14.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
|
version: 7.14.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
|
||||||
|
recharts:
|
||||||
|
specifier: ^3.8.1
|
||||||
|
version: 3.8.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@18.3.1)(react@19.2.5)(redux@5.0.1)
|
||||||
socket.io-client:
|
socket.io-client:
|
||||||
specifier: ^4.8.3
|
specifier: ^4.8.3
|
||||||
version: 4.8.3
|
version: 4.8.3
|
||||||
@@ -1437,6 +1440,17 @@ packages:
|
|||||||
peerDependencies:
|
peerDependencies:
|
||||||
'@redis/client': ^5.12.1
|
'@redis/client': ^5.12.1
|
||||||
|
|
||||||
|
'@reduxjs/toolkit@2.12.0':
|
||||||
|
resolution: {integrity: sha512-KiT+RzZbp6mQET+Mg+h2c97+9j1sNflUxQkIHI7Yuzf6Peu+OYpmkn6nbHWmLLWj+1ZODUJFwGZ7gx3L9R9EOw==}
|
||||||
|
peerDependencies:
|
||||||
|
react: ^16.9.0 || ^17.0.0 || ^18 || ^19
|
||||||
|
react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0
|
||||||
|
peerDependenciesMeta:
|
||||||
|
react:
|
||||||
|
optional: true
|
||||||
|
react-redux:
|
||||||
|
optional: true
|
||||||
|
|
||||||
'@rolldown/binding-android-arm64@1.0.0-rc.15':
|
'@rolldown/binding-android-arm64@1.0.0-rc.15':
|
||||||
resolution: {integrity: sha512-YYe6aWruPZDtHNpwu7+qAHEMbQ/yRl6atqb/AhznLTnD3UY99Q1jE7ihLSahNWkF4EqRPVC4SiR4O0UkLK02tA==}
|
resolution: {integrity: sha512-YYe6aWruPZDtHNpwu7+qAHEMbQ/yRl6atqb/AhznLTnD3UY99Q1jE7ihLSahNWkF4EqRPVC4SiR4O0UkLK02tA==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
@@ -1722,6 +1736,12 @@ packages:
|
|||||||
'@speed-highlight/core@1.2.15':
|
'@speed-highlight/core@1.2.15':
|
||||||
resolution: {integrity: sha512-BMq1K3DsElxDWawkX6eLg9+CKJrTVGCBAWVuHXVUV2u0s2711qiChLSId6ikYPfxhdYocLNt3wWwSvDiTvFabw==}
|
resolution: {integrity: sha512-BMq1K3DsElxDWawkX6eLg9+CKJrTVGCBAWVuHXVUV2u0s2711qiChLSId6ikYPfxhdYocLNt3wWwSvDiTvFabw==}
|
||||||
|
|
||||||
|
'@standard-schema/spec@1.1.0':
|
||||||
|
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
|
||||||
|
|
||||||
|
'@standard-schema/utils@0.3.0':
|
||||||
|
resolution: {integrity: sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==}
|
||||||
|
|
||||||
'@tailwindcss/node@4.2.2':
|
'@tailwindcss/node@4.2.2':
|
||||||
resolution: {integrity: sha512-pXS+wJ2gZpVXqFaUEjojq7jzMpTGf8rU6ipJz5ovJV6PUGmlJ+jvIwGrzdHdQ80Sg+wmQxUFuoW1UAAwHNEdFA==}
|
resolution: {integrity: sha512-pXS+wJ2gZpVXqFaUEjojq7jzMpTGf8rU6ipJz5ovJV6PUGmlJ+jvIwGrzdHdQ80Sg+wmQxUFuoW1UAAwHNEdFA==}
|
||||||
|
|
||||||
@@ -1866,6 +1886,33 @@ packages:
|
|||||||
'@types/cors@2.8.19':
|
'@types/cors@2.8.19':
|
||||||
resolution: {integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==}
|
resolution: {integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==}
|
||||||
|
|
||||||
|
'@types/d3-array@3.2.2':
|
||||||
|
resolution: {integrity: sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==}
|
||||||
|
|
||||||
|
'@types/d3-color@3.1.3':
|
||||||
|
resolution: {integrity: sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==}
|
||||||
|
|
||||||
|
'@types/d3-ease@3.0.2':
|
||||||
|
resolution: {integrity: sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==}
|
||||||
|
|
||||||
|
'@types/d3-interpolate@3.0.4':
|
||||||
|
resolution: {integrity: sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==}
|
||||||
|
|
||||||
|
'@types/d3-path@3.1.1':
|
||||||
|
resolution: {integrity: sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==}
|
||||||
|
|
||||||
|
'@types/d3-scale@4.0.9':
|
||||||
|
resolution: {integrity: sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==}
|
||||||
|
|
||||||
|
'@types/d3-shape@3.1.8':
|
||||||
|
resolution: {integrity: sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==}
|
||||||
|
|
||||||
|
'@types/d3-time@3.0.4':
|
||||||
|
resolution: {integrity: sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==}
|
||||||
|
|
||||||
|
'@types/d3-timer@3.0.2':
|
||||||
|
resolution: {integrity: sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==}
|
||||||
|
|
||||||
'@types/eslint-scope@3.7.7':
|
'@types/eslint-scope@3.7.7':
|
||||||
resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
|
resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
|
||||||
|
|
||||||
@@ -1934,6 +1981,9 @@ packages:
|
|||||||
'@types/supertest@7.2.0':
|
'@types/supertest@7.2.0':
|
||||||
resolution: {integrity: sha512-uh2Lv57xvggst6lCqNdFAmDSvoMG7M/HDtX4iUCquxQ5EGPtaPM5PL5Hmi7LCvOG8db7YaCPNJEeoI8s/WzIQw==}
|
resolution: {integrity: sha512-uh2Lv57xvggst6lCqNdFAmDSvoMG7M/HDtX4iUCquxQ5EGPtaPM5PL5Hmi7LCvOG8db7YaCPNJEeoI8s/WzIQw==}
|
||||||
|
|
||||||
|
'@types/use-sync-external-store@0.0.6':
|
||||||
|
resolution: {integrity: sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==}
|
||||||
|
|
||||||
'@types/validator@13.15.10':
|
'@types/validator@13.15.10':
|
||||||
resolution: {integrity: sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==}
|
resolution: {integrity: sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==}
|
||||||
|
|
||||||
@@ -2473,6 +2523,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
|
resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
|
||||||
engines: {node: '>=0.8'}
|
engines: {node: '>=0.8'}
|
||||||
|
|
||||||
|
clsx@2.1.1:
|
||||||
|
resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
|
||||||
|
engines: {node: '>=6'}
|
||||||
|
|
||||||
cluster-key-slot@1.1.2:
|
cluster-key-slot@1.1.2:
|
||||||
resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
|
resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
|
||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
@@ -2569,6 +2623,50 @@ packages:
|
|||||||
csstype@3.2.3:
|
csstype@3.2.3:
|
||||||
resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
|
resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
|
||||||
|
|
||||||
|
d3-array@3.2.4:
|
||||||
|
resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-color@3.1.0:
|
||||||
|
resolution: {integrity: sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-ease@3.0.1:
|
||||||
|
resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-format@3.1.2:
|
||||||
|
resolution: {integrity: sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-interpolate@3.0.1:
|
||||||
|
resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-path@3.1.0:
|
||||||
|
resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-scale@4.0.2:
|
||||||
|
resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-shape@3.2.0:
|
||||||
|
resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-time-format@4.1.0:
|
||||||
|
resolution: {integrity: sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-time@3.1.0:
|
||||||
|
resolution: {integrity: sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
|
d3-timer@3.0.1:
|
||||||
|
resolution: {integrity: sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
daisyui@5.5.19:
|
daisyui@5.5.19:
|
||||||
resolution: {integrity: sha512-pbFAkl1VCEh/MPCeclKL61I/MqRIFFhNU7yiXoDDRapXN4/qNCoMxeCCswyxEEhqL5eiTTfwHvucFtOE71C9sA==}
|
resolution: {integrity: sha512-pbFAkl1VCEh/MPCeclKL61I/MqRIFFhNU7yiXoDDRapXN4/qNCoMxeCCswyxEEhqL5eiTTfwHvucFtOE71C9sA==}
|
||||||
|
|
||||||
@@ -2581,6 +2679,9 @@ packages:
|
|||||||
supports-color:
|
supports-color:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
decimal.js-light@2.5.1:
|
||||||
|
resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==}
|
||||||
|
|
||||||
dedent@1.7.2:
|
dedent@1.7.2:
|
||||||
resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==}
|
resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -2701,6 +2802,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
|
resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
|
||||||
engines: {node: '>= 0.4'}
|
engines: {node: '>= 0.4'}
|
||||||
|
|
||||||
|
es-toolkit@1.47.0:
|
||||||
|
resolution: {integrity: sha512-n1GuoD0WEQZMBk5tttoZSqwgyLx01oqa5XsBmCHwPyNe1S9jPBEmtR2pSgp2kJuWE3ciFZ6yRHmY4pM4C3OOkw==}
|
||||||
|
|
||||||
esbuild@0.27.3:
|
esbuild@0.27.3:
|
||||||
resolution: {integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==}
|
resolution: {integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
@@ -2815,6 +2919,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
|
resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
|
||||||
engines: {node: '>= 0.6'}
|
engines: {node: '>= 0.6'}
|
||||||
|
|
||||||
|
eventemitter3@5.0.4:
|
||||||
|
resolution: {integrity: sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==}
|
||||||
|
|
||||||
events@3.3.0:
|
events@3.3.0:
|
||||||
resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
|
resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
|
||||||
engines: {node: '>=0.8.x'}
|
engines: {node: '>=0.8.x'}
|
||||||
@@ -3069,6 +3176,12 @@ packages:
|
|||||||
resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
|
resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
|
||||||
engines: {node: '>= 4'}
|
engines: {node: '>= 4'}
|
||||||
|
|
||||||
|
immer@10.2.0:
|
||||||
|
resolution: {integrity: sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==}
|
||||||
|
|
||||||
|
immer@11.1.8:
|
||||||
|
resolution: {integrity: sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA==}
|
||||||
|
|
||||||
import-fresh@3.3.1:
|
import-fresh@3.3.1:
|
||||||
resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
|
resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
|
||||||
engines: {node: '>=6'}
|
engines: {node: '>=6'}
|
||||||
@@ -3089,6 +3202,10 @@ packages:
|
|||||||
inherits@2.0.4:
|
inherits@2.0.4:
|
||||||
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
|
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
|
||||||
|
|
||||||
|
internmap@2.0.3:
|
||||||
|
resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
|
||||||
ipaddr.js@1.9.1:
|
ipaddr.js@1.9.1:
|
||||||
resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
|
resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
|
||||||
engines: {node: '>= 0.10'}
|
engines: {node: '>= 0.10'}
|
||||||
@@ -3867,6 +3984,18 @@ packages:
|
|||||||
react-is@18.3.1:
|
react-is@18.3.1:
|
||||||
resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
|
resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
|
||||||
|
|
||||||
|
react-redux@9.3.0:
|
||||||
|
resolution: {integrity: sha512-KQopgqFo/p/fgmAs5qz6p5RWaNAzq40WAu7fJIXnQpYxFPbJYtsJPWvGeF2rOBaY/kEuV77AVsX8TsQzKm+A/g==}
|
||||||
|
peerDependencies:
|
||||||
|
'@types/react': ^18.2.25 || ^19
|
||||||
|
react: ^18.0 || ^19
|
||||||
|
redux: ^5.0.0
|
||||||
|
peerDependenciesMeta:
|
||||||
|
'@types/react':
|
||||||
|
optional: true
|
||||||
|
redux:
|
||||||
|
optional: true
|
||||||
|
|
||||||
react-router@7.14.0:
|
react-router@7.14.0:
|
||||||
resolution: {integrity: sha512-m/xR9N4LQLmAS0ZhkY2nkPA1N7gQ5TUVa5n8TgANuDTARbn1gt+zLPXEm7W0XDTbrQ2AJSJKhoa6yx1D8BcpxQ==}
|
resolution: {integrity: sha512-m/xR9N4LQLmAS0ZhkY2nkPA1N7gQ5TUVa5n8TgANuDTARbn1gt+zLPXEm7W0XDTbrQ2AJSJKhoa6yx1D8BcpxQ==}
|
||||||
engines: {node: '>=20.0.0'}
|
engines: {node: '>=20.0.0'}
|
||||||
@@ -3889,10 +4018,26 @@ packages:
|
|||||||
resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
|
resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
|
||||||
engines: {node: '>= 14.18.0'}
|
engines: {node: '>= 14.18.0'}
|
||||||
|
|
||||||
|
recharts@3.8.1:
|
||||||
|
resolution: {integrity: sha512-mwzmO1s9sFL0TduUpwndxCUNoXsBw3u3E/0+A+cLcrSfQitSG62L32N69GhqUrrT5qKcAE3pCGVINC6pqkBBQg==}
|
||||||
|
engines: {node: '>=18'}
|
||||||
|
peerDependencies:
|
||||||
|
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
|
||||||
|
react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
|
||||||
|
react-is: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
|
||||||
|
|
||||||
redis@5.12.1:
|
redis@5.12.1:
|
||||||
resolution: {integrity: sha512-LDsoVvb/CpoV9EN3FXvgvSHNJWuCIzl9MiO3ppOevuGLpSGJhwfQjpEwfFJcQvNSddHADDdZaWx0HnmMxRXG7g==}
|
resolution: {integrity: sha512-LDsoVvb/CpoV9EN3FXvgvSHNJWuCIzl9MiO3ppOevuGLpSGJhwfQjpEwfFJcQvNSddHADDdZaWx0HnmMxRXG7g==}
|
||||||
engines: {node: '>= 18.19.0'}
|
engines: {node: '>= 18.19.0'}
|
||||||
|
|
||||||
|
redux-thunk@3.1.0:
|
||||||
|
resolution: {integrity: sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==}
|
||||||
|
peerDependencies:
|
||||||
|
redux: ^5.0.0
|
||||||
|
|
||||||
|
redux@5.0.1:
|
||||||
|
resolution: {integrity: sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==}
|
||||||
|
|
||||||
reflect-metadata@0.2.2:
|
reflect-metadata@0.2.2:
|
||||||
resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==}
|
resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==}
|
||||||
|
|
||||||
@@ -3904,6 +4049,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
|
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
|
||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
|
|
||||||
|
reselect@5.1.1:
|
||||||
|
resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}
|
||||||
|
|
||||||
resolve-cwd@3.0.0:
|
resolve-cwd@3.0.0:
|
||||||
resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
|
resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
|
||||||
engines: {node: '>=8'}
|
engines: {node: '>=8'}
|
||||||
@@ -4187,6 +4335,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
|
resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
|
||||||
engines: {node: '>=8'}
|
engines: {node: '>=8'}
|
||||||
|
|
||||||
|
tiny-invariant@1.3.3:
|
||||||
|
resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
|
||||||
|
|
||||||
tinyglobby@0.2.16:
|
tinyglobby@0.2.16:
|
||||||
resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
|
resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
|
||||||
engines: {node: '>=12.0.0'}
|
engines: {node: '>=12.0.0'}
|
||||||
@@ -4365,6 +4516,11 @@ packages:
|
|||||||
uri-js@4.4.1:
|
uri-js@4.4.1:
|
||||||
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
|
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
|
||||||
|
|
||||||
|
use-sync-external-store@1.6.0:
|
||||||
|
resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
|
||||||
|
peerDependencies:
|
||||||
|
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
|
||||||
|
|
||||||
util-deprecate@1.0.2:
|
util-deprecate@1.0.2:
|
||||||
resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
|
resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
|
||||||
|
|
||||||
@@ -4383,6 +4539,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
|
resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
|
||||||
engines: {node: '>= 0.8'}
|
engines: {node: '>= 0.8'}
|
||||||
|
|
||||||
|
victory-vendor@37.3.6:
|
||||||
|
resolution: {integrity: sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==}
|
||||||
|
|
||||||
vite@8.0.8:
|
vite@8.0.8:
|
||||||
resolution: {integrity: sha512-dbU7/iLVa8KZALJyLOBOQ88nOXtNG8vxKuOT4I2mD+Ya70KPceF4IAmDsmU0h1Qsn5bPrvsY9HJstCRh3hG6Uw==}
|
resolution: {integrity: sha512-dbU7/iLVa8KZALJyLOBOQ88nOXtNG8vxKuOT4I2mD+Ya70KPceF4IAmDsmU0h1Qsn5bPrvsY9HJstCRh3hG6Uw==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
@@ -6119,6 +6278,18 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@redis/client': 5.12.1
|
'@redis/client': 5.12.1
|
||||||
|
|
||||||
|
'@reduxjs/toolkit@2.12.0(react-redux@9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1))(react@19.2.5)':
|
||||||
|
dependencies:
|
||||||
|
'@standard-schema/spec': 1.1.0
|
||||||
|
'@standard-schema/utils': 0.3.0
|
||||||
|
immer: 11.1.8
|
||||||
|
redux: 5.0.1
|
||||||
|
redux-thunk: 3.1.0(redux@5.0.1)
|
||||||
|
reselect: 5.1.1
|
||||||
|
optionalDependencies:
|
||||||
|
react: 19.2.5
|
||||||
|
react-redux: 9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1)
|
||||||
|
|
||||||
'@rolldown/binding-android-arm64@1.0.0-rc.15':
|
'@rolldown/binding-android-arm64@1.0.0-rc.15':
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
@@ -6460,6 +6631,10 @@ snapshots:
|
|||||||
|
|
||||||
'@speed-highlight/core@1.2.15': {}
|
'@speed-highlight/core@1.2.15': {}
|
||||||
|
|
||||||
|
'@standard-schema/spec@1.1.0': {}
|
||||||
|
|
||||||
|
'@standard-schema/utils@0.3.0': {}
|
||||||
|
|
||||||
'@tailwindcss/node@4.2.2':
|
'@tailwindcss/node@4.2.2':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@jridgewell/remapping': 2.3.5
|
'@jridgewell/remapping': 2.3.5
|
||||||
@@ -6593,6 +6768,30 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 24.12.2
|
'@types/node': 24.12.2
|
||||||
|
|
||||||
|
'@types/d3-array@3.2.2': {}
|
||||||
|
|
||||||
|
'@types/d3-color@3.1.3': {}
|
||||||
|
|
||||||
|
'@types/d3-ease@3.0.2': {}
|
||||||
|
|
||||||
|
'@types/d3-interpolate@3.0.4':
|
||||||
|
dependencies:
|
||||||
|
'@types/d3-color': 3.1.3
|
||||||
|
|
||||||
|
'@types/d3-path@3.1.1': {}
|
||||||
|
|
||||||
|
'@types/d3-scale@4.0.9':
|
||||||
|
dependencies:
|
||||||
|
'@types/d3-time': 3.0.4
|
||||||
|
|
||||||
|
'@types/d3-shape@3.1.8':
|
||||||
|
dependencies:
|
||||||
|
'@types/d3-path': 3.1.1
|
||||||
|
|
||||||
|
'@types/d3-time@3.0.4': {}
|
||||||
|
|
||||||
|
'@types/d3-timer@3.0.2': {}
|
||||||
|
|
||||||
'@types/eslint-scope@3.7.7':
|
'@types/eslint-scope@3.7.7':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/eslint': 9.6.1
|
'@types/eslint': 9.6.1
|
||||||
@@ -6678,6 +6877,8 @@ snapshots:
|
|||||||
'@types/methods': 1.1.4
|
'@types/methods': 1.1.4
|
||||||
'@types/superagent': 8.1.9
|
'@types/superagent': 8.1.9
|
||||||
|
|
||||||
|
'@types/use-sync-external-store@0.0.6': {}
|
||||||
|
|
||||||
'@types/validator@13.15.10': {}
|
'@types/validator@13.15.10': {}
|
||||||
|
|
||||||
'@types/webidl-conversions@7.0.3': {}
|
'@types/webidl-conversions@7.0.3': {}
|
||||||
@@ -7317,6 +7518,8 @@ snapshots:
|
|||||||
|
|
||||||
clone@1.0.4: {}
|
clone@1.0.4: {}
|
||||||
|
|
||||||
|
clsx@2.1.1: {}
|
||||||
|
|
||||||
cluster-key-slot@1.1.2: {}
|
cluster-key-slot@1.1.2: {}
|
||||||
|
|
||||||
co@4.6.0: {}
|
co@4.6.0: {}
|
||||||
@@ -7393,12 +7596,52 @@ snapshots:
|
|||||||
|
|
||||||
csstype@3.2.3: {}
|
csstype@3.2.3: {}
|
||||||
|
|
||||||
|
d3-array@3.2.4:
|
||||||
|
dependencies:
|
||||||
|
internmap: 2.0.3
|
||||||
|
|
||||||
|
d3-color@3.1.0: {}
|
||||||
|
|
||||||
|
d3-ease@3.0.1: {}
|
||||||
|
|
||||||
|
d3-format@3.1.2: {}
|
||||||
|
|
||||||
|
d3-interpolate@3.0.1:
|
||||||
|
dependencies:
|
||||||
|
d3-color: 3.1.0
|
||||||
|
|
||||||
|
d3-path@3.1.0: {}
|
||||||
|
|
||||||
|
d3-scale@4.0.2:
|
||||||
|
dependencies:
|
||||||
|
d3-array: 3.2.4
|
||||||
|
d3-format: 3.1.2
|
||||||
|
d3-interpolate: 3.0.1
|
||||||
|
d3-time: 3.1.0
|
||||||
|
d3-time-format: 4.1.0
|
||||||
|
|
||||||
|
d3-shape@3.2.0:
|
||||||
|
dependencies:
|
||||||
|
d3-path: 3.1.0
|
||||||
|
|
||||||
|
d3-time-format@4.1.0:
|
||||||
|
dependencies:
|
||||||
|
d3-time: 3.1.0
|
||||||
|
|
||||||
|
d3-time@3.1.0:
|
||||||
|
dependencies:
|
||||||
|
d3-array: 3.2.4
|
||||||
|
|
||||||
|
d3-timer@3.0.1: {}
|
||||||
|
|
||||||
daisyui@5.5.19: {}
|
daisyui@5.5.19: {}
|
||||||
|
|
||||||
debug@4.4.3:
|
debug@4.4.3:
|
||||||
dependencies:
|
dependencies:
|
||||||
ms: 2.1.3
|
ms: 2.1.3
|
||||||
|
|
||||||
|
decimal.js-light@2.5.1: {}
|
||||||
|
|
||||||
dedent@1.7.2: {}
|
dedent@1.7.2: {}
|
||||||
|
|
||||||
deep-is@0.1.4: {}
|
deep-is@0.1.4: {}
|
||||||
@@ -7511,6 +7754,8 @@ snapshots:
|
|||||||
has-tostringtag: 1.0.2
|
has-tostringtag: 1.0.2
|
||||||
hasown: 2.0.2
|
hasown: 2.0.2
|
||||||
|
|
||||||
|
es-toolkit@1.47.0: {}
|
||||||
|
|
||||||
esbuild@0.27.3:
|
esbuild@0.27.3:
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@esbuild/aix-ppc64': 0.27.3
|
'@esbuild/aix-ppc64': 0.27.3
|
||||||
@@ -7658,6 +7903,8 @@ snapshots:
|
|||||||
|
|
||||||
etag@1.8.1: {}
|
etag@1.8.1: {}
|
||||||
|
|
||||||
|
eventemitter3@5.0.4: {}
|
||||||
|
|
||||||
events@3.3.0: {}
|
events@3.3.0: {}
|
||||||
|
|
||||||
execa@5.1.1:
|
execa@5.1.1:
|
||||||
@@ -7961,6 +8208,10 @@ snapshots:
|
|||||||
|
|
||||||
ignore@7.0.5: {}
|
ignore@7.0.5: {}
|
||||||
|
|
||||||
|
immer@10.2.0: {}
|
||||||
|
|
||||||
|
immer@11.1.8: {}
|
||||||
|
|
||||||
import-fresh@3.3.1:
|
import-fresh@3.3.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
parent-module: 1.0.1
|
parent-module: 1.0.1
|
||||||
@@ -7980,6 +8231,8 @@ snapshots:
|
|||||||
|
|
||||||
inherits@2.0.4: {}
|
inherits@2.0.4: {}
|
||||||
|
|
||||||
|
internmap@2.0.3: {}
|
||||||
|
|
||||||
ipaddr.js@1.9.1: {}
|
ipaddr.js@1.9.1: {}
|
||||||
|
|
||||||
is-arrayish@0.2.1: {}
|
is-arrayish@0.2.1: {}
|
||||||
@@ -8831,6 +9084,15 @@ snapshots:
|
|||||||
|
|
||||||
react-is@18.3.1: {}
|
react-is@18.3.1: {}
|
||||||
|
|
||||||
|
react-redux@9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1):
|
||||||
|
dependencies:
|
||||||
|
'@types/use-sync-external-store': 0.0.6
|
||||||
|
react: 19.2.5
|
||||||
|
use-sync-external-store: 1.6.0(react@19.2.5)
|
||||||
|
optionalDependencies:
|
||||||
|
'@types/react': 19.2.14
|
||||||
|
redux: 5.0.1
|
||||||
|
|
||||||
react-router@7.14.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
|
react-router@7.14.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
|
||||||
dependencies:
|
dependencies:
|
||||||
cookie: 1.1.1
|
cookie: 1.1.1
|
||||||
@@ -8849,6 +9111,26 @@ snapshots:
|
|||||||
|
|
||||||
readdirp@4.1.2: {}
|
readdirp@4.1.2: {}
|
||||||
|
|
||||||
|
recharts@3.8.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@18.3.1)(react@19.2.5)(redux@5.0.1):
|
||||||
|
dependencies:
|
||||||
|
'@reduxjs/toolkit': 2.12.0(react-redux@9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1))(react@19.2.5)
|
||||||
|
clsx: 2.1.1
|
||||||
|
decimal.js-light: 2.5.1
|
||||||
|
es-toolkit: 1.47.0
|
||||||
|
eventemitter3: 5.0.4
|
||||||
|
immer: 10.2.0
|
||||||
|
react: 19.2.5
|
||||||
|
react-dom: 19.2.5(react@19.2.5)
|
||||||
|
react-is: 18.3.1
|
||||||
|
react-redux: 9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1)
|
||||||
|
reselect: 5.1.1
|
||||||
|
tiny-invariant: 1.3.3
|
||||||
|
use-sync-external-store: 1.6.0(react@19.2.5)
|
||||||
|
victory-vendor: 37.3.6
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- '@types/react'
|
||||||
|
- redux
|
||||||
|
|
||||||
redis@5.12.1:
|
redis@5.12.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@redis/bloom': 5.12.1(@redis/client@5.12.1)
|
'@redis/bloom': 5.12.1(@redis/client@5.12.1)
|
||||||
@@ -8860,12 +9142,20 @@ snapshots:
|
|||||||
- '@node-rs/xxhash'
|
- '@node-rs/xxhash'
|
||||||
- '@opentelemetry/api'
|
- '@opentelemetry/api'
|
||||||
|
|
||||||
|
redux-thunk@3.1.0(redux@5.0.1):
|
||||||
|
dependencies:
|
||||||
|
redux: 5.0.1
|
||||||
|
|
||||||
|
redux@5.0.1: {}
|
||||||
|
|
||||||
reflect-metadata@0.2.2: {}
|
reflect-metadata@0.2.2: {}
|
||||||
|
|
||||||
require-directory@2.1.1: {}
|
require-directory@2.1.1: {}
|
||||||
|
|
||||||
require-from-string@2.0.2: {}
|
require-from-string@2.0.2: {}
|
||||||
|
|
||||||
|
reselect@5.1.1: {}
|
||||||
|
|
||||||
resolve-cwd@3.0.0:
|
resolve-cwd@3.0.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
resolve-from: 5.0.0
|
resolve-from: 5.0.0
|
||||||
@@ -9232,6 +9522,8 @@ snapshots:
|
|||||||
glob: 7.2.3
|
glob: 7.2.3
|
||||||
minimatch: 3.1.5
|
minimatch: 3.1.5
|
||||||
|
|
||||||
|
tiny-invariant@1.3.3: {}
|
||||||
|
|
||||||
tinyglobby@0.2.16:
|
tinyglobby@0.2.16:
|
||||||
dependencies:
|
dependencies:
|
||||||
fdir: 6.5.0(picomatch@4.0.4)
|
fdir: 6.5.0(picomatch@4.0.4)
|
||||||
@@ -9432,6 +9724,10 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
punycode: 2.3.1
|
punycode: 2.3.1
|
||||||
|
|
||||||
|
use-sync-external-store@1.6.0(react@19.2.5):
|
||||||
|
dependencies:
|
||||||
|
react: 19.2.5
|
||||||
|
|
||||||
util-deprecate@1.0.2: {}
|
util-deprecate@1.0.2: {}
|
||||||
|
|
||||||
v8-compile-cache-lib@3.0.1: {}
|
v8-compile-cache-lib@3.0.1: {}
|
||||||
@@ -9446,6 +9742,23 @@ snapshots:
|
|||||||
|
|
||||||
vary@1.1.2: {}
|
vary@1.1.2: {}
|
||||||
|
|
||||||
|
victory-vendor@37.3.6:
|
||||||
|
dependencies:
|
||||||
|
'@types/d3-array': 3.2.2
|
||||||
|
'@types/d3-ease': 3.0.2
|
||||||
|
'@types/d3-interpolate': 3.0.4
|
||||||
|
'@types/d3-scale': 4.0.9
|
||||||
|
'@types/d3-shape': 3.1.8
|
||||||
|
'@types/d3-time': 3.0.4
|
||||||
|
'@types/d3-timer': 3.0.2
|
||||||
|
d3-array: 3.2.4
|
||||||
|
d3-ease: 3.0.1
|
||||||
|
d3-interpolate: 3.0.1
|
||||||
|
d3-scale: 4.0.2
|
||||||
|
d3-shape: 3.2.0
|
||||||
|
d3-time: 3.1.0
|
||||||
|
d3-timer: 3.0.1
|
||||||
|
|
||||||
vite@8.0.8(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.46.1):
|
vite@8.0.8(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.46.1):
|
||||||
dependencies:
|
dependencies:
|
||||||
lightningcss: 1.32.0
|
lightningcss: 1.32.0
|
||||||
|
|||||||
@@ -26,12 +26,23 @@ export function main(args = process.argv.slice(2), env = process.env) {
|
|||||||
env.CF_PAGES_PROJECT_NAME ??
|
env.CF_PAGES_PROJECT_NAME ??
|
||||||
env.CLOUDFLARE_PAGES_PROJECT_NAME ??
|
env.CLOUDFLARE_PAGES_PROJECT_NAME ??
|
||||||
"lolympus";
|
"lolympus";
|
||||||
const stagingBranch =
|
const deployPlan = resolveDeployPlan(target, env);
|
||||||
target === "staging" ? resolveStagingBranch(env) : undefined;
|
|
||||||
|
|
||||||
validateEnv(viteMode, env);
|
validateEnv(viteMode, env);
|
||||||
run("pnpm", ["--filter", "web", "run", `build:${target}`], repoRoot);
|
run("pnpm", ["--filter", "web", "run", `build:${target}`], repoRoot);
|
||||||
|
|
||||||
|
const deployArgs = createPagesDeployArgs(projectName, deployPlan.pagesBranch);
|
||||||
|
console.error(
|
||||||
|
[
|
||||||
|
`Deploying ${target} from ${deployPlan.sourceBranch}`,
|
||||||
|
`to Cloudflare Pages branch ${deployPlan.pagesBranch}`,
|
||||||
|
].join(" "),
|
||||||
|
);
|
||||||
|
|
||||||
|
run("pnpm", deployArgs, webDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createPagesDeployArgs(projectName, branch) {
|
||||||
const deployArgs = [
|
const deployArgs = [
|
||||||
"exec",
|
"exec",
|
||||||
"wrangler",
|
"wrangler",
|
||||||
@@ -42,37 +53,62 @@ export function main(args = process.argv.slice(2), env = process.env) {
|
|||||||
projectName,
|
projectName,
|
||||||
];
|
];
|
||||||
|
|
||||||
if (target === "staging") {
|
if (branch) deployArgs.push("--branch", branch);
|
||||||
deployArgs.push("--branch", stagingBranch);
|
return deployArgs;
|
||||||
console.error(
|
|
||||||
`Deploying staging to Cloudflare Pages branch ${stagingBranch}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
run("pnpm", deployArgs, webDir);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function resolveStagingBranch(env = process.env) {
|
export function resolveStagingBranch(env = process.env) {
|
||||||
const configuredBranch = env.CF_PAGES_STAGING_BRANCH?.trim();
|
return resolveDeployPlan("staging", env).pagesBranch;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function resolveDeployPlan(
|
||||||
|
target,
|
||||||
|
env = process.env,
|
||||||
|
releaseBranchRowsProvider = () => {
|
||||||
|
refreshRemoteReleaseBranches();
|
||||||
|
return listReleaseBranchRefs();
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
const sourceBranch = resolveSourceBranch(
|
||||||
|
target,
|
||||||
|
env,
|
||||||
|
releaseBranchRowsProvider,
|
||||||
|
);
|
||||||
|
const pagesBranch =
|
||||||
|
target === "prod" ? resolveProductionBranch(env) : sourceBranch;
|
||||||
|
|
||||||
|
return { sourceBranch, pagesBranch };
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveSourceBranch(target, env, releaseBranchRowsProvider) {
|
||||||
|
const sourceEnvKey =
|
||||||
|
target === "prod" ? "CF_PAGES_RELEASE_BRANCH" : "CF_PAGES_STAGING_BRANCH";
|
||||||
|
const configuredBranch = env[sourceEnvKey]?.trim();
|
||||||
if (configuredBranch) return configuredBranch;
|
if (configuredBranch) return configuredBranch;
|
||||||
|
|
||||||
refreshRemoteReleaseBranches();
|
|
||||||
|
|
||||||
const latestReleaseBranch = selectLatestReleaseBranch(
|
const latestReleaseBranch = selectLatestReleaseBranch(
|
||||||
listReleaseBranchRefs(),
|
releaseBranchRowsProvider(),
|
||||||
);
|
);
|
||||||
if (latestReleaseBranch) return latestReleaseBranch;
|
if (latestReleaseBranch) return latestReleaseBranch;
|
||||||
|
|
||||||
console.error(
|
console.error(
|
||||||
[
|
[
|
||||||
"No release/* branch found for staging deploy.",
|
`No release/* branch found for ${target} deploy.`,
|
||||||
"Create a release branch, for example: git push origin main:release/66",
|
"Create a release branch, for example: git push origin main:release/66",
|
||||||
"Or set CF_PAGES_STAGING_BRANCH explicitly.",
|
`Or set ${sourceEnvKey} explicitly.`,
|
||||||
].join("\n"),
|
].join("\n"),
|
||||||
);
|
);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function resolveProductionBranch(env) {
|
||||||
|
return (
|
||||||
|
env.CF_PAGES_PRODUCTION_BRANCH?.trim() ||
|
||||||
|
env.CF_PAGES_PROD_BRANCH?.trim() ||
|
||||||
|
"main"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function selectLatestReleaseBranch(refRows) {
|
export function selectLatestReleaseBranch(refRows) {
|
||||||
const latestByBranch = new Map();
|
const latestByBranch = new Map();
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
import assert from "node:assert/strict";
|
||||||
|
import { describe, it } from "node:test";
|
||||||
|
|
||||||
|
import {
|
||||||
|
createPagesDeployArgs,
|
||||||
|
resolveDeployPlan,
|
||||||
|
} from "./deploy-cloudflare-pages.mjs";
|
||||||
|
|
||||||
|
describe("deploy-cloudflare-pages", () => {
|
||||||
|
it("deploys prod to the production branch using the latest release branch as source", () => {
|
||||||
|
const plan = resolveDeployPlan("prod", {}, () => [
|
||||||
|
"1710000000\torigin/release/66",
|
||||||
|
"1720000000\torigin/release/67",
|
||||||
|
]);
|
||||||
|
|
||||||
|
assert.deepEqual(plan, {
|
||||||
|
sourceBranch: "release/67",
|
||||||
|
pagesBranch: "main",
|
||||||
|
});
|
||||||
|
assert.deepEqual(
|
||||||
|
createPagesDeployArgs("lolympus", plan.pagesBranch),
|
||||||
|
[
|
||||||
|
"exec",
|
||||||
|
"wrangler",
|
||||||
|
"pages",
|
||||||
|
"deploy",
|
||||||
|
"dist",
|
||||||
|
"--project-name",
|
||||||
|
"lolympus",
|
||||||
|
"--branch",
|
||||||
|
"main",
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps explicit staging branch override behavior", () => {
|
||||||
|
const plan = resolveDeployPlan(
|
||||||
|
"staging",
|
||||||
|
{ CF_PAGES_STAGING_BRANCH: "release/manual" },
|
||||||
|
() => {
|
||||||
|
throw new Error("should not inspect git refs when branch is explicit");
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.deepEqual(plan, {
|
||||||
|
sourceBranch: "release/manual",
|
||||||
|
pagesBranch: "release/manual",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("allows overriding the Cloudflare Pages production branch", () => {
|
||||||
|
const plan = resolveDeployPlan(
|
||||||
|
"prod",
|
||||||
|
{ CF_PAGES_PRODUCTION_BRANCH: "production" },
|
||||||
|
() => ["1720000000\torigin/release/67"],
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.deepEqual(plan, {
|
||||||
|
sourceBranch: "release/67",
|
||||||
|
pagesBranch: "production",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in new issue
Block a user