@cloudflare/sandbox 0.5.1 → 0.5.3

package/tests/sandbox.test.ts

@@ -76,6 +76,7 @@ describe('Sandbox - Automatic Session Management', () => {
         .mockImplementation(
           <T>(callback: () => Promise<T>): Promise<T> => callback()
         ),
+      waitUntil: vi.fn(),
       id: {
         toString: () => 'test-sandbox-id',
         equals: vi.fn(),
@@ -86,7 +87,7 @@ describe('Sandbox - Automatic Session Management', () => {
     mockEnv = {};
 
     // Create Sandbox instance - SandboxClient is created internally
-    const stub = new Sandbox(mockCtx, mockEnv);
+    const stub = new Sandbox(mockCtx as DurableObjectState<{}>, mockEnv);
 
     // Wait for blockConcurrencyWhile to complete
     await vi.waitFor(() => {
@@ -138,15 +139,35 @@ describe('Sandbox - Automatic Session Management', () => {
       await sandbox.exec('echo test');
 
       expect(sandbox.client.utils.createSession).toHaveBeenCalledTimes(1);
-      expect(sandbox.client.utils.createSession).toHaveBeenCalledWith({
-        id: expect.stringMatching(/^sandbox-/),
-        env: {},
-        cwd: '/workspace'
-      });
+      expect(sandbox.client.utils.createSession).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: expect.stringMatching(/^sandbox-/),
+          cwd: '/workspace'
+        })
+      );
 
       expect(sandbox.client.commands.execute).toHaveBeenCalledWith(
         'echo test',
-        expect.stringMatching(/^sandbox-/)
+        expect.stringMatching(/^sandbox-/),
+        undefined
+      );
+    });
+
+    it('should forward exec options to the command client', async () => {
+      await sandbox.exec('echo $OPTION', {
+        env: { OPTION: 'value' },
+        cwd: '/workspace/project',
+        timeout: 5000
+      });
+
+      expect(sandbox.client.commands.execute).toHaveBeenCalledWith(
+        'echo $OPTION',
+        expect.stringMatching(/^sandbox-/),
+        {
+          timeoutMs: 5000,
+          env: { OPTION: 'value' },
+          cwd: '/workspace/project'
+        }
       );
     });
 
@@ -240,11 +261,12 @@ describe('Sandbox - Automatic Session Management', () => {
 
       await sandbox.exec('pwd');
 
-      expect(sandbox.client.utils.createSession).toHaveBeenCalledWith({
-        id: 'sandbox-my-sandbox',
-        env: {},
-        cwd: '/workspace'
-      });
+      expect(sandbox.client.utils.createSession).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: 'sandbox-my-sandbox',
+          cwd: '/workspace'
+        })
+      );
     });
   });
 
@@ -288,7 +310,8 @@ describe('Sandbox - Automatic Session Management', () => {
 
       expect(sandbox.client.commands.execute).toHaveBeenCalledWith(
         'echo test',
-        'isolated-session'
+        'isolated-session',
+        undefined
       );
     });
 
@@ -366,11 +389,11 @@ describe('Sandbox - Automatic Session Management', () => {
 
       await sandbox.createSession();
 
-      expect(sandbox.client.utils.createSession).toHaveBeenCalledWith({
-        id: expect.stringMatching(/^session-/),
-        env: undefined,
-        cwd: undefined
-      });
+      expect(sandbox.client.utils.createSession).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: expect.stringMatching(/^session-/)
+        })
+      );
     });
   });
 
@@ -391,7 +414,8 @@ describe('Sandbox - Automatic Session Management', () => {
       await session.exec('pwd');
       expect(sandbox.client.commands.execute).toHaveBeenCalledWith(
         'pwd',
-        'test-session'
+        'test-session',
+        undefined
       );
     });
 
@@ -412,7 +436,7 @@ describe('Sandbox - Automatic Session Management', () => {
       expect(sandbox.client.processes.startProcess).toHaveBeenCalledWith(
         'sleep 10',
         'test-session',
-        { processId: undefined }
+        {}
       );
     });
 
@@ -467,11 +491,12 @@ describe('Sandbox - Automatic Session Management', () => {
     it('should initialize with empty environment when not set', async () => {
       await sandbox.exec('pwd');
 
-      expect(sandbox.client.utils.createSession).toHaveBeenCalledWith({
-        id: expect.any(String),
-        env: {},
-        cwd: '/workspace'
-      });
+      expect(sandbox.client.utils.createSession).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: expect.any(String),
+          cwd: '/workspace'
+        })
+      );
     });
 
     it('should use updated environment after setEnvVars', async () => {
@@ -746,9 +771,10 @@ describe('Sandbox - Automatic Session Management', () => {
       await sandbox.setSandboxName('MyProject-123', false);
 
       vi.spyOn(sandbox.client.ports, 'exposePort').mockResolvedValue({
+        success: true,
         port: 8080,
-        token: 'test-token-1234',
-        previewUrl: ''
+        url: '',
+        timestamp: '2023-01-01T00:00:00Z'
       });
 
       await expect(
@@ -760,9 +786,10 @@ describe('Sandbox - Automatic Session Management', () => {
       await sandbox.setSandboxName('my-project', false);
 
       vi.spyOn(sandbox.client.ports, 'exposePort').mockResolvedValue({
+        success: true,
         port: 8080,
-        token: 'mock-token',
-        previewUrl: ''
+        url: '',
+        timestamp: '2023-01-01T00:00:00Z'
       });
 
       const result = await sandbox.exposePort(8080, {
@@ -779,9 +806,10 @@ describe('Sandbox - Automatic Session Management', () => {
       await sandbox.setSandboxName('myproject-123', true);
 
       vi.spyOn(sandbox.client.ports, 'exposePort').mockResolvedValue({
+        success: true,
         port: 4000,
-        token: 'mock-token',
-        previewUrl: ''
+        url: '',
+        timestamp: '2023-01-01T00:00:00Z'
       });
 
       const result = await sandbox.exposePort(4000, { hostname: 'my-app.dev' });
@@ -796,9 +824,10 @@ describe('Sandbox - Automatic Session Management', () => {
       await sandbox.setSandboxName('test-sandbox', false);
 
       vi.spyOn(sandbox.client.ports, 'exposePort').mockResolvedValue({
+        success: true,
         port: 8080,
-        token: 'mock-token',
-        previewUrl: ''
+        url: '',
+        timestamp: '2023-01-01T00:00:00Z'
       });
 
       const result = await sandbox.exposePort(8080, {
@@ -814,9 +843,10 @@ describe('Sandbox - Automatic Session Management', () => {
       await sandbox.setSandboxName('MyProject-ABC', false);
 
       vi.spyOn(sandbox.client.ports, 'exposePort').mockResolvedValue({
+        success: true,
         port: 8080,
-        token: 'test-token-1234',
-        previewUrl: ''
+        url: '',
+        timestamp: '2023-01-01T00:00:00Z'
       });
 
       await expect(

package/tsconfig.json

@@ -6,6 +6,6 @@
     "lib": ["ES2022"],
     "resolveJsonModule": true
   },
-  "include": ["src/**/*.ts"],
-  "exclude": ["tests/**", "node_modules", "dist"]
+  "include": ["src/**/*.ts", "tests/**/*.ts"],
+  "exclude": ["node_modules", "dist"]
 }

package/tsdown.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig } from 'tsdown';
 
 export default defineConfig({
-  entry: 'src/index.ts',
+  entry: ['src/index.ts', 'src/openai/index.ts'],
   outDir: 'dist',
   dts: {
     sourcemap: true,