rl-rock 1.2.6 → 1.3.0

package/dist/index.mjs

@@ -2,7 +2,7 @@ import path, { join, resolve, basename } from 'path';
 import { fileURLToPath } from 'url';
 import { existsSync, mkdirSync, readFileSync, statSync, mkdtempSync, rmSync } from 'fs';
 import { z } from 'zod';
-import axios, { AxiosError } from 'axios';
+import axios from 'axios';
 import https from 'https';
 import { objectToCamel as objectToCamel$1, objectToSnake as objectToSnake$1 } from 'ts-case-convert';
 import winston from 'winston';
@@ -75,9 +75,11 @@ var ReadFileRequestSchema = z.object({
   encoding: z.string().optional(),
   errors: z.string().optional()
 });
+var UploadModeSchema = z.enum(["auto", "direct", "oss"]);
 var UploadRequestSchema = z.object({
   sourcePath: z.string(),
-  targetPath: z.string()
+  targetPath: z.string(),
+  uploadMode: UploadModeSchema.optional()
 });
 var CloseSessionRequestSchema = z.object({
   session: z.string().default("default")
@@ -169,6 +171,16 @@ var OssSetupResponseSchema = z.object({
   success: z.boolean().default(false),
   message: z.string().default("")
 });
+var DownloadFileResponseSchema = z.object({
+  success: z.boolean().default(false),
+  message: z.string().default("")
+});
+var OssCredentialsSchema = z.object({
+  accessKeyId: z.string(),
+  accessKeySecret: z.string(),
+  securityToken: z.string(),
+  expiration: z.string()
+});
 
 // src/common/constants.ts
 var RunMode = {
@@ -299,9 +311,6 @@ var HttpUtils = class {
       }
       return httpResponse;
     } catch (error) {
-      if (error instanceof AxiosError) {
-        throw new Error(`Failed to POST ${url}: ${error.message}`);
-      }
       throw error;
     }
   }
@@ -326,9 +335,6 @@ var HttpUtils = class {
       }
       return httpResponse;
     } catch (error) {
-      if (error instanceof AxiosError) {
-        throw new Error(`Failed to GET ${url}: ${error.message}`);
-      }
       throw error;
     }
   }
@@ -408,9 +414,6 @@ var HttpUtils = class {
       }
       return httpResponse;
     } catch (error) {
-      if (error instanceof AxiosError) {
-        throw new Error(`Failed to POST multipart ${url}: ${error.message}`);
-      }
       throw error;
     }
   }
@@ -1441,6 +1444,53 @@ var LinuxFileSystem = class extends FileSystem {
   }
 };
 
+// src/sandbox/constants.ts
+var ENSURE_OSSUTIL_SCRIPT = `#!/bin/bash
+set -e
+
+# Check downloader
+if command -v wget >/dev/null 2>&1; then
+    DOWNLOADER="wget"
+elif command -v curl >/dev/null 2>&1; then
+    DOWNLOADER="curl"
+else
+    echo "ERROR: neither wget nor curl is available. Please install one first." >&2
+    exit 1
+fi
+
+# Check unzip
+if ! command -v unzip >/dev/null 2>&1; then
+    echo "ERROR: unzip is not available. Please install unzip first." >&2
+    exit 1
+fi
+
+# Skip if already installed
+if command -v ossutil >/dev/null 2>&1; then
+    echo "ossutil already installed, skipping."
+    exit 0
+fi
+
+# Download
+cd /tmp
+if [ "$DOWNLOADER" = "wget" ]; then
+    wget -q https://gosspublic.alicdn.com/ossutil/v2/2.2.1/ossutil-2.2.1-linux-amd64.zip -O /tmp/ossutil.zip
+else
+    curl -sL -o /tmp/ossutil.zip https://gosspublic.alicdn.com/ossutil/v2/2.2.1/ossutil-2.2.1-linux-amd64.zip
+fi
+
+# Extract and install
+unzip -o -q ossutil.zip
+chmod 755 /tmp/ossutil-2.2.1-linux-amd64/ossutil
+mkdir -p /usr/local/bin
+mv /tmp/ossutil-2.2.1-linux-amd64/ossutil /usr/local/bin/
+
+# Cleanup
+rm -rf /tmp/ossutil.zip /tmp/ossutil-2.2.1-linux-amd64
+
+# Verify
+ossutil version
+`;
+
 // src/sandbox/network.ts
 var logger4 = initLogger("rock.sandbox.network");
 var SpeedupType = /* @__PURE__ */ ((SpeedupType2) => {
@@ -1844,6 +1894,10 @@ var Sandbox = class extends AbstractSandbox {
   hostName = null;
   hostIp = null;
   cluster;
+  // OSS-related properties
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ossBucket = null;
+  ossTokenExpireTime = "";
   // Sub-components
   deploy;
   fs;
@@ -2231,7 +2285,7 @@ var Sandbox = class extends AbstractSandbox {
   async upload(request) {
     return this.uploadByPath(request.sourcePath, request.targetPath);
   }
-  async uploadByPath(sourcePath, targetPath) {
+  async uploadByPath(sourcePath, targetPath, uploadMode = "auto") {
     const url = `${this.url}/upload`;
     const headers = this.buildHeaders();
     try {
@@ -2241,6 +2295,13 @@ var Sandbox = class extends AbstractSandbox {
       } catch {
         return { success: false, message: `File not found: ${sourcePath}` };
       }
+      const stats = await fs.stat(sourcePath);
+      const fileSize = stats.size;
+      const ossEnabled = envVars.ROCK_OSS_ENABLE;
+      const ossThreshold = 1024 * 1024;
+      if (uploadMode === "oss" || uploadMode === "auto" && ossEnabled && fileSize > ossThreshold) {
+        return this.uploadViaOss(sourcePath, targetPath);
+      }
       const fileBuffer = await fs.readFile(sourcePath);
       const fileName = sourcePath.split("/").pop() ?? "file";
       const response = await HttpUtils.postMultipart(
@@ -2257,6 +2318,136 @@ var Sandbox = class extends AbstractSandbox {
       return { success: false, message: `Upload failed: ${e}` };
     }
   }
+  /**
+   * Get OSS STS credentials from sandbox
+   */
+  async getOssStsCredentials() {
+    const url = `${this.url}/get_token`;
+    const headers = this.buildHeaders();
+    const response = await HttpUtils.get(url, headers);
+    if (response.status !== "Success") {
+      throw new Error(`Failed to get OSS STS token: ${JSON.stringify(response)}`);
+    }
+    const credentials = OssCredentialsSchema.parse(response.result);
+    this.ossTokenExpireTime = credentials.expiration;
+    return credentials;
+  }
+  /**
+   * Check if OSS token is expired (with 5-minute buffer)
+   */
+  isTokenExpired() {
+    if (!this.ossTokenExpireTime) {
+      return true;
+    }
+    try {
+      const expireTime = new Date(this.ossTokenExpireTime);
+      const currentTime = /* @__PURE__ */ new Date();
+      const bufferMs = 5 * 60 * 1e3;
+      return currentTime.getTime() >= expireTime.getTime() - bufferMs;
+    } catch {
+      return true;
+    }
+  }
+  /**
+   * Download file from sandbox via OSS
+   */
+  async downloadFile(remotePath, localPath) {
+    if (!envVars.ROCK_OSS_ENABLE) {
+      return {
+        success: false,
+        message: "OSS download is not enabled. Please set ROCK_OSS_ENABLE=true"
+      };
+    }
+    try {
+      if (!remotePath || remotePath.trim() === "") {
+        return { success: false, message: "Remote path is required" };
+      }
+      const checkResult = await this.execute({ command: ["test", "-f", remotePath], timeout: 60 });
+      if (checkResult.exitCode !== 0) {
+        return { success: false, message: `Remote file does not exist: ${remotePath}` };
+      }
+      if (this.ossBucket === null || this.isTokenExpired()) {
+        await this.setupOss();
+      }
+      if (!this.ossBucket) {
+        return { success: false, message: "Failed to setup OSS bucket" };
+      }
+      await this.arun(ENSURE_OSSUTIL_SCRIPT, { mode: "nohup", waitTimeout: 300 });
+      const timestamp = Date.now();
+      const fileName = remotePath.split("/").pop() ?? "file";
+      const objectName = `download-${timestamp}-${fileName}`;
+      const credentials = await this.getOssStsCredentials();
+      const bucketName = envVars.ROCK_OSS_BUCKET_NAME ?? "";
+      const region = envVars.ROCK_OSS_BUCKET_REGION ?? "";
+      const endpoint = `https://oss-${region}.aliyuncs.com`;
+      const ossutilConfigCmd = `ossutil config -e ${endpoint} -i ${credentials.accessKeyId} -k ${credentials.accessKeySecret} -t ${credentials.securityToken} -b ${bucketName}`;
+      await this.arun(ossutilConfigCmd, { mode: "nohup", waitTimeout: 60 });
+      const uploadToOssCmd = `ossutil cp ${remotePath} oss://${bucketName}/${objectName}`;
+      const uploadResult = await this.arun(uploadToOssCmd, { mode: "nohup", waitTimeout: 600 });
+      if (uploadResult.exitCode !== 0) {
+        return { success: false, message: `Sandbox to OSS upload failed: ${uploadResult.output}` };
+      }
+      const result = await this.ossBucket.get(objectName, localPath);
+      try {
+        await this.ossBucket.delete(objectName);
+      } catch {
+      }
+      return { success: true, message: `Successfully downloaded ${remotePath} to ${localPath}` };
+    } catch (e) {
+      return { success: false, message: `Download failed: ${e}` };
+    }
+  }
+  /**
+   * Upload file via OSS (internal method)
+   */
+  async uploadViaOss(sourcePath, targetPath) {
+    try {
+      if (this.ossBucket === null || this.isTokenExpired()) {
+        await this.setupOss();
+      }
+      if (!this.ossBucket) {
+        return { success: false, message: "Failed to setup OSS bucket" };
+      }
+      const timestamp = Date.now();
+      const fileName = sourcePath.split("/").pop() ?? "file";
+      const objectName = `${timestamp}-${fileName}`;
+      await this.ossBucket.put(objectName, sourcePath);
+      const signedUrl = this.ossBucket.signatureUrl(objectName, 600);
+      const downloadCmd = `wget -c -O '${targetPath}' '${signedUrl}'`;
+      await this.arun(downloadCmd, { mode: "nohup", waitTimeout: 600 });
+      const checkResult = await this.execute({ command: ["test", "-f", targetPath], timeout: 60 });
+      if (checkResult.exitCode !== 0) {
+        return { success: false, message: "Sandbox download phase failed" };
+      }
+      return { success: true, message: `Successfully uploaded file ${fileName} to ${targetPath} via OSS` };
+    } catch (e) {
+      return { success: false, message: `OSS upload failed: ${e}` };
+    }
+  }
+  /**
+   * Setup OSS bucket with STS credentials
+   */
+  async setupOss() {
+    const credentials = await this.getOssStsCredentials();
+    const OSS = (await import('ali-oss')).default;
+    this.ossBucket = new OSS({
+      region: envVars.ROCK_OSS_BUCKET_REGION ?? "",
+      accessKeyId: credentials.accessKeyId,
+      accessKeySecret: credentials.accessKeySecret,
+      stsToken: credentials.securityToken,
+      bucket: envVars.ROCK_OSS_BUCKET_NAME ?? "",
+      refreshSTSToken: async () => {
+        const newCreds = await this.getOssStsCredentials();
+        return {
+          accessKeyId: newCreds.accessKeyId,
+          accessKeySecret: newCreds.accessKeySecret,
+          stsToken: newCreds.securityToken
+        };
+      },
+      refreshSTSTokenInterval: 3e5
+      // 5 minutes
+    });
+  }
   // Close
   async close() {
     await this.stop();
@@ -3200,6 +3391,6 @@ function getVersion() {
 }
 var VERSION = getVersion();
 
-export { Agent, AgentBashCommandSchema, AgentConfigSchema, BadRequestRockError, BashActionSchema, ChmodRequestSchema, ChmodResponseSchema, ChownRequestSchema, ChownResponseSchema, CloseResponseSchema, CloseSessionRequestSchema, CloseSessionResponseSchema, Codes, CommandResponseSchema, CommandRockError, CommandSchema, CreateBashSessionRequestSchema, CreateSessionResponseSchema, DefaultAgent, DefaultAgentConfigSchema, Deploy, EnvHubClient, EnvHubClientConfigSchema, EnvHubError, ExecuteBashSessionResponseSchema, HttpUtils, InternalServerRockError, InvalidParameterRockException, IsAliveResponseSchema, LinuxFileSystem, LinuxRemoteUser, ModelClient, ModelService, ModelServiceConfigSchema, NODE_DEFAULT_VERSION, Network, NodeRuntimeEnv, NodeRuntimeEnvConfigSchema, ObservationSchema, OssSetupResponseSchema, PID_PREFIX, PID_SUFFIX, Process, PythonRuntimeEnv, PythonRuntimeEnvConfigSchema, ReadFileRequestSchema, ReadFileResponseSchema, ReasonPhrases, RockAgentConfigSchema, RockEnv, RockEnvInfoSchema, RockException, RunMode, RuntimeEnv, RuntimeEnvConfigSchema, Sandbox, SandboxConfigSchema, SandboxGroup, SandboxGroupConfigSchema, SandboxResponseSchema, SandboxStatusResponseSchema, SpeedupType, UploadRequestSchema, UploadResponseSchema, VERSION, WriteFileRequestSchema, WriteFileResponseSchema, arunWithRetry, createRockEnvInfo, createRuntimeEnvId, createSandboxConfig, createSandboxGroupConfig, deprecated, deprecatedClass, extractNohupPid as extractNohupPidFromSandbox, fromRockException, getDefaultPipIndexUrl, getEnv, getReasonPhrase, getRequiredEnv, isClientError, isCommandError, isEnvSet, isError, isNode, isServerError, isSuccess, make, raiseForCode, retryAsync, sleep, withRetry, withTimeLogging };
+export { Agent, AgentBashCommandSchema, AgentConfigSchema, BadRequestRockError, BashActionSchema, ChmodRequestSchema, ChmodResponseSchema, ChownRequestSchema, ChownResponseSchema, CloseResponseSchema, CloseSessionRequestSchema, CloseSessionResponseSchema, Codes, CommandResponseSchema, CommandRockError, CommandSchema, CreateBashSessionRequestSchema, CreateSessionResponseSchema, DefaultAgent, DefaultAgentConfigSchema, Deploy, DownloadFileResponseSchema, EnvHubClient, EnvHubClientConfigSchema, EnvHubError, ExecuteBashSessionResponseSchema, HttpUtils, InternalServerRockError, InvalidParameterRockException, IsAliveResponseSchema, LinuxFileSystem, LinuxRemoteUser, ModelClient, ModelService, ModelServiceConfigSchema, NODE_DEFAULT_VERSION, Network, NodeRuntimeEnv, NodeRuntimeEnvConfigSchema, ObservationSchema, OssCredentialsSchema, OssSetupResponseSchema, PID_PREFIX, PID_SUFFIX, Process, PythonRuntimeEnv, PythonRuntimeEnvConfigSchema, ReadFileRequestSchema, ReadFileResponseSchema, ReasonPhrases, RockAgentConfigSchema, RockEnv, RockEnvInfoSchema, RockException, RunMode, RuntimeEnv, RuntimeEnvConfigSchema, Sandbox, SandboxConfigSchema, SandboxGroup, SandboxGroupConfigSchema, SandboxResponseSchema, SandboxStatusResponseSchema, SpeedupType, UploadModeSchema, UploadRequestSchema, UploadResponseSchema, VERSION, WriteFileRequestSchema, WriteFileResponseSchema, arunWithRetry, createRockEnvInfo, createRuntimeEnvId, createSandboxConfig, createSandboxGroupConfig, deprecated, deprecatedClass, extractNohupPid as extractNohupPidFromSandbox, fromRockException, getDefaultPipIndexUrl, getEnv, getReasonPhrase, getRequiredEnv, isClientError, isCommandError, isEnvSet, isError, isNode, isServerError, isSuccess, make, raiseForCode, retryAsync, sleep, withRetry, withTimeLogging };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map