Skip to content

armgit / E2B

Public Imported from GitHub
0

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

JS timeout

Tomas Valenta6ab30e06cf20
diff --git a/packages/js-sdk/src/sandbox/filesystem/index.ts b/packages/js-sdk/src/sandbox/filesystem/index.ts
index f9c4dc553..cfb851644 100644
--- a/packages/js-sdk/src/sandbox/filesystem/index.ts
+++ b/packages/js-sdk/src/sandbox/filesystem/index.ts
@@ -89,6 +89,8 @@ export class Filesystem {
}
async list(path: string, opts?: FilesystemRequestOpts): Promise<EntryInfo[]> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
const res = await this.rpc.list({
path,
user: {
@@ -98,13 +100,15 @@ export class Filesystem {
},
},
}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
+ signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
return res.entries
}
async makeDir(path: string, opts?: FilesystemRequestOpts): Promise<void> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
await this.rpc.makeDir({
path,
user: {
@@ -114,11 +118,13 @@ export class Filesystem {
},
},
}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
+ signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
}
async remove(path: string, opts?: FilesystemRequestOpts): Promise<void> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
await this.rpc.remove({
path,
user: {
@@ -128,11 +134,13 @@ export class Filesystem {
},
},
}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
+ signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
}
async exists(path: string, opts?: FilesystemRequestOpts): Promise<boolean> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
try {
await this.rpc.stat({
path,
@@ -143,7 +151,7 @@ export class Filesystem {
},
},
}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
+ signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
return true
@@ -161,10 +169,16 @@ export class Filesystem {
async watch(
path: string,
onEvent: (event: FilesystemEvent) => void | Promise<void>,
- opts?: FilesystemRequestOpts,
+ opts?: FilesystemRequestOpts & { timeout?: number },
): Promise<WatchHandle> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
const controller = new AbortController()
+ const reqTimeout = setTimeout(() => {
+ controller.abort()
+ }, requestTimeoutMs)
+
const events = this.rpc.watch({
path,
user: {
@@ -175,9 +189,18 @@ export class Filesystem {
},
}, {
signal: controller.signal,
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
})
+ clearTimeout(reqTimeout)
+
+ const timeout = opts?.timeout ?? requestTimeoutMs
+
+ if (timeout > 0) {
+ setTimeout(() => {
+ controller.abort()
+ }, timeout)
+ }
+
return new WatchHandle(
() => controller.abort(),
events,
diff --git a/packages/js-sdk/src/sandbox/process/index.ts b/packages/js-sdk/src/sandbox/process/index.ts
index 356a6cefe..4a2ca5f96 100644
--- a/packages/js-sdk/src/sandbox/process/index.ts
+++ b/packages/js-sdk/src/sandbox/process/index.ts
@@ -25,6 +25,7 @@ interface ProcessStartOpts extends ProcessRequestOpts {
envs?: Record<string, string>
onStdout?: ((data: string) => void | Promise<void>)
onStderr?: ((data: string) => void | Promise<void>)
+ timeout?: number
}
export class Process {
@@ -38,13 +39,17 @@ export class Process {
}
async list(opts?: ProcessRequestOpts): Promise<ProcessInfo[]> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
const res = await this.rpc.list({}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
+ signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
return res.processes
}
async kill(pid: number, opts?: ProcessRequestOpts): Promise<void> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
await this.rpc.sendSignal({
process: {
selector: {
@@ -54,7 +59,7 @@ export class Process {
},
signal: Signal.SIGKILL,
}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
+ signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
}
@@ -63,10 +68,17 @@ export class Process {
opts?: {
onStdout?: ((data: string) => void | Promise<void>),
onStderr?: ((data: string) => void | Promise<void>),
+ timeout?: number,
} & Pick<ConnectionOpts, 'requestTimeoutMs'>
): Promise<ProcessHandle> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
const controller = new AbortController()
+ const reqTimeout = setTimeout(() => {
+ controller.abort()
+ }, requestTimeoutMs)
+
const events = this.rpc.connect({
process: {
selector: {
@@ -76,10 +88,17 @@ export class Process {
},
}, {
signal: controller.signal,
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
})
- const p = await this.run('cmd', {})
+ clearTimeout(reqTimeout)
+
+ const timeout = opts?.timeout ?? requestTimeoutMs
+
+ if (timeout > 0) {
+ setTimeout(() => {
+ controller.abort()
+ }, timeout)
+ }
return new ProcessHandle(
pid,
@@ -105,8 +124,14 @@ export class Process {
cmd: string,
opts?: ProcessStartOpts,
): Promise<ProcessHandle> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
const controller = new AbortController()
+ const reqTimeout = setTimeout(() => {
+ controller.abort()
+ }, requestTimeoutMs)
+
const events = this.rpc.start({
user: {
selector: {
@@ -122,11 +147,20 @@ export class Process {
},
}, {
signal: controller.signal,
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
})
const startEvent: StartResponse = (await events[Symbol.asyncIterator]().next()).value
+ clearTimeout(reqTimeout)
+
+ const timeout = opts?.timeout ?? requestTimeoutMs
+
+ if (timeout > 0) {
+ setTimeout(() => {
+ controller.abort()
+ }, timeout)
+ }
+
if (startEvent.event?.event.case !== 'start') {
throw new Error('Expected start event')
}
diff --git a/packages/js-sdk/src/sandbox/pty.ts b/packages/js-sdk/src/sandbox/pty.ts
index b2c31e3d2..acf01e8ca 100644
--- a/packages/js-sdk/src/sandbox/pty.ts
+++ b/packages/js-sdk/src/sandbox/pty.ts
@@ -28,8 +28,14 @@ export class Pty {
cols: number,
rows: number,
}, opts?: Pick<ConnectionOpts, 'requestTimeoutMs'>) {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
const controller = new AbortController()
+ setTimeout(() => {
+ controller.abort()
+ }, requestTimeoutMs)
+
const events = this.rpc.start({
user: {
selector: {
@@ -51,7 +57,6 @@ export class Pty {
},
},
}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
signal: controller.signal,
})
@@ -119,13 +124,18 @@ export class Pty {
}
private async streamInput(pid: number, opts?: Pick<ConnectionOpts, 'requestTimeoutMs'>) {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
const controller = new AbortController()
+ setTimeout(() => {
+ controller.abort()
+ }, requestTimeoutMs)
+
const events = new AsyncQueue<PartialMessage<StreamInputRequest>>()
this.rpc.streamInput(events, {
signal: controller.signal,
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
})
events.enqueue({
@@ -168,6 +178,8 @@ export class Pty {
},
opts?: Pick<ConnectionOpts, 'requestTimeoutMs'>,
): Promise<void> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
await this.rpc.update({
process: {
selector: {
@@ -179,11 +191,13 @@ export class Pty {
size,
},
}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
+ signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
}
private async kill(pid: number, opts?: Pick<ConnectionOpts, 'requestTimeoutMs'>): Promise<void> {
+ const requestTimeoutMs = opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs
+
await this.rpc.sendSignal({
process: {
selector: {
@@ -193,7 +207,7 @@ export class Pty {
},
signal: Signal.SIGKILL,
}, {
- timeoutMs: opts?.requestTimeoutMs ?? this.connectionConfig.requestTimeoutMs,
+ signal: requestTimeoutMs ? AbortSignal.timeout(requestTimeoutMs) : undefined,
})
}
}