@zhuweiyou/dsh-holdem 0.1.2 → 0.1.3

package/lib/index.js

@@ -24,6 +24,8 @@ const MAX_FRAME_BYTES = 64 * 1024;
 const TICK_MS = 250;
 const SESSION_TTL_MS = 1440 * 60 * 1e3;
 const DISCONNECT_AFTER_MS = 45e3;
+/** 没有实时通道时，HTTP 请求也算「人在」：这么久没动静才标成离线。 */
+const PRESENCE_TTL_MS = 2e4;
 const LOBBY_KICK_IDLE_MS = 600 * 1e3;
 const CHAT_COOLDOWN_MS = 1200;
 const BUY_IN_BB = 100;
@@ -1446,7 +1448,7 @@ function traceWs(line) {
 function registerHoldemSocket(server, manager) {
 	const wss = new WebSocketServer({
 		noServer: true,
-		handleProtocols: (protocols) => protocols.has(SUBPROTOCOL) ? SUBPROTOCOL : false
+		handleProtocols: (protocols) => protocols.has(SUBPROTOCOL) ? SUBPROTOCOL : ""
 	});
 	const sockets = /* @__PURE__ */ new Map();
 	const off = manager.onEvent((playerId, event) => {
@@ -3168,8 +3170,8 @@ var RoomManager = class {
 		if (cookieSession) {
 			const player$1 = room.players.get(cookieSession.playerId);
 			if (player$1 && !player$1.leaving) {
-				player$1.connected = true;
 				player$1.browserId = input.browserId ?? player$1.browserId;
+				this.touch(room, player$1);
 				return {
 					playerId: player$1.playerId,
 					roomId: room.roomId,
@@ -3260,7 +3262,8 @@ var RoomManager = class {
 	view(roomId, playerId) {
 		const room = this.roomOf(playerId);
 		if (!room || room.roomId !== roomId) throw new CommandError("auth", "不在这个房间里");
-		if (room.hostPlayerId === playerId) room.hostLastSeen = this.now();
+		const player = room.players.get(playerId);
+		if (player) this.touch(room, player);
 		return this.project(room, playerId);
 	}
 	command(roomId, playerId, command, baseSeq, actionId) {
@@ -3268,7 +3271,7 @@ var RoomManager = class {
 		if (!room || room.roomId !== roomId) throw new CommandError("auth", "不在这个房间里");
 		const player = room.players.get(playerId);
 		if (!player || player.leaving) throw new CommandError("auth", "不在这个房间里");
-		if (room.hostPlayerId === playerId) room.hostLastSeen = this.now();
+		this.touch(room, player);
 		if (command.type === "ping") return {
 			seq: room.seq,
 			view: this.project(room, playerId)
@@ -3411,13 +3414,32 @@ var RoomManager = class {
 			roomId: entry.roomId
 		};
 	}
+	/**
+	* 实时通道打开/关闭。
+	*
+	* 关掉 socket 不等于立刻离线：后台轮询（HTTP）还活着的话人还在。真正判离线交给
+	* `tick` 按 `PRESENCE_TTL_MS` 扫一遍，两边都没有动静才标成离线。
+	*/
 	markConnected(playerId, roomId, connected) {
 		const room = this.rooms.get(roomId);
 		const player = room?.players.get(playerId);
 		if (!room || !player) return;
-		if (room.hostPlayerId === playerId && connected) room.hostLastSeen = this.now();
-		if (player.connected === connected) return;
-		player.connected = connected;
+		player.socketOpen = connected;
+		if (connected) player.lastSeenAt = this.now();
+		this.refreshPresence(room, player);
+	}
+	/** HTTP 请求也算心跳：轮询模式下不能把自己和别人都显示成离线。 */
+	touch(room, player) {
+		if (player.leaving) return;
+		player.lastSeenAt = this.now();
+		if (room.hostPlayerId === player.playerId) room.hostLastSeen = player.lastSeenAt;
+		this.refreshPresence(room, player);
+	}
+	/** 有实时通道，或者最近有 HTTP 动静，就算在线。 */
+	refreshPresence(room, player) {
+		const online = !player.leaving && (player.socketOpen || this.now() - player.lastSeenAt < PRESENCE_TTL_MS);
+		if (player.connected === online) return;
+		player.connected = online;
 		this.publish(room);
 	}
 	health() {
@@ -3576,6 +3598,7 @@ var RoomManager = class {
 			if (room.phase === "hand" && room.hand) this.tickHand(room, now);
 			if (room.phase === "handOver" && room.handOverAt !== null && now >= room.handOverAt) this.advance(room, now);
 			for (const player of [...room.players.values()]) if (player.leaving && room.phase !== "hand") this.removePlayer(room, player.playerId);
+			else this.refreshPresence(room, player);
 		}
 		this.cleanupSessions(now);
 	}
@@ -3726,6 +3749,8 @@ var RoomManager = class {
 			seat,
 			ready: false,
 			connected: true,
+			socketOpen: false,
+			lastSeenAt: this.now(),
 			sittingOut: false,
 			autoFold: false,
 			timeoutStreak: 0,