@cloudflare/sandbox 0.7.7 → 0.7.8

package/dist/index.js

@@ -2712,7 +2712,7 @@ function buildS3fsSource(bucket, prefix) {
 * 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.7.7";
+const SDK_VERSION = "0.7.8";
 
 //#endregion
 //#region src/sandbox.ts
@@ -3138,34 +3138,43 @@ var Sandbox = class Sandbox extends Container {
 	*/
 	async containerFetch(requestOrUrl, portOrInit, portParam) {
 		const { request, port } = this.parseContainerFetchArgs(requestOrUrl, portOrInit, portParam);
-		if ((await this.getState()).status !== "healthy") try {
-			this.logger.debug("Starting container with configured timeouts", {
-				instanceTimeout: this.containerTimeouts.instanceGetTimeoutMS,
-				portTimeout: this.containerTimeouts.portReadyTimeoutMS
-			});
-			await this.startAndWaitForPorts({
-				ports: port,
-				cancellationOptions: {
-					instanceGetTimeoutMS: this.containerTimeouts.instanceGetTimeoutMS,
-					portReadyTimeoutMS: this.containerTimeouts.portReadyTimeoutMS,
-					waitInterval: this.containerTimeouts.waitIntervalMS,
-					abort: request.signal
-				}
-			});
-		} catch (e) {
-			if (this.isNoInstanceError(e)) return new Response("Container is currently provisioning. This can take several minutes on first deployment. Please retry in a moment.", {
-				status: 503,
-				headers: { "Retry-After": "10" }
-			});
-			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.", {
+		const state = await this.getState();
+		const containerRunning = this.ctx.container?.running;
+		const staleStateDetected = state.status === "healthy" && containerRunning === false;
+		if (state.status !== "healthy" || containerRunning === false) {
+			if (staleStateDetected) this.logger.debug("Stale container state detected: persisted state is healthy but container is not running");
+			try {
+				this.logger.debug("Starting container with configured timeouts", {
+					instanceTimeout: this.containerTimeouts.instanceGetTimeoutMS,
+					portTimeout: this.containerTimeouts.portReadyTimeoutMS
+				});
+				await this.startAndWaitForPorts({
+					ports: port,
+					cancellationOptions: {
+						instanceGetTimeoutMS: this.containerTimeouts.instanceGetTimeoutMS,
+						portReadyTimeoutMS: this.containerTimeouts.portReadyTimeoutMS,
+						waitInterval: this.containerTimeouts.waitIntervalMS,
+						abort: request.signal
+					}
+				});
+			} catch (e) {
+				if (this.isNoInstanceError(e)) return new Response("Container is currently provisioning. This can take several minutes on first deployment. Please retry in a moment.", {
 					status: 503,
-					headers: { "Retry-After": "3" }
+					headers: { "Retry-After": "10" }
 				});
+				if (this.isTransientStartupError(e)) {
+					if (staleStateDetected) {
+						this.logger.warn("Container startup failed after stale state detection, aborting DO for recovery", { error: e instanceof Error ? e.message : String(e) });
+						this.ctx.abort();
+					} else 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 });
 			}
-			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);
 	}
@@ -3202,6 +3211,8 @@ var Sandbox = class Sandbox extends Container {
 			"network connection lost",
 			"container suddenly disconnected",
 			"monitor failed to find container",
+			"container exited with unexpected exit code",
+			"container exited before we could determine",
 			"timed out",
 			"timeout",
 			"the operation was aborted"