@cloudflare/sandbox 0.7.18 → 0.7.20

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as DirectoryBackup, A as DesktopStopResponse, At as StreamOptions, B as ExecuteResponse, Bt as PtyOptions, C as ClickOptions, Ct as ProcessOptions, D as DesktopStartOptions, Dt as RestoreBackupResult, E as DesktopClient, Et as RemoteMountBucketOptions, F as ScreenshotRegion, Ft as isProcess, G as HttpClientOptions, Gt as RunCodeOptions, H as BaseApiResponse, Ht as CreateContextOptions, I as ScreenshotResponse, It as isProcessStatus, J as SessionRequest, K as RequestConfig, L as ScrollDirection, Lt as ExecuteRequest, M as ScreenSizeResponse, Mt as WaitForPortOptions, N as ScreenshotBytesResponse, Nt as WatchOptions, O as DesktopStartResponse, Ot as SandboxOptions, P as ScreenshotOptions, Pt as isExecResult, Q as BucketProvider, R as TypeOptions, Rt as ExposePortRequest, S as WriteFileRequest, St as ProcessLogsResult, T as Desktop, Tt as ProcessStatus, U as ContainerStub, Ut as Execution, V as BackupClient, Vt as CodeContext, W as ErrorResponse, Wt as ExecutionResult, X as BaseExecOptions, Y as BackupOptions, Z as BucketCredentials, _ as GitClient, _t as Process, a as CreateSessionRequest, at as FileMetadata, b as MkdirRequest, bt as ProcessKillResult, c as DeleteSessionResponse, ct as GitCheckoutResult, d as ProcessClient, dt as LocalMountBucketOptions, et as ExecEvent, f as PortClient, ft as LogEvent, g as GitCheckoutRequest, gt as PortListResult, h as InterpreterClient, ht as PortExposeResult, i as CommandsResponse, it as FileChunk, j as KeyInput, jt as WaitForLogResult, k as DesktopStatusResponse, kt as SessionOptions, l as PingResponse, lt as ISandbox, m as ExecutionCallbacks, mt as PortCloseResult, n as getSandbox, nt as ExecResult, o as CreateSessionResponse, ot as FileStreamEvent, p as UnexposePortRequest, pt as MountBucketOptions, q as ResponseHandler, r as SandboxClient, rt as ExecutionSession, s as DeleteSessionRequest, st as FileWatchSSEEvent, t as Sandbox, tt as ExecOptions, u as UtilityClient, ut as ListFilesOptions, v as FileClient, vt as ProcessCleanupResult, w as CursorPositionResponse, wt as ProcessStartResult, x as ReadFileRequest, xt as ProcessListResult, y as FileOperationRequest, yt as ProcessInfoResult, z as CommandClient, zt as StartProcessRequest } from "./sandbox-CTUXe5eK.js";
+import { $ as DirectoryBackup, A as DesktopStopResponse, At as StreamOptions, B as ExecuteResponse, Bt as PtyOptions, C as ClickOptions, Ct as ProcessOptions, D as DesktopStartOptions, Dt as RestoreBackupResult, E as DesktopClient, Et as RemoteMountBucketOptions, F as ScreenshotRegion, Ft as isProcess, G as HttpClientOptions, Gt as RunCodeOptions, H as BaseApiResponse, Ht as CreateContextOptions, I as ScreenshotResponse, It as isProcessStatus, J as SessionRequest, K as RequestConfig, L as ScrollDirection, Lt as ExecuteRequest, M as ScreenSizeResponse, Mt as WaitForPortOptions, N as ScreenshotBytesResponse, Nt as WatchOptions, O as DesktopStartResponse, Ot as SandboxOptions, P as ScreenshotOptions, Pt as isExecResult, Q as BucketProvider, R as TypeOptions, Rt as ExposePortRequest, S as WriteFileRequest, St as ProcessLogsResult, T as Desktop, Tt as ProcessStatus, U as ContainerStub, Ut as Execution, V as BackupClient, Vt as CodeContext, W as ErrorResponse, Wt as ExecutionResult, X as BaseExecOptions, Y as BackupOptions, Z as BucketCredentials, _ as GitClient, _t as Process, a as CreateSessionRequest, at as FileMetadata, b as MkdirRequest, bt as ProcessKillResult, c as DeleteSessionResponse, ct as GitCheckoutResult, d as ProcessClient, dt as LocalMountBucketOptions, et as ExecEvent, f as PortClient, ft as LogEvent, g as GitCheckoutRequest, gt as PortListResult, h as InterpreterClient, ht as PortExposeResult, i as CommandsResponse, it as FileChunk, j as KeyInput, jt as WaitForLogResult, k as DesktopStatusResponse, kt as SessionOptions, l as PingResponse, lt as ISandbox, m as ExecutionCallbacks, mt as PortCloseResult, n as getSandbox, nt as ExecResult, o as CreateSessionResponse, ot as FileStreamEvent, p as UnexposePortRequest, pt as MountBucketOptions, q as ResponseHandler, r as SandboxClient, rt as ExecutionSession, s as DeleteSessionRequest, st as FileWatchSSEEvent, t as Sandbox, tt as ExecOptions, u as UtilityClient, ut as ListFilesOptions, v as FileClient, vt as ProcessCleanupResult, w as CursorPositionResponse, wt as ProcessStartResult, x as ReadFileRequest, xt as ProcessListResult, y as FileOperationRequest, yt as ProcessInfoResult, z as CommandClient, zt as StartProcessRequest } from "./sandbox-raa8coh3.js";
 import { a as DesktopCoordinateErrorContext, d as ErrorResponse$1, f as OperationType, i as BackupRestoreContext, l as ProcessExitedBeforeReadyContext, n as BackupExpiredContext, o as DesktopErrorContext, p as ErrorCode, r as BackupNotFoundContext, s as InvalidBackupConfigContext, t as BackupCreateContext, u as ProcessReadyTimeoutContext } from "./contexts-CeQR115r.js";
 
 //#region src/errors/classes.d.ts

package/dist/index.js

@@ -3591,7 +3591,8 @@ var InvalidMountConfigError = class extends BucketMountError {
 * Priority order:
 * 1. Explicit options.credentials
 * 2. Standard AWS env vars: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
-* 3. Error: no credentials found
+* 3. Standard R2 env vars: R2_ACCESS_KEY_ID, R2_SECRET_ACCESS_KEY
+* 4. Error: no credentials found
 *
 * @param options - Mount options
 * @param envVars - Environment variables
@@ -3606,7 +3607,18 @@ function detectCredentials(options, envVars) {
 		accessKeyId: awsAccessKeyId,
 		secretAccessKey: awsSecretAccessKey
 	};
-	throw new MissingCredentialsError("No credentials found. Set AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables, or pass explicit credentials in options.");
+	/**
+	* Priority 3: Standard R2 env vars
+	*
+	* AWS vars still take precedence over R2 vars in case both are set
+	*/
+	const r2AccessKeyId = envVars.R2_ACCESS_KEY_ID;
+	const r2SecretAccessKey = envVars.R2_SECRET_ACCESS_KEY;
+	if (r2AccessKeyId && r2SecretAccessKey) return {
+		accessKeyId: r2AccessKeyId,
+		secretAccessKey: r2SecretAccessKey
+	};
+	throw new MissingCredentialsError("No credentials found. Set R2_ACCESS_KEY_ID and R2_SECRET_ACCESS_KEY or AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables, or pass explicit credentials in options.");
 }
 
 //#endregion
@@ -3686,7 +3698,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.7.18";
+const SDK_VERSION = "0.7.20";
 
 //#endregion
 //#region src/sandbox.ts
@@ -3839,7 +3851,7 @@ var Sandbox = class Sandbox extends Container {
 	DEFAULT_CONTAINER_TIMEOUTS = {
 		instanceGetTimeoutMS: 3e4,
 		portReadyTimeoutMS: 9e4,
-		waitIntervalMS: 1e3
+		waitIntervalMS: 300
 	};
 	/**
 	* Active container timeout configuration
@@ -3962,6 +3974,11 @@ var Sandbox = class Sandbox extends Container {
 				};
 				this.client.setRetryTimeoutMs(this.computeRetryTimeoutMs());
 			}
+			const storedSleepAfter = await this.ctx.storage.get("sleepAfter");
+			if (storedSleepAfter !== void 0) {
+				this.sleepAfter = storedSleepAfter;
+				this.renewActivityTimeout();
+			}
 		});
 	}
 	async setSandboxName(name, normalizeId) {
@@ -3987,6 +4004,7 @@ var Sandbox = class Sandbox extends Container {
 	}
 	async setSleepAfter(sleepAfter) {
 		this.sleepAfter = sleepAfter;
+		await this.ctx.storage.put("sleepAfter", sleepAfter);
 		this.renewActivityTimeout();
 	}
 	async setKeepAlive(keepAlive) {
@@ -4133,7 +4151,14 @@ var Sandbox = class Sandbox extends Container {
 			explicitProvider: options.provider,
 			prefix
 		});
-		const credentials = detectCredentials(options, this.envVars);
+		const envObj = this.env;
+		const credentials = detectCredentials(options, {
+			AWS_ACCESS_KEY_ID: getEnvString(envObj, "AWS_ACCESS_KEY_ID"),
+			AWS_SECRET_ACCESS_KEY: getEnvString(envObj, "AWS_SECRET_ACCESS_KEY"),
+			R2_ACCESS_KEY_ID: this.r2AccessKeyId || void 0,
+			R2_SECRET_ACCESS_KEY: this.r2SecretAccessKey || void 0,
+			...this.envVars
+		});
 		const passwordFilePath = this.generatePasswordFilePath();
 		const mountInfo = {
 			mountType: "fuse",