- Coordinator subscribes to account.state_changed over Redis pub/sub: going live marks the account claimable at once; disabled/deleted/error tears the owning runner down immediately (≤30s) instead of waiting for the lease TTL. - delete_account now publishes account.state_changed:deleted after dropping the account from sync:live, so teardown is event-driven, not just fencing. - AccountRunner gains a verify loop (defense in depth): it periodically confirms the account is still live and flags itself dead if not; the coordinator reaps dead runners and releases their lease. Zombie loops are structurally impossible. - New core event user.active (SPEC §8.3), published on login and on every WS connect; consumed for tier promotion in step 5. - Acceptance: added event-driven teardown test (isolated from fencing/verify). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
74 lines
2.4 KiB
Python
74 lines
2.4 KiB
Python
"""WebSocket hub (SPEC §9.2).
|
|
|
|
Auth via session cookie. Relays every §8.3 event belonging to the user as
|
|
``{event, payload}`` frames; the client refetches via TanStack Query invalidation.
|
|
Client -> server: ``{"type":"ping"}`` only.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import json
|
|
import logging
|
|
|
|
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
|
|
|
|
from app.events import get_event_bus
|
|
from app.identity.cookies import SESSION_COOKIE_INSECURE, SESSION_COOKIE_SECURE
|
|
from app.identity.sessions import resolve_session
|
|
from app.redis_client import get_redis
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
@router.websocket("/ws")
|
|
async def ws_endpoint(websocket: WebSocket) -> None:
|
|
token = websocket.cookies.get(SESSION_COOKIE_SECURE) or websocket.cookies.get(
|
|
SESSION_COOKIE_INSECURE, ""
|
|
)
|
|
session = await resolve_session(token)
|
|
if session is None:
|
|
await websocket.close(code=1008) # policy violation
|
|
return
|
|
|
|
await websocket.accept()
|
|
user_id = str(session.user_id)
|
|
# Sync v2 §3: an open WS means the user is active -> promote their tier.
|
|
await get_event_bus().publish("user.active", {"user_id": user_id})
|
|
pubsub = get_redis().pubsub()
|
|
await pubsub.psubscribe("evt:*")
|
|
|
|
async def forward() -> None:
|
|
async for message in pubsub.listen():
|
|
if message.get("type") != "pmessage":
|
|
continue
|
|
try:
|
|
data = json.loads(message["data"])
|
|
except (ValueError, TypeError):
|
|
continue
|
|
payload = data.get("payload", {})
|
|
if str(payload.get("user_id")) == user_id:
|
|
await websocket.send_json(data)
|
|
|
|
async def receive() -> None:
|
|
while True:
|
|
raw = await websocket.receive_text()
|
|
try:
|
|
if json.loads(raw).get("type") == "ping":
|
|
await websocket.send_json({"type": "pong"})
|
|
except (ValueError, TypeError):
|
|
continue
|
|
|
|
forward_task = asyncio.create_task(forward())
|
|
receive_task = asyncio.create_task(receive())
|
|
try:
|
|
await asyncio.wait({forward_task, receive_task}, return_when=asyncio.FIRST_COMPLETED)
|
|
except WebSocketDisconnect:
|
|
pass
|
|
finally:
|
|
for task in (forward_task, receive_task):
|
|
task.cancel()
|
|
await pubsub.aclose() # type: ignore[no-untyped-call]
|