From 44df19b0791cc890dc5b74e88a851b3530d3c8b8 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Mon, 5 Jan 2026 17:34:36 +0000
Subject: [PATCH] refactor: improve war module type safety and reserved turns
 test data handling

---
 app/game-api/test/reservedTurns.test.ts       | 42 ++++-----
 app/gateway-frontend/src/views/LobbyView.vue  | 29 +++---
 .../logic/src/actions/turn/commandModule.ts   |  4 -
 packages/logic/src/triggers/general-action.ts | 90 ++++++++++---------
 .../logic/src/triggers/special/war/aux.ts     |  7 +-
 .../src/triggers/special/war/che_견고.ts      |  4 +-
 .../src/triggers/special/war/che_무쌍.ts      |  8 +-
 .../src/triggers/special/war/che_반계.ts      |  4 +-
 packages/logic/src/war/actions.ts             | 48 +++++-----
 packages/logic/src/war/engine.ts              | 12 ++-
 10 files changed, 137 insertions(+), 111 deletions(-)

diff --git a/app/game-api/test/reservedTurns.test.ts b/app/game-api/test/reservedTurns.test.ts
index ea64eec..570f4a8 100644
--- a/app/game-api/test/reservedTurns.test.ts
+++ b/app/game-api/test/reservedTurns.test.ts
@@ -17,14 +17,10 @@ const buildDb = () => {
     type GeneralTurnFindManyArgs = Parameters<DatabaseClient['generalTurn']['findMany']>[0];
     type GeneralTurnDeleteManyArgs = NonNullable<Parameters<DatabaseClient['generalTurn']['deleteMany']>[0]>;
     type GeneralTurnCreateManyArgs = NonNullable<Parameters<DatabaseClient['generalTurn']['createMany']>[0]>;
-    type GeneralTurnCreateManyData = GeneralTurnCreateManyArgs['data'];
-    type GeneralTurnCreateManyRow = GeneralTurnCreateManyData extends Array<infer Row> ? Row : never;
 
     type NationTurnFindManyArgs = Parameters<DatabaseClient['nationTurn']['findMany']>[0];
     type NationTurnDeleteManyArgs = NonNullable<Parameters<DatabaseClient['nationTurn']['deleteMany']>[0]>;
     type NationTurnCreateManyArgs = NonNullable<Parameters<DatabaseClient['nationTurn']['createMany']>[0]>;
-    type NationTurnCreateManyData = NationTurnCreateManyArgs['data'];
-    type NationTurnCreateManyRow = NationTurnCreateManyData extends Array<infer Row> ? Row : never;
 
     const db = {
         worldState: {
@@ -45,20 +41,23 @@ const buildDb = () => {
                 return generalId !== undefined ? (generalTurns.get(generalId) ?? []) : [];
             },
             deleteMany: async ({ where }: GeneralTurnDeleteManyArgs) => {
-                if (typeof where.generalId === 'number') {
+                if (where && typeof where.generalId === 'number') {
                     generalTurns.delete(where.generalId);
                 }
                 return {};
             },
             createMany: async ({ data }: GeneralTurnCreateManyArgs) => {
-                const rows = data.map((row: GeneralTurnCreateManyRow, index: number) => ({
+                const dataList = (Array.isArray(data) ? data : [data]) as Record<string, unknown>[];
+                const rows: GeneralTurnRow[] = dataList.map((row, index: number) => ({
                     id: index + 1,
-                    generalId: row.generalId,
-                    turnIdx: row.turnIdx,
-                    actionCode: row.actionCode,
-                    arg: row.arg,
+                    generalId: row.generalId as number,
+                    turnIdx: row.turnIdx as number,
+                    actionCode: row.actionCode as string,
+                    arg: row.arg as unknown as GeneralTurnRow['arg'],
+                    createdAt: new Date(),
                 }));
-                const generalId = data[0]?.generalId;
+                const firstRow = dataList[0];
+                const generalId = firstRow?.generalId as number | undefined;
                 if (generalId !== undefined) {
                     generalTurns.set(generalId, rows);
                 }
@@ -76,22 +75,25 @@ const buildDb = () => {
                 return nationTurns.get(`${nationId}:${officerLevel}`) ?? [];
             },
             deleteMany: async ({ where }: NationTurnDeleteManyArgs) => {
-                if (typeof where.nationId === 'number' && typeof where.officerLevel === 'number') {
+                if (where && typeof where.nationId === 'number' && typeof where.officerLevel === 'number') {
                     nationTurns.delete(`${where.nationId}:${where.officerLevel}`);
                 }
                 return {};
             },
             createMany: async ({ data }: NationTurnCreateManyArgs) => {
-                const rows = data.map((row: NationTurnCreateManyRow, index: number) => ({
+                const dataList = (Array.isArray(data) ? data : [data]) as Record<string, unknown>[];
+                const rows: NationTurnRow[] = dataList.map((row, index: number) => ({
                     id: index + 1,
-                    nationId: row.nationId,
-                    officerLevel: row.officerLevel,
-                    turnIdx: row.turnIdx,
-                    actionCode: row.actionCode,
-                    arg: row.arg,
+                    nationId: row.nationId as number,
+                    officerLevel: row.officerLevel as number,
+                    turnIdx: row.turnIdx as number,
+                    actionCode: row.actionCode as string,
+                    arg: row.arg as unknown as NationTurnRow['arg'],
+                    createdAt: new Date(),
                 }));
-                const nationId = data[0]?.nationId;
-                const officerLevel = data[0]?.officerLevel;
+                const firstRow = dataList[0];
+                const nationId = firstRow?.nationId as number | undefined;
+                const officerLevel = firstRow?.officerLevel as number | undefined;
                 if (nationId !== undefined && officerLevel !== undefined) {
                     nationTurns.set(`${nationId}:${officerLevel}`, rows);
                 }
diff --git a/app/gateway-frontend/src/views/LobbyView.vue b/app/gateway-frontend/src/views/LobbyView.vue
index 7ee2579..2dae6ad 100644
--- a/app/gateway-frontend/src/views/LobbyView.vue
+++ b/app/gateway-frontend/src/views/LobbyView.vue
@@ -60,6 +60,7 @@ const handleLogout = async () => {
         <div class="max-w-5xl mx-auto py-8 px-4 space-y-8">
             <!-- Notice -->
             <div v-if="notice" class="text-center">
+                <!-- eslint-disable-next-line vue/no-v-html -->
                 <span class="text-orange-500 text-3xl font-bold" v-html="notice"></span>
             </div>
 
@@ -91,15 +92,15 @@ const handleLogout = async () => {
                                     :style="{ color: profile.color }"
                                     class="text-lg font-bold cursor-help"
                                     :title="
-                                        profileDetails[profile.profileName]
-                                            ? `시작일: ${profileDetails[profile.profileName].starttime}`
+                                        profileDetails[profile.profileName]?.starttime
+                                            ? `시작일: ${profileDetails[profile.profileName]?.starttime}`
                                             : ''
                                     "
                                 >
                                     {{ profile.korName }}섭
                                 </div>
                                 <div v-if="profileDetails[profile.profileName]" class="text-xs text-zinc-500 mt-1">
-                                    &lt;{{ profileDetails[profile.profileName].nationCnt }}국 경쟁중&gt;
+                                    &lt;{{ profileDetails[profile.profileName]?.nationCnt }}국 경쟁중&gt;
                                 </div>
                             </td>
 
@@ -108,25 +109,25 @@ const handleLogout = async () => {
                                 <template v-if="profileDetails[profile.profileName]">
                                     <div class="space-y-1">
                                         <div>
-                                            서기 {{ profileDetails[profile.profileName].year }}년
-                                            {{ profileDetails[profile.profileName].month }}월 (<span
+                                            서기 {{ profileDetails[profile.profileName]?.year }}년
+                                            {{ profileDetails[profile.profileName]?.month }}월 (<span
                                                 class="text-orange-400"
                                                 >{{ profile.scenario }}</span
                                             >)
                                         </div>
                                         <div class="text-zinc-400">
-                                            유저 : {{ profileDetails[profile.profileName].userCnt }} /
-                                            {{ profileDetails[profile.profileName].maxUserCnt }}명
+                                            유저 : {{ profileDetails[profile.profileName]?.userCnt }} /
+                                            {{ profileDetails[profile.profileName]?.maxUserCnt }}명
                                             <span class="text-cyan-400 ml-2"
-                                                >NPC : {{ profileDetails[profile.profileName].npcCnt }}명</span
+                                                >NPC : {{ profileDetails[profile.profileName]?.npcCnt }}명</span
                                             >
                                             <span class="text-green-400 ml-2"
-                                                >({{ profileDetails[profile.profileName].turnTerm }}분 턴 서버)</span
+                                                >({{ profileDetails[profile.profileName]?.turnTerm }}분 턴 서버)</span
                                             >
                                         </div>
                                         <div class="text-xs text-zinc-500">
-                                            (상성 설정:{{ profileDetails[profile.profileName].fictionMode }}), (기타
-                                            설정:{{ profileDetails[profile.profileName].otherTextInfo }})
+                                            (상성 설정:{{ profileDetails[profile.profileName]?.fictionMode }}), (기타
+                                            설정:{{ profileDetails[profile.profileName]?.otherTextInfo }})
                                         </div>
                                     </div>
                                 </template>
@@ -145,14 +146,14 @@ const handleLogout = async () => {
                                     class="w-12 h-12 mx-auto bg-zinc-800 rounded overflow-hidden border border-zinc-700"
                                 >
                                     <img
-                                        :src="profileDetails[profile.profileName].myGeneral.picture"
+                                        :src="profileDetails[profile.profileName]?.myGeneral?.picture ?? undefined"
                                         class="w-full h-full object-cover"
                                     />
                                 </div>
                             </td>
                             <td class="px-4 py-4 border-r border-zinc-800 text-center">
                                 <div v-if="profileDetails[profile.profileName]?.myGeneral" class="font-medium">
-                                    {{ profileDetails[profile.profileName].myGeneral.name }}
+                                    {{ profileDetails[profile.profileName]?.myGeneral?.name }}
                                 </div>
                                 <div v-else class="text-zinc-600">- 미 등 록 -</div>
                             </td>
@@ -161,7 +162,7 @@ const handleLogout = async () => {
                             <td class="px-4 py-4 text-center">
                                 <template v-if="profileDetails[profile.profileName]">
                                     <button
-                                        v-if="profileDetails[profile.profileName].myGeneral"
+                                        v-if="profileDetails[profile.profileName]?.myGeneral"
                                         class="w-full bg-zinc-700 hover:bg-zinc-600 text-white py-1.5 rounded text-sm transition-colors"
                                     >
                                         입장
diff --git a/packages/logic/src/actions/turn/commandModule.ts b/packages/logic/src/actions/turn/commandModule.ts
index b48ed40..5b504f0 100644
--- a/packages/logic/src/actions/turn/commandModule.ts
+++ b/packages/logic/src/actions/turn/commandModule.ts
@@ -1,5 +1,4 @@
 import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js';
-import type { GeneralActionResolver } from '@sammo-ts/logic/actions/engine.js';
 import type { ActionContextBuilder } from './actionContext.js';
 import type { TurnCommandEnv } from './commandEnv.js';
 
@@ -13,8 +12,5 @@ export interface TurnCommandSpecBase<TKey extends string = string> {
 
 export interface TurnCommandModule<TSpec extends TurnCommandSpecBase = TurnCommandSpecBase> {
     commandSpec: TSpec;
-    ActionDefinition: new (...args: unknown[]) => GeneralActionDefinition;
-    ActionResolver?: new (...args: unknown[]) => GeneralActionResolver;
-    CommandResolver?: new (...args: unknown[]) => unknown;
     actionContextBuilder?: ActionContextBuilder;
 }
diff --git a/packages/logic/src/triggers/general-action.ts b/packages/logic/src/triggers/general-action.ts
index 6409be4..a77bb00 100644
--- a/packages/logic/src/triggers/general-action.ts
+++ b/packages/logic/src/triggers/general-action.ts
@@ -12,54 +12,62 @@ import type {
 } from './types.js';
 
 export interface GeneralActionModule<TriggerState extends GeneralTriggerState = GeneralTriggerState> {
-    getName?(): string;
-    getInfo?(): string;
+    getName?: (() => string) | undefined;
+    getInfo?: (() => string) | undefined;
 
-    getPreTurnExecuteTriggerList?(
-        context: GeneralActionContext<TriggerState>
-    ): GeneralTriggerCaller<TriggerState> | null;
+    getPreTurnExecuteTriggerList?:
+        | ((context: GeneralActionContext<TriggerState>) => GeneralTriggerCaller<TriggerState> | null)
+        | undefined;
 
-    onCalcDomestic?(
-        context: GeneralActionContext<TriggerState>,
-        turnType: TriggerDomesticActionType,
-        varType: TriggerDomesticVarType,
-        value: number,
-        aux?: unknown
-    ): number;
+    onCalcDomestic?:
+        | ((
+              context: GeneralActionContext<TriggerState>,
+              turnType: TriggerDomesticActionType,
+              varType: TriggerDomesticVarType,
+              value: number,
+              aux?: unknown
+          ) => number)
+        | undefined;
 
-    onCalcStat?(
-        context: GeneralActionContext<TriggerState>,
-        statName: GeneralStatName,
-        value: number,
-        aux?: unknown
-    ): number;
+    onCalcStat?:
+        | ((
+              context: GeneralActionContext<TriggerState>,
+              statName: GeneralStatName,
+              value: number,
+              aux?: unknown
+          ) => number)
+        | undefined;
 
-    onCalcOpposeStat?(
-        context: GeneralActionContext<TriggerState>,
-        statName: GeneralStatName,
-        value: number,
-        aux?: unknown
-    ): number;
+    onCalcOpposeStat?:
+        | ((
+              context: GeneralActionContext<TriggerState>,
+              statName: GeneralStatName,
+              value: number,
+              aux?: unknown
+          ) => number)
+        | undefined;
 
-    onCalcStrategic?(
-        context: GeneralActionContext<TriggerState>,
-        turnType: TriggerStrategicActionType,
-        varType: TriggerStrategicVarType,
-        value: number
-    ): number;
+    onCalcStrategic?:
+        | ((
+              context: GeneralActionContext<TriggerState>,
+              turnType: TriggerStrategicActionType,
+              varType: TriggerStrategicVarType,
+              value: number
+          ) => number)
+        | undefined;
 
-    onCalcNationalIncome?(
-        context: GeneralActionContext<TriggerState>,
-        type: TriggerNationalIncomeType,
-        amount: number
-    ): number;
+    onCalcNationalIncome?:
+        | ((context: GeneralActionContext<TriggerState>, type: TriggerNationalIncomeType, amount: number) => number)
+        | undefined;
 
-    onArbitraryAction?(
-        context: GeneralActionContext<TriggerState>,
-        actionType: TriggerActionType,
-        phase?: TriggerActionPhase | null,
-        aux?: Record<string, unknown> | null
-    ): Record<string, unknown> | null;
+    onArbitraryAction?:
+        | ((
+              context: GeneralActionContext<TriggerState>,
+              actionType: TriggerActionType,
+              phase?: TriggerActionPhase | null,
+              aux?: Record<string, unknown> | null
+          ) => Record<string, unknown> | null)
+        | undefined;
 }
 
 export class GeneralActionPipeline<TriggerState extends GeneralTriggerState = GeneralTriggerState> {
diff --git a/packages/logic/src/triggers/special/war/aux.ts b/packages/logic/src/triggers/special/war/aux.ts
index e84ab3f..96a8b3f 100644
--- a/packages/logic/src/triggers/special/war/aux.ts
+++ b/packages/logic/src/triggers/special/war/aux.ts
@@ -14,15 +14,16 @@ export const parseWarDexAux = (aux: unknown): WarDexAux => {
     const opposeRaw = aux.opposeType;
 
     if (!isRecord(opposeRaw)) {
-        return { isAttacker };
+        return isAttacker === undefined ? {} : { isAttacker };
     }
 
     const armType = opposeRaw.armType;
     if (typeof armType !== 'number') {
-        return { isAttacker };
+        return isAttacker === undefined ? {} : { isAttacker };
     }
 
-    return { isAttacker, opposeType: { armType } };
+    const opposeType = { armType };
+    return isAttacker === undefined ? { opposeType } : { isAttacker, opposeType };
 };
 
 export const getAuxArmType = (aux: unknown): number | undefined => {
diff --git a/packages/logic/src/triggers/special/war/che_견고.ts b/packages/logic/src/triggers/special/war/che_견고.ts
index 6a46bd6..84565fa 100644
--- a/packages/logic/src/triggers/special/war/che_견고.ts
+++ b/packages/logic/src/triggers/special/war/che_견고.ts
@@ -44,7 +44,7 @@ export const traitModule: TraitModule = {
     kind: 'war',
     getName: () => '견고',
     getInfo: () => '[전투] 상대 필살 확률 -20%p, 상대 계략 시도시 성공 확률 -10%p, 부상 없음, 아군 피해 -10%',
-    onCalcOpposeStat: (_context, statName, value, _aux) => {
+    onCalcOpposeStat: ((_context, statName, value, _aux) => {
         if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
             return value - 0.1;
         }
@@ -52,7 +52,7 @@ export const traitModule: TraitModule = {
             return value - 0.2;
         }
         return value;
-    },
+    }) as TraitModule['onCalcOpposeStat'],
     getBattleInitTriggerList: (_context) => {
         if (!_context.unit) return null;
         return new WarTriggerCaller(new che_부상무효(_context.unit));
diff --git a/packages/logic/src/triggers/special/war/che_무쌍.ts b/packages/logic/src/triggers/special/war/che_무쌍.ts
index b2c0ecd..ea7a07f 100644
--- a/packages/logic/src/triggers/special/war/che_무쌍.ts
+++ b/packages/logic/src/triggers/special/war/che_무쌍.ts
@@ -4,6 +4,8 @@ import type { WarActionContext } from '@sammo-ts/logic/war/actions.js';
 import type { TraitModule } from '@sammo-ts/logic/triggers/special/types.js';
 import { getMetaNumber } from '@sammo-ts/logic/war/utils.js';
 
+import { WarUnit } from '@sammo-ts/logic/war/units.js';
+
 type WarUnitWithGeneral = WarUnit & { getGeneral: () => { meta: Record<string, unknown> } };
 
 const hasGeneral = (unit: WarUnit): unit is WarUnitWithGeneral =>
@@ -44,7 +46,11 @@ export const traitModule: TraitModule = {
         // Note: unit.getGeneral() is only available for WarUnitGeneral.
         // In a real scenario, we should check if unit is WarUnitGeneral.
         if (hasGeneral(unit)) {
-            const killnum = getMetaNumber(unit.getGeneral().meta, 'rank_killnum', 0);
+            const killnum = getMetaNumber(
+                unit.getGeneral().meta as Record<string, import('@sammo-ts/logic/domain/entities.js').TriggerValue>,
+                'rank_killnum',
+                0
+            );
             const logVal = Math.log2(Math.max(1, killnum / 5));
             attackMultiplier += logVal / 20;
             defenceMultiplier -= logVal / 50;
diff --git a/packages/logic/src/triggers/special/war/che_반계.ts b/packages/logic/src/triggers/special/war/che_반계.ts
index e353deb..ea1d526 100644
--- a/packages/logic/src/triggers/special/war/che_반계.ts
+++ b/packages/logic/src/triggers/special/war/che_반계.ts
@@ -99,12 +99,12 @@ export const traitModule: TraitModule = {
     getName: () => '반계',
     getInfo: () =>
         '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 40% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +150%)',
-    onCalcOpposeStat: (_context, statName, value, _aux) => {
+    onCalcOpposeStat: ((_context, statName, value, _aux) => {
         if (statName === 'warMagicSuccessProb' && typeof value === 'number') {
             return value - 0.1;
         }
         return value;
-    },
+    }) as TraitModule['onCalcOpposeStat'],
     getBattlePhaseTriggerList: (_context) => {
         if (!_context.unit) return null;
         return new WarTriggerCaller(new che_반계시도(_context.unit), new che_반계발동(_context.unit));
diff --git a/packages/logic/src/war/actions.ts b/packages/logic/src/war/actions.ts
index 9ee73c8..996537a 100644
--- a/packages/logic/src/war/actions.ts
+++ b/packages/logic/src/war/actions.ts
@@ -16,32 +16,38 @@ export interface WarActionContext<TriggerState extends GeneralTriggerState = Gen
 }
 
 export interface WarActionModule<TriggerState extends GeneralTriggerState = GeneralTriggerState> {
-    getName?(): string;
-    getInfo?(): string;
+    getName?: (() => string) | undefined;
+    getInfo?: (() => string) | undefined;
 
-    getBattleInitTriggerList?(context: WarActionContext<TriggerState>): WarTriggerCaller | null;
+    getBattleInitTriggerList?: ((context: WarActionContext<TriggerState>) => WarTriggerCaller | null) | undefined;
 
-    getBattlePhaseTriggerList?(context: WarActionContext<TriggerState>): WarTriggerCaller | null;
+    getBattlePhaseTriggerList?: ((context: WarActionContext<TriggerState>) => WarTriggerCaller | null) | undefined;
 
-    onCalcStat?(
-        context: WarActionContext<TriggerState>,
-        statName: WarStatName,
-        value: number | [number, number],
-        aux?: unknown
-    ): number | [number, number];
+    onCalcStat?:
+        | ((
+              context: WarActionContext<TriggerState>,
+              statName: WarStatName,
+              value: number | [number, number],
+              aux?: unknown
+          ) => number | [number, number])
+        | undefined;
 
-    onCalcOpposeStat?(
-        context: WarActionContext<TriggerState>,
-        statName: WarStatName,
-        value: number | [number, number],
-        aux?: unknown
-    ): number | [number, number];
+    onCalcOpposeStat?:
+        | ((
+              context: WarActionContext<TriggerState>,
+              statName: WarStatName,
+              value: number | [number, number],
+              aux?: unknown
+          ) => number | [number, number])
+        | undefined;
 
-    getWarPowerMultiplier?(
-        context: WarActionContext<TriggerState>,
-        unit: WarUnit<TriggerState>,
-        oppose: WarUnit<TriggerState>
-    ): [number, number];
+    getWarPowerMultiplier?:
+        | ((
+              context: WarActionContext<TriggerState>,
+              unit: WarUnit<TriggerState>,
+              oppose: WarUnit<TriggerState>
+          ) => [number, number])
+        | undefined;
 }
 
 export class WarActionPipeline<TriggerState extends GeneralTriggerState = GeneralTriggerState> {
diff --git a/packages/logic/src/war/engine.ts b/packages/logic/src/war/engine.ts
index 7d6a524..c1e9852 100644
--- a/packages/logic/src/war/engine.ts
+++ b/packages/logic/src/war/engine.ts
@@ -110,7 +110,10 @@ const isSupplyCity = (city: City): boolean => {
     return city.supplyState > 0;
 };
 
-export const computeBattleOrder = (defender: WarUnit, attacker: WarUnitGeneral): number => {
+export const computeBattleOrder = <TriggerState extends GeneralTriggerState>(
+    defender: WarUnit<TriggerState>,
+    attacker: WarUnitGeneral<TriggerState>
+): number => {
     if (defender instanceof WarUnitCity) {
         const context = attacker.getActionContext();
         return attacker.getActionPipeline().onCalcOpposeStat(context, 'cityBattleOrder', -1);
@@ -257,11 +260,14 @@ export const resolveWarBattle = <TriggerState extends GeneralTriggerState = Gene
         defenderGenerals.push(unit);
     }
 
-    if (defenderGenerals.length > 0 && computeBattleOrder(cityUnit, attackerUnit) > 0) {
+    if (defenderGenerals.length > 0 && computeBattleOrder<TriggerState>(cityUnit, attackerUnit) > 0) {
         defenderUnits.push(cityUnit);
     }
 
-    defenderUnits.sort((lhs, rhs) => computeBattleOrder(rhs, attackerUnit) - computeBattleOrder(lhs, attackerUnit));
+    defenderUnits.sort(
+        (lhs, rhs) =>
+            computeBattleOrder<TriggerState>(rhs, attackerUnit) - computeBattleOrder<TriggerState>(lhs, attackerUnit)
+    );
 
     const iter = defenderUnits.values();
     let defender: WarUnit<TriggerState> | null = null;