@cloudflare/sandbox 0.12.0 → 0.12.1

package/dist/{sandbox-Duj2gvUC.js → sandbox-DKG3H156.js}

@@ -719,6 +719,53 @@ function createErrorFromResponse(errorResponse, options) {
 	}
 }
 
+//#endregion
+//#region src/response-retry.ts
+const DEFAULT_INITIAL_RETRY_DELAY_MS = 3e3;
+const DEFAULT_MAX_RETRY_DELAY_MS = 3e4;
+const RETRYABLE_WEBSOCKET_UPGRADE_STATUSES = new Set([
+	500,
+	502,
+	503,
+	504
+]);
+function isRetryableWebSocketUpgradeResponse(response) {
+	return RETRYABLE_WEBSOCKET_UPGRADE_STATUSES.has(response.status);
+}
+/**
+* Retry Response-returning operations while their response remains retryable.
+* The retry budget covers the whole operation; each attempt owns any
+* per-request timeout inside the caller-provided `fetchResponse` function.
+*/
+async function fetchWithResponseRetry(fetchResponse, options) {
+	const startTime = Date.now();
+	let attempt = 0;
+	while (true) {
+		const response = await fetchResponse();
+		if (!options.shouldRetry(response)) return response;
+		const elapsed = Date.now() - startTime;
+		const remaining = options.retryTimeoutMs - elapsed;
+		if (remaining <= options.minTimeForRetryMs) {
+			options.onRetryExhausted?.({
+				attempts: attempt + 1,
+				elapsedMs: elapsed,
+				response
+			});
+			return response;
+		}
+		const delay = Math.min(DEFAULT_INITIAL_RETRY_DELAY_MS * 2 ** attempt, DEFAULT_MAX_RETRY_DELAY_MS);
+		options.logger.info(options.retryLogMessage, {
+			status: response.status,
+			attempt: attempt + 1,
+			delayMs: delay,
+			remainingSec: Math.floor(remaining / 1e3),
+			...options.getRetryLogContext?.(response)
+		});
+		await new Promise((resolve) => setTimeout(resolve, delay));
+		attempt++;
+	}
+}
+
 //#endregion
 //#region src/clients/transport/base-transport.ts
 /**
@@ -754,30 +801,17 @@ var BaseTransport = class {
 	* transport-specific doFetch() with retry logic for container startup.
 	*/
 	async fetch(path$1, options) {
-		const startTime = Date.now();
-		let attempt = 0;
-		while (true) {
-			const response = await this.doFetch(path$1, options);
-			if (response.status === 503) {
-				const elapsed = Date.now() - startTime;
-				const remaining = this.retryTimeoutMs - elapsed;
-				if (remaining > MIN_TIME_FOR_RETRY_MS$1) {
-					const delay = Math.min(3e3 * 2 ** attempt, 3e4);
-					this.logger.info("Container not ready, retrying", {
-						status: response.status,
-						attempt: attempt + 1,
-						delayMs: delay,
-						remainingSec: Math.floor(remaining / 1e3),
-						mode: this.getMode()
-					});
-					await this.sleep(delay);
-					attempt++;
-					continue;
-				}
-				this.logger.error("Container failed to become ready", /* @__PURE__ */ new Error(`Failed after ${attempt + 1} attempts over ${Math.floor(elapsed / 1e3)}s`));
+		return fetchWithResponseRetry(() => this.doFetch(path$1, options), {
+			retryTimeoutMs: this.retryTimeoutMs,
+			minTimeForRetryMs: MIN_TIME_FOR_RETRY_MS$1,
+			logger: this.logger,
+			retryLogMessage: "Container not ready, retrying",
+			shouldRetry: (response) => response.status === 503,
+			getRetryLogContext: () => ({ mode: this.getMode() }),
+			onRetryExhausted: ({ attempts, elapsedMs }) => {
+				this.logger.error("Container failed to become ready", /* @__PURE__ */ new Error(`Failed after ${attempts} attempts over ${Math.floor(elapsedMs / 1e3)}s`));
 			}
-			return response;
-		}
+		});
 	}
 	/**
 	* Build a URL targeting the container's HTTP server.
@@ -817,12 +851,6 @@ var BaseTransport = class {
 		if (!response.body) throw new Error("No response body for streaming");
 		return response.body;
 	}
-	/**
-	* Sleep utility for retry delays
-	*/
-	sleep(ms) {
-		return new Promise((resolve) => setTimeout(resolve, ms));
-	}
 };
 
 //#endregion
@@ -991,24 +1019,13 @@ var WebSocketTransport = class extends BaseTransport {
 		else await this.connectViaWebSocket();
 	}
 	async fetchUpgradeWithRetry(attemptUpgrade) {
-		const retryTimeoutMs = this.getRetryTimeoutMs();
-		const startTime = Date.now();
-		let attempt = 0;
-		while (true) {
-			const response = await attemptUpgrade();
-			if (response.status !== 503) return response;
-			const remaining = retryTimeoutMs - (Date.now() - startTime);
-			if (remaining <= MIN_TIME_FOR_CONNECT_RETRY_MS) return response;
-			const delay = Math.min(3e3 * 2 ** attempt, 3e4);
-			this.logger.info("WebSocket container not ready, retrying", {
-				status: response.status,
-				attempt: attempt + 1,
-				delayMs: delay,
-				remainingSec: Math.floor(remaining / 1e3)
-			});
-			await this.sleep(delay);
-			attempt++;
-		}
+		return fetchWithResponseRetry(attemptUpgrade, {
+			retryTimeoutMs: this.getRetryTimeoutMs(),
+			minTimeForRetryMs: MIN_TIME_FOR_CONNECT_RETRY_MS,
+			logger: this.logger,
+			retryLogMessage: "WebSocket upgrade returned retryable status, retrying",
+			shouldRetry: isRetryableWebSocketUpgradeResponse
+		});
 	}
 	/**
 	* Connect using fetch-based WebSocket (Cloudflare Workers style)
@@ -2377,7 +2394,7 @@ var SandboxClient = class {
 		this.watch = new WatchClient(clientOptions);
 	}
 	/**
-	* Update the 503 retry budget on all transports without recreating the client.
+	* Update the transport retry budget without recreating the client.
 	*
 	* In WebSocket mode a single shared transport is used, so one update covers
 	* every sub-client. In HTTP mode each sub-client owns its own transport, so
@@ -2464,7 +2481,6 @@ const DISABLE_SESSION_TOKEN = "__DISABLE_SESSION__";
 const DEFAULT_CONNECT_TIMEOUT_MS = 3e4;
 const DEFAULT_RETRY_TIMEOUT_MS = 12e4;
 const MIN_TIME_FOR_RETRY_MS = 15e3;
-const MAX_RETRY_BACKOFF_MS = 3e4;
 /**
 * Manages a capnweb WebSocket RPC session to the container.
 *
@@ -2542,7 +2558,7 @@ var ContainerControlConnection = class {
 		this.connectPromise = null;
 	}
 	/**
-	* Update the 503 retry budget without recreating the connection. Takes
+	* Update the upgrade retry budget without recreating the connection. Takes
 	* effect on the next `connect()`; an in-flight connect uses the value
 	* captured at start. Mirrors `WebSocketTransport.setRetryTimeoutMs`.
 	*/
@@ -2606,30 +2622,18 @@ var ContainerControlConnection = class {
 		}
 	}
 	/**
-	* Issue WebSocket upgrade fetches, retrying transient 503 responses with
-	* exponential backoff (3s → 6s → 12s → … capped at 30s) until either
-	* the upgrade succeeds, a non-503 status is returned, or the retry budget
-	* runs out. Mirrors `WebSocketTransport.fetchUpgradeWithRetry` so both
-	* transports behave the same way during container startup.
+	* Issue WebSocket upgrade fetches, retrying transient control-plane
+	* unavailability responses until either the upgrade succeeds, a
+	* non-retryable status is returned, or the retry budget runs out.
 	*/
 	async fetchUpgradeWithRetry() {
-		const retryTimeoutMs = this.retryTimeoutMs;
-		const startTime = Date.now();
-		let attempt = 0;
-		while (true) {
-			const response = await this.fetchUpgradeAttempt();
-			if (response.status !== 503) return response;
-			const remaining = retryTimeoutMs - (Date.now() - startTime);
-			if (remaining <= MIN_TIME_FOR_RETRY_MS) return response;
-			const delay = Math.min(3e3 * 2 ** attempt, MAX_RETRY_BACKOFF_MS);
-			this.logger.info("ContainerControlConnection upgrade returned 503, retrying", {
-				attempt: attempt + 1,
-				delayMs: delay,
-				remainingSec: Math.floor(remaining / 1e3)
-			});
-			await this.sleep(delay);
-			attempt++;
-		}
+		return fetchWithResponseRetry(() => this.fetchUpgradeAttempt(), {
+			retryTimeoutMs: this.retryTimeoutMs,
+			minTimeForRetryMs: MIN_TIME_FOR_RETRY_MS,
+			logger: this.logger,
+			retryLogMessage: "ContainerControlConnection upgrade returned retryable status, retrying",
+			shouldRetry: isRetryableWebSocketUpgradeResponse
+		});
 	}
 	/**
 	* Single WebSocket-upgrade fetch attempt. Owns its own AbortController so
@@ -2653,9 +2657,6 @@ var ContainerControlConnection = class {
 			clearTimeout(timeout);
 		}
 	}
-	sleep(ms) {
-		return new Promise((resolve) => setTimeout(resolve, ms));
-	}
 };
 /**
 * RPC transport that queues sends and blocks receives until a WebSocket
@@ -3032,7 +3033,7 @@ var ContainerControlClient = class {
 		return wrapStub(this.getConnection().rpc().interpreter, this.renewActivity);
 	}
 	/**
-	* Update the 503 upgrade-retry budget. Applies to the current connection
+	* Update the upgrade retry budget. Applies to the current connection
 	* (if any) and is remembered for any future connections created after the
 	* client is torn down and reconnected.
 	*/
@@ -5833,7 +5834,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.12.0";
+const SDK_VERSION = "0.12.1";
 
 //#endregion
 //#region src/sandbox.ts
@@ -9984,4 +9985,4 @@ var Sandbox = class Sandbox extends Container {
 
 //#endregion
 export { FileClient as A, RPCTransportError as B, collectFile as C, ProcessClient as D, UtilityClient as E, BackupNotFoundError as F, BackupRestoreError as I, InvalidBackupConfigError as L, BackupClient as M, BackupCreateError as N, PortClient as O, BackupExpiredError as P, ProcessExitedBeforeReadyError as R, validateTunnelName as S, SandboxClient as T, SessionTerminatedError as V, responseToAsyncIterable as _, PREVIEW_PROXY_HEADER as a, sanitizeSandboxId as b, PREVIEW_PROXY_SANDBOX_ID_HEADER as c, BucketUnmountError as d, InvalidMountConfigError as f, parseSSEStream as g, asyncIterableToSSEStream as h, proxyTerminal as i, CommandClient as j, GitClient as k, PREVIEW_PROXY_TOKEN_HEADER as l, S3FSMountError as m, Sandbox as n, PREVIEW_PROXY_HEADERS as o, MissingCredentialsError as p, getSandbox as r, PREVIEW_PROXY_PORT_HEADER as s, ContainerProxy$1 as t, BucketMountError as u, CodeInterpreter as v, streamFile as w, validatePort as x, SandboxSecurityError as y, ProcessReadyTimeoutError as z };
-//# sourceMappingURL=sandbox-Duj2gvUC.js.map
+//# sourceMappingURL=sandbox-DKG3H156.js.map