@cloudbase/cli 2.10.0 → 2.11.0-beta.0

package/lib/commands/env/domain.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 };
 };
@@ -51,24 +42,22 @@ let ListAuthDoaminCommand = class ListAuthDoaminCommand extends common_1.Command
             desc: (0, i18n_1.t)('列出环境的安全域名列表')
         };
     }
-    execute(envId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const domains = yield (0, env_1.getEnvAuthDomains)({
-                envId: envId
-            });
-            if (domains.length === 0) {
-                console.log((0, i18n_1.t)('安全域名为空！'));
-                return;
-            }
-            const head = [(0, i18n_1.t)('域名 Id'), (0, i18n_1.t)('域名'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('状态')];
-            const tableData = domains.map((item) => [
-                item.Id,
-                item.Domain,
-                item.CreateTime,
-                item.Status === 'ENABLE' ? (0, i18n_1.t)('启用中') : (0, i18n_1.t)('禁用中')
-            ]);
-            (0, utils_1.printHorizontalTable)(head, tableData);
+    async execute(envId) {
+        const domains = await (0, env_1.getEnvAuthDomains)({
+            envId: envId
         });
+        if (domains.length === 0) {
+            console.log((0, i18n_1.t)('安全域名为空！'));
+            return;
+        }
+        const head = [(0, i18n_1.t)('域名 Id'), (0, i18n_1.t)('域名'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('状态')];
+        const tableData = domains.map((item) => [
+            item.Id,
+            item.Domain,
+            item.CreateTime,
+            item.Status === 'ENABLE' ? (0, i18n_1.t)('启用中') : (0, i18n_1.t)('禁用中')
+        ]);
+        (0, utils_1.printHorizontalTable)(head, tableData);
     }
 };
 __decorate([
@@ -101,39 +90,37 @@ let CreateAuthDomainCommand = class CreateAuthDomainCommand extends common_1.Com
             desc: (0, i18n_1.t)('添加环境安全域名，多个以斜杠 / 分隔')
         };
     }
-    execute(params, envId, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            log.verbose(params);
-            const domain = params === null || params === void 0 ? void 0 : params[0];
-            const domains = domain.split('/');
-            const { confirm } = yield inquirer_1.default.prompt({
-                type: 'confirm',
-                name: 'confirm',
-                message: (0, i18n_1.t)('确认添加以下安全域名： {{domains}} ？', { domains }),
-                default: true
-            });
-            if (!confirm) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
-            }
-            let envDomains = yield (0, env_1.getEnvAuthDomains)({
-                envId
-            });
-            envDomains = envDomains.map((item) => item.Domain);
-            const exitDomains = [];
-            domains.forEach((item) => {
-                if (envDomains.includes(item)) {
-                    exitDomains.push(item);
-                }
-            });
-            if (exitDomains.length) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('域名 [{{domains}}] 已存在！', { domains: exitDomains.join(', ') }));
+    async execute(params, envId, log) {
+        log.verbose(params);
+        const domain = params === null || params === void 0 ? void 0 : params[0];
+        const domains = domain.split('/');
+        const { confirm } = await inquirer_1.default.prompt({
+            type: 'confirm',
+            name: 'confirm',
+            message: (0, i18n_1.t)('确认添加以下安全域名： {{domains}} ？', { domains }),
+            default: true
+        });
+        if (!confirm) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
+        }
+        let envDomains = await (0, env_1.getEnvAuthDomains)({
+            envId
+        });
+        envDomains = envDomains.map((item) => item.Domain);
+        const exitDomains = [];
+        domains.forEach((item) => {
+            if (envDomains.includes(item)) {
+                exitDomains.push(item);
             }
-            yield (0, env_1.createEnvDomain)({
-                envId,
-                domains: domains
-            });
-            log.success((0, i18n_1.t)('添加安全域名成功！'));
         });
+        if (exitDomains.length) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('域名 [{{domains}}] 已存在！', { domains: exitDomains.join(', ') }));
+        }
+        await (0, env_1.createEnvDomain)({
+            envId,
+            domains: domains
+        });
+        log.success((0, i18n_1.t)('添加安全域名成功！'));
     }
 };
 __decorate([
@@ -168,44 +155,42 @@ let DeleteAuthDomainCommand = class DeleteAuthDomainCommand extends common_1.Com
             desc: (0, i18n_1.t)('删除环境的安全域名')
         };
     }
-    execute(envId, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('拉取环境安全域名中'));
-            const domains = yield (0, env_1.getEnvAuthDomains)({
-                envId
-            });
-            if (domains.length === 0) {
-                loading.fail((0, i18n_1.t)('域名安全为空，不能执行删除操作！'));
-                return;
-            }
-            loading.succeed((0, i18n_1.t)('拉取环境安全域名成功！'));
-            const domainList = domains.map((item) => item.Domain);
-            const { selectDomains } = yield inquirer_1.default.prompt({
-                type: 'checkbox',
-                name: 'selectDomains',
-                message: (0, i18n_1.t)('请选择需要删除的域名（可多选）>'),
-                choices: domainList,
-                default: true
-            });
-            const { confirm } = yield inquirer_1.default.prompt({
-                type: 'confirm',
-                name: 'confirm',
-                message: (0, i18n_1.t)('确认删除以下安全域名： {{domains}} ？', { domains: selectDomains }),
-                default: true
-            });
-            if (!confirm) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
-            }
-            const domainIds = domains
-                .filter((item) => selectDomains.includes(item.Domain))
-                .map((item) => item.Id);
-            const deleted = yield (0, env_1.deleteEnvDomain)({
-                domainIds,
-                envId
-            });
-            log.success((0, i18n_1.t)('成功删除了 {{count}} 个域名！', { count: deleted }));
+    async execute(envId, log) {
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('拉取环境安全域名中'));
+        const domains = await (0, env_1.getEnvAuthDomains)({
+            envId
+        });
+        if (domains.length === 0) {
+            loading.fail((0, i18n_1.t)('域名安全为空，不能执行删除操作！'));
+            return;
+        }
+        loading.succeed((0, i18n_1.t)('拉取环境安全域名成功！'));
+        const domainList = domains.map((item) => item.Domain);
+        const { selectDomains } = await inquirer_1.default.prompt({
+            type: 'checkbox',
+            name: 'selectDomains',
+            message: (0, i18n_1.t)('请选择需要删除的域名（可多选）>'),
+            choices: domainList,
+            default: true
+        });
+        const { confirm } = await inquirer_1.default.prompt({
+            type: 'confirm',
+            name: 'confirm',
+            message: (0, i18n_1.t)('确认删除以下安全域名： {{domains}} ？', { domains: selectDomains }),
+            default: true
+        });
+        if (!confirm) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
+        }
+        const domainIds = domains
+            .filter((item) => selectDomains.includes(item.Domain))
+            .map((item) => item.Id);
+        const deleted = await (0, env_1.deleteEnvDomain)({
+            domainIds,
+            envId
         });
+        log.success((0, i18n_1.t)('成功删除了 {{count}} 个域名！', { count: deleted }));
     }
 };
 __decorate([

package/lib/commands/env/login.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 };
 };
@@ -56,20 +47,18 @@ let ListLoginCommand = class ListLoginCommand extends common_1.Command {
             desc: (0, i18n_1.t)('列出环境登录配置')
         };
     }
-    execute(envId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const configList = yield (0, env_1.getLoginConfigList)({
-                envId
-            });
-            const head = [(0, i18n_1.t)('平台'), (0, i18n_1.t)('平台 Id'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('状态')];
-            const tableData = configList.map((item) => [
-                platformMap[item.Platform] ? platformMap[item.Platform] : item.Platform,
-                item.PlatformId,
-                item.CreateTime,
-                item.Status === 'ENABLE' ? (0, i18n_1.t)('启用') : (0, i18n_1.t)('禁用')
-            ]);
-            (0, utils_1.printHorizontalTable)(head, tableData);
+    async execute(envId) {
+        const configList = await (0, env_1.getLoginConfigList)({
+            envId
         });
+        const head = [(0, i18n_1.t)('平台'), (0, i18n_1.t)('平台 Id'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('状态')];
+        const tableData = configList.map((item) => [
+            platformMap[item.Platform] ? platformMap[item.Platform] : item.Platform,
+            item.PlatformId,
+            item.CreateTime,
+            item.Status === 'ENABLE' ? (0, i18n_1.t)('启用') : (0, i18n_1.t)('禁用')
+        ]);
+        (0, utils_1.printHorizontalTable)(head, tableData);
     }
 };
 __decorate([
@@ -99,70 +88,68 @@ let CreateLoginCommand = class CreateLoginCommand extends common_1.Command {
             desc: (0, i18n_1.t)('添加环境登录方式配置')
         };
     }
-    execute(envId, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { platform } = yield inquirer_1.default.prompt([
-                {
-                    type: 'list',
-                    name: 'platform',
-                    choices: [
-                        {
-                            name: (0, i18n_1.t)('微信公众平台'),
-                            value: 'WECHAT-PUBLIC'
-                        },
-                        {
-                            name: (0, i18n_1.t)('微信开放平台'),
-                            value: 'WECHAT-OPEN'
-                        },
-                        {
-                            name: (0, i18n_1.t)('匿名登录'),
-                            value: 'ANONYMOUS'
-                        }
-                    ],
-                    message: (0, i18n_1.t)('请选择登录方式：'),
-                    default: 'WECHAT-PUBLIC'
-                }
-            ]);
-            let appId;
-            let appSecret;
-            if (platform === 'WECHAT-OPEN' || platform === 'WECHAT-PUBLIC') {
-                const input = yield inquirer_1.default.prompt([
+    async execute(envId, log) {
+        const { platform } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'platform',
+                choices: [
+                    {
+                        name: (0, i18n_1.t)('微信公众平台'),
+                        value: 'WECHAT-PUBLIC'
+                    },
                     {
-                        type: 'input',
-                        name: 'appId',
-                        message: (0, i18n_1.t)('请输入 AppId：')
+                        name: (0, i18n_1.t)('微信开放平台'),
+                        value: 'WECHAT-OPEN'
                     },
                     {
-                        type: 'input',
-                        name: 'appSecret',
-                        message: (0, i18n_1.t)('请输入 AppSecret：')
+                        name: (0, i18n_1.t)('匿名登录'),
+                        value: 'ANONYMOUS'
                     }
-                ]);
-                appId = input === null || input === void 0 ? void 0 : input.appId;
-                appSecret = input === null || input === void 0 ? void 0 : input.appSecret;
-                if (!appId || !appSecret) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('appId 和 appSecret 不能为空！'));
-                }
-            }
-            if (platform === 'ANONYMOUS') {
-                appId = 'anonymous';
-                appSecret = 'anonymous';
+                ],
+                message: (0, i18n_1.t)('请选择登录方式：'),
+                default: 'WECHAT-PUBLIC'
             }
-            try {
-                yield (0, env_1.createLoginConfig)({
-                    envId,
-                    appId,
-                    appSecret,
-                    platform
-                });
-                log.success((0, i18n_1.t)('创建登录方式成功！'));
-            }
-            catch (e) {
-                if (e.code === 'ResourceInUse') {
-                    log.error((0, i18n_1.t)('登录方式已开启'));
+        ]);
+        let appId;
+        let appSecret;
+        if (platform === 'WECHAT-OPEN' || platform === 'WECHAT-PUBLIC') {
+            const input = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'appId',
+                    message: (0, i18n_1.t)('请输入 AppId：')
+                },
+                {
+                    type: 'input',
+                    name: 'appSecret',
+                    message: (0, i18n_1.t)('请输入 AppSecret：')
                 }
+            ]);
+            appId = input === null || input === void 0 ? void 0 : input.appId;
+            appSecret = input === null || input === void 0 ? void 0 : input.appSecret;
+            if (!appId || !appSecret) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('appId 和 appSecret 不能为空！'));
             }
-        });
+        }
+        if (platform === 'ANONYMOUS') {
+            appId = 'anonymous';
+            appSecret = 'anonymous';
+        }
+        try {
+            await (0, env_1.createLoginConfig)({
+                envId,
+                appId,
+                appSecret,
+                platform
+            });
+            log.success((0, i18n_1.t)('创建登录方式成功！'));
+        }
+        catch (e) {
+            if (e.code === 'ResourceInUse') {
+                log.error((0, i18n_1.t)('登录方式已开启'));
+            }
+        }
     }
 };
 __decorate([
@@ -193,68 +180,66 @@ let UpdateLogin = class UpdateLogin extends common_1.Command {
             desc: (0, i18n_1.t)('更新环境登录方式配置')
         };
     }
-    execute(envId, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const configList = yield (0, env_1.getLoginConfigList)({
-                envId
-            });
-            const configChoices = configList.map((item) => ({
-                name: `${platformMap[item.Platform]}：${item.PlatformId} [${item.Status === 'ENABLE' ? (0, i18n_1.t)('启用') : (0, i18n_1.t)('禁用')}]`,
-                value: item,
-                short: `${platformMap[item.Platform]}：${item.PlatformId}`
-            }));
-            const { config, status } = yield inquirer_1.default.prompt([
-                {
-                    type: 'list',
-                    name: 'config',
-                    choices: configChoices,
-                    message: (0, i18n_1.t)('请选择需要配置的条目：')
-                },
-                {
-                    type: 'list',
-                    name: 'status',
-                    choices: [
-                        {
-                            name: (0, i18n_1.t)('启用'),
-                            value: 'ENABLE'
-                        },
-                        {
-                            name: (0, i18n_1.t)('禁用'),
-                            value: 'DISABLE'
-                        }
-                    ],
-                    message: (0, i18n_1.t)('请选择登录方式状态：'),
-                    default: 'ENABLE'
-                }
-            ]);
-            const platform = config.Platform;
-            let appId;
-            let appSecret;
-            if (platform === 'WECHAT-OPEN' || platform === 'WECHAT-PUBLIC') {
-                const input = yield inquirer_1.default.prompt([
+    async execute(envId, log) {
+        const configList = await (0, env_1.getLoginConfigList)({
+            envId
+        });
+        const configChoices = configList.map((item) => ({
+            name: `${platformMap[item.Platform]}：${item.PlatformId} [${item.Status === 'ENABLE' ? (0, i18n_1.t)('启用') : (0, i18n_1.t)('禁用')}]`,
+            value: item,
+            short: `${platformMap[item.Platform]}：${item.PlatformId}`
+        }));
+        const { config, status } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'config',
+                choices: configChoices,
+                message: (0, i18n_1.t)('请选择需要配置的条目：')
+            },
+            {
+                type: 'list',
+                name: 'status',
+                choices: [
                     {
-                        type: 'input',
-                        name: 'appId',
-                        message: (0, i18n_1.t)('请输入 AppId（配置状态时可不填）：')
+                        name: (0, i18n_1.t)('启用'),
+                        value: 'ENABLE'
                     },
                     {
-                        type: 'input',
-                        name: 'appSecret',
-                        message: (0, i18n_1.t)('请输入 AppSecret（配置状态时可不填）：')
+                        name: (0, i18n_1.t)('禁用'),
+                        value: 'DISABLE'
                     }
-                ]);
-                appId = input === null || input === void 0 ? void 0 : input.appId;
-                appSecret = input === null || input === void 0 ? void 0 : input.appSecret;
+                ],
+                message: (0, i18n_1.t)('请选择登录方式状态：'),
+                default: 'ENABLE'
             }
-            yield (0, env_1.updateLoginConfig)({
-                envId,
-                configId: config.Id,
-                appId,
-                appSecret,
-                status
-            });
-            log.success((0, i18n_1.t)('更新登录方式成功！'));
+        ]);
+        const platform = config.Platform;
+        let appId;
+        let appSecret;
+        if (platform === 'WECHAT-OPEN' || platform === 'WECHAT-PUBLIC') {
+            const input = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'appId',
+                    message: (0, i18n_1.t)('请输入 AppId（配置状态时可不填）：')
+                },
+                {
+                    type: 'input',
+                    name: 'appSecret',
+                    message: (0, i18n_1.t)('请输入 AppSecret（配置状态时可不填）：')
+                }
+            ]);
+            appId = input === null || input === void 0 ? void 0 : input.appId;
+            appSecret = input === null || input === void 0 ? void 0 : input.appSecret;
+        }
+        await (0, env_1.updateLoginConfig)({
+            envId,
+            configId: config.Id,
+            appId,
+            appSecret,
+            status
         });
+        log.success((0, i18n_1.t)('更新登录方式成功！'));
     }
 };
 __decorate([

package/lib/commands/framework/index.js

@@ -34,15 +34,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.FrameworkRun = exports.FrameworkCompile = exports.FrameworkDeploy = void 0;
 const framework_core_1 = require("@cloudbase/framework-core");
@@ -51,30 +42,28 @@ const decorators_1 = require("../../decorators");
 const Hosting = __importStar(require("../../hosting"));
 const Function = __importStar(require("../../function"));
 const utils_1 = require("../../utils");
-function callFramework(ctx, command, module, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, config } = ctx;
-        const { bumpVersion, versionRemark } = ctx.options;
-        const loginState = yield utils_1.authSupevisor.getLoginState();
-        const { token, secretId, secretKey } = loginState;
-        yield (0, framework_core_1.run)({
-            projectPath: process.cwd(),
-            cloudbaseConfig: {
-                secretId,
-                secretKey,
-                token,
-                envId
-            },
-            config,
-            logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
-            resourceProviders: {
-                hosting: Hosting,
-                function: Function
-            },
-            bumpVersion: Boolean(bumpVersion),
-            versionRemark
-        }, command, module, params);
-    });
+async function callFramework(ctx, command, module, params) {
+    const { envId, config } = ctx;
+    const { bumpVersion, versionRemark } = ctx.options;
+    const loginState = await utils_1.authSupevisor.getLoginState();
+    const { token, secretId, secretKey } = loginState;
+    await (0, framework_core_1.run)({
+        projectPath: process.cwd(),
+        cloudbaseConfig: {
+            secretId,
+            secretKey,
+            token,
+            envId
+        },
+        config,
+        logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
+        resourceProviders: {
+            hosting: Hosting,
+            function: Function
+        },
+        bumpVersion: Boolean(bumpVersion),
+        versionRemark
+    }, command, module, params);
 }
 let FrameworkDeploy = class FrameworkDeploy extends common_1.Command {
     get options() {
@@ -92,11 +81,9 @@ let FrameworkDeploy = class FrameworkDeploy extends common_1.Command {
             desc: '云开发 Serverless 应用框架：部署全栈应用'
         };
     }
-    execute(ctx, logger, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [module] = params || [];
-            yield callFramework(ctx, 'deploy', module);
-        });
+    async execute(ctx, logger, params) {
+        const [module] = params || [];
+        await callFramework(ctx, 'deploy', module);
     }
 };
 __decorate([
@@ -133,11 +120,9 @@ let FrameworkCompile = class FrameworkCompile extends common_1.Command {
             desc: '云开发 Serverless 应用框架：编译应用描述文件'
         };
     }
-    execute(ctx, logger, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [module] = params || [];
-            yield callFramework(ctx, 'compile', module);
-        });
+    async execute(ctx, logger, params) {
+        const [module] = params || [];
+        await callFramework(ctx, 'compile', module);
     }
 };
 __decorate([
@@ -172,12 +157,10 @@ let FrameworkRun = class FrameworkRun extends common_1.Command {
             desc: '云开发 Serverless 应用框架：执行自定义命令'
         };
     }
-    execute(ctx, logger, params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [command] = params || [];
-            const { plugin } = options;
-            yield callFramework(ctx, 'run', plugin, { runCommandKey: command });
-        });
+    async execute(ctx, logger, params, options) {
+        const [command] = params || [];
+        const { plugin } = options;
+        await callFramework(ctx, 'run', plugin, { runCommandKey: command });
     }
 };
 __decorate([