Public changes compared with the previous published export: 89 files changed. Affected areas: - backend/app: 21 files - dependencies: 5 files - deployment and CI: 6 files - documentation: 2 files - frontend: 3 files - frontend/src: 20 files - project files: 1 file - tests: 30 files - unraid: 1 file Changed files: - Updated: ".env.example" - Updated: "Dockerfile.unraid" - Updated: "README.md" - Updated: "backend/Dockerfile" - Added: "backend/app/alerts.py" - Updated: "backend/app/auth.py" - Added: "backend/app/backups.py" - Updated: "backend/app/config_io.py" - Updated: "backend/app/demo.py" - Updated: "backend/app/discovery.py" - Updated: "backend/app/discovery_store.py" - Updated: "backend/app/docker_discovery.py" - Updated: "backend/app/events.py" - Updated: "backend/app/evidence.py" - Updated: "backend/app/health.py" - Updated: "backend/app/incidents.py" - Added: "backend/app/loops.py" - Updated: "backend/app/main.py" - Updated: "backend/app/models.py" - Updated: "backend/app/observation.py" - Updated: "backend/app/probes.py" - Added: "backend/app/response_cache.py" - Updated: "backend/app/scheduler.py" - Updated: "backend/app/semantic.py" - Updated: "backend/app/store.py" - Updated: "backend/pyproject.toml" - Updated: "backend/tests/test_api.py" - Updated: "backend/tests/test_config_io.py" - Updated: "backend/tests/test_demo.py" - Updated: "backend/tests/test_discovery_v120.py" - Updated: "backend/tests/test_health.py" - Updated: "backend/tests/test_probes.py" - Updated: "backend/tests/test_scheduler.py" - Updated: "backend/tests/test_v130_probe_reachability.py" - Updated: "backend/tests/test_v160_evidence_changes.py" - Added: "backend/tests/test_v163_alerts.py" - Added: "backend/tests/test_v163_backups.py" - Added: "backend/tests/test_v163_data_integrity.py" - Added: "backend/tests/test_v163_efficiency.py" - Added: "backend/tests/test_v163_health_performance.py" - Added: "backend/tests/test_v163_loops.py" - Added: "backend/tests/test_v163_management.py" - Added: "backend/tests/test_v163_realtime.py" - Added: "backend/tests/test_v163_security.py" - Added: "backend/tests/test_v163_semantic_etag.py" - Added: "compose.demo.yaml" - Updated: "compose.yaml" - Added: "docker-compose.broker.yml" - Updated: "docker-compose.yml" - Updated: "docs/ARCHITECTURE.md" - Added: "frontend/e2e/a11y.spec.ts" - Updated: "frontend/e2e/demo.spec.ts" - Updated: "frontend/index.html" - Updated: "frontend/nginx.conf" - Updated: "frontend/package-lock.json" - Updated: "frontend/package.json" - Updated: "frontend/playwright.config.ts" - Updated: "frontend/src/App.tsx" - Updated: "frontend/src/LivingEdge.tsx" - Added: "frontend/src/activityView.test.ts" - Added: "frontend/src/activityView.ts" - Updated: "frontend/src/api.ts" - Added: "frontend/src/apiAuth.test.ts" - Added: "frontend/src/components/ActionsMenu.tsx" - Added: "frontend/src/components/ConfirmDialog.test.tsx" - Added: "frontend/src/components/ConfirmDialog.tsx" - Added: "frontend/src/components/StatusIcon.tsx" - Updated: "frontend/src/demo/DemoWalkthrough.test.ts" - Updated: "frontend/src/demo/DemoWalkthrough.tsx" - Added: "frontend/src/elk-worker-url.d.ts" - Added: "frontend/src/labels.ts" - Updated: "frontend/src/main.tsx" - Added: "frontend/src/realtime/refreshPlan.test.ts" - Added: "frontend/src/realtime/refreshPlan.ts" - Updated: "frontend/src/realtime/useRealtimeEvents.ts" - Added: "frontend/src/routing/urlState.test.ts" - Added: "frontend/src/routing/urlState.ts" - Updated: "frontend/src/styles.css" - Added: "frontend/src/topology/GraphListView.test.tsx" - Added: "frontend/src/topology/GraphListView.tsx" - Updated: "frontend/src/topology/ServiceNode.tsx" - Updated: "frontend/src/topology/TopologyCommandBar.tsx" - Added: "frontend/src/topology/semanticGraph.test.ts" - Updated: "frontend/src/topology/semanticGraph.ts" - Added: "frontend/src/topologyLayout.test.ts" - Updated: "frontend/src/topologyLayout.ts" - Updated: "package-lock.json" - Updated: "package.json" - Updated: "unraid/my-servicemap.xml" Export provenance/manifests refreshed; excluded from the change summary. Publish curated ServiceMap source from af46f684e468dffd3a5190e28d3b572d4c26bfd7
104 lines
3.4 KiB
Python
104 lines
3.4 KiB
Python
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import json
|
|
from threading import Lock
|
|
from typing import Any
|
|
|
|
# Clients reconnect after this delay if the stream drops (SSE ``retry:``).
|
|
SSE_RETRY_MS = 5_000
|
|
# A comment line keeps proxies and browsers from timing out a quiet stream.
|
|
SSE_KEEPALIVE_SECONDS = 15.0
|
|
|
|
|
|
class Subscription:
|
|
"""One connected SSE client: an asyncio queue bound to its event loop."""
|
|
|
|
__slots__ = ("loop", "queue")
|
|
|
|
def __init__(self, loop: asyncio.AbstractEventLoop, max_queue_size: int) -> None:
|
|
self.loop = loop
|
|
self.queue: asyncio.Queue[dict[str, Any]] = asyncio.Queue(maxsize=max_queue_size)
|
|
|
|
def offer(self, payload: dict[str, Any]) -> None:
|
|
"""Enqueue on the owning loop; drop the oldest wakeup when full."""
|
|
|
|
if self.queue.full():
|
|
try:
|
|
self.queue.get_nowait()
|
|
except asyncio.QueueEmpty:
|
|
pass
|
|
try:
|
|
self.queue.put_nowait(payload)
|
|
except asyncio.QueueFull:
|
|
pass
|
|
|
|
|
|
class EventBus:
|
|
"""Small bounded fan-out bus used by the SSE endpoint.
|
|
|
|
Persistence is handled by SQLite; this bus only wakes currently connected
|
|
clients. Each client owns an ``asyncio.Queue`` so a waiting stream costs no
|
|
thread: previously every open browser tab parked one default-executor
|
|
thread in ``queue.get``, which starved ``asyncio.to_thread`` work such as
|
|
the observation loop. ``publish`` is safe from worker threads and from
|
|
the event loop; delivery is scheduled with ``call_soon_threadsafe``.
|
|
"""
|
|
|
|
def __init__(self, max_queue_size: int = 100) -> None:
|
|
self.max_queue_size = max_queue_size
|
|
self._subscribers: set[Subscription] = set()
|
|
self._lock = Lock()
|
|
self._revision = 0
|
|
|
|
@property
|
|
def revision(self) -> int:
|
|
"""Monotonic count of published events; read caches compare it."""
|
|
|
|
with self._lock:
|
|
return self._revision
|
|
|
|
def subscribe(self) -> Subscription:
|
|
subscription = Subscription(asyncio.get_running_loop(), self.max_queue_size)
|
|
with self._lock:
|
|
self._subscribers.add(subscription)
|
|
return subscription
|
|
|
|
def unsubscribe(self, subscription: Subscription) -> None:
|
|
with self._lock:
|
|
self._subscribers.discard(subscription)
|
|
|
|
@property
|
|
def subscriber_count(self) -> int:
|
|
with self._lock:
|
|
return len(self._subscribers)
|
|
|
|
def publish(self, payload: dict[str, Any]) -> None:
|
|
with self._lock:
|
|
self._revision += 1
|
|
subscribers = tuple(self._subscribers)
|
|
for subscription in subscribers:
|
|
try:
|
|
subscription.loop.call_soon_threadsafe(subscription.offer, payload)
|
|
except RuntimeError:
|
|
# The client's loop has closed (shutdown); it can no longer
|
|
# receive anything, so forget it.
|
|
self.unsubscribe(subscription)
|
|
|
|
|
|
event_bus = EventBus()
|
|
|
|
|
|
def sse_payload(payload: dict[str, Any]) -> str:
|
|
event_type = str(payload.get("event_type", "update"))
|
|
return f"event: {event_type}\ndata: {json.dumps(payload, default=str)}\n\n"
|
|
|
|
|
|
async def next_event(
|
|
subscription: Subscription, timeout: float = SSE_KEEPALIVE_SECONDS
|
|
) -> dict[str, Any] | None:
|
|
try:
|
|
return await asyncio.wait_for(subscription.queue.get(), timeout)
|
|
except TimeoutError:
|
|
return None
|