@cloudflare/sandbox 0.0.0-037c848 → 0.0.0-16a90ce

package/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @cloudflare/sandbox
 
-## 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,6 +1,6 @@
 {
   "name": "@cloudflare/sandbox",
-  "version": "0.0.0-037c848",
+  "version": "0.0.0-16a90ce",
   "repository": {
     "type": "git",
     "url": "https://github.com/cloudflare/sandbox-sdk"

package/src/client.ts

@@ -203,9 +203,7 @@ export class HttpClient {
     path: string,
     options?: RequestInit
   ): Promise<Response> {
-    const url = this.options.stub
-      ? `http://localhost:${this.options.port}${path}`
-      : `${this.baseUrl}${path}`;
+    const url = this.options.stub ? `stub:${path}` : `${this.baseUrl}${path}`;
     const method = options?.method || "GET";
 
     console.log(`[HTTP Client] Making ${method} request to ${url}`);
@@ -214,23 +212,15 @@ export class HttpClient {
       let response: Response;
 
       if (this.options.stub) {
-        response = await this.options.stub.containerFetch(
-          url,
-          options,
-          this.options.port
-        );
+        response = await this.options.stub.containerFetch(path, options, this.options.port);
       } else {
-        response = await fetch(url, options);
+        response = await fetch(this.baseUrl + path, 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,31 +8,24 @@ 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;
 
-  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,
-    });
-  }
+  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,
+  });
 
   envVars = {
     MESSAGE: "I was passed in via the Sandbox class!",
@@ -76,7 +69,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);
@@ -87,7 +80,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);
@@ -95,7 +88,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);
     }
@@ -105,7 +98,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);
@@ -116,7 +109,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);
@@ -126,7 +119,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);