@cloudflare/sandbox 0.9.3 → 0.9.4

package/dist/{sandbox-BAuU-2a0.js → sandbox-CdWjEUHl.js}

@@ -765,8 +765,8 @@ function createErrorFromResponse(errorResponse, options) {
 /**
 * Container startup retry configuration
 */
-const DEFAULT_RETRY_TIMEOUT_MS = 12e4;
-const MIN_TIME_FOR_RETRY_MS = 15e3;
+const DEFAULT_RETRY_TIMEOUT_MS$1 = 12e4;
+const MIN_TIME_FOR_RETRY_MS$1 = 15e3;
 /**
 * Abstract base transport with shared retry logic
 *
@@ -780,7 +780,7 @@ var BaseTransport = class {
 	constructor(config) {
 		this.config = config;
 		this.logger = config.logger ?? createNoOpLogger();
-		this.retryTimeoutMs = config.retryTimeoutMs ?? DEFAULT_RETRY_TIMEOUT_MS;
+		this.retryTimeoutMs = config.retryTimeoutMs ?? DEFAULT_RETRY_TIMEOUT_MS$1;
 	}
 	setRetryTimeoutMs(ms) {
 		this.retryTimeoutMs = ms;
@@ -802,7 +802,7 @@ var BaseTransport = class {
 			if (response.status === 503) {
 				const elapsed = Date.now() - startTime;
 				const remaining = this.retryTimeoutMs - elapsed;
-				if (remaining > MIN_TIME_FOR_RETRY_MS) {
+				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,
@@ -2756,6 +2756,9 @@ function normalizeBackupExcludePattern(pattern) {
 //#endregion
 //#region src/container-control/connection.ts
 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.
 *
@@ -2773,10 +2776,12 @@ var ContainerControlConnection = class {
 	containerStub;
 	port;
 	logger;
+	retryTimeoutMs;
 	constructor(options) {
 		this.containerStub = options.stub;
 		this.port = options.port ?? 3e3;
 		this.logger = options.logger ?? createNoOpLogger();
+		this.retryTimeoutMs = options.retryTimeoutMs ?? DEFAULT_RETRY_TIMEOUT_MS;
 		this.transport = new DeferredTransport();
 		this.session = new RpcSession(this.transport);
 		this.stub = this.session.getRemoteMain();
@@ -2826,20 +2831,17 @@ var ContainerControlConnection = class {
 		this.connected = false;
 		this.connectPromise = null;
 	}
+	/**
+	* Update the 503 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`.
+	*/
+	setRetryTimeoutMs(ms) {
+		this.retryTimeoutMs = ms;
+	}
 	async doConnect() {
-		const controller = new AbortController();
-		const timeout = setTimeout(() => controller.abort(), DEFAULT_CONNECT_TIMEOUT_MS);
 		try {
-			const url = `http://localhost:${this.port}/rpc`;
-			const request = new Request(url, {
-				headers: {
-					Upgrade: "websocket",
-					Connection: "Upgrade"
-				},
-				signal: controller.signal
-			});
-			const response = await this.containerStub.fetch(request);
-			clearTimeout(timeout);
+			const response = await this.fetchUpgradeWithRetry();
 			if (response.status !== 101) throw new Error(`WebSocket upgrade failed: ${response.status} ${response.statusText}`);
 			const ws = response.webSocket;
 			if (!ws) throw new Error("No WebSocket in upgrade response");
@@ -2858,13 +2860,63 @@ var ContainerControlConnection = class {
 			this.connected = true;
 			this.logger.debug("ContainerControlConnection established", { port: this.port });
 		} catch (error) {
-			clearTimeout(timeout);
 			this.connected = false;
 			this.transport.abort(error);
 			this.logger.error("ContainerControlConnection failed", error instanceof Error ? error : new Error(String(error)));
 			throw error;
 		}
 	}
+	/**
+	* 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.
+	*/
+	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++;
+		}
+	}
+	/**
+	* Single WebSocket-upgrade fetch attempt. Owns its own AbortController so
+	* each retry gets a fresh per-attempt connect timeout independent of the
+	* total retry budget.
+	*/
+	async fetchUpgradeAttempt() {
+		const controller = new AbortController();
+		const timeout = setTimeout(() => controller.abort(), DEFAULT_CONNECT_TIMEOUT_MS);
+		try {
+			const url = `http://localhost:${this.port}/rpc`;
+			const request = new Request(url, {
+				headers: {
+					Upgrade: "websocket",
+					Connection: "Upgrade"
+				},
+				signal: controller.signal
+			});
+			return await this.containerStub.fetch(request);
+		} finally {
+			clearTimeout(timeout);
+		}
+	}
+	sleep(ms) {
+		return new Promise((resolve) => setTimeout(resolve, ms));
+	}
 };
 /**
 * RPC transport that queues sends and blocks receives until a WebSocket
@@ -3093,7 +3145,8 @@ var ContainerControlClient = class {
 		this.connOptions = {
 			stub: options.stub,
 			port: options.port,
-			logger: options.logger
+			logger: options.logger,
+			retryTimeoutMs: options.retryTimeoutMs
 		};
 		this.idleDisconnectMs = options.idleDisconnectMs ?? DEFAULT_IDLE_DISCONNECT_MS;
 		this.busyPollIntervalMs = options.busyPollIntervalMs ?? BUSY_POLL_INTERVAL_MS;
@@ -3226,7 +3279,15 @@ var ContainerControlClient = class {
 	get interpreter() {
 		return wrapStub(this.getConnection().rpc().interpreter, this.renewActivity);
 	}
-	setRetryTimeoutMs(_ms) {}
+	/**
+	* Update the 503 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.
+	*/
+	setRetryTimeoutMs(ms) {
+		this.connOptions.retryTimeoutMs = ms;
+		this.conn?.setRetryTimeoutMs(ms);
+	}
 	getTransportMode() {
 		return "rpc";
 	}
@@ -4196,7 +4257,7 @@ function isLocalhostPattern(hostname) {
 * 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.9.3";
+const SDK_VERSION = "0.9.4";
 
 //#endregion
 //#region src/sandbox.ts
@@ -4528,6 +4589,7 @@ var Sandbox = class Sandbox extends Container {
 				stub: this,
 				port: 3e3,
 				logger: this.logger,
+				retryTimeoutMs: this.computeRetryTimeoutMs(),
 				onActivity: () => {
 					this.renewActivityTimeout();
 				},
@@ -7506,4 +7568,4 @@ var Sandbox = class Sandbox extends Container {
 
 //#endregion
 export { DesktopInvalidOptionsError as A, CommandClient as C, BackupNotFoundError as D, BackupExpiredError as E, InvalidBackupConfigError as F, ProcessExitedBeforeReadyError as I, ProcessReadyTimeoutError as L, DesktopProcessCrashedError as M, DesktopStartFailedError as N, BackupRestoreError as O, DesktopUnavailableError as P, RPCTransportError as R, DesktopClient as S, BackupCreateError as T, UtilityClient as _, BucketMountError as a, GitClient as b, MissingCredentialsError as c, parseSSEStream as d, responseToAsyncIterable as f, SandboxClient as g, streamFile as h, proxyTerminal as i, DesktopNotStartedError as j, DesktopInvalidCoordinatesError as k, S3FSMountError as l, collectFile as m, getSandbox as n, BucketUnmountError as o, CodeInterpreter as p, proxyToSandbox as r, InvalidMountConfigError as s, Sandbox as t, asyncIterableToSSEStream as u, ProcessClient as v, BackupClient as w, FileClient as x, PortClient as y, SessionTerminatedError as z };
-//# sourceMappingURL=sandbox-BAuU-2a0.js.map
+//# sourceMappingURL=sandbox-CdWjEUHl.js.map