fix: 暂存

This commit is contained in:
2026-06-24 09:50:01 +08:00
parent 842e5c29f9
commit 3580ad934e
7 changed files with 307 additions and 79 deletions
@@ -7,6 +7,7 @@ import com.webgame.webgamebackend.service.GomokuGameService;
import com.webgame.webgamebackend.ws.dto.WsInboundMessage;
import com.webgame.webgamebackend.ws.dto.WsMessage;
import com.webgame.webgamebackend.ws.dto.WsOutboundMessage;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -22,7 +23,8 @@ import java.util.Map;
/**
* 房间 WebSocket 处理器
*
* 处理客户端连接、断开与消息路由。消息类型路由到不同的业务逻辑。
* 处理客户端连接、断开与消息路由。消息类型通过 WsMessageRouter 注册表分发,
* 新增消息类型只需注册对应的 WsMessageHandler,无需修改路由逻辑。
* 通过 URL 参数传递 roomId 和 token 完成认证与房间绑定。
*/
@Slf4j
@@ -32,6 +34,56 @@ public class RoomWebSocketHandler extends TextWebSocketHandler {
private final RoomSessionManager sessionManager;
private final GomokuGameService gomokuGameService;
private final WsMessageRouter router;
/**
* 注册所有消息类型与对应处理器
*
* 新增消息类型只需在此方法中添加一行 router.register(...) 即可。
*/
@PostConstruct
public void registerHandlers() {
// 落子:需从 data 中提取 row, col
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);
});
// 聊天
router.register(WsInboundMessage.CHAT, (roomId, userId, data, sm) -> {
String content = data.getString("content");
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 {
@@ -89,40 +141,17 @@ public class RoomWebSocketHandler extends TextWebSocketHandler {
try {
JSONObject json = JSON.parseObject(payload);
String type = json.getString("type");
Object data = json.get("data");
Object rawData = json.get("data");
JSONObject data = (rawData instanceof JSONObject) ? (JSONObject) rawData : null;
switch (type) {
case WsInboundMessage.PLACE_STONE -> {
// data 包含 row, col
int row = ((JSONObject) data).getIntValue("row");
int col = ((JSONObject) data).getIntValue("col");
gomokuGameService.placeStone(roomId, userId, row, col, sessionManager);
}
case WsInboundMessage.CHAT -> {
String content = ((JSONObject) data).getString("content");
handleChat(roomId, userId, content);
}
case WsInboundMessage.READY -> {
gomokuGameService.toggleReady(roomId, userId, sessionManager);
}
case WsInboundMessage.RESIGN -> {
gomokuGameService.resign(roomId, userId, sessionManager);
}
case WsInboundMessage.DRAW_REQUEST -> {
gomokuGameService.requestDraw(roomId, userId, sessionManager);
}
case WsInboundMessage.DRAW_RESPONSE -> {
boolean accept = ((JSONObject) data).getBooleanValue("accept");
gomokuGameService.respondToDraw(roomId, userId, accept, sessionManager);
}
case WsInboundMessage.LEAVE -> {
gomokuGameService.leaveRoom(roomId, userId, sessionManager);
}
case WsInboundMessage.START -> {
gomokuGameService.startGame(roomId, userId, sessionManager);
}
default -> sendError(session, "未知消息类型: " + type);
// 通过路由器查找处理器
WsMessageHandler handler = router.get(type);
if (handler == null) {
sendError(session, "未知消息类型: " + type);
return;
}
handler.handle(roomId, userId, data, sessionManager);
} catch (Exception e) {
log.error("[WS] 处理消息异常, roomId={}, userId={}", roomId, userId, e);
sendError(session, e.getMessage());