fixup! feat(cli): changes to run to work better with detached stdin (no shell)

Author: tuler

apps/cli/src/commands/run.ts

@@ -20,6 +20,7 @@ import { DEFAULT_SDK_VERSION, PREFERRED_PORT } from "../config.js";
 import {
     AVAILABLE_SERVICES,
     deployApplication,
+    host,
     removeApplication,
     type RollupsDeployment,
     startEnvironment,
@@ -298,11 +299,15 @@ export const createRunCommand = () => {
             // configure optional anvil fork
             const forkConfig = await configureFork(options);
 
+            // if TTY is not attached, run on foreground (not detached)
+            const detach = process.stdin.isTTY;
+
             // run compose environment (detached)
-            const { address, config } = await startEnvironment({
+            const { cmd, config } = await startEnvironment({
                 blockTime,
                 cpus,
                 defaultBlock,
+                detach,
                 dryRun,
                 forkConfig,
                 memory,
@@ -313,6 +318,9 @@ export const createRunCommand = () => {
                 verbose,
             });
 
+            // host address
+            const address = `${host}:${port}`;
+
             if (dryRun && config) {
                 // just show the docker compose configuration and quit
                 process.stdout.write(config);
@@ -365,7 +373,7 @@ export const createRunCommand = () => {
                 process.exit(0);
             };
 
-            if (process.stdin.isTTY) {
+            if (detach) {
                 // inhibit SIGINT and SIGTERM, will be handled gracefully by the shell
                 process.on("SIGINT", () => {});
                 process.on("SIGTERM", () => {});
@@ -387,18 +395,19 @@ export const createRunCommand = () => {
                 });
                 await shutdown();
             } else {
-                // non-interactive mode: wait for SIGINT or SIGTERM to shutdown
-                await new Promise<void>((resolve) => {
-                    // keep the event loop alive
-                    const keepAlive = setInterval(() => {}, 1 << 30);
-                    const handler = () => {
-                        clearInterval(keepAlive);
-                        resolve();
-                    };
-                    process.on("SIGINT", handler);
-                    process.on("SIGTERM", handler);
-                });
-                await shutdown();
+                process.on("SIGINT", shutdown);
+                process.on("SIGTERM", shutdown);
+                try {
+                    await cmd;
+                } catch (error: unknown) {
+                    if (error instanceof ExecaError) {
+                        // just continue gracefully
+                        if (error.exitCode === 130) {
+                            return;
+                        }
+                        throw error;
+                    }
+                }
             }
         });
 };

apps/cli/src/exec/rollups.ts

@@ -135,7 +135,7 @@ type Service = {
     errorTitle?: string; // title of the service when it is not healthy
 };
 
-const host = "http://127.0.0.1";
+export const host = "http://127.0.0.1";
 
 // services configuration
 const baseServices: Service[] = [
@@ -242,6 +242,7 @@ export const startEnvironment = async (options: {
     blockTime: number;
     cpus?: number;
     defaultBlock: "latest" | "safe" | "pending" | "finalized";
+    detach: boolean;
     dryRun: boolean;
     forkConfig?: ForkConfig;
     memory?: number;
@@ -255,6 +256,7 @@ export const startEnvironment = async (options: {
         blockTime,
         cpus,
         defaultBlock,
+        detach,
         dryRun,
         forkConfig,
         memory,
@@ -265,25 +267,26 @@ export const startEnvironment = async (options: {
         verbose,
     } = options;
 
-    const address = `${host}:${port}`;
-
     // setup the environment variable used in docker compose
     const env: NodeJS.ProcessEnv = {
         CARTESI_BLOCKCHAIN_DEFAULT_BLOCK: defaultBlock,
         CARTESI_LISTEN_PORT: port.toString(),
         CARTESI_LOG_LEVEL: verbose ? "debug" : "info",
     };
 
+    // local dev environment, we don't need security
+    const databasePassword = "password";
+
     const files = [
         anvil({
             blockTime,
             forkConfig,
             imageTag: runtimeVersion,
         }),
-        database({ imageTag: runtimeVersion, password: "password" }),
+        database({ imageTag: runtimeVersion, password: databasePassword }),
         node({
             cpus,
-            databasePassword: "password",
+            databasePassword,
             defaultBlock,
             forkChainId: forkConfig?.chainId,
             imageTag: runtimeVersion,
@@ -298,7 +301,7 @@ export const startEnvironment = async (options: {
             explorer({
                 imageTag: "1.4.0",
                 apiTag: "1.1.0",
-                databasePassword: "password",
+                databasePassword,
                 port,
             }),
         );
@@ -316,7 +319,7 @@ export const startEnvironment = async (options: {
     const composeArgs = ["compose", "-f", "-", "--project-directory", "."];
 
     // run in detached mode (background)
-    const upArgs = ["--detach"];
+    const upArgs = detach ? ["--detach"] : [];
 
     // merge files, following Docker Compose merge rules
     const composeFile = concat([{ name: projectName }, ...files]);
@@ -330,25 +333,21 @@ export const startEnvironment = async (options: {
             { env, input: stringify(composeFile, { lineWidth: 0, indent: 2 }) },
         );
 
-        return { address, config };
+        return { config };
     }
 
-    // pull images first
-    // const pullArgs = ["--policy", "missing"];
-    // await execa("docker", [...composeArgs, "pull", ...pullArgs], {
-    //     env,
-    ////FIXME: stdio and input won't work together
-    //     stdio: "inherit",
-    //     input: composeFile.build()
-    // });
-
     // run compose
-    await execa("docker", [...composeArgs, "up", ...upArgs], {
+    const cmd = execa("docker", [...composeArgs, "up", ...upArgs], {
         env,
         input: stringify(composeFile, { lineWidth: 0, indent: 2 }),
     });
 
-    return { address };
+    // if detached, wait to finish
+    if (detach) {
+        await cmd;
+    }
+
+    return { cmd };
 };
 
 /**