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

package/lib/commands/common.js

@@ -1,13 +1,4 @@
 "use strict";
-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 };
 };
@@ -34,26 +25,24 @@ function ICommand(options = defaultCmdDecoratorOpts) {
     };
 }
 exports.ICommand = ICommand;
-function registerCommands() {
+async function registerCommands() {
     var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const args = (0, yargs_parser_1.default)(process.argv.slice(2));
-        const config = yield (0, utils_1.getCloudBaseConfig)(args.configFile);
-        const isPrivate = (0, utils_1.getPrivateSettings)(config, (_b = (_a = args === null || args === void 0 ? void 0 : args._) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toString());
-        registrableCommands.forEach(({ Command, decoratorOptions }) => {
-            if (isPrivate) {
-                if (decoratorOptions.supportPrivate) {
-                    const command = new Command();
-                    command.init();
-                }
+    const args = (0, yargs_parser_1.default)(process.argv.slice(2));
+    const config = await (0, utils_1.getCloudBaseConfig)(args.configFile);
+    const isPrivate = (0, utils_1.getPrivateSettings)(config, (_b = (_a = args === null || args === void 0 ? void 0 : args._) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toString());
+    registrableCommands.forEach(({ Command, decoratorOptions }) => {
+        if (isPrivate) {
+            if (decoratorOptions.supportPrivate) {
+                const command = new Command();
+                command.init();
             }
-            else {
-                if (decoratorOptions.supportPrivate !== 'only') {
-                    const command = new Command();
-                    command.init();
-                }
+        }
+        else {
+            if (decoratorOptions.supportPrivate !== 'only') {
+                const command = new Command();
+                command.init();
             }
-        });
+        }
     });
 }
 exports.registerCommands = registerCommands;
@@ -129,11 +118,11 @@ class Command extends events_1.EventEmitter {
             }
         });
         instance.description(desc);
-        instance.action((...args) => __awaiter(this, void 0, void 0, function* () {
+        instance.action(async (...args) => {
             const params = args.slice(0, -1);
             const cmdOptions = instance.opts();
             const parentOptions = commander_1.program.opts();
-            const config = yield (0, utils_1.getCloudBaseConfig)(parentOptions === null || parentOptions === void 0 ? void 0 : parentOptions.configFile);
+            const config = await (0, utils_1.getCloudBaseConfig)(parentOptions === null || parentOptions === void 0 ? void 0 : parentOptions.configFile);
             const envId = (cmdOptions === null || cmdOptions === void 0 ? void 0 : cmdOptions.envId) || (config === null || config === void 0 ? void 0 : config.envId);
             const privateSettings = (0, utils_1.getPrivateSettings)(config, cmd);
             let loginState;
@@ -141,12 +130,12 @@ class Command extends events_1.EventEmitter {
                 loginState = privateSettings.credential;
             }
             else {
-                loginState = (yield utils_1.authSupevisor.getLoginState());
+                loginState = (await utils_1.authSupevisor.getLoginState());
             }
             if (!withoutAuth && !loginState) {
                 if (autoRunLogin) {
                     console.log(chalk_1.default.bold.yellowBright((0, i18n_1.t)('无有效身份信息，将自动为您打开授权页面。')));
-                    const execResult = yield (0, toolbox_1.execWithLoading)(() => (0, auth_1.login)(), {
+                    const execResult = await (0, toolbox_1.execWithLoading)(() => (0, auth_1.login)(), {
                         startTip: (0, i18n_1.t)('请在浏览器中打开的授权页面进行授权...'),
                         successTip: (0, i18n_1.t)('授权登录成功！')
                     });
@@ -164,7 +153,7 @@ class Command extends events_1.EventEmitter {
                 envId: envId || (loginState === null || loginState === void 0 ? void 0 : loginState['envId'])
             });
             try {
-                yield report_1.beaconAction.report('tcb_cli_exec_command', {
+                await report_1.beaconAction.report('tcb_cli_exec_command', {
                     cmd,
                     childCmd,
                     desc
@@ -181,45 +170,41 @@ class Command extends events_1.EventEmitter {
                 hasPrivateSettings: Boolean(privateSettings)
             };
             this.emit('preHandle', ctx, args.slice(0, -1));
-            yield this.preHandle();
+            await this.preHandle();
             if (deprecate) {
                 console.log(chalk_1.default.bold.yellowBright('\n', (0, i18n_1.t)('⚠️  此命令将被废弃，请使用新的命令 tcb {{cmd}} 代替', { cmd: newCmd })), '\n');
             }
-            yield this.execute(ctx);
+            await this.execute(ctx);
             this.emit('afterHandle', ctx, args);
             this.afterHandle(ctx);
-        }));
-    }
-    preHandle() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const loading = (0, utils_1.loadingFactory)();
-            try {
-                loading.start((0, i18n_1.t)('数据加载中...'));
-                const res = yield (0, utils_1.getNotification)();
-                loading.stop();
-                if (!res)
-                    return;
-                const { title, content } = res;
-                console.log(chalk_1.default.bold.cyan(title));
-                console.log(content, '\n');
-            }
-            catch (e) {
-                loading.stop();
-            }
         });
     }
-    afterHandle(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const { cmd } = ctx;
-                const agree = yield utils_1.usageStore.get('agreeCollect');
-                if (!agree)
-                    return;
-                yield (0, utils_1.collectUsage)(cmd);
-            }
-            catch (e) {
-            }
-        });
+    async preHandle() {
+        const loading = (0, utils_1.loadingFactory)();
+        try {
+            loading.start((0, i18n_1.t)('数据加载中...'));
+            const res = await (0, utils_1.getNotification)();
+            loading.stop();
+            if (!res)
+                return;
+            const { title, content } = res;
+            console.log(chalk_1.default.bold.cyan(title));
+            console.log(content, '\n');
+        }
+        catch (e) {
+            loading.stop();
+        }
+    }
+    async afterHandle(ctx) {
+        try {
+            const { cmd } = ctx;
+            const agree = await utils_1.usageStore.get('agreeCollect');
+            if (!agree)
+                return;
+            await (0, utils_1.collectUsage)(cmd);
+        }
+        catch (e) {
+        }
     }
 }
 exports.Command = Command;

package/lib/commands/config/delete.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.ConfigDeleteCommand = void 0;
 const common_1 = require("../common");
@@ -38,24 +29,22 @@ let ConfigDeleteCommand = class ConfigDeleteCommand extends common_1.Command {
             withoutAuth: true
         };
     }
-    execute(params, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [key] = params;
-            if (!key) {
-                log.warn((0, i18n_1.t)('缺少必要的参数: key'));
-                return;
-            }
-            const conf = interface_1.CONFIGS[key];
-            if (!conf) {
-                log.warn((0, i18n_1.t)('未知的配置项: {{key}}', { key }));
-                return;
-            }
-            const value = yield config_1.configStore.get(key);
-            if (value !== undefined) {
-                yield config_1.configStore.delete(key);
-                log.log(key);
-            }
-        });
+    async execute(params, log) {
+        const [key] = params;
+        if (!key) {
+            log.warn((0, i18n_1.t)('缺少必要的参数: key'));
+            return;
+        }
+        const conf = interface_1.CONFIGS[key];
+        if (!conf) {
+            log.warn((0, i18n_1.t)('未知的配置项: {{key}}', { key }));
+            return;
+        }
+        const value = await config_1.configStore.get(key);
+        if (value !== undefined) {
+            await config_1.configStore.delete(key);
+            log.log(key);
+        }
     }
 };
 __decorate([

package/lib/commands/config/get.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.ConfigGetCommand = void 0;
 const common_1 = require("../common");
@@ -38,21 +29,19 @@ let ConfigGetCommand = class ConfigGetCommand extends common_1.Command {
             withoutAuth: true
         };
     }
-    execute(params, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [key] = params;
-            if (!key) {
-                log.warn((0, i18n_1.t)('缺少必要的参数: key'));
-                return;
-            }
-            const conf = interface_1.CONFIGS[key];
-            if (!conf) {
-                log.warn((0, i18n_1.t)('未知的配置项: {{key}}', { key }));
-                return;
-            }
-            const value = yield config_1.configStore.get(key);
-            log.log(value);
-        });
+    async execute(params, log) {
+        const [key] = params;
+        if (!key) {
+            log.warn((0, i18n_1.t)('缺少必要的参数: key'));
+            return;
+        }
+        const conf = interface_1.CONFIGS[key];
+        if (!conf) {
+            log.warn((0, i18n_1.t)('未知的配置项: {{key}}', { key }));
+            return;
+        }
+        const value = await config_1.configStore.get(key);
+        log.log(value);
     }
 };
 __decorate([

package/lib/commands/config/list.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.ConfigListCommand = void 0;
 const common_1 = require("../common");
@@ -38,25 +29,23 @@ let ConfigListCommand = class ConfigListCommand extends common_1.Command {
             withoutAuth: true
         };
     }
-    execute(log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            log.info((0, i18n_1.t)('可用配置:'));
-            for (const [key, conf] of Object.entries(interface_1.CONFIGS)) {
-                log.log(`${key}: ${conf.description}`);
-            }
-            log.breakLine();
-            const allConfigs = {};
-            for (const [key] of Object.entries(interface_1.CONFIGS)) {
-                const value = yield config_1.configStore.get(key);
-                if (value !== undefined) {
-                    allConfigs[key] = value;
-                }
-            }
-            log.info((0, i18n_1.t)('当前配置:'));
-            for (const [key, value] of Object.entries(allConfigs)) {
-                log.log(`${key}: ${value}`);
+    async execute(log) {
+        log.info((0, i18n_1.t)('可用配置:'));
+        for (const [key, conf] of Object.entries(interface_1.CONFIGS)) {
+            log.log(`${key}: ${conf.description}`);
+        }
+        log.breakLine();
+        const allConfigs = {};
+        for (const [key] of Object.entries(interface_1.CONFIGS)) {
+            const value = await config_1.configStore.get(key);
+            if (value !== undefined) {
+                allConfigs[key] = value;
             }
-        });
+        }
+        log.info((0, i18n_1.t)('当前配置:'));
+        for (const [key, value] of Object.entries(allConfigs)) {
+            log.log(`${key}: ${value}`);
+        }
     }
 };
 __decorate([

package/lib/commands/config/set.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.ConfigSetCommand = void 0;
 const common_1 = require("../common");
@@ -38,41 +29,39 @@ let ConfigSetCommand = class ConfigSetCommand extends common_1.Command {
             withoutAuth: true
         };
     }
-    execute(params, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [key, value] = params;
-            if (!key || !value) {
-                log.warn((0, i18n_1.t)('缺少必要的参数: key 或 value'));
-                return;
-            }
-            const conf = interface_1.CONFIGS[key];
-            if (!conf) {
-                log.warn((0, i18n_1.t)('未知的配置项: {{key}}', { key }));
-                return;
-            }
-            let parsedValue = value;
-            switch (conf.type) {
-                case 'number':
-                    parsedValue = Number(value);
-                    if (Number.isNaN(parsedValue)) {
-                        log.warn((0, i18n_1.t)('{{key}} 预期类型为 {{type}}', { key, type: conf.type }));
-                        return;
-                    }
-                    break;
-                case 'boolean':
-                    if (value === 'true')
-                        parsedValue = true;
-                    else if (value === 'false')
-                        parsedValue = false;
-                    else {
-                        log.warn((0, i18n_1.t)('{{key}} 预期类型为 {{type}}', { key, type: conf.type }));
-                        return;
-                    }
-                    break;
-            }
-            yield config_1.configStore.set(key, parsedValue);
-            log.log(parsedValue);
-        });
+    async execute(params, log) {
+        const [key, value] = params;
+        if (!key || !value) {
+            log.warn((0, i18n_1.t)('缺少必要的参数: key 或 value'));
+            return;
+        }
+        const conf = interface_1.CONFIGS[key];
+        if (!conf) {
+            log.warn((0, i18n_1.t)('未知的配置项: {{key}}', { key }));
+            return;
+        }
+        let parsedValue = value;
+        switch (conf.type) {
+            case 'number':
+                parsedValue = Number(value);
+                if (Number.isNaN(parsedValue)) {
+                    log.warn((0, i18n_1.t)('{{key}} 预期类型为 {{type}}', { key, type: conf.type }));
+                    return;
+                }
+                break;
+            case 'boolean':
+                if (value === 'true')
+                    parsedValue = true;
+                else if (value === 'false')
+                    parsedValue = false;
+                else {
+                    log.warn((0, i18n_1.t)('{{key}} 预期类型为 {{type}}', { key, type: conf.type }));
+                    return;
+                }
+                break;
+        }
+        await config_1.configStore.set(key, parsedValue);
+        log.log(parsedValue);
     }
 };
 __decorate([