mirror of
https://github.com/harivansh-afk/sandbox-agent.git
synced 2026-04-16 08:02:25 +00:00
feat: sprites support
This commit is contained in:
parent
9cd9252725
commit
5da35e6dfa
35 changed files with 746 additions and 1257 deletions
|
|
@ -147,3 +147,9 @@ export type {
|
|||
SandboxAgentSpawnLogMode,
|
||||
SandboxAgentSpawnOptions,
|
||||
} from "./spawn.ts";
|
||||
|
||||
export type {
|
||||
SpritesProviderOptions,
|
||||
SpritesCreateOverrides,
|
||||
SpritesClientOverrides,
|
||||
} from "./providers/sprites.ts";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import { DEFAULT_SANDBOX_AGENT_IMAGE, buildServerStartCommand } from "./shared.t
|
|||
|
||||
const DEFAULT_AGENT_PORT = 3000;
|
||||
const DEFAULT_PREVIEW_TTL_SECONDS = 4 * 60 * 60;
|
||||
const DEFAULT_CWD = "/home/sandbox";
|
||||
|
||||
type DaytonaCreateParams = NonNullable<Parameters<Daytona["create"]>[0]>;
|
||||
|
||||
|
|
@ -13,6 +14,7 @@ export interface DaytonaProviderOptions {
|
|||
create?: DaytonaCreateOverrides | (() => DaytonaCreateOverrides | Promise<DaytonaCreateOverrides>);
|
||||
image?: DaytonaCreateParams["image"];
|
||||
agentPort?: number;
|
||||
cwd?: string;
|
||||
previewTtlSeconds?: number;
|
||||
deleteTimeoutSeconds?: number;
|
||||
}
|
||||
|
|
@ -26,12 +28,13 @@ async function resolveCreateOptions(value: DaytonaProviderOptions["create"]): Pr
|
|||
export function daytona(options: DaytonaProviderOptions = {}): SandboxProvider {
|
||||
const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
|
||||
const image = options.image ?? DEFAULT_SANDBOX_AGENT_IMAGE;
|
||||
const cwd = options.cwd ?? DEFAULT_CWD;
|
||||
const previewTtlSeconds = options.previewTtlSeconds ?? DEFAULT_PREVIEW_TTL_SECONDS;
|
||||
const client = new Daytona();
|
||||
|
||||
return {
|
||||
name: "daytona",
|
||||
defaultCwd: "/home/daytona",
|
||||
defaultCwd: cwd,
|
||||
async create(): Promise<string> {
|
||||
const createOpts = await resolveCreateOptions(options.create);
|
||||
const sandbox = await client.create({
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import { DEFAULT_AGENTS, SANDBOX_AGENT_INSTALL_SCRIPT } from "./shared.ts";
|
|||
|
||||
const DEFAULT_AGENT_PORT = 3000;
|
||||
const DEFAULT_TIMEOUT_MS = 3_600_000;
|
||||
const SANDBOX_AGENT_PATH_EXPORT = 'export PATH="/usr/local/bin:$HOME/.local/bin:$PATH"';
|
||||
|
||||
type E2BCreateOverrides = Omit<Partial<SandboxBetaCreateOpts>, "timeoutMs" | "autoPause">;
|
||||
type E2BConnectOverrides = Omit<Partial<SandboxConnectOpts>, "timeoutMs">;
|
||||
|
|
@ -35,6 +36,11 @@ async function resolveTemplate(value: E2BTemplateOverride | undefined): Promise<
|
|||
return typeof value === "function" ? await value() : value;
|
||||
}
|
||||
|
||||
function buildShellCommand(command: string, strict = false): string {
|
||||
const strictPrefix = strict ? "set -euo pipefail; " : "";
|
||||
return `bash -lc '${strictPrefix}${SANDBOX_AGENT_PATH_EXPORT}; ${command}'`;
|
||||
}
|
||||
|
||||
export function e2b(options: E2BProviderOptions = {}): SandboxProvider {
|
||||
const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
|
||||
const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
||||
|
|
@ -56,15 +62,15 @@ export function e2b(options: E2BProviderOptions = {}): SandboxProvider {
|
|||
: // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await Sandbox.betaCreate({ allowInternetAccess: true, ...restCreateOpts, timeoutMs, autoPause } as any);
|
||||
|
||||
await sandbox.commands.run(`curl -fsSL ${SANDBOX_AGENT_INSTALL_SCRIPT} | sh`).then((r) => {
|
||||
await sandbox.commands.run(buildShellCommand(`curl -fsSL ${SANDBOX_AGENT_INSTALL_SCRIPT} | sh`, true)).then((r) => {
|
||||
if (r.exitCode !== 0) throw new Error(`e2b install failed:\n${r.stderr}`);
|
||||
});
|
||||
for (const agent of DEFAULT_AGENTS) {
|
||||
await sandbox.commands.run(`sandbox-agent install-agent ${agent}`).then((r) => {
|
||||
await sandbox.commands.run(buildShellCommand(`sandbox-agent install-agent ${agent}`)).then((r) => {
|
||||
if (r.exitCode !== 0) throw new Error(`e2b agent install failed: ${agent}\n${r.stderr}`);
|
||||
});
|
||||
}
|
||||
await sandbox.commands.run(`sandbox-agent server --no-token --host 0.0.0.0 --port ${agentPort}`, { background: true, timeoutMs: 0 });
|
||||
await sandbox.commands.run(buildShellCommand(`sandbox-agent server --no-token --host 0.0.0.0 --port ${agentPort}`), { background: true, timeoutMs: 0 });
|
||||
|
||||
return sandbox.sandboxId;
|
||||
},
|
||||
|
|
@ -100,7 +106,7 @@ export function e2b(options: E2BProviderOptions = {}): SandboxProvider {
|
|||
async ensureServer(sandboxId: string): Promise<void> {
|
||||
const connectOpts = await resolveOptions(options.connect, sandboxId);
|
||||
const sandbox = await Sandbox.connect(sandboxId, { ...connectOpts, timeoutMs } as SandboxConnectOpts);
|
||||
await sandbox.commands.run(`sandbox-agent server --no-token --host 0.0.0.0 --port ${agentPort}`, { background: true, timeoutMs: 0 });
|
||||
await sandbox.commands.run(buildShellCommand(`sandbox-agent server --no-token --host 0.0.0.0 --port ${agentPort}`), { background: true, timeoutMs: 0 });
|
||||
},
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
export const DEFAULT_SANDBOX_AGENT_IMAGE = "rivetdev/sandbox-agent:0.5.0-rc.2-full";
|
||||
export const SANDBOX_AGENT_INSTALL_SCRIPT = "https://releases.rivet.dev/sandbox-agent/0.4.x/install.sh";
|
||||
export const SANDBOX_AGENT_VERSION = "0.5.0-rc.2";
|
||||
export const DEFAULT_SANDBOX_AGENT_IMAGE = `rivetdev/sandbox-agent:${SANDBOX_AGENT_VERSION}-full`;
|
||||
export const SANDBOX_AGENT_INSTALL_SCRIPT = `https://releases.rivet.dev/sandbox-agent/${SANDBOX_AGENT_VERSION}/install.sh`;
|
||||
export const SANDBOX_AGENT_NPX_SPEC = `@sandbox-agent/cli@${SANDBOX_AGENT_VERSION}`;
|
||||
export const DEFAULT_AGENTS = ["claude", "codex"] as const;
|
||||
|
||||
export function buildServerStartCommand(port: number): string {
|
||||
|
|
|
|||
267
sdks/typescript/src/providers/sprites.ts
Normal file
267
sdks/typescript/src/providers/sprites.ts
Normal file
|
|
@ -0,0 +1,267 @@
|
|||
import { ExecError, SpritesClient, type ClientOptions as SpritesClientOptions, type SpriteConfig } from "@fly/sprites";
|
||||
import { SandboxDestroyedError } from "../client.ts";
|
||||
import type { SandboxProvider } from "./types.ts";
|
||||
import { SANDBOX_AGENT_NPX_SPEC } from "./shared.ts";
|
||||
|
||||
const DEFAULT_AGENT_PORT = 8080;
|
||||
const DEFAULT_SERVICE_NAME = "sandbox-agent";
|
||||
const DEFAULT_NAME_PREFIX = "sandbox-agent";
|
||||
const DEFAULT_SERVICE_START_DURATION = "10m";
|
||||
|
||||
export interface SpritesCreateOverrides {
|
||||
name?: string;
|
||||
config?: SpriteConfig;
|
||||
}
|
||||
|
||||
export type SpritesClientOverrides = Partial<SpritesClientOptions>;
|
||||
|
||||
export interface SpritesProviderOptions {
|
||||
token?: string | (() => string | Promise<string>);
|
||||
client?: SpritesClientOverrides | (() => SpritesClientOverrides | Promise<SpritesClientOverrides>);
|
||||
create?: SpritesCreateOverrides | (() => SpritesCreateOverrides | Promise<SpritesCreateOverrides>);
|
||||
env?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
|
||||
installAgents?: readonly string[];
|
||||
agentPort?: number;
|
||||
serviceName?: string;
|
||||
serviceStartDuration?: string;
|
||||
namePrefix?: string;
|
||||
}
|
||||
|
||||
type SpritesSandboxProvider = SandboxProvider & {
|
||||
getToken(sandboxId: string): Promise<string>;
|
||||
};
|
||||
|
||||
interface SpritesService {
|
||||
cmd?: string;
|
||||
args?: string[];
|
||||
http_port?: number | null;
|
||||
state?: {
|
||||
status?: string;
|
||||
};
|
||||
}
|
||||
|
||||
async function resolveValue<T>(value: T | (() => T | Promise<T>) | undefined, fallback: T): Promise<T> {
|
||||
if (value === undefined) {
|
||||
return fallback;
|
||||
}
|
||||
if (typeof value === "function") {
|
||||
return await (value as () => T | Promise<T>)();
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
async function resolveToken(value: SpritesProviderOptions["token"]): Promise<string> {
|
||||
const token = await resolveValue(value, process.env.SPRITES_API_KEY ?? process.env.SPRITE_TOKEN ?? process.env.SPRITES_TOKEN ?? "");
|
||||
if (!token) {
|
||||
throw new Error("sprites provider requires a token. Set SPRITES_API_KEY (or SPRITE_TOKEN) or pass `token`.");
|
||||
}
|
||||
return token;
|
||||
}
|
||||
|
||||
function createSpritesClient(token: string, options: SpritesClientOverrides): SpritesClient {
|
||||
return new SpritesClient(token, options);
|
||||
}
|
||||
|
||||
function generateSpriteName(prefix: string): string {
|
||||
const suffix =
|
||||
typeof globalThis.crypto?.randomUUID === "function"
|
||||
? globalThis.crypto.randomUUID().slice(0, 8)
|
||||
: `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
|
||||
return `${prefix}-${suffix}`.toLowerCase();
|
||||
}
|
||||
|
||||
function isSpriteNotFoundError(error: unknown): boolean {
|
||||
return error instanceof Error && error.message.startsWith("Sprite not found:");
|
||||
}
|
||||
|
||||
function shellQuote(value: string): string {
|
||||
return `'${value.replace(/'/g, `'\\''`)}'`;
|
||||
}
|
||||
|
||||
function buildServiceCommand(env: Record<string, string>, port: number): string {
|
||||
const exportParts: string[] = [];
|
||||
for (const [key, value] of Object.entries(env)) {
|
||||
if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
|
||||
throw new Error(`sprites provider received an invalid environment variable name: ${key}`);
|
||||
}
|
||||
exportParts.push(`export ${key}=${shellQuote(value)}`);
|
||||
}
|
||||
|
||||
exportParts.push(`exec npx -y ${SANDBOX_AGENT_NPX_SPEC} server --no-token --host 0.0.0.0 --port ${port}`);
|
||||
return exportParts.join("; ");
|
||||
}
|
||||
|
||||
async function runSpriteCommand(sprite: ReturnType<SpritesClient["sprite"]>, file: string, args: string[], env?: Record<string, string>): Promise<void> {
|
||||
try {
|
||||
const result = await sprite.execFile(file, args, env ? { env } : undefined);
|
||||
if (result.exitCode !== 0) {
|
||||
throw new Error(`sprites command failed: ${file} ${args.join(" ")}`);
|
||||
}
|
||||
} catch (error) {
|
||||
if (error instanceof ExecError) {
|
||||
throw new Error(
|
||||
`sprites command failed: ${file} ${args.join(" ")} (exit ${error.exitCode})\nstdout:\n${String(error.stdout)}\nstderr:\n${String(error.stderr)}`,
|
||||
{ cause: error },
|
||||
);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchService(client: SpritesClient, spriteName: string, serviceName: string): Promise<SpritesService | undefined> {
|
||||
const response = await fetch(`${client.baseURL}/v1/sprites/${encodeURIComponent(spriteName)}/services/${encodeURIComponent(serviceName)}`, {
|
||||
method: "GET",
|
||||
headers: {
|
||||
Authorization: `Bearer ${client.token}`,
|
||||
},
|
||||
});
|
||||
|
||||
if (response.status === 404) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`sprites service lookup failed (status ${response.status}): ${await response.text()}`);
|
||||
}
|
||||
|
||||
return (await response.json()) as SpritesService;
|
||||
}
|
||||
|
||||
async function upsertService(client: SpritesClient, spriteName: string, serviceName: string, port: number, command: string): Promise<void> {
|
||||
const existing = await fetchService(client, spriteName, serviceName);
|
||||
const expectedArgs = ["-lc", command];
|
||||
const isCurrent = existing?.cmd === "bash" && existing.http_port === port && JSON.stringify(existing.args ?? []) === JSON.stringify(expectedArgs);
|
||||
if (isCurrent) {
|
||||
return;
|
||||
}
|
||||
|
||||
const response = await fetch(`${client.baseURL}/v1/sprites/${encodeURIComponent(spriteName)}/services/${encodeURIComponent(serviceName)}`, {
|
||||
method: "PUT",
|
||||
headers: {
|
||||
Authorization: `Bearer ${client.token}`,
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
cmd: "bash",
|
||||
args: expectedArgs,
|
||||
http_port: port,
|
||||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`sprites service upsert failed (status ${response.status}): ${await response.text()}`);
|
||||
}
|
||||
}
|
||||
|
||||
async function startServiceIfNeeded(client: SpritesClient, spriteName: string, serviceName: string, duration: string): Promise<void> {
|
||||
const existing = await fetchService(client, spriteName, serviceName);
|
||||
if (existing?.state?.status === "running" || existing?.state?.status === "starting") {
|
||||
return;
|
||||
}
|
||||
|
||||
const response = await fetch(
|
||||
`${client.baseURL}/v1/sprites/${encodeURIComponent(spriteName)}/services/${encodeURIComponent(serviceName)}/start?duration=${encodeURIComponent(duration)}`,
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
Authorization: `Bearer ${client.token}`,
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`sprites service start failed (status ${response.status}): ${await response.text()}`);
|
||||
}
|
||||
|
||||
await response.text();
|
||||
}
|
||||
|
||||
async function ensureService(
|
||||
client: SpritesClient,
|
||||
spriteName: string,
|
||||
serviceName: string,
|
||||
port: number,
|
||||
duration: string,
|
||||
env: Record<string, string>,
|
||||
): Promise<void> {
|
||||
const command = buildServiceCommand(env, port);
|
||||
await upsertService(client, spriteName, serviceName, port, command);
|
||||
await startServiceIfNeeded(client, spriteName, serviceName, duration);
|
||||
}
|
||||
|
||||
export function sprites(options: SpritesProviderOptions = {}): SandboxProvider {
|
||||
const agentPort = options.agentPort ?? DEFAULT_AGENT_PORT;
|
||||
const serviceName = options.serviceName ?? DEFAULT_SERVICE_NAME;
|
||||
const serviceStartDuration = options.serviceStartDuration ?? DEFAULT_SERVICE_START_DURATION;
|
||||
const namePrefix = options.namePrefix ?? DEFAULT_NAME_PREFIX;
|
||||
const installAgents = [...(options.installAgents ?? [])];
|
||||
|
||||
const getClient = async (): Promise<SpritesClient> => {
|
||||
const token = await resolveToken(options.token);
|
||||
const clientOptions = await resolveValue(options.client, {});
|
||||
return createSpritesClient(token, clientOptions);
|
||||
};
|
||||
|
||||
const getServerEnv = async (): Promise<Record<string, string>> => {
|
||||
return await resolveValue(options.env, {});
|
||||
};
|
||||
|
||||
const provider: SpritesSandboxProvider = {
|
||||
name: "sprites",
|
||||
defaultCwd: "/home/sprite",
|
||||
async create(): Promise<string> {
|
||||
const client = await getClient();
|
||||
const createOptions = await resolveValue(options.create, {});
|
||||
const spriteName = createOptions.name ?? generateSpriteName(namePrefix);
|
||||
const sprite = await client.createSprite(spriteName, createOptions.config);
|
||||
|
||||
const serverEnv = await getServerEnv();
|
||||
for (const agent of installAgents) {
|
||||
await runSpriteCommand(sprite, "bash", ["-lc", `npx -y ${SANDBOX_AGENT_NPX_SPEC} install-agent ${agent}`], serverEnv);
|
||||
}
|
||||
|
||||
await ensureService(client, spriteName, serviceName, agentPort, serviceStartDuration, serverEnv);
|
||||
return sprite.name;
|
||||
},
|
||||
async destroy(sandboxId: string): Promise<void> {
|
||||
const client = await getClient();
|
||||
try {
|
||||
await client.deleteSprite(sandboxId);
|
||||
} catch (error) {
|
||||
if (isSpriteNotFoundError(error) || (error instanceof Error && error.message.includes("status 404"))) {
|
||||
return;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
async reconnect(sandboxId: string): Promise<void> {
|
||||
const client = await getClient();
|
||||
try {
|
||||
await client.getSprite(sandboxId);
|
||||
} catch (error) {
|
||||
if (isSpriteNotFoundError(error)) {
|
||||
throw new SandboxDestroyedError(sandboxId, "sprites", { cause: error });
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
async getUrl(sandboxId: string): Promise<string> {
|
||||
const client = await getClient();
|
||||
const sprite = await client.getSprite(sandboxId);
|
||||
const url = (sprite as { url?: string }).url;
|
||||
if (!url) {
|
||||
throw new Error(`sprites API did not return a URL for sprite: ${sandboxId}`);
|
||||
}
|
||||
return url;
|
||||
},
|
||||
async ensureServer(sandboxId: string): Promise<void> {
|
||||
const client = await getClient();
|
||||
await ensureService(client, sandboxId, serviceName, agentPort, serviceStartDuration, await getServerEnv());
|
||||
},
|
||||
async getToken(): Promise<string> {
|
||||
return await resolveToken(options.token);
|
||||
},
|
||||
};
|
||||
|
||||
return provider;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue