rl-rock 1.2.2 → 1.2.3

package/dist/index.js

@@ -94,14 +94,21 @@ var ChmodRequestSchema = zod.z.object({
   mode: zod.z.string().default("755"),
   recursive: zod.z.boolean().default(false)
 });
+var HeaderFieldsSchema = {
+  cluster: zod.z.string().optional(),
+  requestId: zod.z.string().optional(),
+  eagleeyeTraceid: zod.z.string().optional()
+};
 var SandboxResponseSchema = zod.z.object({
   code: zod.z.nativeEnum(Codes).optional(),
   exitCode: zod.z.number().optional(),
-  failureReason: zod.z.string().optional()
+  failureReason: zod.z.string().optional(),
+  ...HeaderFieldsSchema
 });
 var IsAliveResponseSchema = zod.z.object({
   isAlive: zod.z.boolean(),
-  message: zod.z.string().default("")
+  message: zod.z.string().default(""),
+  ...HeaderFieldsSchema
 });
 var SandboxStatusResponseSchema = zod.z.object({
   sandboxId: zod.z.string().optional(),
@@ -118,54 +125,68 @@ 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(),
+  ...HeaderFieldsSchema
 });
 var CommandResponseSchema = zod.z.object({
   stdout: zod.z.string().default(""),
   stderr: zod.z.string().default(""),
-  exitCode: zod.z.number().optional()
+  exitCode: zod.z.number().optional(),
+  ...HeaderFieldsSchema
 });
 var WriteFileResponseSchema = zod.z.object({
   success: zod.z.boolean().default(false),
-  message: zod.z.string().default("")
+  message: zod.z.string().default(""),
+  ...HeaderFieldsSchema
 });
 var ReadFileResponseSchema = zod.z.object({
-  content: zod.z.string().default("")
+  content: zod.z.string().default(""),
+  ...HeaderFieldsSchema
 });
 var UploadResponseSchema = zod.z.object({
   success: zod.z.boolean().default(false),
   message: zod.z.string().default(""),
-  fileName: zod.z.string().optional()
+  fileName: zod.z.string().optional(),
+  ...HeaderFieldsSchema
 });
 var ObservationSchema = zod.z.object({
   output: zod.z.string().default(""),
   exitCode: zod.z.number().optional(),
   failureReason: zod.z.string().default(""),
-  expectString: zod.z.string().default("")
+  expectString: zod.z.string().default(""),
+  ...HeaderFieldsSchema
 });
 var CreateSessionResponseSchema = zod.z.object({
   output: zod.z.string().default(""),
-  sessionType: zod.z.literal("bash").default("bash")
+  sessionType: zod.z.literal("bash").default("bash"),
+  ...HeaderFieldsSchema
 });
 var CloseSessionResponseSchema = zod.z.object({
-  sessionType: zod.z.literal("bash").default("bash")
+  sessionType: zod.z.literal("bash").default("bash"),
+  ...HeaderFieldsSchema
+});
+var CloseResponseSchema = zod.z.object({
+  ...HeaderFieldsSchema
 });
-var CloseResponseSchema = zod.z.object({});
 var ChownResponseSchema = zod.z.object({
   success: zod.z.boolean().default(false),
-  message: zod.z.string().default("")
+  message: zod.z.string().default(""),
+  ...HeaderFieldsSchema
 });
 var ChmodResponseSchema = zod.z.object({
   success: zod.z.boolean().default(false),
-  message: zod.z.string().default("")
+  message: zod.z.string().default(""),
+  ...HeaderFieldsSchema
 });
 var ExecuteBashSessionResponseSchema = zod.z.object({
   success: zod.z.boolean().default(false),
-  message: zod.z.string().default("")
+  message: zod.z.string().default(""),
+  ...HeaderFieldsSchema
 });
 var OssSetupResponseSchema = zod.z.object({
   success: zod.z.boolean().default(false),
-  message: zod.z.string().default("")
+  message: zod.z.string().default(""),
+  ...HeaderFieldsSchema
 });
 
 // src/common/constants.ts
@@ -281,6 +302,7 @@ var HttpUtils = class {
    * Send POST request
    * Automatically converts request body from camelCase to snake_case
    * Automatically converts response from snake_case to camelCase
+   * Returns structured response with headers
    */
   static async post(url, headers, data, readTimeout) {
     const client = this.createClient({
@@ -290,7 +312,18 @@ var HttpUtils = class {
     const snakeData = objectToSnake(data);
     try {
       const response = await client.post(url, snakeData);
-      return objectToCamel(response.data);
+      const result = objectToCamel(response.data);
+      const responseHeaders = {};
+      for (const [key, value] of Object.entries(response.headers)) {
+        if (typeof value === "string") {
+          responseHeaders[key.toLowerCase()] = value;
+        }
+      }
+      return {
+        status: result?.status ?? "Success",
+        result,
+        headers: responseHeaders
+      };
     } catch (error) {
       if (error instanceof axios3.AxiosError) {
         throw new Error(`Failed to POST ${url}: ${error.message}`);
@@ -301,12 +334,24 @@ var HttpUtils = class {
   /**
    * Send GET request
    * Automatically converts response from snake_case to camelCase
+   * Returns structured response with headers
    */
   static async get(url, headers) {
     const client = this.createClient({ headers });
     try {
       const response = await client.get(url);
-      return objectToCamel(response.data);
+      const result = objectToCamel(response.data);
+      const responseHeaders = {};
+      for (const [key, value] of Object.entries(response.headers)) {
+        if (typeof value === "string") {
+          responseHeaders[key.toLowerCase()] = value;
+        }
+      }
+      return {
+        status: result?.status ?? "Success",
+        result,
+        headers: responseHeaders
+      };
     } catch (error) {
       if (error instanceof axios3.AxiosError) {
         throw new Error(`Failed to GET ${url}: ${error.message}`);
@@ -324,6 +369,7 @@ var HttpUtils = class {
    * Send multipart/form-data request
    * Automatically converts form data keys to snake_case
    * Automatically converts response from snake_case to camelCase
+   * Returns structured response with headers
    */
   static async postMultipart(url, headers, data, files) {
     const formData = new FormData();
@@ -360,7 +406,18 @@ var HttpUtils = class {
     });
     try {
       const response = await client.post(url, formData);
-      return objectToCamel(response.data);
+      const result = objectToCamel(response.data);
+      const responseHeaders = {};
+      for (const [key, value] of Object.entries(response.headers)) {
+        if (typeof value === "string") {
+          responseHeaders[key.toLowerCase()] = value;
+        }
+      }
+      return {
+        status: result?.status ?? "Success",
+        result,
+        headers: responseHeaders
+      };
     } catch (error) {
       if (error instanceof axios3.AxiosError) {
         throw new Error(`Failed to POST multipart ${url}: ${error.message}`);
@@ -571,7 +628,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 +645,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 +665,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 +698,7 @@ var EnvHubClient = class {
         url,
         this.headers
       );
-      return response;
+      return response.result;
     } catch (e) {
       throw new EnvHubError(`Failed to health check: ${e}`);
     }
@@ -1090,7 +1147,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
       });
@@ -1349,6 +1406,16 @@ var Sandbox = class extends AbstractSandbox {
       headers["X-Namespace"] = this.config.namespace;
     }
   }
+  /**
+   * Extract header-derived fields from response headers
+   */
+  extractHeaderFields(headers) {
+    return {
+      cluster: headers["x-rock-gateway-target-cluster"] || this.config.cluster || "N/A",
+      requestId: headers["x-request-id"] || headers["request-id"] || "N/A",
+      eagleeyeTraceid: headers["eagleeye-traceid"] || "N/A"
+    };
+  }
   // Lifecycle methods
   async start() {
     logger8.info("Starting sandbox...");
@@ -1432,7 +1499,11 @@ var Sandbox = class extends AbstractSandbox {
     if (response.status !== "Success") {
       throw new Error(`Failed to get status: ${JSON.stringify(response)}`);
     }
-    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) {
@@ -1454,7 +1525,9 @@ var Sandbox = class extends AbstractSandbox {
       if (response.status !== "Success") {
         throw new Error(`Failed to execute command: ${JSON.stringify(response)}`);
       }
-      return response.result;
+      const result = response.result;
+      Object.assign(result, this.extractHeaderFields(response.headers));
+      return result;
     } catch (e) {
       throw new Error(`Failed to execute command: ${e}`);
     }
@@ -1476,7 +1549,9 @@ var Sandbox = class extends AbstractSandbox {
       if (response.status !== "Success") {
         throw new Error(`Failed to create session: ${JSON.stringify(response)}`);
       }
-      return response.result;
+      const result = response.result;
+      Object.assign(result, this.extractHeaderFields(response.headers));
+      return result;
     } catch (e) {
       throw new Error(`Failed to create session: ${e}`);
     }
@@ -1497,7 +1572,9 @@ var Sandbox = class extends AbstractSandbox {
       if (response.status !== "Success") {
         throw new Error(`Failed to close session: ${JSON.stringify(response)}`);
       }
-      return response.result ?? { sessionType: "bash" };
+      const result = response.result ?? { sessionType: "bash" };
+      Object.assign(result, this.extractHeaderFields(response.headers));
+      return result;
     } catch (e) {
       throw new Error(`Failed to close session: ${e}`);
     }
@@ -1543,7 +1620,9 @@ var Sandbox = class extends AbstractSandbox {
       if (response.status !== "Success") {
         throw new Error(`Failed to execute command: ${JSON.stringify(response)}`);
       }
-      return response.result;
+      const result = response.result;
+      Object.assign(result, this.extractHeaderFields(response.headers));
+      return result;
     } catch (e) {
       throw new Error(`Failed to run in session: ${e}`);
     }
@@ -1582,7 +1661,10 @@ var Sandbox = class extends AbstractSandbox {
         output: "Failed to submit command, nohup failed to extract PID",
         exitCode: 1,
         failureReason: "PID extraction failed",
-        expectString: ""
+        expectString: "",
+        cluster: response.cluster,
+        requestId: response.requestId,
+        eagleeyeTraceid: response.eagleeyeTraceid
       };
     }
     const success = await this.waitForProcessCompletion(pid, tmpSession, waitTimeout, waitInterval);
@@ -1591,7 +1673,10 @@ var Sandbox = class extends AbstractSandbox {
         output: `Command executed in nohup mode. Output file: ${tmpFile}`,
         exitCode: success ? 0 : 1,
         failureReason: success ? "" : "Process did not complete successfully",
-        expectString: ""
+        expectString: "",
+        cluster: response.cluster,
+        requestId: response.requestId,
+        eagleeyeTraceid: response.eagleeyeTraceid
       };
     }
     const readCmd = responseLimitedBytesInNohup ? `head -c ${responseLimitedBytesInNohup} ${tmpFile}` : `cat ${tmpFile}`;
@@ -1603,7 +1688,10 @@ var Sandbox = class extends AbstractSandbox {
       output: outputResult.output,
       exitCode: success ? 0 : 1,
       failureReason: success ? "" : "Process did not complete successfully",
-      expectString: ""
+      expectString: "",
+      cluster: outputResult.cluster,
+      requestId: outputResult.requestId,
+      eagleeyeTraceid: outputResult.eagleeyeTraceid
     };
   }
   async waitForProcessCompletion(pid, session, waitTimeout, waitInterval) {
@@ -1629,7 +1717,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 = {
@@ -1638,12 +1726,13 @@ var Sandbox = class extends AbstractSandbox {
       sandboxId: this.sandboxId
     };
     const response = await HttpUtils.post(url, headers, data);
+    const headerFields = this.extractHeaderFields(response.headers);
     if (response.status !== "Success") {
-      return { success: false, message: `Failed to write file ${request.path}` };
+      return { success: false, message: `Failed to write file ${request.path}`, ...headerFields };
     }
-    return { success: true, message: `Successfully write content to file ${request.path}` };
+    return { success: true, message: `Successfully write content to file ${request.path}`, ...headerFields };
   }
-  async read_file(request) {
+  async readFile(request) {
     const url = `${this.url}/read_file`;
     const headers = this.buildHeaders();
     const data = {
@@ -1657,7 +1746,10 @@ var Sandbox = class extends AbstractSandbox {
       headers,
       data
     );
-    return { content: response.result?.content ?? "" };
+    return {
+      content: response.result?.content ?? "",
+      ...this.extractHeaderFields(response.headers)
+    };
   }
   // Upload
   async upload(request) {
@@ -1669,7 +1761,7 @@ var Sandbox = class extends AbstractSandbox {
     try {
       const fs = await import('fs');
       if (!fs.existsSync(sourcePath)) {
-        return { success: false, message: `File not found: ${sourcePath}` };
+        return { success: false, message: `File not found: ${sourcePath}`, cluster: "N/A", requestId: "N/A", eagleeyeTraceid: "N/A" };
       }
       const fileBuffer = fs.readFileSync(sourcePath);
       const fileName = sourcePath.split("/").pop() ?? "file";
@@ -1679,12 +1771,13 @@ var Sandbox = class extends AbstractSandbox {
         { targetPath, sandboxId: this.sandboxId ?? "" },
         { file: [fileName, fileBuffer, "application/octet-stream"] }
       );
+      const headerFields = this.extractHeaderFields(response.headers);
       if (response.status !== "Success") {
-        return { success: false, message: "Upload failed" };
+        return { success: false, message: "Upload failed", ...headerFields };
       }
-      return { success: true, message: `Successfully uploaded file ${fileName} to ${targetPath}` };
+      return { success: true, message: `Successfully uploaded file ${fileName} to ${targetPath}`, ...headerFields };
     } catch (e) {
-      return { success: false, message: `Upload failed: ${e}` };
+      return { success: false, message: `Upload failed: ${e}`, cluster: "N/A", requestId: "N/A", eagleeyeTraceid: "N/A" };
     }
   }
   // Close
@@ -2011,6 +2104,7 @@ exports.EnvHubClient = EnvHubClient;
 exports.EnvHubClientConfigSchema = EnvHubClientConfigSchema;
 exports.EnvHubError = EnvHubError;
 exports.ExecuteBashSessionResponseSchema = ExecuteBashSessionResponseSchema;
+exports.HeaderFieldsSchema = HeaderFieldsSchema;
 exports.HttpUtils = HttpUtils;
 exports.InternalServerRockError = InternalServerRockError;
 exports.InvalidParameterRockException = InvalidParameterRockException;