@cloudbase/cli 2.10.0 → 2.11.0-beta.0

package/lib/commands/storage/storage.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -40,11 +31,9 @@ const AclMap = {
     ADMINWRITE: (0, i18n_1.t)('所有用户可读，仅管理员可写'),
     ADMINONLY: (0, i18n_1.t)('仅管理员可读写')
 };
-function getStorageService(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { storage } = yield (0, utils_1.getMangerService)(envId);
-        return storage;
-    });
+async function getStorageService(envId) {
+    const { storage } = await (0, utils_1.getMangerService)(envId);
+    return storage;
 }
 function checkCloudPath(cloudPath) {
     if ((cloudPath === null || cloudPath === void 0 ? void 0 : cloudPath[0]) === '/') {
@@ -71,82 +60,80 @@ let UploadCommand = class UploadCommand extends common_1.Command {
             desc: (0, i18n_1.t)('上传文件/文件夹')
         };
     }
-    execute(envId, params, options, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const localPath = params === null || params === void 0 ? void 0 : params[0];
-            const cloudPath = params === null || params === void 0 ? void 0 : params[1];
-            const retryCount = options === null || options === void 0 ? void 0 : options.times;
-            const retryInterval = options === null || options === void 0 ? void 0 : options.interval;
-            const resolveLocalPath = path_1.default.resolve(localPath);
-            if (!(0, utils_1.checkFullAccess)(resolveLocalPath)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('文件未找到！'));
-            }
-            if (retryCount > 10) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('上传重试次数为 0-10 次之间'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('准备上传中...'));
-            const storageService = yield getStorageService(envId);
-            const isDir = fs_1.default.statSync(resolveLocalPath).isDirectory();
-            let totalFiles = 0;
-            if (isDir) {
-                let files = yield storageService.walkLocalDir(resolveLocalPath);
-                files = files.filter((item) => !(0, utils_1.isDirectory)(item));
-                totalFiles = files.length;
-            }
-            const onProgress = (0, utils_1.createUploadProgressBar)(() => {
-                !isDir && log.success((0, i18n_1.t)('上传文件成功！'));
-            }, () => {
-                loading.stop();
-            });
-            const successFiles = [];
-            const failedFiles = [];
-            if (isDir) {
-                yield storageService.uploadDirectory({
-                    localPath: resolveLocalPath,
-                    cloudPath,
-                    onProgress,
-                    onFileFinish: (...args) => {
-                        const error = args[0];
-                        const fileInfo = args[2];
-                        if (error) {
-                            failedFiles.push(fileInfo.Key);
-                        }
-                        else {
-                            successFiles.push(fileInfo.Key);
-                        }
-                    },
-                    retryCount: retryCount || 1,
-                    retryInterval,
-                    parallel: 20
-                });
-                log.success((0, i18n_1.t)('文件共计 {{count}} 个', { count: totalFiles }));
-                log.success((0, i18n_1.t)('文件上传成功 {{count}} 个', { count: successFiles.length }));
-                if (totalFiles <= 50) {
-                    (0, utils_1.printHorizontalTable)([(0, i18n_1.t)('状态'), (0, i18n_1.t)('文件')], successFiles.map((item) => [log_symbols_1.default.success, item]));
-                }
-                log.error((0, i18n_1.t)('文件上传失败 {{count}} 个', { count: failedFiles.length }));
-                if (failedFiles.length) {
-                    if (totalFiles <= 50) {
-                        (0, utils_1.printHorizontalTable)([(0, i18n_1.t)('状态'), (0, i18n_1.t)('文件')], failedFiles.map((item) => [log_symbols_1.default.error, item]));
+    async execute(envId, params, options, log) {
+        const localPath = params === null || params === void 0 ? void 0 : params[0];
+        const cloudPath = params === null || params === void 0 ? void 0 : params[1];
+        const retryCount = options === null || options === void 0 ? void 0 : options.times;
+        const retryInterval = options === null || options === void 0 ? void 0 : options.interval;
+        const resolveLocalPath = path_1.default.resolve(localPath);
+        if (!(0, utils_1.checkFullAccess)(resolveLocalPath)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('文件未找到！'));
+        }
+        if (retryCount > 10) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('上传重试次数为 0-10 次之间'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('准备上传中...'));
+        const storageService = await getStorageService(envId);
+        const isDir = fs_1.default.statSync(resolveLocalPath).isDirectory();
+        let totalFiles = 0;
+        if (isDir) {
+            let files = await storageService.walkLocalDir(resolveLocalPath);
+            files = files.filter((item) => !(0, utils_1.isDirectory)(item));
+            totalFiles = files.length;
+        }
+        const onProgress = (0, utils_1.createUploadProgressBar)(() => {
+            !isDir && log.success((0, i18n_1.t)('上传文件成功！'));
+        }, () => {
+            loading.stop();
+        });
+        const successFiles = [];
+        const failedFiles = [];
+        if (isDir) {
+            await storageService.uploadDirectory({
+                localPath: resolveLocalPath,
+                cloudPath,
+                onProgress,
+                onFileFinish: (...args) => {
+                    const error = args[0];
+                    const fileInfo = args[2];
+                    if (error) {
+                        failedFiles.push(fileInfo.Key);
                     }
                     else {
-                        const errorLogPath = path_1.default.resolve('./cloudbase-error.log');
-                        log.error((0, i18n_1.t)('上传失败文件：'));
-                        console.log(errorLogPath);
-                        fs_1.default.writeFileSync(errorLogPath, failedFiles.join('\n'));
+                        successFiles.push(fileInfo.Key);
                     }
-                }
+                },
+                retryCount: retryCount || 1,
+                retryInterval,
+                parallel: 20
+            });
+            log.success((0, i18n_1.t)('文件共计 {{count}} 个', { count: totalFiles }));
+            log.success((0, i18n_1.t)('文件上传成功 {{count}} 个', { count: successFiles.length }));
+            if (totalFiles <= 50) {
+                (0, utils_1.printHorizontalTable)([(0, i18n_1.t)('状态'), (0, i18n_1.t)('文件')], successFiles.map((item) => [log_symbols_1.default.success, item]));
             }
-            else {
-                const assignCloudPath = cloudPath || path_1.default.parse(resolveLocalPath).base;
-                yield storageService.uploadFile({
-                    localPath: resolveLocalPath,
-                    cloudPath: assignCloudPath,
-                    onProgress
-                });
+            log.error((0, i18n_1.t)('文件上传失败 {{count}} 个', { count: failedFiles.length }));
+            if (failedFiles.length) {
+                if (totalFiles <= 50) {
+                    (0, utils_1.printHorizontalTable)([(0, i18n_1.t)('状态'), (0, i18n_1.t)('文件')], failedFiles.map((item) => [log_symbols_1.default.error, item]));
+                }
+                else {
+                    const errorLogPath = path_1.default.resolve('./cloudbase-error.log');
+                    log.error((0, i18n_1.t)('上传失败文件：'));
+                    console.log(errorLogPath);
+                    fs_1.default.writeFileSync(errorLogPath, failedFiles.join('\n'));
+                }
             }
-        });
+        }
+        else {
+            const assignCloudPath = cloudPath || path_1.default.parse(resolveLocalPath).base;
+            await storageService.uploadFile({
+                localPath: resolveLocalPath,
+                cloudPath: assignCloudPath,
+                onProgress
+            });
+        }
     }
 };
 __decorate([
@@ -182,34 +169,32 @@ let DownloadCommand = class DownloadCommand extends common_1.Command {
             desc: (0, i18n_1.t)('下载文件/文件夹，文件夹需指定 --dir 选项')
         };
     }
-    execute(envId, options, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cloudPath = params === null || params === void 0 ? void 0 : params[0];
-            const localPath = params === null || params === void 0 ? void 0 : params[1];
-            const storageService = yield getStorageService(envId);
-            const resolveLocalPath = path_1.default.resolve(localPath);
-            const { dir } = options;
-            const fileText = dir ? (0, i18n_1.t)('文件夹') : (0, i18n_1.t)('文件');
-            if (dir && !(0, utils_1.checkFullAccess)(resolveLocalPath)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('存储文件夹不存在！'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('下载{{type}}中', { type: fileText }));
-            if (dir) {
-                yield storageService.downloadDirectory({
-                    localPath: resolveLocalPath,
-                    cloudPath,
-                    parallel: 20
-                });
-            }
-            else {
-                yield storageService.downloadFile({
-                    cloudPath,
-                    localPath: resolveLocalPath
-                });
-            }
-            loading.succeed((0, i18n_1.t)('下载{{type}}成功！', { type: fileText }));
-        });
+    async execute(envId, options, params) {
+        const cloudPath = params === null || params === void 0 ? void 0 : params[0];
+        const localPath = params === null || params === void 0 ? void 0 : params[1];
+        const storageService = await getStorageService(envId);
+        const resolveLocalPath = path_1.default.resolve(localPath);
+        const { dir } = options;
+        const fileText = dir ? (0, i18n_1.t)('文件夹') : (0, i18n_1.t)('文件');
+        if (dir && !(0, utils_1.checkFullAccess)(resolveLocalPath)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('存储文件夹不存在！'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('下载{{type}}中', { type: fileText }));
+        if (dir) {
+            await storageService.downloadDirectory({
+                localPath: resolveLocalPath,
+                cloudPath,
+                parallel: 20
+            });
+        }
+        else {
+            await storageService.downloadFile({
+                cloudPath,
+                localPath: resolveLocalPath
+            });
+        }
+        loading.succeed((0, i18n_1.t)('下载{{type}}成功！', { type: fileText }));
     }
 };
 __decorate([
@@ -244,37 +229,35 @@ let DeleteFileCommand = class DeleteFileCommand extends common_1.Command {
             desc: (0, i18n_1.t)('删除文件/文件夹，文件夹需指定 --dir 选项')
         };
     }
-    execute(envId, options, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let isDir = options.dir;
-            const cloudPath = params === null || params === void 0 ? void 0 : params[0];
-            const loading = (0, utils_1.loadingFactory)();
-            const storageService = yield getStorageService(envId);
-            if (!cloudPath) {
-                const { confirm } = yield inquirer_1.default.prompt({
-                    type: 'confirm',
-                    name: 'confirm',
-                    message: (0, i18n_1.t)('指定云端路径为空，将会删除所有文件，是否继续'),
-                    default: false
-                });
-                if (!confirm) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
-                }
-                isDir = true;
-            }
-            if (cloudPath === '/') {
-                isDir = true;
-            }
-            const fileText = isDir ? (0, i18n_1.t)('文件夹') : (0, i18n_1.t)('文件');
-            loading.start((0, i18n_1.t)('删除{{type}}中', { type: fileText }));
-            if (isDir) {
-                yield storageService.deleteDirectory(cloudPath);
-            }
-            else {
-                yield storageService.deleteFile([cloudPath]);
+    async execute(envId, options, params) {
+        let isDir = options.dir;
+        const cloudPath = params === null || params === void 0 ? void 0 : params[0];
+        const loading = (0, utils_1.loadingFactory)();
+        const storageService = await getStorageService(envId);
+        if (!cloudPath) {
+            const { confirm } = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'confirm',
+                message: (0, i18n_1.t)('指定云端路径为空，将会删除所有文件，是否继续'),
+                default: false
+            });
+            if (!confirm) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
             }
-            loading.succeed((0, i18n_1.t)('删除{{type}}成功！', { type: fileText }));
-        });
+            isDir = true;
+        }
+        if (cloudPath === '/') {
+            isDir = true;
+        }
+        const fileText = isDir ? (0, i18n_1.t)('文件夹') : (0, i18n_1.t)('文件');
+        loading.start((0, i18n_1.t)('删除{{type}}中', { type: fileText }));
+        if (isDir) {
+            await storageService.deleteDirectory(cloudPath);
+        }
+        else {
+            await storageService.deleteFile([cloudPath]);
+        }
+        loading.succeed((0, i18n_1.t)('删除{{type}}成功！', { type: fileText }));
     }
 };
 __decorate([
@@ -305,27 +288,25 @@ let StorageListCommand = class StorageListCommand extends common_1.Command {
             desc: (0, i18n_1.t)('获取文件存储的文件列表，不指定路径时获取全部文件列表')
         };
     }
-    execute(envId, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cloudPath = params === null || params === void 0 ? void 0 : params[0];
-            const storageService = yield getStorageService(envId);
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('获取文件列表中...'));
-            const list = yield storageService.listDirectoryFiles(cloudPath);
-            loading.stop();
-            const head = [(0, i18n_1.t)('序号'), 'Key', 'LastModified', 'ETag', 'Size(KB)'];
-            const notDir = (item) => !(Number(item.Size) === 0 && /\/$/g.test(item.Key));
-            const tableData = list
-                .filter(notDir)
-                .map((item, index) => [
-                index + 1,
-                item.Key,
-                (0, utils_1.formatDate)(item.LastModified, 'yyyy-MM-dd hh:mm:ss'),
-                item.ETag,
-                String((0, utils_1.formateFileSize)(item.Size, 'KB'))
-            ]);
-            (0, utils_1.printHorizontalTable)(head, tableData);
-        });
+    async execute(envId, params) {
+        const cloudPath = params === null || params === void 0 ? void 0 : params[0];
+        const storageService = await getStorageService(envId);
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('获取文件列表中...'));
+        const list = await storageService.listDirectoryFiles(cloudPath);
+        loading.stop();
+        const head = [(0, i18n_1.t)('序号'), 'Key', 'LastModified', 'ETag', 'Size(KB)'];
+        const notDir = (item) => !(Number(item.Size) === 0 && /\/$/g.test(item.Key));
+        const tableData = list
+            .filter(notDir)
+            .map((item, index) => [
+            index + 1,
+            item.Key,
+            (0, utils_1.formatDate)(item.LastModified, 'yyyy-MM-dd hh:mm:ss'),
+            item.ETag,
+            String((0, utils_1.formateFileSize)(item.Size, 'KB'))
+        ]);
+        (0, utils_1.printHorizontalTable)(head, tableData);
     }
 };
 __decorate([
@@ -355,14 +336,12 @@ let GetUrlCommand = class GetUrlCommand extends common_1.Command {
             desc: (0, i18n_1.t)('获取文件临时访问地址')
         };
     }
-    execute(envId, params, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cloudPath = params === null || params === void 0 ? void 0 : params[0];
-            const storageService = yield getStorageService(envId);
-            const fileList = yield storageService.getTemporaryUrl([cloudPath]);
-            const { url } = fileList[0];
-            log.success((0, i18n_1.t)('文件临时访问地址：{{url}}', { url }));
-        });
+    async execute(envId, params, log) {
+        const cloudPath = params === null || params === void 0 ? void 0 : params[0];
+        const storageService = await getStorageService(envId);
+        const fileList = await storageService.getTemporaryUrl([cloudPath]);
+        const { url } = fileList[0];
+        log.success((0, i18n_1.t)('文件临时访问地址：{{url}}', { url }));
     }
 };
 __decorate([
@@ -393,20 +372,18 @@ let StorageDetailCommand = class StorageDetailCommand extends common_1.Command {
             desc: (0, i18n_1.t)('获取文件信息')
         };
     }
-    execute(envId, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cloudPath = params === null || params === void 0 ? void 0 : params[0];
-            const storageService = yield getStorageService(envId);
-            const fileInfo = yield storageService.getFileInfo(cloudPath);
-            const date = (0, utils_1.formatDate)(fileInfo.Date, 'yyyy-MM-dd hh:mm:ss');
-            const logInfo = (0, i18n_1.t)('文件大小：{{size}}\n文件类型：{{type}}\n修改日期：{{date}}\nETag：{{etag}}', {
-                size: fileInfo.Size,
-                type: fileInfo.Type,
-                date,
-                etag: fileInfo.ETag
-            });
-            console.log(logInfo);
+    async execute(envId, params) {
+        const cloudPath = params === null || params === void 0 ? void 0 : params[0];
+        const storageService = await getStorageService(envId);
+        const fileInfo = await storageService.getFileInfo(cloudPath);
+        const date = (0, utils_1.formatDate)(fileInfo.Date, 'yyyy-MM-dd hh:mm:ss');
+        const logInfo = (0, i18n_1.t)('文件大小：{{size}}\n文件类型：{{type}}\n修改日期：{{date}}\nETag：{{etag}}', {
+            size: fileInfo.Size,
+            type: fileInfo.Type,
+            date,
+            etag: fileInfo.ETag
         });
+        console.log(logInfo);
     }
 };
 __decorate([
@@ -436,12 +413,10 @@ let GetAclCommand = class GetAclCommand extends common_1.Command {
             desc: (0, i18n_1.t)('获取文件存储权限信息')
         };
     }
-    execute(envId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const storageService = yield getStorageService(envId);
-            const acl = yield storageService.getStorageAcl();
-            console.log((0, i18n_1.t)('当前权限【{{acl}}】', { acl: AclMap[acl] }));
-        });
+    async execute(envId) {
+        const storageService = await getStorageService(envId);
+        const acl = await storageService.getStorageAcl();
+        console.log((0, i18n_1.t)('当前权限【{{acl}}】', { acl: AclMap[acl] }));
     }
 };
 __decorate([
@@ -470,35 +445,33 @@ let setAclCommand = class setAclCommand extends common_1.Command {
             desc: (0, i18n_1.t)('设置文件存储权限信息')
         };
     }
-    execute(envId, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const storageService = yield getStorageService(envId);
-            const { acl } = yield inquirer_1.default.prompt({
-                type: 'list',
-                name: 'acl',
-                message: (0, i18n_1.t)('选择权限'),
-                choices: [
-                    {
-                        name: (0, i18n_1.t)('所有用户可读，仅创建者和管理员可写'),
-                        value: 'READONLY'
-                    },
-                    {
-                        name: (0, i18n_1.t)('仅创建者及管理员可读写'),
-                        value: 'PRIVATE'
-                    },
-                    {
-                        name: (0, i18n_1.t)('所有用户可读，仅管理员可写'),
-                        value: 'ADMINWRITE'
-                    },
-                    {
-                        name: (0, i18n_1.t)('仅管理员可读写'),
-                        value: 'ADMINONLY'
-                    }
-                ]
-            });
-            yield storageService.setStorageAcl(acl);
-            log.success((0, i18n_1.t)('设置存储权限成功！'));
+    async execute(envId, log) {
+        const storageService = await getStorageService(envId);
+        const { acl } = await inquirer_1.default.prompt({
+            type: 'list',
+            name: 'acl',
+            message: (0, i18n_1.t)('选择权限'),
+            choices: [
+                {
+                    name: (0, i18n_1.t)('所有用户可读，仅创建者和管理员可写'),
+                    value: 'READONLY'
+                },
+                {
+                    name: (0, i18n_1.t)('仅创建者及管理员可读写'),
+                    value: 'PRIVATE'
+                },
+                {
+                    name: (0, i18n_1.t)('所有用户可读，仅管理员可写'),
+                    value: 'ADMINWRITE'
+                },
+                {
+                    name: (0, i18n_1.t)('仅管理员可读写'),
+                    value: 'ADMINONLY'
+                }
+            ]
         });
+        await storageService.setStorageAcl(acl);
+        log.success((0, i18n_1.t)('设置存储权限成功！'));
     }
 };
 __decorate([

package/lib/commands/third/thirdAttach.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteThirdAttach = void 0;
 const common_1 = require("../common");
@@ -47,25 +38,23 @@ class DeleteThirdAttach extends common_1.Command {
             requiredEnvId: false
         };
     }
-    execute(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { source, thirdAppId } = options;
-            let typeFlag;
-            if (source === 'qq') {
-                typeFlag = 1;
-            }
-            if (!typeFlag) {
-                throw new Error((0, i18n_1.t)('请指定对应的source'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            const data = yield (0, third_1.deleteThirdPartAttach)({
-                TypeFlag: typeFlag,
-                ThirdPartAppid: thirdAppId
-            });
-            loading.stop();
-            console.log(data);
+    async execute(options) {
+        const { source, thirdAppId } = options;
+        let typeFlag;
+        if (source === 'qq') {
+            typeFlag = 1;
+        }
+        if (!typeFlag) {
+            throw new Error((0, i18n_1.t)('请指定对应的source'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        const data = await (0, third_1.deleteThirdPartAttach)({
+            TypeFlag: typeFlag,
+            ThirdPartAppid: thirdAppId
         });
+        loading.stop();
+        console.log(data);
     }
 }
 __decorate([