@cloudflare/sandbox 0.13.0-next.738.2 → 0.13.0-next.748.1

package/dist/bridge/index.js

@@ -1,7 +1,7 @@
 import "../errors-CXR0xBpw.js";
 import "../errors-QYlSkVGz.js";
 import "../dist-Duor5GbS.js";
-import { g as validateTunnelName, h as validatePort, m as SandboxSecurityError, n as getSandbox$1, x as streamFile } from "../sandbox-CdJaXKpV.js";
+import { g as validateTunnelName, h as validatePort, m as SandboxSecurityError, n as getSandbox$1, x as streamFile } from "../sandbox-CXc1T45U.js";
 import "../extensions-CFB2xHqY.js";
 import { DurableObject, env } from "cloudflare:workers";
 import { Hono } from "hono";

package/dist/index.js

@@ -1,7 +1,7 @@
 import "./errors-CXR0xBpw.js";
 import { $ as TerminalControlError, G as BackupRestoreError, H as BackupCreateError, J as InvalidTerminalCursorError, K as ContainerUnavailableError, Q as StaleTerminalHandleError, U as BackupExpiredError, W as BackupNotFoundError, X as OperationInterruptedError, Y as InvalidTerminalCwdError, Z as RPCTransportError, _ as StaleProcessHandleError, c as InvalidProcessEnvironmentError, d as ProcessExitedBeforeLogError, et as TerminalNotFoundError, f as ProcessExitedBeforeReadyError, g as ProcessWaitTimeoutError, h as ProcessSpawnFailedError, l as ProcessAbortedError, m as ProcessReadyTimeoutError, n as RuntimeIdentityInactiveError, o as InvalidProcessCursorError, p as ProcessNotFoundError, q as InvalidBackupConfigError, r as RuntimeControlProtocolError, s as InvalidProcessCwdError, u as ProcessError } from "./errors-QYlSkVGz.js";
 import { a as TraceContext, r as createLogger } from "./dist-Duor5GbS.js";
-import { _ as proxyTerminal, a as responseToAsyncIterable, b as collectFile, c as BucketUnmountError, d as S3FSMountError, f as parsePreviewRoute, i as parseSSEStream, l as InvalidMountConfigError, n as getSandbox, o as ContainerProxy, p as withPreviewProxyMetadata, r as asyncIterableToSSEStream, s as BucketMountError, t as Sandbox, u as MissingCredentialsError, v as isDurableObjectCodeUpdateReset, x as streamFile, y as isPlatformTransientError } from "./sandbox-CdJaXKpV.js";
+import { _ as proxyTerminal, a as responseToAsyncIterable, b as collectFile, c as BucketUnmountError, d as S3FSMountError, f as parsePreviewRoute, i as parseSSEStream, l as InvalidMountConfigError, n as getSandbox, o as ContainerProxy, p as withPreviewProxyMetadata, r as asyncIterableToSSEStream, s as BucketMountError, t as Sandbox, u as MissingCredentialsError, v as isDurableObjectCodeUpdateReset, x as streamFile, y as isPlatformTransientError } from "./sandbox-CXc1T45U.js";
 import "./extensions-CFB2xHqY.js";
 
 //#region src/request-handler.ts

package/dist/{sandbox-CdJaXKpV.js → sandbox-CXc1T45U.js}

@@ -719,6 +719,10 @@ function trimTrailingSlashes(s) {
 	while (end > 0 && s[end - 1] === "/") end--;
 	return s.slice(0, end);
 }
+function normalizeMountPrefix(prefix) {
+	if (!prefix) return void 0;
+	return trimTrailingSlashes(normalizeObjectKey(prefix)) || void 0;
+}
 function parsePath(pathname) {
 	const stripped = pathname.startsWith("/") ? pathname.slice(1) : pathname;
 	if (!stripped) return null;
@@ -916,15 +920,17 @@ async function handleGetObject(r2, key, request) {
 		headers
 	});
 }
-async function handlePutObject(r2, bucketName, key, request, env$1, permitted, mountPrefix) {
+async function handlePutObject(r2, bucketName, key, request, env$1, buckets) {
 	const copySourceHeader = request.headers.get("x-amz-copy-source");
 	if (copySourceHeader) {
 		const copySource = parseCopySource(copySourceHeader);
 		if (!copySource || !copySource.key) return new Response("Bad Request: invalid x-amz-copy-source", { status: 400 });
-		if (!permitted.has(copySource.bucket)) return new Response(`Access to R2 bucket "${copySource.bucket}" is not permitted. Call mountBucket() with this bucket before accessing it.`, { status: 403 });
+		if (!Object.hasOwn(buckets, copySource.bucket)) return new Response(`Access to R2 bucket "${copySource.bucket}" is not permitted. Call mountBucket() with this bucket before accessing it.`, { status: 403 });
+		const sourceParams = buckets[copySource.bucket];
 		const sourceBucket = copySource.bucket === bucketName ? r2 : resolveR2Bucket(env$1, copySource.bucket);
 		if (!sourceBucket) return new Response(`R2 binding "${copySource.bucket}" not found in Worker env. Ensure the binding name matches the bucket name passed to mountBucket().`, { status: 500 });
-		const sourceKey = mountPrefix && copySource.bucket === bucketName ? `${mountPrefix}/${copySource.key}` : copySource.key;
+		const sourcePrefix = normalizeMountPrefix(sourceParams.prefix);
+		const sourceKey = sourcePrefix ? `${sourcePrefix}/${copySource.key}` : copySource.key;
 		const sourceObject = await sourceBucket.get(sourceKey);
 		if (!sourceObject) return new Response(null, { status: 404 });
 		const httpMetadata = request.headers.get("x-amz-metadata-directive")?.toUpperCase() === "REPLACE" ? extractHttpMetadata(request) : sourceObject.httpMetadata;
@@ -998,8 +1004,7 @@ const r2EgressHandler = async (request, env$1, ctx) => {
 	const { bucket: bucketName, key } = parsed;
 	if (!ctx.params?.buckets || !(bucketName in ctx.params.buckets)) return new Response(`Access to R2 bucket "${bucketName}" is not permitted. Call mountBucket() with this bucket before accessing it.`, { status: 403 });
 	const bucketParams = ctx.params.buckets[bucketName];
-	const rawPrefix = bucketParams.prefix;
-	const mountPrefix = rawPrefix ? trimTrailingSlashes(normalizeObjectKey(rawPrefix)) : void 0;
+	const mountPrefix = normalizeMountPrefix(bucketParams.prefix);
 	const readOnly = bucketParams.readOnly ?? false;
 	const r2 = resolveR2Bucket(env$1, bucketName);
 	if (!r2) return new Response(`R2 binding "${bucketName}" not found in Worker env. Ensure the binding name matches the bucket name passed to mountBucket().`, { status: 500 });
@@ -1011,7 +1016,6 @@ const r2EgressHandler = async (request, env$1, ctx) => {
 		return new Response("Method Not Allowed", { status: 405 });
 	}
 	const fullKey = mountPrefix ? `${mountPrefix}/${key}` : key;
-	const permitted = new Set(Object.keys(ctx.params.buckets));
 	if (readOnly && (method === "PUT" || method === "DELETE" || method === "POST" && (url.searchParams.has("uploads") || url.searchParams.has("uploadId")))) return new Response("Forbidden: bucket mount is read-only", { status: 403 });
 	if (method === "POST" && url.searchParams.has("uploads")) return handleCreateMultipartUpload(r2, bucketName, fullKey, request);
 	if (method === "POST" && url.searchParams.has("uploadId")) return handleCompleteMultipartUpload(r2, bucketName, fullKey, url, request);
@@ -1020,7 +1024,7 @@ const r2EgressHandler = async (request, env$1, ctx) => {
 	switch (method) {
 		case "HEAD": return handleHeadObject(r2, fullKey);
 		case "GET": return handleGetObject(r2, fullKey, request);
-		case "PUT": return handlePutObject(r2, bucketName, fullKey, request, env$1, permitted, mountPrefix);
+		case "PUT": return handlePutObject(r2, bucketName, fullKey, request, env$1, ctx.params.buckets);
 		case "DELETE": return handleDeleteObject(r2, fullKey);
 		default: return new Response("Method Not Allowed", { status: 405 });
 	}
@@ -10036,4 +10040,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-CdJaXKpV.js.map
+//# sourceMappingURL=sandbox-CXc1T45U.js.map