Merge pull request #9 from ItsWendell/fix/baseurl-stub

fix: baseUrl and stub forwarding

Author: threepointone

.changeset/angry-pots-sniff.md

@@ -0,0 +1,5 @@
+---
+"@cloudflare/sandbox": patch
+---
+
+fix baseUrl for stub and stub forwarding

packages/sandbox/src/client.ts

@@ -212,7 +212,7 @@ 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(this.baseUrl + path, options, this.options.port);
       } else {
         response = await fetch(this.baseUrl + path, options);
       }

packages/sandbox/src/index.ts

@@ -8,24 +8,29 @@ 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!",