Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
fix(js-sdk): raise errors for non-2xx API and envd responses with empty bodies (#1430)
Mish Ushakov91e84d9186ee
diff --git a/.changeset/shiny-pugs-check.md b/.changeset/shiny-pugs-check.mdnew file mode 100644index 000000000..8f644d251--- /dev/null+++ b/.changeset/shiny-pugs-check.md@@ -0,0 +1,5 @@+---+"e2b": patch+---++Raise an error for non-2xx API and envd responses with empty bodies (e.g. `Content-Length: 0`) instead of treating them as successful.diff --git a/packages/js-sdk/src/api/index.ts b/packages/js-sdk/src/api/index.tsindex ae4174bfb..ced62f84b 100644--- a/packages/js-sdk/src/api/index.ts+++ b/packages/js-sdk/src/api/index.ts@@ -31,9 +31,9 @@ export function handleApiError() => Error = SandboxError,stackTrace?: string): Error | undefined {- // openapi-fetch returns empty string for error when response body is empty,- // so we check !== undefined instead of truthiness- if (response.error === undefined) {+ // openapi-fetch leaves `error` undefined for non-2xx responses with+ // Content-Length: 0, so check the status instead+ if (response.response.ok) {return}@@ -57,7 +57,8 @@ export function handleApiError(return new RateLimitError(message)}- const message = response.error?.message ?? response.error+ const message =+ response.error?.message || response.error || response.response.statusTextreturn new errorClass(`${response.response.status}: ${message}`, stackTrace)}diff --git a/packages/js-sdk/src/envd/api.ts b/packages/js-sdk/src/envd/api.tsindex 0e5cd467d..52529c981 100644--- a/packages/js-sdk/src/envd/api.ts+++ b/packages/js-sdk/src/envd/api.ts@@ -43,14 +43,27 @@ export async function handleEnvdApiError(},errorMap?: Record<number, (message: string) => Error>) {- if (!res.error) {+ // openapi-fetch leaves `error` empty for non-2xx responses without content+ // (undefined for Content-Length: 0, '' for an empty body without the+ // header), so check the status instead+ if (res.response.ok) {return}- const message: string =- typeof res.error == 'string'- ? res.error- : res.error?.message || (await res.response.text())+ let message =+ (typeof res.error === 'string' ? res.error : res.error?.message) ?? ''++ // openapi-fetch consumes the body when parsing the error, except for+ // responses without content+ if (!message && !res.response.bodyUsed) {+ try {+ message = await res.response.text()+ } catch {+ // ignore unreadable bodies+ }+ }++ message = message || res.response.statusText// Check if a custom error mapping is provided for this error codeif (errorMap && res.response.status in errorMap) {diff --git a/packages/js-sdk/tests/api/handleApiError.test.ts b/packages/js-sdk/tests/api/handleApiError.test.tsindex 1dc1e855e..6d00483b0 100644--- a/packages/js-sdk/tests/api/handleApiError.test.ts+++ b/packages/js-sdk/tests/api/handleApiError.test.ts@@ -23,6 +23,31 @@ function createMockResponse(}describe('handleApiError', () => {+ describe('without content', () => {+ // openapi-fetch leaves `error` undefined for non-2xx responses with+ // Content-Length: 0+ test('catches 404 with undefined error', () => {+ const res = createMockResponse(404, undefined)+ const err = handleApiError(res as any)+ assert.instanceOf(err, SandboxError)+ assert.include(err?.message, '404')+ })++ test('catches 500 with undefined error', () => {+ const res = createMockResponse(500, undefined)+ const err = handleApiError(res as any)+ assert.instanceOf(err, SandboxError)+ assert.include(err?.message, '500')+ })++ test('returns AuthenticationError for 401 with undefined error', () => {+ const res = createMockResponse(401, undefined)+ const err = handleApiError(res as any)+ assert.instanceOf(err, AuthenticationError)+ assert.include(err?.message, 'Unauthorized')+ })+ })+describe('with empty error body', () => {test('catches 404 with empty string error', () => {const res = createMockResponse(404, '')diff --git a/packages/js-sdk/tests/envd/handleEnvdApiError.test.ts b/packages/js-sdk/tests/envd/handleEnvdApiError.test.tsindex 55f32e734..e6f63ed50 100644--- a/packages/js-sdk/tests/envd/handleEnvdApiError.test.ts+++ b/packages/js-sdk/tests/envd/handleEnvdApiError.test.ts@@ -12,28 +12,52 @@ import {function createMockResponse(status: number,- error: { message?: string } | string+ error?: { message?: string } | string): {- error: { message?: string } | string+ error?: { message?: string } | stringresponse: Response} {return {error,response: {status,+ ok: status >= 200 && status < 300,+ statusText: '',+ // openapi-fetch consumes the body whenever it produces an error value+ bodyUsed: error !== undefined,text: async () => (typeof error === 'string' ? error : ''),- } as Response,+ } as unknown as Response,}}describe('handleEnvdApiError', () => {test('returns undefined for a successful response', async () => {- const err = await handleEnvdApiError({- response: { status: 200 } as Response,- })+ const err = await handleEnvdApiError(createMockResponse(200))assert.isUndefined(err)})+ test('returns an error for non-2xx response without content', async () => {+ // openapi-fetch leaves `error` undefined for responses with+ // Content-Length: 0+ const res = createMockResponse(500)+ const err = await handleEnvdApiError(res)+ assert.instanceOf(err, SandboxError)+ assert.include(err?.message, '500')+ })++ test('returns an error for non-2xx response with empty string error', async () => {+ const res = createMockResponse(500, '')+ const err = await handleEnvdApiError(res)+ assert.instanceOf(err, SandboxError)+ assert.include(err?.message, '500')+ })++ test('returns a mapped error for non-2xx response without content', async () => {+ const res = createMockResponse(404)+ const err = await handleEnvdApiError(res)+ assert.instanceOf(err, NotFoundError)+ })+test('returns InvalidArgumentError for 400', async () => {const res = createMockResponse(400, { message: 'Bad request' })const err = await handleEnvdApiError(res)diff --git a/packages/js-sdk/tests/volume/volume.test.ts b/packages/js-sdk/tests/volume/volume.test.tsindex 404ccabad..b69290953 100644--- a/packages/js-sdk/tests/volume/volume.test.ts+++ b/packages/js-sdk/tests/volume/volume.test.ts@@ -3,7 +3,7 @@ import { http, HttpResponse } from 'msw'import { setupServer } from 'msw/node'import { randomUUID } from 'node:crypto'-import { Volume, NotFoundError } from '../../src'+import { Volume, NotFoundError, VolumeError } from '../../src'import { VolumeConnectionConfig } from '../../src/volume/client'import { apiUrl } from '../setup'@@ -125,6 +125,21 @@ describe('Volume CRUD', () => {)})+ it('should throw VolumeError for a non-2xx response without content', async () => {+ server.use(+ http.post(+ apiUrl('/volumes'),+ () =>+ new HttpResponse(null, {+ status: 500,+ headers: { 'Content-Length': '0' },+ })+ )+ )++ await expect(Volume.create('error-volume')).rejects.toThrow(VolumeError)+ })+it('should keep the proxy on the instance so content calls reuse it', async () => {const proxy = 'http://user:[email protected]:8080'const vol = await Volume.create('proxy-volume', { proxy })