@cloudflare/sandbox 0.0.0-24ceb90 → 0.0.0-2f85e95

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @cloudflare/sandbox
 
+## 0.0.8
+
+### Patch Changes
+
+- [`60af265`](https://github.com/cloudflare/sandbox-sdk/commit/60af265d834e83fd30a921a3e1be232f13fe24da) Thanks [@threepointone](https://github.com/threepointone)! - update dependencies
+
+## 0.0.7
+
+### Patch Changes
+
+- [`d1c7c99`](https://github.com/cloudflare/sandbox-sdk/commit/d1c7c99df6555eff71bcd59852e4b8eed2ad8cb6) Thanks [@threepointone](https://github.com/threepointone)! - fix file operations
+
+## 0.0.6
+
+### Patch Changes
+
+- [#9](https://github.com/cloudflare/sandbox-sdk/pull/9) [`24f5470`](https://github.com/cloudflare/sandbox-sdk/commit/24f547048d5a26137de4656cea13d83ad2cc0b43) Thanks [@ItsWendell](https://github.com/ItsWendell)! - fix baseUrl for stub and stub forwarding
+
 ## 0.0.5
 
 ### Patch Changes

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@cloudflare/sandbox",
-  "version": "0.0.0-24ceb90",
+  "version": "0.0.0-2f85e95",
   "repository": {
     "type": "git",
     "url": "https://github.com/cloudflare/sandbox-sdk"
   },
   "description": "A sandboxed environment for running commands",
   "dependencies": {
-    "@cloudflare/containers": "^0.0.13"
+    "@cloudflare/containers": "^0.0.19"
   },
   "tags": [
     "sandbox",

package/src/client.ts

@@ -203,7 +203,9 @@ export class HttpClient {
     path: string,
     options?: RequestInit
   ): Promise<Response> {
-    const url = this.options.stub ? `stub:${path}` : `${this.baseUrl}${path}`;
+    const url = this.options.stub
+      ? `http://localhost:${this.options.port}${path}`
+      : `${this.baseUrl}${path}`;
     const method = options?.method || "GET";
 
     console.log(`[HTTP Client] Making ${method} request to ${url}`);
@@ -212,15 +214,23 @@ export class HttpClient {
       let response: Response;
 
       if (this.options.stub) {
-        response = await this.options.stub.containerFetch(path, options, this.options.port);
+        response = await this.options.stub.containerFetch(
+          url,
+          options,
+          this.options.port
+        );
       } else {
-        response = await fetch(this.baseUrl + path, options);
+        response = await fetch(url, options);
       }
 
-      console.log(`[HTTP Client] Response: ${response.status} ${response.statusText}`);
+      console.log(
+        `[HTTP Client] Response: ${response.status} ${response.statusText}`
+      );
 
       if (!response.ok) {
-        console.error(`[HTTP Client] Request failed: ${method} ${url} - ${response.status} ${response.statusText}`);
+        console.error(
+          `[HTTP Client] Request failed: ${method} ${url} - ${response.status} ${response.statusText}`
+        );
       }
 
       return response;

package/src/index.ts

@@ -8,24 +8,31 @@ export function getSandbox(ns: DurableObjectNamespace<Sandbox>, id: string) {
 export class Sandbox<Env = unknown> extends Container<Env> {
   defaultPort = 3000; // The default port for the container to listen on
   sleepAfter = "3m"; // Sleep the sandbox if no requests are made in this timeframe
+  client: HttpClient;
 
-  client: HttpClient = new HttpClient({
-    onCommandComplete: (success, exitCode, stdout, stderr, command, args) => {
-      console.log(
-        `[Container] Command completed: ${command}, Success: ${success}, Exit code: ${exitCode}`
-      );
-    },
-    onCommandStart: (command, args) => {
-      console.log(`[Container] Command started: ${command} ${args.join(" ")}`);
-    },
-    onError: (error, command, args) => {
-      console.error(`[Container] Command error: ${error}`);
-    },
-    onOutput: (stream, data, command) => {
-      console.log(`[Container] [${stream}] ${data}`);
-    },
-    port: this.defaultPort,
-  });
+  constructor(ctx: DurableObjectState, env: Env) {
+    super(ctx, env);
+    this.client = new HttpClient({
+      onCommandComplete: (success, exitCode, stdout, stderr, command, args) => {
+        console.log(
+          `[Container] Command completed: ${command}, Success: ${success}, Exit code: ${exitCode}`
+        );
+      },
+      onCommandStart: (command, args) => {
+        console.log(
+          `[Container] Command started: ${command} ${args.join(" ")}`
+        );
+      },
+      onError: (error, command, args) => {
+        console.error(`[Container] Command error: ${error}`);
+      },
+      onOutput: (stream, data, command) => {
+        console.log(`[Container] [${stream}] ${data}`);
+      },
+      port: this.defaultPort,
+      stub: this,
+    });
+  }
 
   envVars = {
     MESSAGE: "I was passed in via the Sandbox class!",
@@ -69,7 +76,7 @@ export class Sandbox<Env = unknown> extends Container<Env> {
 
   async mkdir(
     path: string,
-    options: { recursive?: boolean; stream?: boolean }
+    options: { recursive?: boolean; stream?: boolean } = {}
   ) {
     if (options?.stream) {
       return this.client.mkdirStream(path, options.recursive);
@@ -80,7 +87,7 @@ export class Sandbox<Env = unknown> extends Container<Env> {
   async writeFile(
     path: string,
     content: string,
-    options: { encoding?: string; stream?: boolean }
+    options: { encoding?: string; stream?: boolean } = {}
   ) {
     if (options?.stream) {
       return this.client.writeFileStream(path, content, options.encoding);
@@ -88,7 +95,7 @@ export class Sandbox<Env = unknown> extends Container<Env> {
     return this.client.writeFile(path, content, options.encoding);
   }
 
-  async deleteFile(path: string, options: { stream?: boolean }) {
+  async deleteFile(path: string, options: { stream?: boolean } = {}) {
     if (options?.stream) {
       return this.client.deleteFileStream(path);
     }
@@ -98,7 +105,7 @@ export class Sandbox<Env = unknown> extends Container<Env> {
   async renameFile(
     oldPath: string,
     newPath: string,
-    options: { stream?: boolean }
+    options: { stream?: boolean } = {}
   ) {
     if (options?.stream) {
       return this.client.renameFileStream(oldPath, newPath);
@@ -109,7 +116,7 @@ export class Sandbox<Env = unknown> extends Container<Env> {
   async moveFile(
     sourcePath: string,
     destinationPath: string,
-    options: { stream?: boolean }
+    options: { stream?: boolean } = {}
   ) {
     if (options?.stream) {
       return this.client.moveFileStream(sourcePath, destinationPath);
@@ -119,7 +126,7 @@ export class Sandbox<Env = unknown> extends Container<Env> {
 
   async readFile(
     path: string,
-    options: { encoding?: string; stream?: boolean }
+    options: { encoding?: string; stream?: boolean } = {}
   ) {
     if (options?.stream) {
       return this.client.readFileStream(path, options.encoding);