shraga 0.1.3 → 0.1.5

package/src/server/spa-catchall.ts

@@ -0,0 +1,41 @@
+import path from 'path';
+import { existsSync } from 'fs';
+import type express from 'express';
+
+// Non-page prefixes that must fall through to a real 404 (JSON/API/transport), never the SPA shell.
+function isNonPagePath(p: string): boolean {
+  return p.startsWith('/api/') || p.startsWith('/mcp') || p.startsWith('/uploads') ||
+    p.startsWith('/internal/') || p.startsWith('/.well-known');
+}
+
+/**
+ * Register the SPA catch-all (`app.get('*')`) as the LAST GET route so it serves the built
+ * index.html for client routes/deep links (/oauth/authorize, /cli-auth, /session/x, …) while
+ * letting unmatched API/MCP/upload/internal/oauth-metadata paths fall through to a real 404.
+ *
+ * Idempotent + re-placeable: each call splices out any prior catch-all layer, so it can be called
+ * again after a later mountFeatures() (passive→active promotion) and still sit behind those routes.
+ * In dev (no built dist) it is a no-op — Vite serves the SPA and a catch-all would 404-shadow it.
+ *
+ * EXPRESS 4 COUPLING: uses the bare `app.get('*')` route and Express's private `_router.stack`.
+ * A future express@5 bump breaks this LOUDLY (path-to-regexp v8 rejects `'*'`), not silently —
+ * re-verify the promotion-path ordering if express is ever upgraded.
+ */
+export function registerSpaCatchAll(app: express.Express, distPath: string): void {
+  if (!existsSync(distPath)) return;
+  const indexHtml = path.join(distPath, 'index.html');
+  // For app.get(), the layer's `handle` is the Route's dispatcher — our tagged handler lives inside
+  // `layer.route.stack[*].handle`. Match on that so re-registration removes the stale catch-all.
+  const stack = (app as any)._router?.stack as Array<{ route?: { stack?: Array<{ handle?: { __spaCatchAll?: boolean } }> } }> | undefined;
+  if (stack) {
+    for (let i = stack.length - 1; i >= 0; i--) {
+      if (stack[i]?.route?.stack?.some((h) => h?.handle?.__spaCatchAll)) stack.splice(i, 1);
+    }
+  }
+  const handler: express.RequestHandler = (req, res, next) => {
+    if (isNonPagePath(req.path)) return next();
+    res.sendFile(indexHtml);
+  };
+  (handler as { __spaCatchAll?: boolean }).__spaCatchAll = true;
+  app.get('*', handler);
+}

package/src/server/artifacts/artifacts.export.ts

@@ -1,85 +0,0 @@
-import { writeFileSync, mkdirSync } from 'node:fs';
-import path from 'node:path';
-import { dataPath } from '../paths.ts';
-
-const PREFIX = '[artifacts:export]';
-
-let browserInstance: any = null;
-let idleTimer: ReturnType<typeof setTimeout> | null = null;
-const IDLE_TIMEOUT = 60_000;
-
-async function getBrowser() {
-  if (browserInstance) {
-    resetIdleTimer();
-    return browserInstance;
-  }
-
-  let puppeteer: any;
-  try {
-    puppeteer = await import('puppeteer');
-  } catch {
-    throw new Error('puppeteer not installed. Run: bun add puppeteer');
-  }
-
-  console.log(PREFIX, 'launching browser');
-  browserInstance = await puppeteer.default.launch({
-    headless: true,
-    args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
-  });
-
-  browserInstance.on('disconnected', () => { browserInstance = null; });
-  resetIdleTimer();
-  return browserInstance;
-}
-
-function resetIdleTimer() {
-  if (idleTimer) clearTimeout(idleTimer);
-  idleTimer = setTimeout(async () => {
-    if (browserInstance) {
-      console.log(PREFIX, 'closing idle browser');
-      await browserInstance.close().catch(() => {});
-      browserInstance = null;
-    }
-  }, IDLE_TIMEOUT);
-}
-
-export async function exportToPng(
-  html: string,
-  dimensions: [number, number],
-): Promise<Buffer> {
-  const [width, height] = dimensions;
-  const browser = await getBrowser();
-  const page = await browser.newPage();
-
-  try {
-    await page.setViewport({ width, height, deviceScaleFactor: 2 });
-    await page.setContent(html, { waitUntil: 'networkidle0', timeout: 15_000 });
-    const png = await page.screenshot({ type: 'png', clip: { x: 0, y: 0, width, height } });
-    return Buffer.from(png);
-  } finally {
-    await page.close();
-  }
-}
-
-export async function exportAndSave(
-  sessionId: string,
-  artifactId: string,
-  html: string,
-  dimensions: [number, number],
-): Promise<string> {
-  const png = await exportToPng(html, dimensions);
-  const dir = dataPath(`sessions/${sessionId}/artifacts`);
-  mkdirSync(dir, { recursive: true });
-  const filePath = path.join(dir, `${artifactId}.png`);
-  writeFileSync(filePath, png);
-  console.log(PREFIX, `saved ${filePath} (${png.length} bytes)`);
-  return filePath;
-}
-
-export async function closeBrowser() {
-  if (idleTimer) clearTimeout(idleTimer);
-  if (browserInstance) {
-    await browserInstance.close().catch(() => {});
-    browserInstance = null;
-  }
-}