@camstack/server 1.2.88 → 1.2.89

package/dist/main.js

@@ -39,7 +39,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument -- pre-existing lint debt across this 800+ line bootstrap module. The flagged sites cross typed boundaries (Fastify request typing, AddonRouteRegistry, AuthService inherited methods) where the projectService context can't trace inheritance chains. Tracked separately; do not amend in unrelated edits. */
 const fastify_1 = require("@trpc/server/adapters/fastify");
 const ws_1 = require("@trpc/server/adapters/ws");
-const static_1 = __importDefault(require("@fastify/static"));
 const compress_1 = __importDefault(require("@fastify/compress"));
 const cookie_1 = __importDefault(require("@fastify/cookie"));
 const sse_no_compression_js_1 = require("./api/sse-no-compression.js");
@@ -1074,216 +1073,166 @@ async function bootstrap() {
         await addonRegistry.setAppRouter(appRouter);
         console.log('[bootstrap] AddonRegistry wired with tRPC direct caller');
     }
-    // ScopedTokenManager and admin user creation handled by local-auth addon.
-    // Serve admin UI static files from the admin-ui singleton capability.
-    // Always enabled — in dev mode Vite runs on its own port and doesn't interfere.
-    //
-    // The admin-ui addon runs in its own dedicated runner subprocess and
-    // finishes registering 1-3s after bootstrap; poll briefly for it
-    // before giving up to avoid the 'admin-ui capability not registered —
-    // no static file serving' warn that left the SPA unserved until next
-    // restart.
-    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 — bypass the 60s poll. Used by the
-        // e2e harness, which doesn't need the SPA served and spawns hubs
-        // with strict boot timeouts. Production keeps the poll so cold
-        // boots wait for the forked admin-ui group to register.
-        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');
+    const adminUiState = { staticDir: null, indexPath: null };
+    const viewerUiState = { staticDir: null, indexPath: null };
+    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
+    // immediately reachable while the non-critical UI runners finish starting.
+    fastify.get('/viewer', async (_request, reply) => reply.redirect(`${VIEWER_MOUNT}/`));
+    fastify.get('/viewer/', async (_request, reply) => reply.redirect(`${VIEWER_MOUNT}/`));
+    fastify.get('/webrtc-test.html', async (_request, reply) => {
+        const webrtcTestPath = path.join(dataPath, 'webrtc-test.html');
+        if (!fs.existsSync(webrtcTestPath))
+            return reply.callNotFound();
+        return reply.type('text/html').send(fs.createReadStream(webrtcTestPath));
+    });
+    fastify.get('/viewer/*', async (request, reply) => {
+        const { staticDir, indexPath } = viewerUiState;
+        if (!staticDir || !indexPath) {
+            return reply.status(503).send({ error: 'Viewer UI is starting' });
+        }
+        const pathOnly = request.url.split('?')[0] ?? request.url;
+        let rel = '';
+        if (pathOnly.startsWith(`${VIEWER_MOUNT}/`)) {
+            rel = pathOnly.slice(VIEWER_MOUNT.length + 1);
+        }
+        if (rel && /\.[a-zA-Z0-9]+$/.test(pathOnly)) {
+            const abs = path.join(staticDir, rel);
+            if ((abs === staticDir || abs.startsWith(staticDir + path.sep)) && fs.existsSync(abs)) {
+                reply.header('cache-control', (0, spa_static_1.spaAssetCacheControl)(rel));
+                reply.type((0, spa_static_1.contentTypeForPath)(rel));
+                return sendMaybePrecompressed(reply, abs, request.headers['accept-encoding']);
             }
+            return reply.callNotFound();
         }
-        if (adminUI) {
-            const { staticDir } = await adminUI.getStaticDir();
-            const indexPath = path.join(staticDir, 'index.html');
-            if (fs.existsSync(staticDir) && fs.existsSync(indexPath)) {
-                spaIndexHtml = indexPath;
-                // `serve: false` registers no route — it only decorates
-                // `reply.sendFile`, so the single SPA `/*` handler below owns all
-                // routing and serves each asset LIVE from the current `staticDir`.
-                // The old `wildcard: false` registered one route per file enumerated
-                // AT BOOT, so a redeployed admin-ui's new content-hashed assets had no
-                // route and 404'd until a hub restart. Live `sendFile` removes that.
-                await fastify.register(static_1.default, {
-                    root: staticDir,
-                    serve: false,
-                    decorateReply: true,
-                    // Disable @fastify/static's automatic Cache-Control injection so
-                    // the per-file headers set by the route handler (immutable for
-                    // hashed assets, no-cache for index.html / SW) survive sendFile().
-                    cacheControl: false,
-                });
-                // Dev diagnostic: serve webrtc-test.html from dataPath if it exists.
-                const webrtcTestPath = path.join(dataPath, 'webrtc-test.html');
-                if (fs.existsSync(webrtcTestPath)) {
-                    fastify.get('/webrtc-test.html', async (_request, reply) => {
-                        return reply.type('text/html').send(fs.createReadStream(webrtcTestPath));
-                    });
+        reply.header('cache-control', 'no-cache, must-revalidate');
+        return reply.type('text/html').send(fs.createReadStream(indexPath));
+    });
+    fastify.get('/*', async (request, reply) => {
+        const url = request.url;
+        if (url.startsWith('/trpc') ||
+            url.startsWith('/api/') ||
+            url.startsWith('/agent') ||
+            url.startsWith('/health') ||
+            url.startsWith('/viewer')) {
+            return reply.callNotFound();
+        }
+        const { staticDir, indexPath } = adminUiState;
+        if (!staticDir || !indexPath) {
+            return reply.status(503).send({ error: 'Admin UI is starting' });
+        }
+        const pathOnly = url.split('?')[0] ?? url;
+        if (/\.[a-zA-Z0-9]+$/.test(pathOnly)) {
+            const rel = pathOnly.replace(/^\/+/, '');
+            const abs = path.join(staticDir, rel);
+            if ((abs === staticDir || abs.startsWith(staticDir + path.sep)) && fs.existsSync(abs)) {
+                reply.header('cache-control', (0, spa_static_1.spaAssetCacheControl)(rel));
+                return sendMaybePrecompressed(reply, abs, request.headers['accept-encoding']);
+            }
+            return reply.callNotFound();
+        }
+        reply.header('cache-control', 'no-cache, must-revalidate');
+        return reply.type('text/html').send(fs.createReadStream(indexPath));
+    });
+    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`);
                 }
-                // SPA fallback + live static serving: this single catch-all owns every
-                // GET. Core API prefixes fall through to their own routers via
-                // `callNotFound`. Uses a wildcard route instead of setNotFoundHandler.
-                fastify.get('/*', async (request, reply) => {
-                    const url = request.url;
-                    if (url.startsWith('/trpc') ||
-                        url.startsWith('/api/') ||
-                        url.startsWith('/agent') ||
-                        url.startsWith('/health') ||
-                        // The viewer SPA owns /viewer/** via its own catch-all (registered
-                        // below). Fall through here so admin-ui never serves it — and so
-                        // /viewer 404s cleanly when the viewer-ui addon isn't registered.
-                        url.startsWith('/viewer')) {
-                        return reply.callNotFound();
-                    }
-                    // A request whose last path segment has a file extension is a static
-                    // asset: serve it LIVE from the current dist so a redeployed
-                    // admin-ui's new content-hashed files are picked up without a hub
-                    // restart. When the file is missing, 404 — never the SPA
-                    // `index.html`: serving HTML under a `.js`/`.css` URL makes upstream
-                    // caches (Cloudflare, the browser) pin `text/html`, which then fails
-                    // the module MIME check long after the file is actually available.
-                    const pathOnly = url.split('?')[0] ?? url;
-                    if (/\.[a-zA-Z0-9]+$/.test(pathOnly)) {
-                        const rel = pathOnly.replace(/^\/+/, '');
-                        const abs = path.join(staticDir, rel);
-                        if ((abs === staticDir || abs.startsWith(staticDir + path.sep)) && fs.existsSync(abs)) {
-                            // Cache policy that lets PWA updates actually propagate (the
-                            // stale-bundle bug): the service worker + registration + manifest
-                            // MUST be revalidated every load or a redeploy never reaches the
-                            // client (the SW keeps serving the old precache). Content-hashed
-                            // build assets (assets/index-<hash>.js) are immutable. Everything
-                            // else gets a short cache.
-                            reply.header('cache-control', (0, spa_static_1.spaAssetCacheControl)(rel));
-                            return sendMaybePrecompressed(reply, abs, request.headers['accept-encoding']);
-                        }
-                        return reply.callNotFound();
-                    }
-                    // index.html (the SPA shell) must never be cached — it references the
-                    // content-hashed bundles, so a stale copy pins the old app forever.
-                    reply.header('cache-control', 'no-cache, must-revalidate');
-                    return reply.type('text/html').send(fs.createReadStream(spaIndexHtml));
-                });
-                // Compress the dist in the background so the first CLIENT does not pay
-                // for it — a 5 MB bundle takes ~6.7s at quality 11, and that is a worse
-                // first load than the per-request compression this replaced.
-                (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`);
+                console.warn('[bootstrap] admin-ui capability not registered — no static file serving');
             }
         }
-        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);
         }
-    }
-    catch (err) {
-        console.error('[bootstrap] Failed to set up admin UI static serving:', err);
-    }
-    // Serve the CamStack viewer SPA from the viewer-ui singleton capability.
-    // The viewer is built (Expo web export) with EXPO_PUBLIC_WEB_BASE_PATH=/viewer,
-    // so its baseUrl — and therefore every asset URL — is /viewer/camstack/**. We
-    // mount it at exactly that prefix and redirect /viewer → the SPA root. Mirrors
-    // the admin-ui poll+serve, but streams assets directly from its own dist root
-    // so it stays independent of the admin-ui @fastify/static decorator.
-    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');
-        const skipViewerUIWait = process.env['CAMSTACK_SKIP_VIEWER_UI_WAIT'] === '1';
-        if (!viewerUI && capRegistry && !skipViewerUIWait) {
-            // 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');
+    };
+    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');
+            const skipViewerUIWait = process.env['CAMSTACK_SKIP_VIEWER_UI_WAIT'] === '1';
+            if (!viewerUI && capRegistry && !skipViewerUIWait) {
+                // 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)) {
-                // The Expo baseUrl (`${webBasePath}/camstack`) is the on-hub mount.
-                const VIEWER_MOUNT = '/viewer/camstack';
-                // Clean entry point: /viewer and /viewer/ → the SPA root.
-                fastify.get('/viewer', async (_request, reply) => reply.redirect(`${VIEWER_MOUNT}/`));
-                fastify.get('/viewer/', async (_request, reply) => reply.redirect(`${VIEWER_MOUNT}/`));
-                // Single catch-all owns every GET under /viewer/**: assets stream LIVE
-                // from the current dist; everything else is the SPA shell.
-                fastify.get('/viewer/*', async (request, reply) => {
-                    const pathOnly = request.url.split('?')[0] ?? request.url;
-                    // Map the request path to a dist-relative path by stripping the mount
-                    // prefix. Anything not under the mount is treated as the SPA shell.
-                    let rel = '';
-                    if (pathOnly === VIEWER_MOUNT || pathOnly === `${VIEWER_MOUNT}/`) {
-                        rel = '';
-                    }
-                    else if (pathOnly.startsWith(`${VIEWER_MOUNT}/`)) {
-                        rel = pathOnly.slice(VIEWER_MOUNT.length + 1);
-                    }
-                    // A path whose last segment has a file extension is a static asset:
-                    // serve it, or 404 — NEVER the SPA shell (serving HTML under a
-                    // .js/.css URL pins text/html in caches and breaks the module MIME
-                    // check long after the file is actually available).
-                    if (rel && /\.[a-zA-Z0-9]+$/.test(pathOnly)) {
-                        const abs = path.join(staticDir, rel);
-                        if ((abs === staticDir || abs.startsWith(staticDir + path.sep)) && fs.existsSync(abs)) {
-                            reply.header('cache-control', (0, spa_static_1.spaAssetCacheControl)(rel));
-                            reply.type((0, spa_static_1.contentTypeForPath)(rel));
-                            return sendMaybePrecompressed(reply, abs, request.headers['accept-encoding']);
-                        }
-                        return reply.callNotFound();
-                    }
-                    // SPA shell — never cached (it references content-hashed bundles).
-                    reply.header('cache-control', 'no-cache, must-revalidate');
-                    return reply.type('text/html').send(fs.createReadStream(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})`);
+            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 dist not found at: ${staticDir} — run 'npm run build' in addon-viewer-ui`);
+                console.warn('[bootstrap] viewer-ui capability not registered — viewer not served');
             }
         }
-        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);
         }
-    }
-    catch (err) {
-        console.error('[bootstrap] Failed to set up viewer UI static serving:', err);
-    }
+    };
     try {
         await app.listen(port, host);
     }
@@ -1300,6 +1249,9 @@ async function bootstrap() {
     const logger = app.get(logging_service_1.LoggingService).createLogger('System');
     const protocol = tlsOptions ? 'https' : 'http';
     logger.info('CamStack server listening', { meta: { protocol, host, port, trpcRegistered } });
+    // UI runners are not part of control-plane readiness. Their mutable route
+    // state switches from 503 to static serving as soon as each capability is up.
+    void Promise.all([resolveAdminUi(), resolveViewerUi()]);
     // Post-boot: fork workers, register device streams, emit system.boot
     const postBoot = app.get(post_boot_service_1.PostBootService);
     await postBoot.run({ port, host, dataPath, trpcRegistered });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.88",
+  "version": "1.2.89",
   "private": false,
   "files": [
     "dist",
@@ -38,9 +38,9 @@
     "@camstack/addon-auth": "1.2.11",
     "@camstack/addon-decoder-nodeav": "1.2.9",
     "@camstack/addon-notifiers": "1.2.13",
-    "@camstack/addon-pipeline": "1.2.54",
-    "@camstack/addon-pipeline-orchestrator": "1.2.36",
-    "@camstack/addon-post-analysis": "1.2.56",
+    "@camstack/addon-pipeline": "1.2.57",
+    "@camstack/addon-pipeline-orchestrator": "1.2.38",
+    "@camstack/addon-post-analysis": "1.2.58",
     "@camstack/sdk": "1.2.11",
     "@camstack/shm-ring": "1.1.9",
     "@camstack/system": "1.2.75",