@stacksjs/ts-cloud 0.7.45 → 0.7.47

package/dist/{chunk-qdsvsrbt.js → chunk-2mw2566h.js}

@@ -1201,7 +1201,7 @@ async function resolveDashboardData(config, environment) {
   return out;
 }
 // src/deploy/local-dashboard-server.ts
-import { existsSync as existsSync18, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync18, readdirSync as readdirSync7, rmSync, statSync as statSync3 } from "node:fs";
 import { readFile, writeFile as writeFile4 } from "node:fs/promises";
 import { mkdtempSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -12819,7 +12819,35 @@ function createTerminalSession(onData, options = {}) {
 var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_PORT = 7676;
 var MAX_OUTPUT_BYTES3 = 64 * 1024;
+var DASHBOARD_TEMP_PREFIX = "ts-cloud-dashboard-";
 var here = dirname8(fileURLToPath(import.meta.url));
+function isProcessRunning(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error2) {
+    return error2?.code !== "ESRCH";
+  }
+}
+function pruneDashboardTempRoots(root = tmpdir(), running = isProcessRunning) {
+  let removed = 0;
+  for (const entry of readdirSync7(root, { withFileTypes: true })) {
+    if (!entry.isDirectory() || !entry.name.startsWith(DASHBOARD_TEMP_PREFIX))
+      continue;
+    const path = join12(root, entry.name);
+    const owned = entry.name.match(/^ts-cloud-dashboard-(\d+)-/);
+    if (owned) {
+      const pid = Number(owned[1]);
+      if (pid === process.pid || running(pid))
+        continue;
+    } else if (readdirSync7(path).length > 0) {
+      continue;
+    }
+    rmSync(path, { recursive: true, force: true });
+    removed += 1;
+  }
+  return removed;
+}
 var contentTypes = {
   ".html": "text/html; charset=utf-8",
   ".css": "text/css; charset=utf-8",
@@ -12940,8 +12968,9 @@ async function buildLiveUi(cwd, data) {
   const uiDir = resolveUiSourceDir(cwd);
   if (!uiDir)
     return null;
+  let outDir;
   try {
-    const outDir = mkdtempSync(join12(tmpdir(), "ts-cloud-dashboard-"));
+    outDir = mkdtempSync(join12(tmpdir(), `${DASHBOARD_TEMP_PREFIX}${process.pid}-`));
     const localStx = join12(uiDir, "node_modules", ".bin", "stx");
     const cmd = existsSync18(localStx) ? [localStx, "build", "--pages", "pages", "--out", outDir, "--no-sitemap", "--no-cache"] : ["bunx", "--bun", "@stacksjs/stx", "build", "--pages", "pages", "--out", outDir, "--no-sitemap", "--no-cache"];
     const proc = Bun.spawn(cmd, {
@@ -12959,6 +12988,7 @@ async function buildLiveUi(cwd, data) {
       proc.exited
     ]);
     if (exitCode !== 0) {
+      rmSync(outDir, { recursive: true, force: true });
       if (process.env.TSCLOUD_DASHBOARD_VERBOSE)
         console.warn(`ts-cloud dashboard: live UI build failed; serving the pre-built UI.
 ${stdout}
@@ -12967,6 +12997,8 @@ ${stderr}`);
     }
     return outDir;
   } catch (err) {
+    if (outDir)
+      rmSync(outDir, { recursive: true, force: true });
     if (process.env.TSCLOUD_DASHBOARD_VERBOSE)
       console.warn(`ts-cloud dashboard: live UI build errored; serving the pre-built UI. ${err.message}`);
     return null;
@@ -13116,6 +13148,7 @@ async function serveStatic(uiRoot, pathname) {
   return new Response(body, { headers: { "content-type": type } });
 }
 async function startLocalDashboardServer(options = {}) {
+  pruneDashboardTempRoots();
   const cwd = options.cwd ?? process.cwd();
   const host = options.host ?? DEFAULT_HOST;
   const port = options.port ?? DEFAULT_PORT;
@@ -13132,20 +13165,49 @@ async function startLocalDashboardServer(options = {}) {
   let latestData = initialData;
   const packagedUi = resolveUiSource(cwd);
   const uiCache = new Map;
+  const uiBuilds = new Map;
+  const ownedUiRoots = new Set;
+  let uiGeneration = 0;
+  function clearUiCache() {
+    uiGeneration += 1;
+    uiCache.clear();
+    for (const root of ownedUiRoots)
+      rmSync(root, { recursive: true, force: true });
+    ownedUiRoots.clear();
+  }
   const scopeKey = (user) => user.role === "admin" ? "admin" : `member:${Object.entries(user.sites).sort(([a], [b]) => a.localeCompare(b)).map(([site, role]) => `${site}=${role}`).join(",")}`;
   async function uiRootFor(user) {
     const key = scopeKey(user);
     const cached = uiCache.get(key);
     if (cached)
       return cached;
-    const scoped = {
-      ...scopeDashboardData(latestData, { user, slug: config6.project.slug }),
-      viewer: { role: user.role }
-    };
-    const root = await buildLiveUi(cwd, scoped) ?? packagedUi?.uiRoot;
-    if (root)
-      uiCache.set(key, root);
-    return root;
+    const pending = uiBuilds.get(key);
+    if (pending)
+      return pending;
+    const generation = uiGeneration;
+    const build = (async () => {
+      const scoped = {
+        ...scopeDashboardData(latestData, { user, slug: config6.project.slug }),
+        viewer: { role: user.role }
+      };
+      const liveRoot = await buildLiveUi(cwd, scoped);
+      if (liveRoot && generation !== uiGeneration) {
+        rmSync(liveRoot, { recursive: true, force: true });
+        return packagedUi?.uiRoot;
+      }
+      if (liveRoot)
+        ownedUiRoots.add(liveRoot);
+      const root = liveRoot ?? packagedUi?.uiRoot;
+      if (root)
+        uiCache.set(key, root);
+      return root;
+    })();
+    uiBuilds.set(key, build);
+    try {
+      return await build;
+    } finally {
+      uiBuilds.delete(key);
+    }
   }
   const adminUiRoot = await uiRootFor({ username: "", passwordHash: "", role: "admin", sites: {} });
   if (!adminUiRoot)
@@ -13288,7 +13350,7 @@ async function startLocalDashboardServer(options = {}) {
             environment = requested;
             actions = dashboardActions(environment);
             latestData = await resolveLiveDashboardData(config6, environment);
-            uiCache.clear();
+            clearUiCache();
           }
           return json({ ok: true, environment, environments: availableEnvironments });
         }
@@ -13560,7 +13622,7 @@ async function startLocalDashboardServer(options = {}) {
           if (password && password.length < 12)
             return json({ ok: false, error: "Password must be at least 12 characters." }, 422);
           const result = upsertMember(cwd, { username, password, name: typeof body.name === "string" ? body.name : undefined, sites });
-          uiCache.clear();
+          clearUiCache();
           return json({ ok: true, user: describeUser(result.user), password: result.password });
         }
         if (url.pathname === "/api/users" && req.method === "DELETE") {
@@ -13714,6 +13776,12 @@ async function startLocalDashboardServer(options = {}) {
       }
     }
   });
+  const stop = server.stop.bind(server);
+  server.stop = (closeActiveConnections) => {
+    clearInterval(throttleSweep);
+    clearUiCache();
+    return stop(closeActiveConnections);
+  };
   return { server, url: `http://${host}:${server.port}/` };
 }
 export { defaultConfig4 as defaultConfig, getConfig, loadCloudConfig, config5 as config, collectServerDnsDomains, removeStaleServerAddressRecords, deploySite, infraEnvFromOutputs, buildFunctionEnv, deployServerlessApp, redeployServerlessApp, rollbackServerlessApp, setMaintenance, runRemoteCommand, resolveDashboardData, sanitizeCloudConfig, dashboardActions, resolveDashboardAction, startLocalDashboardServer };

package/dist/deploy/index.js

@@ -14,7 +14,7 @@ import {
   sanitizeCloudConfig,
   setMaintenance,
   startLocalDashboardServer
-} from "../chunk-qdsvsrbt.js";
+} from "../chunk-2mw2566h.js";
 import {
   buildAndPushServerlessImage
 } from "../chunk-tskj9fay.js";

package/dist/deploy/local-dashboard-server.d.ts

@@ -25,6 +25,7 @@ export interface DashboardAction {
     mutates: boolean;
     confirm?: string;
 }
+export declare function pruneDashboardTempRoots(root?: string, running?: (pid: number) => boolean): number;
 export declare function sanitizeCloudConfig(config: CloudConfig): Record<string, any>;
 export declare function dashboardActions(environment: EnvironmentType): DashboardAction[];
 export declare function resolveDashboardAction(id: string, environment: EnvironmentType): DashboardAction | undefined;

package/dist/index.js

@@ -57,7 +57,7 @@ import {
   sanitizeCloudConfig,
   setMaintenance,
   startLocalDashboardServer
-} from "./chunk-qdsvsrbt.js";
+} from "./chunk-2mw2566h.js";
 import {
   buildAndPushServerlessImage
 } from "./chunk-tskj9fay.js";