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

package/lib/function/create.js

@@ -1,72 +1,62 @@
 "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.batchCreateFunctions = exports.createFunction = void 0;
 const utils_1 = require("../utils");
 const error_1 = require("../error");
 const base_1 = require("./base");
 const i18n_1 = require("../i18n");
-function createFunction(options) {
+async function createFunction(options) {
     var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, accessPath, codeSecret, force = false, functionPath, base64Code = '', functionRootPath = '' } = options;
-        const func = Object.assign(Object.assign({}, (_a = options === null || options === void 0 ? void 0 : options.func) === null || _a === void 0 ? void 0 : _a.config), options.func);
-        accessPath && (func.path = accessPath);
-        const funcName = func.name;
-        const scfService = yield (0, base_1.getFunctionService)(envId);
-        func.isWaitInstall = true;
+    const { envId, accessPath, codeSecret, force = false, functionPath, base64Code = '', functionRootPath = '' } = options;
+    const func = {
+        ...(_a = options === null || options === void 0 ? void 0 : options.func) === null || _a === void 0 ? void 0 : _a.config,
+        ...options.func
+    };
+    accessPath && (func.path = accessPath);
+    const funcName = func.name;
+    const scfService = await (0, base_1.getFunctionService)(envId);
+    func.isWaitInstall = true;
+    try {
+        await scfService.createFunction({
+            func,
+            force,
+            base64Code,
+            codeSecret,
+            functionPath,
+            functionRootPath
+        });
+    }
+    catch (e) {
+        if (e.message && !force) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 部署失败，{{error}}', { name: funcName, error: e.message }), {
+                code: e.code,
+                original: e
+            });
+        }
+        throw e;
+    }
+}
+exports.createFunction = createFunction;
+async function batchCreateFunctions(options) {
+    const { functions, functionRootPath = '', envId, force, codeSecret, log = false } = options;
+    const promises = functions.map((func) => (async () => {
+        const loading = (0, utils_1.loadingFactory)();
         try {
-            yield scfService.createFunction({
+            log && loading.start((0, i18n_1.t)('[{{name}}] 函数部署中...', { name: func.name }));
+            await createFunction({
                 func,
+                envId,
                 force,
-                base64Code,
                 codeSecret,
-                functionPath,
                 functionRootPath
             });
+            log && loading.succeed((0, i18n_1.t)('[{{name}}] 函数部署成功', { name: func.name }));
         }
         catch (e) {
-            if (e.message && !force) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 部署失败，{{error}}', { name: funcName, error: e.message }), {
-                    code: e.code,
-                    original: e
-                });
-            }
-            throw e;
+            log && loading.fail((0, i18n_1.t)('[{{name}}] 函数部署失败', { name: func.name }));
+            throw new error_1.CloudBaseError(e.message);
         }
-    });
-}
-exports.createFunction = createFunction;
-function batchCreateFunctions(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { functions, functionRootPath = '', envId, force, codeSecret, log = false } = options;
-        const promises = functions.map((func) => (() => __awaiter(this, void 0, void 0, function* () {
-            const loading = (0, utils_1.loadingFactory)();
-            try {
-                log && loading.start((0, i18n_1.t)('[{{name}}] 函数部署中...', { name: func.name }));
-                yield createFunction({
-                    func,
-                    envId,
-                    force,
-                    codeSecret,
-                    functionRootPath
-                });
-                log && loading.succeed((0, i18n_1.t)('[{{name}}] 函数部署成功', { name: func.name }));
-            }
-            catch (e) {
-                log && loading.fail((0, i18n_1.t)('[{{name}}] 函数部署失败', { name: func.name }));
-                throw new error_1.CloudBaseError(e.message);
-            }
-        }))());
-        yield Promise.all(promises);
-    });
+    })());
+    await Promise.all(promises);
 }
 exports.batchCreateFunctions = batchCreateFunctions;

package/lib/function/delete.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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.batchDeleteFunctions = exports.deleteFunction = void 0;
 const logger_1 = require("../logger");
@@ -16,38 +7,34 @@ const utils_1 = require("../utils");
 const gateway_1 = require("../gateway");
 const i18n_1 = require("../i18n");
 const scfService = utils_1.CloudApiService.getInstance('scf');
-function deleteFunction({ functionName, envId }) {
+async function deleteFunction({ functionName, envId }) {
     var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const res = yield (0, gateway_1.queryGateway)({
+    const res = await (0, gateway_1.queryGateway)({
+        envId,
+        name: functionName
+    });
+    if (((_a = res === null || res === void 0 ? void 0 : res.APISet) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+        await (0, gateway_1.deleteGateway)({
             envId,
             name: functionName
         });
-        if (((_a = res === null || res === void 0 ? void 0 : res.APISet) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            yield (0, gateway_1.deleteGateway)({
-                envId,
-                name: functionName
-            });
-        }
-        yield scfService.request('DeleteFunction', {
-            FunctionName: functionName,
-            Namespace: envId
-        });
+    }
+    await scfService.request('DeleteFunction', {
+        FunctionName: functionName,
+        Namespace: envId
     });
 }
 exports.deleteFunction = deleteFunction;
-function batchDeleteFunctions({ names, envId }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const promises = names.map(name => (() => __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield deleteFunction({ functionName: name, envId });
-                (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 函数删除成功！', { name }));
-            }
-            catch (e) {
-                throw new error_1.CloudBaseError(e.message);
-            }
-        }))());
-        yield Promise.all(promises);
-    });
+async function batchDeleteFunctions({ names, envId }) {
+    const promises = names.map(name => (async () => {
+        try {
+            await deleteFunction({ functionName: name, envId });
+            (0, logger_1.successLog)((0, i18n_1.t)('[{{name}}] 函数删除成功！', { name }));
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError(e.message);
+        }
+    })());
+    await Promise.all(promises);
 }
 exports.batchDeleteFunctions = batchDeleteFunctions;

package/lib/function/layer/attach.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 };
 };
@@ -19,45 +10,41 @@ const error_1 = require("../../error");
 const i18n_1 = require("../../i18n");
 const __1 = require("../");
 const scfService = new utils_1.CloudApiService('scf');
-function attachLayer(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, layerName, layerVersion, codeSecret } = options;
-        const functionService = yield (0, __1.getFunctionService)(envId);
-        let { Layers } = yield functionService.getFunctionDetail(functionName, codeSecret);
-        Layers = Layers.map(item => lodash_1.default.pick(item, ['LayerName', 'LayerVersion']));
-        Layers.push({
-            LayerName: layerName,
-            LayerVersion: layerVersion
-        });
-        const res = yield scfService.request('UpdateFunctionConfiguration', {
-            Layers,
-            Namespace: envId,
-            FunctionName: functionName
-        });
-        return res;
+async function attachLayer(options) {
+    const { envId, functionName, layerName, layerVersion, codeSecret } = options;
+    const functionService = await (0, __1.getFunctionService)(envId);
+    let { Layers } = await functionService.getFunctionDetail(functionName, codeSecret);
+    Layers = Layers.map(item => lodash_1.default.pick(item, ['LayerName', 'LayerVersion']));
+    Layers.push({
+        LayerName: layerName,
+        LayerVersion: layerVersion
     });
+    const res = await scfService.request('UpdateFunctionConfiguration', {
+        Layers,
+        Namespace: envId,
+        FunctionName: functionName
+    });
+    return res;
 }
 exports.attachLayer = attachLayer;
-function unAttachLayer(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, layerName, layerVersion, codeSecret } = options;
-        const functionService = yield (0, __1.getFunctionService)(envId);
-        let { Layers } = yield functionService.getFunctionDetail(functionName, codeSecret);
-        Layers = Layers.map(item => lodash_1.default.pick(item, ['LayerName', 'LayerVersion']));
-        const index = Layers.findIndex(item => item.LayerName === layerName && item.LayerVersion === layerVersion);
-        if (index === -1) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('层不存在'));
-        }
-        Layers.splice(index, 1);
-        const apiParams = {
-            Namespace: envId,
-            FunctionName: functionName,
-            Layers: Layers.length > 0 ? Layers : [{
-                    LayerName: '',
-                    LayerVersion: 0
-                }]
-        };
-        return scfService.request('UpdateFunctionConfiguration', apiParams);
-    });
+async function unAttachLayer(options) {
+    const { envId, functionName, layerName, layerVersion, codeSecret } = options;
+    const functionService = await (0, __1.getFunctionService)(envId);
+    let { Layers } = await functionService.getFunctionDetail(functionName, codeSecret);
+    Layers = Layers.map(item => lodash_1.default.pick(item, ['LayerName', 'LayerVersion']));
+    const index = Layers.findIndex(item => item.LayerName === layerName && item.LayerVersion === layerVersion);
+    if (index === -1) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('层不存在'));
+    }
+    Layers.splice(index, 1);
+    const apiParams = {
+        Namespace: envId,
+        FunctionName: functionName,
+        Layers: Layers.length > 0 ? Layers : [{
+                LayerName: '',
+                LayerVersion: 0
+            }]
+    };
+    return scfService.request('UpdateFunctionConfiguration', apiParams);
 }
 exports.unAttachLayer = unAttachLayer;

package/lib/function/layer/create.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 };
 };
@@ -19,45 +10,43 @@ const toolbox_1 = require("@cloudbase/toolbox");
 const utils_1 = require("../../utils");
 const i18n_1 = require("../../i18n");
 const scfService = new utils_1.CloudApiService('scf');
-function createLayer(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, contentPath = '', layerName, base64Content = '', runtimes = [] } = options;
-        (0, utils_1.checkFullAccess)(contentPath);
-        const validRuntime = ['Nodejs8.9', 'Php7', 'Java8', 'Nodejs12.16'];
-        if (runtimes.some((item) => validRuntime.indexOf(item) === -1)) {
-            throw new toolbox_1.CloudBaseError(`Invalid runtime value. Now only support: ${validRuntime.join(', ')}`);
-        }
-        let base64;
-        if (base64Content) {
-            base64 = base64Content;
-        }
-        else if ((0, utils_1.isDirectory)(contentPath)) {
-            const dirName = path_1.default.parse(contentPath).name;
-            const dest = path_1.default.join(process.cwd(), `cli-${dirName}.zip`);
-            if ((0, utils_1.checkFullAccess)(dest)) {
-                (0, utils_1.delSync)(dest);
-            }
-            yield (0, toolbox_1.zipDir)(contentPath, dest);
-            const fileBuffer = yield fs_1.default.promises.readFile(dest);
-            base64 = fileBuffer.toString('base64');
+async function createLayer(options) {
+    const { envId, contentPath = '', layerName, base64Content = '', runtimes = [] } = options;
+    (0, utils_1.checkFullAccess)(contentPath);
+    const validRuntime = ['Nodejs8.9', 'Php7', 'Java8', 'Nodejs12.16'];
+    if (runtimes.some((item) => validRuntime.indexOf(item) === -1)) {
+        throw new toolbox_1.CloudBaseError(`Invalid runtime value. Now only support: ${validRuntime.join(', ')}`);
+    }
+    let base64;
+    if (base64Content) {
+        base64 = base64Content;
+    }
+    else if ((0, utils_1.isDirectory)(contentPath)) {
+        const dirName = path_1.default.parse(contentPath).name;
+        const dest = path_1.default.join(process.cwd(), `cli-${dirName}.zip`);
+        if ((0, utils_1.checkFullAccess)(dest)) {
             (0, utils_1.delSync)(dest);
         }
-        else {
-            const fileType = path_1.default.extname(contentPath);
-            if (fileType !== '.zip') {
-                throw new toolbox_1.CloudBaseError((0, i18n_1.t)('文件类型不正确，目前只支持 ZIP 文件！'));
-            }
-            const fileBuffer = yield fs_1.default.promises.readFile(contentPath);
-            base64 = fileBuffer.toString('base64');
+        await (0, toolbox_1.zipDir)(contentPath, dest);
+        const fileBuffer = await fs_1.default.promises.readFile(dest);
+        base64 = fileBuffer.toString('base64');
+        (0, utils_1.delSync)(dest);
+    }
+    else {
+        const fileType = path_1.default.extname(contentPath);
+        if (fileType !== '.zip') {
+            throw new toolbox_1.CloudBaseError((0, i18n_1.t)('文件类型不正确，目前只支持 ZIP 文件！'));
+        }
+        const fileBuffer = await fs_1.default.promises.readFile(contentPath);
+        base64 = fileBuffer.toString('base64');
+    }
+    return scfService.request('PublishLayerVersion', {
+        LayerName: layerName,
+        CompatibleRuntimes: runtimes,
+        Src: `TCB_${envId}`,
+        Content: {
+            ZipFile: base64
         }
-        return scfService.request('PublishLayerVersion', {
-            LayerName: layerName,
-            CompatibleRuntimes: runtimes,
-            Src: `TCB_${envId}`,
-            Content: {
-                ZipFile: base64
-            }
-        });
     });
 }
 exports.createLayer = createLayer;

package/lib/function/layer/delete.js

@@ -1,24 +1,13 @@
 "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.deleteLayer = void 0;
 const utils_1 = require("../../utils");
 const scfService = new utils_1.CloudApiService('scf');
-function deleteLayer(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { name, version } = options;
-        return scfService.request('DeleteLayerVersion', {
-            LayerName: name,
-            LayerVersion: version
-        });
+async function deleteLayer(options) {
+    const { name, version } = options;
+    return scfService.request('DeleteLayerVersion', {
+        LayerName: name,
+        LayerVersion: version
     });
 }
 exports.deleteLayer = deleteLayer;

package/lib/function/layer/download.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 };
 };
@@ -19,19 +10,17 @@ const error_1 = require("../../error");
 const common_1 = require("../../utils/tools/common");
 const i18n_1 = require("../../i18n");
 const scfService = new utils_1.CloudApiService('scf');
-function downloadLayer(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { name, version, destPath } = options;
-        const res = yield scfService.request('GetLayerVersion', {
-            LayerName: name,
-            LayerVersion: version
-        });
-        const url = res === null || res === void 0 ? void 0 : res.Location;
-        const zipPath = path_1.default.join(destPath, `${name}-${version}.zip`);
-        if ((0, utils_1.checkFullAccess)(zipPath)) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('文件已存在：{{path}}', { path: zipPath }));
-        }
-        return (0, common_1.downloadAndExtractRemoteZip)(url, destPath);
+async function downloadLayer(options) {
+    const { name, version, destPath } = options;
+    const res = await scfService.request('GetLayerVersion', {
+        LayerName: name,
+        LayerVersion: version
     });
+    const url = res === null || res === void 0 ? void 0 : res.Location;
+    const zipPath = path_1.default.join(destPath, `${name}-${version}.zip`);
+    if ((0, utils_1.checkFullAccess)(zipPath)) {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('文件已存在：{{path}}', { path: zipPath }));
+    }
+    return (0, common_1.downloadAndExtractRemoteZip)(url, destPath);
 }
 exports.downloadLayer = downloadLayer;

package/lib/function/layer/list.js

@@ -1,36 +1,23 @@
 "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.listLayerVersions = exports.listLayers = void 0;
 const utils_1 = require("../../utils");
 const scfService = new utils_1.CloudApiService('scf');
-function listLayers(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { offset, limit, searchSrc } = options;
-        const res = yield scfService.request('ListLayers', {
-            Offset: offset,
-            Limit: limit,
-            SearchSrc: searchSrc
-        });
-        return (res === null || res === void 0 ? void 0 : res.Layers) || [];
+async function listLayers(options) {
+    const { offset, limit, searchSrc } = options;
+    const res = await scfService.request('ListLayers', {
+        Offset: offset,
+        Limit: limit,
+        SearchSrc: searchSrc
     });
+    return (res === null || res === void 0 ? void 0 : res.Layers) || [];
 }
 exports.listLayers = listLayers;
-function listLayerVersions(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { name } = options;
-        const res = yield scfService.request('ListLayerVersions', {
-            LayerName: name
-        });
-        return (res === null || res === void 0 ? void 0 : res.LayerVersions) || [];
+async function listLayerVersions(options) {
+    const { name } = options;
+    const res = await scfService.request('ListLayerVersions', {
+        LayerName: name
     });
+    return (res === null || res === void 0 ? void 0 : res.LayerVersions) || [];
 }
 exports.listLayerVersions = listLayerVersions;

package/lib/function/layer/sort.js

@@ -1,25 +1,14 @@
 "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.sortLayer = void 0;
 const utils_1 = require("../../utils");
 const scfService = new utils_1.CloudApiService('scf');
-function sortLayer(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { envId, functionName, layers } = options;
-        return scfService.request('UpdateFunctionConfiguration', {
-            Layers: layers,
-            Namespace: envId,
-            FunctionName: functionName
-        });
+async function sortLayer(options) {
+    const { envId, functionName, layers } = options;
+    return scfService.request('UpdateFunctionConfiguration', {
+        Layers: layers,
+        Namespace: envId,
+        FunctionName: functionName
     });
 }
 exports.sortLayer = sortLayer;