@cloudflare/sandbox 0.5.6 → 0.6.1

package/src/openai/index.ts

@@ -1,465 +0,0 @@
-/**
- * OpenAI Agents adapters for executing shell commands and file operations
- * inside a Cloudflare Sandbox.
- */
-import {
-  type ApplyPatchOperation,
-  type ApplyPatchResult,
-  applyDiff,
-  type Editor as OpenAIEeditor,
-  type Shell as OpenAIShell,
-  type ShellAction,
-  type ShellOutputResult,
-  type ShellResult
-} from '@openai/agents';
-
-// Command result for API responses
-export interface CommandResult {
-  command: string;
-  stdout: string;
-  stderr: string;
-  exitCode: number | null;
-  timestamp: number;
-}
-
-// File operation result for API responses
-export interface FileOperationResult {
-  operation: 'create' | 'update' | 'delete';
-  path: string;
-  status: 'completed' | 'failed';
-  output: string;
-  error?: string;
-  timestamp: number;
-}
-
-import { createLogger, type Logger } from '@repo/shared';
-import type { Sandbox } from '../sandbox';
-
-// Helper functions for error handling
-function isErrorWithProperties(error: unknown): error is {
-  message?: string;
-  exitCode?: number;
-  stdout?: string;
-  stderr?: string;
-  status?: number;
-  stack?: string;
-} {
-  return typeof error === 'object' && error !== null;
-}
-
-function getErrorMessage(error: unknown): string {
-  if (isErrorWithProperties(error) && typeof error.message === 'string') {
-    return error.message;
-  }
-  return String(error);
-}
-
-/**
- * Convert unknown values to Error instances when possible so downstream
- * loggers can include stack traces without losing type safety.
- */
-function toError(error: unknown): Error | undefined {
-  return error instanceof Error ? error : undefined;
-}
-
-/**
- * Shell implementation that adapts Cloudflare Sandbox exec calls to the
- * OpenAI Agents `Shell` contract, including structured result collection.
- */
-export class Shell implements OpenAIShell {
-  private cwd: string = '/workspace';
-  public results: CommandResult[] = [];
-  private readonly logger: Logger;
-
-  constructor(private readonly sandbox: Sandbox) {
-    this.logger = createLogger({
-      component: 'sandbox-do',
-      operation: 'openai-shell'
-    });
-  }
-
-  async run(action: ShellAction): Promise<ShellResult> {
-    this.logger.debug('SandboxShell.run called', {
-      commands: action.commands,
-      timeout: action.timeoutMs
-    });
-    const output: ShellResult['output'] = [];
-
-    for (const command of action.commands) {
-      this.logger.debug('Executing command', { command, cwd: this.cwd });
-      let stdout = '';
-      let stderr = '';
-      let exitCode: number | null = 0;
-      let outcome: ShellOutputResult['outcome'] = {
-        type: 'exit',
-        exitCode: 0
-      };
-      try {
-        const result = await this.sandbox.exec(command, {
-          timeout: action.timeoutMs,
-          cwd: this.cwd
-        });
-        stdout = result.stdout;
-        stderr = result.stderr;
-        exitCode = result.exitCode;
-        // exec returns a result even for failed commands, so check success field
-        // Timeout would be indicated by a specific error or exit code
-        outcome = { type: 'exit', exitCode };
-
-        this.logger.debug('Command executed successfully', {
-          command,
-          exitCode,
-          stdoutLength: stdout.length,
-          stderrLength: stderr.length
-        });
-
-        // Log warnings for non-zero exit codes or stderr output
-        if (exitCode !== 0) {
-          this.logger.warn(`Command failed with exit code ${exitCode}`, {
-            command,
-            stderr
-          });
-        } else if (stderr) {
-          this.logger.warn(`Command produced stderr output`, {
-            command,
-            stderr
-          });
-        } else {
-          this.logger.info(`Command completed successfully`, { command });
-        }
-      } catch (error: unknown) {
-        // Handle network/HTTP errors or timeout errors
-        const errorObj = isErrorWithProperties(error) ? error : {};
-        exitCode =
-          typeof errorObj.exitCode === 'number' ? errorObj.exitCode : null;
-        stdout = typeof errorObj.stdout === 'string' ? errorObj.stdout : '';
-        stderr = typeof errorObj.stderr === 'string' ? errorObj.stderr : '';
-
-        // Check if it's a timeout error
-        const errorMessage = getErrorMessage(error);
-        if (
-          errorMessage.includes('timeout') ||
-          errorMessage.includes('Timeout') ||
-          errorMessage.includes('timed out')
-        ) {
-          this.logger.error(`Command timed out`, undefined, {
-            command,
-            timeout: action.timeoutMs
-          });
-          outcome = { type: 'timeout' };
-        } else {
-          this.logger.error(`Error executing command`, toError(error), {
-            command,
-            error: errorMessage || error,
-            exitCode
-          });
-          outcome = { type: 'exit', exitCode: exitCode ?? 1 };
-        }
-      }
-      output.push({
-        command,
-        stdout,
-        stderr,
-        outcome
-      });
-
-      // Collect results for API responses
-      const collectedExitCode =
-        outcome.type === 'exit' ? outcome.exitCode : null;
-      const timestamp = Date.now();
-      this.results.push({
-        command: String(command),
-        stdout: String(stdout),
-        stderr: String(stderr),
-        exitCode: collectedExitCode,
-        timestamp
-      });
-      this.logger.debug('Result collected', {
-        command,
-        exitCode: collectedExitCode,
-        timestamp
-      });
-
-      if (outcome.type === 'timeout') {
-        this.logger.warn('Breaking command loop due to timeout');
-        break;
-      }
-    }
-
-    this.logger.debug('SandboxShell.run completed', {
-      totalCommands: action.commands.length,
-      resultsCount: this.results.length
-    });
-    return {
-      output,
-      providerData: {
-        working_directory: this.cwd
-      }
-    };
-  }
-}
-
-/**
- * Editor implementation that projects applyPatch operations from Agents
- * into calls against the sandbox filesystem APIs.
- */
-export class Editor implements OpenAIEeditor {
-  public results: FileOperationResult[] = [];
-  private readonly logger: Logger;
-
-  constructor(
-    private readonly sandbox: Sandbox,
-    private readonly root: string = '/workspace'
-  ) {
-    this.logger = createLogger({
-      component: 'sandbox-do',
-      operation: 'openai-editor'
-    });
-  }
-
-  /**
-   * Create a new file inside the sandbox by applying the provided diff.
-   */
-  async createFile(
-    operation: Extract<ApplyPatchOperation, { type: 'create_file' }>
-  ): Promise<ApplyPatchResult | undefined> {
-    const targetPath = this.resolve(operation.path);
-    this.logger.debug('WorkspaceEditor.createFile called', {
-      path: operation.path,
-      targetPath
-    });
-
-    try {
-      // Create parent directory if needed
-      const dirPath = this.getDirname(targetPath);
-      if (dirPath !== this.root && dirPath !== '/') {
-        this.logger.debug('Creating parent directory', { dirPath });
-        await this.sandbox.mkdir(dirPath, { recursive: true });
-      }
-
-      const content = applyDiff('', operation.diff, 'create');
-      this.logger.debug('Writing file content', {
-        path: targetPath,
-        contentLength: content.length
-      });
-      await this.sandbox.writeFile(targetPath, content, { encoding: 'utf-8' });
-      const timestamp = Date.now();
-      const result: FileOperationResult = {
-        operation: 'create',
-        path: operation.path,
-        status: 'completed',
-        output: `Created ${operation.path}`,
-        timestamp
-      };
-      this.results.push(result);
-      this.logger.info('File created successfully', {
-        path: operation.path,
-        timestamp
-      });
-      return { status: 'completed', output: `Created ${operation.path}` };
-    } catch (error: unknown) {
-      const timestamp = Date.now();
-      const errorMessage = getErrorMessage(error);
-      const result: FileOperationResult = {
-        operation: 'create',
-        path: operation.path,
-        status: 'failed',
-        output: `Failed to create ${operation.path}`,
-        error: errorMessage,
-        timestamp
-      };
-      this.results.push(result);
-      this.logger.error('Failed to create file', toError(error), {
-        path: operation.path,
-        error: errorMessage
-      });
-      throw error;
-    }
-  }
-
-  /**
-   * Update an existing file by reading its content, applying a diff, and
-   * writing the patched output back to the sandbox.
-   */
-  async updateFile(
-    operation: Extract<ApplyPatchOperation, { type: 'update_file' }>
-  ): Promise<ApplyPatchResult | undefined> {
-    const targetPath = this.resolve(operation.path);
-    this.logger.debug('WorkspaceEditor.updateFile called', {
-      path: operation.path,
-      targetPath
-    });
-
-    try {
-      let original: string;
-      try {
-        this.logger.debug('Reading original file', { path: targetPath });
-        const fileInfo = await this.sandbox.readFile(targetPath, {
-          encoding: 'utf-8'
-        });
-        original = fileInfo.content;
-        this.logger.debug('Original file read', {
-          path: targetPath,
-          originalLength: original.length
-        });
-      } catch (error: unknown) {
-        // Sandbox API may throw errors for missing files
-        const errorObj = isErrorWithProperties(error) ? error : {};
-        const errorMessage = getErrorMessage(error);
-        if (
-          errorMessage.includes('not found') ||
-          errorMessage.includes('ENOENT') ||
-          errorObj.status === 404
-        ) {
-          this.logger.error('Cannot update missing file', undefined, {
-            path: operation.path
-          });
-          throw new Error(`Cannot update missing file: ${operation.path}`);
-        }
-        this.logger.error('Error reading file', toError(error), {
-          path: operation.path,
-          error: errorMessage
-        });
-        throw error;
-      }
-
-      const patched = applyDiff(original, operation.diff);
-      this.logger.debug('Applied diff', {
-        path: targetPath,
-        originalLength: original.length,
-        patchedLength: patched.length
-      });
-      await this.sandbox.writeFile(targetPath, patched, { encoding: 'utf-8' });
-      const timestamp = Date.now();
-      const result: FileOperationResult = {
-        operation: 'update',
-        path: operation.path,
-        status: 'completed',
-        output: `Updated ${operation.path}`,
-        timestamp
-      };
-      this.results.push(result);
-      this.logger.info('File updated successfully', {
-        path: operation.path,
-        timestamp
-      });
-      return { status: 'completed', output: `Updated ${operation.path}` };
-    } catch (error: unknown) {
-      const timestamp = Date.now();
-      const errorMessage = getErrorMessage(error);
-      const result: FileOperationResult = {
-        operation: 'update',
-        path: operation.path,
-        status: 'failed',
-        output: `Failed to update ${operation.path}`,
-        error: errorMessage,
-        timestamp
-      };
-      this.results.push(result);
-      this.logger.error('Failed to update file', toError(error), {
-        path: operation.path,
-        error: errorMessage
-      });
-      throw error;
-    }
-  }
-
-  /**
-   * Delete a file that was previously created through applyPatch calls.
-   */
-  async deleteFile(
-    operation: Extract<ApplyPatchOperation, { type: 'delete_file' }>
-  ): Promise<ApplyPatchResult | undefined> {
-    const targetPath = this.resolve(operation.path);
-    this.logger.debug('WorkspaceEditor.deleteFile called', {
-      path: operation.path,
-      targetPath
-    });
-
-    try {
-      await this.sandbox.deleteFile(targetPath);
-      const timestamp = Date.now();
-      const result: FileOperationResult = {
-        operation: 'delete',
-        path: operation.path,
-        status: 'completed',
-        output: `Deleted ${operation.path}`,
-        timestamp
-      };
-      this.results.push(result);
-      this.logger.info('File deleted successfully', {
-        path: operation.path,
-        timestamp
-      });
-      return { status: 'completed', output: `Deleted ${operation.path}` };
-    } catch (error: unknown) {
-      const timestamp = Date.now();
-      const errorMessage = getErrorMessage(error);
-      const result: FileOperationResult = {
-        operation: 'delete',
-        path: operation.path,
-        status: 'failed',
-        output: `Failed to delete ${operation.path}`,
-        error: errorMessage,
-        timestamp
-      };
-      this.results.push(result);
-      this.logger.error('Failed to delete file', toError(error), {
-        path: operation.path,
-        error: errorMessage
-      });
-      throw error;
-    }
-  }
-
-  private resolve(relativePath: string): string {
-    // If the path already starts with the root, strip it to get the relative part
-    let pathToProcess = relativePath;
-    if (relativePath.startsWith(this.root)) {
-      pathToProcess = relativePath.slice(this.root.length);
-      // Remove leading slash if present after stripping root
-      pathToProcess = pathToProcess.replace(/^\//, '');
-    }
-
-    // Remove leading ./ or / if present, then join with root
-    const normalized = pathToProcess.replace(/^\.\//, '').replace(/^\//, '');
-    const resolved = normalized ? `${this.root}/${normalized}` : this.root;
-
-    // Normalize path separators first
-    const pathWithNormalizedSeparators = resolved.replace(/\/+/g, '/');
-
-    // Normalize .. segments by processing path segments
-    const segments = pathWithNormalizedSeparators
-      .split('/')
-      .filter((s) => s && s !== '.');
-    const stack: string[] = [];
-
-    for (const segment of segments) {
-      if (segment === '..') {
-        if (stack.length === 0) {
-          throw new Error(`Operation outside workspace: ${relativePath}`);
-        }
-        stack.pop();
-      } else {
-        stack.push(segment);
-      }
-    }
-
-    const normalizedPath = `/${stack.join('/')}`;
-
-    // Ensure the resolved path is within the workspace
-    if (!normalizedPath.startsWith(this.root)) {
-      throw new Error(`Operation outside workspace: ${relativePath}`);
-    }
-
-    return normalizedPath;
-  }
-
-  private getDirname(filePath: string): string {
-    const lastSlash = filePath.lastIndexOf('/');
-    if (lastSlash === -1) {
-      return '/';
-    }
-    return filePath.substring(0, lastSlash) || '/';
-  }
-}

package/src/request-handler.ts

@@ -1,184 +0,0 @@
-import { switchPort } from '@cloudflare/containers';
-import { createLogger, type LogContext, TraceContext } from '@repo/shared';
-import { getSandbox, type Sandbox } from './sandbox';
-import { sanitizeSandboxId, validatePort } from './security';
-
-export interface SandboxEnv {
-  Sandbox: DurableObjectNamespace<Sandbox>;
-}
-
-export interface RouteInfo {
-  port: number;
-  sandboxId: string;
-  path: string;
-  token: string;
-}
-
-export async function proxyToSandbox<E extends SandboxEnv>(
-  request: Request,
-  env: E
-): Promise<Response | null> {
-  // Create logger context for this request
-  const traceId =
-    TraceContext.fromHeaders(request.headers) || TraceContext.generate();
-  const logger = createLogger({
-    component: 'sandbox-do',
-    traceId,
-    operation: 'proxy'
-  });
-
-  try {
-    const url = new URL(request.url);
-    const routeInfo = extractSandboxRoute(url);
-
-    if (!routeInfo) {
-      return null; // Not a request to an exposed container port
-    }
-
-    const { sandboxId, port, path, token } = routeInfo;
-    // Preview URLs always use normalized (lowercase) IDs
-    const sandbox = getSandbox(env.Sandbox, sandboxId, { normalizeId: true });
-
-    // Critical security check: Validate token (mandatory for all user ports)
-    // Skip check for control plane port 3000
-    if (port !== 3000) {
-      // Validate the token matches the port
-      const isValidToken = await sandbox.validatePortToken(port, token);
-      if (!isValidToken) {
-        logger.warn('Invalid token access blocked', {
-          port,
-          sandboxId,
-          path,
-          hostname: url.hostname,
-          url: request.url,
-          method: request.method,
-          userAgent: request.headers.get('User-Agent') || 'unknown'
-        });
-
-        return new Response(
-          JSON.stringify({
-            error: `Access denied: Invalid token or port not exposed`,
-            code: 'INVALID_TOKEN'
-          }),
-          {
-            status: 404,
-            headers: {
-              'Content-Type': 'application/json'
-            }
-          }
-        );
-      }
-    }
-
-    // Detect WebSocket upgrade request
-    const upgradeHeader = request.headers.get('Upgrade');
-    if (upgradeHeader?.toLowerCase() === 'websocket') {
-      // WebSocket path: Must use fetch() not containerFetch()
-      // This bypasses JSRPC serialization boundary which cannot handle WebSocket upgrades
-      return await sandbox.fetch(switchPort(request, port));
-    }
-
-    // Build proxy request with proper headers
-    let proxyUrl: string;
-
-    // Route based on the target port
-    if (port !== 3000) {
-      // Route directly to user's service on the specified port
-      proxyUrl = `http://localhost:${port}${path}${url.search}`;
-    } else {
-      // Port 3000 is our control plane - route normally
-      proxyUrl = `http://localhost:3000${path}${url.search}`;
-    }
-
-    const proxyRequest = new Request(proxyUrl, {
-      method: request.method,
-      headers: {
-        ...Object.fromEntries(request.headers),
-        'X-Original-URL': request.url,
-        'X-Forwarded-Host': url.hostname,
-        'X-Forwarded-Proto': url.protocol.replace(':', ''),
-        'X-Sandbox-Name': sandboxId // Pass the friendly name
-      },
-      body: request.body,
-      // @ts-expect-error - duplex required for body streaming in modern runtimes
-      duplex: 'half'
-    });
-
-    return await sandbox.containerFetch(proxyRequest, port);
-  } catch (error) {
-    logger.error(
-      'Proxy routing error',
-      error instanceof Error ? error : new Error(String(error))
-    );
-    return new Response('Proxy routing error', { status: 500 });
-  }
-}
-
-function extractSandboxRoute(url: URL): RouteInfo | null {
-  // Parse subdomain pattern: port-sandboxId-token.domain (tokens mandatory)
-  // Token is always exactly 16 chars (generated by generatePortToken)
-  const subdomainMatch = url.hostname.match(
-    /^(\d{4,5})-([^.-][^.]*?[^.-]|[^.-])-([a-z0-9_-]{16})\.(.+)$/
-  );
-
-  if (!subdomainMatch) {
-    return null;
-  }
-
-  const portStr = subdomainMatch[1];
-  const sandboxId = subdomainMatch[2];
-  const token = subdomainMatch[3]; // Mandatory token
-  const domain = subdomainMatch[4];
-
-  const port = parseInt(portStr, 10);
-  if (!validatePort(port)) {
-    return null;
-  }
-
-  let sanitizedSandboxId: string;
-  try {
-    sanitizedSandboxId = sanitizeSandboxId(sandboxId);
-  } catch (error) {
-    return null;
-  }
-
-  // DNS subdomain length limit is 63 characters
-  if (sandboxId.length > 63) {
-    return null;
-  }
-
-  return {
-    port,
-    sandboxId: sanitizedSandboxId,
-    path: url.pathname || '/',
-    token
-  };
-}
-
-export function isLocalhostPattern(hostname: string): boolean {
-  // Handle IPv6 addresses in brackets (with or without port)
-  if (hostname.startsWith('[')) {
-    if (hostname.includes(']:')) {
-      // [::1]:port format
-      const ipv6Part = hostname.substring(0, hostname.indexOf(']:') + 1);
-      return ipv6Part === '[::1]';
-    } else {
-      // [::1] format without port
-      return hostname === '[::1]';
-    }
-  }
-
-  // Handle bare IPv6 without brackets
-  if (hostname === '::1') {
-    return true;
-  }
-
-  // For IPv4 and regular hostnames, split on colon to remove port
-  const hostPart = hostname.split(':')[0];
-
-  return (
-    hostPart === 'localhost' ||
-    hostPart === '127.0.0.1' ||
-    hostPart === '0.0.0.0'
-  );
-}