rl-rock 1.2.3 → 1.2.4

package/dist/index.mjs

@@ -86,21 +86,14 @@ var ChmodRequestSchema = z.object({
   mode: z.string().default("755"),
   recursive: z.boolean().default(false)
 });
-var HeaderFieldsSchema = {
-  cluster: z.string().optional(),
-  requestId: z.string().optional(),
-  eagleeyeTraceid: z.string().optional()
-};
 var SandboxResponseSchema = z.object({
   code: z.nativeEnum(Codes).optional(),
   exitCode: z.number().optional(),
-  failureReason: z.string().optional(),
-  ...HeaderFieldsSchema
+  failureReason: z.string().optional()
 });
 var IsAliveResponseSchema = z.object({
   isAlive: z.boolean(),
-  message: z.string().default(""),
-  ...HeaderFieldsSchema
+  message: z.string().default("")
 });
 var SandboxStatusResponseSchema = z.object({
   sandboxId: z.string().optional(),
@@ -118,67 +111,57 @@ var SandboxStatusResponseSchema = z.object({
   cpus: z.number().optional(),
   memory: z.string().optional(),
   state: z.unknown().optional(),
-  ...HeaderFieldsSchema
+  // Response headers info
+  cluster: z.string().optional(),
+  requestId: z.string().optional(),
+  eagleeyeTraceid: z.string().optional()
 });
 var CommandResponseSchema = z.object({
   stdout: z.string().default(""),
   stderr: z.string().default(""),
-  exitCode: z.number().optional(),
-  ...HeaderFieldsSchema
+  exitCode: z.number().optional()
 });
 var WriteFileResponseSchema = z.object({
   success: z.boolean().default(false),
-  message: z.string().default(""),
-  ...HeaderFieldsSchema
+  message: z.string().default("")
 });
 var ReadFileResponseSchema = z.object({
-  content: z.string().default(""),
-  ...HeaderFieldsSchema
+  content: z.string().default("")
 });
 var UploadResponseSchema = z.object({
   success: z.boolean().default(false),
   message: z.string().default(""),
-  fileName: z.string().optional(),
-  ...HeaderFieldsSchema
+  fileName: z.string().optional()
 });
 var ObservationSchema = z.object({
   output: z.string().default(""),
   exitCode: z.number().optional(),
   failureReason: z.string().default(""),
-  expectString: z.string().default(""),
-  ...HeaderFieldsSchema
+  expectString: z.string().default("")
 });
 var CreateSessionResponseSchema = z.object({
   output: z.string().default(""),
-  sessionType: z.literal("bash").default("bash"),
-  ...HeaderFieldsSchema
+  sessionType: z.literal("bash").default("bash")
 });
 var CloseSessionResponseSchema = z.object({
-  sessionType: z.literal("bash").default("bash"),
-  ...HeaderFieldsSchema
-});
-var CloseResponseSchema = z.object({
-  ...HeaderFieldsSchema
+  sessionType: z.literal("bash").default("bash")
 });
+var CloseResponseSchema = z.object({});
 var ChownResponseSchema = z.object({
   success: z.boolean().default(false),
-  message: z.string().default(""),
-  ...HeaderFieldsSchema
+  message: z.string().default("")
 });
 var ChmodResponseSchema = z.object({
   success: z.boolean().default(false),
-  message: z.string().default(""),
-  ...HeaderFieldsSchema
+  message: z.string().default("")
 });
 var ExecuteBashSessionResponseSchema = z.object({
   success: z.boolean().default(false),
-  message: z.string().default(""),
-  ...HeaderFieldsSchema
+  message: z.string().default("")
 });
 var OssSetupResponseSchema = z.object({
   success: z.boolean().default(false),
-  message: z.string().default(""),
-  ...HeaderFieldsSchema
+  message: z.string().default("")
 });
 
 // src/common/constants.ts
@@ -294,7 +277,6 @@ 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({
@@ -304,18 +286,18 @@ var HttpUtils = class {
     const snakeData = objectToSnake(data);
     try {
       const response = await client.post(url, snakeData);
-      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
+      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 AxiosError) {
         throw new Error(`Failed to POST ${url}: ${error.message}`);
@@ -326,24 +308,23 @@ 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);
-      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
+      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 AxiosError) {
         throw new Error(`Failed to GET ${url}: ${error.message}`);
@@ -351,6 +332,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
    */
@@ -361,7 +356,6 @@ 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();
@@ -398,18 +392,18 @@ var HttpUtils = class {
     });
     try {
       const response = await client.post(url, formData);
-      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
+      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 AxiosError) {
         throw new Error(`Failed to POST multipart ${url}: ${error.message}`);
@@ -690,7 +684,7 @@ var EnvHubClient = class {
         url,
         this.headers
       );
-      return response.result;
+      return response.result ?? {};
     } catch (e) {
       throw new EnvHubError(`Failed to health check: ${e}`);
     }
@@ -1398,16 +1392,6 @@ 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...");
@@ -1489,7 +1473,8 @@ 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)}`);
     }
     const result = response.result;
     result.cluster = response.headers["x-rock-gateway-target-cluster"] || this.config.cluster || "N/A";
@@ -1515,11 +1500,10 @@ 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)}`);
       }
-      const result = response.result;
-      Object.assign(result, this.extractHeaderFields(response.headers));
-      return result;
+      return response.result;
     } catch (e) {
       throw new Error(`Failed to execute command: ${e}`);
     }
@@ -1539,11 +1523,10 @@ 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)}`);
       }
-      const result = response.result;
-      Object.assign(result, this.extractHeaderFields(response.headers));
-      return result;
+      return response.result;
     } catch (e) {
       throw new Error(`Failed to create session: ${e}`);
     }
@@ -1562,11 +1545,10 @@ 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)}`);
       }
-      const result = response.result ?? { sessionType: "bash" };
-      Object.assign(result, this.extractHeaderFields(response.headers));
-      return result;
+      return response.result ?? { sessionType: "bash" };
     } catch (e) {
       throw new Error(`Failed to close session: ${e}`);
     }
@@ -1610,11 +1592,10 @@ 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)}`);
       }
-      const result = response.result;
-      Object.assign(result, this.extractHeaderFields(response.headers));
-      return result;
+      return response.result;
     } catch (e) {
       throw new Error(`Failed to run in session: ${e}`);
     }
@@ -1653,10 +1634,7 @@ var Sandbox = class extends AbstractSandbox {
         output: "Failed to submit command, nohup failed to extract PID",
         exitCode: 1,
         failureReason: "PID extraction failed",
-        expectString: "",
-        cluster: response.cluster,
-        requestId: response.requestId,
-        eagleeyeTraceid: response.eagleeyeTraceid
+        expectString: ""
       };
     }
     const success = await this.waitForProcessCompletion(pid, tmpSession, waitTimeout, waitInterval);
@@ -1665,10 +1643,7 @@ 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: "",
-        cluster: response.cluster,
-        requestId: response.requestId,
-        eagleeyeTraceid: response.eagleeyeTraceid
+        expectString: ""
       };
     }
     const readCmd = responseLimitedBytesInNohup ? `head -c ${responseLimitedBytesInNohup} ${tmpFile}` : `cat ${tmpFile}`;
@@ -1680,10 +1655,7 @@ var Sandbox = class extends AbstractSandbox {
       output: outputResult.output,
       exitCode: success ? 0 : 1,
       failureReason: success ? "" : "Process did not complete successfully",
-      expectString: "",
-      cluster: outputResult.cluster,
-      requestId: outputResult.requestId,
-      eagleeyeTraceid: outputResult.eagleeyeTraceid
+      expectString: ""
     };
   }
   async waitForProcessCompletion(pid, session, waitTimeout, waitInterval) {
@@ -1718,11 +1690,10 @@ 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}`, ...headerFields };
+      return { success: false, message: `Failed to write file ${request.path}` };
     }
-    return { success: true, message: `Successfully write content to file ${request.path}`, ...headerFields };
+    return { success: true, message: `Successfully write content to file ${request.path}` };
   }
   async readFile(request) {
     const url = `${this.url}/read_file`;
@@ -1738,10 +1709,7 @@ var Sandbox = class extends AbstractSandbox {
       headers,
       data
     );
-    return {
-      content: response.result?.content ?? "",
-      ...this.extractHeaderFields(response.headers)
-    };
+    return { content: response.result?.content ?? "" };
   }
   // Upload
   async upload(request) {
@@ -1753,7 +1721,7 @@ var Sandbox = class extends AbstractSandbox {
     try {
       const fs = await import('fs');
       if (!fs.existsSync(sourcePath)) {
-        return { success: false, message: `File not found: ${sourcePath}`, cluster: "N/A", requestId: "N/A", eagleeyeTraceid: "N/A" };
+        return { success: false, message: `File not found: ${sourcePath}` };
       }
       const fileBuffer = fs.readFileSync(sourcePath);
       const fileName = sourcePath.split("/").pop() ?? "file";
@@ -1763,13 +1731,12 @@ 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", ...headerFields };
+        return { success: false, message: "Upload failed" };
       }
-      return { success: true, message: `Successfully uploaded file ${fileName} to ${targetPath}`, ...headerFields };
+      return { success: true, message: `Successfully uploaded file ${fileName} to ${targetPath}` };
     } catch (e) {
-      return { success: false, message: `Upload failed: ${e}`, cluster: "N/A", requestId: "N/A", eagleeyeTraceid: "N/A" };
+      return { success: false, message: `Upload failed: ${e}` };
     }
   }
   // Close
@@ -2075,6 +2042,6 @@ var ModelService = class {
 // src/index.ts
 var VERSION = "1.2.1";
 
-export { BadRequestRockError, BashActionSchema, ChmodRequestSchema, ChmodResponseSchema, ChownRequestSchema, ChownResponseSchema, CloseResponseSchema, CloseSessionRequestSchema, CloseSessionResponseSchema, Codes, CommandResponseSchema, CommandRockError, CommandSchema, Constants, CreateBashSessionRequestSchema, CreateSessionResponseSchema, Deploy, EnvHubClient, EnvHubClientConfigSchema, EnvHubError, ExecuteBashSessionResponseSchema, HeaderFieldsSchema, HttpUtils, InternalServerRockError, InvalidParameterRockException, IsAliveResponseSchema, LinuxFileSystem, LinuxRemoteUser, ModelClient, ModelService, Network, ObservationSchema, OssSetupResponseSchema, PID_PREFIX, PID_SUFFIX, Process, ReadFileRequestSchema, ReadFileResponseSchema, ReasonPhrases, RockEnv, RockEnvInfoSchema, RockException, RunMode, Sandbox, SandboxConfigSchema, SandboxGroup, SandboxGroupConfigSchema, SandboxResponseSchema, SandboxStatusResponseSchema, SpeedupType, UploadRequestSchema, UploadResponseSchema, VERSION, WriteFileRequestSchema, WriteFileResponseSchema, arunWithRetry, createRockEnvInfo, createSandboxConfig, createSandboxGroupConfig, deprecated, deprecatedClass, extractNohupPid as extractNohupPidFromSandbox, fromRockException, getEnv, getReasonPhrase, getRequiredEnv, isBrowser, isClientError, isCommandError, isEnvSet, isError, isNode, isServerError, isSuccess, make, raiseForCode, retryAsync, sleep, withRetry, withTimeLogging };
+export { BadRequestRockError, BashActionSchema, ChmodRequestSchema, ChmodResponseSchema, ChownRequestSchema, ChownResponseSchema, CloseResponseSchema, CloseSessionRequestSchema, CloseSessionResponseSchema, Codes, CommandResponseSchema, CommandRockError, CommandSchema, Constants, CreateBashSessionRequestSchema, CreateSessionResponseSchema, Deploy, EnvHubClient, EnvHubClientConfigSchema, EnvHubError, ExecuteBashSessionResponseSchema, HttpUtils, InternalServerRockError, InvalidParameterRockException, IsAliveResponseSchema, LinuxFileSystem, LinuxRemoteUser, ModelClient, ModelService, Network, ObservationSchema, OssSetupResponseSchema, PID_PREFIX, PID_SUFFIX, Process, ReadFileRequestSchema, ReadFileResponseSchema, ReasonPhrases, RockEnv, RockEnvInfoSchema, RockException, RunMode, Sandbox, SandboxConfigSchema, SandboxGroup, SandboxGroupConfigSchema, SandboxResponseSchema, SandboxStatusResponseSchema, SpeedupType, UploadRequestSchema, UploadResponseSchema, VERSION, WriteFileRequestSchema, WriteFileResponseSchema, arunWithRetry, createRockEnvInfo, createSandboxConfig, createSandboxGroupConfig, deprecated, deprecatedClass, extractNohupPid as extractNohupPidFromSandbox, fromRockException, getEnv, getReasonPhrase, getRequiredEnv, isBrowser, isClientError, isCommandError, isEnvSet, isError, isNode, isServerError, isSuccess, make, raiseForCode, retryAsync, sleep, withRetry, withTimeLogging };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map