Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
feat(js-sdk): run the full test suite under Bun (#1584)
Mish Ushakova406f78658e0
diff --git a/.changeset/bun-suite-fetch-fixes.md b/.changeset/bun-suite-fetch-fixes.mdnew file mode 100644index 000000000..171b836a6--- /dev/null+++ b/.changeset/bun-suite-fetch-fixes.md@@ -0,0 +1,8 @@+---+'e2b': patch+---++Fix fetch handling on non-Node runtimes (Bun, Deno, browsers, edge):++- The SDK now late-binds `globalThis.fetch` instead of capturing the reference at client creation, so a fetch replaced afterwards (msw, instrumentation) is picked up, and per-proxy fetcher cache entries stay distinct.+- Request/idle timeout abort reasons are pinned to their `AbortController` to work around Bun dropping weakly-held `AbortSignal.reason` values, so timeouts on Bun surface as `TimeoutError` instead of an `undefined` reason.diff --git a/.github/workflows/js_sdk_tests.yml b/.github/workflows/js_sdk_tests.ymlindex c9f905988..f87c03dc7 100644--- a/.github/workflows/js_sdk_tests.yml+++ b/.github/workflows/js_sdk_tests.yml@@ -80,9 +80,11 @@ jobs:E2B_DOMAIN: ${{ inputs.E2B_DOMAIN }}- name: Install Bun+ if: matrix.os == 'ubuntu-22.04'uses: oven-sh/setup-bun@v2- - name: Run Bun tests+ - name: Run test suite under Bun+ if: matrix.os == 'ubuntu-22.04'run: pnpm test:bunenv:E2B_API_KEY: ${{ secrets.E2B_API_KEY }}diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.jsonindex cc9f4d298..b5666d405 100644--- a/packages/js-sdk/package.json+++ b/packages/js-sdk/package.json@@ -37,7 +37,7 @@"check-deps": "knip","pretest": "npx playwright install --with-deps chromium","postPublish": "./scripts/post-publish.sh || true",- "test:bun": "bun test tests/runtimes/bun --env-file=.env",+ "test:bun": "bunx --bun vitest run --project unit --project connectionConfig","test:deno": "deno test tests/runtimes/deno/ --allow-net --allow-read --allow-env --unstable-sloppy-imports --trace-leaks","test:integration": "E2B_INTEGRATION_TEST=1 vitest run tests/integration/**","typecheck": "tsc --noEmit",diff --git a/packages/js-sdk/src/api/http2.ts b/packages/js-sdk/src/api/http2.tsindex ad81531bf..f33241b84 100644--- a/packages/js-sdk/src/api/http2.ts+++ b/packages/js-sdk/src/api/http2.ts@@ -41,7 +41,10 @@ export function createApiFetchForRuntime(} = {}): typeof fetch {if (currentRuntime !== 'node') {- return fetch+ // Late-bind the global fetch: runtimes and tools (msw, instrumentation)+ // may replace `globalThis.fetch` after this factory runs, and a fresh+ // closure keeps the per-proxy cache entries distinct.+ return ((input, init) => globalThis.fetch(input, init)) as typeof fetch}let fetcherPromise: Promise<typeof fetch> | undefineddiff --git a/packages/js-sdk/src/connectionConfig.ts b/packages/js-sdk/src/connectionConfig.tsindex 7b0397104..d470c9213 100644--- a/packages/js-sdk/src/connectionConfig.ts+++ b/packages/js-sdk/src/connectionConfig.ts@@ -160,10 +160,10 @@ export function setupRequestController(} {const controller = new AbortController()- const onUserAbort = () => controller.abort(userSignal?.reason)+ const onUserAbort = () => abortWithReason(controller, userSignal?.reason)if (userSignal) {if (userSignal.aborted) {- controller.abort(userSignal.reason)+ abortWithReason(controller, userSignal.reason)} else {userSignal.addEventListener('abort', onUserAbort, { once: true })}@@ -172,7 +172,8 @@ export function setupRequestController(let reqTimeout: ReturnType<typeof setTimeout> | undefined = requestTimeoutMs? setTimeout(() =>- controller.abort(+ abortWithReason(+ controller,new DOMException(`Request handshake timed out after ${requestTimeoutMs}ms`,'TimeoutError'@@ -225,7 +226,8 @@ function createIdleAbort(clear()timer = setTimeout(() =>- controller.abort(+ abortWithReason(+ controller,new DOMException(`${label} idle for ${idleTimeoutMs}ms`,'TimeoutError'@@ -237,6 +239,24 @@ function createIdleAbort(return { arm, clear }}+/**+ * Abort with the reason pinned to the controller. Bun (observed on 1.3.14)+ * holds `signal.reason` weakly: a reason that nothing else strongly+ * references — e.g. a `DOMException` constructed inside a timer callback —+ * can be garbage-collected, leaving `signal.reason` undefined by the time a+ * consumer reads it. Pinning the reason to the controller keeps it alive for+ * the signal's lifetime. No-op cost on other runtimes.+ *+ * @internal+ */+function abortWithReason(controller: AbortController, reason: unknown) {+ // A second abort is a spec-level no-op and must not overwrite the pin that+ // keeps the committed (winning) reason alive.+ if (controller.signal.aborted) return+ ;(controller as { __e2bAbortReason?: unknown }).__e2bAbortReason = reason+ controller.abort(reason)+}+/*** Wrap a streaming response body so its pooled connection is released when the* stream is fully read, cancelled, errors, or stays idle for too long.diff --git a/packages/js-sdk/src/envd/http2.ts b/packages/js-sdk/src/envd/http2.tsindex a0427b3ea..edaa3a65a 100644--- a/packages/js-sdk/src/envd/http2.ts+++ b/packages/js-sdk/src/envd/http2.ts@@ -29,7 +29,10 @@ export function createEnvdFetchForRuntime(options: EnvdFetchOptions = {}): typeof fetch {if (currentRuntime !== 'node') {- return fetch+ // Late-bind the global fetch: runtimes and tools (msw, instrumentation)+ // may replace `globalThis.fetch` after this factory runs, and a fresh+ // closure keeps the per-proxy cache entries distinct.+ return ((input, init) => globalThis.fetch(input, init)) as typeof fetch}let fetcherPromise: Promise<typeof fetch> | undefineddiff --git a/packages/js-sdk/tests/connectionConfig.test.ts b/packages/js-sdk/tests/connectionConfig.test.tsindex 6a839ffb9..1af6edc8c 100644--- a/packages/js-sdk/tests/connectionConfig.test.ts+++ b/packages/js-sdk/tests/connectionConfig.test.ts@@ -387,6 +387,21 @@ test('setupRequestController handshake timeout aborts with TimeoutError reason',assert.equal((controller.signal.reason as DOMException).name, 'TimeoutError')})+test('setupRequestController keeps the winning abort reason when a later abort races', async () => {+ const userController = new AbortController()+ const { controller } = setupRequestController(20, userController.signal)+ await new Promise((resolve) => setTimeout(resolve, 40))+ assert.equal(controller.signal.aborted, true)++ // A user abort arriving after the timeout already aborted must not disturb+ // the committed reason (on Bun: nor steal the pin keeping it alive).+ userController.abort(new Error('user cancel'))+ await new Promise((resolve) => setTimeout(resolve, 20))++ assert.ok(controller.signal.reason instanceof DOMException)+ assert.equal((controller.signal.reason as DOMException).name, 'TimeoutError')+})+test('setupRequestController user signal still cancels after clearStartTimeout', () => {const userController = new AbortController()const { controller, clearStartTimeout } = setupRequestController(diff --git a/packages/js-sdk/tests/envd/http2.test.ts b/packages/js-sdk/tests/envd/http2.test.tsindex de6118ce7..9ad6e9ee0 100644--- a/packages/js-sdk/tests/envd/http2.test.ts+++ b/packages/js-sdk/tests/envd/http2.test.ts@@ -272,11 +272,26 @@ test('falls back to global fetch when undici cannot be loaded', async () => {})test('uses global fetch outside Node', async () => {- const fallbackFetch = vi.fn() as unknown as typeof fetch- vi.stubGlobal('fetch', fallbackFetch)+ const fallbackFetch = vi.fn()const { createEnvdFetchForRuntime } = await import('../../src/envd/http2')- expect(createEnvdFetchForRuntime('browser')).toBe(fallbackFetch)- expect(createEnvdFetchForRuntime('vercel-edge')).toBe(fallbackFetch)+ const browserFetch = createEnvdFetchForRuntime('browser')+ const edgeFetch = createEnvdFetchForRuntime('vercel-edge')++ // The global fetch is late-bound: a fetch swapped in after the fetcher was+ // created (msw, instrumentation) must still be picked up.+ vi.stubGlobal('fetch', fallbackFetch)+ try {+ await browserFetch('https://example.com/status')+ await edgeFetch('https://example.com/status')+ } finally {+ vi.unstubAllGlobals()+ }++ expect(fallbackFetch).toHaveBeenCalledTimes(2)+ expect(fallbackFetch).toHaveBeenCalledWith(+ 'https://example.com/status',+ undefined+ )})diff --git a/packages/js-sdk/tests/runtimes/bun/run.test.ts b/packages/js-sdk/tests/runtimes/bun/run.test.tsdeleted file mode 100644index 5c77b02e3..000000000--- a/packages/js-sdk/tests/runtimes/bun/run.test.ts+++ /dev/null@@ -1,30 +0,0 @@-import { expect, test } from 'bun:test'--import { Sandbox } from '../../../src'-import { template } from '../../template'--test(- 'Bun test',- async () => {- const sbx = await Sandbox.create(template, { timeoutMs: 5_000 })- try {- const isRunning = await sbx.isRunning()- expect(isRunning).toBeTruthy()-- const text = 'Hello, World!'-- const cmd = await sbx.commands.run(`echo "${text}"`)-- expect(cmd.exitCode).toBe(0)- expect(cmd.stdout).toEqual(`${text}\n`)-- await sbx.files.write('test.txt', text)- const test = await sbx.files.read('test.txt')-- expect(test).toEqual(text)- } finally {- await sbx.kill()- }- },- { timeout: 20_000 }-)diff --git a/packages/js-sdk/tests/volume/volume.test.ts b/packages/js-sdk/tests/volume/volume.test.tsindex ff1d2f251..066b58493 100644--- a/packages/js-sdk/tests/volume/volume.test.ts+++ b/packages/js-sdk/tests/volume/volume.test.ts@@ -5,6 +5,7 @@ import { randomUUID } from 'node:crypto'import { Volume, NotFoundError, VolumeError } from '../../src'import { VolumeConnectionConfig } from '../../src/volume/client'+import { runtime } from '../../src/utils'import { apiUrl } from '../setup'// In-memory store for mock volumes@@ -223,12 +224,24 @@ describe('Volume content readFile', () => {const blob = await vol.readFile('hello.txt', { format: 'blob' })expect(blob).toBeInstanceOf(Blob)expect(await blob.text()).toBe('hello world')-- const stream = await vol.readFile('hello.txt', { format: 'stream' })- expect(stream).toBeInstanceOf(ReadableStream)- expect(await new Response(stream).text()).toBe('hello world')})+ // Skipped on Bun: reading `response.body` of an msw-intercepted fetch via a+ // reader yields an immediately-done stream there (msw/Bun incompatibility),+ // while `.text()`/`.blob()` work. Real (non-mocked) streams work on Bun —+ // covered by the sandbox files.read stream tests.+ it.skipIf(runtime === 'bun')(+ 'should return content for a non-empty file as a stream',+ async () => {+ volumeFiles.set('hello.txt', 'hello world')+ const vol = await Volume.create('content-volume')++ const stream = await vol.readFile('hello.txt', { format: 'stream' })+ expect(stream).toBeInstanceOf(ReadableStream)+ expect(await new Response(stream).text()).toBe('hello world')+ }+ )+it('should return empty values for an empty file in every format', async () => {volumeFiles.set('empty.txt', '')const vol = await Volume.create('content-volume')