@cloudbase/manager-node 3.10.0 → 3.11.0

package/lib/hosting/index.js

@@ -131,7 +131,7 @@ class HostingService {
      * @param options
      */
     async uploadFiles(options) {
-        const { localPath, cloudPath, files = [], onProgress, onFileFinish, parallel = 20, ignore } = options;
+        const { localPath, cloudPath, files = [], onProgress, onFileFinish, parallel = 20, ignore, retryCount, retryInterval } = options;
         const hosting = await this.checkStatus();
         const { Bucket, Regoin } = hosting;
         const storageService = await this.environment.getStorageService();
@@ -150,7 +150,9 @@ class HostingService {
                     onProgress,
                     onFileFinish,
                     fileId: false,
-                    ignore
+                    ignore,
+                    retryCount,
+                    retryInterval,
                 });
             }
             else {
@@ -171,7 +173,9 @@ class HostingService {
             bucket: Bucket,
             region: Regoin,
             files: uploadFiles,
-            fileId: false
+            fileId: false,
+            retryCount,
+            retryInterval,
         });
     }
     /**

package/lib/storage/index.js

@@ -49,7 +49,7 @@ class StorageService {
      * @param options
      */
     async uploadFiles(options) {
-        const { files, onProgress, parallel, onFileFinish, ignore } = options;
+        const { files, onProgress, parallel, onFileFinish, ignore, retryCount, retryInterval } = options;
         const { bucket, region } = this.getStorageConfig();
         return this.uploadFilesCustom({
             files,
@@ -58,7 +58,9 @@ class StorageService {
             ignore,
             parallel,
             onProgress,
-            onFileFinish
+            onFileFinish,
+            retryCount,
+            retryInterval
         });
     }
     /**
@@ -257,7 +259,7 @@ class StorageService {
      * @param options
      */
     async uploadFilesCustom(options) {
-        const { files, bucket, region, ignore, onProgress, onFileFinish, fileId = true, parallel = 20 } = options;
+        const { files, bucket, region, ignore, onProgress, onFileFinish, fileId = true, parallel = 20, retryCount = 0, retryInterval = 500 } = options;
         if (!files || !files.length) {
             return;
         }
@@ -291,11 +293,24 @@ class StorageService {
         fileList = await asyncTaskController.run();
         const cos = this.getCos(parallel);
         const uploadFiles = util_1.default.promisify(cos.uploadFiles).bind(cos);
-        return uploadFiles({
-            onProgress,
-            onFileFinish,
+        const params = {
             files: fileList,
-            SliceSize: BIG_FILE_SIZE
+            SliceSize: BIG_FILE_SIZE,
+            onProgress,
+            onFileFinish
+        };
+        // return uploadFiles({
+        //     onProgress,
+        //     onFileFinish,
+        //     files: fileList,
+        //     SliceSize: BIG_FILE_SIZE
+        // })
+        return this.uploadFilesWithRetry({
+            uploadFiles,
+            options: params,
+            times: retryCount,
+            interval: retryInterval,
+            failedFiles: []
         });
     }
     /**
@@ -790,7 +805,6 @@ class StorageService {
                 params.WebsiteConfiguration.RoutingRules.push(routeItem);
             }
         }
-        console.log('params:', JSON.stringify(params));
         const res = await putBucketWebsite(params);
         return res;
     }
@@ -873,13 +887,11 @@ class StorageService {
      * @returns
      */
     async uploadFilesWithRetry({ uploadFiles, options, times, interval, failedFiles }) {
-        console.log('times', times);
         const { files, onFileFinish } = options;
         const tempFailedFiles = [];
         const res = await uploadFiles(Object.assign(Object.assign({}, options), { files: failedFiles.length
                 ? files.filter(file => failedFiles.includes(file.Key))
                 : files, onFileFinish: (...args) => {
-                console.log('args', args);
                 const error = args[0];
                 const fileInfo = args[2];
                 if (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "3.10.0",
+    "version": "3.11.0",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/src/hosting/index.ts

@@ -38,6 +38,10 @@ export interface IHostingFileOptions {
     onProgress?: OnProgress
     onFileFinish?: OnFileFinish
     ignore?: string | string[]
+    // 重试次数
+    retryCount?: number
+    // 重试时间间隔(毫秒)
+    retryInterval?: number
 }
 
 export interface IHostingFilesOptions {
@@ -52,6 +56,10 @@ export interface IHostingFilesOptions {
     onProgress?: OnProgress
     onFileFinish?: OnFileFinish
     ignore?: string | string[]
+    // 重试次数
+    retryCount?: number
+    // 重试时间间隔(毫秒)
+    retryInterval?: number
 }
 
 export type IHostingOptions = IHostingFileOptions | IHostingFilesOptions
@@ -331,7 +339,9 @@ export class HostingService {
             onProgress,
             onFileFinish,
             parallel = 20,
-            ignore
+            ignore,
+            retryCount,
+            retryInterval
         } = options
 
         const hosting = await this.checkStatus()
@@ -355,7 +365,9 @@ export class HostingService {
                     onProgress,
                     onFileFinish,
                     fileId: false,
-                    ignore
+                    ignore,
+                    retryCount,
+                    retryInterval,
                 })
             } else {
                 // 文件上传统一通过批量上传接口
@@ -376,7 +388,9 @@ export class HostingService {
             bucket: Bucket,
             region: Regoin,
             files: uploadFiles,
-            fileId: false
+            fileId: false,
+            retryCount,
+            retryInterval,
         })
     }
 

package/src/storage/index.ts

@@ -62,6 +62,11 @@ export interface IFilesOptions extends IOptions {
     ignore?: string | string[]
     // 文件列表
     files: { localPath: string; cloudPath?: string }[]
+
+    // 重试次数
+    retryCount?: number
+    // 重试时间间隔(毫秒)
+    retryInterval?: number
 }
 
 export interface ICustomOptions {
@@ -141,7 +146,8 @@ export class StorageService {
      */
     @preLazy()
     public async uploadFiles(options: IFilesOptions): Promise<void> {
-        const { files, onProgress, parallel, onFileFinish, ignore } = options
+        const { files, onProgress, parallel, onFileFinish, ignore, retryCount,
+            retryInterval } = options
         const { bucket, region } = this.getStorageConfig()
 
         return this.uploadFilesCustom({
@@ -151,7 +157,9 @@ export class StorageService {
             ignore,
             parallel,
             onProgress,
-            onFileFinish
+            onFileFinish,
+            retryCount,
+            retryInterval
         })
     }
 
@@ -403,7 +411,9 @@ export class StorageService {
             onProgress,
             onFileFinish,
             fileId = true,
-            parallel = 20
+            parallel = 20,
+            retryCount = 0,
+            retryInterval = 500
         } = options
 
         if (!files || !files.length) {
@@ -446,11 +456,25 @@ export class StorageService {
         const cos = this.getCos(parallel)
         const uploadFiles = Util.promisify(cos.uploadFiles).bind(cos)
 
-        return uploadFiles({
-            onProgress,
-            onFileFinish,
+        const params = {
             files: fileList,
-            SliceSize: BIG_FILE_SIZE
+            SliceSize: BIG_FILE_SIZE,
+            onProgress,
+            onFileFinish
+        }
+
+        // return uploadFiles({
+        //     onProgress,
+        //     onFileFinish,
+        //     files: fileList,
+        //     SliceSize: BIG_FILE_SIZE
+        // })
+        return this.uploadFilesWithRetry({
+            uploadFiles,
+            options: params,
+            times: retryCount,
+            interval: retryInterval,
+            failedFiles: []
         })
     }
 
@@ -1068,7 +1092,6 @@ export class StorageService {
             }
         }
 
-        console.log('params:', JSON.stringify(params))
         const res = await putBucketWebsite(params)
 
         return res
@@ -1165,7 +1188,6 @@ export class StorageService {
      * @returns
      */
     private async uploadFilesWithRetry({ uploadFiles, options, times, interval, failedFiles }) {
-        console.log('times', times)
         const { files, onFileFinish } = options
         const tempFailedFiles = []
         const res = await uploadFiles({
@@ -1174,7 +1196,6 @@ export class StorageService {
                 ? files.filter(file => failedFiles.includes(file.Key))
                 : files,
             onFileFinish: (...args) => {
-                console.log('args', args)
                 const error = args[0]
                 const fileInfo = (args as any)[2]
                 if (error) {

package/types/hosting/index.d.ts

@@ -20,6 +20,8 @@ export interface IHostingFileOptions {
     onProgress?: OnProgress;
     onFileFinish?: OnFileFinish;
     ignore?: string | string[];
+    retryCount?: number;
+    retryInterval?: number;
 }
 export interface IHostingFilesOptions {
     localPath?: string;
@@ -32,6 +34,8 @@ export interface IHostingFilesOptions {
     onProgress?: OnProgress;
     onFileFinish?: OnFileFinish;
     ignore?: string | string[];
+    retryCount?: number;
+    retryInterval?: number;
 }
 export declare type IHostingOptions = IHostingFileOptions | IHostingFilesOptions;
 export interface IHostingCloudOptions {

package/types/storage/index.d.ts

@@ -27,6 +27,8 @@ export interface IFilesOptions extends IOptions {
         localPath: string;
         cloudPath?: string;
     }[];
+    retryCount?: number;
+    retryInterval?: number;
 }
 export interface ICustomOptions {
     bucket: string;