@cloudflare/sandbox 0.13.0-next.632.1 → 0.13.0-next.649.1

package/dist/{sandbox-B7ewRruX.js → sandbox-B-FLGbkP.js}

@@ -1,5 +1,5 @@
 import { a as shellEscape, c as TraceContext, d as ResultImpl, f as filterEnvVars, i as parseSSEFrames, l as logCanonicalEvent, m as partitionEnvVars, o as createLogger, p as getEnvString, s as createNoOpLogger, u as Execution } from "./dist-mAH_7Ui7.js";
-import { n as getHttpStatus, r as ErrorCode, t as getSuggestion } from "./errors-aRUdk9K8.js";
+import { n as getHttpStatus, r as ErrorCode, t as getSuggestion } from "./errors-CpoDEfUZ.js";
 import { Container, ContainerProxy, getContainer, switchPort } from "@cloudflare/containers";
 import { AwsClient } from "aws4fetch";
 import { RpcSession, RpcTarget } from "capnweb";
@@ -629,6 +629,12 @@ var BackupRestoreError = class extends SandboxError {
 		return this.context.backupId;
 	}
 };
+var ContainerUnavailableError = class extends SandboxError {
+	constructor(errorResponse) {
+		super(errorResponse);
+		this.name = "ContainerUnavailableError";
+	}
+};
 /**
 * Raised when the capnweb WebSocket session itself fails on the SDK side.
 * Unlike the rest of the SandboxError tree, the container never produces
@@ -710,6 +716,7 @@ function createErrorFromResponse(errorResponse, options) {
 		case ErrorCode.INTERPRETER_NOT_READY: return new InterpreterNotReadyError(errorResponse);
 		case ErrorCode.CONTEXT_NOT_FOUND: return new ContextNotFoundError(errorResponse);
 		case ErrorCode.CODE_EXECUTION_ERROR: return new CodeExecutionError(errorResponse);
+		case ErrorCode.CONTAINER_UNAVAILABLE: return new ContainerUnavailableError(errorResponse);
 		case ErrorCode.RPC_TRANSPORT_ERROR: return new RPCTransportError(errorResponse, options);
 		case ErrorCode.VALIDATION_FAILED: return new ValidationFailedError(errorResponse);
 		case ErrorCode.INVALID_JSON_RESPONSE:
@@ -1126,6 +1133,11 @@ async function fetchWithResponseRetry(fetchResponse, options) {
 const DEFAULT_CONNECT_TIMEOUT_MS = 3e4;
 const DEFAULT_RETRY_TIMEOUT_MS = 12e4;
 const MIN_TIME_FOR_RETRY_MS = 15e3;
+function isErrorResponse(value) {
+	if (typeof value !== "object" || value === null) return false;
+	const candidate = value;
+	return typeof candidate.code === "string" && Object.values(ErrorCode).includes(candidate.code) && typeof candidate.message === "string" && typeof candidate.httpStatus === "number" && typeof candidate.timestamp === "string" && typeof candidate.context === "object" && candidate.context !== null;
+}
 /**
 * Manages a capnweb WebSocket RPC session to the container.
 *
@@ -1249,7 +1261,19 @@ var ContainerControlConnection = class {
 	async doConnect() {
 		try {
 			const response = await this.fetchUpgradeWithRetry();
-			if (response.status !== 101) throw new Error(`WebSocket upgrade failed: ${response.status} ${response.statusText}`);
+			if (response.status !== 101) {
+				const structuredError = await this.parseStructuredUpgradeError(response);
+				if (structuredError) throw createErrorFromResponse(structuredError);
+				if (isRetryableWebSocketUpgradeResponse(response)) throw createErrorFromResponse({
+					code: ErrorCode.CONTAINER_UNAVAILABLE,
+					message: "Container is starting. Please retry in a moment.",
+					context: { reason: "startup" },
+					httpStatus: 503,
+					timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+					suggestion: "The container is not ready yet. Retry the operation in a moment."
+				});
+				throw new Error(`WebSocket upgrade failed: ${response.status} ${response.statusText}`);
+			}
 			const ws = response.webSocket;
 			if (!ws) throw new Error("No WebSocket in upgrade response");
 			ws.accept();
@@ -1267,6 +1291,17 @@ var ContainerControlConnection = class {
 			throw error;
 		}
 	}
+	async parseStructuredUpgradeError(response) {
+		if (!(response.headers.get("Content-Type") ?? "").includes("application/json")) return null;
+		let body;
+		try {
+			body = await response.clone().json();
+		} catch {
+			return null;
+		}
+		if (!isErrorResponse(body)) return null;
+		return body;
+	}
 	/**
 	* Issue WebSocket upgrade fetches, retrying transient control-plane
 	* unavailability responses until either the upgrade succeeds, a
@@ -1395,6 +1430,11 @@ const BUSY_POLL_INTERVAL_MS = 1e3;
 */
 const IDLE_IMPORT_THRESHOLD = 1;
 const IDLE_EXPORT_THRESHOLD = 1;
+function isLocalSandboxError(error) {
+	if (!("errorResponse" in error)) return false;
+	const response = error.errorResponse;
+	return typeof response?.code === "string" && Object.hasOwn(ErrorCode, response.code) && typeof response.message === "string" && typeof response.httpStatus === "number" && typeof response.timestamp === "string" && typeof response.context === "object" && response.context !== null;
+}
 /**
 * Translate a capnweb-propagated error into a typed SandboxError.
 *
@@ -1413,6 +1453,7 @@ const IDLE_EXPORT_THRESHOLD = 1;
 */
 function translateRPCError(error) {
 	if (error instanceof Error) {
+		if (isLocalSandboxError(error)) throw error;
 		const propagated = error;
 		if (typeof propagated.code === "string" && Object.hasOwn(ErrorCode, propagated.code)) {
 			const code = propagated.code;
@@ -4144,7 +4185,7 @@ async function pruneTunnelsForRestart(storage) {
 * 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.13.0-next.632.1";
+const SDK_VERSION = "0.13.0-next.649.1";
 
 //#endregion
 //#region src/sandbox.ts
@@ -4211,6 +4252,8 @@ const BACKUP_MULTIPART_MAX_PARTS = 64;
 const BACKUP_DOWNLOAD_PARALLEL_PARTS = 8;
 const BACKUP_DOWNLOAD_PARALLEL_MIN_SIZE = 10 * 1024 * 1024;
 const BACKUP_DOWNLOAD_MAX_PARTS = 64;
+const DEFAULT_SESSION_INIT_MAX_ATTEMPTS = 2;
+const DEFAULT_SESSION_RESTART_SETTLE_MS = 100;
 /**
 * Calculate the optimal number of parts for multipart upload/download
 * based on archive size. Larger archives benefit from more parallelism.
@@ -5512,12 +5555,12 @@ var Sandbox = class Sandbox extends Container {
 		} catch (e) {
 			if (this.isNoInstanceError(e)) {
 				const errorBody$1 = {
-					code: ErrorCode.INTERNAL_ERROR,
+					code: ErrorCode.CONTAINER_UNAVAILABLE,
 					message: "Container is currently provisioning. This can take several minutes on first deployment.",
-					context: { phase: "provisioning" },
+					context: { reason: "provisioning" },
 					httpStatus: 503,
 					timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-					suggestion: "This is expected during first deployment. The SDK will retry automatically."
+					suggestion: "The container is still being provisioned. Retry the operation in a moment."
 				};
 				return new Response(JSON.stringify(errorBody$1), {
 					status: 503,
@@ -5559,15 +5602,12 @@ var Sandbox = class Sandbox extends Container {
 					error: e instanceof Error ? e.message : String(e)
 				});
 				const errorBody$1 = {
-					code: ErrorCode.INTERNAL_ERROR,
+					code: ErrorCode.CONTAINER_UNAVAILABLE,
 					message: "Container is starting. Please retry in a moment.",
-					context: {
-						phase: "startup",
-						error: e instanceof Error ? e.message : String(e)
-					},
+					context: { reason: "startup" },
 					httpStatus: 503,
 					timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-					suggestion: "The container is booting. The SDK will retry automatically."
+					suggestion: "The container is not ready yet. Retry the operation in a moment."
 				};
 				return new Response(JSON.stringify(errorBody$1), {
 					status: 503,
@@ -5583,15 +5623,12 @@ var Sandbox = class Sandbox extends Container {
 				error: e instanceof Error ? e.message : String(e)
 			});
 			const errorBody = {
-				code: ErrorCode.INTERNAL_ERROR,
+				code: ErrorCode.CONTAINER_UNAVAILABLE,
 				message: "Container is starting. Please retry in a moment.",
-				context: {
-					phase: "startup",
-					error: e instanceof Error ? e.message : String(e)
-				},
+				context: { reason: "startup" },
 				httpStatus: 503,
 				timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-				suggestion: "The SDK will retry automatically. If this persists, the container may need redeployment."
+				suggestion: "The container is not ready yet. Retry the operation in a moment."
 			};
 			return new Response(JSON.stringify(errorBody), {
 				status: 503,
@@ -5837,6 +5874,15 @@ var Sandbox = class Sandbox extends Container {
 	*/
 	async ensureDefaultSession() {
 		const sessionId = `sandbox-${this.sandboxName || "default"}`;
+		for (let attempt = 1; attempt <= DEFAULT_SESSION_INIT_MAX_ATTEMPTS; attempt++) try {
+			return await this.getOrInitializeDefaultSession(sessionId);
+		} catch (error) {
+			if (!this.isDefaultSessionInitContainerRestart(error) || attempt === DEFAULT_SESSION_INIT_MAX_ATTEMPTS) throw error;
+			await new Promise((resolve) => setTimeout(resolve, DEFAULT_SESSION_RESTART_SETTLE_MS));
+		}
+		throw new Error("Default session initialization failed unexpectedly");
+	}
+	async getOrInitializeDefaultSession(sessionId) {
 		if (this.defaultSession === sessionId) return this.defaultSession;
 		const generation = this.containerGeneration;
 		const pending = this.defaultSessionInit;
@@ -5854,6 +5900,9 @@ var Sandbox = class Sandbox extends Container {
 			if (this.defaultSessionInit === init) this.defaultSessionInit = null;
 		}
 	}
+	isDefaultSessionInitContainerRestart(error) {
+		return error instanceof ContainerUnavailableError && error.context.reason === "container_restarted";
+	}
 	async initializeDefaultSession(sessionId, generation) {
 		let placementId;
 		try {
@@ -5867,7 +5916,17 @@ var Sandbox = class Sandbox extends Container {
 			placementId = error.containerPlacementId;
 			this.logger.debug("Session exists in container but not in DO state, syncing", { sessionId });
 		}
-		if (generation !== this.containerGeneration) throw new Error("Default session initialization was invalidated by a container stop");
+		if (generation !== this.containerGeneration) throw new ContainerUnavailableError({
+			code: ErrorCode.CONTAINER_UNAVAILABLE,
+			message: "Container restarted while the default session was being initialized.",
+			context: {
+				reason: "container_restarted",
+				sessionId
+			},
+			httpStatus: 503,
+			timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+			suggestion: "The container restarted while the SDK was preparing the default session. Retry the operation to use the new container."
+		});
 		await this.ctx.storage.put("defaultSession", sessionId);
 		await this.capturePlacementId(placementId);
 		this.defaultSession = sessionId;
@@ -8207,5 +8266,5 @@ var Sandbox = class Sandbox extends Container {
 };
 
 //#endregion
-export { ProcessExitedBeforeReadyError as A, collectFile as C, BackupNotFoundError as D, BackupExpiredError as E, RPCTransportError as M, SessionTerminatedError as N, BackupRestoreError as O, validateTunnelName as S, BackupCreateError as T, proxyTerminal as _, BucketUnmountError as a, sanitizeSandboxId as b, S3FSMountError as c, responseToAsyncIterable as d, PREVIEW_PROXY_HEADER as f, PREVIEW_PROXY_TOKEN_HEADER as g, PREVIEW_PROXY_SANDBOX_ID_HEADER as h, BucketMountError as i, ProcessReadyTimeoutError as j, InvalidBackupConfigError as k, asyncIterableToSSEStream as l, PREVIEW_PROXY_PORT_HEADER as m, Sandbox as n, InvalidMountConfigError as o, PREVIEW_PROXY_HEADERS as p, getSandbox as r, MissingCredentialsError as s, ContainerProxy$1 as t, parseSSEStream as u, CodeInterpreter as v, streamFile as w, validatePort as x, SandboxSecurityError as y };
-//# sourceMappingURL=sandbox-B7ewRruX.js.map
+export { InvalidBackupConfigError as A, collectFile as C, BackupNotFoundError as D, BackupExpiredError as E, ProcessReadyTimeoutError as M, RPCTransportError as N, BackupRestoreError as O, SessionTerminatedError as P, validateTunnelName as S, BackupCreateError as T, proxyTerminal as _, BucketUnmountError as a, sanitizeSandboxId as b, S3FSMountError as c, responseToAsyncIterable as d, PREVIEW_PROXY_HEADER as f, PREVIEW_PROXY_TOKEN_HEADER as g, PREVIEW_PROXY_SANDBOX_ID_HEADER as h, BucketMountError as i, ProcessExitedBeforeReadyError as j, ContainerUnavailableError as k, asyncIterableToSSEStream as l, PREVIEW_PROXY_PORT_HEADER as m, Sandbox as n, InvalidMountConfigError as o, PREVIEW_PROXY_HEADERS as p, getSandbox as r, MissingCredentialsError as s, ContainerProxy$1 as t, parseSSEStream as u, CodeInterpreter as v, streamFile as w, validatePort as x, SandboxSecurityError as y };
+//# sourceMappingURL=sandbox-B-FLGbkP.js.map