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

package/lib/commands/functions/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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -47,45 +38,43 @@ let DeleteFunction = class DeleteFunction extends common_1.Command {
             desc: (0, i18n_1.t)('删除云函数')
         };
     }
-    execute(ctx, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const name = params === null || params === void 0 ? void 0 : params[0];
-            const { envId, config: { functions } } = ctx;
-            const functionService = yield (0, function_1.getFunctionService)(envId);
-            let isBatchDelete = false;
-            if (!name) {
-                const answer = yield inquirer_1.default.prompt({
+    async execute(ctx, params) {
+        const name = params === null || params === void 0 ? void 0 : params[0];
+        const { envId, config: { functions } } = ctx;
+        const functionService = await (0, function_1.getFunctionService)(envId);
+        let isBatchDelete = false;
+        if (!name) {
+            const answer = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'isBatch',
+                message: (0, i18n_1.t)('无云函数名称，是否需要删除配置文件中的全部云函数？'),
+                default: false
+            });
+            if (answer.isBatch) {
+                const { reConfirm } = await inquirer_1.default.prompt({
                     type: 'confirm',
-                    name: 'isBatch',
-                    message: (0, i18n_1.t)('无云函数名称，是否需要删除配置文件中的全部云函数？'),
+                    name: 'reConfirm',
+                    message: (0, i18n_1.t)('确定要删除配置文件中的全部云函数？'),
                     default: false
                 });
-                if (answer.isBatch) {
-                    const { reConfirm } = yield inquirer_1.default.prompt({
-                        type: 'confirm',
-                        name: 'reConfirm',
-                        message: (0, i18n_1.t)('确定要删除配置文件中的全部云函数？'),
-                        default: false
-                    });
-                    isBatchDelete = reConfirm;
-                }
-                if (!isBatchDelete) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('请指定需要删除的云函数名称！'));
-                }
+                isBatchDelete = reConfirm;
             }
-            if (isBatchDelete) {
-                const names = functions.map((item) => item.name);
-                return functionService.batchDeleteFunctions({
-                    names
-                });
+            if (!isBatchDelete) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定需要删除的云函数名称！'));
             }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('删除函数 [{{name}}] 中...', { name }));
-            yield functionService.deleteFunction({
-                name
+        }
+        if (isBatchDelete) {
+            const names = functions.map((item) => item.name);
+            return functionService.batchDeleteFunctions({
+                names
             });
-            loading.succeed((0, i18n_1.t)('删除函数 [{{name}}] 成功！', { name }));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('删除函数 [{{name}}] 中...', { name }));
+        await functionService.deleteFunction({
+            name
         });
+        loading.succeed((0, i18n_1.t)('删除函数 [{{name}}] 成功！', { name }));
     }
 };
 __decorate([

package/lib/commands/functions/deploy.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 };
 };
@@ -77,236 +68,227 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
             desc: (0, i18n_1.t)('部署云函数')
         };
     }
-    execute(ctx, params, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { envId, config, options } = ctx;
-            const { functions } = config;
-            const { force, codeSecret, path: access, all, dir } = options;
-            const functionRootPath = path_1.default.join(process.cwd(), config.functionRoot);
-            const name = params === null || params === void 0 ? void 0 : params[0];
-            if (access && (0, utils_1.checkFullAccess)(access)) {
-                log.warn((0, i18n_1.t)('--path 参数已更换为HTTP 访问服务路径，请使用 --dir 指定部署函数的文件夹路径'));
-            }
-            if (access && access[0] !== '/') {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('HTTP 访问服务路径必须以 / 开头'));
-            }
-            if ((!name && !dir) || all) {
-                return this.deployAllFunction({
-                    all,
-                    envId,
-                    force,
-                    access,
-                    functions,
-                    codeSecret,
-                    functionRootPath
-                });
-            }
-            if (dir) {
-                (0, utils_1.checkFullAccess)(dir, true);
-                if (!(0, utils_1.isDirectory)(dir)) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
-                }
-            }
-            let newFunction;
-            if (functions && functions.length > 0) {
-                newFunction = functions.find((item) => item.name === name);
+    async execute(ctx, params, log) {
+        const { envId, config, options } = ctx;
+        const { functions } = config;
+        const { force, codeSecret, path: access, all, dir } = options;
+        const functionRootPath = path_1.default.join(process.cwd(), config.functionRoot);
+        const name = params === null || params === void 0 ? void 0 : params[0];
+        if (access && (0, utils_1.checkFullAccess)(access)) {
+            log.warn((0, i18n_1.t)('--path 参数已更换为HTTP 访问服务路径，请使用 --dir 指定部署函数的文件夹路径'));
+        }
+        if (access && access[0] !== '/') {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('HTTP 访问服务路径必须以 / 开头'));
+        }
+        if ((!name && !dir) || all) {
+            return this.deployAllFunction({
+                all,
+                envId,
+                force,
+                access,
+                functions,
+                codeSecret,
+                functionRootPath
+            });
+        }
+        if (dir) {
+            (0, utils_1.checkFullAccess)(dir, true);
+            if (!(0, utils_1.isDirectory)(dir)) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
             }
-            if (!newFunction || !newFunction.name) {
-                log.info((0, i18n_1.t)('未找到函数发布配置，使用默认配置 => 运行时：Nodejs10.15/在线安装依赖'));
-                newFunction = Object.assign({ name }, constant_1.DefaultFunctionDeployConfig);
+        }
+        let newFunction;
+        if (functions && functions.length > 0) {
+            newFunction = functions.find((item) => item.name === name);
+        }
+        if (!newFunction || !newFunction.name) {
+            log.info((0, i18n_1.t)('未找到函数发布配置，使用默认配置 => 运行时：Nodejs10.15/在线安装依赖'));
+            newFunction = {
+                name,
+                ...constant_1.DefaultFunctionDeployConfig
+            };
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('云函数部署中...'));
+        try {
+            await (0, function_1.createFunction)({
+                force,
+                envId,
+                codeSecret,
+                functionRootPath,
+                func: newFunction,
+                accessPath: access,
+                functionPath: dir
+            });
+            loading.succeed((0, i18n_1.t)('[{{name}}] 云函数部署成功！', { name: newFunction.name }));
+            this.printSuccessTips(envId);
+        }
+        catch (e) {
+            loading.stop();
+            await this.handleDeployFail(e, {
+                envId,
+                codeSecret,
+                functionRootPath,
+                func: newFunction,
+                accessPath: access,
+                functionPath: dir
+            });
+        }
+        if (access || newFunction.path) {
+            const link = (0, utils_1.genClickableLink)(`https://${envId}.service.tcloudbase.com${access || newFunction.path}`);
+            console.log((0, i18n_1.t)('\n云函数HTTP 访问服务访问链接：{{link}}', { link }));
+        }
+    }
+    async deployAllFunction(options) {
+        const { functions = [], envId, force, codeSecret, functionRootPath, all, access } = options;
+        if (!all) {
+            const { isBatch } = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'isBatch',
+                message: (0, i18n_1.t)('没有指定需要部署的云函数，是否部署配置文件中的全部云函数？'),
+                default: false
+            });
+            if (!isBatch) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定需要部署的云函数的名称或通过 --path 参数指定需要部署的函数的路径！'));
             }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('云函数部署中...'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        const tasks = functions.map((func) => async () => {
+            loading.start((0, i18n_1.t)('云函数部署中'));
             try {
-                yield (0, function_1.createFunction)({
-                    force,
+                await (0, function_1.createFunction)({
+                    func,
                     envId,
+                    force,
                     codeSecret,
                     functionRootPath,
-                    func: newFunction,
-                    accessPath: access,
-                    functionPath: dir
+                    accessPath: access
                 });
-                loading.succeed((0, i18n_1.t)('[{{name}}] 云函数部署成功！', { name: newFunction.name }));
-                this.printSuccessTips(envId);
+                loading.succeed((0, i18n_1.t)('[{{name}}] 云函数部署成功', { name: func.name }));
             }
             catch (e) {
                 loading.stop();
-                yield this.handleDeployFail(e, {
+                await this.handleDeployFail(e, {
+                    func,
                     envId,
                     codeSecret,
                     functionRootPath,
-                    func: newFunction,
-                    accessPath: access,
-                    functionPath: dir
+                    accessPath: access
                 });
             }
-            if (access || newFunction.path) {
-                const link = (0, utils_1.genClickableLink)(`https://${envId}.service.tcloudbase.com${access || newFunction.path}`);
-                console.log((0, i18n_1.t)('\n云函数HTTP 访问服务访问链接：{{link}}', { link }));
-            }
         });
+        if (tasks.length > 5) {
+            utils_1.logger.info((0, i18n_1.t)('函数数量较多，将使用队列部署'));
+        }
+        const asyncTaskController = new utils_1.AsyncTaskParallelController(5, 50);
+        asyncTaskController.loadTasks(tasks);
+        const results = await asyncTaskController.run();
+        const success = results.filter((_) => !_);
+        utils_1.logger.success((0, i18n_1.t)('成功部署 {{count}} 个函数', { count: success === null || success === void 0 ? void 0 : success.length }));
+        const err = results.filter((_) => _);
+        (err === null || err === void 0 ? void 0 : err.length) && utils_1.logger.error((0, i18n_1.t)('{{count}} 个云函数部署失败', { count: err === null || err === void 0 ? void 0 : err.length }));
     }
-    deployAllFunction(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { functions = [], envId, force, codeSecret, functionRootPath, all, access } = options;
-            if (!all) {
-                const { isBatch } = yield inquirer_1.default.prompt({
-                    type: 'confirm',
-                    name: 'isBatch',
-                    message: (0, i18n_1.t)('没有指定需要部署的云函数，是否部署配置文件中的全部云函数？'),
-                    default: false
-                });
-                if (!isBatch) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('请指定需要部署的云函数的名称或通过 --path 参数指定需要部署的函数的路径！'));
-                }
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            const tasks = functions.map((func) => () => __awaiter(this, void 0, void 0, function* () {
-                loading.start((0, i18n_1.t)('云函数部署中'));
+    async handleDeployFail(e, options) {
+        const { envId, codeSecret, functionRootPath, func, functionPath, accessPath } = options;
+        const loading = (0, utils_1.loadingFactory)();
+        if (e.code === 'ResourceInUse.FunctionName' || e.code === 'ResourceInUse.Function') {
+            const { force } = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'force',
+                message: (0, i18n_1.t)('存在同名云函数：[{{name}}]，是否覆盖原函数代码与配置', { name: func.name }),
+                default: false
+            });
+            const { triggers } = func;
+            if (force) {
+                loading.start((0, i18n_1.t)('云函数更新部署中...'));
                 try {
-                    yield (0, function_1.createFunction)({
+                    await (0, function_2.updateFunctionCode)({
                         func,
                         envId,
-                        force,
                         codeSecret,
-                        functionRootPath,
-                        accessPath: access
+                        functionRootPath
+                    });
+                    await this.waitForFunctionReady(envId, func.name, loading);
+                    loading.succeed((0, i18n_1.t)('[{{name}}] 云函数配置更新中...', { name: func.name }));
+                    await (0, function_2.updateFunctionConfig)({
+                        envId,
+                        functionName: func.name,
+                        config: func
                     });
-                    loading.succeed((0, i18n_1.t)('[{{name}}] 云函数部署成功', { name: func.name }));
+                    loading.succeed((0, i18n_1.t)('[{{name}}] 云函数更新成功！', { name: func.name }));
+                    await this.printSuccessTips(envId);
                 }
                 catch (e) {
                     loading.stop();
-                    yield this.handleDeployFail(e, {
-                        func,
-                        envId,
-                        codeSecret,
-                        functionRootPath,
-                        accessPath: access
-                    });
+                    throw e;
                 }
-            }));
-            if (tasks.length > 5) {
-                utils_1.logger.info((0, i18n_1.t)('函数数量较多，将使用队列部署'));
+                return;
             }
-            const asyncTaskController = new utils_1.AsyncTaskParallelController(5, 50);
-            asyncTaskController.loadTasks(tasks);
-            const results = yield asyncTaskController.run();
-            const success = results.filter((_) => !_);
-            utils_1.logger.success((0, i18n_1.t)('成功部署 {{count}} 个函数', { count: success === null || success === void 0 ? void 0 : success.length }));
-            const err = results.filter((_) => _);
-            (err === null || err === void 0 ? void 0 : err.length) && utils_1.logger.error((0, i18n_1.t)('{{count}} 个云函数部署失败', { count: err === null || err === void 0 ? void 0 : err.length }));
-        });
+        }
+        throw e;
     }
-    handleDeployFail(e, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { envId, codeSecret, functionRootPath, func, functionPath, accessPath } = options;
-            const loading = (0, utils_1.loadingFactory)();
-            if (e.code === 'ResourceInUse.FunctionName' || e.code === 'ResourceInUse.Function') {
-                const { force } = yield inquirer_1.default.prompt({
-                    type: 'confirm',
-                    name: 'force',
-                    message: (0, i18n_1.t)('存在同名云函数：[{{name}}]，是否覆盖原函数代码与配置', { name: func.name }),
-                    default: false
-                });
-                const { triggers } = func;
-                if (force) {
-                    loading.start((0, i18n_1.t)('云函数更新部署中...'));
-                    try {
-                        yield (0, function_2.updateFunctionCode)({
-                            func,
-                            envId,
-                            codeSecret,
-                            functionRootPath
-                        });
-                        yield this.waitForFunctionReady(envId, func.name, loading);
-                        loading.succeed((0, i18n_1.t)('[{{name}}] 云函数配置更新中...', { name: func.name }));
-                        yield (0, function_2.updateFunctionConfig)({
-                            envId,
-                            functionName: func.name,
-                            config: func
-                        });
-                        loading.succeed((0, i18n_1.t)('[{{name}}] 云函数更新成功！', { name: func.name }));
-                        yield this.printSuccessTips(envId);
+    async waitForFunctionReady(envId, functionName, loading, timeoutMinutes = 5) {
+        const scfService = await (0, function_2.getFunctionService)(envId);
+        const timeoutMs = timeoutMinutes * 60 * 1000;
+        return new Promise((resolve, reject) => {
+            let intervalId = null;
+            const timeoutId = setTimeout(() => {
+                clearInterval(intervalId);
+                reject(new error_1.CloudBaseError((0, i18n_1.t)('[{{functionName}}] 等待函数更新超时，已等待 {{timeoutMinutes}} 分钟', { functionName, timeoutMinutes })));
+            }, timeoutMs);
+            intervalId = setInterval(async () => {
+                try {
+                    const functionInfo = await scfService.getFunctionDetail(functionName);
+                    if ((functionInfo === null || functionInfo === void 0 ? void 0 : functionInfo.Status) === 'Active') {
+                        clearTimeout(timeoutId);
+                        clearInterval(intervalId);
+                        loading.succeed((0, i18n_1.t)('[{{functionName}}] 云函数代码已更新！', { functionName }));
+                        resolve();
                     }
-                    catch (e) {
-                        loading.stop();
-                        throw e;
+                    else {
+                        loading.text = (0, i18n_1.t)('正在更新[{{functionName}}] 云函数代码... 当前状态: {{status}}', { functionName, status: (functionInfo === null || functionInfo === void 0 ? void 0 : functionInfo.Status) || (0, i18n_1.t)('未知') });
                     }
-                    return;
                 }
-            }
-            throw e;
-        });
-    }
-    waitForFunctionReady(envId, functionName, loading, timeoutMinutes = 5) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const scfService = yield (0, function_2.getFunctionService)(envId);
-            const timeoutMs = timeoutMinutes * 60 * 1000;
-            return new Promise((resolve, reject) => {
-                let intervalId = null;
-                const timeoutId = setTimeout(() => {
-                    clearInterval(intervalId);
-                    reject(new error_1.CloudBaseError((0, i18n_1.t)('[{{functionName}}] 等待函数更新超时，已等待 {{timeoutMinutes}} 分钟', { functionName, timeoutMinutes })));
-                }, timeoutMs);
-                intervalId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const functionInfo = yield scfService.getFunctionDetail(functionName);
-                        if ((functionInfo === null || functionInfo === void 0 ? void 0 : functionInfo.Status) === 'Active') {
-                            clearTimeout(timeoutId);
-                            clearInterval(intervalId);
-                            loading.succeed((0, i18n_1.t)('[{{functionName}}] 云函数代码已更新！', { functionName }));
-                            resolve();
-                        }
-                        else {
-                            loading.text = (0, i18n_1.t)('正在更新[{{functionName}}] 云函数代码... 当前状态: {{status}}', { functionName, status: (functionInfo === null || functionInfo === void 0 ? void 0 : functionInfo.Status) || (0, i18n_1.t)('未知') });
-                        }
-                    }
-                    catch (error) {
-                        loading.text = (0, i18n_1.t)('获取[{{functionName}}] 云函数状态失败，重试中...', { functionName });
-                    }
-                }), 2000);
-            });
+                catch (error) {
+                    loading.text = (0, i18n_1.t)('获取[{{functionName}}] 云函数状态失败，重试中...', { functionName });
+                }
+            }, 2000);
         });
     }
-    printSuccessTips(envId, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let url = `${utils_1.EUrl.TcbConsole}/scf?envId=${envId}`;
-            const region = yield (0, toolbox_1.getRegion)();
-            url += `&rid=${regionIdMap[region]}`;
-            const link = (0, utils_1.genClickableLink)(url);
-            log.breakLine();
-            log.info((0, i18n_1.t)('控制台查看函数详情或创建HTTP 访问服务链接 🔗：{{link}}', { link }));
-            log.info((0, i18n_1.t)('使用 {{command}} 命令查看已部署云函数', { command: (0, utils_1.highlightCommand)('cloudbase functions:list') }));
-        });
+    async printSuccessTips(envId, log) {
+        let url = `${utils_1.EUrl.TcbConsole}/scf?envId=${envId}`;
+        const region = await (0, toolbox_1.getRegion)();
+        url += `&rid=${regionIdMap[region]}`;
+        const link = (0, utils_1.genClickableLink)(url);
+        log.breakLine();
+        log.info((0, i18n_1.t)('控制台查看函数详情或创建HTTP 访问服务链接 🔗：{{link}}', { link }));
+        log.info((0, i18n_1.t)('使用 {{command}} 命令查看已部署云函数', { command: (0, utils_1.highlightCommand)('cloudbase functions:list') }));
     }
-    genApiGateway(envId, name) {
+    async genApiGateway(envId, name) {
         var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const loading = (0, utils_1.loadingFactory)();
-            const res = yield (0, gateway_1.queryGateway)({
+        const loading = (0, utils_1.loadingFactory)();
+        const res = await (0, gateway_1.queryGateway)({
+            name,
+            envId
+        });
+        if ((res === null || res === void 0 ? void 0 : res.EnableService) === false)
+            return;
+        loading.start((0, i18n_1.t)('生成云函数HTTP 访问服务中...'));
+        let path;
+        if (((_a = res === null || res === void 0 ? void 0 : res.APISet) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            path = (_b = res.APISet[0]) === null || _b === void 0 ? void 0 : _b.Path;
+        }
+        else {
+            path = `/${(0, utils_1.random)(12)}`;
+            await (0, gateway_1.createGateway)({
+                envId,
                 name,
-                envId
+                path
             });
-            if ((res === null || res === void 0 ? void 0 : res.EnableService) === false)
-                return;
-            loading.start((0, i18n_1.t)('生成云函数HTTP 访问服务中...'));
-            let path;
-            if (((_a = res === null || res === void 0 ? void 0 : res.APISet) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                path = (_b = res.APISet[0]) === null || _b === void 0 ? void 0 : _b.Path;
-            }
-            else {
-                path = `/${(0, utils_1.random)(12)}`;
-                yield (0, gateway_1.createGateway)({
-                    envId,
-                    name,
-                    path
-                });
-            }
-            loading.stop();
-            const link = (0, utils_1.genClickableLink)(`https://${envId}.service.tcloudbase.com${path}`);
-            console.log((0, i18n_1.t)('\n云函数HTTP 访问服务链接：{{link}}', { link }));
-        });
+        }
+        loading.stop();
+        const link = (0, utils_1.genClickableLink)(`https://${envId}.service.tcloudbase.com${path}`);
+        console.log((0, i18n_1.t)('\n云函数HTTP 访问服务链接：{{link}}', { link }));
     }
 };
 __decorate([

package/lib/commands/functions/detail.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 };
 };
@@ -58,32 +49,30 @@ let FunctionDetail = class FunctionDetail extends common_1.Command {
             desc: (0, i18n_1.t)('获取云函数信息')
         };
     }
-    execute(ctx, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { envId, options } = ctx;
-            const { codeSecret } = options;
-            const name = params === null || params === void 0 ? void 0 : params[0];
-            if (!name) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称！'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('获取函数信息中...'));
-            const functionService = yield (0, function_1.getFunctionService)(envId);
-            try {
-                const data = yield functionService.getFunctionDetail(name, codeSecret);
-                loading.stop();
-                this.logDetail(data, name);
-            }
-            catch (e) {
-                if (e.code === 'ResourceNotFound.FunctionName') {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 函数不存在', { name }));
-                }
-                throw e;
-            }
-            finally {
-                loading.stop();
+    async execute(ctx, params) {
+        const { envId, options } = ctx;
+        const { codeSecret } = options;
+        const name = params === null || params === void 0 ? void 0 : params[0];
+        if (!name) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称！'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('获取函数信息中...'));
+        const functionService = await (0, function_1.getFunctionService)(envId);
+        try {
+            const data = await functionService.getFunctionDetail(name, codeSecret);
+            loading.stop();
+            this.logDetail(data, name);
+        }
+        catch (e) {
+            if (e.code === 'ResourceNotFound.FunctionName') {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 函数不存在', { name }));
             }
-        });
+            throw e;
+        }
+        finally {
+            loading.stop();
+        }
     }
     logDetail(info, name, log) {
         const ResMap = {