Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Improve watcher; [WIP] Error handling

Tomas Valentac04a07b4be8e
diff --git a/packages/js-sdk/src/sandbox/filesystem/index.ts b/packages/js-sdk/src/sandbox/filesystem/index.ts
index 121ffdc64..14ac2dc7c 100644
--- a/packages/js-sdk/src/sandbox/filesystem/index.ts
+++ b/packages/js-sdk/src/sandbox/filesystem/index.ts
@@ -29,7 +29,7 @@ export interface FilesystemRequestOpts extends Partial<Pick<ConnectionOpts, 'req
export interface WatchOpts extends FilesystemRequestOpts {
timeout?: number
- onExit?: (err: SandboxError) => void
+ onExit?: (err: Error) => void
}
export class FilesystemError extends SandboxError {
@@ -301,7 +301,7 @@ export class Filesystem {
async watch(
path: string,
onEvent: (event: FilesystemEvent) => void | Promise<void>,
- opts?: FilesystemRequestOpts & { timeout?: number, onExit?: () => void | Promise<void> },
+ opts?: FilesystemRequestOpts & { timeout?: number, onExit?: (err?: Error) => void | Promise<void> },
): Promise<WatchHandle> {
const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
const username = opts?.user || defaultUsername
diff --git a/packages/js-sdk/src/sandbox/process/index.ts b/packages/js-sdk/src/sandbox/process/index.ts
index 22d04bbb4..41d8e9ce4 100644
--- a/packages/js-sdk/src/sandbox/process/index.ts
+++ b/packages/js-sdk/src/sandbox/process/index.ts
@@ -26,11 +26,10 @@ export interface ProcessStartOpts extends ProcessRequestOpts {
envs?: Record<string, string>
onStdout?: ((data: string) => void | Promise<void>)
onStderr?: ((data: string) => void | Promise<void>)
- onExit?: ((err?: Error) => void | Promise<void>)
timeout?: number
}
-export type ProcessConnectOpts = Pick<ProcessStartOpts, 'onStderr' | 'onStdout' | 'onExit' | 'timeout'> & ProcessRequestOpts
+export type ProcessConnectOpts = Pick<ProcessStartOpts, 'onStderr' | 'onStdout' | 'timeout'> & ProcessRequestOpts
export class ProcessError extends SandboxError {
constructor(message: string, public readonly pid: number) {
@@ -123,7 +122,6 @@ export class Process {
opts?.onStdout,
opts?.onStderr,
undefined,
- opts?.onExit,
)
}
@@ -184,6 +182,7 @@ export class Process {
events,
opts?.onStdout,
opts?.onStderr,
+ undefined,
)
} catch (err) {
const connectErr = ConnectError.from(err)
diff --git a/packages/js-sdk/src/sandbox/process/processHandle.ts b/packages/js-sdk/src/sandbox/process/processHandle.ts
index 7fc564c17..7254086f7 100644
--- a/packages/js-sdk/src/sandbox/process/processHandle.ts
+++ b/packages/js-sdk/src/sandbox/process/processHandle.ts
@@ -55,7 +55,6 @@ export class ProcessHandle implements Omit<ProcessResult, 'exitCode' | 'error'>,
private readonly onStdout?: (stdout: string) => (void | Promise<void>),
private readonly onStderr?: (stderr: string) => (void | Promise<void>),
private readonly onPty?: (pty: Uint8Array) => (void | Promise<void>),
- private readonly onExit?: (err?: Error) => (void | Promise<void>),
) {
this._wait = this.handleEvents()
}
@@ -89,7 +88,7 @@ export class ProcessHandle implements Omit<ProcessResult, 'exitCode' | 'error'>,
await this.handleKill()
}
- private async *[Symbol.asyncIterator](): AsyncIterator<[Stdout, undefined, undefined] | [undefined, Stderr, undefined] | [undefined, undefined, Pty]> {
+ private async* iterateEvents(): AsyncGenerator<[Stdout, undefined, undefined] | [undefined, Stderr, undefined] | [undefined, undefined, Pty]> {
try {
for await (const event of this.events) {
const e = event?.event?.event
@@ -130,7 +129,7 @@ export class ProcessHandle implements Omit<ProcessResult, 'exitCode' | 'error'>,
}
private async handleEvents(): Promise<ProcessResult> {
- for await (const [stdout, stderr, pty] of this) {
+ for await (const [stdout, stderr, pty] of this.iterateEvents()) {
if (stdout !== undefined) {
this.onStdout?.(stdout)
} else if (stderr !== undefined) {
diff --git a/packages/js-sdk/src/sandbox/pty.ts b/packages/js-sdk/src/sandbox/pty.ts
index 63934cedc..7966c6341 100644
--- a/packages/js-sdk/src/sandbox/pty.ts
+++ b/packages/js-sdk/src/sandbox/pty.ts
@@ -14,6 +14,13 @@ import { ConnectionConfig, ConnectionOpts, defaultUsername } from '../connection
import { PartialMessage } from '@bufbuild/protobuf'
import { ProcessHandle } from './process/processHandle'
+export interface PtyCreateOpts extends Pick<ConnectionOpts, 'requestTimeoutMs'> {
+ cols: number
+ rows: number
+ onData: (data: Uint8Array) => (void | Promise<void>)
+ timeout?: number
+}
+
export class Pty {
private readonly rpc: PromiseClient<typeof ProcessService>
@@ -21,11 +28,7 @@ export class Pty {
this.rpc = createPromiseClient(ProcessService, this.transport)
}
- async create({ cols, rows, onData }: {
- cols: number,
- rows: number,
- onData: (data: Uint8Array) => (void | Promise<void>),
- }, opts?: Pick<ConnectionOpts, 'requestTimeoutMs'> & { timeout?: number, onExit?: (err?: Error) => (void | Promise<void>) }) {
+ async create(opts: PtyCreateOpts) {
const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
const controller = new AbortController()
@@ -50,8 +53,8 @@ export class Pty {
},
pty: {
size: {
- cols,
- rows,
+ cols: opts.cols,
+ rows: opts.rows,
},
},
}, {
@@ -76,8 +79,7 @@ export class Pty {
events,
undefined,
undefined,
- onData,
- opts?.onExit,
+ opts.onData,
)
}