@cloudflare/sandbox 0.13.0-next.788.1 → 0.13.0-next.802.1

package/dist/{sandbox-pJ4JSnDx.js → sandbox-CaesWCLh.js}

@@ -1,7 +1,7 @@
-import { i as ErrorCode, n as getSuggestion, r as getHttpStatus } from "./errors-CXR0xBpw.js";
-import { $ as TerminalControlError, G as BackupRestoreError, H as BackupCreateError, Q as StaleTerminalHandleError, U as BackupExpiredError, W as BackupNotFoundError, X as OperationInterruptedError, Z as RPCTransportError, _ as StaleProcessHandleError, n as RuntimeIdentityInactiveError, p as ProcessNotFoundError, q as InvalidBackupConfigError, r as RuntimeControlProtocolError, t as createErrorFromResponse, tt as SandboxError, v as CustomDomainRequiredError } from "./errors-QYlSkVGz.js";
+import { i as ErrorCode, n as getSuggestion, r as getHttpStatus } from "./errors-Bb3s6nBS.js";
+import { $ as TerminalControlError, G as BackupRestoreError, H as BackupCreateError, Q as StaleTerminalHandleError, U as BackupExpiredError, W as BackupNotFoundError, X as OperationInterruptedError, Z as RPCTransportError, _ as StaleProcessHandleError, n as RuntimeIdentityInactiveError, p as ProcessNotFoundError, q as InvalidBackupConfigError, r as RuntimeControlProtocolError, t as createErrorFromResponse, tt as SandboxError, v as CustomDomainRequiredError } from "./errors--yR3zLC_.js";
 import { a as TraceContext, d as partitionEnvVars, i as createNoOpLogger, o as logCanonicalEvent, r as createLogger, t as parseSSEFrames, u as getEnvString } from "./dist-n_eniPAR.js";
-import { a as PullSubscriptionTarget, i as createSandboxProcess, o as openRemoteSubscription, r as sandboxRuntimeCall, s as translateRPCError, t as SandboxExtension } from "./extensions-Be5HnDGt.js";
+import { a as PullSubscriptionTarget, i as createSandboxProcess, o as openRemoteSubscription, r as sandboxRuntimeCall, s as translateRPCError, t as SandboxExtension } from "./extensions-BKL2zqL4.js";
 import { Container, ContainerProxy, getContainer, switchPort } from "@cloudflare/containers";
 import { RpcTarget } from "cloudflare:workers";
 import { AwsClient } from "aws4fetch";
@@ -161,6 +161,19 @@ function isDurableObjectCodeUpdateReset(error) {
 	return false;
 }
 /**
+* Whether an error was raised because the Durable Object itself was reset, by
+* a code update or a storage startup failure, rather than by the operation
+* that observed it.
+*/
+function isDurableObjectReset(error) {
+	for (const candidate of selfAndCauses(error)) {
+		const message = errorMessageOf(candidate);
+		if (SUPERSEDED_ISOLATE_PATTERN.test(message)) return true;
+		if (DO_STORAGE_STARTUP_RESET_PATTERN.test(message)) return true;
+	}
+	return false;
+}
+/**
 * Whether an error represents a transient platform lifecycle/storage failure,
 * not an application-level sandbox failure.
 */
@@ -2516,11 +2529,6 @@ async function mountR2EgressBucket(context, bucket, mountPath, options) {
 		const lifecycle = await context.lifecycle.capture(context.runtime);
 		passwordFilePath = generatePasswordFilePath();
 		additionalHeaderFilePath = generateS3FSAdditionalHeaderFilePath();
-		await createPasswordFile(context.s3fsHost, passwordFilePath, bucket, {
-			accessKeyId: "x",
-			secretAccessKey: "x"
-		});
-		await createDisableExpectHeaderFile(context.s3fsHost, additionalHeaderFilePath);
 		mountInfo = {
 			mountId: crypto.randomUUID(),
 			mountType: "r2-egress",
@@ -2532,14 +2540,21 @@ async function mountR2EgressBucket(context, bucket, mountPath, options) {
 			prefix,
 			readOnly: options.readOnly ?? false
 		};
-		await configureR2EgressOutbound(context.getOutboundHost(), { buckets: {
-			...buildR2EgressParams(context.registry).buckets,
-			[bucket]: {
-				prefix,
-				readOnly: options.readOnly ?? false
-			}
-		} });
-		await context.runRuntimeCall("mount.ensureDirectory", (control) => control.mounts.ensureDirectory(mountPath));
+		await allOrFirstError([
+			createPasswordFile(context.s3fsHost, passwordFilePath, bucket, {
+				accessKeyId: "x",
+				secretAccessKey: "x"
+			}),
+			createDisableExpectHeaderFile(context.s3fsHost, additionalHeaderFilePath),
+			configureR2EgressOutbound(context.getOutboundHost(), { buckets: {
+				...buildR2EgressParams(context.registry).buckets,
+				[bucket]: {
+					prefix,
+					readOnly: options.readOnly ?? false
+				}
+			} }),
+			context.runRuntimeCall("mount.ensureDirectory", (control) => control.mounts.ensureDirectory(mountPath))
+		]);
 		s3fsStarted = true;
 		await executeS3FSMount(context.s3fsHost, {
 			bucket,
@@ -2603,6 +2618,14 @@ async function mountR2EgressBucket(context, bucket, mountPath, options) {
 		});
 	}
 }
+/**
+* Like `Promise.all`, but waits for every step to settle before rejecting, so
+* cleanup never runs while a support-file write or route update is in flight.
+*/
+async function allOrFirstError(steps) {
+	const failure = (await Promise.allSettled(steps)).find((result) => result.status === "rejected");
+	if (failure) throw failure.reason;
+}
 
 //#endregion
 //#region src/storage-mount/validation/credentials.ts
@@ -4601,8 +4624,13 @@ async function forwardPreviewRequest(tcpPort, request, lease) {
 		};
 	} catch (error) {
 		release();
+		if (interruptedError) throw interruptedError;
+		if (isDurableObjectReset(error)) throw error;
 		if (error instanceof Error && error.message.includes("Network connection lost.")) return { status: "network-lost" };
-		throw error;
+		return {
+			status: "failed",
+			error
+		};
 	}
 }
 function retainPreviewBody(body, release, bindInterrupt) {
@@ -4754,10 +4782,6 @@ function buildPreviewProxyRequest(request, { port, sandboxId, sandboxName }) {
 	headers.set("X-Forwarded-Host", url.hostname);
 	headers.set("X-Forwarded-Proto", url.protocol.replace(":", ""));
 	headers.set("X-Sandbox-Name", sandboxName ?? sandboxId);
-	if (request.headers.get("Upgrade")?.toLowerCase() === "websocket") return new Request(request, {
-		headers,
-		redirect: "manual"
-	});
 	return new Request(proxyURL, {
 		method: request.method,
 		headers,
@@ -5091,6 +5115,13 @@ var PreviewService = class {
 		if (!container?.running) return this.stalePreviewURLResponse();
 		const result = await forwardPreviewRequest(container.getTcpPort(port), request, lease);
 		if (result.status === "network-lost") return this.stalePreviewURLResponse();
+		if (result.status === "failed") {
+			this.deps.logger.error("Preview request to container port failed", result.error instanceof Error ? result.error : new Error(String(result.error)), {
+				port,
+				method: request.method
+			});
+			return new Response(`Could not reach port ${port} in the container`, { status: 502 });
+		}
 		return result.response;
 	}
 	async validatePreviewURLForRuntime(port, token) {
@@ -7589,6 +7620,22 @@ function randomId(size = 20) {
 function createQuickTunnelId() {
 	return `quick-${randomId()}`;
 }
+/**
+* The run holding `request.port` when the container rejected `request`
+* with a port conflict, or `null` when the conflict does not name both
+* the active run and its tunnel, which `stopTunnelRun` needs.
+*/
+function conflictingRunOnPort(error, request) {
+	const e = error;
+	if (e?.code !== "TUNNEL_RUN_CONFLICT") return null;
+	const runId = e.context?.activeRunId;
+	const tunnelId = e.context?.activeTunnelId;
+	if (e.context?.port !== request.port || typeof runId !== "string" || typeof tunnelId !== "string" || runId === request.runId) return null;
+	return {
+		tunnelId,
+		runId
+	};
+}
 var TunnelProvisioner = class {
 	#host;
 	#zoneNamePromise = null;
@@ -7596,7 +7643,7 @@ var TunnelProvisioner = class {
 		this.#host = host;
 	}
 	async provisionQuickTunnel(tunnels, port, tunnelRunId, tunnelId = createQuickTunnelId()) {
-		const result = await this.#ensureTunnelRun(tunnels, {
+		const result = await this.#ensureQuickTunnelRun(tunnels, {
 			mode: "quick",
 			tunnelId,
 			runId: tunnelRunId,
@@ -7712,6 +7759,26 @@ var TunnelProvisioner = class {
 	async #ensureTunnelRun(tunnels, request) {
 		return await tunnels.ensureTunnelRun(request);
 	}
+	/**
+	* Start a quick tunnel run. The Durable Object owns every tunnel run in
+	* its container and holds the port lock, so a different run already on
+	* the port lost its storage record. Stop it and retry once instead of
+	* failing every later `get()` for the port.
+	*/
+	async #ensureQuickTunnelRun(tunnels, request) {
+		try {
+			return await this.#ensureTunnelRun(tunnels, request);
+		} catch (error) {
+			const orphan = conflictingRunOnPort(error, request);
+			if (!orphan) throw error;
+			this.#host.logger?.warn("tunnel.get: stopping orphaned run on port", {
+				port: request.port,
+				...orphan
+			});
+			await tunnels.stopTunnelRun(orphan);
+			return await this.#ensureTunnelRun(tunnels, request);
+		}
+	}
 	async #getZoneName(config) {
 		if (!this.#zoneNamePromise) {
 			const pending = getZoneName({
@@ -7944,13 +8011,37 @@ var TunnelService = class {
 				await this.#assertSandboxLifetime(lifetime, "committing");
 				return spawned;
 			} catch (error) {
-				if (committedInfo) await this.#invalidateCommittedPortIfUnchanged(port, committedInfo, lease.runtime, runId);
+				try {
+					if (committedInfo) await this.#invalidateCommittedPortIfUnchanged(port, committedInfo, lease.runtime, runId);
+				} finally {
+					await this.#stopAbandonedQuickRun(lease.tunnels, port, {
+						tunnelId,
+						runId
+					});
+				}
 				throw error;
 			} finally {
 				hold.release();
 			}
 		});
 	}
+	/**
+	* Stop a quick tunnel run that provisioning is giving up on, so its
+	* cloudflared does not keep holding the port without a stored record.
+	* Best effort: the run may never have started, or may have died with a
+	* replaced runtime.
+	*/
+	async #stopAbandonedQuickRun(tunnels, port, run) {
+		try {
+			await tunnels.stopTunnelRun(run);
+		} catch (error) {
+			this.#host.logger.warn("tunnel.get: abandoned run cleanup failed", {
+				port,
+				...run,
+				error: error instanceof Error ? error.message : String(error)
+			});
+		}
+	}
 	async #provisionNamedTunnel(port, name) {
 		const lifetime = await this.#host.currentLifetime?.getOrCreate();
 		return await this.#host.runProvision(async (lease) => {
@@ -10111,4 +10202,4 @@ var Sandbox = class extends Container {
 
 //#endregion
 export { proxyTerminal as _, responseToAsyncIterable as a, collectFile as b, BucketUnmountError as c, S3FSMountError as d, parsePreviewRoute as f, validateTunnelName as g, validatePort as h, parseSSEStream as i, InvalidMountConfigError as l, SandboxSecurityError as m, getSandbox as n, ContainerProxy$1 as o, withPreviewProxyMetadata as p, asyncIterableToSSEStream as r, BucketMountError as s, Sandbox as t, MissingCredentialsError as u, isDurableObjectCodeUpdateReset as v, streamFile as x, isPlatformTransientError as y };
-//# sourceMappingURL=sandbox-pJ4JSnDx.js.map
+//# sourceMappingURL=sandbox-CaesWCLh.js.map