Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Improve process rejection

Tomas Valenta7e1019cb4f68
diff --git a/packages/js-sdk/src/envd/rpc.ts b/packages/js-sdk/src/envd/rpc.ts
index 34c962e3e..4c08fe59a 100644
--- a/packages/js-sdk/src/envd/rpc.ts
+++ b/packages/js-sdk/src/envd/rpc.ts
@@ -3,7 +3,7 @@ import { Code, ConnectError } from '@connectrpc/connect'
import { SandboxError, InvalidUserError, InvalidPathError, TimeoutError, formatSandboxTimeoutError } from '../errors'
-export function handleRpcError(err: unknown) {
+export function handleRpcError(err: unknown): Error {
if (err instanceof ConnectError) {
switch (err.code) {
case Code.InvalidArgument:
@@ -25,5 +25,5 @@ export function handleRpcError(err: unknown) {
}
}
- return err
+ return err as Error
}
diff --git a/packages/js-sdk/src/sandbox/process/processHandle.ts b/packages/js-sdk/src/sandbox/process/processHandle.ts
index 88c8f25a1..c342f9526 100644
--- a/packages/js-sdk/src/sandbox/process/processHandle.ts
+++ b/packages/js-sdk/src/sandbox/process/processHandle.ts
@@ -48,8 +48,9 @@ export class ProcessHandle implements Omit<ProcessResult, 'exitCode' | 'error'>,
private _stderr = ''
private result?: ProcessResult
+ private iterationError?: Error
- private readonly _wait: Promise<ProcessResult>
+ private readonly _wait: Promise<void>
constructor(
readonly pid: number,
@@ -60,7 +61,7 @@ export class ProcessHandle implements Omit<ProcessResult, 'exitCode' | 'error'>,
private readonly onStderr?: (stderr: string) => (void | Promise<void>),
private readonly onPty?: (pty: Uint8Array) => (void | Promise<void>),
) {
- this._wait = new Promise((res, rej) => this.handleEvents().then(res).catch(rej))
+ this._wait = this.handleEvents()
}
get exitCode() {
@@ -80,7 +81,21 @@ export class ProcessHandle implements Omit<ProcessResult, 'exitCode' | 'error'>,
}
async wait() {
- return this._wait
+ await this._wait
+
+ if (this.iterationError) {
+ throw this.iterationError
+ }
+
+ if (!this.result) {
+ throw new SandboxError('Process exited without a result')
+ }
+
+ if (this.result.exitCode !== 0) {
+ throw new ProcessExitError(this.result)
+ }
+
+ return this.result
}
async disconnect() {
@@ -122,38 +137,27 @@ export class ProcessHandle implements Omit<ProcessResult, 'exitCode' | 'error'>,
stdout: this.stdout,
stderr: this.stderr,
}
-
- return this.result
+ break
}
}
- } catch (e) {
- throw handleRpcError(e)
} finally {
- this.handleDisconnect()
+ this.disconnect()
}
-
- if (!this.result) {
- throw new SandboxError('Process exited without a result')
- }
-
- if (this.result.exitCode !== 0) {
- throw new ProcessExitError(this.result)
- }
-
- return this.result
}
- private async handleEvents(): Promise<ProcessResult> {
- for await (const [stdout, stderr, pty] of this.iterateEvents()) {
- if (stdout !== null) {
- this.onStdout?.(stdout)
- } else if (stderr !== null) {
- this.onStderr?.(stderr)
- } else if (pty) {
- this.onPty?.(pty)
+ private async handleEvents() {
+ try {
+ for await (const [stdout, stderr, pty] of this.iterateEvents()) {
+ if (stdout !== null) {
+ this.onStdout?.(stdout)
+ } else if (stderr !== null) {
+ this.onStderr?.(stderr)
+ } else if (pty) {
+ this.onPty?.(pty)
+ }
}
+ } catch (e) {
+ this.iterationError = handleRpcError(e)
}
-
- return this.result!
}
}
diff --git a/packages/js-sdk/tests/sandbox/commands/sendStdin.test.mts b/packages/js-sdk/tests/sandbox/commands/sendStdin.test.mts
index aeed3ba00..09cb0ceaa 100644
--- a/packages/js-sdk/tests/sandbox/commands/sendStdin.test.mts
+++ b/packages/js-sdk/tests/sandbox/commands/sendStdin.test.mts
@@ -1,5 +1,4 @@
import { assert } from 'vitest'
-import { ProcessExitError } from '../../../src/index.js'
import { sandboxTest } from '../../setup.mjs'
sandboxTest('send stdin to process', async ({ sandbox }) => {
@@ -8,11 +7,7 @@ sandboxTest('send stdin to process', async ({ sandbox }) => {
await sandbox.commands.sendStdin(cmd.pid, text)
- try {
- await cmd.kill()
- } catch (error) {
- assert.instanceOf(error, ProcessExitError)
- }
+ await cmd.kill()
assert.equal(cmd.stdout, text)
})
@@ -23,11 +18,7 @@ sandboxTest('send empty stdin to process', async ({ sandbox }) => {
await sandbox.commands.sendStdin(cmd.pid, text)
- try {
- await cmd.kill()
- } catch (error) {
- assert.instanceOf(error, ProcessExitError)
- }
+ await cmd.kill()
assert.equal(cmd.stdout, text)
})
@@ -38,11 +29,7 @@ sandboxTest('send special characters to stdin', async ({ sandbox }) => {
await sandbox.commands.sendStdin(cmd.pid, text)
- try {
- await cmd.kill()
- } catch (error) {
- assert.instanceOf(error, ProcessExitError)
- }
+ await cmd.kill()
assert.equal(cmd.stdout, text)
})
@@ -53,11 +40,7 @@ sandboxTest('send multiline string to stdin', async ({ sandbox }) => {
await sandbox.commands.sendStdin(cmd.pid, text)
- try {
- await cmd.kill()
- } catch (error) {
- assert.instanceOf(error, ProcessExitError)
- }
+ await cmd.kill()
assert.equal(cmd.stdout, text)
})
diff --git a/packages/python-sdk/e2b/sandbox/process/process_handle.py b/packages/python-sdk/e2b/sandbox/process/process_handle.py
index ecd7fbbfd..e3d754a19 100644
--- a/packages/python-sdk/e2b/sandbox/process/process_handle.py
+++ b/packages/python-sdk/e2b/sandbox/process/process_handle.py
@@ -52,6 +52,7 @@ class ProcessHandle:
self._stderr: str = ""
self._result: Optional[ProcessResult] = None
+ self._iteration_exception: Optional[Exception] = None
def __iter__(self):
return self._handle_events()
@@ -61,7 +62,7 @@ class ProcessHandle:
) -> Generator[
Union[Tuple[Stdout, None], Tuple[None, Stderr]],
None,
- ProcessResult,
+ None,
]:
try:
for event in self._events:
@@ -81,16 +82,9 @@ class ProcessHandle:
exit_code=event.event.end.exit_code,
error=event.event.end.error,
)
- except Exception as e:
- raise handle_rpc_exception(e)
finally:
self.disconnect()
- if self._result is None:
- raise RuntimeError("Process ended without an end event")
-
- return self._result
-
def disconnect(self) -> None:
self._events.close()
@@ -98,15 +92,23 @@ class ProcessHandle:
self,
on_stdout: Optional[Callable[[str], None]] = None,
on_stderr: Optional[Callable[[str], None]] = None,
- ):
- for stdout, stderr in self:
- if stdout is not None and on_stdout:
- on_stdout(stdout)
- elif stderr is not None and on_stderr:
- on_stderr(stderr)
+ ) -> ProcessResult:
+ try:
+ for stdout, stderr in self:
+ if stdout is not None and on_stdout:
+ on_stdout(stdout)
+ elif stderr is not None and on_stderr:
+ on_stderr(stderr)
+ except StopIteration:
+ pass
+ except Exception as e:
+ self._iteration_exception = handle_rpc_exception(e)
+
+ if self._iteration_exception:
+ raise self._iteration_exception
if self._result is None:
- raise RuntimeError("Process ended without an end event")
+ raise Exception("Process ended without an end event")
if self._result.exit_code != 0:
raise ProcessExitException(