auto-sync: 2026-05-17 06:29:41

src/api/sse_routes.py

@@ -3,9 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-import json
-import queue
-import threading
 from typing import Optional
 
 from fastapi import APIRouter, Query, Request
@@ -15,7 +12,6 @@ from src.daemon.sse import SSEBroker
 
 router = APIRouter(prefix="/api/events", tags=["sse"])
 
-# 全局 broker 实例
 _broker: Optional[SSEBroker] = None
 
 
@@ -39,39 +35,18 @@ async def event_stream(
     """SSE 端点 — 实时推送黑板事件"""
     broker = get_broker()
 
-    # 使用同步 queue 作为缓冲（兼容 TestClient）
-    sync_queue: queue.Queue = queue.Queue(maxsize=100)
-
-    # 注册一个临时 async subscriber，桥接到 sync queue
-    async def bridge():
+    async def generate():
+        cid, queue = broker.subscribe()
         try:
-            cid, async_queue = broker.subscribe()
             while True:
                 if await request.is_disconnected():
-                    broker.unsubscribe(cid)
                     break
                 try:
-                    event = await asyncio.wait_for(async_queue.get(), timeout=5.0)
-                    sync_queue.put(event)
+                    event = await asyncio.wait_for(queue.get(), timeout=30.0)
+                    yield event.to_sse()
                 except asyncio.TimeoutError:
-                    sync_queue.put(None)  # heartbeat marker
-        except Exception:
-            pass
-
-    bridge_task = asyncio.get_event_loop().create_task(bridge())
-
-    def generate():
-        try:
-            while True:
-                try:
-                    event = sync_queue.get(timeout=30.0)
-                    if event is None:
-                        yield ": heartbeat\n\n"
-                    else:
-                        yield event.to_sse()
-                except queue.Empty:
                     yield ": heartbeat\n\n"
-        except GeneratorExit:
-            bridge_task.cancel()
+        finally:
+            broker.unsubscribe(cid)
 
     return StreamingResponse(generate(), media_type="text/event-stream")