rl-rock 1.2.2 → 1.2.4

package/dist/index.d.mts

@@ -268,6 +268,9 @@ declare const SandboxStatusResponseSchema: z.ZodObject<{
     cpus: z.ZodOptional<z.ZodNumber>;
     memory: z.ZodOptional<z.ZodString>;
     state: z.ZodOptional<z.ZodUnknown>;
+    cluster: z.ZodOptional<z.ZodString>;
+    requestId: z.ZodOptional<z.ZodString>;
+    eagleeyeTraceid: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     isAlive: boolean;
     status?: Record<string, unknown> | undefined;
@@ -284,6 +287,9 @@ declare const SandboxStatusResponseSchema: z.ZodObject<{
     cpus?: number | undefined;
     memory?: string | undefined;
     state?: unknown;
+    cluster?: string | undefined;
+    requestId?: string | undefined;
+    eagleeyeTraceid?: string | undefined;
 }, {
     status?: Record<string, unknown> | undefined;
     isAlive?: boolean | undefined;
@@ -300,6 +306,9 @@ declare const SandboxStatusResponseSchema: z.ZodObject<{
     cpus?: number | undefined;
     memory?: string | undefined;
     state?: unknown;
+    cluster?: string | undefined;
+    requestId?: string | undefined;
+    eagleeyeTraceid?: string | undefined;
 }>;
 type SandboxStatusResponse = z.infer<typeof SandboxStatusResponseSchema>;
 /**
@@ -546,6 +555,15 @@ declare function raiseForCode(code: Codes | null | undefined, message: string):
  */
 declare function fromRockException(e: RockException): SandboxResponse;
 
+/**
+ * HTTP response with headers
+ */
+interface HttpResponse<T = unknown> {
+    status: string;
+    result?: T;
+    error?: string;
+    headers: Record<string, string>;
+}
 /**
  * HTTP utilities class
  */
@@ -561,12 +579,16 @@ declare class HttpUtils {
      * Automatically converts request body from camelCase to snake_case
      * Automatically converts response from snake_case to camelCase
      */
-    static post<T = unknown>(url: string, headers: Record<string, string>, data: Record<string, unknown>, readTimeout?: number): Promise<T>;
+    static post<T = unknown>(url: string, headers: Record<string, string>, data: Record<string, unknown>, readTimeout?: number): Promise<HttpResponse<T>>;
     /**
      * Send GET request
      * Automatically converts response from snake_case to camelCase
      */
-    static get<T = unknown>(url: string, headers: Record<string, string>): Promise<T>;
+    static get<T = unknown>(url: string, headers: Record<string, string>): Promise<HttpResponse<T>>;
+    /**
+     * Extract headers from axios response
+     */
+    private static extractHeaders;
     /**
      * Convert camelCase key to snake_case
      */
@@ -576,7 +598,7 @@ declare class HttpUtils {
      * Automatically converts form data keys to snake_case
      * Automatically converts response from snake_case to camelCase
      */
-    static postMultipart<T = unknown>(url: string, headers: Record<string, string>, data?: Record<string, string | number | boolean>, files?: Record<string, File | Buffer | [string, Buffer, string]>): Promise<T>;
+    static postMultipart<T = unknown>(url: string, headers: Record<string, string>, data?: Record<string, string | number | boolean>, files?: Record<string, File | Buffer | [string, Buffer, string]>): Promise<HttpResponse<T>>;
     /**
      * Guess MIME type from filename
      */
@@ -870,11 +892,11 @@ declare const SandboxConfigSchema: z.ZodObject<{
     image: string;
     cpus: number;
     memory: string;
+    cluster: string;
     baseUrl: string;
     extraHeaders: Record<string, string>;
     autoClearSeconds: number;
     startupTimeout: number;
-    cluster: string;
     userId?: string | undefined;
     experimentId?: string | undefined;
     namespace?: string | undefined;
@@ -887,13 +909,13 @@ declare const SandboxConfigSchema: z.ZodObject<{
     namespace?: string | undefined;
     cpus?: number | undefined;
     memory?: string | undefined;
+    cluster?: string | undefined;
     baseUrl?: string | undefined;
     xrlAuthorization?: string | undefined;
     extraHeaders?: Record<string, string> | undefined;
     autoClearSeconds?: number | undefined;
     routeKey?: string | undefined;
     startupTimeout?: number | undefined;
-    cluster?: string | undefined;
 }>;
 type SandboxConfig = z.infer<typeof SandboxConfigSchema>;
 /**
@@ -922,11 +944,11 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     image: string;
     cpus: number;
     memory: string;
+    cluster: string;
     baseUrl: string;
     extraHeaders: Record<string, string>;
     autoClearSeconds: number;
     startupTimeout: number;
-    cluster: string;
     size: number;
     startConcurrency: number;
     startRetryTimes: number;
@@ -942,13 +964,13 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     namespace?: string | undefined;
     cpus?: number | undefined;
     memory?: string | undefined;
+    cluster?: string | undefined;
     baseUrl?: string | undefined;
     xrlAuthorization?: string | undefined;
     extraHeaders?: Record<string, string> | undefined;
     autoClearSeconds?: number | undefined;
     routeKey?: string | undefined;
     startupTimeout?: number | undefined;
-    cluster?: string | undefined;
     size?: number | undefined;
     startConcurrency?: number | undefined;
     startRetryTimes?: number | undefined;
@@ -1136,8 +1158,8 @@ declare abstract class AbstractSandbox {
     abstract isAlive(): Promise<IsAliveResponse>;
     abstract createSession(request: CreateBashSessionRequest): Promise<CreateSessionResponse>;
     abstract execute(command: Command): Promise<CommandResponse>;
-    abstract read_file(request: ReadFileRequest): Promise<ReadFileResponse>;
-    abstract write_file(request: WriteFileRequest): Promise<WriteFileResponse>;
+    abstract readFile(request: ReadFileRequest): Promise<ReadFileResponse>;
+    abstract writeFile(request: WriteFileRequest): Promise<WriteFileResponse>;
     abstract upload(request: UploadRequest): Promise<UploadResponse>;
     abstract closeSession(request: CloseSessionRequest): Promise<CloseSessionResponse>;
     abstract close(): Promise<void>;
@@ -1192,8 +1214,8 @@ declare class Sandbox extends AbstractSandbox {
     private runInSession;
     private arunWithNohup;
     private waitForProcessCompletion;
-    write_file(request: WriteFileRequest): Promise<WriteFileResponse>;
-    read_file(request: ReadFileRequest): Promise<ReadFileResponse>;
+    writeFile(request: WriteFileRequest): Promise<WriteFileResponse>;
+    readFile(request: ReadFileRequest): Promise<ReadFileResponse>;
     upload(request: UploadRequest): Promise<UploadResponse>;
     uploadByPath(sourcePath: string, targetPath: string): Promise<UploadResponse>;
     close(): Promise<void>;

package/dist/index.d.ts

@@ -268,6 +268,9 @@ declare const SandboxStatusResponseSchema: z.ZodObject<{
     cpus: z.ZodOptional<z.ZodNumber>;
     memory: z.ZodOptional<z.ZodString>;
     state: z.ZodOptional<z.ZodUnknown>;
+    cluster: z.ZodOptional<z.ZodString>;
+    requestId: z.ZodOptional<z.ZodString>;
+    eagleeyeTraceid: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     isAlive: boolean;
     status?: Record<string, unknown> | undefined;
@@ -284,6 +287,9 @@ declare const SandboxStatusResponseSchema: z.ZodObject<{
     cpus?: number | undefined;
     memory?: string | undefined;
     state?: unknown;
+    cluster?: string | undefined;
+    requestId?: string | undefined;
+    eagleeyeTraceid?: string | undefined;
 }, {
     status?: Record<string, unknown> | undefined;
     isAlive?: boolean | undefined;
@@ -300,6 +306,9 @@ declare const SandboxStatusResponseSchema: z.ZodObject<{
     cpus?: number | undefined;
     memory?: string | undefined;
     state?: unknown;
+    cluster?: string | undefined;
+    requestId?: string | undefined;
+    eagleeyeTraceid?: string | undefined;
 }>;
 type SandboxStatusResponse = z.infer<typeof SandboxStatusResponseSchema>;
 /**
@@ -546,6 +555,15 @@ declare function raiseForCode(code: Codes | null | undefined, message: string):
  */
 declare function fromRockException(e: RockException): SandboxResponse;
 
+/**
+ * HTTP response with headers
+ */
+interface HttpResponse<T = unknown> {
+    status: string;
+    result?: T;
+    error?: string;
+    headers: Record<string, string>;
+}
 /**
  * HTTP utilities class
  */
@@ -561,12 +579,16 @@ declare class HttpUtils {
      * Automatically converts request body from camelCase to snake_case
      * Automatically converts response from snake_case to camelCase
      */
-    static post<T = unknown>(url: string, headers: Record<string, string>, data: Record<string, unknown>, readTimeout?: number): Promise<T>;
+    static post<T = unknown>(url: string, headers: Record<string, string>, data: Record<string, unknown>, readTimeout?: number): Promise<HttpResponse<T>>;
     /**
      * Send GET request
      * Automatically converts response from snake_case to camelCase
      */
-    static get<T = unknown>(url: string, headers: Record<string, string>): Promise<T>;
+    static get<T = unknown>(url: string, headers: Record<string, string>): Promise<HttpResponse<T>>;
+    /**
+     * Extract headers from axios response
+     */
+    private static extractHeaders;
     /**
      * Convert camelCase key to snake_case
      */
@@ -576,7 +598,7 @@ declare class HttpUtils {
      * Automatically converts form data keys to snake_case
      * Automatically converts response from snake_case to camelCase
      */
-    static postMultipart<T = unknown>(url: string, headers: Record<string, string>, data?: Record<string, string | number | boolean>, files?: Record<string, File | Buffer | [string, Buffer, string]>): Promise<T>;
+    static postMultipart<T = unknown>(url: string, headers: Record<string, string>, data?: Record<string, string | number | boolean>, files?: Record<string, File | Buffer | [string, Buffer, string]>): Promise<HttpResponse<T>>;
     /**
      * Guess MIME type from filename
      */
@@ -870,11 +892,11 @@ declare const SandboxConfigSchema: z.ZodObject<{
     image: string;
     cpus: number;
     memory: string;
+    cluster: string;
     baseUrl: string;
     extraHeaders: Record<string, string>;
     autoClearSeconds: number;
     startupTimeout: number;
-    cluster: string;
     userId?: string | undefined;
     experimentId?: string | undefined;
     namespace?: string | undefined;
@@ -887,13 +909,13 @@ declare const SandboxConfigSchema: z.ZodObject<{
     namespace?: string | undefined;
     cpus?: number | undefined;
     memory?: string | undefined;
+    cluster?: string | undefined;
     baseUrl?: string | undefined;
     xrlAuthorization?: string | undefined;
     extraHeaders?: Record<string, string> | undefined;
     autoClearSeconds?: number | undefined;
     routeKey?: string | undefined;
     startupTimeout?: number | undefined;
-    cluster?: string | undefined;
 }>;
 type SandboxConfig = z.infer<typeof SandboxConfigSchema>;
 /**
@@ -922,11 +944,11 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     image: string;
     cpus: number;
     memory: string;
+    cluster: string;
     baseUrl: string;
     extraHeaders: Record<string, string>;
     autoClearSeconds: number;
     startupTimeout: number;
-    cluster: string;
     size: number;
     startConcurrency: number;
     startRetryTimes: number;
@@ -942,13 +964,13 @@ declare const SandboxGroupConfigSchema: z.ZodObject<{
     namespace?: string | undefined;
     cpus?: number | undefined;
     memory?: string | undefined;
+    cluster?: string | undefined;
     baseUrl?: string | undefined;
     xrlAuthorization?: string | undefined;
     extraHeaders?: Record<string, string> | undefined;
     autoClearSeconds?: number | undefined;
     routeKey?: string | undefined;
     startupTimeout?: number | undefined;
-    cluster?: string | undefined;
     size?: number | undefined;
     startConcurrency?: number | undefined;
     startRetryTimes?: number | undefined;
@@ -1136,8 +1158,8 @@ declare abstract class AbstractSandbox {
     abstract isAlive(): Promise<IsAliveResponse>;
     abstract createSession(request: CreateBashSessionRequest): Promise<CreateSessionResponse>;
     abstract execute(command: Command): Promise<CommandResponse>;
-    abstract read_file(request: ReadFileRequest): Promise<ReadFileResponse>;
-    abstract write_file(request: WriteFileRequest): Promise<WriteFileResponse>;
+    abstract readFile(request: ReadFileRequest): Promise<ReadFileResponse>;
+    abstract writeFile(request: WriteFileRequest): Promise<WriteFileResponse>;
     abstract upload(request: UploadRequest): Promise<UploadResponse>;
     abstract closeSession(request: CloseSessionRequest): Promise<CloseSessionResponse>;
     abstract close(): Promise<void>;
@@ -1192,8 +1214,8 @@ declare class Sandbox extends AbstractSandbox {
     private runInSession;
     private arunWithNohup;
     private waitForProcessCompletion;
-    write_file(request: WriteFileRequest): Promise<WriteFileResponse>;
-    read_file(request: ReadFileRequest): Promise<ReadFileResponse>;
+    writeFile(request: WriteFileRequest): Promise<WriteFileResponse>;
+    readFile(request: ReadFileRequest): Promise<ReadFileResponse>;
     upload(request: UploadRequest): Promise<UploadResponse>;
     uploadByPath(sourcePath: string, targetPath: string): Promise<UploadResponse>;
     close(): Promise<void>;

package/dist/index.js

@@ -118,7 +118,11 @@ var SandboxStatusResponseSchema = zod.z.object({
   namespace: zod.z.string().optional(),
   cpus: zod.z.number().optional(),
   memory: zod.z.string().optional(),
-  state: zod.z.unknown().optional()
+  state: zod.z.unknown().optional(),
+  // Response headers info
+  cluster: zod.z.string().optional(),
+  requestId: zod.z.string().optional(),
+  eagleeyeTraceid: zod.z.string().optional()
 });
 var CommandResponseSchema = zod.z.object({
   stdout: zod.z.string().default(""),
@@ -290,7 +294,18 @@ var HttpUtils = class {
     const snakeData = objectToSnake(data);
     try {
       const response = await client.post(url, snakeData);
-      return objectToCamel(response.data);
+      const camelData = objectToCamel(response.data);
+      const httpResponse = {
+        status: camelData.status ?? "Success",
+        headers: this.extractHeaders(response)
+      };
+      if (camelData.result !== void 0) {
+        httpResponse.result = camelData.result;
+      }
+      if (camelData.error !== void 0) {
+        httpResponse.error = camelData.error;
+      }
+      return httpResponse;
     } catch (error) {
       if (error instanceof axios3.AxiosError) {
         throw new Error(`Failed to POST ${url}: ${error.message}`);
@@ -306,7 +321,18 @@ var HttpUtils = class {
     const client = this.createClient({ headers });
     try {
       const response = await client.get(url);
-      return objectToCamel(response.data);
+      const camelData = objectToCamel(response.data);
+      const httpResponse = {
+        status: camelData.status ?? "Success",
+        headers: this.extractHeaders(response)
+      };
+      if (camelData.result !== void 0) {
+        httpResponse.result = camelData.result;
+      }
+      if (camelData.error !== void 0) {
+        httpResponse.error = camelData.error;
+      }
+      return httpResponse;
     } catch (error) {
       if (error instanceof axios3.AxiosError) {
         throw new Error(`Failed to GET ${url}: ${error.message}`);
@@ -314,6 +340,20 @@ var HttpUtils = class {
       throw error;
     }
   }
+  /**
+   * Extract headers from axios response
+   */
+  static extractHeaders(response) {
+    const headers = {};
+    for (const [key, value] of Object.entries(response.headers)) {
+      if (typeof value === "string") {
+        headers[key.toLowerCase()] = value;
+      } else if (Array.isArray(value)) {
+        headers[key.toLowerCase()] = value.join(", ");
+      }
+    }
+    return headers;
+  }
   /**
    * Convert camelCase key to snake_case
    */
@@ -360,7 +400,18 @@ var HttpUtils = class {
     });
     try {
       const response = await client.post(url, formData);
-      return objectToCamel(response.data);
+      const camelData = objectToCamel(response.data);
+      const httpResponse = {
+        status: camelData.status ?? "Success",
+        headers: this.extractHeaders(response)
+      };
+      if (camelData.result !== void 0) {
+        httpResponse.result = camelData.result;
+      }
+      if (camelData.error !== void 0) {
+        httpResponse.error = camelData.error;
+      }
+      return httpResponse;
     } catch (error) {
       if (error instanceof axios3.AxiosError) {
         throw new Error(`Failed to POST multipart ${url}: ${error.message}`);
@@ -571,7 +622,7 @@ var EnvHubClient = class {
         this.headers,
         payload
       );
-      return createRockEnvInfo(response);
+      return createRockEnvInfo(response.result);
     } catch (e) {
       throw new EnvHubError(`Failed to register environment: ${e}`);
     }
@@ -588,7 +639,7 @@ var EnvHubClient = class {
         this.headers,
         payload
       );
-      return createRockEnvInfo(response);
+      return createRockEnvInfo(response.result);
     } catch (e) {
       throw new EnvHubError(`Failed to get environment ${envName}: ${e}`);
     }
@@ -608,7 +659,7 @@ var EnvHubClient = class {
         this.headers,
         payload
       );
-      const envsData = response.envs ?? [];
+      const envsData = response.result?.envs ?? [];
       return envsData.map((envData) => createRockEnvInfo(envData));
     } catch (e) {
       throw new EnvHubError(`Failed to list environments: ${e}`);
@@ -641,7 +692,7 @@ var EnvHubClient = class {
         url,
         this.headers
       );
-      return response;
+      return response.result ?? {};
     } catch (e) {
       throw new EnvHubError(`Failed to health check: ${e}`);
     }
@@ -1090,7 +1141,7 @@ var Process = class {
     const scriptPath = `/tmp/${name}`;
     try {
       logger5.info(`[${sandboxId}] Uploading script to ${scriptPath}`);
-      const writeResult = await this.sandbox.write_file({
+      const writeResult = await this.sandbox.writeFile({
         content: scriptContent,
         path: scriptPath
       });
@@ -1430,9 +1481,14 @@ var Sandbox = class extends AbstractSandbox {
     const headers = this.buildHeaders();
     const response = await HttpUtils.get(url, headers);
     if (response.status !== "Success") {
-      throw new Error(`Failed to get status: ${JSON.stringify(response)}`);
+      const errorDetail = response.error ? `, error=${response.error}` : "";
+      throw new Error(`Failed to get status: status=${response.status}${errorDetail}, result=${JSON.stringify(response.result)}`);
     }
-    return response.result;
+    const result = response.result;
+    result.cluster = response.headers["x-rock-gateway-target-cluster"] || this.config.cluster || "N/A";
+    result.requestId = response.headers["x-request-id"] || response.headers["request-id"] || "N/A";
+    result.eagleeyeTraceid = response.headers["eagleeye-traceid"] || "N/A";
+    return result;
   }
   // Command execution
   async execute(command) {
@@ -1452,7 +1508,8 @@ var Sandbox = class extends AbstractSandbox {
         data
       );
       if (response.status !== "Success") {
-        throw new Error(`Failed to execute command: ${JSON.stringify(response)}`);
+        const errorDetail = response.error ? `, error=${response.error}` : "";
+        throw new Error(`Failed to execute command: status=${response.status}${errorDetail}, result=${JSON.stringify(response.result)}`);
       }
       return response.result;
     } catch (e) {
@@ -1474,7 +1531,8 @@ var Sandbox = class extends AbstractSandbox {
         data
       );
       if (response.status !== "Success") {
-        throw new Error(`Failed to create session: ${JSON.stringify(response)}`);
+        const errorDetail = response.error ? `, error=${response.error}` : "";
+        throw new Error(`Failed to create session: status=${response.status}${errorDetail}, result=${JSON.stringify(response.result)}`);
       }
       return response.result;
     } catch (e) {
@@ -1495,7 +1553,8 @@ var Sandbox = class extends AbstractSandbox {
         data
       );
       if (response.status !== "Success") {
-        throw new Error(`Failed to close session: ${JSON.stringify(response)}`);
+        const errorDetail = response.error ? `, error=${response.error}` : "";
+        throw new Error(`Failed to close session: status=${response.status}${errorDetail}, result=${JSON.stringify(response.result)}`);
       }
       return response.result ?? { sessionType: "bash" };
     } catch (e) {
@@ -1541,7 +1600,8 @@ var Sandbox = class extends AbstractSandbox {
         timeoutMs
       );
       if (response.status !== "Success") {
-        throw new Error(`Failed to execute command: ${JSON.stringify(response)}`);
+        const errorDetail = response.error ? `, error=${response.error}` : "";
+        throw new Error(`Failed to run in session: status=${response.status}${errorDetail}, result=${JSON.stringify(response.result)}`);
       }
       return response.result;
     } catch (e) {
@@ -1629,7 +1689,7 @@ var Sandbox = class extends AbstractSandbox {
     return false;
   }
   // File operations
-  async write_file(request) {
+  async writeFile(request) {
     const url = `${this.url}/write_file`;
     const headers = this.buildHeaders();
     const data = {
@@ -1643,7 +1703,7 @@ var Sandbox = class extends AbstractSandbox {
     }
     return { success: true, message: `Successfully write content to file ${request.path}` };
   }
-  async read_file(request) {
+  async readFile(request) {
     const url = `${this.url}/read_file`;
     const headers = this.buildHeaders();
     const data = {