feat: 重构游戏房间架构
This commit is contained in:
@@ -3,7 +3,12 @@ package com.webgame.webgamebackend.ws;
|
||||
import com.webgame.webgamebackend.common.auth.AuthenticationProvider;
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.webgame.webgamebackend.service.GomokuGameService;
|
||||
import com.webgame.webgamebackend.entities.GameRoomEntity;
|
||||
import com.webgame.webgamebackend.repository.GameRoomRepository;
|
||||
import com.webgame.webgamebackend.service.RoomManager;
|
||||
import com.webgame.webgamebackend.service.engine.GameEngine;
|
||||
import com.webgame.webgamebackend.service.engine.GameEngineRegistry;
|
||||
import com.webgame.webgamebackend.service.engine.RoomContext;
|
||||
import com.webgame.webgamebackend.ws.dto.WsInboundMessage;
|
||||
import com.webgame.webgamebackend.ws.dto.WsMessage;
|
||||
import com.webgame.webgamebackend.ws.dto.WsOutboundMessage;
|
||||
@@ -23,9 +28,14 @@ import java.util.Map;
|
||||
/**
|
||||
* 房间 WebSocket 处理器
|
||||
*
|
||||
* 处理客户端连接、断开与消息路由。消息类型通过 WsMessageRouter 注册表分发,
|
||||
* 新增消息类型只需注册对应的 WsMessageHandler,无需修改路由逻辑。
|
||||
* 通过 URL 参数传递 roomId 和 token 完成认证与房间绑定。
|
||||
* 重构后的职责:
|
||||
* - 连接建立:认证 + 注册会话 + 取消断线倒计时(通过 RoomManager)
|
||||
* - 消息路由:房间管理消息 → RoomManager,游戏消息 → GameEngine
|
||||
* - 连接关闭:启动断线倒计时(通过 RoomManager)
|
||||
*
|
||||
* <p>采用策略路由:根据房间当前状态(WAITING/PLAYING)将消息分发给不同的处理器。
|
||||
* WAITING 状态下只有房间管理消息(ready, leave, start)有效;
|
||||
* PLAYING 状态下游戏消息(place_stone, resign, draw_*)由 GameEngine 处理。</p>
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
@@ -33,62 +43,69 @@ import java.util.Map;
|
||||
public class RoomWebSocketHandler extends TextWebSocketHandler {
|
||||
|
||||
private final RoomSessionManager sessionManager;
|
||||
private final GomokuGameService gomokuGameService;
|
||||
private final RoomManager roomManager;
|
||||
private final GameEngineRegistry engineRegistry;
|
||||
private final GameRoomRepository gameRoomRepository;
|
||||
private final WsMessageRouter router;
|
||||
private final AuthenticationProvider authProvider;
|
||||
|
||||
/**
|
||||
* 注册所有消息类型与对应处理器
|
||||
*
|
||||
* 新增消息类型只需在此方法中添加一行 router.register(...) 即可。
|
||||
*/
|
||||
@PostConstruct
|
||||
public void registerHandlers() {
|
||||
// 落子:需从 data 中提取 row, col
|
||||
// ===== 房间管理消息(所有状态) =====
|
||||
|
||||
// 准备/取消准备
|
||||
router.register(WsInboundMessage.READY,
|
||||
(roomId, userId, data, sm) ->
|
||||
roomManager.toggleReady(roomId, userId));
|
||||
|
||||
// 离开房间
|
||||
router.register(WsInboundMessage.LEAVE,
|
||||
(roomId, userId, data, sm) ->
|
||||
roomManager.leaveRoom(roomId, userId));
|
||||
|
||||
// 开始游戏(仅房主)
|
||||
router.register(WsInboundMessage.START,
|
||||
(roomId, userId, data, sm) ->
|
||||
roomManager.startGame(roomId, userId));
|
||||
|
||||
// ===== 游戏消息(PLAYING 状态) =====
|
||||
|
||||
// 落子
|
||||
router.register(WsInboundMessage.PLACE_STONE, (roomId, userId, data, sm) -> {
|
||||
int row = data.getIntValue("row");
|
||||
int col = data.getIntValue("col");
|
||||
gomokuGameService.placeStone(roomId, userId, row, col, sm);
|
||||
GameRoomEntity room = gameRoomRepository.findById(roomId).orElse(null);
|
||||
if (room != null && "playing".equals(room.getStatus())) {
|
||||
// 通过 RoomManager 获取引擎的 getState 不行,需要直接找到引擎
|
||||
// 改为委托模式:RoomManager 提供 executeGameAction 方法
|
||||
roomManager.executeGameAction(roomId, userId, "place_stone", data);
|
||||
}
|
||||
});
|
||||
|
||||
// 认输
|
||||
router.register(WsInboundMessage.RESIGN, (roomId, userId, data, sm) -> {
|
||||
roomManager.executeGameAction(roomId, userId, "resign", null);
|
||||
});
|
||||
|
||||
// 求和请求
|
||||
router.register(WsInboundMessage.DRAW_REQUEST, (roomId, userId, data, sm) -> {
|
||||
roomManager.executeGameAction(roomId, userId, "draw_request", null);
|
||||
});
|
||||
|
||||
// 回应求和
|
||||
router.register(WsInboundMessage.DRAW_RESPONSE, (roomId, userId, data, sm) -> {
|
||||
roomManager.executeGameAction(roomId, userId, "draw_response", data);
|
||||
});
|
||||
|
||||
// 聊天
|
||||
router.register(WsInboundMessage.CHAT, (roomId, userId, data, sm) -> {
|
||||
String content = data.getString("content");
|
||||
String content = data != null ? data.getString("content") : null;
|
||||
handleChat(roomId, userId, content);
|
||||
});
|
||||
|
||||
// 准备/取消准备
|
||||
router.register(WsInboundMessage.READY,
|
||||
(roomId, userId, data, sm) -> gomokuGameService.toggleReady(roomId, userId, sm));
|
||||
|
||||
// 认输
|
||||
router.register(WsInboundMessage.RESIGN,
|
||||
(roomId, userId, data, sm) -> gomokuGameService.resign(roomId, userId, sm));
|
||||
|
||||
// 求和请求
|
||||
router.register(WsInboundMessage.DRAW_REQUEST,
|
||||
(roomId, userId, data, sm) -> gomokuGameService.requestDraw(roomId, userId, sm));
|
||||
|
||||
// 回应求和:需从 data 中提取 accept
|
||||
router.register(WsInboundMessage.DRAW_RESPONSE, (roomId, userId, data, sm) -> {
|
||||
boolean accept = data.getBooleanValue("accept");
|
||||
gomokuGameService.respondToDraw(roomId, userId, accept, sm);
|
||||
});
|
||||
|
||||
// 离开房间
|
||||
router.register(WsInboundMessage.LEAVE,
|
||||
(roomId, userId, data, sm) -> gomokuGameService.leaveRoom(roomId, userId, sm));
|
||||
|
||||
// 开始游戏(仅房主)
|
||||
router.register(WsInboundMessage.START,
|
||||
(roomId, userId, data, sm) -> gomokuGameService.startGame(roomId, userId, sm));
|
||||
|
||||
log.info("[WS] 已注册 {} 个消息处理器", router.size());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterConnectionEstablished(WebSocketSession session) throws Exception {
|
||||
// 从 URL 参数中提取 roomId 和 token
|
||||
URI uri = session.getUri();
|
||||
if (uri == null) {
|
||||
session.close(CloseStatus.BAD_DATA);
|
||||
@@ -116,11 +133,11 @@ public class RoomWebSocketHandler extends TextWebSocketHandler {
|
||||
return;
|
||||
}
|
||||
|
||||
// 注册会话(内部会清理同用户的旧会话)
|
||||
// 注册会话
|
||||
sessionManager.addSession(roomId, userId, session);
|
||||
|
||||
// 取消断线超时定时器(重连场景)
|
||||
gomokuGameService.cancelDisconnectTimeout(roomId, userId);
|
||||
// 处理重连
|
||||
roomManager.handleReconnect(roomId, userId);
|
||||
|
||||
log.info("[WS] 连接建立, roomId={}, userId={}, sessionId={}", roomId, userId, session.getId());
|
||||
}
|
||||
@@ -144,7 +161,6 @@ public class RoomWebSocketHandler extends TextWebSocketHandler {
|
||||
Object rawData = json.get("data");
|
||||
JSONObject data = (rawData instanceof JSONObject) ? (JSONObject) rawData : null;
|
||||
|
||||
// 通过路由器查找处理器
|
||||
WsMessageHandler handler = router.get(type);
|
||||
if (handler == null) {
|
||||
sendError(session, "未知消息类型: " + type);
|
||||
@@ -166,8 +182,8 @@ public class RoomWebSocketHandler extends TextWebSocketHandler {
|
||||
roomId, userId, session.getId(), status);
|
||||
|
||||
if (userId != null && roomId != null) {
|
||||
// 通知游戏服务玩家断开
|
||||
gomokuGameService.handleDisconnect(roomId, userId, sessionManager);
|
||||
// 通知 RoomManager 处理断线
|
||||
roomManager.handleDisconnect(roomId, userId);
|
||||
}
|
||||
sessionManager.removeSession(session);
|
||||
}
|
||||
@@ -191,15 +207,9 @@ public class RoomWebSocketHandler extends TextWebSocketHandler {
|
||||
private static final int CHAT_MAX_LENGTH = 500;
|
||||
|
||||
/**
|
||||
* 聊天消息处理(暂不持久化,直接广播)
|
||||
*
|
||||
* 校验规则:
|
||||
* - content 不能为 null 或空字符串
|
||||
* - content 长度不能超过 CHAT_MAX_LENGTH(500 字符)
|
||||
* - 移除 HTML 标签防止 XSS
|
||||
* 聊天消息处理
|
||||
*/
|
||||
private void handleChat(String roomId, String userId, String content) {
|
||||
// 内容为空或超长时直接丢弃
|
||||
if (content == null || content.isBlank()) {
|
||||
return;
|
||||
}
|
||||
@@ -207,12 +217,10 @@ public class RoomWebSocketHandler extends TextWebSocketHandler {
|
||||
content = content.substring(0, CHAT_MAX_LENGTH);
|
||||
}
|
||||
|
||||
// 简易 XSS 防护:移除 HTML 标签
|
||||
String sanitized = content
|
||||
.replace("<", "<")
|
||||
.replace(">", ">");
|
||||
|
||||
// TODO: 后续可增加消息持久化
|
||||
broadcastToRoom(roomId, new WsMessage(WsOutboundMessage.CHAT_BROADCAST, Map.of(
|
||||
"userId", userId,
|
||||
"content", sanitized,
|
||||
|
||||
Reference in New Issue
Block a user