handle LS CLI failures using text heuristic

Author: skyrpex

src/plugins/manage.ts

@@ -17,13 +17,17 @@ export default createPlugin(
 		);
 
 		context.subscriptions.push(
-			commands.registerCommand("localstack.start", () => {
+			commands.registerCommand("localstack.start", async () => {
 				if (localStackStatusTracker.status() !== "stopped") {
 					window.showInformationMessage("LocalStack is already running.");
 					return;
 				}
-				localStackStatusTracker.forceStarting();
-				void startLocalStack(outputChannel, telemetry);
+				localStackStatusTracker.forceContainerStatus("running");
+				try {
+					await startLocalStack(outputChannel, telemetry);
+				} catch {
+					localStackStatusTracker.forceContainerStatus("stopped");
+				}
 			}),
 		);
 
@@ -33,7 +37,7 @@ export default createPlugin(
 					window.showInformationMessage("LocalStack is not running.");
 					return;
 				}
-				localStackStatusTracker.forceStopping();
+				localStackStatusTracker.forceContainerStatus("stopping");
 				void stopLocalStack(outputChannel, telemetry);
 			}),
 		);

src/utils/cli.ts

@@ -8,6 +8,7 @@ import { CLI_PATHS } from "../constants.ts";
 
 import { exec } from "./exec.ts";
 import { spawn } from "./spawn.ts";
+import type { SpawnOptions } from "./spawn.ts";
 
 const IMAGE_NAME = "localstack/localstack-pro";
 const LOCALSTACK_LDM_PREVIEW = "1";
@@ -68,6 +69,7 @@ export const spawnLocalStack = async (
 	options: {
 		outputChannel: LogOutputChannel;
 		cancellationToken?: CancellationToken;
+		onStderr?: SpawnOptions["onStderr"];
 	},
 ) => {
 	const cli = await findLocalStack();
@@ -81,5 +83,6 @@ export const spawnLocalStack = async (
 			IMAGE_NAME,
 			LOCALSTACK_LDM_PREVIEW,
 		},
+		onStderr: options.onStderr,
 	});
 };

src/utils/localstack-status.ts

@@ -11,9 +11,7 @@ export type LocalStackStatus = "starting" | "running" | "stopping" | "stopped";
 
 export interface LocalStackStatusTracker extends Disposable {
 	status(): LocalStackStatus;
-	// setStatus(status: LocalStackStatus): void;
-	forceStarting(): void;
-	forceStopping(): void;
+	forceContainerStatus(status: ContainerStatus): void;
 	onChange(callback: (status: LocalStackStatus) => void): void;
 }
 
@@ -66,15 +64,9 @@ export async function createLocalStackStatusTracker(
 			// biome-ignore lint/style/noNonNullAssertion: false positive
 			return status!;
 		},
-		forceStarting() {
-			if (containerStatus !== "running") {
-				containerStatus = "running";
-				deriveStatus();
-			}
-		},
-		forceStopping() {
-			if (containerStatus !== "stopping") {
-				containerStatus = "stopping";
+		forceContainerStatus(newContainerStatus) {
+			if (containerStatus !== newContainerStatus) {
+				containerStatus = newContainerStatus;
 				deriveStatus();
 			}
 		},

src/utils/manage.ts

@@ -5,6 +5,7 @@ import { commands, env, Uri, window } from "vscode";
 import { checkIsLicenseValid } from "./authenticate.ts";
 import { spawnLocalStack } from "./cli.ts";
 import { exec } from "./exec.ts";
+import { spawn } from "./spawn.ts";
 import type { Telemetry } from "./telemetry.ts";
 
 export type LocalstackStatus = "running" | "starting" | "stopping" | "stopped";
@@ -85,7 +86,7 @@ export async function getLocalstackStatus(): Promise<LocalstackStatus> {
 export async function startLocalStack(
 	outputChannel: LogOutputChannel,
 	telemetry: Telemetry,
-) {
+): Promise<void> {
 	void showInformationMessage("Starting LocalStack.", {
 		title: "View Logs",
 		command: "localstack.viewLogs",
@@ -105,6 +106,17 @@ export async function startLocalStack(
 			],
 			{
 				outputChannel,
+				onStderr(data: Buffer, context) {
+					const text = data.toString();
+					if (
+						text.includes(
+							"localstack.utils.container_utils.container_client.ContainerException",
+						)
+					) {
+						context.abort();
+						throw new Error("ContainerException");
+					}
+				},
 			},
 		);
 
@@ -129,6 +141,7 @@ export async function startLocalStack(
 				title: "View Logs",
 				command: "localstack.viewLogs",
 			});
+			throw error;
 		}
 
 		telemetry.track({

src/utils/spawn.ts

@@ -133,6 +133,14 @@ export class SpawnError extends Error {
 	}
 }
 
+export interface SpawnOptions {
+	outputLabel?: string;
+	outputChannel: LogOutputChannel;
+	cancellationToken?: CancellationToken;
+	environment?: Record<string, string | undefined> | undefined;
+	onStderr?: (data: Buffer, context: { abort: () => void }) => void;
+}
+
 /**
  * Spawns a new process using the given `command`, with command-line arguments in `args`.
  * - All output is appended to the `options.outputChannel`, optionally prefixed by `options.outputLabel`.
@@ -143,12 +151,7 @@ export class SpawnError extends Error {
 export const spawn = (
 	command: string,
 	args: string[],
-	options: {
-		outputLabel?: string;
-		outputChannel: LogOutputChannel;
-		cancellationToken?: CancellationToken;
-		environment?: Record<string, string | undefined> | undefined;
-	},
+	options: SpawnOptions,
 ) => {
 	return new Promise<{ code: number | null; signal: NodeJS.Signals | null }>(
 		(resolve, reject) => {
@@ -169,24 +172,38 @@ export const spawn = (
 
 			const child = childProcess.spawn(command, args, spawnOptions);
 
+			const killChild = () => {
+				// Use SIGINT on Unix, 'SIGTERM' on Windows
+				const isWindows = os.platform() === "win32";
+				if (isWindows) {
+					child.kill("SIGTERM");
+				} else {
+					child.kill("SIGINT");
+				}
+			};
+
 			const disposeCancel = options.cancellationToken?.onCancellationRequested(
 				() => {
 					outputChannel.appendLine(
 						`${outputLabel}Command cancelled: ${commandLine}`,
 					);
-					// Use SIGINT on Unix, 'SIGTERM' on Windows
-					const isWindows = os.platform() === "win32";
-					if (isWindows) {
-						child.kill("SIGTERM");
-					} else {
-						child.kill("SIGINT");
-					}
+					killChild();
 					reject(new Error("Command cancelled"));
 				},
 			);
 
 			pipeToLogOutputChannel(child, outputChannel, outputLabel);
 
+			if (options.onStderr) {
+				child.stderr?.on("data", (data: Buffer) =>
+					options.onStderr?.(data, {
+						abort() {
+							killChild();
+						},
+					}),
+				);
+			}
+
 			child.on("close", (code, signal) => {
 				disposeCancel?.dispose();