Skip to content

armgit / E2B

Public Imported from GitHub
0

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

address PR comments

0div9e6bc1739cfe
diff --git a/packages/js-sdk/src/index.ts b/packages/js-sdk/src/index.ts
index 0425b7097..fdc292238 100644
--- a/packages/js-sdk/src/index.ts
+++ b/packages/js-sdk/src/index.ts
@@ -1,55 +1,26 @@
-export {
- ApiClient,
-} from './api'
+export { ApiClient } from './api'
export type { components, paths } from './api'
-export {
- AuthenticationError,
- SandboxError,
- TimeoutError,
- NotFoundError,
- NotEnoughSpaceError,
- InvalidArgumentError,
- TemplateError,
-} from './errors'
-export {
- ConnectionConfig,
-} from './connectionConfig'
-export type { Logger } from './logs'
+export { ConnectionConfig } from './connectionConfig'
export type { ConnectionOpts, Username } from './connectionConfig'
+export { AuthenticationError, InvalidArgumentError, NotEnoughSpaceError, NotFoundError, SandboxError, TemplateError, TimeoutError } from './errors'
+export type { Logger } from './logs'
+export { FileType } from './sandbox/filesystem'
+export type { EntryInfo, Filesystem, WriteData } from './sandbox/filesystem'
export { FilesystemEventType } from './sandbox/filesystem/watchHandle'
export type { FilesystemEvent, WatchHandle } from './sandbox/filesystem/watchHandle'
-export type {
- EntryInfo,
- Filesystem,
-} from './sandbox/filesystem'
-export {
- FileType,
-} from './sandbox/filesystem'
export { ProcessExitError } from './sandbox/process/processHandle'
-export type {
- ProcessResult,
- Stdout,
- Stderr,
- PtyOutput,
- ProcessHandle,
-} from './sandbox/process/processHandle'
+export type { ProcessHandle, ProcessResult, PtyOutput, Stderr, Stdout } from './sandbox/process/processHandle'
export type { SandboxApiOpts } from './sandbox/sandboxApi'
-export type {
- ProcessInfo,
- ProcessRequestOpts,
- ProcessConnectOpts,
- ProcessStartOpts,
- Process,
-} from './sandbox/process'
+export type { Process, ProcessConnectOpts, ProcessInfo, ProcessRequestOpts, ProcessStartOpts } from './sandbox/process'
export type { Pty } from './sandbox/pty'
-export type { SandboxInfo } from './sandbox/sandboxApi'
export type { SandboxOpts } from './sandbox'
-import { Sandbox } from './sandbox'
+export type { SandboxInfo } from './sandbox/sandboxApi'
export { Sandbox }
+import { Sandbox } from './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 490ce91ba..639038888 100644
--- a/packages/js-sdk/src/sandbox/filesystem/index.ts
+++ b/packages/js-sdk/src/sandbox/filesystem/index.ts
@@ -8,6 +8,7 @@ import { EnvdApiClient } from '../../envd/api'
import { Filesystem as FilesystemService } from '../../envd/filesystem/filesystem_connect'
import { FileType as FsFileType } from '../../envd/filesystem/filesystem_pb'
+import { clearTimeout } from 'timers'
import { FilesystemEvent, WatchHandle } from './watchHandle'
export interface EntryInfo {
@@ -80,8 +81,23 @@ export class Filesystem {
return res.data
}
- async write(path: string, data: WriteData | { data: WriteData; filename: string }[], opts?: FilesystemRequestOpts): Promise<EntryInfo | EntryInfo[]> {
+ async write(path: string, data: WriteData, opts?: FilesystemRequestOpts): Promise<EntryInfo>
+ async write(files: { data: WriteData; filename: string }[], opts?: FilesystemRequestOpts): Promise<EntryInfo[]>
+ async write(pathOrFiles: string | { data: WriteData; filename: string }[], dataOrOpts?: WriteData | FilesystemRequestOpts, opts?: FilesystemRequestOpts): Promise<EntryInfo | EntryInfo[]> {
+ let path: string
+ let data: WriteData | { data: WriteData; filename: string }[]
+
+ if (typeof pathOrFiles === 'string') {
+ path = pathOrFiles
+ data = dataOrOpts as WriteData
+ } else {
+ path = ''
+ data = pathOrFiles
+ opts = dataOrOpts as FilesystemRequestOpts
+ }
+
let blobs: Blob[] = []
+
if (Array.isArray(data)) {
for (const d of data) {
const blob = await new Response(d.data).blob()
@@ -251,11 +267,7 @@ export class Filesystem {
}
}
- async watch(
- path: string,
- onEvent: (event: FilesystemEvent) => void | Promise<void>,
- opts?: FilesystemRequestOpts & { timeout?: number; onExit?: (err?: Error) => void | Promise<void> }
- ): Promise<WatchHandle> {
+ async watch(path: string, onEvent: (event: FilesystemEvent) => void | Promise<void>, opts?: FilesystemRequestOpts & { timeout?: number; onExit?: (err?: Error) => void | Promise<void> }): Promise<WatchHandle> {
const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
const controller = new AbortController()