@cloudbase/cli 2.10.0 → 2.11.0-beta.0

package/lib/function/base.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 };
 };
@@ -21,246 +12,227 @@ const vpc_1 = require("./vpc");
 const toolbox_1 = require("@cloudbase/toolbox");
 const i18n_1 = require("../i18n");
 const scfService = utils_1.CloudApiService.getInstance('scf');
-function getFunctionService(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const region = yield (0, toolbox_1.getRegion)();
-        const { secretId, secretKey, token } = yield (0, utils_1.checkAndGetCredential)(true);
-        const app = new manager_node_1.default({
-            region,
-            token,
-            envId,
-            secretId,
-            secretKey,
-            proxy: (0, utils_1.getProxy)()
-        });
-        return app.functions;
+async function getFunctionService(envId) {
+    const region = await (0, toolbox_1.getRegion)();
+    const { secretId, secretKey, token } = await (0, utils_1.checkAndGetCredential)(true);
+    const app = new manager_node_1.default({
+        region,
+        token,
+        envId,
+        secretId,
+        secretKey,
+        proxy: (0, utils_1.getProxy)()
     });
+    return app.functions;
 }
 exports.getFunctionService = getFunctionService;
-function listFunction(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { limit = 20, offset = 0, envId } = options;
-        const res = yield scfService.request('ListFunctions', {
-            Namespace: envId,
-            Limit: limit,
-            Offset: offset
-        });
-        const { Functions = [] } = res;
-        const data = [];
-        Functions.forEach(func => {
-            const { FunctionId, FunctionName, Runtime, AddTime, ModTime, Status } = func;
-            data.push({
-                FunctionId,
-                FunctionName,
-                Runtime,
-                AddTime,
-                ModTime,
-                Status
-            });
+async function listFunction(options) {
+    const { limit = 20, offset = 0, envId } = options;
+    const res = await scfService.request('ListFunctions', {
+        Namespace: envId,
+        Limit: limit,
+        Offset: offset
+    });
+    const { Functions = [] } = res;
+    const data = [];
+    Functions.forEach(func => {
+        const { FunctionId, FunctionName, Runtime, AddTime, ModTime, Status } = func;
+        data.push({
+            FunctionId,
+            FunctionName,
+            Runtime,
+            AddTime,
+            ModTime,
+            Status
         });
-        return data;
     });
+    return data;
 }
 exports.listFunction = listFunction;
-function listAllFunctions(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const allFunctions = [];
-        let currentOffset = 0;
-        const pageSize = 20;
-        const { envId } = options;
-        while (true) {
-            try {
-                const res = yield scfService.request('ListFunctions', {
-                    Namespace: envId,
-                    Limit: pageSize,
-                    Offset: currentOffset
-                });
-                const { Functions = [], TotalCount } = res;
-                if (Functions.length === 0) {
-                    break;
-                }
-                allFunctions.push(...Functions);
-                if (allFunctions.length >= TotalCount || Functions.length < pageSize) {
-                    break;
-                }
-                currentOffset += pageSize;
+async function listAllFunctions(options) {
+    const allFunctions = [];
+    let currentOffset = 0;
+    const pageSize = 20;
+    const { envId } = options;
+    while (true) {
+        try {
+            const res = await scfService.request('ListFunctions', {
+                Namespace: envId,
+                Limit: pageSize,
+                Offset: currentOffset
+            });
+            const { Functions = [], TotalCount } = res;
+            if (Functions.length === 0) {
+                break;
             }
-            catch (error) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('获取函数列表失败: {{error}}', { error: error.message }));
+            allFunctions.push(...Functions);
+            if (allFunctions.length >= TotalCount || Functions.length < pageSize) {
+                break;
             }
+            currentOffset += pageSize;
         }
-        const data = [];
-        allFunctions.forEach(func => {
-            const { FunctionId, FunctionName, Runtime, AddTime, ModTime, Status } = func;
-            data.push({
-                FunctionId,
-                FunctionName,
-                Runtime,
-                AddTime,
-                ModTime,
-                Status
-            });
+        catch (error) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('获取函数列表失败: {{error}}', { error: error.message }));
+        }
+    }
+    const data = [];
+    allFunctions.forEach(func => {
+        const { FunctionId, FunctionName, Runtime, AddTime, ModTime, Status } = func;
+        data.push({
+            FunctionId,
+            FunctionName,
+            Runtime,
+            AddTime,
+            ModTime,
+            Status
         });
-        return data;
     });
+    return data;
 }
 exports.listAllFunctions = listAllFunctions;
-function getFunctionDetail(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functionName, envId, codeSecret } = options;
-        const res = yield scfService.request('GetFunction', {
-            FunctionName: functionName,
-            Namespace: envId,
-            ShowCode: 'TRUE',
-            CodeSecret: codeSecret
-        });
-        const data = res;
-        const { VpcId = '', SubnetId = '' } = data.VpcConfig || {};
-        if (VpcId && SubnetId) {
-            try {
-                const vpcs = yield (0, vpc_1.getVpcs)();
-                const subnets = yield (0, vpc_1.getSubnets)(VpcId);
-                const vpc = vpcs.find(item => item.VpcId === VpcId);
-                const subnet = subnets.find(item => item.SubnetId === SubnetId);
-                data.VpcConfig = {
-                    vpc,
-                    subnet
-                };
-            }
-            catch (e) {
-                data.VpcConfig = {
-                    vpc: VpcId,
-                    subnet: SubnetId
-                };
-            }
-        }
-        return data;
+async function getFunctionDetail(options) {
+    const { functionName, envId, codeSecret } = options;
+    const res = await scfService.request('GetFunction', {
+        FunctionName: functionName,
+        Namespace: envId,
+        ShowCode: 'TRUE',
+        CodeSecret: codeSecret
     });
+    const data = res;
+    const { VpcId = '', SubnetId = '' } = data.VpcConfig || {};
+    if (VpcId && SubnetId) {
+        try {
+            const vpcs = await (0, vpc_1.getVpcs)();
+            const subnets = await (0, vpc_1.getSubnets)(VpcId);
+            const vpc = vpcs.find(item => item.VpcId === VpcId);
+            const subnet = subnets.find(item => item.SubnetId === SubnetId);
+            data.VpcConfig = {
+                vpc,
+                subnet
+            };
+        }
+        catch (e) {
+            data.VpcConfig = {
+                vpc: VpcId,
+                subnet: SubnetId
+            };
+        }
+    }
+    return data;
 }
 exports.getFunctionDetail = getFunctionDetail;
-function batchGetFunctionsDetail({ names, envId, codeSecret }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const data = [];
-        const promises = names.map(name => (() => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const info = yield getFunctionDetail({
-                    envId,
-                    codeSecret,
-                    functionName: name
-                });
-                data.push(info);
-            }
-            catch (e) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('{{name}} 获取信息失败：{{error}}', { name, error: e.message }));
-            }
-        }))());
-        yield Promise.all(promises);
-        return data;
-    });
+async function batchGetFunctionsDetail({ names, envId, codeSecret }) {
+    const data = [];
+    const promises = names.map(name => (async () => {
+        try {
+            const info = await getFunctionDetail({
+                envId,
+                codeSecret,
+                functionName: name
+            });
+            data.push(info);
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('{{name}} 获取信息失败：{{error}}', { name, error: e.message }));
+        }
+    })());
+    await Promise.all(promises);
+    return data;
 }
 exports.batchGetFunctionsDetail = batchGetFunctionsDetail;
-function getFunctionLog(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId } = options;
-        const params = {
-            Namespace: envId
-        };
-        Object.keys(options).forEach(key => {
-            if (key === 'envId')
-                return;
-            const keyFirstCharUpperCase = key.charAt(0).toUpperCase() + key.slice(1);
-            params[keyFirstCharUpperCase] = options[key];
-        });
-        const { Data = [] } = yield scfService.request('GetFunctionLogs', params);
-        return Data;
+async function getFunctionLog(options) {
+    const { envId } = options;
+    const params = {
+        Namespace: envId
+    };
+    Object.keys(options).forEach(key => {
+        if (key === 'envId')
+            return;
+        const keyFirstCharUpperCase = key.charAt(0).toUpperCase() + key.slice(1);
+        params[keyFirstCharUpperCase] = options[key];
     });
+    const { Data = [] } = await scfService.request('GetFunctionLogs', params);
+    return Data;
 }
 exports.getFunctionLog = getFunctionLog;
-function updateFunctionConfig(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functionName, config, envId } = options;
-        const functionService = yield getFunctionService(envId);
-        yield functionService.updateFunctionConfig(Object.assign({ name: functionName }, config));
+async function updateFunctionConfig(options) {
+    const { functionName, config, envId } = options;
+    const functionService = await getFunctionService(envId);
+    await functionService.updateFunctionConfig({
+        name: functionName,
+        ...config
     });
 }
 exports.updateFunctionConfig = updateFunctionConfig;
-function batchUpdateFunctionConfig(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functions, envId, log } = options;
-        const promises = functions.map(func => (() => __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield updateFunctionConfig({
-                    functionName: func.name,
-                    config: func,
-                    envId
-                });
-                log && (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 更新云函数配置成功！', { name: func.name }));
-            }
-            catch (e) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('{{name}} 更新配置失败：{{error}}', { name: func.name, error: e.message }));
-            }
-        }))());
-        yield Promise.all(promises);
-    });
-}
-exports.batchUpdateFunctionConfig = batchUpdateFunctionConfig;
-function invokeFunction(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functionName, envId, params = {} } = options;
-        const _params = {
-            FunctionName: functionName,
-            Namespace: envId,
-            ClientContext: JSON.stringify(params),
-            LogType: 'Tail'
-        };
+async function batchUpdateFunctionConfig(options) {
+    const { functions, envId, log } = options;
+    const promises = functions.map(func => (async () => {
         try {
-            const { Result } = yield scfService.request('Invoke', _params);
-            return Result;
+            await updateFunctionConfig({
+                functionName: func.name,
+                config: func,
+                envId
+            });
+            log && (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 更新云函数配置成功！', { name: func.name }));
         }
         catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 调用失败：\n{{error}}', { name: functionName, error: e.message }));
+            throw new error_1.CloudBaseError((0, i18n_1.t)('{{name}} 更新配置失败：{{error}}', { name: func.name, error: e.message }));
         }
-    });
+    })());
+    await Promise.all(promises);
+}
+exports.batchUpdateFunctionConfig = batchUpdateFunctionConfig;
+async function invokeFunction(options) {
+    const { functionName, envId, params = {} } = options;
+    const _params = {
+        FunctionName: functionName,
+        Namespace: envId,
+        ClientContext: JSON.stringify(params),
+        LogType: 'Tail'
+    };
+    try {
+        const { Result } = await scfService.request('Invoke', _params);
+        return Result;
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 调用失败：\n{{error}}', { name: functionName, error: e.message }));
+    }
 }
 exports.invokeFunction = invokeFunction;
-function batchInvokeFunctions(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functions, envId, log = false } = options;
-        const promises = functions.map(func => (() => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const result = yield invokeFunction({
-                    functionName: func.name,
-                    params: func.params,
-                    envId
-                });
-                if (log) {
-                    (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 调用成功\n响应结果：\n', { name: func.name }));
-                    console.log(result);
-                }
-                return result;
-            }
-            catch (e) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('{{name}} 函数调用失败：{{error}}', { name: func.name, error: e.message }));
+async function batchInvokeFunctions(options) {
+    const { functions, envId, log = false } = options;
+    const promises = functions.map(func => (async () => {
+        try {
+            const result = await invokeFunction({
+                functionName: func.name,
+                params: func.params,
+                envId
+            });
+            if (log) {
+                (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 调用成功\n响应结果：\n', { name: func.name }));
+                console.log(result);
             }
-        }))());
-        return Promise.all(promises);
-    });
+            return result;
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('{{name}} 函数调用失败：{{error}}', { name: func.name, error: e.message }));
+        }
+    })());
+    return Promise.all(promises);
 }
 exports.batchInvokeFunctions = batchInvokeFunctions;
-function copyFunction(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, newFunctionName, targetEnvId, force, codeSecret } = options;
-        if (!envId || !functionName || !newFunctionName) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('参数缺失'));
-        }
-        yield scfService.request('CopyFunction', {
-            FunctionName: functionName,
-            NewFunctionName: newFunctionName,
-            Namespace: envId,
-            TargetNamespace: targetEnvId || envId,
-            Override: force ? true : false,
-            CodeSecret: codeSecret
-        });
+async function copyFunction(options) {
+    const { envId, functionName, newFunctionName, targetEnvId, force, codeSecret } = options;
+    if (!envId || !functionName || !newFunctionName) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('参数缺失'));
+    }
+    await scfService.request('CopyFunction', {
+        FunctionName: functionName,
+        NewFunctionName: newFunctionName,
+        Namespace: envId,
+        TargetNamespace: targetEnvId || envId,
+        Override: force ? true : false,
+        CodeSecret: codeSecret
     });
 }
 exports.copyFunction = copyFunction;

package/lib/function/code.js

@@ -1,28 +1,17 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadFunctionCode = void 0;
 const utils_1 = require("../utils");
 const common_1 = require("../utils/tools/common");
 const scfService = utils_1.CloudApiService.getInstance('scf');
-function downloadFunctionCode(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { destPath, envId, functionName, codeSecret } = options;
-        (0, utils_1.checkFullAccess)(destPath, true);
-        const { Url } = yield scfService.request('GetFunctionAddress', {
-            FunctionName: functionName,
-            Namespace: envId,
-            CodeSecret: codeSecret
-        });
-        return (0, common_1.downloadAndExtractRemoteZip)(Url, destPath);
+async function downloadFunctionCode(options) {
+    const { destPath, envId, functionName, codeSecret } = options;
+    (0, utils_1.checkFullAccess)(destPath, true);
+    const { Url } = await scfService.request('GetFunctionAddress', {
+        FunctionName: functionName,
+        Namespace: envId,
+        CodeSecret: codeSecret
     });
+    return (0, common_1.downloadAndExtractRemoteZip)(Url, destPath);
 }
 exports.downloadFunctionCode = downloadFunctionCode;

package/lib/function/concurrency.js

@@ -1,70 +1,55 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteProvisionedConcurrencyConfig = exports.getProvisionedConcurrencyConfig = exports.setProvisionedConcurrencyConfig = void 0;
 const error_1 = require("../error");
 const base_1 = require("./base");
 const i18n_1 = require("../i18n");
-function setProvisionedConcurrencyConfig(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, qualifier, versionProvisionedConcurrencyNum } = options;
-        const scfService = yield (0, base_1.getFunctionService)(envId);
-        try {
-            yield scfService.setProvisionedConcurrencyConfig({
-                functionName,
-                qualifier,
-                versionProvisionedConcurrencyNum
-            });
-        }
-        catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 设置函数预置并发失败： {{error}}', { name: functionName, error: e.message }), {
-                code: e.code
-            });
-        }
-    });
+async function setProvisionedConcurrencyConfig(options) {
+    const { envId, functionName, qualifier, versionProvisionedConcurrencyNum } = options;
+    const scfService = await (0, base_1.getFunctionService)(envId);
+    try {
+        await scfService.setProvisionedConcurrencyConfig({
+            functionName,
+            qualifier,
+            versionProvisionedConcurrencyNum
+        });
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 设置函数预置并发失败： {{error}}', { name: functionName, error: e.message }), {
+            code: e.code
+        });
+    }
 }
 exports.setProvisionedConcurrencyConfig = setProvisionedConcurrencyConfig;
-function getProvisionedConcurrencyConfig(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, qualifier } = options;
-        const scfService = yield (0, base_1.getFunctionService)(envId);
-        try {
-            return scfService.getProvisionedConcurrencyConfig({
-                functionName,
-                qualifier,
-            });
-        }
-        catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 查看函数预置并发信息失败： {{error}}', { name: functionName, error: e.message }), {
-                code: e.code
-            });
-        }
-    });
+async function getProvisionedConcurrencyConfig(options) {
+    const { envId, functionName, qualifier } = options;
+    const scfService = await (0, base_1.getFunctionService)(envId);
+    try {
+        return scfService.getProvisionedConcurrencyConfig({
+            functionName,
+            qualifier,
+        });
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 查看函数预置并发信息失败： {{error}}', { name: functionName, error: e.message }), {
+            code: e.code
+        });
+    }
 }
 exports.getProvisionedConcurrencyConfig = getProvisionedConcurrencyConfig;
-function deleteProvisionedConcurrencyConfig(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, qualifier } = options;
-        const scfService = yield (0, base_1.getFunctionService)(envId);
-        try {
-            yield scfService.deleteProvisionedConcurrencyConfig({
-                functionName,
-                qualifier
-            });
-        }
-        catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 删除函数预置并发失败： {{error}}', { name: functionName, error: e.message }), {
-                code: e.code
-            });
-        }
-    });
+async function deleteProvisionedConcurrencyConfig(options) {
+    const { envId, functionName, qualifier } = options;
+    const scfService = await (0, base_1.getFunctionService)(envId);
+    try {
+        await scfService.deleteProvisionedConcurrencyConfig({
+            functionName,
+            qualifier
+        });
+    }
+    catch (e) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 删除函数预置并发失败： {{error}}', { name: functionName, error: e.message }), {
+            code: e.code
+        });
+    }
 }
 exports.deleteProvisionedConcurrencyConfig = deleteProvisionedConcurrencyConfig;