@cloudbase/cli 2.10.0-beta.0 → 2.11.0-beta.0

package/lib/commands/runf/base.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 };
 };
@@ -32,7 +23,7 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const nodemon = (() => { try {
     return require('nodemon');
 }
-catch (_a) {
+catch {
     return null;
 } })();
 const path_1 = __importDefault(require("path"));
@@ -67,109 +58,105 @@ let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
             desc: (0, i18n_1.t)('部署云函数 2.0 服务')
         };
     }
-    execute(ctx, envId, log, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { serviceName, source } = options;
-            const targetDir = path_1.default.resolve(source || process.cwd());
-            if (!envId) {
-                const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(targetDir));
-                if (envConfig.envId) {
-                    envId = envConfig.envId;
-                    log.info((0, i18n_1.t)('当前环境 Id：{{envId}}', { envId }));
-                }
-                else {
-                    envId = yield _selectEnv();
-                }
+    async execute(ctx, envId, log, options) {
+        let { serviceName, source } = options;
+        const targetDir = path_1.default.resolve(source || process.cwd());
+        if (!envId) {
+            const envConfig = (0, camelcase_keys_1.default)(await iac_core_1.utils.loadEnv(targetDir));
+            if (envConfig.envId) {
+                envId = envConfig.envId;
+                log.info((0, i18n_1.t)('当前环境 Id：{{envId}}', { envId }));
             }
             else {
-                log.info((0, i18n_1.t)('当前环境 Id：{{envId}}', { envId }));
+                envId = await _selectEnv();
             }
-            if (!serviceName) {
-                const { shortName } = yield (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
-                serviceName = yield _inputServiceName(shortName);
+        }
+        else {
+            log.info((0, i18n_1.t)('当前环境 Id：{{envId}}', { envId }));
+        }
+        if (!serviceName) {
+            const { shortName } = await (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+            serviceName = await _inputServiceName(shortName);
+        }
+        const answers = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'confirm',
+                message: (0, i18n_1.t)('即将开始部署，是否确认继续？'),
+                default: true
             }
-            const answers = yield inquirer_1.default.prompt([
-                {
-                    type: 'confirm',
-                    name: 'confirm',
-                    message: (0, i18n_1.t)('即将开始部署，是否确认继续？'),
-                    default: true
-                }
-            ]);
-            if (!answers.confirm) {
-                return;
+        ]);
+        if (!answers.confirm) {
+            return;
+        }
+        await iac_core_1.IAC.init({
+            cwd: targetDir,
+            getCredential: () => {
+                return (0, utils_1.getCredential)(ctx, options);
+            },
+            polyRepoMode: true
+        });
+        await _runDeploy();
+        async function _runDeploy() {
+            try {
+                const res = await iac_core_1.IAC.FunctionV2.apply({
+                    cwd: targetDir,
+                    envId: envId,
+                    name: serviceName
+                }, function (message) {
+                    (0, utils_1.trackCallback)(message, log);
+                });
+                const { envId: _envId, name, resourceType: _resourceType } = res === null || res === void 0 ? void 0 : res.data;
+                (0, utils_1.trackCallback)({
+                    details: (0, i18n_1.t)('请打开链接查看部署状态: {{url}}', { url: `${utils_2.EUrl.DevPlatform}?envId=${_envId}#/platform-run/service/detail?serverName=${name}&tabId=deploy&envId=${_envId}` })
+                }, log);
             }
-            yield iac_core_1.IAC.init({
-                cwd: targetDir,
-                getCredential: () => {
-                    return (0, utils_1.getCredential)(ctx, options);
-                },
-                polyRepoMode: true
-            });
-            yield _runDeploy();
-            function _runDeploy() {
-                return __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const res = yield iac_core_1.IAC.FunctionV2.apply({
-                            cwd: targetDir,
-                            envId: envId,
-                            name: serviceName
-                        }, function (message) {
-                            (0, utils_1.trackCallback)(message, log);
-                        });
-                        const { envId: _envId, name, resourceType: _resourceType } = res === null || res === void 0 ? void 0 : res.data;
-                        (0, utils_1.trackCallback)({
-                            details: (0, i18n_1.t)('请打开链接查看部署状态: {{url}}', { url: `${utils_2.EUrl.DevPlatform}?envId=${_envId}#/platform-run/service/detail?serverName=${name}&tabId=deploy&envId=${_envId}` })
-                        }, log);
-                    }
-                    catch (e) {
-                        if ((e === null || e === void 0 ? void 0 : e.action) === 'UpdateCloudRunServer' && (e === null || e === void 0 ? void 0 : e.code) === 'ResourceInUse') {
-                            inquirer_1.default
-                                .prompt([
-                                {
-                                    type: 'confirm',
-                                    name: 'confirm',
-                                    message: (0, i18n_1.t)('平台当前有部署发布任务正在运行中。确认继续部署，正在执行的部署任务将被取消，并立即部署最新的代码'),
-                                    default: true
-                                }
-                            ])
-                                .then((answers) => __awaiter(this, void 0, void 0, function* () {
-                                if (answers.confirm) {
-                                    try {
-                                        const { task } = yield CloudAPI.tcbrServiceRequest('DescribeServerManageTask', {
-                                            envId,
-                                            serverName: serviceName,
-                                            taskId: 0
-                                        });
-                                        const id = task === null || task === void 0 ? void 0 : task.id;
-                                        yield CloudAPI.tcbrServiceRequest('OperateServerManage', {
-                                            envId,
-                                            operateType: 'cancel',
-                                            serverName: serviceName,
-                                            taskId: id
-                                        });
-                                        yield _runDeploy();
-                                    }
-                                    catch (e) {
-                                        (0, utils_1.trackCallback)({
-                                            type: 'error',
-                                            details: e.message
-                                        }, log);
-                                    }
-                                }
-                            }));
+            catch (e) {
+                if ((e === null || e === void 0 ? void 0 : e.action) === 'UpdateCloudRunServer' && (e === null || e === void 0 ? void 0 : e.code) === 'ResourceInUse') {
+                    inquirer_1.default
+                        .prompt([
+                        {
+                            type: 'confirm',
+                            name: 'confirm',
+                            message: (0, i18n_1.t)('平台当前有部署发布任务正在运行中。确认继续部署，正在执行的部署任务将被取消，并立即部署最新的代码'),
+                            default: true
                         }
-                        else {
-                            (0, utils_1.trackCallback)({
-                                type: 'error',
-                                details: `${e.message}`,
-                                originalError: e
-                            }, log);
+                    ])
+                        .then(async (answers) => {
+                        if (answers.confirm) {
+                            try {
+                                const { task } = await CloudAPI.tcbrServiceRequest('DescribeServerManageTask', {
+                                    envId,
+                                    serverName: serviceName,
+                                    taskId: 0
+                                });
+                                const id = task === null || task === void 0 ? void 0 : task.id;
+                                await CloudAPI.tcbrServiceRequest('OperateServerManage', {
+                                    envId,
+                                    operateType: 'cancel',
+                                    serverName: serviceName,
+                                    taskId: id
+                                });
+                                await _runDeploy();
+                            }
+                            catch (e) {
+                                (0, utils_1.trackCallback)({
+                                    type: 'error',
+                                    details: e.message
+                                }, log);
+                            }
                         }
-                    }
-                });
+                    });
+                }
+                else {
+                    (0, utils_1.trackCallback)({
+                        type: 'error',
+                        details: `${e.message}`,
+                        originalError: e
+                    }, log);
+                }
             }
-        });
+        }
     }
 };
 __decorate([
@@ -210,62 +197,60 @@ let RunfDownloadCommand = class RunfDownloadCommand extends common_1.Command {
             desc: (0, i18n_1.t)('下载云函数 2.0 服务代码')
         };
     }
-    execute(ctx, envId, log, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { serviceName, source } = options;
-            let targetDir = path_1.default.resolve(source || process.cwd());
-            if (!envId) {
-                const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(targetDir));
-                envId = envConfig.envId || (yield _selectEnv());
-            }
-            else {
-                log.info((0, i18n_1.t)('当前环境 Id：{{envId}}', { envId }));
+    async execute(ctx, envId, log, options) {
+        let { serviceName, source } = options;
+        let targetDir = path_1.default.resolve(source || process.cwd());
+        if (!envId) {
+            const envConfig = (0, camelcase_keys_1.default)(await iac_core_1.utils.loadEnv(targetDir));
+            envId = envConfig.envId || (await _selectEnv());
+        }
+        else {
+            log.info((0, i18n_1.t)('当前环境 Id：{{envId}}', { envId }));
+        }
+        if (!serviceName) {
+            const { shortName } = await (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+            serviceName = await _inputServiceName(shortName);
+            if (serviceName !== shortName) {
+                targetDir = path_1.default.join(targetDir, serviceName);
             }
-            if (!serviceName) {
-                const { shortName } = yield (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
-                serviceName = yield _inputServiceName(shortName);
-                if (serviceName !== shortName) {
-                    targetDir = path_1.default.join(targetDir, serviceName);
-                }
-            }
-            const needTips = !(yield (0, utils_1.isDirectoryEmptyOrNotExists)(targetDir));
-            if (needTips) {
-                const answers = yield inquirer_1.default.prompt([
-                    {
-                        type: 'confirm',
-                        name: 'confirm',
-                        message: (0, i18n_1.t)('下载将覆盖 {{targetDir}} 目录下的代码，是否继续？', { targetDir }),
-                        default: true
-                    }
-                ]);
-                if (!answers.confirm) {
-                    return;
+        }
+        const needTips = !(await (0, utils_1.isDirectoryEmptyOrNotExists)(targetDir));
+        if (needTips) {
+            const answers = await inquirer_1.default.prompt([
+                {
+                    type: 'confirm',
+                    name: 'confirm',
+                    message: (0, i18n_1.t)('下载将覆盖 {{targetDir}} 目录下的代码，是否继续？', { targetDir }),
+                    default: true
                 }
+            ]);
+            if (!answers.confirm) {
+                return;
             }
-            yield iac_core_1.IAC.init({
+        }
+        await iac_core_1.IAC.init({
+            cwd: targetDir,
+            getCredential: () => {
+                return (0, utils_1.getCredential)(ctx, options);
+            },
+            polyRepoMode: true
+        });
+        try {
+            await iac_core_1.IAC.FunctionV2.pull({
                 cwd: targetDir,
-                getCredential: () => {
-                    return (0, utils_1.getCredential)(ctx, options);
-                },
-                polyRepoMode: true
+                envId: envId,
+                name: serviceName
+            }, function (message) {
+                (0, utils_1.trackCallback)(message, log);
             });
-            try {
-                yield iac_core_1.IAC.FunctionV2.pull({
-                    cwd: targetDir,
-                    envId: envId,
-                    name: serviceName
-                }, function (message) {
-                    (0, utils_1.trackCallback)(message, log);
-                });
-            }
-            catch (e) {
-                (0, utils_1.trackCallback)({
-                    type: 'error',
-                    details: `${e.message}`,
-                    originalError: e
-                }, log);
-            }
-        });
+        }
+        catch (e) {
+            (0, utils_1.trackCallback)({
+                type: 'error',
+                details: `${e.message}`,
+                originalError: e
+            }, log);
+        }
     }
 };
 __decorate([
@@ -351,64 +336,62 @@ let RunfRunCommand = class RunfRunCommand extends common_1.Command {
             desc: (0, i18n_1.t)('本地运行云函数 2.0 代码')
         };
     }
-    execute(logger, ctx, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = process.argv.slice(2);
-            const watchFlag = ['--watch', '-w'];
-            const defaultIgnoreFiles = ['logs/*.*'];
-            const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(process.cwd()));
-            const credential = yield (0, utils_1.getCredential)(ctx, options);
-            process.env.EXTENDED_CONTEXT = JSON.stringify({
-                tmpSecret: {
-                    secretId: credential.secretId,
-                    secretKey: credential.secretKey,
-                    token: credential.token
-                },
-                source: 'local_dev',
-                envId: envConfig.envId
-            });
-            if (watchFlag.some((flag) => args.includes(flag))) {
-                const cmd = args.filter((arg) => !watchFlag.includes(arg)).join(' ');
-                if (!nodemon) {
-                    throw new Error((0, i18n_1.t)('缺少开发依赖 nodemon，独立发行版已不内置。请在本地开发环境中安装再使用该命令。'));
-                }
-                nodemon({
-                    script: '',
-                    exec: `${process.argv[1]} ${cmd}`,
-                    watchOptions: {
-                        usePolling: true,
-                        ignorePermissionErrors: true,
-                        ignored: defaultIgnoreFiles.join(','),
-                        persistent: true,
-                        interval: 500
-                    }
-                })
-                    .on('start', () => {
-                    logger.info('Initializing server in watch mode. Changes in source files will trigger a restart.');
-                })
-                    .on('quit', (e) => {
-                    logger.info(`Nodemon quit with code ${e}.`);
-                    process.exit(0);
-                })
-                    .on('restart', (e) => {
-                    var _a, _b;
-                    logger.info(`Server restarted due to changed files: ${(_b = (_a = e === null || e === void 0 ? void 0 : e.matched) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.join(', ')}`);
-                })
-                    .on('log', (e) => {
-                    logger.info(`[nodemon ${e.type}] ${e.message}`);
-                })
-                    .on('crash', () => {
-                    logger.error('Server crashed.');
-                    process.exit(1);
-                })
-                    .on('exit', (e) => {
-                    logger.info(`Server exited with code ${e}.`);
-                });
-            }
-            else {
-                (0, functions_framework_1.runCLI)();
-            }
+    async execute(logger, ctx, options) {
+        const args = process.argv.slice(2);
+        const watchFlag = ['--watch', '-w'];
+        const defaultIgnoreFiles = ['logs/*.*'];
+        const envConfig = (0, camelcase_keys_1.default)(await iac_core_1.utils.loadEnv(process.cwd()));
+        const credential = await (0, utils_1.getCredential)(ctx, options);
+        process.env.EXTENDED_CONTEXT = JSON.stringify({
+            tmpSecret: {
+                secretId: credential.secretId,
+                secretKey: credential.secretKey,
+                token: credential.token
+            },
+            source: 'local_dev',
+            envId: envConfig.envId
         });
+        if (watchFlag.some((flag) => args.includes(flag))) {
+            const cmd = args.filter((arg) => !watchFlag.includes(arg)).join(' ');
+            if (!nodemon) {
+                throw new Error((0, i18n_1.t)('缺少开发依赖 nodemon，独立发行版已不内置。请在本地开发环境中安装再使用该命令。'));
+            }
+            nodemon({
+                script: '',
+                exec: `${process.argv[1]} ${cmd}`,
+                watchOptions: {
+                    usePolling: true,
+                    ignorePermissionErrors: true,
+                    ignored: defaultIgnoreFiles.join(','),
+                    persistent: true,
+                    interval: 500
+                }
+            })
+                .on('start', () => {
+                logger.info('Initializing server in watch mode. Changes in source files will trigger a restart.');
+            })
+                .on('quit', (e) => {
+                logger.info(`Nodemon quit with code ${e}.`);
+                process.exit(0);
+            })
+                .on('restart', (e) => {
+                var _a, _b;
+                logger.info(`Server restarted due to changed files: ${(_b = (_a = e === null || e === void 0 ? void 0 : e.matched) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.join(', ')}`);
+            })
+                .on('log', (e) => {
+                logger.info(`[nodemon ${e.type}] ${e.message}`);
+            })
+                .on('crash', () => {
+                logger.error('Server crashed.');
+                process.exit(1);
+            })
+                .on('exit', (e) => {
+                logger.info(`Server exited with code ${e}.`);
+            });
+        }
+        else {
+            (0, functions_framework_1.runCLI)();
+        }
     }
 };
 __decorate([
@@ -424,30 +407,26 @@ RunfRunCommand = __decorate([
     (0, common_1.ICommand)()
 ], RunfRunCommand);
 exports.RunfRunCommand = RunfRunCommand;
-function _selectEnv() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (0, utils_1.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
-    });
+async function _selectEnv() {
+    return (0, utils_1.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
 }
-function _inputServiceName(defaultVal = '') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const questions = [
-            {
-                type: 'input',
-                name: 'serviceName',
-                message: (0, i18n_1.t)('请输入服务名称'),
-                default: defaultVal,
-                validate: (val) => {
-                    const isValid = !val.startsWith('lcap') &&
-                        !val.startsWith('lowcode') &&
-                        /^[A-Za-z][\w-_]{0,43}[A-Za-z0-9]$/.test(val);
-                    return isValid
-                        ? true
-                        : (0, i18n_1.t)('支持大小写字母、数字、-和_，但必须以字母开头、以字母和数字结尾，不支持以lcap、lowcode开头，最长45个字符');
-                }
+async function _inputServiceName(defaultVal = '') {
+    const questions = [
+        {
+            type: 'input',
+            name: 'serviceName',
+            message: (0, i18n_1.t)('请输入服务名称'),
+            default: defaultVal,
+            validate: (val) => {
+                const isValid = !val.startsWith('lcap') &&
+                    !val.startsWith('lowcode') &&
+                    /^[A-Za-z][\w-_]{0,43}[A-Za-z0-9]$/.test(val);
+                return isValid
+                    ? true
+                    : (0, i18n_1.t)('支持大小写字母、数字、-和_，但必须以字母开头、以字母和数字结尾，不支持以lcap、lowcode开头，最长45个字符');
             }
-        ];
-        const answers = yield inquirer_1.default.prompt(questions);
-        return answers['serviceName'];
-    });
+        }
+    ];
+    const answers = await inquirer_1.default.prompt(questions);
+    return answers['serviceName'];
 }