Tianyi Cui
f5866fc202
- subprocess-e2b: the 20 ms remote poll cadence becomes a validated pollMs Config field (each tick is one control-plane request); the README documents the latency-versus-request-count trade. - subprocess-e2b: extract src/remote.ts owning asError, signalOpts, commandOpts, delay, waitTick, and one tolerant signalRemoteGroups shared by the pgid-keyed process ladder and sid-keyed terminal ladder, so the two teardown paths keep identical error tolerance. - subprocess-e2b: service disposal aggregates sibling cleanup failures into one AggregateError instead of discarding all but the first. - subprocess-e2b: waitForProcessGroupId refuses published group ids <= 1, so a same-UID rewrite of the pid file cannot aim termination at kill -- -1; README documents the same-UID control-state limitation. - subprocess-e2b: drain-grace expiry now releases an inherited-output E2B callback blocked on host backpressure before disconnecting, so the SDK settlement cannot stay pinned behind an unread host stream. - subprocess-e2b: spawn/spawnTerminal stop validating typed spec fields (trust-TypeScript rule; pty-local validates its config before specs exist); resolveExecutable rejects separator-containing relative paths per the seam contract; terminal setups tracked as a Set of records. - subprocess-e2b: PTY output push-without-backpressure is a documented contract (flowing consumer folds bytes; paused consumer buffers). - fs-e2b: streamText normalizes the pinned SDK's empty-file '' return into an empty stream instead of throwing on getReader(). - e2b overlays: comment the one-world cwd invariant across e2b.cwd, workspaceRoot, and bash-local's implicit default workdir.
98 lines
3.4 KiB
TypeScript
98 lines
3.4 KiB
TypeScript
/**
|
|
* Shared remote-control helpers for the E2B subprocess adapter: SDK option
|
|
* shaping, poll ticks, and the one tolerant process-group signal used by both
|
|
* the ordinary-process and terminal teardown ladders.
|
|
*/
|
|
|
|
import { CommandExitError, e2bControlEnvs, SandboxNotFoundError } from '@deepseek-ai/dsh-e2b'
|
|
import type { Sandbox } from '@deepseek-ai/dsh-e2b'
|
|
|
|
/**
|
|
* Normalize an unknown rejection into an Error.
|
|
* @param error - Any thrown or rejected value.
|
|
* @returns The value itself when already an Error, else a stringified wrapper.
|
|
*/
|
|
export function asError(error: unknown): Error {
|
|
return error instanceof Error ? error : new Error(String(error))
|
|
}
|
|
|
|
/**
|
|
* Shape the optional-signal SDK options object.
|
|
* @param signal - Optional cancellation for one SDK request.
|
|
* @returns An options fragment that omits an undefined signal.
|
|
*/
|
|
export function signalOpts(signal: AbortSignal | undefined): { signal?: AbortSignal } {
|
|
return signal === undefined ? {} : { signal }
|
|
}
|
|
|
|
/**
|
|
* Shape control-shell command options with the isolated HOME override.
|
|
* @param envs - Explicit environment entries for the control command.
|
|
* @param signal - Optional cancellation for the SDK request.
|
|
* @returns Options for `sandbox.commands.run` control invocations.
|
|
*/
|
|
export function commandOpts(
|
|
envs: Record<string, string>,
|
|
signal?: AbortSignal,
|
|
): { envs: Record<string, string>; signal?: AbortSignal } {
|
|
return { envs: e2bControlEnvs(envs), ...signalOpts(signal) }
|
|
}
|
|
|
|
/**
|
|
* Resolve after one duration.
|
|
* @param ms - Milliseconds to wait.
|
|
* @returns Settles after the timeout.
|
|
*/
|
|
export function delay(ms: number): Promise<void> {
|
|
return new Promise(resolve => setTimeout(resolve, ms))
|
|
}
|
|
|
|
/**
|
|
* Wait one poll interval or until the signal aborts.
|
|
* @param pollMs - Poll cadence in milliseconds.
|
|
* @param signal - Optional abort that ends the wait early.
|
|
* @returns `true` after a full tick, `false` when aborted first.
|
|
*/
|
|
export function waitTick(pollMs: number, signal?: AbortSignal): Promise<boolean> {
|
|
if (signal?.aborted === true) return Promise.resolve(false)
|
|
return new Promise<boolean>((resolve) => {
|
|
const timer = setTimeout(() => {
|
|
signal?.removeEventListener('abort', onAbort)
|
|
resolve(true)
|
|
}, pollMs)
|
|
const onAbort = (): void => {
|
|
clearTimeout(timer)
|
|
resolve(false)
|
|
}
|
|
signal?.addEventListener('abort', onAbort, { once: true })
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Signal remote process groups, tolerating the shared teardown outcomes: a
|
|
* nonzero `kill` (groups already gone) and a disappeared sandbox. Both the
|
|
* pgid-keyed process ladder and the sid-keyed terminal ladder deliver signals
|
|
* through this single tolerance so they cannot drift apart.
|
|
* @param sandbox - Live SDK handle.
|
|
* @param envs - Control-shell environment entries.
|
|
* @param groups - Positive process-group ids to signal.
|
|
* @param signal - `TERM` or `KILL`.
|
|
*/
|
|
export async function signalRemoteGroups(
|
|
sandbox: Sandbox,
|
|
envs: Record<string, string>,
|
|
groups: readonly number[],
|
|
signal: 'TERM' | 'KILL',
|
|
): Promise<void> {
|
|
// TODO(e2b-pgid-identity): Prefer an atomic identity-bound group signal if E2B adds one;
|
|
// a userspace identity precheck cannot close the numeric-PGID reuse race.
|
|
try {
|
|
await sandbox.commands.run(
|
|
`kill -${signal} -- ${groups.map(group => `-${group}`).join(' ')}`,
|
|
commandOpts(envs),
|
|
)
|
|
} catch (error: unknown) {
|
|
if (!(error instanceof CommandExitError) && !(error instanceof SandboxNotFoundError)) throw error
|
|
}
|
|
}
|