@cloudflare/sandbox 0.8.0 → 0.8.1

package/dist/index.js

@@ -737,6 +737,9 @@ var BaseTransport = class {
 	setRetryTimeoutMs(ms) {
 		this.retryTimeoutMs = ms;
 	}
+	getRetryTimeoutMs() {
+		return this.retryTimeoutMs;
+	}
 	/**
 	* Fetch with automatic retry for 503 (container starting)
 	*
@@ -841,6 +844,7 @@ var HttpTransport = class extends BaseTransport {
 const DEFAULT_REQUEST_TIMEOUT_MS = 12e4;
 const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 3e5;
 const DEFAULT_CONNECT_TIMEOUT_MS = 3e4;
+const MIN_TIME_FOR_CONNECT_RETRY_MS = 15e3;
 /**
 * WebSocket transport implementation
 *
@@ -943,6 +947,26 @@ var WebSocketTransport = class extends BaseTransport {
 		if (this.config.stub) await this.connectViaFetch();
 		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++;
+		}
+	}
 	/**
 	* Connect using fetch-based WebSocket (Cloudflare Workers style)
 	* This is required when running inside a Durable Object.
@@ -952,20 +976,10 @@ var WebSocketTransport = class extends BaseTransport {
 	*/
 	async connectViaFetch() {
 		const timeoutMs = this.config.connectTimeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
-		const controller = new AbortController();
-		const timeout = setTimeout(() => controller.abort(), timeoutMs);
 		try {
 			const wsPath = new URL(this.config.wsUrl).pathname;
 			const httpUrl = `http://localhost:${this.config.port || 3e3}${wsPath}`;
-			const request = new Request(httpUrl, {
-				headers: {
-					Upgrade: "websocket",
-					Connection: "Upgrade"
-				},
-				signal: controller.signal
-			});
-			const response = await this.config.stub.fetch(request);
-			clearTimeout(timeout);
+			const response = await this.fetchUpgradeWithRetry(() => this.fetchUpgradeAttempt(httpUrl, timeoutMs));
 			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");
@@ -976,12 +990,27 @@ var WebSocketTransport = class extends BaseTransport {
 			this.ws.addEventListener("message", this.boundHandleMessage);
 			this.logger.debug("WebSocket connected via fetch", { url: this.config.wsUrl });
 		} catch (error) {
-			clearTimeout(timeout);
 			this.state = "error";
 			this.logger.error("WebSocket fetch connection failed", error instanceof Error ? error : new Error(String(error)));
 			throw error;
 		}
 	}
+	async fetchUpgradeAttempt(httpUrl, timeoutMs) {
+		const controller = new AbortController();
+		const timeout = setTimeout(() => controller.abort(), timeoutMs);
+		try {
+			const request = new Request(httpUrl, {
+				headers: {
+					Upgrade: "websocket",
+					Connection: "Upgrade"
+				},
+				signal: controller.signal
+			});
+			return await this.config.stub.fetch(request);
+		} finally {
+			clearTimeout(timeout);
+		}
+	}
 	/**
 	* Connect using standard WebSocket API (browser/Node style)
 	*/
@@ -3562,7 +3591,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.8.0";
+const SDK_VERSION = "0.8.1";
 
 //#endregion
 //#region src/sandbox.ts