Talon/chat_grid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix position desync causing item interaction failures

Browse Source
This commit is contained in:
Jage9
2026-02-24 21:01:21 -05:00
parent 297f1c0c1a
commit 4ea5419d30
7 changed files with 103 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/public/version.js
View File

@@ -1,5 +1,5 @@
// Maintainer-controlled web client version.
// Format: YYYY.MM.DD Rn (example: 2026.02.20 R2)
window.CHGRID_WEB_VERSION = "2026.02.25 R238";
window.CHGRID_WEB_VERSION = "2026.02.25 R239";
// Optional display timezone for timestamps. Falls back to America/Detroit if unset/invalid.
window.CHGRID_TIME_ZONE = "America/Detroit";

3
client/src/main.ts
View File

@@ -1094,8 +1094,7 @@ function updateTeleport(): void {
const completionStatus = activeTeleport.completionStatus;
state.player.x = activeTeleport.targetX;
state.player.y = activeTeleport.targetY;
signaling.send({ type: 'update_position', x: activeTeleport.targetX, y: activeTeleport.targetY });
signaling.send({ type: 'teleport_complete' });
signaling.send({ type: 'teleport_complete', x: activeTeleport.targetX, y: activeTeleport.targetY });
activeTeleport = null;
stopTeleportLoopAudio();
persistPlayerPosition();

5
client/src/network/messageHandlers.ts
View File

@@ -140,6 +140,11 @@ export function createOnMessageHandler(deps: MessageHandlerDeps): (message: Inco
}
case 'update_position': {
if (message.id === deps.state.player.id) {
deps.state.player.x = message.x;
deps.state.player.y = message.y;
break;
}
const peer = deps.state.peers.get(message.id);
const prevX = peer?.x ?? message.x;
const prevY = peer?.y ?? message.y;

2
client/src/network/protocol.ts
View File

@@ -225,7 +225,7 @@ export type IncomingMessage = z.infer<typeof incomingMessageSchema>;
export type OutgoingMessage =
| { type: 'signal'; targetId: string; sdp?: RTCSessionDescriptionInit; ice?: RTCIceCandidateInit }
| { type: 'update_position'; x: number; y: number }
| { type: 'teleport_complete' }
| { type: 'teleport_complete'; x: number; y: number }
| { type: 'update_nickname'; nickname: string }
| { type: 'chat_message'; message: string }
| { type: 'ping'; clientSentAt: number }

2
server/app/models.py
View File

@@ -27,6 +27,8 @@ class UpdatePositionPacket(BasePacket):
class TeleportCompletePacket(BasePacket):
type: Literal["teleport_complete"]
x: int
y: int
class UpdateNicknamePacket(BasePacket):

43
server/app/server.py
View File

@@ -849,6 +849,10 @@ class SignalingServer:
packet.y,
self.grid_size,
)
await self._send(
client.websocket,
BroadcastPositionPacket(type="update_position", id=client.id, x=client.x, y=client.y),
)
return
now_ms = self.item_service.now_ms()
requested_delta = max(abs(packet.x - client.x), abs(packet.y - client.y))
@@ -865,10 +869,18 @@ class SignalingServer:
remaining,
client.movement_window_index,
)
await self._send(
client.websocket,
BroadcastPositionPacket(type="update_position", id=client.id, x=client.x, y=client.y),
)
return
client.x = packet.x
client.y = packet.y
client.last_position_update_ms = now_ms
await self._send(
client.websocket,
BroadcastPositionPacket(type="update_position", id=client.id, x=client.x, y=client.y),
)
await self._broadcast(
BroadcastPositionPacket(type="update_position", id=client.id, x=client.x, y=client.y),
exclude=client.websocket,
@@ -882,6 +894,37 @@ class SignalingServer:
return
if isinstance(packet, TeleportCompletePacket):
if not self._is_in_bounds(packet.x, packet.y):
PACKET_LOGGER.warning(
"out-of-bounds teleport ignored id=%s x=%d y=%d grid_size=%d",
client.id,
packet.x,
packet.y,
self.grid_size,
)
await self._send(
client.websocket,
BroadcastPositionPacket(type="update_position", id=client.id, x=client.x, y=client.y),
)
return
client.x = packet.x
client.y = packet.y
client.last_position_update_ms = self.item_service.now_ms()
await self._send(
client.websocket,
BroadcastPositionPacket(type="update_position", id=client.id, x=client.x, y=client.y),
)
await self._broadcast(
BroadcastPositionPacket(type="update_position", id=client.id, x=client.x, y=client.y),
exclude=client.websocket,
)
carried = self.item_service.find_carried_item(client.id)
if carried:
carried.x = client.x
carried.y = client.y
carried.updatedAt = self.item_service.now_ms()
await self._broadcast_item(carried)
await self._broadcast(
BroadcastTeleportCompletePacket(
type="teleport_complete",

57
server/tests/test_server_message_handling.py
View File

@@ -149,13 +149,56 @@ async def test_teleport_complete_broadcasts_spatial_event(monkeypatch: pytest.Mo
async def fake_broadcast(packet: object, exclude: ServerConnection | None = None) -> None:
broadcast_payloads.append(packet)
async def fake_send(websocket: ServerConnection, packet: object) -> None:
return None
monkeypatch.setattr(server, "_broadcast", fake_broadcast)
monkeypatch.setattr(server, "_send", fake_send)
await server._handle_message(client, json.dumps({"type": "teleport_complete", "x": 12, "y": 13}))
assert len(broadcast_payloads) == 2
assert broadcast_payloads[0].type == "update_position"
assert broadcast_payloads[0].id == "u1"
assert broadcast_payloads[0].x == 12
assert broadcast_payloads[0].y == 13
assert broadcast_payloads[1].type == "teleport_complete"
assert broadcast_payloads[1].id == "u1"
assert broadcast_payloads[1].x == 12
assert broadcast_payloads[1].y == 13
@pytest.mark.asyncio
async def test_update_position_rate_reject_sends_self_correction(monkeypatch: pytest.MonkeyPatch) -> None:
server = SignalingServer("127.0.0.1", 8765, None, None, grid_size=41)
ws = _fake_ws()
client = ClientConnection(websocket=ws, id="u1", nickname="tester", x=5, y=5)
server.clients[ws] = client
server.movement_tick_ms = 100
server.movement_max_steps_per_tick = 1
fixed_now = 10_000
monkeypatch.setattr(server.item_service, "now_ms", lambda: fixed_now)
send_payloads: list[object] = []
async def fake_send(websocket: ServerConnection, packet: object) -> None:
send_payloads.append(packet)
async def fake_broadcast(packet: object, exclude: ServerConnection | None = None) -> None:
return None
monkeypatch.setattr(server, "_send", fake_send)
monkeypatch.setattr(server, "_broadcast", fake_broadcast)
await server._handle_message(client, json.dumps({"type": "teleport_complete"}))
# 2-tile move exceeds per-window budget and should be rejected with correction.
await server._handle_message(client, json.dumps({"type": "update_position", "x": 7, "y": 5}))
assert len(broadcast_payloads) == 1
packet = broadcast_payloads[0]
assert packet.type == "teleport_complete"
assert packet.id == "u1"
assert packet.x == 12
assert packet.y == 13
assert client.x == 5
assert client.y == 5
assert send_payloads
correction = send_payloads[-1]
assert correction.type == "update_position"
assert correction.id == "u1"
assert correction.x == 5
assert correction.y == 5