@cloudflare/sandbox 0.10.3 → 0.12.0

package/Dockerfile

@@ -284,61 +284,6 @@ EXPOSE 4096
 
 ENTRYPOINT ["/container-server/sandbox"]
 
-# ============================================================================
-# Desktop variant — full Linux desktop with robotgo native control
-# ============================================================================
-FROM golang:1.25-bookworm AS go-builder
-
-RUN mkdir -p /usr/local/share/ca-certificates
-RUN --mount=type=secret,id=wrangler_ca \
-    apt-get update && apt-get install -y --no-install-recommends ca-certificates && \
-    if [ -f /run/secrets/wrangler_ca ] && [ -s /run/secrets/wrangler_ca ]; then \
-        cp /run/secrets/wrangler_ca /usr/local/share/ca-certificates/wrangler-dev-ca.crt; \
-    fi && \
-    update-ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    gcc libx11-dev libxtst-dev libxinerama-dev libpng-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY packages/sandbox-container/native/desktop-wrapper/ /build/
-WORKDIR /build
-RUN go mod tidy && go build -buildmode=c-shared -o /usr/lib/desktop.so .
-
-FROM runtime-base AS desktop
-
-# Install display stack
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    rm -f /etc/apt/apt.conf.d/docker-clean && \
-    echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache && \
-    apt-get update && apt-get install -y --no-install-recommends \
-    xvfb x11vnc novnc websockify \
-    xfce4 xfce4-terminal dbus-x11 \
-    libx11-6 libxrandr2 libxext6 libxrender1 libxfixes3 \
-    libxss1 libxtst6 libxi6 libxinerama1 \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY --from=go-builder /usr/lib/desktop.so /usr/lib/desktop.so
-COPY --from=go-builder /usr/lib/desktop.h /usr/lib/desktop.h
-
-COPY --from=builder /app/packages/sandbox-container/dist/sandbox /container-server/sandbox
-COPY --from=builder /app/packages/sandbox-container/dist/workers/ /container-server/workers/
-
-# Install koffi for FFI worker thread
-WORKDIR /container-server
-RUN npm init -y && npm install koffi
-
-EXPOSE 6080
-
-ENV DISPLAY=:99
-ENV PYTHON_POOL_MIN_SIZE=0
-ENV JAVASCRIPT_POOL_MIN_SIZE=0
-ENV TYPESCRIPT_POOL_MIN_SIZE=0
-
-ENTRYPOINT ["/container-server/sandbox"]
-
 # ============================================================================
 # Stage 5d: Musl image - Alpine-based with musl-linked binary
 # ============================================================================

package/dist/bridge/index.js

@@ -1,6 +1,6 @@
 import "../dist-B_eXrP83.js";
-import "../errors-8Hvune8K.js";
-import { h as streamFile, n as getSandbox } from "../sandbox-B-MUmsli.js";
+import "../errors-aRUdk9K8.js";
+import { S as validateTunnelName, r as getSandbox, w as streamFile, x as validatePort, y as SandboxSecurityError } from "../sandbox-Duj2gvUC.js";
 import { DurableObject, env } from "cloudflare:workers";
 import { Hono } from "hono";
 
@@ -228,6 +228,11 @@ const OPENAPI_SCHEMA = {
 						$ref: "#/components/schemas/MountBucketCredentials",
 						description: "Explicit credentials. When omitted, the SDK auto-detects from Worker secrets (R2_ACCESS_KEY_ID / R2_SECRET_ACCESS_KEY or AWS equivalents)."
 					},
+					credentialProxy: {
+						type: "boolean",
+						description: "Keep credentials in the Durable Object and sign intercepted s3fs requests from the Worker. Credentials may be explicit or auto-detected from Worker secrets.",
+						default: false
+					},
 					s3fsOptions: {
 						type: "array",
 						items: { type: "string" },
@@ -267,6 +272,50 @@ const OPENAPI_SCHEMA = {
 					example: "/mnt/data"
 				} }
 			},
+			TunnelRequest: {
+				type: "object",
+				properties: { name: {
+					type: "string",
+					description: "Subdomain prefix for a named tunnel, such as `app`. Do not pass a full hostname. Omit to create or reuse an ephemeral tunnel.",
+					example: "app"
+				} }
+			},
+			Tunnel: {
+				type: "object",
+				required: [
+					"id",
+					"port",
+					"url",
+					"hostname",
+					"createdAt"
+				],
+				properties: {
+					id: { type: "string" },
+					port: {
+						type: "integer",
+						description: "Container port served by the tunnel.",
+						example: 8080
+					},
+					url: {
+						type: "string",
+						format: "uri",
+						example: "https://app.example.com"
+					},
+					hostname: {
+						type: "string",
+						example: "app.example.com"
+					},
+					createdAt: {
+						type: "string",
+						format: "date-time"
+					},
+					name: {
+						type: "string",
+						description: "Present for named tunnels only.",
+						example: "app"
+					}
+				}
+			},
 			ErrorResponse: {
 				type: "object",
 				required: ["error", "code"],
@@ -290,7 +339,8 @@ const OPENAPI_SCHEMA = {
 							"pool_error",
 							"mount_error",
 							"unmount_error",
-							"session_error"
+							"session_error",
+							"tunnel_error"
 						]
 					}
 				}
@@ -439,6 +489,103 @@ const OPENAPI_SCHEMA = {
 				}
 			}
 		} },
+		"/v1/sandbox/{id}/tunnel/{port}": {
+			post: {
+				operationId: "createTunnel",
+				summary: "Create or reuse a tunnel for a sandbox port",
+				description: "Returns an existing tunnel for the port when one is already recorded, or provisions one when needed. The service must already be listening inside the sandbox. Omit `name` for an ephemeral `*.trycloudflare.com` tunnel, or pass `name` to choose the subdomain prefix for a named tunnel. Use a value such as `app`, not a full hostname.",
+				"x-codeSamples": [{
+					lang: "curl",
+					label: "Ephemeral tunnel",
+					source: "curl -X POST https://$HOST/v1/sandbox/my-sandbox/tunnel/8080 \\\n  -H \"Authorization: Bearer $SANDBOX_API_KEY\""
+				}, {
+					lang: "curl",
+					label: "Named tunnel",
+					source: "curl -X POST https://$HOST/v1/sandbox/my-sandbox/tunnel/8080 \\\n  -H \"Authorization: Bearer $SANDBOX_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"name\":\"app\"}'"
+				}],
+				parameters: [{
+					name: "id",
+					in: "path",
+					required: true,
+					schema: { type: "string" },
+					description: "Sandbox instance name."
+				}, {
+					name: "port",
+					in: "path",
+					required: true,
+					schema: {
+						type: "integer",
+						minimum: 1024,
+						maximum: 65535
+					},
+					description: "Container port to tunnel. Port 3000 is reserved."
+				}],
+				requestBody: {
+					required: false,
+					content: { "application/json": { schema: { $ref: "#/components/schemas/TunnelRequest" } } }
+				},
+				responses: {
+					"200": {
+						description: "Tunnel created or reused.",
+						content: { "application/json": { schema: { $ref: "#/components/schemas/Tunnel" } } }
+					},
+					"400": { $ref: "#/components/responses/InvalidRequest" },
+					"401": { $ref: "#/components/responses/Unauthorized" },
+					"502": {
+						description: "Tunnel creation failed.",
+						content: { "application/json": {
+							schema: { $ref: "#/components/schemas/ErrorResponse" },
+							example: {
+								error: "tunnel failed: cloudflared could not be found",
+								code: "tunnel_error"
+							}
+						} }
+					}
+				}
+			},
+			delete: {
+				operationId: "deleteTunnel",
+				summary: "Delete the tunnel for a sandbox port",
+				description: "Stops the tunnel process for the port and removes any named-tunnel Cloudflare resources tracked by the sandbox.",
+				"x-codeSamples": [{
+					lang: "curl",
+					label: "Delete tunnel",
+					source: "curl -X DELETE https://$HOST/v1/sandbox/my-sandbox/tunnel/8080 \\\n  -H \"Authorization: Bearer $SANDBOX_API_KEY\""
+				}],
+				parameters: [{
+					name: "id",
+					in: "path",
+					required: true,
+					schema: { type: "string" },
+					description: "Sandbox instance name."
+				}, {
+					name: "port",
+					in: "path",
+					required: true,
+					schema: {
+						type: "integer",
+						minimum: 1024,
+						maximum: 65535
+					},
+					description: "Container port whose tunnel should be deleted. Port 3000 is reserved."
+				}],
+				responses: {
+					"204": { description: "Tunnel deleted or already absent." },
+					"400": { $ref: "#/components/responses/InvalidRequest" },
+					"401": { $ref: "#/components/responses/Unauthorized" },
+					"502": {
+						description: "Tunnel deletion failed.",
+						content: { "application/json": {
+							schema: { $ref: "#/components/schemas/ErrorResponse" },
+							example: {
+								error: "tunnel failed: cleanup failed",
+								code: "tunnel_error"
+							}
+						} }
+					}
+				}
+			}
+		},
 		"/v1/sandbox/{id}/file/{path}": {
 			get: {
 				operationId: "readFile",
@@ -1632,6 +1779,24 @@ function hasCredentials(options) {
 function isStringArray(value) {
 	return Array.isArray(value) && value.every((item) => typeof item === "string");
 }
+function parseTunnelOptions(rawBody) {
+	if (!rawBody.trim()) return void 0;
+	let body;
+	try {
+		body = JSON.parse(rawBody);
+	} catch {
+		return errorJson("Invalid JSON body", "invalid_request", 400);
+	}
+	if (!body || typeof body !== "object" || Array.isArray(body) || body.name === void 0) return;
+	if (typeof body.name !== "string") return errorJson("name must be a string when provided", "invalid_request", 400);
+	try {
+		validateTunnelName(body.name);
+	} catch (err) {
+		if (err instanceof SandboxSecurityError) return errorJson(err.message, "invalid_request", 400);
+		throw err;
+	}
+	return { name: body.name };
+}
 function validateMountOptions(options, binding) {
 	if ("endpoint" in options && !hasEndpoint(options)) return errorJson("options.endpoint must be a string when provided", "invalid_request", 400);
 	if (binding !== void 0 && typeof binding !== "string") return errorJson("binding must be a string when provided", "invalid_request", 400);
@@ -1640,6 +1805,7 @@ function validateMountOptions(options, binding) {
 	if (options.s3fsOptions !== void 0 && !isStringArray(options.s3fsOptions)) return errorJson("options.s3fsOptions must be an array of strings when provided", "invalid_request", 400);
 	if (options.readOnly !== void 0 && typeof options.readOnly !== "boolean") return errorJson("options.readOnly must be a boolean when provided", "invalid_request", 400);
 	if (options.prefix !== void 0 && typeof options.prefix !== "string") return errorJson("options.prefix must be a string when provided", "invalid_request", 400);
+	if ("credentialProxy" in options && options.credentialProxy !== void 0 && typeof options.credentialProxy !== "boolean") return errorJson("options.credentialProxy must be a boolean when provided", "invalid_request", 400);
 	if ("credentials" in options && options.credentials !== void 0 && (typeof options.credentials !== "object" || options.credentials === null || typeof options.credentials.accessKeyId !== "string" || typeof options.credentials.secretAccessKey !== "string")) return errorJson("options.credentials must include string accessKeyId and secretAccessKey", "invalid_request", 400);
 	return null;
 }
@@ -1661,6 +1827,7 @@ function toSDKMountOptions(options) {
 			secretAccessKey: options.credentials.secretAccessKey
 		};
 		if (options.s3fsOptions !== void 0) remoteOptions.s3fsOptions = options.s3fsOptions;
+		if ("credentialProxy" in options && typeof options.credentialProxy === "boolean") remoteOptions.credentialProxy = options.credentialProxy;
 		return remoteOptions;
 	}
 	const r2BindingOptions = {};
@@ -1865,6 +2032,30 @@ function createBridgeApp(config) {
 			return errorJson(`write failed: ${err instanceof Error ? err.message : String(err)}`, "workspace_archive_write_error", 502);
 		}
 	});
+	app.post(`${apiPrefix}/sandbox/:id/tunnel/:port`, async (c) => {
+		const port = Number(c.req.param("port"));
+		if (!validatePort(port)) return errorJson("Invalid port", "invalid_request", 400);
+		const options = parseTunnelOptions(await c.req.text());
+		if (options instanceof Response) return options;
+		const sandbox = getSandbox$1(getSandboxNs(c.env), c.get("containerUUID"));
+		try {
+			const tunnel = await sandbox.tunnels.get(port, options);
+			return c.json(tunnel);
+		} catch (err) {
+			return errorJson(`tunnel failed: ${err instanceof Error ? err.message : String(err)}`, "tunnel_error", 502);
+		}
+	});
+	app.delete(`${apiPrefix}/sandbox/:id/tunnel/:port`, async (c) => {
+		const port = Number(c.req.param("port"));
+		if (!validatePort(port)) return errorJson("Invalid port", "invalid_request", 400);
+		const sandbox = getSandbox$1(getSandboxNs(c.env), c.get("containerUUID"));
+		try {
+			await sandbox.tunnels.destroy(port);
+			return c.body(null, 204);
+		} catch (err) {
+			return errorJson(`tunnel failed: ${err instanceof Error ? err.message : String(err)}`, "tunnel_error", 502);
+		}
+	});
 	app.get(`${apiPrefix}/sandbox/:id/running`, async (c) => {
 		const sandbox = getSandbox$1(getSandboxNs(c.env), c.get("containerUUID"));
 		try {