rl-rock 1.3.9 → 1.10.0-beta.1

package/README.md

@@ -52,6 +52,9 @@ const sandbox = new Sandbox({
 await sandbox.start();
 
 console.log(`Sandbox ID: ${sandbox.getSandboxId()}`);
+
+// 重启沙箱
+await sandbox.restart();
 ```
 
 ### 执行命令
@@ -237,6 +240,7 @@ interface SandboxConfig {
   cpus: number;            // CPU 核心数
   autoClearSeconds: number; // 自动清理时间
   startupTimeout: number;  // 启动超时
+  autoDeleteSeconds?: number | null; // 沙箱自动删除时间（秒），0 表示立即清理，null/undefined 表示不自动删除
   routeKey?: string;       // 路由键
   extraHeaders?: Record<string, string>; // 额外请求头
 }

package/dist/index.d.mts

@@ -983,6 +983,7 @@ declare const SandboxConfigSchema: z.ZodObject<{
     experimentId: z.ZodOptional<z.ZodString>;
     cluster: z.ZodDefault<z.ZodString>;
     namespace: z.ZodOptional<z.ZodString>;
+    autoDeleteSeconds: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, "strip", z.ZodTypeAny, {
     image: string;
     cpus: number;
@@ -997,6 +998,7 @@ declare const SandboxConfigSchema: z.ZodObject<{
     namespace?: string | undefined;
     xrlAuthorization?: string | undefined;
     routeKey?: string | undefined;
+    autoDeleteSeconds?: number | null | undefined;
 }, {
     image?: string | undefined;
     userId?: string | undefined;
@@ -1011,6 +1013,7 @@ declare const SandboxConfigSchema: z.ZodObject<{
     autoClearSeconds?: number | undefined;
     routeKey?: string | undefined;
     startupTimeout?: number | undefined;
+    autoDeleteSeconds?: number | null | undefined;
 }>;
 type SandboxConfig = z.infer<typeof SandboxConfigSchema>;
 /**
@@ -1031,6 +1034,7 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     experimentId: z.ZodOptional<z.ZodString>;
     cluster: z.ZodDefault<z.ZodString>;
     namespace: z.ZodOptional<z.ZodString>;
+    autoDeleteSeconds: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 } & {
     size: z.ZodDefault<z.ZodNumber>;
     startConcurrency: z.ZodDefault<z.ZodNumber>;
@@ -1052,6 +1056,7 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     namespace?: string | undefined;
     xrlAuthorization?: string | undefined;
     routeKey?: string | undefined;
+    autoDeleteSeconds?: number | null | undefined;
 }, {
     image?: string | undefined;
     userId?: string | undefined;
@@ -1066,6 +1071,7 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     autoClearSeconds?: number | undefined;
     routeKey?: string | undefined;
     startupTimeout?: number | undefined;
+    autoDeleteSeconds?: number | null | undefined;
     size?: number | undefined;
     startConcurrency?: number | undefined;
     startRetryTimes?: number | undefined;
@@ -1312,7 +1318,9 @@ declare class Sandbox extends AbstractSandbox {
     start(): Promise<void>;
     stop(): Promise<void>;
     isAlive(): Promise<IsAliveResponse>;
-    getStatus(): Promise<SandboxStatusResponse>;
+    getStatus(options?: {
+        includeAllStates?: boolean;
+    }): Promise<SandboxStatusResponse>;
     execute(command: Command): Promise<CommandResponse>;
     createSession(request: CreateBashSessionRequest): Promise<CreateSessionResponse>;
     closeSession(request: CloseSessionRequest): Promise<CloseSessionResponse>;
@@ -1367,6 +1375,9 @@ declare class Sandbox extends AbstractSandbox {
      * @param timeout - Optional timeout in milliseconds (defaults to ROCK_OSS_TIMEOUT env var or 300000ms)
      */
     private setupOss;
+    restart(): Promise<void>;
+    private waitForAlive;
+    private parseErrorMessageFromStatus;
     close(): Promise<void>;
     toString(): string;
 }

package/dist/index.d.ts

@@ -983,6 +983,7 @@ declare const SandboxConfigSchema: z.ZodObject<{
     experimentId: z.ZodOptional<z.ZodString>;
     cluster: z.ZodDefault<z.ZodString>;
     namespace: z.ZodOptional<z.ZodString>;
+    autoDeleteSeconds: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, "strip", z.ZodTypeAny, {
     image: string;
     cpus: number;
@@ -997,6 +998,7 @@ declare const SandboxConfigSchema: z.ZodObject<{
     namespace?: string | undefined;
     xrlAuthorization?: string | undefined;
     routeKey?: string | undefined;
+    autoDeleteSeconds?: number | null | undefined;
 }, {
     image?: string | undefined;
     userId?: string | undefined;
@@ -1011,6 +1013,7 @@ declare const SandboxConfigSchema: z.ZodObject<{
     autoClearSeconds?: number | undefined;
     routeKey?: string | undefined;
     startupTimeout?: number | undefined;
+    autoDeleteSeconds?: number | null | undefined;
 }>;
 type SandboxConfig = z.infer<typeof SandboxConfigSchema>;
 /**
@@ -1031,6 +1034,7 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     experimentId: z.ZodOptional<z.ZodString>;
     cluster: z.ZodDefault<z.ZodString>;
     namespace: z.ZodOptional<z.ZodString>;
+    autoDeleteSeconds: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 } & {
     size: z.ZodDefault<z.ZodNumber>;
     startConcurrency: z.ZodDefault<z.ZodNumber>;
@@ -1052,6 +1056,7 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     namespace?: string | undefined;
     xrlAuthorization?: string | undefined;
     routeKey?: string | undefined;
+    autoDeleteSeconds?: number | null | undefined;
 }, {
     image?: string | undefined;
     userId?: string | undefined;
@@ -1066,6 +1071,7 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     autoClearSeconds?: number | undefined;
     routeKey?: string | undefined;
     startupTimeout?: number | undefined;
+    autoDeleteSeconds?: number | null | undefined;
     size?: number | undefined;
     startConcurrency?: number | undefined;
     startRetryTimes?: number | undefined;
@@ -1312,7 +1318,9 @@ declare class Sandbox extends AbstractSandbox {
     start(): Promise<void>;
     stop(): Promise<void>;
     isAlive(): Promise<IsAliveResponse>;
-    getStatus(): Promise<SandboxStatusResponse>;
+    getStatus(options?: {
+        includeAllStates?: boolean;
+    }): Promise<SandboxStatusResponse>;
     execute(command: Command): Promise<CommandResponse>;
     createSession(request: CreateBashSessionRequest): Promise<CreateSessionResponse>;
     closeSession(request: CloseSessionRequest): Promise<CloseSessionResponse>;
@@ -1367,6 +1375,9 @@ declare class Sandbox extends AbstractSandbox {
      * @param timeout - Optional timeout in milliseconds (defaults to ROCK_OSS_TIMEOUT env var or 300000ms)
      */
     private setupOss;
+    restart(): Promise<void>;
+    private waitForAlive;
+    private parseErrorMessageFromStatus;
     close(): Promise<void>;
     toString(): string;
 }

package/dist/index.js

@@ -1114,7 +1114,8 @@ var SandboxConfigSchema = BaseConfigSchema.extend({
   userId: zod.z.string().optional(),
   experimentId: zod.z.string().optional(),
   cluster: zod.z.string().default(() => envVars.ROCK_DEFAULT_CLUSTER),
-  namespace: zod.z.string().optional()
+  namespace: zod.z.string().optional(),
+  autoDeleteSeconds: zod.z.number().min(0, "autoDeleteSeconds must be >= 0").nullish()
 });
 var SandboxGroupConfigSchema = SandboxConfigSchema.extend({
   size: zod.z.number().default(() => envVars.ROCK_DEFAULT_GROUP_SIZE),
@@ -1995,7 +1996,8 @@ var Sandbox = class extends AbstractSandbox {
       autoClearTimeMinutes: this.config.autoClearSeconds / 60,
       startupTimeout: this.config.startupTimeout,
       memory: this.config.memory,
-      cpus: this.config.cpus
+      cpus: this.config.cpus,
+      autoDeleteSeconds: this.config.autoDeleteSeconds
     };
     logger8.debug(`Calling start_async API: ${url}`);
     logger8.debug(`Request data: ${JSON.stringify(data)}`);
@@ -2014,30 +2016,7 @@ var Sandbox = class extends AbstractSandbox {
     this.hostName = response.result?.hostName ?? null;
     this.hostIp = response.result?.hostIp ?? null;
     logger8.info(`Sandbox ID: ${this.sandboxId}`);
-    await sleep(2e3);
-    const startTime = Date.now();
-    const checkTimeout = 1e4;
-    const checkInterval = 3e3;
-    while (Date.now() - startTime < this.config.startupTimeout * 1e3) {
-      try {
-        logger8.info(`Checking status... (elapsed: ${Math.round((Date.now() - startTime) / 1e3)}s)`);
-        const statusPromise = this.getStatus();
-        const timeoutPromise = new Promise(
-          (_, reject) => setTimeout(() => reject(new Error("Status check timeout")), checkTimeout)
-        );
-        const status = await Promise.race([statusPromise, timeoutPromise]);
-        if (status && status.isAlive) {
-          logger8.info("Sandbox is alive");
-          return;
-        }
-      } catch (e) {
-        logger8.debug(`Status check failed (will retry): ${e}`);
-      }
-      await sleep(checkInterval);
-    }
-    throw new InternalServerRockError(
-      `Failed to start sandbox within ${this.config.startupTimeout}s, sandbox: ${this.toString()}`
-    );
+    await this.waitForAlive();
   }
   async stop() {
     if (!this.sandboxId) return;
@@ -2060,8 +2039,11 @@ var Sandbox = class extends AbstractSandbox {
       throw new Error(`Failed to get is alive: ${e}`);
     }
   }
-  async getStatus() {
-    const url = `${this.url}/get_status?sandbox_id=${this.sandboxId}`;
+  async getStatus(options) {
+    let url = `${this.url}/get_status?sandbox_id=${this.sandboxId}`;
+    if (options?.includeAllStates) {
+      url += "&include_all_states=true";
+    }
     const headers = this.buildHeaders();
     const response = await HttpUtils.get(url, headers);
     if (response.status !== "Success") {
@@ -2555,6 +2537,75 @@ var Sandbox = class extends AbstractSandbox {
       // 5 minutes
     });
   }
+  async restart() {
+    if (!this.sandboxId) {
+      throw new Error("sandbox_id is not set, cannot restart");
+    }
+    const url = `${this.url}/restart`;
+    const headers = this.buildHeaders();
+    const data = { sandboxId: this.sandboxId };
+    const response = await HttpUtils.post(url, headers, data);
+    logger8.debug(`Restart sandbox response: ${JSON.stringify(response)}`);
+    if (response.status !== "Success") {
+      const code = response.result?.code;
+      raiseForCode(code, `Failed to restart sandbox: ${JSON.stringify(response)}`);
+      throw new Error(`Failed to restart sandbox: ${JSON.stringify(response)}`);
+    }
+    await this.waitForAlive({ includeAllStates: true, operation: "restart" });
+  }
+  async waitForAlive(options) {
+    await sleep(2e3);
+    const startTime = Date.now();
+    const checkTimeout = 1e4;
+    const checkInterval = 3e3;
+    while (Date.now() - startTime < this.config.startupTimeout * 1e3) {
+      let timeoutId;
+      try {
+        logger8.info(`Checking status... (elapsed: ${Math.round((Date.now() - startTime) / 1e3)}s)`);
+        const statusPromise = this.getStatus(options);
+        const timeoutPromise = new Promise((_, reject) => {
+          timeoutId = setTimeout(() => reject(new Error("Status check timeout")), checkTimeout);
+        });
+        const status = await Promise.race([statusPromise, timeoutPromise]);
+        if (status && status.isAlive) {
+          logger8.info("Sandbox is alive");
+          return;
+        }
+        if (options?.includeAllStates && status) {
+          const errorMsg = this.parseErrorMessageFromStatus(status.status);
+          if (errorMsg) {
+            throw new InternalServerRockError(
+              `Failed to restart sandbox because ${errorMsg}, sandbox: ${this.toString()}`
+            );
+          }
+        }
+      } catch (e) {
+        if (e instanceof InternalServerRockError) {
+          throw e;
+        }
+        logger8.debug(`Status check failed (will retry): ${e}`);
+      } finally {
+        clearTimeout(timeoutId);
+      }
+      await sleep(checkInterval);
+    }
+    const operation = options?.operation ?? "start";
+    throw new InternalServerRockError(
+      `Failed to ${operation} sandbox within ${this.config.startupTimeout}s, sandbox: ${this.toString()}`
+    );
+  }
+  parseErrorMessageFromStatus(status) {
+    if (!status) return null;
+    for (const [stage, details] of Object.entries(status)) {
+      if (details && typeof details === "object") {
+        const d = details;
+        if (d.status === "failed" || d.status === "timeout") {
+          return `${stage}: ${d.message ?? "No message provided"}`;
+        }
+      }
+    }
+    return null;
+  }
   // Close
   async close() {
     await this.stop();