rl-rock 1.3.6 → 1.3.8

package/dist/index.d.mts

@@ -1287,7 +1287,7 @@ declare class Sandbox extends AbstractSandbox {
     writeFile(request: WriteFileRequest): Promise<WriteFileResponse>;
     readFile(request: ReadFileRequest): Promise<ReadFileResponse>;
     upload(request: UploadRequest): Promise<UploadResponse>;
-    uploadByPath(sourcePath: string, targetPath: string, uploadMode?: UploadMode): Promise<UploadResponse>;
+    uploadByPath(sourcePath: string, targetPath: string, uploadMode?: UploadMode, timeout?: number): Promise<UploadResponse>;
     /**
      * Get OSS STS credentials from sandbox
      */
@@ -1299,13 +1299,15 @@ declare class Sandbox extends AbstractSandbox {
     /**
      * Download file from sandbox via OSS
      */
-    downloadFile(remotePath: string, localPath: string): Promise<DownloadFileResponse>;
+    downloadFile(remotePath: string, localPath: string, timeout?: number): Promise<DownloadFileResponse>;
     /**
      * Upload file via OSS (internal method)
+     * @param timeout - Optional timeout in milliseconds
      */
     private uploadViaOss;
     /**
      * Setup OSS bucket with STS credentials
+     * @param timeout - Optional timeout in milliseconds (defaults to ROCK_OSS_TIMEOUT env var or 300000ms)
      */
     private setupOss;
     close(): Promise<void>;

package/dist/index.d.ts

@@ -1287,7 +1287,7 @@ declare class Sandbox extends AbstractSandbox {
     writeFile(request: WriteFileRequest): Promise<WriteFileResponse>;
     readFile(request: ReadFileRequest): Promise<ReadFileResponse>;
     upload(request: UploadRequest): Promise<UploadResponse>;
-    uploadByPath(sourcePath: string, targetPath: string, uploadMode?: UploadMode): Promise<UploadResponse>;
+    uploadByPath(sourcePath: string, targetPath: string, uploadMode?: UploadMode, timeout?: number): Promise<UploadResponse>;
     /**
      * Get OSS STS credentials from sandbox
      */
@@ -1299,13 +1299,15 @@ declare class Sandbox extends AbstractSandbox {
     /**
      * Download file from sandbox via OSS
      */
-    downloadFile(remotePath: string, localPath: string): Promise<DownloadFileResponse>;
+    downloadFile(remotePath: string, localPath: string, timeout?: number): Promise<DownloadFileResponse>;
     /**
      * Upload file via OSS (internal method)
+     * @param timeout - Optional timeout in milliseconds
      */
     private uploadViaOss;
     /**
      * Setup OSS bucket with STS credentials
+     * @param timeout - Optional timeout in milliseconds (defaults to ROCK_OSS_TIMEOUT env var or 300000ms)
      */
     private setupOss;
     close(): Promise<void>;

package/dist/index.js

@@ -601,6 +601,9 @@ var envVars = {
   get ROCK_OSS_BUCKET_REGION() {
     return getEnv("ROCK_OSS_BUCKET_REGION");
   },
+  get ROCK_OSS_TIMEOUT() {
+    return parseInt(getEnv("ROCK_OSS_TIMEOUT", "300000"), 10);
+  },
   // Pip
   get ROCK_PIP_INDEX_URL() {
     return getEnv("ROCK_PIP_INDEX_URL", "https://pypi.org/simple/");
@@ -2295,7 +2298,7 @@ var Sandbox = class extends AbstractSandbox {
   async upload(request) {
     return this.uploadByPath(request.sourcePath, request.targetPath);
   }
-  async uploadByPath(sourcePath, targetPath, uploadMode = "auto") {
+  async uploadByPath(sourcePath, targetPath, uploadMode = "auto", timeout) {
     const url = `${this.url}/upload`;
     const headers = this.buildHeaders();
     try {
@@ -2310,7 +2313,7 @@ var Sandbox = class extends AbstractSandbox {
       const ossEnabled = envVars.ROCK_OSS_ENABLE;
       const ossThreshold = 1024 * 1024;
       if (uploadMode === "oss" || uploadMode === "auto" && ossEnabled && fileSize > ossThreshold) {
-        return this.uploadViaOss(sourcePath, targetPath);
+        return this.uploadViaOss(sourcePath, targetPath, timeout);
       }
       const fileBuffer = await fs.readFile(sourcePath);
       const fileName = sourcePath.split("/").pop() ?? "file";
@@ -2361,7 +2364,7 @@ var Sandbox = class extends AbstractSandbox {
   /**
    * Download file from sandbox via OSS
    */
-  async downloadFile(remotePath, localPath) {
+  async downloadFile(remotePath, localPath, timeout) {
     if (!envVars.ROCK_OSS_ENABLE) {
       return {
         success: false,
@@ -2377,7 +2380,7 @@ var Sandbox = class extends AbstractSandbox {
         return { success: false, message: `Remote file does not exist: ${remotePath}` };
       }
       if (this.ossBucket === null || this.isTokenExpired()) {
-        await this.setupOss();
+        await this.setupOss(timeout);
       }
       if (!this.ossBucket) {
         return { success: false, message: "Failed to setup OSS bucket" };
@@ -2390,12 +2393,14 @@ var Sandbox = class extends AbstractSandbox {
       const bucketName = envVars.ROCK_OSS_BUCKET_NAME ?? "";
       const region = (envVars.ROCK_OSS_BUCKET_REGION ?? "").replace(/^oss-/, "");
       const endpoint = envVars.ROCK_OSS_BUCKET_ENDPOINT ?? `oss-${region}.aliyuncs.com`;
-      const uploadToOssCmd = `ossutil cp '${remotePath}' 'oss://${bucketName}/${objectName}' --access-key-id '${credentials.accessKeyId}' --access-key-secret '${credentials.accessKeySecret}' --sts-token '${credentials.securityToken}' --endpoint '${endpoint}' --region '${region}'`;
+      const ossutilInnerCmd = `ossutil cp '${remotePath}' 'oss://${bucketName}/${objectName}' --access-key-id '${credentials.accessKeyId}' --access-key-secret '${credentials.accessKeySecret}' --sts-token '${credentials.securityToken}' --endpoint '${endpoint}' --region '${region}'`;
+      const uploadToOssCmd = `bash -c '${ossutilInnerCmd.replace(/'/g, `'"'"'`)}'`;
       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);
+      const ossTimeout = timeout ?? envVars.ROCK_OSS_TIMEOUT;
+      const result = await this.ossBucket.get(objectName, localPath, { timeout: ossTimeout });
       try {
         await this.ossBucket.delete(objectName);
       } catch {
@@ -2407,11 +2412,12 @@ var Sandbox = class extends AbstractSandbox {
   }
   /**
    * Upload file via OSS (internal method)
+   * @param timeout - Optional timeout in milliseconds
    */
-  async uploadViaOss(sourcePath, targetPath) {
+  async uploadViaOss(sourcePath, targetPath, timeout) {
     try {
       if (this.ossBucket === null || this.isTokenExpired()) {
-        await this.setupOss();
+        await this.setupOss(timeout);
       }
       if (!this.ossBucket) {
         return { success: false, message: "Failed to setup OSS bucket" };
@@ -2419,7 +2425,8 @@ var Sandbox = class extends AbstractSandbox {
       const timestamp = Date.now();
       const fileName = sourcePath.split("/").pop() ?? "file";
       const objectName = `${timestamp}-${fileName}`;
-      await this.ossBucket.put(objectName, sourcePath);
+      const ossTimeout = timeout ?? envVars.ROCK_OSS_TIMEOUT;
+      await this.ossBucket.put(objectName, sourcePath, { timeout: ossTimeout });
       const signedUrl = this.ossBucket.signatureUrl(objectName, { expires: 600 });
       const downloadCmd = `wget -c -O '${targetPath}' '${signedUrl}'`;
       await this.arun(downloadCmd, { mode: "nohup", waitTimeout: 600 });
@@ -2434,13 +2441,16 @@ var Sandbox = class extends AbstractSandbox {
   }
   /**
    * Setup OSS bucket with STS credentials
+   * @param timeout - Optional timeout in milliseconds (defaults to ROCK_OSS_TIMEOUT env var or 300000ms)
    */
-  async setupOss() {
+  async setupOss(timeout) {
     const credentials = await this.getOssStsCredentials();
     const OSS = (await import('ali-oss')).default;
+    const ossTimeout = timeout ?? envVars.ROCK_OSS_TIMEOUT;
     this.ossBucket = new OSS({
       secure: true,
       // Use HTTPS for OSS connections
+      timeout: ossTimeout,
       region: envVars.ROCK_OSS_BUCKET_REGION ?? "",
       accessKeyId: credentials.accessKeyId,
       accessKeySecret: credentials.accessKeySecret,