@cloudflare/sandbox 0.0.0-4aceb32 → 0.0.0-4bedc3a

package/container_src/jupyter-service.ts

@@ -133,16 +133,29 @@ export class JupyterService {
    * Pre-warm context pools for better performance
    */
   private async warmContextPools() {
+    // Delay pre-warming to avoid startup rush that triggers Bun WebSocket bug
+    await new Promise((resolve) => setTimeout(resolve, 2000));
+
     try {
       console.log(
         "[JupyterService] Pre-warming context pools for better performance"
       );
 
-      // Enable pool warming with min sizes
+      // Only pre-warm Python contexts to avoid Bun WebSocket validation errors
+      // JavaScript contexts will be created on-demand
       await this.jupyterServer.enablePoolWarming("python", 1);
-      await this.jupyterServer.enablePoolWarming("javascript", 1);
+
+      // Commenting out JavaScript pre-warming due to kernel message validation errors
+      // The errors appear to be related to Bun's handling of WebSocket messages
+      // JavaScript contexts still work fine when created on-demand
+      // 
+      // await new Promise((resolve) => setTimeout(resolve, 1000));
+      // await this.jupyterServer.enablePoolWarming("javascript", 1);
     } catch (error) {
       console.error("[JupyterService] Error pre-warming context pools:", error);
+      console.error(
+        "[JupyterService] Pre-warming failed but service continues"
+      );
     }
   }
 

package/container_src/jupyter_config.py

@@ -0,0 +1,48 @@
+"""
+Minimal Jupyter configuration focused on kernel-only usage
+"""
+
+c = get_config()  # noqa
+
+# Disable all authentication - we handle security at container level
+c.ServerApp.token = ''
+c.ServerApp.password = ''
+c.IdentityProvider.token = ''
+c.ServerApp.allow_origin = '*'
+c.ServerApp.allow_remote_access = True
+c.ServerApp.disable_check_xsrf = True
+c.ServerApp.allow_root = True
+c.ServerApp.allow_credentials = True
+
+# Also set NotebookApp settings for compatibility
+c.NotebookApp.token = ''
+c.NotebookApp.password = ''
+c.NotebookApp.allow_origin = '*'
+c.NotebookApp.allow_remote_access = True
+c.NotebookApp.disable_check_xsrf = True
+c.NotebookApp.allow_credentials = True
+
+# Performance settings
+c.ServerApp.iopub_data_rate_limit = 1000000000  # E2B uses 1GB/s
+
+# Minimal logging
+c.Application.log_level = 'ERROR'
+
+# Disable browser
+c.ServerApp.open_browser = False
+
+# Optimize for container environment
+c.ServerApp.ip = '0.0.0.0'
+c.ServerApp.port = 8888
+
+# Kernel optimizations
+c.KernelManager.shutdown_wait_time = 0.0
+c.MappingKernelManager.cull_idle_timeout = 0
+c.MappingKernelManager.cull_interval = 0
+
+# Disable terminals
+c.ServerApp.terminals_enabled = False
+
+# Disable all extensions to speed up startup
+c.ServerApp.jpserver_extensions = {}
+c.ServerApp.nbserver_extensions = {}

package/container_src/shell-escape.ts

@@ -0,0 +1,42 @@
+/**
+ * Secure shell command utilities to prevent injection attacks
+ */
+
+/**
+ * Escapes a string for safe use in shell commands.
+ * This follows POSIX shell escaping rules to prevent command injection.
+ * 
+ * @param str - The string to escape
+ * @returns The escaped string safe for shell use
+ */
+export function escapeShellArg(str: string): string {
+  // If string is empty, return empty quotes
+  if (str === '') {
+    return "''";
+  }
+
+  // Check if string contains any characters that need escaping
+  // Safe characters: alphanumeric, dash, underscore, dot, slash
+  if (/^[a-zA-Z0-9._\-/]+$/.test(str)) {
+    return str;
+  }
+
+  // For strings with special characters, use single quotes and escape single quotes
+  // Single quotes preserve all characters literally except the single quote itself
+  // To include a single quote, we end the quoted string, add an escaped quote, and start a new quoted string
+  return `'${str.replace(/'/g, "'\\''")}'`;
+}
+
+/**
+ * Escapes a file path for safe use in shell commands.
+ * 
+ * @param path - The file path to escape
+ * @returns The escaped path safe for shell use
+ */
+export function escapeShellPath(path: string): string {
+  // Normalize path to prevent issues with multiple slashes
+  const normalizedPath = path.replace(/\/+/g, '/');
+  
+  // Apply standard shell escaping
+  return escapeShellArg(normalizedPath);
+}

package/container_src/startup.sh

@@ -2,7 +2,8 @@
 
 # Function to check if Jupyter is ready
 check_jupyter_ready() {
-  curl -s http://localhost:8888/api > /dev/null 2>&1
+  # Check if API is responsive and kernelspecs are available
+  curl -s http://localhost:8888/api/kernelspecs > /dev/null 2>&1
 }
 
 # Function to notify Bun server that Jupyter is ready
@@ -12,19 +13,10 @@ notify_jupyter_ready() {
   echo "[Startup] Jupyter is ready, notified Bun server"
 }
 
-# Start Jupyter notebook server in background
+# Start Jupyter server in background
 echo "[Startup] Starting Jupyter server..."
-jupyter notebook \
-  --ip=0.0.0.0 \
-  --port=8888 \
-  --no-browser \
-  --allow-root \
-  --NotebookApp.token='' \
-  --NotebookApp.password='' \
-  --NotebookApp.allow_origin='*' \
-  --NotebookApp.disable_check_xsrf=True \
-  --NotebookApp.allow_remote_access=True \
-  --NotebookApp.allow_credentials=True \
+jupyter server \
+  --config=/container-server/jupyter_config.py \
   > /tmp/jupyter.log 2>&1 &
 
 JUPYTER_PID=$!
@@ -37,18 +29,21 @@ BUN_PID=$!
 # Monitor Jupyter readiness in background
 (
   echo "[Startup] Monitoring Jupyter readiness in background..."
-  MAX_ATTEMPTS=30
+  MAX_ATTEMPTS=60
   ATTEMPT=0
-  DELAY=0.5
-  MAX_DELAY=5
-  
+
+  # Track start time for reporting
+  START_TIME=$(date +%s.%N)
+
   while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
     if check_jupyter_ready; then
       notify_jupyter_ready
-      echo "[Startup] Jupyter server is ready after $ATTEMPT attempts"
+      END_TIME=$(date +%s.%N)
+      ELAPSED=$(awk "BEGIN {printf \"%.2f\", $END_TIME - $START_TIME}")
+      echo "[Startup] Jupyter server is ready after $ELAPSED seconds ($ATTEMPT attempts)"
       break
     fi
-    
+
     # Check if Jupyter process is still running
     if ! kill -0 $JUPYTER_PID 2>/dev/null; then
       echo "[Startup] WARNING: Jupyter process died. Check /tmp/jupyter.log for details"
@@ -56,21 +51,27 @@ BUN_PID=$!
       # Don't exit - let Bun server continue running in degraded mode
       break
     fi
-    
+
     ATTEMPT=$((ATTEMPT + 1))
-    echo "[Startup] Jupyter not ready yet (attempt $ATTEMPT/$MAX_ATTEMPTS, delay ${DELAY}s)"
-    
-    # Sleep with exponential backoff
-    sleep $DELAY
-    
-    # Increase delay exponentially with jitter, cap at MAX_DELAY
-    DELAY=$(awk "BEGIN {printf \"%.2f\", $DELAY * 1.5 + (rand() * 0.5)}")
-    # Use awk for comparison since bc might not be available
-    if [ $(awk "BEGIN {print ($DELAY > $MAX_DELAY)}") -eq 1 ]; then
-      DELAY=$MAX_DELAY
+
+    # Start with faster checks
+    if [ $ATTEMPT -eq 1 ]; then
+      DELAY=0.5  # Start at 0.5s
+    else
+      # Exponential backoff with 1.3x multiplier (less aggressive than 1.5x)
+      DELAY=$(awk "BEGIN {printf \"%.2f\", $DELAY * 1.3}")
+      # Cap at 2s max (instead of 5s)
+      if [ $(awk "BEGIN {print ($DELAY > 2)}") -eq 1 ]; then
+        DELAY=2
+      fi
     fi
+
+    # Log with current delay for transparency
+    echo "[Startup] Jupyter not ready yet (attempt $ATTEMPT/$MAX_ATTEMPTS, next check in ${DELAY}s)"
+
+    sleep $DELAY
   done
-  
+
   if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then
     echo "[Startup] WARNING: Jupyter failed to become ready within attempts"
     echo "[Startup] Jupyter logs:"
@@ -80,4 +81,4 @@ BUN_PID=$!
 ) &
 
 # Wait for Bun server (main process)
-wait $BUN_PID
+wait $BUN_PID

package/container_src/types.ts

@@ -17,19 +17,20 @@ export interface ProcessRecord {
   startTime: Date;
   endTime?: Date;
   exitCode?: number;
-  sessionId?: string;
-  childProcess?: ChildProcess;
+  stdoutFile?: string;  // Path to temp file containing stdout
+  stderrFile?: string;  // Path to temp file containing stderr
   stdout: string;
   stderr: string;
   outputListeners: Set<(stream: 'stdout' | 'stderr', data: string) => void>;
   statusListeners: Set<(status: ProcessStatus) => void>;
+  monitoringInterval?: NodeJS.Timeout;  // For polling temp files when streaming
 }
 
 export interface StartProcessRequest {
   command: string;
+  sessionId: string;
   options?: {
     processId?: string;
-    sessionId?: string;
     timeout?: number;
     env?: Record<string, string>;
     cwd?: string;
@@ -39,7 +40,6 @@ export interface StartProcessRequest {
 }
 
 export interface ExecuteOptions {
-  sessionId?: string | null;
   background?: boolean;
   cwd?: string | URL;
   env?: Record<string, string>;
@@ -47,49 +47,59 @@ export interface ExecuteOptions {
 
 export interface ExecuteRequest extends ExecuteOptions {
   command: string;
+  sessionId: string;
 }
 
 export interface GitCheckoutRequest {
   repoUrl: string;
   branch?: string;
   targetDir?: string;
-  sessionId?: string;
+  sessionId: string;
 }
 
 export interface MkdirRequest {
   path: string;
   recursive?: boolean;
-  sessionId?: string;
+  sessionId: string;
 }
 
 export interface WriteFileRequest {
   path: string;
   content: string;
   encoding?: string;
-  sessionId?: string;
+  sessionId: string;
 }
 
 export interface ReadFileRequest {
   path: string;
   encoding?: string;
-  sessionId?: string;
+  sessionId: string;
 }
 
 export interface DeleteFileRequest {
   path: string;
-  sessionId?: string;
+  sessionId: string;
 }
 
 export interface RenameFileRequest {
   oldPath: string;
   newPath: string;
-  sessionId?: string;
+  sessionId: string;
 }
 
 export interface MoveFileRequest {
   sourcePath: string;
   destinationPath: string;
-  sessionId?: string;
+  sessionId: string;
+}
+
+export interface ListFilesRequest {
+  path: string;
+  options?: {
+    recursive?: boolean;
+    includeHidden?: boolean;
+  };
+  sessionId: string;
 }
 
 export interface ExposePortRequest {
@@ -102,7 +112,20 @@ export interface UnexposePortRequest {
 }
 
 export interface SessionData {
-  sessionId: string;
+  id: string;
   activeProcess: ChildProcess | null;
   createdAt: Date;
 }
+
+// Session management API types
+export interface CreateSessionRequest {
+  id: string;
+  env?: Record<string, string>;
+  cwd?: string;
+  isolation?: boolean;
+}
+
+export interface SessionExecRequest {
+  id: string;
+  command: string;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/sandbox",
-  "version": "0.0.0-4aceb32",
+  "version": "0.0.0-4bedc3a",
   "repository": {
     "type": "git",
     "url": "https://github.com/cloudflare/sandbox-sdk"