packages/secubox-aggregator/aggregator/main.py

@@ -214,19 +214,6 @@ def _build_app() -> FastAPI:
     for name in cfg.get("modules", []):
         _mount_module(app, name)
 
-    @app.on_event("startup")
-    async def _raise_threadpool() -> None:
-        """Sync (`def`) route handlers — including the blocking ones converted
-        by the #738 async-sweep — run in AnyIO's default threadpool (40 tokens).
-        With ~110 modules sharing one process, raise the cap so concurrent
-        blocking calls don't queue head-of-line behind a full pool."""
-        try:
-            import anyio
-            anyio.to_thread.current_default_thread_limiter().total_tokens = 80
-            log.info("threadpool limiter raised to 80 tokens")
-        except Exception as e:  # never let this break startup
-            log.warning("could not raise threadpool limiter: %s", e)
-
     @app.get("/health")
     def health() -> dict:
         """Aggregator health. Reports per-module load state."""

packages/secubox-hub/api/main.py

@@ -153,29 +153,24 @@ def _load_menu_cache_from_file() -> dict:
 @public_router.get("/menu")
 async def public_menu():
     """Public menu endpoint for sidebar navigation (no auth required).
-
-    Double-buffer cache: ALWAYS returns the current snapshot instantly and never
-    computes on the request path (a sync systemctl walk here, multiplied by the
-    sidebar's polling, is what froze the shared aggregator loop). The background
-    refresher — kicked here because mounted sub-apps get no startup/middleware —
-    fills the buffer within a few seconds; until then we serve the file snapshot
-    or an explicit `warming` placeholder.
+    Returns basic menu structure without sensitive data.
+    Uses pre-computed cache for instant response.
     """
     global _menu_cache
-    _ensure_bg()
 
-    # Active buffer (instant).
+    # Return from in-memory cache (instant)
     if _menu_cache:
         return _menu_cache
 
-    # Cold start: last-good snapshot persisted to file (cheap read, no systemctl).
+    # Fallback to file cache (fast startup)
     file_cache = _load_menu_cache_from_file()
     if file_cache:
         _menu_cache = file_cache
         return file_cache
 
-    # Nothing yet — never block; the background task will fill it shortly.
-    return {"categories": [], "total_installed": 0, "total_active": 0, "warming": True}
+    # Last resort: compute synchronously (only on first request before cache ready)
+    log.warning("Menu cache miss - computing synchronously")
+    return _compute_menu_sync()
 
 
 @public_router.get("/info")
@@ -267,20 +262,22 @@ async def public_led_status():
 
 @public_router.get("/health-batch")
 async def public_health_batch():
-    """Batch health snapshot for the sidebar LEDs.
+    """Batch health check for all modules — returns status for sidebar LEDs.
 
-    Double-buffer cache: returns the last fully-built snapshot instantly and
-    NEVER rebuilds on the request path. The previous cold-miss rebuilt under a
-    lock, so concurrent sidebar polls serialized behind a ~3 s systemctl walk
-    and starved the shared loop. The background refresher (kicked here) swaps in
-    a complete snapshot atomically — so we never serve partial/bad counts.
+    Serves the TTL snapshot built by the background loop; on a cold miss it
+    builds it ONCE off the event loop. Never makes a synchronous systemctl call
+    on the request path.
     """
-    _ensure_bg()
     hb = _cache.get("health_batch")
-    if hb:
+    if hb and (time.time() - _cache.get("health_batch_ts", 0)) < CACHE_TTL * 2:
+        return hb
+    async with _health_batch_lock:
+        # Re-check under the lock: a concurrent waiter may have just rebuilt it.
+        hb = _cache.get("health_batch")
+        if not hb or (time.time() - _cache.get("health_batch_ts", 0)) >= CACHE_TTL * 2:
+            await asyncio.to_thread(_refresh_health_batch)
+            hb = _cache.get("health_batch") or {"modules": {}, "count": 0}
     return hb
-    # Not warmed yet — serve an explicit placeholder rather than block/compute.
-    return {"modules": {}, "count": 0, "warming": True}
 
 
 app.include_router(public_router)
@@ -506,27 +503,17 @@ async def startup():
     await _start_background_once()
 
 
-def _ensure_bg() -> None:
-    """Reliably kick the background warm-up + refresh loops from the request path.
-
-    Mounted in the aggregator, a sub-app receives neither startup/lifespan nor
-    `@app.middleware` events — so the navbar status endpoints trigger the warm-up
-    themselves on first hit. Fire-and-forget: never blocks or delays the request.
-    Idempotent (``_start_background_once`` guards on ``_bg_started``).
-    """
-    if _bg_started:
-        return
-    try:
-        asyncio.create_task(_start_background_once())
-    except RuntimeError:
-        # No running loop yet (e.g. import time) — a later request retries.
-        pass
-
-
-# Kept for the standalone-uvicorn path; harmless (no-op) when mounted.
 @app.middleware("http")
 async def _lazy_background_start(request, call_next):
-    _ensure_bg()
+    """Kick the background warm-up on the first request.
+
+    Mounted sub-apps don't receive startup/lifespan events under the aggregator,
+    so the cache would otherwise stay cold and every _svc() would fall back to a
+    blocking per-module systemctl call. Fire-and-forget so this request isn't
+    delayed by the warm-up.
+    """
+    if not _bg_started:
+        asyncio.create_task(_start_background_once())
     return await call_next(request)
 
 

packages/secubox-hub/www/health/health.css

@@ -39,10 +39,10 @@ h2 { font-size: 16px; font-weight: 600; margin: var(--sp-xl) 0 var(--sp-m); }
 .svc-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(220px, 1fr)); gap: var(--sp-s); }
 .svc { display: flex; align-items: center; gap: var(--sp-s); background: var(--bg1); border: 1px solid var(--bd);
     border-radius: 8px; padding: 10px 12px; min-width: 0; }
-/* .led now carries the status emoji (🟢🟡🔴) instead of a CSS dot. */
-.svc .led { flex: none; width: auto; height: auto; background: none; box-shadow: none;
-    font-size: 14px; line-height: 1; font-family: "Noto Color Emoji", "Apple Color Emoji", sans-serif; }
-.svc.error .led { animation: pulse 1.2s infinite; }
+.svc .led { width: 9px; height: 9px; border-radius: 50%; flex: none; box-shadow: 0 0 6px currentColor; }
+.svc.ok .led { background: #2ecc8f; color: #2ecc8f; }
+.svc.warn .led, .svc.unknown .led { background: #f0b94c; color: #f0b94c; }
+.svc.error .led { background: #ff7a6b; color: #ff7a6b; animation: pulse 1.2s infinite; }
 @keyframes pulse { 50% { opacity: .4; } }
 .svc.error { border-left: 3px solid #803018; }
 .svc-name { font-weight: 600; font-size: 13px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }

packages/secubox-hub/www/health/health.js

@@ -25,15 +25,11 @@
         return r.json();
     }
 
-    // Status → emoji indicator (replaces the CSS LED dot).
-    const EMOJI = { ok: '🟢', warn: '🟡', error: '🔴', unknown: '⚪' };
-    const emo = (status) => EMOJI[status] || EMOJI.unknown;
-
     function chip(id, st) {
         const status = (st && st.status) || 'unknown';
         const msg = (st && st.msg) || '';
         return `<div class="svc ${status}" title="${esc(id)}: ${esc(msg)}">
-            <span class="led">${emo(status)}</span>
+            <span class="led"></span>
             <span class="svc-name">${esc(id)}</span>
             <span class="svc-msg">${esc(msg)}</span>
         </div>`;
@@ -48,10 +44,10 @@
         });
 
         $('summary').innerHTML =
-            `<div class="sum ok"><b>${ok}</b><span>🟢 healthy</span></div>` +
-            `<div class="sum warn"><b>${warn}</b><span>🟡 degraded</span></div>` +
-            `<div class="sum err"><b>${err}</b><span>🔴 down</span></div>` +
-            `<div class="sum total"><b>${ids.length}</b><span>📊 services</span></div>`;
+            `<div class="sum ok"><b>${ok}</b><span>healthy</span></div>` +
+            `<div class="sum warn"><b>${warn}</b><span>degraded</span></div>` +
+            `<div class="sum err"><b>${err}</b><span>down</span></div>` +
+            `<div class="sum total"><b>${ids.length}</b><span>services</span></div>`;
 
         const vital = ids.filter((id) => VITAL_SET.has(id));
         const common = ids.filter((id) => !VITAL_SET.has(id));