@cloudbase/manager-node 3.9.4-beta → 3.11.0

package/lib/context.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudBaseContext = void 0;
 class CloudBaseContext {
-    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '' }) {
+    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '' }) {
         this.secretId = secretId;
         this.secretKey = secretKey;
         this.token = token;
         this.proxy = proxy;
         this.region = region;
+        this.envType = envType;
     }
 }
 exports.CloudBaseContext = CloudBaseContext;

package/lib/env/index.js

@@ -21,6 +21,7 @@ class EnvService {
     constructor(environment) {
         this.environment = environment;
         this.envId = environment.getEnvId();
+        this.envType = environment.getEnvType();
         this.cloudService = new utils_1.CloudService(environment.cloudBaseContext, 'tcb', '2018-06-08');
         this.camService = new cam_1.CamService(environment.cloudBaseContext);
         this.billService = new billing_1.BillingService(environment.cloudBaseContext);
@@ -331,9 +332,13 @@ class EnvService {
      */
     async getEnvInfo() {
         // NOTE: DescribeEnv 接口废弃，需要使用 DescribeEnvs 接口
-        const { EnvList, RequestId } = await this.cloudService.request('DescribeEnvs', {
+        const params = {
             EnvId: this.envId
-        });
+        };
+        if (this.envType === 'run') {
+            params.EnvType = 'run';
+        }
+        const { EnvList, RequestId } = await this.cloudService.request('DescribeEnvs', params);
         return {
             EnvInfo: (EnvList === null || EnvList === void 0 ? void 0 : EnvList.length) ? EnvList[0] : {},
             RequestId

package/lib/environment.js

@@ -19,6 +19,7 @@ class Environment {
         this.inited = false;
         this.envId = envId;
         this.cloudBaseContext = context;
+        this.envType = context.envType;
         // 拉取当前环境 的环境信息 todo
         this.functionService = new function_1.FunctionService(this);
         this.databaseService = new database_1.DatabaseService(this);
@@ -49,6 +50,9 @@ class Environment {
     getEnvId() {
         return this.envId;
     }
+    getEnvType() {
+        return this.envType;
+    }
     getStorageService() {
         return this.storageService;
     }

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/index.js

@@ -4,7 +4,7 @@ const environmentManager_1 = require("./environmentManager");
 class CloudBase {
     constructor(config = {}) {
         this.cloudBaseConfig = {};
-        let { secretId, secretKey, token, envId, proxy, region } = config;
+        let { secretId, secretKey, token, envId, proxy, region, envType } = config;
         // config 中传入的 secretId secretkey 必须同时存在
         if ((secretId && !secretKey) || (!secretId && secretKey)) {
             throw new Error('secretId and secretKey must be a pair');
@@ -14,6 +14,7 @@ class CloudBase {
             secretKey,
             token,
             envId,
+            envType,
             proxy,
             region
         };

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
         });
     }
     /**
@@ -134,18 +136,24 @@ class StorageService {
      * 上传文件夹
      * @param {string} localPath 本地文件夹路径
      * @param {string} cloudPath 云端文件夹
+     * @param {number} parallel 并发量
+     * @param {number} retryCount 重试次数
+     * @param {number} retryInterval 重试时间间隔(毫秒)
      * @param {(string | string[])} ignore
      * @param {(string | string[])} ignore
      * @returns {Promise<void>}
      */
     async uploadDirectory(options) {
-        const { localPath, cloudPath = '', ignore, onProgress, onFileFinish } = options;
+        const { localPath, cloudPath = '', ignore, onProgress, onFileFinish, parallel, retryCount, retryInterval } = options;
         // 此处不检查路径是否存在
         // 绝对路径 /var/blog/xxxx
         const { bucket, region } = this.getStorageConfig();
         return this.uploadDirectoryCustom({
             localPath,
             cloudPath,
+            parallel,
+            retryCount,
+            retryInterval,
             bucket,
             region,
             ignore,
@@ -157,13 +165,16 @@ class StorageService {
      * 上传文件夹，支持自定义 Region 和 Bucket
      * @param {string} localPath
      * @param {string} cloudPath
+     * @param {number} parallel
+     * @param {number} retryCount
+     * @param {number} retryInterval
      * @param {string} bucket
      * @param {string} region
      * @param {IOptions} options
      * @returns {Promise<void>}
      */
     async uploadDirectoryCustom(options) {
-        const { localPath, cloudPath, bucket, region, onProgress, onFileFinish, ignore, fileId = true, parallel = 20 } = options;
+        const { localPath, cloudPath, bucket, region, onProgress, onFileFinish, ignore, fileId = true, parallel = 20, retryCount = 0, retryInterval = 500 } = options;
         // 此处不检查路径是否存在
         // 绝对路径 /var/blog/xxxx
         const resolvePath = path_1.default.resolve(localPath);
@@ -229,11 +240,18 @@ class StorageService {
         // 对文件上传进行处理
         const cos = this.getCos(parallel);
         const uploadFiles = util_1.default.promisify(cos.uploadFiles).bind(cos);
-        return uploadFiles({
+        const params = {
             files,
             SliceSize: BIG_FILE_SIZE,
             onProgress,
             onFileFinish
+        };
+        return this.uploadFilesWithRetry({
+            uploadFiles,
+            options: params,
+            times: retryCount,
+            interval: retryInterval,
+            failedFiles: []
         });
     }
     /**
@@ -241,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;
         }
@@ -275,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: []
         });
     }
     /**
@@ -774,7 +805,6 @@ class StorageService {
                 params.WebsiteConfiguration.RoutingRules.push(routeItem);
             }
         }
-        console.log('params:', JSON.stringify(params));
         const res = await putBucketWebsite(params);
         return res;
     }
@@ -847,6 +877,40 @@ class StorageService {
             env: envConfig.EnvId
         };
     }
+    /**
+     * 带重试功能的上传多文件函数
+     * @param uploadFiles sdk上传函数
+     * @param options sdk上传函数参数
+     * @param times 重试次数
+     * @param interval 重试时间间隔(毫秒)
+     * @param failedFiles 失败文件列表
+     * @returns
+     */
+    async uploadFilesWithRetry({ uploadFiles, options, times, interval, failedFiles }) {
+        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) => {
+                const error = args[0];
+                const fileInfo = args[2];
+                if (error) {
+                    tempFailedFiles.push(fileInfo.Key);
+                }
+                onFileFinish === null || onFileFinish === void 0 ? void 0 : onFileFinish.apply(null, args);
+            } }));
+        if (!(tempFailedFiles === null || tempFailedFiles === void 0 ? void 0 : tempFailedFiles.length) || times <= 0)
+            return res;
+        if (times > 0) {
+            setTimeout(() => this.uploadFilesWithRetry({
+                uploadFiles,
+                options,
+                times: times - 1,
+                interval,
+                failedFiles: tempFailedFiles
+            }), interval);
+        }
+    }
 }
 __decorate([
     utils_1.preLazy()

package/package.json

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

package/src/context.ts

@@ -5,12 +5,14 @@ export class CloudBaseContext {
     public readonly proxy: string
     public readonly envId: string
     public readonly region: string
+    public readonly envType: string // baas/run/weda/hosting
 
-    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '' }) {
+    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '' }) {
         this.secretId = secretId
         this.secretKey = secretKey
         this.token = token
         this.proxy = proxy
         this.region = region
+        this.envType = envType
     }
 }

package/src/env/index.ts

@@ -64,10 +64,12 @@ export class EnvService {
     private cloudService: CloudService
     private camService: CamService
     private billService: BillingService
+    private envType?: string
 
     constructor(environment: Environment) {
         this.environment = environment
         this.envId = environment.getEnvId()
+        this.envType = environment.getEnvType()
         this.cloudService = new CloudService(environment.cloudBaseContext, 'tcb', '2018-06-08')
         this.camService = new CamService(environment.cloudBaseContext)
         this.billService = new BillingService(environment.cloudBaseContext)
@@ -420,9 +422,15 @@ export class EnvService {
         RequestId: string
     }> {
         // NOTE: DescribeEnv 接口废弃，需要使用 DescribeEnvs 接口
-        const { EnvList, RequestId } = await this.cloudService.request('DescribeEnvs', {
+        const params: any = {
             EnvId: this.envId
-        })
+        }
+
+        if (this.envType === 'run') {
+            params.EnvType = 'run'
+        }
+
+        const { EnvList, RequestId } = await this.cloudService.request('DescribeEnvs', params)
 
         return {
             EnvInfo: EnvList?.length ? EnvList[0] : {},

package/src/environment.ts

@@ -21,6 +21,7 @@ export class Environment {
     public cloudBaseContext: CloudBaseContext
     public lazyEnvironmentConfig: EnvInfo
     private envId: string
+    private envType?: string
 
     private functionService: FunctionService
     private databaseService: DatabaseService
@@ -35,6 +36,7 @@ export class Environment {
     constructor(context: CloudBaseContext, envId: string) {
         this.envId = envId
         this.cloudBaseContext = context
+        this.envType = context.envType
 
         // 拉取当前环境 的环境信息 todo
         this.functionService = new FunctionService(this)
@@ -69,6 +71,10 @@ export class Environment {
         return this.envId
     }
 
+    public getEnvType(): string {
+        return this.envType
+    }
+
     public getStorageService(): StorageService {
         return this.storageService
     }

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/index.ts

@@ -19,6 +19,7 @@ interface CloudBaseConfig {
     envId?: string
     proxy?: string
     region?: string
+    envType?: string
 }
 
 class CloudBase {
@@ -45,7 +46,7 @@ class CloudBase {
     private environmentManager: EnvironmentManager
 
     public constructor(config: CloudBaseConfig = {}) {
-        let { secretId, secretKey, token, envId, proxy, region } = config
+        let { secretId, secretKey, token, envId, proxy, region, envType } = config
         // config 中传入的 secretId secretkey 必须同时存在
         if ((secretId && !secretKey) || (!secretId && secretKey)) {
             throw new Error('secretId and secretKey must be a pair')
@@ -56,6 +57,7 @@ class CloudBase {
             secretKey,
             token,
             envId,
+            envType,
             proxy,
             region
         }

package/src/storage/index.ts

@@ -49,6 +49,12 @@ export interface IFileOptions extends IOptions {
     localPath: string
     // cloudPath 可以为空
     cloudPath?: string
+    // 并发数量
+    parallel?: number
+    // 重试次数
+    retryCount?: number
+    // 重试时间间隔(毫秒)
+    retryInterval?: number
 }
 
 export interface IFilesOptions extends IOptions {
@@ -56,6 +62,11 @@ export interface IFilesOptions extends IOptions {
     ignore?: string | string[]
     // 文件列表
     files: { localPath: string; cloudPath?: string }[]
+
+    // 重试次数
+    retryCount?: number
+    // 重试时间间隔(毫秒)
+    retryInterval?: number
 }
 
 export interface ICustomOptions {
@@ -135,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({
@@ -145,7 +157,9 @@ export class StorageService {
             ignore,
             parallel,
             onProgress,
-            onFileFinish
+            onFileFinish,
+            retryCount,
+            retryInterval
         })
     }
 
@@ -230,19 +244,34 @@ export class StorageService {
      * 上传文件夹
      * @param {string} localPath 本地文件夹路径
      * @param {string} cloudPath 云端文件夹
+     * @param {number} parallel 并发量
+     * @param {number} retryCount 重试次数
+     * @param {number} retryInterval 重试时间间隔(毫秒)
      * @param {(string | string[])} ignore
      * @param {(string | string[])} ignore
      * @returns {Promise<void>}
      */
     @preLazy()
     public async uploadDirectory(options: IFileOptions): Promise<void> {
-        const { localPath, cloudPath = '', ignore, onProgress, onFileFinish } = options
+        const {
+            localPath,
+            cloudPath = '',
+            ignore,
+            onProgress,
+            onFileFinish,
+            parallel,
+            retryCount,
+            retryInterval
+        } = options
         // 此处不检查路径是否存在
         // 绝对路径 /var/blog/xxxx
         const { bucket, region } = this.getStorageConfig()
         return this.uploadDirectoryCustom({
             localPath,
             cloudPath,
+            parallel,
+            retryCount,
+            retryInterval,
             bucket,
             region,
             ignore,
@@ -255,6 +284,9 @@ export class StorageService {
      * 上传文件夹，支持自定义 Region 和 Bucket
      * @param {string} localPath
      * @param {string} cloudPath
+     * @param {number} parallel
+     * @param {number} retryCount
+     * @param {number} retryInterval
      * @param {string} bucket
      * @param {string} region
      * @param {IOptions} options
@@ -271,7 +303,9 @@ export class StorageService {
             onFileFinish,
             ignore,
             fileId = true,
-            parallel = 20
+            parallel = 20,
+            retryCount = 0,
+            retryInterval = 500
         } = options
         // 此处不检查路径是否存在
         // 绝对路径 /var/blog/xxxx
@@ -310,12 +344,13 @@ export class StorageService {
         const creatingDirController = new AsyncTaskParallelController(parallel, 50)
         const creatingDirTasks = fileStatsList
             .filter(info => info.isDir)
-            .map(info => () =>
-                this.createCloudDirectroyCustom({
-                    cloudPath: info.cloudFileKey,
-                    bucket,
-                    region
-                })
+            .map(
+                info => () =>
+                    this.createCloudDirectroyCustom({
+                        cloudPath: info.cloudFileKey,
+                        bucket,
+                        region
+                    })
             )
 
         creatingDirController.loadTasks(creatingDirTasks)
@@ -348,15 +383,20 @@ export class StorageService {
         // 对文件上传进行处理
         const cos = this.getCos(parallel)
         const uploadFiles = Util.promisify(cos.uploadFiles).bind(cos)
-
-        return uploadFiles({
+        const params = {
             files,
             SliceSize: BIG_FILE_SIZE,
             onProgress,
             onFileFinish
+        }
+        return this.uploadFilesWithRetry({
+            uploadFiles,
+            options: params,
+            times: retryCount,
+            interval: retryInterval,
+            failedFiles: []
         })
     }
-
     /**
      * 批量上传文件
      * @param options
@@ -371,7 +411,9 @@ export class StorageService {
             onProgress,
             onFileFinish,
             fileId = true,
-            parallel = 20
+            parallel = 20,
+            retryCount = 0,
+            retryInterval = 500
         } = options
 
         if (!files || !files.length) {
@@ -414,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: []
         })
     }
 
@@ -735,9 +791,7 @@ export class StorageService {
      * @returns {Promise<void>}
      */
     @preLazy()
-    public async deleteDirectory(
-        cloudPath: string
-    ): Promise<{
+    public async deleteDirectory(cloudPath: string): Promise<{
         Deleted: { Key: string }[]
         Error: Object[]
     }> {
@@ -758,9 +812,7 @@ export class StorageService {
      * @returns {Promise<void>}
      */
     @preLazy()
-    public async deleteDirectoryCustom(
-        options: { cloudPath: string } & ICustomOptions
-    ): Promise<{
+    public async deleteDirectoryCustom(options: { cloudPath: string } & ICustomOptions): Promise<{
         Deleted: { Key: string }[]
         Error: Object[]
     }> {
@@ -1040,7 +1092,6 @@ export class StorageService {
             }
         }
 
-        console.log('params:', JSON.stringify(params))
         const res = await putBucketWebsite(params)
 
         return res
@@ -1127,4 +1178,45 @@ export class StorageService {
             env: envConfig.EnvId
         }
     }
+    /**
+     * 带重试功能的上传多文件函数
+     * @param uploadFiles sdk上传函数
+     * @param options sdk上传函数参数
+     * @param times 重试次数
+     * @param interval 重试时间间隔(毫秒)
+     * @param failedFiles 失败文件列表
+     * @returns
+     */
+    private async uploadFilesWithRetry({ uploadFiles, options, times, interval, failedFiles }) {
+        const { files, onFileFinish } = options
+        const tempFailedFiles = []
+        const res = await uploadFiles({
+            ...options,
+            files: failedFiles.length
+                ? files.filter(file => failedFiles.includes(file.Key))
+                : files,
+            onFileFinish: (...args) => {
+                const error = args[0]
+                const fileInfo = (args as any)[2]
+                if (error) {
+                    tempFailedFiles.push(fileInfo.Key)
+                }
+                onFileFinish?.apply(null, args)
+            }
+        })
+        if (!tempFailedFiles?.length || times <= 0) return res
+        if (times > 0) {
+            setTimeout(
+                () =>
+                    this.uploadFilesWithRetry({
+                        uploadFiles,
+                        options,
+                        times: times - 1,
+                        interval,
+                        failedFiles: tempFailedFiles
+                    }),
+                interval
+            )
+        }
+    }
 }

package/types/context.d.ts

@@ -5,11 +5,13 @@ export declare class CloudBaseContext {
     readonly proxy: string;
     readonly envId: string;
     readonly region: string;
-    constructor({ secretId, secretKey, token, proxy, region }: {
+    readonly envType: string;
+    constructor({ secretId, secretKey, token, proxy, region, envType }: {
         secretId?: string;
         secretKey?: string;
         token?: string;
         proxy?: string;
         region?: string;
+        envType?: string;
     });
 }

package/types/env/index.d.ts

@@ -34,6 +34,7 @@ export declare class EnvService {
     private cloudService;
     private camService;
     private billService;
+    private envType?;
     constructor(environment: Environment);
     /**
      * 列出所有环境

package/types/environment.d.ts

@@ -15,6 +15,7 @@ export declare class Environment {
     cloudBaseContext: CloudBaseContext;
     lazyEnvironmentConfig: EnvInfo;
     private envId;
+    private envType?;
     private functionService;
     private databaseService;
     private storageService;
@@ -27,6 +28,7 @@ export declare class Environment {
     constructor(context: CloudBaseContext, envId: string);
     lazyInit(): Promise<any>;
     getEnvId(): string;
+    getEnvType(): string;
     getStorageService(): StorageService;
     getDatabaseService(): DatabaseService;
     getFunctionService(): FunctionService;

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/index.d.ts

@@ -17,6 +17,7 @@ interface CloudBaseConfig {
     envId?: string;
     proxy?: string;
     region?: string;
+    envType?: string;
 }
 declare class CloudBase {
     private static cloudBase;

package/types/storage/index.d.ts

@@ -17,6 +17,9 @@ export interface IOptions {
 export interface IFileOptions extends IOptions {
     localPath: string;
     cloudPath?: string;
+    parallel?: number;
+    retryCount?: number;
+    retryInterval?: number;
 }
 export interface IFilesOptions extends IOptions {
     ignore?: string | string[];
@@ -24,6 +27,8 @@ export interface IFilesOptions extends IOptions {
         localPath: string;
         cloudPath?: string;
     }[];
+    retryCount?: number;
+    retryInterval?: number;
 }
 export interface ICustomOptions {
     bucket: string;
@@ -87,6 +92,9 @@ export declare class StorageService {
      * 上传文件夹
      * @param {string} localPath 本地文件夹路径
      * @param {string} cloudPath 云端文件夹
+     * @param {number} parallel 并发量
+     * @param {number} retryCount 重试次数
+     * @param {number} retryInterval 重试时间间隔(毫秒)
      * @param {(string | string[])} ignore
      * @param {(string | string[])} ignore
      * @returns {Promise<void>}
@@ -96,6 +104,9 @@ export declare class StorageService {
      * 上传文件夹，支持自定义 Region 和 Bucket
      * @param {string} localPath
      * @param {string} cloudPath
+     * @param {number} parallel
+     * @param {number} retryCount
+     * @param {number} retryInterval
      * @param {string} bucket
      * @param {string} region
      * @param {IOptions} options
@@ -284,5 +295,15 @@ export declare class StorageService {
      * 获取存储桶配置
      */
     private getStorageConfig;
+    /**
+     * 带重试功能的上传多文件函数
+     * @param uploadFiles sdk上传函数
+     * @param options sdk上传函数参数
+     * @param times 重试次数
+     * @param interval 重试时间间隔(毫秒)
+     * @param failedFiles 失败文件列表
+     * @returns
+     */
+    private uploadFilesWithRetry;
 }
 export {};

package/.vscode/launch.json

@@ -1,26 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "attach",
-            "runtime": "node",
-            "name": "Cloudbase Debugger For Node",
-            "scf": true,
-            "port": 9229
-        },
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Launch Program",
-            "program": "${workspaceFolder}/lib/index.js",
-            "preLaunchTask": "tsc: build - tsconfig.json",
-            "outFiles": [
-                "${workspaceFolder}/lib/**/*.js"
-            ]
-        }
-    ]
-}

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "liveServer.settings.port": 5501
-}