diff --git a/apps/server/src/domains/game/application/useCases/disconnectUseCase.ts b/apps/server/src/domains/game/application/useCases/disconnectUseCase.ts index ce9ce89..49d886c 100644 --- a/apps/server/src/domains/game/application/useCases/disconnectUseCase.ts +++ b/apps/server/src/domains/game/application/useCases/disconnectUseCase.ts @@ -2,17 +2,17 @@ import { logEvent } from "@server/logging/logEvent"; type DisconnectUseCaseParams = { - gameManager: DisconnectPlayerPort; + gameSessionManager: DisconnectPlayerPort; playerId: string; publishPlayerRemoved: (playerId: string) => void; }; export const disconnectUseCase = ({ - gameManager, + gameSessionManager, playerId, publishPlayerRemoved, }: DisconnectUseCaseParams) => { - gameManager.removePlayer(playerId); + gameSessionManager.removePlayer(playerId); publishPlayerRemoved(playerId); logEvent("GameUseCase", { event: "DISCONNECT", diff --git a/apps/server/src/domains/game/application/useCases/movePlayerUseCase.ts b/apps/server/src/domains/game/application/useCases/movePlayerUseCase.ts index 9bcece1..029f15d 100644 --- a/apps/server/src/domains/game/application/useCases/movePlayerUseCase.ts +++ b/apps/server/src/domains/game/application/useCases/movePlayerUseCase.ts @@ -2,15 +2,15 @@ import type { MovePlayerPort } from "../ports/gameUseCasePorts"; type MovePlayerUseCaseParams = { - gameManager: MovePlayerPort; + gameSessionManager: MovePlayerPort; playerId: string; move: playerTypes.MovePayload; }; export const movePlayerUseCase = ({ - gameManager, + gameSessionManager, playerId, move, }: MovePlayerUseCaseParams) => { - gameManager.movePlayer(playerId, move.x, move.y); + gameSessionManager.movePlayer(playerId, move.x, move.y); }; diff --git a/apps/server/src/domains/game/application/useCases/readyForGameUseCase.ts b/apps/server/src/domains/game/application/useCases/readyForGameUseCase.ts index 067a1e2..21dd04e 100644 --- a/apps/server/src/domains/game/application/useCases/readyForGameUseCase.ts +++ b/apps/server/src/domains/game/application/useCases/readyForGameUseCase.ts @@ -5,7 +5,7 @@ type ReadyForGameUseCaseParams = { socketId: string; roomId?: string; - gameManager: ReadyForGamePort; + gameSessionManager: ReadyForGamePort; publishCurrentPlayers: (players: playerTypes.PlayerData[]) => void; publishGameStart: (payload: { startTime: number }) => void; }; @@ -13,7 +13,7 @@ export const readyForGameUseCase = ({ socketId, roomId, - gameManager, + gameSessionManager, publishCurrentPlayers, publishGameStart, }: ReadyForGameUseCaseParams) => { @@ -27,7 +27,7 @@ return; } - const roomPlayers = gameManager.getRoomPlayers(roomId); + const roomPlayers = gameSessionManager.getRoomPlayers(roomId); publishCurrentPlayers(roomPlayers); logEvent("GameUseCase", { @@ -38,7 +38,7 @@ totalPlayers: roomPlayers.length, }); - const startTime = gameManager.getRoomStartTime(roomId); + const startTime = gameSessionManager.getRoomStartTime(roomId); if (!startTime) { return; } diff --git a/apps/server/src/domains/game/application/useCases/startGameUseCase.ts b/apps/server/src/domains/game/application/useCases/startGameUseCase.ts index b8991db..cc449c9 100644 --- a/apps/server/src/domains/game/application/useCases/startGameUseCase.ts +++ b/apps/server/src/domains/game/application/useCases/startGameUseCase.ts @@ -6,7 +6,7 @@ type StartGameUseCaseParams = { ownerId: string; - gameManager: StartGamePort; + gameSessionManager: StartGamePort; roomManager: RoomManager; publishUpdatePlayer: (roomId: string, playerData: playerTypes.PlayerData) => void; publishMapCellUpdates: (roomId: string, cellUpdates: gridMapTypes.CellUpdate[]) => void; @@ -16,7 +16,7 @@ export const startGameUseCase = ({ ownerId, - gameManager, + gameSessionManager, roomManager, publishUpdatePlayer, publishMapCellUpdates, @@ -55,7 +55,7 @@ const playerIds = room.players.map((p: { id: string }) => p.id); - gameManager.startRoomSession( + gameSessionManager.startRoomSession( room.roomId, playerIds, (tickData) => { @@ -79,6 +79,6 @@ } ); - const startTime = gameManager.getRoomStartTime(room.roomId) || Date.now(); + const startTime = gameSessionManager.getRoomStartTime(room.roomId) || Date.now(); publishGameStart(room.roomId, { startTime }); }; diff --git a/apps/server/src/network/SocketManager.ts b/apps/server/src/network/SocketManager.ts index f986526..d34a3f3 100644 --- a/apps/server/src/network/SocketManager.ts +++ b/apps/server/src/network/SocketManager.ts @@ -10,12 +10,12 @@ /** Socket.IOの接続ハンドラ登録を統括する */ export class SocketManager { private io: Server; - private gameManager: GameSessionManager; + private gameSessionManager: GameSessionManager; private roomManager: RoomManager; - constructor(io: Server, gameManager: GameSessionManager, roomManager: RoomManager) { + constructor(io: Server, gameSessionManager: GameSessionManager, roomManager: RoomManager) { this.io = io; - this.gameManager = gameManager; + this.gameSessionManager = gameSessionManager; this.roomManager = roomManager; } @@ -23,7 +23,7 @@ // 接続時に必要な各ドメインハンドラを登録する registerConnectionHandlers({ io: this.io, - gameManager: this.gameManager, + gameSessionManager: this.gameSessionManager, roomManager: this.roomManager, }); } diff --git a/apps/server/src/network/bootstrap/boot.ts b/apps/server/src/network/bootstrap/boot.ts index 59005a9..4f2073e 100644 --- a/apps/server/src/network/bootstrap/boot.ts +++ b/apps/server/src/network/bootstrap/boot.ts @@ -12,9 +12,9 @@ export const boot = (httpServer: HttpServer) => { // ネットワーク層とドメイン層の依存を構築する const io = createIo(httpServer); - const gameManager = new GameSessionManager(); + const gameSessionManager = new GameSessionManager(); const roomManager = new RoomManager(); - const socketManager = new SocketManager(io, gameManager, roomManager); + const socketManager = new SocketManager(io, gameSessionManager, roomManager); socketManager.initialize(); }; diff --git a/apps/server/src/network/handlers/game/handleGameDisconnect.ts b/apps/server/src/network/handlers/game/handleGameDisconnect.ts index 6a25232..7ff1db5 100644 --- a/apps/server/src/network/handlers/game/handleGameDisconnect.ts +++ b/apps/server/src/network/handlers/game/handleGameDisconnect.ts @@ -10,14 +10,14 @@ /** 切断したプレイヤーをゲーム管理から除外し通知する */ export const handleGameDisconnect = ( io: Server, - gameManager: GameSessionManager, + gameSessionManager: GameSessionManager, roomId: string | undefined, playerId: string ) => { const gameDisconnectPublisher = createGameDisconnectPublisher(io); disconnectUseCase({ - gameManager, + gameSessionManager, playerId, publishPlayerRemoved: (removedPlayerId) => { if (!roomId) { diff --git a/apps/server/src/network/handlers/game/registerGameHandlers.ts b/apps/server/src/network/handlers/game/registerGameHandlers.ts index 4e2f2c3..a41a172 100644 --- a/apps/server/src/network/handlers/game/registerGameHandlers.ts +++ b/apps/server/src/network/handlers/game/registerGameHandlers.ts @@ -20,7 +20,7 @@ export const registerGameHandlers = ( io: Server, socket: Socket, - gameManager: GameSessionManager, + gameSessionManager: GameSessionManager, roomManager: RoomManager ) => { const common = createCommonHandlerContext(io, socket); @@ -47,7 +47,7 @@ socket.on(protocol.SocketEvents.START_GAME, () => { startGameUseCase({ ownerId: socket.id, - gameManager, + gameSessionManager, roomManager, publishUpdatePlayer: gamePublisher.publishUpdatePlayerToRoom, publishMapCellUpdates: gamePublisher.publishMapCellUpdatesToRoom, @@ -63,7 +63,7 @@ readyForGameUseCase({ socketId: socket.id, roomId, - gameManager, + gameSessionManager, publishCurrentPlayers: gamePublisher.publishCurrentPlayersToSocket, publishGameStart: gamePublisher.publishGameStartToSocket, }); @@ -81,7 +81,7 @@ } movePlayerUseCase({ - gameManager, + gameSessionManager, playerId: socket.id, move: data, }); diff --git a/apps/server/src/network/handlers/registerConnectionHandlers.ts b/apps/server/src/network/handlers/registerConnectionHandlers.ts index a64fd5b..9496105 100644 --- a/apps/server/src/network/handlers/registerConnectionHandlers.ts +++ b/apps/server/src/network/handlers/registerConnectionHandlers.ts @@ -12,14 +12,14 @@ type RegisterConnectionHandlersParams = { io: Server; - gameManager: GameSessionManager; + gameSessionManager: GameSessionManager; roomManager: RoomManager; }; /** ソケット接続と切断イベントに対する共通ハンドラを登録する */ export const registerConnectionHandlers = ({ io, - gameManager, + gameSessionManager, roomManager, }: RegisterConnectionHandlersParams) => { io.on(protocol.SocketEvents.CONNECT, (socket: Socket) => { @@ -31,7 +31,7 @@ }); registerRoomHandlers(io, socket, roomManager); - registerGameHandlers(io, socket, gameManager, roomManager); + registerGameHandlers(io, socket, gameSessionManager, roomManager); socket.on(protocol.SocketEvents.DISCONNECT, () => { // 切断ログ記録後にドメイン別の後処理を実行する @@ -43,7 +43,7 @@ const roomId = roomManager.getRoomByPlayerId(socket.id)?.roomId; - handleGameDisconnect(io, gameManager, roomId, socket.id); + handleGameDisconnect(io, gameSessionManager, roomId, socket.id); handleRoomDisconnect(io, socket, roomManager); }); });