@cloudflare/sandbox 0.9.4 → 0.10.1

package/dist/{sandbox-CdWjEUHl.js → sandbox-uC1vzWtG.js}

@@ -2050,13 +2050,8 @@ var FileClient = class extends BaseHttpClient {
 		};
 		return await this.post("/api/write", data);
 	}
-	/**
-	* Read content from a file
-	* @param path - File path to read from
-	* @param sessionId - The session ID for this operation
-	* @param options - Optional settings (encoding)
-	*/
 	async readFile(path$1, sessionId, options) {
+		if (options?.encoding === "none") throw new Error("readFile with encoding: 'none' requires the rpc transport. Set SANDBOX_TRANSPORT=rpc.");
 		const data = {
 			path: path$1,
 			sessionId,
@@ -2143,6 +2138,13 @@ var FileClient = class extends BaseHttpClient {
 		};
 		return await this.post("/api/exists", data);
 	}
+	/**
+	* Write a file via a raw binary stream over the RPC transport.
+	* Throws on HTTP and WebSocket transports — use writeFile() with a string instead.
+	*/
+	writeFileStream(_path, _content, _sessionId) {
+		throw new Error("writeFileStream requires the rpc transport. Set SANDBOX_TRANSPORT=rpc.");
+	}
 };
 
 //#endregion
@@ -2706,16 +2708,6 @@ var SandboxClient = class {
 		return this.transport?.isConnected() ?? false;
 	}
 	/**
-	* Stream a file directly to the container over a binary RPC channel.
-	*
-	* Requires the container-control path (`transport: 'rpc'`). Calling this
-	* method with the HTTP or WebSocket route transports throws an error because
-	* those transports do not support binary streaming.
-	*/
-	writeFileStream(_path, _content, _sessionId) {
-		throw new Error("writeFileStream requires the RPC transport. Enable it with transport: \"rpc\" in sandbox options.");
-	}
-	/**
 	* Connect WebSocket transport (no-op in HTTP mode)
 	* Called automatically on first request, but can be called explicitly
 	* to establish connection upfront.
@@ -3300,9 +3292,6 @@ var ContainerControlClient = class {
 	disconnect() {
 		this.destroyConnection();
 	}
-	async writeFileStream(path$1, stream, sessionId) {
-		return this.files.writeFileStream(path$1, stream, sessionId);
-	}
 };
 
 //#endregion
@@ -4257,7 +4246,7 @@ function isLocalhostPattern(hostname) {
 * 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.9.4";
+const SDK_VERSION = "0.10.1";
 
 //#endregion
 //#region src/sandbox.ts
@@ -6081,7 +6070,7 @@ var Sandbox = class Sandbox extends Container {
 	}
 	async writeFile(path$1, content, options = {}) {
 		const session = options.sessionId ?? await this.ensureDefaultSession();
-		if (content instanceof ReadableStream) return this.client.writeFileStream(path$1, content, session);
+		if (content instanceof ReadableStream) return this.client.files.writeFileStream(path$1, content, session);
 		return this.client.files.writeFile(path$1, content, session, { encoding: options.encoding });
 	}
 	async deleteFile(path$1, sessionId) {
@@ -6098,6 +6087,7 @@ var Sandbox = class Sandbox extends Container {
 	}
 	async readFile(path$1, options = {}) {
 		const session = options.sessionId ?? await this.ensureDefaultSession();
+		if (options.encoding === "none") return this.client.files.readFile(path$1, session, { encoding: "none" });
 		return this.client.files.readFile(path$1, session, { encoding: options.encoding });
 	}
 	/**
@@ -6472,9 +6462,16 @@ var Sandbox = class Sandbox extends Container {
 				...options,
 				sessionId
 			}),
-			readFile: (path$1, options) => this.readFile(path$1, {
-				...options,
-				sessionId
+			readFile: ((path$1, options) => {
+				const encoding = options?.encoding;
+				if (encoding === "none") return this.readFile(path$1, {
+					encoding: "none",
+					sessionId
+				});
+				return this.readFile(path$1, {
+					encoding,
+					sessionId
+				});
 			}),
 			readFileStream: (path$1) => this.readFileStream(path$1, { sessionId }),
 			watch: (path$1, options) => this.watch(path$1, {
@@ -7232,9 +7229,18 @@ var Sandbox = class Sandbox extends Container {
 			sizeBytes = createResult.sizeBytes;
 			const r2Key = `${BACKUP_STORAGE_PREFIX}/${backupId}/${BACKUP_ARCHIVE_OBJECT_NAME}`;
 			const metaKey = `${BACKUP_STORAGE_PREFIX}/${backupId}/${BACKUP_METADATA_OBJECT_NAME}`;
-			const { content } = await collectFile(await this.client.files.readFileStream(archivePath, backupSession));
-			const archiveData = content instanceof Uint8Array ? content : new TextEncoder().encode(content);
-			await bucket.put(r2Key, archiveData);
+			const archiveStream = await this.client.files.readFileStream(archivePath, backupSession);
+			const sseDecoded = new ReadableStream({ async start(controller) {
+				try {
+					for await (const chunk of streamFile(archiveStream)) if (chunk instanceof Uint8Array) controller.enqueue(chunk);
+					controller.close();
+				} catch (err) {
+					controller.error(err);
+				}
+			} });
+			const fixedStream = new FixedLengthStream(createResult.sizeBytes);
+			sseDecoded.pipeTo(fixedStream.writable).catch(() => {});
+			await bucket.put(r2Key, fixedStream.readable);
 			const head = await bucket.head(r2Key);
 			if (!head || head.size !== createResult.sizeBytes) throw new BackupCreateError({
 				message: `Upload verification failed: expected ${createResult.sizeBytes} bytes, got ${head?.size ?? 0}`,
@@ -7512,20 +7518,35 @@ var Sandbox = class Sandbox extends Container {
 			});
 			backupSession = await this.ensureBackupSession();
 			const archivePath = `${BACKUP_CONTAINER_DIR}/${id}.sqsh`;
-			const archiveBuffer = await archiveObject.arrayBuffer();
-			const base64Content = Buffer.from(archiveBuffer).toString("base64");
 			await this.execWithSession(`mkdir -p ${BACKUP_CONTAINER_DIR}`, backupSession, { origin: "internal" });
-			const writeResult = await this.client.files.writeFile(archivePath, base64Content, backupSession, { encoding: "base64" });
-			if (!writeResult.success) throw new BackupRestoreError({
-				message: `Failed to write backup archive to ${archivePath}: ${"error" in writeResult && typeof writeResult.error === "object" && writeResult.error !== null && "message" in writeResult.error && typeof writeResult.error.message === "string" ? writeResult.error.message : `File write returned success: false for '${archivePath}'`}`,
-				code: ErrorCode.BACKUP_RESTORE_FAILED,
-				httpStatus: 500,
-				context: {
-					dir,
-					backupId: id
-				},
-				timestamp: (/* @__PURE__ */ new Date()).toISOString()
-			});
+			if (this.transport === "rpc") {
+				const body = archiveObject.body;
+				if (!body) throw new BackupRestoreError({
+					message: `R2 archive object has no body stream for backup ${id}`,
+					code: ErrorCode.BACKUP_RESTORE_FAILED,
+					httpStatus: 500,
+					context: {
+						dir,
+						backupId: id
+					},
+					timestamp: (/* @__PURE__ */ new Date()).toISOString()
+				});
+				await this.client.files.writeFileStream(archivePath, body, backupSession);
+			} else {
+				const archiveBuffer = await archiveObject.arrayBuffer();
+				const base64Content = Buffer.from(archiveBuffer).toString("base64");
+				const writeResult = await this.client.files.writeFile(archivePath, base64Content, backupSession, { encoding: "base64" });
+				if (!writeResult.success) throw new BackupRestoreError({
+					message: `Failed to write backup archive to ${archivePath}: ${"error" in writeResult && typeof writeResult.error === "object" && writeResult.error !== null && "message" in writeResult.error && typeof writeResult.error.message === "string" ? writeResult.error.message : `File write returned success: false for '${archivePath}'`}`,
+					code: ErrorCode.BACKUP_RESTORE_FAILED,
+					httpStatus: 500,
+					context: {
+						dir,
+						backupId: id
+					},
+					timestamp: (/* @__PURE__ */ new Date()).toISOString()
+				});
+			}
 			const extractResult = await this.execWithSession(`/usr/bin/unsquashfs -f -d ${shellEscape(dir)} ${shellEscape(archivePath)}`, backupSession, { origin: "internal" });
 			if (extractResult.exitCode !== 0) throw new BackupRestoreError({
 				message: `unsquashfs extraction failed (exit code ${extractResult.exitCode}): ${extractResult.stderr}`,
@@ -7568,4 +7589,4 @@ var Sandbox = class Sandbox extends Container {
 
 //#endregion
 export { DesktopInvalidOptionsError as A, CommandClient as C, BackupNotFoundError as D, BackupExpiredError as E, InvalidBackupConfigError as F, ProcessExitedBeforeReadyError as I, ProcessReadyTimeoutError as L, DesktopProcessCrashedError as M, DesktopStartFailedError as N, BackupRestoreError as O, DesktopUnavailableError as P, RPCTransportError as R, DesktopClient as S, BackupCreateError as T, UtilityClient as _, BucketMountError as a, GitClient as b, MissingCredentialsError as c, parseSSEStream as d, responseToAsyncIterable as f, SandboxClient as g, streamFile as h, proxyTerminal as i, DesktopNotStartedError as j, DesktopInvalidCoordinatesError as k, S3FSMountError as l, collectFile as m, getSandbox as n, BucketUnmountError as o, CodeInterpreter as p, proxyToSandbox as r, InvalidMountConfigError as s, Sandbox as t, asyncIterableToSSEStream as u, ProcessClient as v, BackupClient as w, FileClient as x, PortClient as y, SessionTerminatedError as z };
-//# sourceMappingURL=sandbox-CdWjEUHl.js.map
+//# sourceMappingURL=sandbox-uC1vzWtG.js.map