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

package/lib/commands/functions/run.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 };
 };
@@ -61,7 +52,10 @@ function spawnNodeProcess(args, options) {
         cwd: path_1.default.dirname(bootstrapFilePath),
         windowsHide: true
     };
-    const exec = (0, child_process_1.spawn)('node', args, Object.assign(Object.assign({}, commonOptions), options));
+    const exec = (0, child_process_1.spawn)('node', args, {
+        ...commonOptions,
+        ...options
+    });
     exec.on('error', (e) => {
         console.log((0, i18n_1.t)('进程执行异常：{{message}}', { message: e.message }));
         setTimeout(() => { }, 100);
@@ -78,110 +72,120 @@ function spawnNodeProcess(args, options) {
         }
     });
 }
-function getSecret() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const credential = yield (0, utils_1.checkAndGetCredential)();
-        if (lodash_1.default.isEmpty(credential)) {
-            console.log((0, i18n_1.t)('未登录，无法直接调用 Node SDK'));
-            return {};
-        }
-        const { secretId, secretKey, token } = credential;
-        return {
-            TENCENTCLOUD_SECRETID: secretId,
-            TENCENTCLOUD_SECRETKEY: secretKey,
-            TENCENTCLOUD_SESSIONTOKEN: token
-        };
-    });
+async function getSecret() {
+    const credential = await (0, utils_1.checkAndGetCredential)();
+    if (lodash_1.default.isEmpty(credential)) {
+        console.log((0, i18n_1.t)('未登录，无法直接调用 Node SDK'));
+        return {};
+    }
+    const { secretId, secretKey, token } = credential;
+    return {
+        TENCENTCLOUD_SECRETID: secretId,
+        TENCENTCLOUD_SECRETKEY: secretKey,
+        TENCENTCLOUD_SESSIONTOKEN: token
+    };
 }
-function debugFunctionByPath(functionPath, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { params, debug, port } = options;
-        params && checkJSON(params);
-        const filePath = path_1.default.resolve(functionPath);
-        (0, utils_1.checkFullAccess)(filePath);
-        let debugDirname;
-        const isDir = (0, utils_1.isDirectory)(filePath);
-        if (isDir) {
-            const exists = (0, utils_1.checkFullAccess)(path_1.default.join(filePath, 'index.js'));
-            if (!exists) {
-                errorLog((0, i18n_1.t)('index.js 文件不存在！'), debug);
-            }
-            debugDirname = filePath;
+async function debugFunctionByPath(functionPath, options) {
+    const { params, debug, port } = options;
+    params && checkJSON(params);
+    const filePath = path_1.default.resolve(functionPath);
+    (0, utils_1.checkFullAccess)(filePath);
+    let debugDirname;
+    const isDir = (0, utils_1.isDirectory)(filePath);
+    if (isDir) {
+        const exists = (0, utils_1.checkFullAccess)(path_1.default.join(filePath, 'index.js'));
+        if (!exists) {
+            errorLog((0, i18n_1.t)('index.js 文件不存在！'), debug);
         }
-        else {
-            const { base, dir } = path_1.default.parse(filePath);
-            if (base !== 'index.js') {
-                errorLog((0, i18n_1.t)('index.js 文件不存在！'), debug);
-            }
-            debugDirname = dir;
+        debugDirname = filePath;
+    }
+    else {
+        const { base, dir } = path_1.default.parse(filePath);
+        if (base !== 'index.js') {
+            errorLog((0, i18n_1.t)('index.js 文件不存在！'), debug);
         }
-        try {
-            const fileExports = require(path_1.default.join(debugDirname, 'index.js'));
-            if (!fileExports.main) {
-                errorLog((0, i18n_1.t)('main 方法不存在！'), debug);
-            }
+        debugDirname = dir;
+    }
+    try {
+        const fileExports = require(path_1.default.join(debugDirname, 'index.js'));
+        if (!fileExports.main) {
+            errorLog((0, i18n_1.t)('main 方法不存在！'), debug);
         }
-        catch (e) {
-            errorLog((0, i18n_1.t)('导入云函数异常：{{message}}', { message: e.message }), debug);
+    }
+    catch (e) {
+        errorLog((0, i18n_1.t)('导入云函数异常：{{message}}', { message: e.message }), debug);
+    }
+    const secret = await getSecret();
+    const debugArgs = getDebugArgs(port);
+    const args = debug ? [...debugArgs, bootstrapFilePath] : [bootstrapFilePath];
+    console.log((0, i18n_1.t)('> 以默认配置启动 Node 云函数调试'));
+    spawnNodeProcess(args, {
+        env: {
+            ...process.env,
+            SCF_FUNCTION_HANDLER: 'index.main',
+            SCF_FUNCTION_NAME: 'main',
+            GLOBAL_USER_FILE_PATH: path_1.default.join(debugDirname, path_1.default.sep),
+            SCF_EVENT_BODY: params || '{}',
+            ...secret
         }
-        const secret = yield getSecret();
-        const debugArgs = getDebugArgs(port);
-        const args = debug ? [...debugArgs, bootstrapFilePath] : [bootstrapFilePath];
-        console.log((0, i18n_1.t)('> 以默认配置启动 Node 云函数调试'));
-        spawnNodeProcess(args, {
-            env: Object.assign(Object.assign(Object.assign({}, process.env), { SCF_FUNCTION_HANDLER: 'index.main', SCF_FUNCTION_NAME: 'main', GLOBAL_USER_FILE_PATH: path_1.default.join(debugDirname, path_1.default.sep), SCF_EVENT_BODY: params || '{}' }), secret)
-        });
     });
 }
 exports.debugFunctionByPath = debugFunctionByPath;
-function debugByConfig(ctx, name) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, options, envId } = ctx;
-        const { params, debug, port } = options;
-        params && checkJSON(params);
-        let functionPath = path_1.default.resolve(config.functionRoot, name);
-        const filePath = path_1.default.resolve(functionPath);
-        (0, utils_1.checkFullAccess)(filePath, !debug);
-        let debugDirname;
-        const funcConfig = config.functions.find((item) => item.name === name);
-        const handlers = ((funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.handler) || 'index.main').split('.');
-        const indexFileName = handlers[0];
-        const indexFile = `${indexFileName}.js`;
-        const mainFunction = handlers[1];
-        const isDir = (0, utils_1.isDirectory)(filePath);
-        if (isDir) {
-            const exists = (0, utils_1.checkFullAccess)(path_1.default.join(filePath, indexFile));
-            if (!exists) {
-                errorLog((0, i18n_1.t)('{{indexFile}} 文件不存在！', { indexFile }), debug);
-            }
-            debugDirname = filePath;
+async function debugByConfig(ctx, name) {
+    const { config, options, envId } = ctx;
+    const { params, debug, port } = options;
+    params && checkJSON(params);
+    let functionPath = path_1.default.resolve(config.functionRoot, name);
+    const filePath = path_1.default.resolve(functionPath);
+    (0, utils_1.checkFullAccess)(filePath, !debug);
+    let debugDirname;
+    const funcConfig = config.functions.find((item) => item.name === name);
+    const handlers = ((funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.handler) || 'index.main').split('.');
+    const indexFileName = handlers[0];
+    const indexFile = `${indexFileName}.js`;
+    const mainFunction = handlers[1];
+    const isDir = (0, utils_1.isDirectory)(filePath);
+    if (isDir) {
+        const exists = (0, utils_1.checkFullAccess)(path_1.default.join(filePath, indexFile));
+        if (!exists) {
+            errorLog((0, i18n_1.t)('{{indexFile}} 文件不存在！', { indexFile }), debug);
         }
-        else {
-            const { base, dir } = path_1.default.parse(filePath);
-            if (base !== indexFile) {
-                errorLog((0, i18n_1.t)('{{indexFile}} 文件不存在！', { indexFile }), debug);
-            }
-            debugDirname = dir;
+        debugDirname = filePath;
+    }
+    else {
+        const { base, dir } = path_1.default.parse(filePath);
+        if (base !== indexFile) {
+            errorLog((0, i18n_1.t)('{{indexFile}} 文件不存在！', { indexFile }), debug);
         }
-        try {
-            const finalPath = path_1.default.join(debugDirname, indexFile);
-            const requirePath = process.platform === 'win32'
-                ? finalPath.replace(/\\/g, '\\\\')
-                : finalPath;
-            const fileExports = require(requirePath);
-            if (!fileExports[mainFunction]) {
-                errorLog((0, i18n_1.t)('handler 中的 {{mainFunction}} 方法不存在，请检查你的配置！', { mainFunction }), debug);
-            }
+        debugDirname = dir;
+    }
+    try {
+        const finalPath = path_1.default.join(debugDirname, indexFile);
+        const requirePath = process.platform === 'win32'
+            ? finalPath.replace(/\\/g, '\\\\')
+            : finalPath;
+        const fileExports = require(requirePath);
+        if (!fileExports[mainFunction]) {
+            errorLog((0, i18n_1.t)('handler 中的 {{mainFunction}} 方法不存在，请检查你的配置！', { mainFunction }), debug);
         }
-        catch (e) {
-            errorLog((0, i18n_1.t)('导入云函数异常:{{message}}', { message: e.message }), debug);
+    }
+    catch (e) {
+        errorLog((0, i18n_1.t)('导入云函数异常:{{message}}', { message: e.message }), debug);
+    }
+    const secret = await getSecret();
+    const debugArgs = getDebugArgs(port);
+    const args = debug ? [...debugArgs, bootstrapFilePath] : [bootstrapFilePath];
+    spawnNodeProcess(args, {
+        env: {
+            ...process.env,
+            SCF_NAMESPACE: envId,
+            SCF_FUNCTION_HANDLER: (funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.handler) || 'index.main',
+            SCF_FUNCTION_NAME: (funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.name) || 'main',
+            GLOBAL_USER_FILE_PATH: path_1.default.join(debugDirname, path_1.default.sep),
+            SCF_EVENT_BODY: params || JSON.stringify((funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.params) || {}),
+            ...funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.envVariables,
+            ...secret
         }
-        const secret = yield getSecret();
-        const debugArgs = getDebugArgs(port);
-        const args = debug ? [...debugArgs, bootstrapFilePath] : [bootstrapFilePath];
-        spawnNodeProcess(args, {
-            env: Object.assign(Object.assign(Object.assign(Object.assign({}, process.env), { SCF_NAMESPACE: envId, SCF_FUNCTION_HANDLER: (funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.handler) || 'index.main', SCF_FUNCTION_NAME: (funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.name) || 'main', GLOBAL_USER_FILE_PATH: path_1.default.join(debugDirname, path_1.default.sep), SCF_EVENT_BODY: params || JSON.stringify((funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.params) || {}) }), funcConfig === null || funcConfig === void 0 ? void 0 : funcConfig.envVariables), secret)
-        });
     });
 }
 exports.debugByConfig = debugByConfig;
@@ -216,20 +220,18 @@ let FunctionDebug = class FunctionDebug extends common_1.Command {
             desc: (0, i18n_1.t)('本地运行云函数（当前仅支持 Node）')
         };
     }
-    execute(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { options } = ctx;
-            const { path, name } = options;
-            if (path) {
-                yield debugFunctionByPath(path, options);
-            }
-            else if (typeof name === 'string') {
-                yield debugByConfig(ctx, name);
-            }
-            else {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定运行函数的名称或函数的路径\n\n例如 cloudbase functions:run --name app'));
-            }
-        });
+    async execute(ctx) {
+        const { options } = ctx;
+        const { path, name } = options;
+        if (path) {
+            await debugFunctionByPath(path, options);
+        }
+        else if (typeof name === 'string') {
+            await debugByConfig(ctx, name);
+        }
+        else {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请指定运行函数的名称或函数的路径\n\n例如 cloudbase functions:run --name app'));
+        }
     }
 };
 __decorate([

package/lib/commands/functions/trigger-create.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 };
 };
@@ -48,41 +39,39 @@ let CreateTrigger = class CreateTrigger extends common_1.Command {
             desc: (0, i18n_1.t)('创建云函数触发器')
         };
     }
-    execute(ctx, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { envId, config: { functions } } = ctx;
-            const name = params === null || params === void 0 ? void 0 : params[0];
-            const functionService = yield (0, function_1.getFunctionService)(envId);
-            let isBatchCreateTrigger = false;
-            if (!name) {
-                const { isBatch } = yield inquirer_1.default.prompt({
-                    type: 'confirm',
-                    name: 'isBatch',
-                    message: (0, i18n_1.t)('无云函数名称，是否需要部署配置文件中的【全部云函数】的全部触发器？'),
-                    default: false
-                });
-                isBatchCreateTrigger = isBatch;
-                if (!isBatchCreateTrigger) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称！'));
-                }
-            }
-            if (isBatchCreateTrigger) {
-                return functionService.batchCreateTriggers({
-                    envId,
-                    functions
-                });
-            }
-            const functionItem = functions.find((item) => item.name === name);
-            if (!functionItem) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('未找到相关函数配置，请检查函数名是否正确'));
-            }
-            const { triggers } = functionItem;
-            if (!triggers || !triggers.length) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('触发器配置不能为空'));
+    async execute(ctx, params) {
+        const { envId, config: { functions } } = ctx;
+        const name = params === null || params === void 0 ? void 0 : params[0];
+        const functionService = await (0, function_1.getFunctionService)(envId);
+        let isBatchCreateTrigger = false;
+        if (!name) {
+            const { isBatch } = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'isBatch',
+                message: (0, i18n_1.t)('无云函数名称，是否需要部署配置文件中的【全部云函数】的全部触发器？'),
+                default: false
+            });
+            isBatchCreateTrigger = isBatch;
+            if (!isBatchCreateTrigger) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称！'));
             }
-            yield functionService.createFunctionTriggers(name, triggers);
-            (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 创建云函数触发器成功！', { name }));
-        });
+        }
+        if (isBatchCreateTrigger) {
+            return functionService.batchCreateTriggers({
+                envId,
+                functions
+            });
+        }
+        const functionItem = functions.find((item) => item.name === name);
+        if (!functionItem) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('未找到相关函数配置，请检查函数名是否正确'));
+        }
+        const { triggers } = functionItem;
+        if (!triggers || !triggers.length) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('触发器配置不能为空'));
+        }
+        await functionService.createFunctionTriggers(name, triggers);
+        (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 创建云函数触发器成功！', { name }));
     }
 };
 __decorate([

package/lib/commands/functions/trigger-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,64 +38,62 @@ let DeleteTrigger = class DeleteTrigger extends common_1.Command {
             desc: (0, i18n_1.t)('删除云函数触发器')
         };
     }
-    execute(ctx, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { envId, config: { functions } } = ctx;
-            const name = params === null || params === void 0 ? void 0 : params[0];
-            const triggerName = params === null || params === void 0 ? void 0 : params[1];
-            const functionService = yield (0, function_1.getFunctionService)(envId);
-            let isBatchDeleteTriggers;
-            let isBatchDeleteFunctionTriggers = false;
-            if (!name) {
-                const answer = yield inquirer_1.default.prompt({
+    async execute(ctx, params) {
+        const { envId, config: { functions } } = ctx;
+        const name = params === null || params === void 0 ? void 0 : params[0];
+        const triggerName = params === null || params === void 0 ? void 0 : params[1];
+        const functionService = await (0, function_1.getFunctionService)(envId);
+        let isBatchDeleteTriggers;
+        let isBatchDeleteFunctionTriggers = 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
-                    });
-                    isBatchDeleteTriggers = reConfirm;
-                }
-                if (!isBatchDeleteTriggers) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称以及触发器名称！'));
-                }
-            }
-            if (isBatchDeleteTriggers) {
-                return functionService.batchDeleteTriggers({
-                    envId,
-                    functions
-                });
+                isBatchDeleteTriggers = reConfirm;
             }
-            if (!triggerName && name) {
-                const { isBatch } = yield inquirer_1.default.prompt({
-                    type: 'confirm',
-                    name: 'isBatch',
-                    message: (0, i18n_1.t)('没有指定触发器名称，是否需要此云函数的全部触发器？'),
-                    default: false
-                });
-                isBatchDeleteFunctionTriggers = isBatch;
-                if (!isBatchDeleteFunctionTriggers) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称以及触发器名称！'));
-                }
-            }
-            if (isBatchDeleteFunctionTriggers) {
-                const func = functions.find((item) => item.name === name);
-                return functionService.batchDeleteTriggers({
-                    envId,
-                    functions: [func]
-                });
+            if (!isBatchDeleteTriggers) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称以及触发器名称！'));
             }
-            if (!triggerName) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('触发器名称不能为空'));
+        }
+        if (isBatchDeleteTriggers) {
+            return functionService.batchDeleteTriggers({
+                envId,
+                functions
+            });
+        }
+        if (!triggerName && name) {
+            const { isBatch } = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'isBatch',
+                message: (0, i18n_1.t)('没有指定触发器名称，是否需要此云函数的全部触发器？'),
+                default: false
+            });
+            isBatchDeleteFunctionTriggers = isBatch;
+            if (!isBatchDeleteFunctionTriggers) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定云函数名称以及触发器名称！'));
             }
-            yield functionService.deleteFunctionTrigger(name, triggerName);
-        });
+        }
+        if (isBatchDeleteFunctionTriggers) {
+            const func = functions.find((item) => item.name === name);
+            return functionService.batchDeleteTriggers({
+                envId,
+                functions: [func]
+            });
+        }
+        if (!triggerName) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('触发器名称不能为空'));
+        }
+        await functionService.deleteFunctionTrigger(name, triggerName);
     }
 };
 __decorate([

package/lib/commands/functions/version/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.ListFunctionVersion = void 0;
 const common_1 = require("../../common");
@@ -48,38 +39,36 @@ let ListFunctionVersion = class ListFunctionVersion extends common_1.Command {
             desc: (0, i18n_1.t)('展示函数版本列表')
         };
     }
-    execute(ctx, params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const name = params === null || params === void 0 ? void 0 : params[0];
-            let { limit = 20, offset = 0 } = options;
-            limit = Number(limit);
-            offset = Number(offset);
-            if (!Number.isInteger(limit) || !Number.isInteger(offset)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为整数'));
-            }
-            if (limit < 0 || offset < 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为大于 0 的整数'));
-            }
-            const { envId } = ctx;
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('拉取函数 [{{name}}] 版本列表中...', { name }));
-            const res = yield (0, function_1.listFunctionVersions)({
-                envId,
-                functionName: name,
-                offset,
-                limit
-            });
-            loading.stop();
-            const head = [(0, i18n_1.t)('版本'), (0, i18n_1.t)('描述'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('修改时间'), (0, i18n_1.t)('状态')];
-            const tableData = res.Versions.map((item) => [
-                item.Version,
-                item.Description,
-                item.AddTime,
-                item.ModTime,
-                constant_1.StatusMap[item.Status]
-            ]);
-            (0, utils_1.printHorizontalTable)(head, tableData);
+    async execute(ctx, params, options) {
+        const name = params === null || params === void 0 ? void 0 : params[0];
+        let { limit = 20, offset = 0 } = options;
+        limit = Number(limit);
+        offset = Number(offset);
+        if (!Number.isInteger(limit) || !Number.isInteger(offset)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为整数'));
+        }
+        if (limit < 0 || offset < 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为大于 0 的整数'));
+        }
+        const { envId } = ctx;
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('拉取函数 [{{name}}] 版本列表中...', { name }));
+        const res = await (0, function_1.listFunctionVersions)({
+            envId,
+            functionName: name,
+            offset,
+            limit
         });
+        loading.stop();
+        const head = [(0, i18n_1.t)('版本'), (0, i18n_1.t)('描述'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('修改时间'), (0, i18n_1.t)('状态')];
+        const tableData = res.Versions.map((item) => [
+            item.Version,
+            item.Description,
+            item.AddTime,
+            item.ModTime,
+            constant_1.StatusMap[item.Status]
+        ]);
+        (0, utils_1.printHorizontalTable)(head, tableData);
     }
 };
 __decorate([

package/lib/commands/functions/version/publish.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.PublishFunctionVersion = void 0;
 const common_1 = require("../../common");
@@ -41,20 +32,18 @@ let PublishFunctionVersion = class PublishFunctionVersion extends common_1.Comma
             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 description = params === null || params === void 0 ? void 0 : params[1];
-            const { envId } = ctx;
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('发布函数 [{{name}}] 新版本中...', { name }));
-            yield (0, function_1.publishVersion)({
-                envId,
-                functionName: name,
-                description
-            });
-            loading.succeed((0, i18n_1.t)('发布函数 [{{name}}] 新版本成功！', { name }));
+    async execute(ctx, params) {
+        const name = params === null || params === void 0 ? void 0 : params[0];
+        const description = params === null || params === void 0 ? void 0 : params[1];
+        const { envId } = ctx;
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('发布函数 [{{name}}] 新版本中...', { name }));
+        await (0, function_1.publishVersion)({
+            envId,
+            functionName: name,
+            description
         });
+        loading.succeed((0, i18n_1.t)('发布函数 [{{name}}] 新版本成功！', { name }));
     }
 };
 __decorate([