@cloudflare/sandbox 0.6.10 → 0.6.11

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as ProcessInfoResult, A as RequestConfig, B as FileChunk, C as WriteFileRequest, D as ContainerStub, E as BaseApiResponse, F as BucketProvider, G as ListFilesOptions, H as FileStreamEvent, I as ExecEvent, J as PortCloseResult, K as LogEvent, L as ExecOptions, M as SessionRequest, N as BaseExecOptions, O as ErrorResponse, P as BucketCredentials, Q as ProcessCleanupResult, R as ExecResult, S as ReadFileRequest, T as ExecuteResponse, U as GitCheckoutResult, V as FileMetadata, W as ISandbox, X as PortListResult, Y as PortExposeResult, Z as Process, _ as GitCheckoutRequest, _t as ExecutionResult, a as CreateSessionRequest, at as ProcessStatus, b as FileOperationRequest, c as DeleteSessionResponse, ct as StreamOptions, d as ProcessClient, dt as isExecResult, et as ProcessKillResult, f as ExposePortRequest, ft as isProcess, g as InterpreterClient, gt as Execution, h as ExecutionCallbacks, ht as CreateContextOptions, i as CommandsResponse, it as ProcessStartResult, j as ResponseHandler, k as HttpClientOptions, l as PingResponse, lt as WaitForLogResult, m as UnexposePortRequest, mt as CodeContext, n as getSandbox, nt as ProcessLogsResult, o as CreateSessionResponse, ot as SandboxOptions, p as PortClient, pt as isProcessStatus, q as MountBucketOptions, r as SandboxClient, rt as ProcessOptions, s as DeleteSessionRequest, st as SessionOptions, t as Sandbox, tt as ProcessListResult, u as UtilityClient, ut as WaitForPortOptions, v as GitClient, vt as RunCodeOptions, w as CommandClient, x as MkdirRequest, y as FileClient, z as ExecutionSession } from "./sandbox-DAb6o08K.js";
+import { $ as ProcessInfoResult, A as RequestConfig, B as FileChunk, C as WriteFileRequest, D as ContainerStub, E as BaseApiResponse, F as BucketProvider, G as ListFilesOptions, H as FileStreamEvent, I as ExecEvent, J as PortCloseResult, K as LogEvent, L as ExecOptions, M as SessionRequest, N as BaseExecOptions, O as ErrorResponse, P as BucketCredentials, Q as ProcessCleanupResult, R as ExecResult, S as ReadFileRequest, T as ExecuteResponse, U as GitCheckoutResult, V as FileMetadata, W as ISandbox, X as PortListResult, Y as PortExposeResult, Z as Process, _ as GitCheckoutRequest, _t as ExecutionResult, a as CreateSessionRequest, at as ProcessStatus, b as FileOperationRequest, c as DeleteSessionResponse, ct as StreamOptions, d as ProcessClient, dt as isExecResult, et as ProcessKillResult, f as ExposePortRequest, ft as isProcess, g as InterpreterClient, gt as Execution, h as ExecutionCallbacks, ht as CreateContextOptions, i as CommandsResponse, it as ProcessStartResult, j as ResponseHandler, k as HttpClientOptions, l as PingResponse, lt as WaitForLogResult, m as UnexposePortRequest, mt as CodeContext, n as getSandbox, nt as ProcessLogsResult, o as CreateSessionResponse, ot as SandboxOptions, p as PortClient, pt as isProcessStatus, q as MountBucketOptions, r as SandboxClient, rt as ProcessOptions, s as DeleteSessionRequest, st as SessionOptions, t as Sandbox, tt as ProcessListResult, u as UtilityClient, ut as WaitForPortOptions, v as GitClient, vt as RunCodeOptions, w as CommandClient, x as MkdirRequest, y as FileClient, z as ExecutionSession } from "./sandbox-HCG7Oeg0.js";
 import { a as OperationType, i as ErrorResponse$1, n as ProcessExitedBeforeReadyContext, o as ErrorCode, r as ProcessReadyTimeoutContext } from "./contexts-CdrlvHWK.js";
 
 //#region ../shared/dist/request-types.d.ts

package/dist/index.js

@@ -2509,6 +2509,30 @@ function resolveS3fsOptions(provider, userOptions) {
 	return Array.from(flagMap.values());
 }
 
+//#endregion
+//#region src/storage-mount/validation.ts
+function validatePrefix(prefix) {
+	if (!prefix.startsWith("/")) throw new InvalidMountConfigError(`Prefix must start with '/': "${prefix}"`);
+}
+function validateBucketName(bucket, mountPath) {
+	if (bucket.includes(":")) {
+		const [bucketName, prefixPart] = bucket.split(":");
+		throw new InvalidMountConfigError(`Bucket name cannot contain ':'. To mount a prefix, use the 'prefix' option:\n  mountBucket('${bucketName}', '${mountPath}', { ...options, prefix: '${prefixPart}' })`);
+	}
+	if (!/^[a-z0-9]([a-z0-9.-]{0,61}[a-z0-9])?$/.test(bucket)) throw new InvalidMountConfigError(`Invalid bucket name: "${bucket}". Bucket names must be 3-63 characters, lowercase alphanumeric, dots, or hyphens, and cannot start/end with dots or hyphens.`);
+}
+/**
+* Builds the s3fs source string from bucket name and optional prefix.
+* Format: "bucket" or "bucket:/prefix/" for subdirectory mounts.
+*
+* @param bucket - The bucket name
+* @param prefix - Optional prefix/subdirectory path
+* @returns The s3fs source string
+*/
+function buildS3fsSource(bucket, prefix) {
+	return prefix ? `${bucket}:${prefix}` : bucket;
+}
+
 //#endregion
 //#region src/version.ts
 /**
@@ -2516,7 +2540,7 @@ function resolveS3fsOptions(provider, userOptions) {
 * 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.6.10";
+const SDK_VERSION = "0.6.11";
 
 //#endregion
 //#region src/sandbox.ts
@@ -2631,8 +2655,6 @@ var Sandbox = class extends Container {
 	async setKeepAlive(keepAlive) {
 		this.keepAliveEnabled = keepAlive;
 		await this.ctx.storage.put("keepAliveEnabled", keepAlive);
-		if (keepAlive) this.logger.info("KeepAlive mode enabled - container will stay alive until explicitly destroyed");
-		else this.logger.info("KeepAlive mode disabled - container will timeout normally");
 	}
 	async setEnvVars(envVars) {
 		this.envVars = {
@@ -2693,13 +2715,21 @@ var Sandbox = class extends Container {
 	}
 	async mountBucket(bucket, mountPath, options) {
 		this.logger.info(`Mounting bucket ${bucket} to ${mountPath}`);
-		this.validateMountOptions(bucket, mountPath, options);
+		const prefix = options.prefix || void 0;
+		this.validateMountOptions(bucket, mountPath, {
+			...options,
+			prefix
+		});
+		const s3fsSource = buildS3fsSource(bucket, prefix);
 		const provider = options.provider || detectProviderFromUrl(options.endpoint);
-		this.logger.debug(`Detected provider: ${provider || "unknown"}`, { explicitProvider: options.provider });
+		this.logger.debug(`Detected provider: ${provider || "unknown"}`, {
+			explicitProvider: options.provider,
+			prefix
+		});
 		const credentials = detectCredentials(options, this.envVars);
 		const passwordFilePath = this.generatePasswordFilePath();
 		this.activeMounts.set(mountPath, {
-			bucket,
+			bucket: s3fsSource,
 			mountPath,
 			endpoint: options.endpoint,
 			provider,
@@ -2709,9 +2739,9 @@ var Sandbox = class extends Container {
 		try {
 			await this.createPasswordFile(passwordFilePath, bucket, credentials);
 			await this.exec(`mkdir -p ${shellEscape(mountPath)}`);
-			await this.executeS3FSMount(bucket, mountPath, options, provider, passwordFilePath);
+			await this.executeS3FSMount(s3fsSource, mountPath, options, provider, passwordFilePath);
 			this.activeMounts.set(mountPath, {
-				bucket,
+				bucket: s3fsSource,
 				mountPath,
 				endpoint: options.endpoint,
 				provider,
@@ -2754,9 +2784,10 @@ var Sandbox = class extends Container {
 		} catch (error) {
 			throw new InvalidMountConfigError(`Invalid endpoint URL: "${options.endpoint}". Must be a valid HTTP(S) URL.`);
 		}
-		if (!/^[a-z0-9]([a-z0-9.-]{0,61}[a-z0-9])?$/.test(bucket)) throw new InvalidMountConfigError(`Invalid bucket name: "${bucket}". Bucket names must be 3-63 characters, lowercase alphanumeric, dots, or hyphens, and cannot start/end with dots or hyphens.`);
+		validateBucketName(bucket, mountPath);
 		if (!mountPath.startsWith("/")) throw new InvalidMountConfigError(`Mount path must be absolute (start with /): "${mountPath}"`);
 		if (this.activeMounts.has(mountPath)) throw new InvalidMountConfigError(`Mount path "${mountPath}" is already in use by bucket "${this.activeMounts.get(mountPath)?.bucket}". Unmount the existing bucket first or use a different mount path.`);
+		if (options.prefix !== void 0) validatePrefix(options.prefix);
 	}
 	/**
 	* Generate unique password file path for s3fs credentials