@camstack/server 1.2.585 → 1.2.587

package/dist/main.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const lazy_ui_serving_js_1 = require("./ui-serving/lazy-ui-serving.js");
 const node_child_process_1 = require("node:child_process");
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
@@ -1471,8 +1472,43 @@ async function bootstrap() {
         await addonRegistry.setAppRouter(appRouter);
         console.log('[bootstrap] AddonRegistry wired with tRPC direct caller');
     }
-    const adminUiState = { staticDir: null, indexPath: null };
-    const viewerUiState = { staticDir: null, indexPath: null };
+    // ScopedTokenManager and admin user creation handled by local-auth addon.
+    // Both UI bundles are resolved LAZILY and single-flight (D876): a request that
+    // finds nothing served triggers one attempt, and a re-registered provider
+    // (addon update/restart) moves the served directory.
+    const uiLogger = (level, message) => {
+        if (level === 'error')
+            console.error(`[bootstrap] ${message}`);
+        else if (level === 'warn')
+            console.warn(`[bootstrap] ${message}`);
+        else
+            console.log(`[bootstrap] ${message}`);
+    };
+    const hubUiProvider = (capName) => {
+        // HUB-NODE-SCOPED resolution — never the cluster-global singleton. An agent
+        // node registers the same cap (agent-only placement) and its `getStaticDir()`
+        // answers with a path on the agent's filesystem.
+        const capRegistry = app.get(addon_registry_service_1.AddonRegistryService).getCapabilityRegistry();
+        return capRegistry?.getSingletonForNode(capName, 'hub') ?? null;
+    };
+    const adminUi = (0, lazy_ui_serving_js_1.createLazyUiServing)({
+        label: 'Admin UI',
+        // CAMSTACK_SKIP_ADMIN_UI_WAIT: e2e runs that do not need the SPA.
+        lookup: () => process.env['CAMSTACK_SKIP_ADMIN_UI_WAIT'] === '1' ? null : hubUiProvider('admin-ui'),
+        log: uiLogger,
+        onServed: ({ staticDir, indexPath }) => {
+            spaIndexHtml = indexPath;
+            (0, precompressed_asset_js_1.warmPrecompressedAssets)(staticDir, (msg, meta) => console.log(`[static] ${msg} ${JSON.stringify(meta)}`));
+        },
+    });
+    const viewerUi = (0, lazy_ui_serving_js_1.createLazyUiServing)({
+        label: 'Viewer UI',
+        lookup: () => hubUiProvider('viewer-ui'),
+        log: uiLogger,
+        onServed: ({ staticDir }) => {
+            (0, precompressed_asset_js_1.warmPrecompressedAssets)(staticDir, (msg, meta) => console.log(`[static] ${msg} ${JSON.stringify(meta)}`));
+        },
+    });
     const VIEWER_MOUNT = '/viewer/camstack';
     // Register UI routes before Fastify starts, but resolve their forked
     // providers after listen. During a cold boot the control plane is therefore
@@ -1498,10 +1534,11 @@ async function bootstrap() {
         return reply.type('text/html').send(fs.createReadStream(webrtcTestPath));
     });
     fastify.get('/viewer/*', async (request, reply) => {
-        const { staticDir, indexPath } = viewerUiState;
-        if (!staticDir || !indexPath) {
+        const served = await viewerUi.get();
+        if (!served) {
             return reply.status(503).send({ error: 'Viewer UI is starting' });
         }
+        const { staticDir, indexPath } = served;
         const pathOnly = request.url.split('?')[0] ?? request.url;
         let rel = '';
         if (pathOnly.startsWith(`${VIEWER_MOUNT}/`)) {
@@ -1531,10 +1568,11 @@ async function bootstrap() {
             url.startsWith('/viewer')) {
             return reply.callNotFound();
         }
-        const { staticDir, indexPath } = adminUiState;
-        if (!staticDir || !indexPath) {
+        const served = await adminUi.get();
+        if (!served) {
             return reply.status(503).send({ error: 'Admin UI is starting' });
         }
+        const { staticDir, indexPath } = served;
         const pathOnly = url.split('?')[0] ?? url;
         // The shell asked for BY NAME is still the shell: it gets the mount
         // injection and the no-store policy, never the asset branch.
@@ -1551,102 +1589,12 @@ async function bootstrap() {
         // it is mounted; without the header the shell is served as before.
         return (0, spa_mount_1.sendSpaShell)(reply, indexPath, request.headers);
     });
+    // Boot-time attempt, after listen. Later attempts are driven by requests.
     const resolveAdminUi = async () => {
-        try {
-            const bootAddonRegistry = app.get(addon_registry_service_1.AddonRegistryService);
-            const capRegistry = bootAddonRegistry.getCapabilityRegistry();
-            // HUB-NODE-SCOPED resolution — never the cluster-global singleton.
-            // Agent nodes register the same `admin-ui` cap through their own
-            // agent-ui addon (placement: agent-only), and the cluster-elected
-            // active provider can land on the AGENT's registration depending on
-            // node boot order. Its `getStaticDir()` then answers with a path on
-            // the agent's filesystem — nonexistent here — and the SPA catch-all
-            // silently never registers (every `GET /` 404s until the next
-            // restart re-rolls the election). `getSingletonForNode(cap, 'hub')`
-            // only ever resolves providers hosted on THIS node.
-            let adminUI = capRegistry?.getSingletonForNode('admin-ui', 'hub');
-            // CAMSTACK_SKIP_ADMIN_UI_WAIT bypasses the background capability poll in
-            // e2e runs that do not need the SPA.
-            const skipAdminUIWait = process.env['CAMSTACK_SKIP_ADMIN_UI_WAIT'] === '1';
-            if (!adminUI && capRegistry && !skipAdminUIWait) {
-                // Forked-addon spawn + Moleculer registration + tRPC hydration
-                // can take ~15-20s on cold boot, especially when several runners
-                // are spawning in parallel. The previous 10s window was racing
-                // the admin-ui runner's boot — fastify-static didn't register and
-                // every `GET /` returned 404. Bump to 60s; we only pay this
-                // wait once at boot.
-                const ADMIN_UI_WAIT_MS = 60_000;
-                const POLL_MS = 200;
-                const deadline = Date.now() + ADMIN_UI_WAIT_MS;
-                while (!adminUI && Date.now() < deadline) {
-                    await new Promise((r) => setTimeout(r, POLL_MS));
-                    adminUI = capRegistry.getSingletonForNode('admin-ui', 'hub');
-                }
-            }
-            if (adminUI) {
-                const { staticDir } = await adminUI.getStaticDir();
-                const indexPath = path.join(staticDir, 'index.html');
-                if (fs.existsSync(staticDir) && fs.existsSync(indexPath)) {
-                    spaIndexHtml = indexPath;
-                    adminUiState.staticDir = staticDir;
-                    adminUiState.indexPath = indexPath;
-                    (0, precompressed_asset_js_1.warmPrecompressedAssets)(staticDir, (msg, meta) => console.log(`[static] ${msg} ${JSON.stringify(meta)}`));
-                    const { version } = await adminUI.getVersion();
-                    console.log(`[bootstrap] Admin UI served from: ${staticDir} (v${version})`);
-                }
-                else {
-                    console.warn(`[bootstrap] Admin UI dist not found at: ${staticDir} — run 'npm run build' in addon-admin-ui`);
-                }
-            }
-            else {
-                console.warn('[bootstrap] admin-ui capability not registered — no static file serving');
-            }
-        }
-        catch (err) {
-            console.error('[bootstrap] Failed to set up admin UI static serving:', err);
-        }
+        await adminUi.get();
     };
     const resolveViewerUi = async () => {
-        try {
-            const bootAddonRegistry = app.get(addon_registry_service_1.AddonRegistryService);
-            const capRegistry = bootAddonRegistry.getCapabilityRegistry();
-            // Hub-node-scoped for the same reason as admin-ui above: a remote
-            // node's registration must never win the election for the provider
-            // whose staticDir this process reads from local disk.
-            let viewerUI = capRegistry?.getSingletonForNode('viewer-ui', 'hub');
-            if (!viewerUI && capRegistry) {
-                // The viewer-ui addon runs in its own forked runner and registers a few
-                // seconds after boot. Poll briefly (shorter than admin-ui's 60s — the
-                // viewer is non-critical and admin-ui already gated the slow cold boot).
-                const VIEWER_UI_WAIT_MS = 30_000;
-                const POLL_MS = 200;
-                const deadline = Date.now() + VIEWER_UI_WAIT_MS;
-                while (!viewerUI && Date.now() < deadline) {
-                    await new Promise((r) => setTimeout(r, POLL_MS));
-                    viewerUI = capRegistry.getSingletonForNode('viewer-ui', 'hub');
-                }
-            }
-            if (viewerUI) {
-                const { staticDir } = await viewerUI.getStaticDir();
-                const indexPath = path.join(staticDir, 'index.html');
-                if (fs.existsSync(staticDir) && fs.existsSync(indexPath)) {
-                    viewerUiState.staticDir = staticDir;
-                    viewerUiState.indexPath = indexPath;
-                    (0, precompressed_asset_js_1.warmPrecompressedAssets)(staticDir, (msg, meta) => console.log(`[static] ${msg} ${JSON.stringify(meta)}`));
-                    const { version } = await viewerUI.getVersion();
-                    console.log(`[bootstrap] Viewer UI served from: ${staticDir} at ${VIEWER_MOUNT} (v${version})`);
-                }
-                else {
-                    console.warn(`[bootstrap] Viewer UI dist not found at: ${staticDir} — run 'npm run build' in addon-viewer-ui`);
-                }
-            }
-            else {
-                console.warn('[bootstrap] viewer-ui capability not registered — viewer not served');
-            }
-        }
-        catch (err) {
-            console.error('[bootstrap] Failed to set up viewer UI static serving:', err);
-        }
+        await viewerUi.get();
     };
     // Establish the logging mirror and re-arm any diagnostic window that was
     // armed BEFORE this boot.

package/dist/ui-serving/lazy-ui-serving.js

@@ -0,0 +1,143 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLazyUiServing = createLazyUiServing;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const DEFAULT_ATTEMPT_GAP_MS = 2_000;
+const DEFAULT_REQUEST_WAIT_MS = 4_000;
+/** Wait for `work`, but never longer than `ms`: a hung provider RPC must not hang every request. */
+async function waitAtMost(work, ms) {
+    let timer;
+    const deadline = new Promise((resolve) => {
+        timer = setTimeout(resolve, ms);
+    });
+    try {
+        await Promise.race([work, deadline]);
+    }
+    finally {
+        clearTimeout(timer);
+    }
+}
+/**
+ * Lazy, single-flight resolution of a forked UI provider (D876).
+ *
+ * A request that finds nothing served triggers (or joins) ONE attempt; the next
+ * request tries again, at most once per `minAttemptGapMs`. Once served, the
+ * provider object identity is compared on each request: a re-registered
+ * provider (addon update/restart) or a vanished index re-resolves, so the
+ * served directory follows the provider. No timers, no retry loop.
+ */
+function createLazyUiServing(options) {
+    const gapMs = options.minAttemptGapMs ?? DEFAULT_ATTEMPT_GAP_MS;
+    const waitMs = options.requestWaitMs ?? DEFAULT_REQUEST_WAIT_MS;
+    const now = options.now ?? Date.now;
+    let state = null;
+    let servedProvider = null;
+    let inFlight = null;
+    let lastAttemptAt = Number.NEGATIVE_INFINITY;
+    let lastNotice = '';
+    const notice = (level, message) => {
+        if (message === lastNotice)
+            return;
+        lastNotice = message;
+        options.log(level, message);
+    };
+    const attempt = async () => {
+        try {
+            const provider = options.lookup();
+            if (!provider) {
+                if (!state) {
+                    notice('warn', `${options.label}: capability not registered yet, answering 503 until it is`);
+                }
+                return;
+            }
+            const { staticDir } = await provider.getStaticDir();
+            const indexPath = path.join(staticDir, 'index.html');
+            if (!fs.existsSync(staticDir) || !fs.existsSync(indexPath)) {
+                if (state && state.staticDir !== staticDir)
+                    state = null;
+                notice('warn', `${options.label}: dist not found at ${staticDir}`);
+                return;
+            }
+            if (state?.staticDir === staticDir) {
+                servedProvider = provider;
+                return;
+            }
+            // The version only labels the log line: a failing read must not keep the
+            // OLD directory served behind a provider we already marked as current.
+            const version = await provider
+                .getVersion()
+                .then((v) => v.version)
+                .catch(() => 'unknown');
+            const next = { staticDir, indexPath };
+            state = next;
+            servedProvider = provider;
+            notice('info', `${options.label} served from: ${staticDir} (v${version})`);
+            options.onServed?.(next, version);
+        }
+        catch (err) {
+            notice('error', `${options.label}: resolution failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    };
+    const startAttempt = () => {
+        if (inFlight)
+            return inFlight;
+        lastAttemptAt = now();
+        inFlight = attempt().finally(() => {
+            inFlight = null;
+        });
+        return inFlight;
+    };
+    const needsAttempt = () => {
+        if (!state)
+            return true;
+        if (!fs.existsSync(state.indexPath))
+            return true;
+        const current = options.lookup();
+        return current !== null && current !== servedProvider;
+    };
+    return {
+        async get() {
+            if (inFlight) {
+                await waitAtMost(inFlight, waitMs);
+            }
+            else if (needsAttempt() && now() - lastAttemptAt >= gapMs) {
+                await waitAtMost(startAttempt(), waitMs);
+            }
+            return state && fs.existsSync(state.indexPath) ? state : null;
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.585",
+  "version": "1.2.587",
   "license": "MIT",
   "private": false,
   "files": [
@@ -38,19 +38,19 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.431",
-    "@camstack/addon-agent-ui": "1.2.238",
+    "@camstack/addon-admin-ui": "1.2.432",
+    "@camstack/addon-agent-ui": "1.2.239",
     "@camstack/addon-auth": "1.2.148",
     "@camstack/addon-decoder-nodeav": "1.2.123",
     "@camstack/addon-notifiers": "1.2.135",
     "@camstack/addon-pipeline": "1.2.374",
-    "@camstack/addon-pipeline-orchestrator": "1.2.327",
+    "@camstack/addon-pipeline-orchestrator": "1.2.328",
     "@camstack/addon-post-analysis": "1.2.372",
     "@camstack/develop": "0.1.11",
     "@camstack/sdk": "1.2.132",
-    "@camstack/system": "1.2.440",
-    "@camstack/types": "1.2.376",
-    "@camstack/ui-library": "1.2.294",
+    "@camstack/system": "1.2.441",
+    "@camstack/types": "1.2.377",
+    "@camstack/ui-library": "1.2.295",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/cors": "^11.2.0",