Merge branch 'main' into add-allow-deny-network-out-support

Author: dobrac

.changeset/seven-cooks-tie.md

@@ -0,0 +1,6 @@
+---
+"e2b": patch
+"@e2b/python-sdk": patch
+---
+
+Support overriding sandbox API URL

.changeset/tasty-walls-move.md

@@ -0,0 +1,5 @@
+---
+'e2b': patch
+---
+
+fixes default context directory for windows paths

.github/workflows/cli_tests.yml

@@ -14,9 +14,6 @@ permissions:
 
 jobs:
   test:
-    defaults:
-      run:
-        working-directory: ./packages/cli
     name: CLI - Build
     runs-on: ubuntu-22.04
     steps:
@@ -32,7 +29,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
-        id: pnpm-install
         with:
           version: '${{ env.TOOL_VERSION_PNPM }}'
 
@@ -47,15 +43,20 @@ jobs:
       - name: Configure pnpm
         run: |
           pnpm config set auto-install-peers true
-          pnpm config set exclude-links-from-lockfile true
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Test build
+      - name: Build the SDK (pre-requisite for the tests)
         run: pnpm build
+        working-directory: ./packages/js-sdk
+
+      - name: Build the CLI
+        run: pnpm build
+        working-directory: ./packages/cli
 
       - name: Run tests
         run: pnpm test
+        working-directory: ./packages/cli
         env:
           E2B_API_KEY: ${{ secrets.E2B_API_KEY }}

.github/workflows/python_sdk_tests.yml

@@ -50,6 +50,6 @@ jobs:
         run: poetry build
 
       - name: Run tests
-        run: poetry run pytest --verbose -x
+        run: make test
         env:
           E2B_API_KEY: ${{ secrets.E2B_API_KEY }}

.tool-versions

@@ -2,4 +2,4 @@ deno 1.46.3
 nodejs 20.19.5
 pnpm 9.15.5
 python 3.9
-poetry 1.8.3
+poetry 2.1.1

packages/js-sdk/src/connectionConfig.ts

@@ -35,6 +35,12 @@ export interface ConnectionOpts {
    * @default E2B_API_URL // environment variable or `https://api.${domain}`
    */
   apiUrl?: string
+  /**
+   * Sandbox Url to use for the API.
+   * @internal
+   * @default E2B_SANDBOX_URL // environment variable or `https://${port}-${sandboxID}.${domain}`
+   */
+  sandboxUrl?: string
   /**
    * If true the SDK starts in the debug mode and connects to the local envd API server.
    * @internal
@@ -62,9 +68,12 @@ export interface ConnectionOpts {
  * Configuration for connecting to the API.
  */
 export class ConnectionConfig {
+  public static envdPort = 49983
+
   readonly debug: boolean
   readonly domain: string
   readonly apiUrl: string
+  readonly sandboxUrl?: string
   readonly logger?: Logger
 
   readonly requestTimeoutMs: number
@@ -88,6 +97,8 @@ export class ConnectionConfig {
       opts?.apiUrl ||
       ConnectionConfig.apiUrl ||
       (this.debug ? 'http://localhost:3000' : `https://api.${this.domain}`)
+
+    this.sandboxUrl = opts?.sandboxUrl || ConnectionConfig.sandboxUrl
   }
 
   private static get domain() {
@@ -98,6 +109,10 @@ export class ConnectionConfig {
     return getEnvVar('E2B_API_URL')
   }
 
+  private static get sandboxUrl() {
+    return getEnvVar('E2B_SANDBOX_URL')
+  }
+
   private static get debug() {
     return (getEnvVar('E2B_DEBUG') || 'false').toLowerCase() === 'true'
   }
@@ -115,6 +130,25 @@ export class ConnectionConfig {
 
     return timeout ? AbortSignal.timeout(timeout) : undefined
   }
+
+  getSandboxUrl(
+    sandboxId: string,
+    opts: { sandboxDomain: string; envdPort: number }
+  ) {
+    if (this.sandboxUrl) {
+      return this.sandboxUrl
+    }
+
+    return `${this.debug ? 'http' : 'https'}://${this.getHost(sandboxId, opts.envdPort, opts.sandboxDomain)}`
+  }
+
+  getHost(sandboxId: string, port: number, sandboxDomain: string) {
+    if (this.debug) {
+      return `localhost:${port}`
+    }
+
+    return `${port}-${sandboxId}.${sandboxDomain ?? this.domain}`
+  }
 }
 
 /**

packages/js-sdk/src/sandbox/index.ts

@@ -123,9 +123,15 @@ export class Sandbox extends SandboxApi {
     this.sandboxDomain = opts.sandboxDomain ?? this.connectionConfig.domain
 
     this.envdAccessToken = opts.envdAccessToken
-    this.envdApiUrl = `${
-      this.connectionConfig.debug ? 'http' : 'https'
-    }://${this.getHost(this.envdPort)}`
+    this.envdApiUrl = this.connectionConfig.getSandboxUrl(this.sandboxId, {
+      sandboxDomain: this.sandboxDomain,
+      envdPort: this.envdPort,
+    })
+
+    const sandboxHeaders = {
+      'E2b-Sandbox-Id': this.sandboxId,
+      'E2b-Sandbox-Port': this.envdPort.toString(),
+    }
 
     const rpcTransport = createConnectTransport({
       baseUrl: this.envdApiUrl,
@@ -141,6 +147,9 @@ export class Sandbox extends SandboxApi {
         new Headers(options?.headers).forEach((value, key) =>
           headers.append(key, value)
         )
+        new Headers(sandboxHeaders).forEach((value, key) =>
+          headers.append(key, value)
+        )
 
         if (this.envdAccessToken) {
           headers.append('X-Access-Token', this.envdAccessToken)
@@ -459,11 +468,11 @@ export class Sandbox extends SandboxApi {
    * ```
    */
   getHost(port: number) {
-    if (this.connectionConfig.debug) {
-      return `localhost:${port}`
-    }
-
-    return `${port}-${this.sandboxId}.${this.sandboxDomain}`
+    return this.connectionConfig.getHost(
+      this.sandboxId,
+      port,
+      this.sandboxDomain
+    )
   }
 
   /**

packages/js-sdk/src/sandbox/sandboxApi.ts

@@ -115,6 +115,11 @@ export interface SandboxOpts extends ConnectionOpts {
    * Sandbox network configuration
    */
   network?: SandboxNetworkOpts
+  
+  /**
+   * Sandbox URL. Used for local development
+   */
+  sandboxUrl?: string
 }
 
 export type SandboxBetaCreateOpts = SandboxOpts & {

packages/js-sdk/src/template/utils.ts

@@ -176,35 +176,21 @@ export function getCallerFrame(depth: number): string | undefined {
   return lines.slice(depth).join('\n')
 }
 
-/**
- * Extract the directory path from a stack trace line.
- *
- * Matches patterns like:
- * - "at <anonymous> (/path/to/file.js:1:1)"
- * - "at /path/to/file.js:1:1"
- * - "at <anonymous> (file:///C:/path/to/file.js:1:1)"
- * - "at (file:///C:/path/to/file.js:1:1)"
- * @param line A line from a stack trace
- * @returns The directory of the file, or undefined if not found
- */
-export function matchFileDir(line: string): string | undefined {
-  const match = line.match(
-    /(?:file:\/\/\/)?([A-Za-z]:)?([/\\][^:]+)(?::\d+:\d+)?\)?/
-  )
-  if (match) {
-    // Extract the full matched path
-    let filePath = match[0]
-
-    // Remove file:/// protocol prefix if present
-    filePath = filePath.replace(/^file:\/\/\//, '')
-
-    // Remove trailing closing parenthesis if present
-    filePath = filePath.replace(/\)$/, '')
-
-    // Remove :line:column suffix if present
-    filePath = filePath.replace(/:\d+:\d+$/, '')
+// adopted from https://github.com/sindresorhus/callsites
+export function callsites(depth: number): NodeJS.CallSite[] {
+  const _originalPrepareStackTrace = Error.prepareStackTrace
+  try {
+    let result: NodeJS.CallSite[] = []
+    Error.prepareStackTrace = (_, callSites) => {
+      const callSitesWithoutCurrent = callSites.slice(depth)
+      result = callSitesWithoutCurrent
+      return callSitesWithoutCurrent
+    }
 
-    return path.dirname(filePath)
+    new Error().stack
+    return result
+  } finally {
+    Error.prepareStackTrace = _originalPrepareStackTrace
   }
 }
 
@@ -215,18 +201,18 @@ export function matchFileDir(line: string): string | undefined {
  * @returns The caller's directory path, or undefined if not available
  */
 export function getCallerDirectory(depth: number): string | undefined {
-  const caller = getCallerFrame(depth + 1) // +1 depth to skip this function (getCallerDirectory)
-  if (!caller) {
-    return
+  // +1 depth to skip this function (getCallerDirectory)
+  const callSites = callsites(depth + 1)
+  if (callSites.length === 0) {
+    return undefined
   }
 
-  const lines = caller.split('\n')
-  if (lines.length === 0) {
-    return
+  const fileName = callSites[0].getFileName()
+  if (!fileName) {
+    return undefined
   }
 
-  const firstLine = lines[0]
-  return matchFileDir(firstLine)
+  return path.dirname(fileName)
 }
 
 /**