@cloudflare/sandbox 0.8.0 → 0.8.2

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,8 @@ 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 DEFAULT_IDLE_DISCONNECT_MS = 1e3;
+const MIN_TIME_FOR_CONNECT_RETRY_MS = 15e3;
 /**
 * WebSocket transport implementation
 *
@@ -852,6 +857,7 @@ var WebSocketTransport = class extends BaseTransport {
 	state = "disconnected";
 	pendingRequests = /* @__PURE__ */ new Map();
 	connectPromise = null;
+	idleDisconnectTimer = null;
 	boundHandleMessage;
 	boundHandleClose;
 	constructor(config) {
@@ -876,6 +882,7 @@ var WebSocketTransport = class extends BaseTransport {
 	* callers share the same connection attempt.
 	*/
 	async connect() {
+		this.clearIdleDisconnectTimer();
 		if (this.isConnected()) return;
 		if (this.connectPromise) return this.connectPromise;
 		this.connectPromise = this.doConnect();
@@ -943,6 +950,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 +979,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 +993,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)
 	*/
@@ -1026,6 +1058,7 @@ var WebSocketTransport = class extends BaseTransport {
 	*/
 	async request(method, path$1, body, headers) {
 		await this.connect();
+		this.clearIdleDisconnectTimer();
 		const id = generateRequestId();
 		const request = {
 			type: "request",
@@ -1039,12 +1072,14 @@ var WebSocketTransport = class extends BaseTransport {
 			const timeoutMs = this.config.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
 			const timeoutId = setTimeout(() => {
 				this.pendingRequests.delete(id);
+				this.scheduleIdleDisconnect();
 				reject(/* @__PURE__ */ new Error(`Request timeout after ${timeoutMs}ms: ${method} ${path$1}`));
 			}, timeoutMs);
 			this.pendingRequests.set(id, {
 				resolve: (response) => {
 					clearTimeout(timeoutId);
 					this.pendingRequests.delete(id);
+					this.scheduleIdleDisconnect();
 					resolve({
 						status: response.status,
 						body: response.body
@@ -1053,6 +1088,7 @@ var WebSocketTransport = class extends BaseTransport {
 				reject: (error) => {
 					clearTimeout(timeoutId);
 					this.pendingRequests.delete(id);
+					this.scheduleIdleDisconnect();
 					reject(error);
 				},
 				isStreaming: false,
@@ -1063,6 +1099,7 @@ var WebSocketTransport = class extends BaseTransport {
 			} catch (error) {
 				clearTimeout(timeoutId);
 				this.pendingRequests.delete(id);
+				this.scheduleIdleDisconnect();
 				reject(error instanceof Error ? error : new Error(String(error)));
 			}
 		});
@@ -1083,6 +1120,7 @@ var WebSocketTransport = class extends BaseTransport {
 	*/
 	async requestStream(method, path$1, body, headers) {
 		await this.connect();
+		this.clearIdleDisconnectTimer();
 		const id = generateRequestId();
 		const request = {
 			type: "request",
@@ -1099,6 +1137,7 @@ var WebSocketTransport = class extends BaseTransport {
 			const createIdleTimeout = () => {
 				return setTimeout(() => {
 					this.pendingRequests.delete(id);
+					this.scheduleIdleDisconnect();
 					const error = /* @__PURE__ */ new Error(`Stream idle timeout after ${idleTimeoutMs}ms: ${method} ${path$1}`);
 					if (firstMessageReceived) try {
 						streamController?.error(error);
@@ -1126,6 +1165,7 @@ var WebSocketTransport = class extends BaseTransport {
 						});
 					}
 					this.pendingRequests.delete(id);
+					this.scheduleIdleDisconnect();
 				}
 			});
 			this.pendingRequests.set(id, {
@@ -1133,6 +1173,7 @@ var WebSocketTransport = class extends BaseTransport {
 					const pending = this.pendingRequests.get(id);
 					if (pending?.timeoutId) clearTimeout(pending.timeoutId);
 					this.pendingRequests.delete(id);
+					this.scheduleIdleDisconnect();
 					if (!firstMessageReceived) {
 						firstMessageReceived = true;
 						if (response.status >= 400) rejectStream(/* @__PURE__ */ new Error(`Stream error: ${response.status} - ${JSON.stringify(response.body)}`));
@@ -1149,6 +1190,7 @@ var WebSocketTransport = class extends BaseTransport {
 					const pending = this.pendingRequests.get(id);
 					if (pending?.timeoutId) clearTimeout(pending.timeoutId);
 					this.pendingRequests.delete(id);
+					this.scheduleIdleDisconnect();
 					if (firstMessageReceived) try {
 						streamController?.error(error);
 					} catch {}
@@ -1173,6 +1215,7 @@ var WebSocketTransport = class extends BaseTransport {
 									});
 									if (pending.timeoutId) clearTimeout(pending.timeoutId);
 									this.pendingRequests.delete(id);
+									this.scheduleIdleDisconnect();
 								}
 								pending.bufferedChunks = void 0;
 							}
@@ -1186,6 +1229,7 @@ var WebSocketTransport = class extends BaseTransport {
 			} catch (error) {
 				clearTimeout(timeoutId);
 				this.pendingRequests.delete(id);
+				this.scheduleIdleDisconnect();
 				rejectStream(error instanceof Error ? error : new Error(String(error)));
 			}
 		});
@@ -1272,6 +1316,7 @@ var WebSocketTransport = class extends BaseTransport {
 			});
 			if (pending.timeoutId) clearTimeout(pending.timeoutId);
 			this.pendingRequests.delete(chunk.id);
+			this.scheduleIdleDisconnect();
 		}
 	}
 	/**
@@ -1283,6 +1328,7 @@ var WebSocketTransport = class extends BaseTransport {
 		const idleTimeoutMs = this.config.streamIdleTimeoutMs ?? DEFAULT_STREAM_IDLE_TIMEOUT_MS;
 		pending.timeoutId = setTimeout(() => {
 			this.pendingRequests.delete(id);
+			this.scheduleIdleDisconnect();
 			if (pending.streamController) try {
 				pending.streamController.error(/* @__PURE__ */ new Error(`Stream idle timeout after ${idleTimeoutMs}ms`));
 			} catch {}
@@ -1325,6 +1371,7 @@ var WebSocketTransport = class extends BaseTransport {
 	* Cleanup resources
 	*/
 	cleanup() {
+		this.clearIdleDisconnectTimer();
 		if (this.ws) {
 			this.ws.removeEventListener("close", this.boundHandleClose);
 			this.ws.removeEventListener("message", this.boundHandleMessage);
@@ -1336,6 +1383,23 @@ var WebSocketTransport = class extends BaseTransport {
 		for (const pending of this.pendingRequests.values()) if (pending.timeoutId) clearTimeout(pending.timeoutId);
 		this.pendingRequests.clear();
 	}
+	scheduleIdleDisconnect() {
+		if (!this.isConnected() || this.pendingRequests.size > 0) return;
+		this.clearIdleDisconnectTimer();
+		this.idleDisconnectTimer = setTimeout(() => {
+			this.idleDisconnectTimer = null;
+			if (this.pendingRequests.size === 0 && this.isConnected()) {
+				this.logger.debug("Disconnecting idle WebSocket transport");
+				this.cleanup();
+			}
+		}, DEFAULT_IDLE_DISCONNECT_MS);
+	}
+	clearIdleDisconnectTimer() {
+		if (this.idleDisconnectTimer) {
+			clearTimeout(this.idleDisconnectTimer);
+			this.idleDisconnectTimer = null;
+		}
+	}
 };
 
 //#endregion
@@ -3562,7 +3626,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.2";
 
 //#endregion
 //#region src/sandbox.ts