Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Cleanup overload

Tomas Valenta76c29fa7ea46
diff --git a/packages/js-sdk/src/index.ts b/packages/js-sdk/src/index.ts
index f94818af2..1030c9cee 100644
--- a/packages/js-sdk/src/index.ts
+++ b/packages/js-sdk/src/index.ts
@@ -22,15 +22,9 @@ export { ProcessHandle } from './sandbox/process/processHandle'
export type { ProcessOutput, ProcessResult } from './sandbox/process/processHandle'
export type {
ProcessInfo,
- ProcessBackgroundRunOpts,
- ProcessRunOpts,
ProcessRequestOpts,
} from './sandbox/process'
-export type {
- StreamInputHandle,
-} from './sandbox/pty'
-
import { Sandbox } from './sandbox'
export { Sandbox, }
export default Sandbox
diff --git a/packages/js-sdk/src/sandbox/filesystem/index.ts b/packages/js-sdk/src/sandbox/filesystem/index.ts
index 344370591..f08003ae3 100644
--- a/packages/js-sdk/src/sandbox/filesystem/index.ts
+++ b/packages/js-sdk/src/sandbox/filesystem/index.ts
@@ -36,13 +36,15 @@ export class Filesystem {
this.rpc = createPromiseClient(FilesystemService, transport)
}
- async read(path: string, format: 'text', opts?: FilesystemRequestOpts): Promise<string>
- async read(path: string, format: 'bytes', opts?: FilesystemRequestOpts): Promise<Uint8Array>
- async read(path: string, format: 'blob', opts?: FilesystemRequestOpts): Promise<Blob>
- async read(path: string, format: 'stream', opts?: FilesystemRequestOpts): Promise<ReadableStream<Uint8Array>>
- async read(path: string, format: FileFormat = 'text', opts?: FilesystemRequestOpts): Promise<unknown> {
+ async read(path: string, opts?: FilesystemRequestOpts & { format?: 'text' }): Promise<string>
+ async read(path: string, opts?: FilesystemRequestOpts & { format: 'bytes' }): Promise<Uint8Array>
+ async read(path: string, opts?: FilesystemRequestOpts & { format: 'blob' }): Promise<Blob>
+ async read(path: string, opts?: FilesystemRequestOpts & { format: 'stream' }): Promise<ReadableStream<Uint8Array>>
+ async read(path: string, opts?: FilesystemRequestOpts & { format?: FileFormat }): Promise<unknown> {
const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+ const format = opts?.format ?? 'text'
+
const response = await this.envdApi.api.GET('/files/{path}', {
params: {
path: {
@@ -83,7 +85,7 @@ export class Filesystem {
return fd
},
- body: undefined as any,
+ body: {},
signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
}
@@ -100,6 +102,7 @@ export class Filesystem {
}, {
timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
})
+
return res.entries
}
diff --git a/packages/js-sdk/src/sandbox/process/index.ts b/packages/js-sdk/src/sandbox/process/index.ts
index 2575dba8d..356a6cefe 100644
--- a/packages/js-sdk/src/sandbox/process/index.ts
+++ b/packages/js-sdk/src/sandbox/process/index.ts
@@ -27,14 +27,6 @@ interface ProcessStartOpts extends ProcessRequestOpts {
onStderr?: ((data: string) => void | Promise<void>)
}
-export type ProcessRunOpts = ProcessStartOpts & {
- background?: false
-}
-
-export type ProcessBackgroundRunOpts = ProcessStartOpts & {
- background: true
-}
-
export class Process {
protected readonly rpc: PromiseClient<typeof ProcessService>
@@ -87,6 +79,8 @@ export class Process {
timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
})
+ const p = await this.run('cmd', {})
+
return new ProcessHandle(
pid,
() => controller.abort(),
@@ -97,18 +91,9 @@ export class Process {
)
}
- async run(
- cmd: string,
- opts?: ProcessRunOpts,
- ): Promise<ProcessOutput>
- async run(
- cmd: string,
- opts?: ProcessBackgroundRunOpts,
- ): Promise<ProcessHandle>
- async run(
- cmd: string,
- opts?: ProcessStartOpts,
- ): Promise<unknown> {
+ async run(cmd: string, opts?: ProcessStartOpts & { background?: false }): Promise<ProcessOutput>
+ async run(cmd: string, opts?: ProcessStartOpts & { background: true }): Promise<ProcessHandle>
+ async run(cmd: string, opts?: ProcessStartOpts & { background?: boolean }): Promise<unknown> {
const proc = await this.start(cmd, opts)
return opts?.background