diff --git a/apps/api/src/modules/auction/auction-rejection.spec.ts b/apps/api/src/modules/auction/auction-rejection.spec.ts new file mode 100644 index 00000000..79b6316a --- /dev/null +++ b/apps/api/src/modules/auction/auction-rejection.spec.ts @@ -0,0 +1,82 @@ +import { + AUCTION_REJECTION_REASON, + isAuctionResyncRecommended, + resolveAuctionRejectionReason, +} from './auction-rejection'; + +describe('resolveAuctionRejectionReason', () => { + it('maps the internal CONFLICT code to the descriptive transition reason', () => { + expect(resolveAuctionRejectionReason('CONFLICT')).toBe( + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY, + ); + }); + + it('maps internal bid codes to descriptive bid reasons', () => { + expect(resolveAuctionRejectionReason('EXPIRED')).toBe( + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED, + ); + expect(resolveAuctionRejectionReason('TOO_LOW')).toBe( + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST, + ); + }); + + it('maps known BadRequest messages without a structured code', () => { + expect( + resolveAuctionRejectionReason(undefined, 'Cannot advance from current phase.'), + ).toBe( + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE, + ); + }); + + it('falls back via the message when the code carries the full sentence', () => { + // 구조 전환 경로는 code 자리에 message 문장이 들어올 수 있다. + expect( + resolveAuctionRejectionReason('Auction is not in bidding phase.'), + ).toBe( + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE, + ); + }); + + it('treats internal coordination codes as retryable', () => { + expect(resolveAuctionRejectionReason('ACTION_REQUEST_LEASE_EXPIRED')).toBe( + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE, + ); + expect(resolveAuctionRejectionReason('INVALID_DEADLINE_MODE')).toBe( + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE, + ); + }); + + it('falls back to the unrecognized reason for unknown input', () => { + expect(resolveAuctionRejectionReason('SOMETHING_NEW', 'weird')).toBe( + AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON, + ); + }); +}); + +describe('isAuctionResyncRecommended', () => { + it('recommends resync for stale-view rejections', () => { + expect( + isAuctionResyncRecommended( + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY, + ), + ).toBe(true); + expect( + isAuctionResyncRecommended( + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED, + ), + ).toBe(true); + }); + + it('does not recommend resync for genuine constraint rejections', () => { + expect( + isAuctionResyncRecommended( + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL, + ), + ).toBe(false); + expect( + isAuctionResyncRecommended( + AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON, + ), + ).toBe(false); + }); +}); diff --git a/apps/api/src/modules/auction/auction-rejection.ts b/apps/api/src/modules/auction/auction-rejection.ts new file mode 100644 index 00000000..8a20e67c --- /dev/null +++ b/apps/api/src/modules/auction/auction-rejection.ts @@ -0,0 +1,170 @@ +/** + * 경매 거부(rejection)를 클라이언트에 알릴 때 쓰는 "설명적 거부코드" 체계. + * + * 배경: + * - 내부 Lua/서비스는 `CONFLICT`, `EXPIRED`, `TOO_LOW` 같은 짧은 코드를 쓴다. + * 이 코드들은 구현 디테일이고, 그대로 클라/운영자에게 노출하면 "무엇이 왜 + * 거부됐는지"를 알기 어렵다(특히 `CONFLICT`는 원인이 광범위하다). + * - 그래서 ack의 `code`/`message`는 그대로 두되(진단/하위호환), 별도로 + * `auctionRejectionReason`이라는 **맥락을 코드 이름에 담은 안정적 식별자**를 + * 함께 내려준다. 클라는 이 reason을 사람이 읽는 문구로 매핑한다(프론트 사전). + * + * 명명 규칙: + * - 다소 길어지더라도 "무엇이(BID/AUCTION_TRANSITION) + 왜(BECAUSE_...)"를 + * 이름만으로 알 수 있게 풀어쓴다. + * + * resync 권장 여부: + * - `AUCTION_RESYNC_RECOMMENDED_REASONS`에 속한 reason은 "클라가 본 상태가 이미 + * 바뀌었다(낙관적 동시성 충돌/만료/단계 전이)"는 신호다. 이 경우 클라는 최신 + * state로 rebaseline한 뒤 (구조 액션이라면) 1회 재시도하는 것이 안전하다. + * - 반대로 정원 초과/포인트 부족처럼 "상태를 새로고침해도 결과가 같은" 거부는 + * resync 권장 대상이 아니다(재시도해도 또 거부됨). + */ + +export const AUCTION_REJECTION_REASON = { + // === 구조 전환(낙찰/유찰/다음/입찰오픈) === + /** 내가 본 revision/phase/선수가 commit 직전 이미 바뀜(낙관적 동시성 충돌, 내부 `CONFLICT`). */ + AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY: + 'AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY', + /** 입찰 단계가 아닌데 입찰 단계 전환을 시도함(이미 sold/passed/presenting 등). */ + AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE: + 'AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE', + /** 현재 단계에서 "다음"으로 진행할 수 없음(sold/passed/presenting이 아님 — 보통 이미 진행됨). */ + AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE: + 'AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE', + /** 낙찰 처리할 유효한 최고 입찰이 없음(만료 처리로 이미 정리됐을 수 있음). */ + AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD: + 'AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD', + /** 진행 중인 입찰이 있는 선수를 유찰 처리하려 함. */ + AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT: + 'AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT', + /** 전환 요청 조정(예약/리스/멱등) 단계의 일시적 거부 — 최신 상태로 재시도하면 보통 해소됨. */ + AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE: + 'AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE', + + // === 입찰(bid) === + /** 입찰 라운드가 이미 다음 선수/다음 라운드로 넘어감(내부 `STALE_BID_ROUND`). */ + BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED: + 'BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED', + /** 입찰 라운드 마감 시각이 이미 지남(내부 `EXPIRED`). */ + BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED: + 'BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED', + /** 경매가 입찰 단계가 아님(내부 `PHASE`). */ + BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE: + 'BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE', + /** 입찰 금액이 현재 최고가보다 높지 않음(내부 `TOO_LOW`). */ + BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST: + 'BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST', + /** 팀 정원이 이미 가득 참(내부 `FULL`). */ + BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL: + 'BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL', + /** 남은 슬롯 최소 확보분을 고려하면 포인트가 부족함(내부 `INSUFFICIENT`). */ + BID_REJECTED_BECAUSE_INSUFFICIENT_REMAINING_POINTS_FOR_SLOTS: + 'BID_REJECTED_BECAUSE_INSUFFICIENT_REMAINING_POINTS_FOR_SLOTS', + /** 알 수 없는 팀 인덱스(내부 `UNKNOWN_TEAM`). */ + BID_REJECTED_BECAUSE_UNKNOWN_TEAM: 'BID_REJECTED_BECAUSE_UNKNOWN_TEAM', + /** 같은 요청 id에 다른 내용이 온 멱등성 충돌(내부 `DUPLICATE_REQUEST_CONFLICT`). */ + BID_REJECTED_BECAUSE_DUPLICATE_REQUEST_PAYLOAD_CONFLICT: + 'BID_REJECTED_BECAUSE_DUPLICATE_REQUEST_PAYLOAD_CONFLICT', + /** 짧은 시간에 너무 많은 입찰 요청(게이트웨이 rate limit). */ + BID_REJECTED_BECAUSE_RATE_LIMITED: 'BID_REJECTED_BECAUSE_RATE_LIMITED', + + // === 공통/그 외 === + /** 실시간 상태를 아직 사용할 수 없음(재접속/재조회 필요). */ + AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE: + 'AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE', + /** 위 어디에도 해당하지 않는 미분류 거부(원문 message로 안내). */ + AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON: + 'AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON', +} as const; + +export type AuctionRejectionReason = + (typeof AUCTION_REJECTION_REASON)[keyof typeof AUCTION_REJECTION_REASON]; + +/** 내부 짧은 코드 → 설명적 reason. */ +const INTERNAL_CODE_TO_REASON: Record = { + CONFLICT: + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY, + STALE_BID_ROUND: + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED, + EXPIRED: + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED, + PHASE: + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE, + TOO_LOW: + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST, + FULL: AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL, + INSUFFICIENT: + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_INSUFFICIENT_REMAINING_POINTS_FOR_SLOTS, + UNKNOWN_TEAM: AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_UNKNOWN_TEAM, + DUPLICATE_REQUEST_CONFLICT: + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_DUPLICATE_REQUEST_PAYLOAD_CONFLICT, + BID_RATE_LIMITED: AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_RATE_LIMITED, +}; + +/** 구조화된 code 없이 message만 던지는 BadRequest(구조 전환 검증 등) → 설명적 reason. */ +const MESSAGE_TO_REASON: Record = { + 'Auction is not in bidding phase.': + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE, + 'Cannot advance from current phase.': + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE, + 'No bid to mark sold.': + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD, + 'Cannot pass a player with an active bid.': + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT, + 'Auction realtime state is not available.': + AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE, +}; + +/** + * resync(최신 state로 rebaseline 후 재시도)가 권장되는 reason 집합. + * "내가 본 상태가 낡았을 뿐, 다시 보면 가능할 수 있는" 거부들이다. + */ +export const AUCTION_RESYNC_RECOMMENDED_REASONS: ReadonlySet = + new Set([ + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY, + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE, + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE, + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD, + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT, + AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE, + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED, + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED, + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE, + AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST, + AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE, + ]); + +/** + * 내부 거부 code(짧은 코드) 또는 BadRequest message로부터 설명적 reason을 해석한다. + * 둘 다 모르면 미분류 reason으로 떨어뜨린다(원문 message는 ack에 그대로 남는다). + */ +export function resolveAuctionRejectionReason( + internalCode?: string, + message?: string, +): AuctionRejectionReason { + if (internalCode && INTERNAL_CODE_TO_REASON[internalCode]) { + return INTERNAL_CODE_TO_REASON[internalCode]; + } + if (message && MESSAGE_TO_REASON[message]) { + return MESSAGE_TO_REASON[message]; + } + // 구조 전환 경로는 code 자리에 message 문장이 들어올 수 있어 한 번 더 확인한다. + if (internalCode && MESSAGE_TO_REASON[internalCode]) { + return MESSAGE_TO_REASON[internalCode]; + } + if ( + internalCode && + (internalCode.startsWith('ACTION_REQUEST_') || + internalCode.startsWith('INVALID_')) + ) { + return AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE; + } + return AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON; +} + +export function isAuctionResyncRecommended( + reason: AuctionRejectionReason, +): boolean { + return AUCTION_RESYNC_RECOMMENDED_REASONS.has(reason); +} diff --git a/apps/api/src/modules/auction/auction.gateway.ts b/apps/api/src/modules/auction/auction.gateway.ts index a1db43b5..66d4df76 100644 --- a/apps/api/src/modules/auction/auction.gateway.ts +++ b/apps/api/src/modules/auction/auction.gateway.ts @@ -31,6 +31,10 @@ import type { AuctionStateResponse, } from './auction.service'; import { AuctionEventBusService } from './auction-event-bus.service'; +import { + isAuctionResyncRecommended, + resolveAuctionRejectionReason, +} from './auction-rejection'; import type { MatchSideEffectDelta } from './auction-side-effect.service'; import { serializeRealtimeAuction } from './auction-realtime-serializer'; import { AuctionRedisService } from './redis/auction-redis.service'; @@ -211,11 +215,14 @@ export class AuctionGateway ), }); } catch (error) { - const errorPayload = this.resolveErrorPayload(error); - const bidServerTiming = this.extractBidServerTiming(errorPayload); - this.emitError(socket, errorPayload.message); + const rejectionAckFields = await this.resolveRejectionAckFields( + matchId, + error, + ); + const bidServerTiming = this.extractBidServerTiming(rejectionAckFields); + this.emitError(socket, String(rejectionAckFields.message ?? '')); ack?.({ - ...errorPayload, + ...rejectionAckFields, bidRequestId, bidServerTiming: this.buildGatewayBidTiming( gatewayBidStartedAtMS, @@ -276,8 +283,8 @@ export class AuctionGateway } catch (error) { this.emitKnownError(socket, error); ack?.({ + ...(await this.resolveRejectionAckFields(matchId, error)), auctionActionRequestId: payload?.auctionActionRequestId, - code: error instanceof Error ? error.message : 'UNKNOWN', rejected: true, }); } @@ -306,8 +313,8 @@ export class AuctionGateway } catch (error) { this.emitKnownError(socket, error); ack?.({ + ...(await this.resolveRejectionAckFields(matchId, error)), auctionActionRequestId: payload?.auctionActionRequestId, - code: error instanceof Error ? error.message : 'UNKNOWN', rejected: true, }); } @@ -335,8 +342,8 @@ export class AuctionGateway } catch (error) { this.emitKnownError(socket, error); ack?.({ + ...(await this.resolveRejectionAckFields(matchId, error)), auctionActionRequestId: payload?.auctionActionRequestId, - code: error instanceof Error ? error.message : 'UNKNOWN', rejected: true, }); } @@ -364,8 +371,8 @@ export class AuctionGateway } catch (error) { this.emitKnownError(socket, error); ack?.({ + ...(await this.resolveRejectionAckFields(matchId, error)), auctionActionRequestId: payload?.auctionActionRequestId, - code: error instanceof Error ? error.message : 'UNKNOWN', rejected: true, }); } @@ -608,6 +615,49 @@ export class AuctionGateway return JSON.parse(JSON.stringify(auction)); } + /** + * 거부 ack에 실을 공통 필드를 만든다. + * + * - `code`/`message`: 기존 내부 코드/문구(진단·하위호환). + * - `auctionRejectionReason`: 맥락을 담은 설명적 거부코드(클라가 문구로 매핑). + * - `resyncRecommended`: "내가 본 상태가 낡았다"는 신호면 true. + * - `state`: resync 권장 거부에 한해 최신 권위 state를 동봉해, 클라가 join + * 왕복 없이 즉시 rebaseline하도록 한다(후속 액션의 반복 CONFLICT 차단). + */ + private async resolveRejectionAckFields( + matchId: string, + error: unknown, + ): Promise> { + const errorPayload = this.resolveErrorPayload(error); + const auctionRejectionReason = resolveAuctionRejectionReason( + typeof errorPayload.code === 'string' ? errorPayload.code : undefined, + errorPayload.message, + ); + const resyncRecommended = isAuctionResyncRecommended(auctionRejectionReason); + const state = resyncRecommended + ? await this.fetchSerializedAuctionState(matchId) + : undefined; + return { + ...errorPayload, + auctionRejectionReason, + resyncRecommended, + ...(state ? { state } : {}), + }; + } + + private async fetchSerializedAuctionState( + matchId: string, + ): Promise | undefined> { + try { + const state = await this.auctionService.getStateByMatchId( + new mongoose.Types.ObjectId(matchId), + ); + return state ? this.serializeAuction(state) : undefined; + } catch { + return undefined; + } + } + private resolveErrorPayload(error: unknown): Record & { message: string; } { diff --git a/apps/api/src/modules/auction/auction.service.ts b/apps/api/src/modules/auction/auction.service.ts index a76e1d87..23c4cac1 100644 --- a/apps/api/src/modules/auction/auction.service.ts +++ b/apps/api/src/modules/auction/auction.service.ts @@ -1720,9 +1720,12 @@ export class AuctionService { }, ); if ('rejected' in result) { - throw new BadRequestException( - `Auction transition was rejected: ${result.code}.`, - ); + // 게이트웨이가 설명적 거부코드로 변환할 수 있도록 내부 code(예: CONFLICT)를 + // 구조화해 던진다(message만 던지면 code 자리에 풀 문장이 들어가 매핑이 어렵다). + throw new BadRequestException({ + code: result.code, + message: `Auction transition was rejected: ${result.code}.`, + }); } return this.requireRedisAuctionState(matchId); diff --git a/apps/web/src/api/auctionRejectionMessages.ts b/apps/web/src/api/auctionRejectionMessages.ts new file mode 100644 index 00000000..cdbee3a9 --- /dev/null +++ b/apps/web/src/api/auctionRejectionMessages.ts @@ -0,0 +1,101 @@ +/** + * 경매 거부코드 → 사용자 문구 매핑(프론트 전용). + * + * 서버(`apps/api/.../auction-rejection.ts`)가 ack에 실어주는 설명적 거부코드 + * `auctionRejectionReason`를 사람이 읽는 한국어 문구로 바꾼다. reason 문자열은 + * 서버와의 계약이므로 양쪽을 함께 바꿔야 한다(서버는 영문 message도 함께 보내므로, + * 매핑이 빠진 reason은 message로 폴백된다). + * + * 또한 ack가 없는 `error` 이벤트 채널(영문 message만 옴)도 같은 톤의 한국어로 + * 바꿀 수 있도록 영문 message → 한국어 매핑을 함께 둔다. + */ + +/** 서버 `AUCTION_REJECTION_REASON`와 1:1로 맞춘 사용자 문구. */ +const REASON_TO_USER_MESSAGE: Record = { + // 구조 전환 + AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY: + '경매 상태가 바뀌어 최신 상태로 맞췄어요. 다시 시도해 주세요.', + AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE: + '이미 입찰 단계가 아니에요. 최신 상태로 맞췄어요.', + AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE: + '이미 다음 단계로 넘어간 상태예요. 최신 상태로 맞췄어요.', + AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD: + '낙찰할 입찰이 없어요. 최신 상태로 맞췄어요.', + AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT: + '진행 중인 입찰이 있어 유찰할 수 없어요.', + AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE: + '잠시 처리 중이라 반영되지 않았어요. 다시 시도해 주세요.', + // 입찰 + BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED: '이미 다음 선수로 넘어갔어요.', + BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED: '마감되어 반영되지 않았어요.', + BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE: + '지금은 입찰할 수 없는 단계예요.', + BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST: + '더 높은 입찰이 있었어요.', + BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL: '팀 정원이 가득 찼어요.', + BID_REJECTED_BECAUSE_INSUFFICIENT_REMAINING_POINTS_FOR_SLOTS: + '남은 슬롯을 고려하면 포인트가 부족해요.', + BID_REJECTED_BECAUSE_UNKNOWN_TEAM: '알 수 없는 팀이에요.', + BID_REJECTED_BECAUSE_DUPLICATE_REQUEST_PAYLOAD_CONFLICT: '중복된 요청이에요.', + BID_REJECTED_BECAUSE_RATE_LIMITED: + '요청이 너무 많아요. 잠시 후 다시 시도해 주세요.', + // 공통 + AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE: + '실시간 상태를 불러오는 중이에요. 잠시 후 다시 시도해 주세요.', +}; + +/** ack 없이 `error` 이벤트로만 오는 영문 message → 한국어. */ +const ENGLISH_MESSAGE_TO_USER_MESSAGE: Record = { + 'Bid deadline has already expired.': '마감되어 반영되지 않았어요.', + 'Bid must exceed current bid.': '더 높은 입찰이 있었어요.', + 'Bid round has already changed.': '이미 다음 선수로 넘어갔어요.', + 'Auction is not in bidding phase.': '지금은 입찰할 수 없는 단계예요.', + 'Team already has maximum members.': '팀 정원이 가득 찼어요.', + 'Bid must reserve minimum points for remaining slots.': + '남은 슬롯을 고려하면 포인트가 부족해요.', + 'Unknown team.': '알 수 없는 팀이에요.', + 'Bid request conflicts with an earlier request.': '중복된 요청이에요.', + 'Cannot advance from current phase.': + '이미 다음 단계로 넘어간 상태예요. 최신 상태로 맞췄어요.', + 'No bid to mark sold.': '낙찰할 입찰이 없어요. 최신 상태로 맞췄어요.', + 'Cannot pass a player with an active bid.': + '진행 중인 입찰이 있어 유찰할 수 없어요.', +}; + +const DEFAULT_REJECTION_MESSAGE = '요청이 반영되지 않았어요.'; +const DEFAULT_ERROR_MESSAGE = '실시간 경매 연결 중 오류가 발생했습니다.'; + +export interface AuctionRejectionAckLike { + auctionRejectionReason?: string; + code?: string; + message?: string; + resyncRecommended?: boolean; +} + +/** 거부 ack → 사용자 문구. reason 매핑 우선, 없으면 영문 message 매핑, 그래도 없으면 원문/기본값. */ +export function resolveAuctionRejectionMessage( + ack: AuctionRejectionAckLike, +): string { + if (ack.auctionRejectionReason) { + const mapped = REASON_TO_USER_MESSAGE[ack.auctionRejectionReason]; + if (mapped) return mapped; + } + if (ack.message) { + const mapped = ENGLISH_MESSAGE_TO_USER_MESSAGE[ack.message]; + if (mapped) return mapped; + } + return ack.message ?? ack.code ?? DEFAULT_REJECTION_MESSAGE; +} + +/** `error` 이벤트(영문 message) → 사용자 문구. */ +export function resolveAuctionErrorMessage(message?: string): string { + if (message && ENGLISH_MESSAGE_TO_USER_MESSAGE[message]) { + return ENGLISH_MESSAGE_TO_USER_MESSAGE[message]; + } + return message ?? DEFAULT_ERROR_MESSAGE; +} + +/** 최신 상태로 rebaseline 후 재시도가 권장되는 거부인지. */ +export function isAuctionResyncRecommended(ack: AuctionRejectionAckLike): boolean { + return ack.resyncRecommended === true; +} diff --git a/apps/web/src/api/useAuctionSocket.ts b/apps/web/src/api/useAuctionSocket.ts index b7500686..fb0842c7 100644 --- a/apps/web/src/api/useAuctionSocket.ts +++ b/apps/web/src/api/useAuctionSocket.ts @@ -3,6 +3,11 @@ import { io, type Socket } from 'socket.io-client'; import { API_BASE_URL, useAuthUserId } from '../config'; import { acquireAccessToken } from '../lib/auth/token-provider'; import type { ApiAuction, ApiAuctionChatMessage, Position } from './types'; +import { + isAuctionResyncRecommended, + resolveAuctionErrorMessage, + resolveAuctionRejectionMessage, +} from './auctionRejectionMessages'; type ConnectionStatus = | 'idle' @@ -84,12 +89,14 @@ interface BidDiagnosticsPayload { } interface BidAckPayload { + auctionRejectionReason?: string; bidDelta?: BidDeltaPayload | null; bidDiagnostics?: BidDiagnosticsPayload; bidServerTiming?: BidServerTimingPayload; code?: string; message?: string; rejected?: boolean; + resyncRecommended?: boolean; state?: ApiAuction; } @@ -435,7 +442,8 @@ export function useAuctionSocket(matchId: string | undefined) { }); socket.on('error', (payload: { message?: string }) => { - setError(payload.message ?? '실시간 경매 연결 중 오류가 발생했습니다.'); + // ack 없는 error 채널(영문 message만)도 같은 톤의 한국어로 매핑한다. + setError(resolveAuctionErrorMessage(payload.message)); }); })(); @@ -527,7 +535,21 @@ export function useAuctionSocket(matchId: string | undefined) { }; } - function emitAuctionAction(eventName: string, payload: AuctionActionPayload) { + // 거부 등으로 클라 상태가 낡았을 때 서버 최신 state를 다시 받아 rebaseline한다. + // join 핸들러가 getStateByMatchId → broadcastState로 fresh state를 내려주고, + // revision 가드상 더 높은 revision이라 정상 적용된다(force-resync 아님). + function resyncAuctionState() { + const socket = socketRef.current; + if (!socket || !socket.connected || !matchId) return; + socket.emit('join', { matchId }); + } + + // retryAttempt: 거부 후 자동 재시도 횟수(루프 방지를 위해 1회로 제한). + function emitAuctionAction( + eventName: string, + payload: AuctionActionPayload, + retryAttempt = 0, + ) { const socket = socketRef.current; if (!socket || !socket.connected) { setError('소켓이 아직 연결되지 않았습니다.'); @@ -557,15 +579,41 @@ export function useAuctionSocket(matchId: string | undefined) { actionPayload, (ack?: { auctionActionRequestId?: string; + auctionRejectionReason?: string; code?: string; + message?: string; rejected?: boolean; + resyncRecommended?: boolean; state?: ApiAuction; }) => { if (ack?.rejected) { clearPendingActionRequest( ack?.auctionActionRequestId ?? auctionActionRequestId, ); - setError(ack.code ?? '경매 진행 상태가 반영되지 않았습니다.'); + // 1) rebaseline: 서버가 동봉한 최신 state를 즉시 반영(없으면 join으로 재요청). + // commitAuctionState는 latestAuctionRef를 동기로 갱신하므로, 이후 + // buildAuctionActionPayload는 최신 관측값(revision/phase/선수)을 읽는다. + if (ack.state) { + commitAuctionState(ack.state); + } else if (isAuctionResyncRecommended(ack)) { + resyncAuctionState(); + } + // 2) 자동 재시도: "낡은 화면 때문에 거부"였고 동기 rebaseline 소스(state)가 + // 있을 때만 1회. assignedPosition 등 원래 payload는 유지하고 관측값/요청 + // id만 새로 만든다. 재시도 시에는 중간 에러 문구를 띄우지 않는다(무음 복구). + const canAutoRetry = + Boolean(ack.state) && + isAuctionResyncRecommended(ack) && + retryAttempt < 1; + if (canAutoRetry) { + emitAuctionAction( + eventName, + { ...payload, ...buildAuctionActionPayload() }, + retryAttempt + 1, + ); + } else { + setError(resolveAuctionRejectionMessage(ack)); + } return; } const ackState = ack?.state; @@ -644,7 +692,15 @@ export function useAuctionSocket(matchId: string | undefined) { captureBidLatencyDiagnostics(ack); if (ack?.rejected) { clearPendingBidRequest(bidRequestId); - setError(ack.message ?? ack.code ?? '입찰이 반영되지 않았습니다.'); + // 입찰 거부도 최신 state로 rebaseline(예: 0초 입찰 EXPIRED → 만료된 + // 라운드 화면에서 벗어나게). 단 입찰은 자동 재시도하지 않는다(의도치 + // 않은 금액 재입찰 방지). + if (ack.state) { + commitAuctionState(ack.state); + } else if (isAuctionResyncRecommended(ack)) { + resyncAuctionState(); + } + setError(resolveAuctionRejectionMessage(ack)); return; } if (ack?.bidDelta) {