@cloudflare/sandbox 0.6.5 → 0.6.6

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as ProcessInfoResult, A as RequestConfig, B as FileChunk, C as WriteFileRequest, D as ContainerStub, E as BaseApiResponse, F as BucketProvider, G as ListFilesOptions, H as FileStreamEvent, I as ExecEvent, J as PortCloseResult, K as LogEvent, L as ExecOptions, M as SessionRequest, N as BaseExecOptions, O as ErrorResponse, P as BucketCredentials, Q as ProcessCleanupResult, R as ExecResult, S as ReadFileRequest, T as ExecuteResponse, U as GitCheckoutResult, V as FileMetadata, W as ISandbox, X as PortListResult, Y as PortExposeResult, Z as Process, _ as GitCheckoutRequest, _t as ExecutionResult, a as CreateSessionRequest, at as ProcessStatus, b as FileOperationRequest, c as DeleteSessionResponse, ct as StreamOptions, d as ProcessClient, dt as isExecResult, et as ProcessKillResult, f as ExposePortRequest, ft as isProcess, g as InterpreterClient, gt as Execution, h as ExecutionCallbacks, ht as CreateContextOptions, i as CommandsResponse, it as ProcessStartResult, j as ResponseHandler, k as HttpClientOptions, l as PingResponse, lt as WaitForLogResult, m as UnexposePortRequest, mt as CodeContext, n as getSandbox, nt as ProcessLogsResult, o as CreateSessionResponse, ot as SandboxOptions, p as PortClient, pt as isProcessStatus, q as MountBucketOptions, r as SandboxClient, rt as ProcessOptions, s as DeleteSessionRequest, st as SessionOptions, t as Sandbox, tt as ProcessListResult, u as UtilityClient, ut as WaitForPortOptions, v as GitClient, vt as RunCodeOptions, w as CommandClient, x as MkdirRequest, y as FileClient, z as ExecutionSession } from "./sandbox-C9WRqWBO.js";
+import { $ as ProcessInfoResult, A as RequestConfig, B as FileChunk, C as WriteFileRequest, D as ContainerStub, E as BaseApiResponse, F as BucketProvider, G as ListFilesOptions, H as FileStreamEvent, I as ExecEvent, J as PortCloseResult, K as LogEvent, L as ExecOptions, M as SessionRequest, N as BaseExecOptions, O as ErrorResponse, P as BucketCredentials, Q as ProcessCleanupResult, R as ExecResult, S as ReadFileRequest, T as ExecuteResponse, U as GitCheckoutResult, V as FileMetadata, W as ISandbox, X as PortListResult, Y as PortExposeResult, Z as Process, _ as GitCheckoutRequest, _t as ExecutionResult, a as CreateSessionRequest, at as ProcessStatus, b as FileOperationRequest, c as DeleteSessionResponse, ct as StreamOptions, d as ProcessClient, dt as isExecResult, et as ProcessKillResult, f as ExposePortRequest, ft as isProcess, g as InterpreterClient, gt as Execution, h as ExecutionCallbacks, ht as CreateContextOptions, i as CommandsResponse, it as ProcessStartResult, j as ResponseHandler, k as HttpClientOptions, l as PingResponse, lt as WaitForLogResult, m as UnexposePortRequest, mt as CodeContext, n as getSandbox, nt as ProcessLogsResult, o as CreateSessionResponse, ot as SandboxOptions, p as PortClient, pt as isProcessStatus, q as MountBucketOptions, r as SandboxClient, rt as ProcessOptions, s as DeleteSessionRequest, st as SessionOptions, t as Sandbox, tt as ProcessListResult, u as UtilityClient, ut as WaitForPortOptions, v as GitClient, vt as RunCodeOptions, w as CommandClient, x as MkdirRequest, y as FileClient, z as ExecutionSession } from "./sandbox-09Ce7yli.js";
 import { a as OperationType, i as ErrorResponse$1, n as ProcessExitedBeforeReadyContext, o as ErrorCode, r as ProcessReadyTimeoutContext } from "./contexts-CdrlvHWK.js";
 
 //#region ../shared/dist/request-types.d.ts

package/dist/index.js

@@ -586,14 +586,14 @@ var BaseHttpClient = class {
 	}
 	/**
 	* Core HTTP request method with automatic retry for container startup delays
-	* Retries both 503 (provisioning) and 500 (startup failure) errors when they're container-related
+	* Retries on 503 (Service Unavailable) which indicates container is starting
 	*/
 	async doFetch(path, options) {
 		const startTime = Date.now();
 		let attempt = 0;
 		while (true) {
 			const response = await this.executeFetch(path, options);
-			if (await this.isRetryableContainerError(response)) {
+			if (this.isRetryableContainerError(response)) {
 				const elapsed = Date.now() - startTime;
 				const remaining = TIMEOUT_MS - elapsed;
 				if (remaining > MIN_TIME_FOR_RETRY_MS) {
@@ -706,51 +706,19 @@ var BaseHttpClient = class {
 	}
 	/**
 	* Check if response indicates a retryable container error
-	* Uses fail-safe strategy: only retry known transient errors
 	*
-	* TODO: This relies on string matching error messages, which is brittle.
-	* Ideally, the container API should return structured errors with a
-	* `retryable: boolean` field to avoid coupling to error message format.
+	* The Sandbox DO returns proper HTTP status codes:
+	* - 503 Service Unavailable: Transient errors (container starting, port not ready)
+	* - 500 Internal Server Error: Permanent errors (bad config, missing image)
+	*
+	* We only retry on 503, which indicates the container is starting up.
+	* The Retry-After header suggests how long to wait.
 	*
 	* @param response - HTTP response to check
-	* @returns true if error is retryable container error, false otherwise
+	* @returns true if error is retryable (503), false otherwise
 	*/
-	async isRetryableContainerError(response) {
-		if (response.status !== 500 && response.status !== 503) return false;
-		try {
-			const text = await response.clone().text();
-			const textLower = text.toLowerCase();
-			if ([
-				"no such image",
-				"container already exists",
-				"malformed containerinspect"
-			].some((err) => textLower.includes(err))) {
-				this.logger.debug("Detected permanent error, not retrying", { text });
-				return false;
-			}
-			const shouldRetry = [
-				"no container instance available",
-				"currently provisioning",
-				"container port not found",
-				"connection refused: container port",
-				"the container is not listening",
-				"failed to verify port",
-				"container did not start",
-				"network connection lost",
-				"container suddenly disconnected",
-				"monitor failed to find container",
-				"timed out",
-				"timeout"
-			].some((err) => textLower.includes(err));
-			if (!shouldRetry) this.logger.debug("Unknown error pattern, not retrying", {
-				status: response.status,
-				text: text.substring(0, 200)
-			});
-			return shouldRetry;
-		} catch (error) {
-			this.logger.error("Error checking if response is retryable", error instanceof Error ? error : new Error(String(error)));
-			return false;
-		}
+	isRetryableContainerError(response) {
+		return response.status === 503;
 	}
 	async executeFetch(path, options) {
 		const url = this.options.stub ? `http://localhost:${this.options.port}${path}` : `${this.baseUrl}${path}`;
@@ -2019,7 +1987,7 @@ function resolveS3fsOptions(provider, userOptions) {
 * This file is auto-updated by .github/changeset-version.ts during releases
 * DO NOT EDIT MANUALLY - Changes will be overwritten on the next version bump
 */
-const SDK_VERSION = "0.6.5";
+const SDK_VERSION = "0.6.6";
 
 //#endregion
 //#region src/sandbox.ts
@@ -2379,18 +2347,57 @@ var Sandbox = class extends Container {
 				status: 503,
 				headers: { "Retry-After": "10" }
 			});
-			this.logger.error("Container startup failed", e instanceof Error ? e : new Error(String(e)));
+			if (this.isTransientStartupError(e)) {
+				this.logger.debug("Transient container startup error, returning 503", { error: e instanceof Error ? e.message : String(e) });
+				return new Response("Container is starting. Please retry in a moment.", {
+					status: 503,
+					headers: { "Retry-After": "3" }
+				});
+			}
+			this.logger.error("Container startup failed with permanent error", e instanceof Error ? e : new Error(String(e)));
 			return new Response(`Failed to start container: ${e instanceof Error ? e.message : String(e)}`, { status: 500 });
 		}
 		return await super.containerFetch(requestOrUrl, portOrInit, portParam);
 	}
 	/**
 	* Helper: Check if error is "no container instance available"
+	* This indicates the container VM is still being provisioned.
 	*/
 	isNoInstanceError(error) {
 		return error instanceof Error && error.message.toLowerCase().includes("no container instance");
 	}
 	/**
+	* Helper: Check if error is a transient startup error that should trigger retry
+	*
+	* These errors occur during normal container startup and are recoverable:
+	* - Port not yet mapped (container starting, app not listening yet)
+	* - Connection refused (port mapped but app not ready)
+	* - Timeouts during startup (recoverable with retry)
+	* - Network transients (temporary connectivity issues)
+	*
+	* Errors NOT included (permanent failures):
+	* - "no such image" - missing Docker image
+	* - "container already exists" - name collision
+	* - Configuration errors
+	*/
+	isTransientStartupError(error) {
+		if (!(error instanceof Error)) return false;
+		const msg = error.message.toLowerCase();
+		return [
+			"container port not found",
+			"connection refused: container port",
+			"the container is not listening",
+			"failed to verify port",
+			"container did not start",
+			"network connection lost",
+			"container suddenly disconnected",
+			"monitor failed to find container",
+			"timed out",
+			"timeout",
+			"the operation was aborted"
+		].some((pattern) => msg.includes(pattern));
+	}
+	/**
 	* Helper: Parse containerFetch arguments (supports multiple signatures)
 	*/
 	parseContainerFetchArgs(requestOrUrl, portOrInit, portParam) {
@@ -2606,6 +2613,9 @@ var Sandbox = class extends Container {
 			},
 			waitForPort: async (port, options) => {
 				await this.waitForPortReady(data.id, data.command, port, options);
+			},
+			waitForExit: async (timeout) => {
+				return this.waitForProcessExit(data.id, data.command, timeout);
 			}
 		};
 	}
@@ -2731,6 +2741,30 @@ var Sandbox = class extends Container {
 		}
 	}
 	/**
+	* Wait for a process to exit
+	* Returns the exit code
+	*/
+	async waitForProcessExit(processId, command, timeout) {
+		const stream = await this.streamProcessLogs(processId);
+		let timeoutId;
+		let timeoutPromise;
+		if (timeout !== void 0) timeoutPromise = new Promise((_, reject) => {
+			timeoutId = setTimeout(() => {
+				reject(this.createReadyTimeoutError(processId, command, "process exit", timeout));
+			}, timeout);
+		});
+		try {
+			const streamProcessor = async () => {
+				for await (const event of parseSSEStream(stream)) if (event.type === "exit") return { exitCode: event.exitCode ?? 1 };
+				throw new Error(`Process ${processId} stream ended unexpectedly without exit event`);
+			};
+			if (timeoutPromise) return await Promise.race([streamProcessor(), timeoutPromise]);
+			return await streamProcessor();
+		} finally {
+			if (timeoutId) clearTimeout(timeoutId);
+		}
+	}
+	/**
 	* Match a pattern against text
 	*/
 	matchPattern(text, pattern) {