Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

fix(js-sdk): detect Bun and Deno connection-dropped errors in health check (#1451)

Mish Ushakov71b450f30e2a
diff --git a/.changeset/terminated-runtime-variants.md b/.changeset/terminated-runtime-variants.md
new file mode 100644
index 000000000..27510a140
--- /dev/null
+++ b/.changeset/terminated-runtime-variants.md
@@ -0,0 +1,5 @@
+---
+"e2b": patch
+---
+
+Recognize Bun and Deno connection-dropped errors in the sandbox health check. When the connection to a sandbox is dropped mid-request, each JS runtime surfaces it with different wording (Node/undici: `terminated`, Bun: `The socket connection was closed unexpectedly`, Deno: `error reading a body from connection`). All known variants are now matched, so a sandbox killed mid-request is reported as a `TimeoutError` on Bun and Deno too, matching Node.
diff --git a/packages/js-sdk/src/envd/api.ts b/packages/js-sdk/src/envd/api.ts
index 9886cd0da..02a185568 100644
--- a/packages/js-sdk/src/envd/api.ts
+++ b/packages/js-sdk/src/envd/api.ts
@@ -17,7 +17,7 @@ import {
import { StartResponse, ConnectResponse } from './process/process_pb'
import { Code, ConnectError } from '@connectrpc/connect'
import { WatchDirResponse } from './filesystem/filesystem_pb'
-import { SandboxHealthCheck } from './rpc'
+import { isConnectionTerminatedMessage, SandboxHealthCheck } from './rpc'
type ApiError = { message?: string } | string
@@ -73,8 +73,9 @@ export async function handleEnvdApiFetchError(
err: unknown,
checkHealth?: SandboxHealthCheck
): Promise<Error> {
- // Undici surfaces a connection dropped mid-body as a TypeError with the message 'terminated'
- if (err instanceof TypeError && err.message === 'terminated') {
+ // A connection dropped mid-body surfaces as a fetch failure whose message varies
+ // by runtime (e.g. undici's 'terminated'); match every known variant.
+ if (err instanceof Error && isConnectionTerminatedMessage(err.message)) {
const running = checkHealth
? await checkHealth().catch(() => undefined)
: undefined
diff --git a/packages/js-sdk/src/envd/rpc.ts b/packages/js-sdk/src/envd/rpc.ts
index 1e9aa4a3b..64234fa56 100644
--- a/packages/js-sdk/src/envd/rpc.ts
+++ b/packages/js-sdk/src/envd/rpc.ts
@@ -20,16 +20,47 @@ import { ENVD_DEFAULT_USER } from './versions'
*/
export type SandboxHealthCheck = () => Promise<boolean | undefined>
+/**
+ * Message fragments different JS runtimes use when the connection to the sandbox
+ * is dropped mid-request. The transport surfaces a dropped connection (e.g. an
+ * HTTP/2 stream reset) with runtime- and version-specific wording, so we match
+ * every known variant:
+ * - Node (undici): `terminated`
+ * - Bun: `The socket connection was closed unexpectedly`
+ * - Deno: `error reading a body from connection`
+ */
+const CONNECTION_TERMINATED_MESSAGES = [
+ 'terminated',
+ 'The socket connection was closed unexpectedly',
+ 'error reading a body from connection',
+]
+
+/**
+ * Checks whether a message matches any known runtime variant of the connection to
+ * the sandbox being dropped mid-request (see {@link CONNECTION_TERMINATED_MESSAGES}).
+ */
+export function isConnectionTerminatedMessage(
+ message: string | undefined
+): boolean {
+ if (!message) {
+ return false
+ }
+
+ return CONNECTION_TERMINATED_MESSAGES.some((fragment) =>
+ message.includes(fragment)
+ )
+}
+
/**
* Checks whether the error is the signature of the connection to the sandbox being
* dropped mid-request — an HTTP/2 stream reset surfaced by connect as `Code.Unknown`
- * with the message 'terminated'.
+ * with one of the runtime-specific connection-dropped messages.
*/
export function isConnectionTerminatedError(err: unknown): boolean {
return (
err instanceof ConnectError &&
err.code === Code.Unknown &&
- err.rawMessage === 'terminated'
+ isConnectionTerminatedMessage(err.rawMessage)
)
}
diff --git a/packages/js-sdk/tests/envd/handleEnvdApiError.test.ts b/packages/js-sdk/tests/envd/handleEnvdApiError.test.ts
index 46b569f21..d446cefa8 100644
--- a/packages/js-sdk/tests/envd/handleEnvdApiError.test.ts
+++ b/packages/js-sdk/tests/envd/handleEnvdApiError.test.ts
@@ -119,6 +119,25 @@ describe('handleEnvdApiFetchError', () => {
assert.include(err.message, 'sandbox was killed or reached its end of life')
})
+ // Each JS runtime surfaces a dropped connection with different wording, and not
+ // always as a TypeError (Bun raises a plain Error), so match by message
+ const runtimeTerminatedErrors = {
+ Node: new TypeError('terminated'),
+ Bun: new Error('The socket connection was closed unexpectedly'),
+ Deno: new TypeError('error reading a body from connection'),
+ }
+
+ for (const [runtime, error] of Object.entries(runtimeTerminatedErrors)) {
+ test(`treats the ${runtime} dropped-connection error as terminated`, async () => {
+ const err = await handleEnvdApiFetchError(error, async () => false)
+ assert.instanceOf(err, TimeoutError)
+ assert.include(
+ err.message,
+ 'sandbox was killed or reached its end of life'
+ )
+ })
+ }
+
test('returns the original error when the health check says the sandbox is running', async () => {
const original = new TypeError('terminated')
const err = await handleEnvdApiFetchError(original, async () => true)
diff --git a/packages/js-sdk/tests/envd/handleRpcError.test.ts b/packages/js-sdk/tests/envd/handleRpcError.test.ts
index 4a3f423d8..c3d0a3687 100644
--- a/packages/js-sdk/tests/envd/handleRpcError.test.ts
+++ b/packages/js-sdk/tests/envd/handleRpcError.test.ts
@@ -64,6 +64,13 @@ describe('handleRpcError', () => {
describe('handleRpcErrorWithHealthCheck', () => {
const terminated = () => new ConnectError('terminated', Code.Unknown)
+ // Each JS runtime surfaces a dropped connection with different wording
+ const runtimeTerminatedMessages = {
+ Node: 'terminated',
+ Bun: 'The socket connection was closed unexpectedly',
+ Deno: 'error reading a body from connection',
+ }
+
test('returns a TimeoutError when the health check says the sandbox is not running', async () => {
const err = await handleRpcErrorWithHealthCheck(
terminated(),
@@ -73,6 +80,20 @@ describe('handleRpcErrorWithHealthCheck', () => {
assert.include(err.message, 'sandbox was killed or reached its end of life')
})
+ for (const [runtime, message] of Object.entries(runtimeTerminatedMessages)) {
+ test(`treats the ${runtime} dropped-connection message as terminated`, async () => {
+ const err = await handleRpcErrorWithHealthCheck(
+ new ConnectError(message, Code.Unknown),
+ async () => false
+ )
+ assert.instanceOf(err, TimeoutError)
+ assert.include(
+ err.message,
+ 'sandbox was killed or reached its end of life'
+ )
+ })
+ }
+
test('falls back to the generic mapping when the health check says the sandbox is running', async () => {
const err = await handleRpcErrorWithHealthCheck(
terminated(),