@absolutejs/absolute 0.19.0-beta.681 → 0.19.0-beta.683

package/dist/cli/index.js

@@ -1145,17 +1145,17 @@ var isCommandService3 = (service) => service.kind === "command" || Array.isArray
 }, shellEscape = (value) => `'${value.replaceAll("'", "'\\''")}'`, runShell = async (name, command) => run(name, ["/bin/bash", "-lc", command]), findBin = (name) => {
   const local = resolve8("node_modules", ".bin", name);
   return existsSync10(local) ? local : null;
-}, stripAnsi2 = (str) => str.replace(/\x1b\[[0-9;]*m/g, ""), formatSvelteOutput = (output) => {
+}, stripAnsi3 = (str) => str.replace(/\x1b\[[0-9;]*m/g, ""), formatSvelteOutput = (output) => {
   const cwd = `${process.cwd()}/`;
-  const summaryMatch = stripAnsi2(output).match(/svelte-check found (\d+) error/);
+  const summaryMatch = stripAnsi3(output).match(/svelte-check found (\d+) error/);
   const errorCount = summaryMatch ? parseInt(summaryMatch[1] ?? "0", 10) : 0;
   const formatted = output.split(`
 `).filter((line) => {
-    const plain = stripAnsi2(line);
+    const plain = stripAnsi3(line);
     return !plain.startsWith("Loading svelte-check") && !plain.startsWith("Getting Svelte") && !plain.startsWith("====") && !plain.startsWith("svelte-check found") && !/^\d+ (START|COMPLETED)/.test(plain) && plain.trim() !== "";
   }).flatMap((line) => {
     const result = line.replaceAll(cwd, "");
-    const plain = stripAnsi2(result);
+    const plain = stripAnsi3(result);
     const pathMatch = plain.match(/^(\S+\.svelte):(\d+:\d+)$/);
     if (pathMatch) {
       return [
@@ -1163,9 +1163,9 @@ var isCommandService3 = (service) => service.kind === "command" || Array.isArray
       ];
     }
     if (result.includes("\x1B[35m")) {
-      const plainLine = stripAnsi2(result);
-      const before = stripAnsi2(result.split("\x1B[35m")[0] ?? "");
-      const token = stripAnsi2((result.split("\x1B[35m")[1] ?? "").split(/\x1b\[3[69]m/)[0] ?? "");
+      const plainLine = stripAnsi3(result);
+      const before = stripAnsi3(result.split("\x1B[35m")[0] ?? "");
+      const token = stripAnsi3((result.split("\x1B[35m")[1] ?? "").split(/\x1b\[3[69]m/)[0] ?? "");
       if (!token)
         return [result];
       const expanded = before.replace(/\t/g, "        ");
@@ -2485,7 +2485,13 @@ var start = async (serverEntry, outdir, configPath2) => {
 init_constants();
 init_loadConfig();
 init_getDurationString();
-import { existsSync as existsSync8, readFileSync as readFileSync8 } from "fs";
+import {
+  appendFileSync,
+  existsSync as existsSync8,
+  mkdirSync as mkdirSync4,
+  readFileSync as readFileSync8,
+  writeFileSync as writeFileSync2
+} from "fs";
 import { createConnection } from "net";
 import { resolve as resolve6 } from "path";
 
@@ -3127,7 +3133,44 @@ var createWorkspaceTui = ({
 
 // src/cli/scripts/workspace.ts
 init_utils();
+var ANSI_REGEX2 = /\x1B\[[0-?]*[ -/]*[@-~]/g;
 var sleep = (ms) => new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
+var stripAnsi2 = (value) => value.replace(ANSI_REGEX2, "");
+var sanitizeLogFileName = (value) => value.replace(/[^a-zA-Z0-9._-]/g, "_") || "unknown";
+var createWorkspaceLogSink = (appendLog) => {
+  const logDirectory = resolve6(".absolutejs", "workspace", "logs");
+  mkdirSync4(logDirectory, { recursive: true });
+  for (const file of ["all.log", "workspace.log"]) {
+    writeFileSync2(resolve6(logDirectory, file), "");
+  }
+  const initializedSources = new Set(["workspace"]);
+  const writeLog = (source, message, level) => {
+    const cleanMessage = stripAnsi2(message).trimEnd();
+    if (!cleanMessage) {
+      return;
+    }
+    const timestamp = new Date().toISOString();
+    const line = `[${timestamp}] [${level}] [${source}] ${cleanMessage}
+`;
+    const sourceFile = resolve6(logDirectory, `${sanitizeLogFileName(source)}.log`);
+    if (!initializedSources.has(source)) {
+      writeFileSync2(sourceFile, "");
+      initializedSources.add(source);
+    }
+    appendFileSync(sourceFile, line);
+    appendFileSync(resolve6(logDirectory, "all.log"), line);
+    if (source === "workspace") {
+      appendFileSync(resolve6(logDirectory, "workspace.log"), line);
+    }
+  };
+  return {
+    logDirectory,
+    appendLog: (source, message, level = "info") => {
+      writeLog(source, message, level);
+      appendLog(source, message, level);
+    }
+  };
+};
 var readPackageVersion2 = (candidate) => {
   try {
     const pkg = JSON.parse(readFileSync8(candidate, "utf-8"));
@@ -3320,6 +3363,51 @@ var waitForReady = async (service) => {
   }
   throw new Error(resolved.type === "http" ? `service did not become ready within ${resolved.timeoutMs}ms (${resolved.url})` : resolved.type === "tcp" ? `service did not become ready within ${resolved.timeoutMs}ms (tcp://${resolved.host}:${resolved.port})` : `service did not become ready within ${resolved.timeoutMs}ms (${resolved.command.join(" ")})`);
 };
+var resolveShutdownHook = (shutdown) => {
+  if (!shutdown) {
+    return null;
+  }
+  if (Array.isArray(shutdown)) {
+    return {
+      command: shutdown,
+      timeoutMs: 1e4
+    };
+  }
+  return {
+    command: shutdown.command,
+    timeoutMs: shutdown.timeoutMs ?? 1e4
+  };
+};
+var runShutdownHook = async (service, onLog) => {
+  const hook = resolveShutdownHook(service.service.shutdown);
+  if (!hook) {
+    return;
+  }
+  onLog("workspace", `Running ${service.name} shutdown hook...`, "info");
+  const processHandle = Bun.spawn(hook.command, {
+    cwd: service.cwd,
+    env: service.env,
+    stderr: "pipe",
+    stdin: "ignore",
+    stdout: "pipe"
+  });
+  pipeProcessLogs(service.name, processHandle, onLog);
+  const timeout = setTimeout(() => {
+    try {
+      processHandle.kill();
+    } catch {}
+  }, hook.timeoutMs);
+  try {
+    const exitCode = await processHandle.exited;
+    if (exitCode === 0) {
+      onLog("workspace", `${service.name} shutdown hook finished.`, "success");
+      return;
+    }
+    onLog("workspace", `${service.name} shutdown hook exited with code ${exitCode || 1}.`, "warn");
+  } finally {
+    clearTimeout(timeout);
+  }
+};
 var topologicallySortServices = (services) => {
   const ordered = [];
   const visiting = new Set;
@@ -3487,6 +3575,9 @@ var workspace = async (subcommand, options) => {
     }),
     version: absoluteVersion
   });
+  const workspaceLogs = createWorkspaceLogSink(tui.addLog);
+  const addLog = workspaceLogs.appendLog;
+  addLog("workspace", `Writing workspace logs to ${workspaceLogs.logDirectory}`, "info");
   const killProcesses = async () => {
     const snapshot = [...running];
     running.length = 0;
@@ -3496,6 +3587,14 @@ var workspace = async (subcommand, options) => {
       } catch {}
     }
     await Promise.all(snapshot.map((service) => service.process.exited));
+    for (const service of snapshot.reverse()) {
+      try {
+        await runShutdownHook(service.resolved, addLog);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        addLog("workspace", `${service.name} shutdown hook failed: ${message}`, "warn");
+      }
+    }
   };
   const printFailureSummary = (exitCode) => {
     const servicesSnapshot = tui.getServiceSnapshot();
@@ -3563,7 +3662,7 @@ var workspace = async (subcommand, options) => {
       const port = (resolved.service.port ?? Number(resolved.env.PORT ?? "")) || DEFAULT_PORT;
       if (port > 0) {
         killStaleProcesses(port, (message) => {
-          tui.addLog("workspace", message, "warn");
+          addLog("workspace", message, "warn");
         });
       }
       if (isAbsoluteService(resolved.service) && resolved.configPath && !existsSync8(resolved.configPath)) {
@@ -3578,7 +3677,7 @@ var workspace = async (subcommand, options) => {
         stdin: "ignore",
         stdout: "pipe"
       });
-      pipeProcessLogs(name, processHandle, tui.addLog);
+      pipeProcessLogs(name, processHandle, addLog);
       const runningService = {
         name,
         process: processHandle,
@@ -3593,7 +3692,7 @@ var workspace = async (subcommand, options) => {
           return;
         }
         tui.setServiceStatus(name, "error", `exit code ${exitCode || 1}`);
-        tui.addLog("workspace", `${name} exited with code ${exitCode || 1}. Shutting down workspace.`, "error");
+        addLog("workspace", `${name} exited with code ${exitCode || 1}. Shutting down workspace.`, "error");
         shutdown(exitCode || 1);
       });
       await waitForReady(resolved);
@@ -3613,7 +3712,7 @@ var workspace = async (subcommand, options) => {
       }
       paused = false;
     }
-    tui.addLog("workspace", "Restarting workspace...", "info");
+    addLog("workspace", "Restarting workspace...", "info");
     for (const name of orderedNames) {
       tui.setServiceStatus(name, "restarting");
     }
@@ -3622,7 +3721,7 @@ var workspace = async (subcommand, options) => {
     workspaceBootStartedAt = performance.now();
     await startServices();
     tui.setReadyDuration(performance.now() - workspaceBootStartedAt);
-    tui.addLog("workspace", "Workspace ready.", "success");
+    addLog("workspace", "Workspace ready.", "success");
   };
   const togglePause = () => {
     if (paused) {
@@ -3631,14 +3730,14 @@ var workspace = async (subcommand, options) => {
         tui.setServiceStatus(service.name, "ready");
       }
       paused = false;
-      tui.addLog("workspace", "Workspace resumed.", "success");
+      addLog("workspace", "Workspace resumed.", "success");
     } else {
       for (const service of running) {
         sendSignalToService(service.process, "SIGSTOP");
         tui.setServiceStatus(service.name, "paused");
       }
       paused = true;
-      tui.addLog("workspace", "Workspace paused.", "warn");
+      addLog("workspace", "Workspace paused.", "warn");
     }
   };
   const runShellCommand2 = async (command) => {
@@ -3647,19 +3746,19 @@ var workspace = async (subcommand, options) => {
       stderr: "pipe",
       stdout: "pipe"
     });
-    pipeProcessLogs("shell", processHandle, tui.addLog);
+    pipeProcessLogs("shell", processHandle, addLog);
     const exitCode = await processHandle.exited;
     if (exitCode === 0) {
-      tui.addLog("workspace", `Shell command finished: ${command}`, "success");
+      addLog("workspace", `Shell command finished: ${command}`, "success");
       return;
     }
-    tui.addLog("workspace", `Shell command failed with exit code ${exitCode}: ${command}`, "error");
+    addLog("workspace", `Shell command failed with exit code ${exitCode}: ${command}`, "error");
   };
   const openInBrowser = async () => {
     const publicService = orderedNames.map((name) => services[name]).find((service) => service && getVisibility(service) === "public");
     const url = publicService ? getServiceUrl(publicService) : null;
     if (!url) {
-      tui.addLog("workspace", "No public service to open.", "warn");
+      addLog("workspace", "No public service to open.", "warn");
       return;
     }
     const { platform: platform4 } = process;
@@ -3680,9 +3779,9 @@ var workspace = async (subcommand, options) => {
         stderr: "ignore",
         stdout: "ignore"
       });
-      tui.addLog("workspace", `Opening ${url}`, "info");
+      addLog("workspace", `Opening ${url}`, "info");
     } catch {
-      tui.addLog("workspace", `Could not open browser automatically. Visit ${url}`, "warn");
+      addLog("workspace", `Could not open browser automatically. Visit ${url}`, "warn");
     }
   };
   process.on("SIGINT", () => {
@@ -3692,10 +3791,10 @@ var workspace = async (subcommand, options) => {
     shutdown(0);
   });
   tui.start();
-  tui.addLog("workspace", `Workspace booting ${orderedNames.length} services.`, "info");
+  addLog("workspace", `Workspace booting ${orderedNames.length} services.`, "info");
   await startServices();
   tui.setReadyDuration(performance.now() - workspaceBootStartedAt);
-  tui.addLog("workspace", "Workspace ready.", "success");
+  addLog("workspace", "Workspace ready.", "success");
   await new Promise(() => {});
 };
 

package/dist/types/build.d.ts

@@ -51,6 +51,10 @@ export type DelayReadyConfig = {
     ms: number;
 };
 export type ServiceReadyConfig = false | string | HttpReadyConfig | TcpReadyConfig | CommandReadyConfig | DelayReadyConfig;
+export type ServiceShutdownConfig = false | string[] | {
+    command: string[];
+    timeoutMs?: number;
+};
 export type ServiceVisibility = 'public' | 'internal';
 export type BaseBuildConfig = {
     buildDirectory?: string;
@@ -96,6 +100,7 @@ export type AbsoluteServiceConfig = BaseBuildConfig & {
     entry?: string;
     env?: Record<string, string>;
     ready?: ServiceReadyConfig;
+    shutdown?: ServiceShutdownConfig;
     port?: number;
     visibility?: ServiceVisibility;
     command?: never;
@@ -107,6 +112,7 @@ export type CommandServiceConfig = {
     dependsOn?: string[];
     env?: Record<string, string>;
     ready?: ServiceReadyConfig;
+    shutdown?: ServiceShutdownConfig;
     port?: number;
     visibility?: ServiceVisibility;
     entry?: never;

package/package.json

@@ -302,5 +302,5 @@
 		"typecheck": "bun run src/cli/index.ts typecheck --config example/absolute.config.ts"
 	},
 	"types": "./dist/src/index.d.ts",
-	"version": "0.19.0-beta.681"
+	"version": "0.19.0-beta.683"
 }