@cloudbase/manager-node 4.5.0 → 4.6.1

package/lib/function/index.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionService = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const lodash_1 = __importDefault(require("lodash"));
 const packer_1 = require("./packer");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
@@ -733,12 +734,34 @@ class FunctionService {
                 TriggerDesc: item.config
             };
         });
-        return this.scfService.request('BatchCreateTrigger', {
-            FunctionName: name,
-            Namespace: namespace,
-            Triggers: JSON.stringify(parsedTriggers),
-            Count: parsedTriggers.length
-        });
+        try {
+            return await this.scfService.request('BatchCreateTrigger', {
+                FunctionName: name,
+                Namespace: namespace,
+                Triggers: JSON.stringify(parsedTriggers),
+                Count: parsedTriggers.length
+            });
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError(`[${name}] 创建触发器失败：${e.message}`, {
+                action: e.action,
+                code: e.code
+            });
+        }
+    }
+    // 批量部署函数触发器
+    async batchCreateTriggers(options) {
+        const { functions, envId } = options;
+        const promises = functions.map(func => (async () => {
+            try {
+                await this.createFunctionTriggers(func.name, func.triggers);
+                (0, utils_1.successLog)(`[${func.name}] 创建云函数触发器成功！`);
+            }
+            catch (e) {
+                throw new error_1.CloudBaseError(e.message);
+            }
+        })());
+        await Promise.all(promises);
     }
     /**
      * 删除云函数触发器
@@ -748,12 +771,32 @@ class FunctionService {
      */
     async deleteFunctionTrigger(name, triggerName) {
         const { namespace } = this.getFunctionConfig();
-        return this.scfService.request('DeleteTrigger', {
-            FunctionName: name,
-            Namespace: namespace,
-            TriggerName: triggerName,
-            Type: 'timer'
-        });
+        try {
+            await this.scfService.request('DeleteTrigger', {
+                FunctionName: name,
+                Namespace: namespace,
+                TriggerName: triggerName,
+                Type: 'timer'
+            });
+            (0, utils_1.successLog)(`[${name}] 删除云函数触发器 ${triggerName} 成功！`);
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError(`[${name}] 删除触发器失败：${e.message}`);
+        }
+    }
+    async batchDeleteTriggers(options) {
+        const { functions, envId } = options;
+        const promises = functions.map(func => (async () => {
+            try {
+                func.triggers.forEach(async (trigger) => {
+                    await this.deleteFunctionTrigger(func.name, trigger.name);
+                });
+            }
+            catch (e) {
+                throw new error_1.CloudBaseError(e.message);
+            }
+        })());
+        await Promise.all(promises);
     }
     /**
      * 下载云函数代码
@@ -797,6 +840,68 @@ class FunctionService {
             throw new error_1.CloudBaseError(`[${functionName}] 获取函数代码下载链接失败：\n${e.message}`);
         }
     }
+    // 函数绑定文件层
+    async attachLayer(options) {
+        const { envId, functionName, layerName, layerVersion, codeSecret } = options;
+        let { Layers = [] } = await this.getFunctionDetail(functionName, codeSecret);
+        Layers = Layers.map(item => lodash_1.default.pick(item, ['LayerName', 'LayerVersion']));
+        // 新加的文件层添加到最后
+        Layers.push({
+            LayerName: layerName,
+            LayerVersion: layerVersion
+        });
+        const res = await this.scfService.request('UpdateFunctionConfiguration', {
+            Layers,
+            Namespace: envId,
+            FunctionName: functionName
+        });
+        return res;
+    }
+    // 函数解绑文件层
+    async unAttachLayer(options) {
+        const { envId, functionName, layerName, layerVersion, codeSecret } = options;
+        let { Layers } = await this.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('层不存在');
+        }
+        // 删除指定的层
+        Layers.splice(index, 1);
+        const apiParams = {
+            Namespace: envId,
+            FunctionName: functionName,
+            Layers: Layers.length > 0 ? Layers : [{
+                    LayerName: '',
+                    LayerVersion: 0
+                }]
+        };
+        return this.scfService.request('UpdateFunctionConfiguration', apiParams);
+    }
+    // 更新云函数层
+    async updateFunctionLayer(options) {
+        const { envId, functionName, layers } = options;
+        return this.scfService.request('UpdateFunctionConfiguration', {
+            Layers: layers,
+            Namespace: envId,
+            FunctionName: functionName
+        });
+    }
+    // 下载文件层 ZIP 文件
+    async downloadLayer(options) {
+        const { name, version, destPath } = options;
+        const res = await this.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(`文件已存在：${zipPath}`);
+        }
+        // 下载文件
+        return (0, utils_1.downloadAndExtractRemoteZip)(url, destPath);
+    }
     // 创建文件层版本
     async createLayer(options) {
         const { env } = this.getFunctionConfig();
@@ -869,7 +974,7 @@ class FunctionService {
             Limit: limit,
             Offset: offset,
             SearchKey: searchKey,
-            SearchSrc: `TCB_${env}`
+            // SearchSrc: `TCB_${env}`
         };
         if (runtime) {
             param.CompatibleRuntime = runtime;
@@ -1246,6 +1351,18 @@ __decorate([
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "getFunctionDownloadUrl", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "attachLayer", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "unAttachLayer", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "updateFunctionLayer", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "downloadLayer", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "createLayer", null);

package/lib/utils/index.js

@@ -38,7 +38,6 @@ const path_1 = __importDefault(require("path"));
 const unzipper_1 = __importDefault(require("unzipper"));
 const constant_1 = require("../constant");
 const http_request_1 = require("./http-request");
-const log_symbols_1 = __importDefault(require("log-symbols"));
 __exportStar(require("./auth"), exports);
 __exportStar(require("./cloud-api-request"), exports);
 __exportStar(require("./cloudbase-request"), exports);
@@ -311,5 +310,5 @@ const getCompleteTimeRange = (timeRange) => {
 exports.getCompleteTimeRange = getCompleteTimeRange;
 function successLog(msg) {
     // 空格，兼容中文字符编码长度问题
-    console.log(`${log_symbols_1.default.success} ${msg}`);
+    console.log(`${msg}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "4.5.0",
+    "version": "4.6.1",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/types/function/index.d.ts

@@ -198,6 +198,28 @@ export interface IFunctionCodeOptions {
     functionName: string;
     codeSecret?: string;
 }
+export interface ILayerDownloadOptions {
+    name: string;
+    version: number;
+    destPath: string;
+    force?: boolean;
+}
+export interface IAttachOptions {
+    envId: string;
+    layerName: string;
+    layerVersion: number;
+    functionName: string;
+    codeSecret?: string;
+}
+export interface ISortOptions {
+    envId: string;
+    functionName: string;
+    layers: ILayer[];
+}
+export interface ILayer {
+    LayerName: string;
+    LayerVersion: number;
+}
 export declare class FunctionService {
     private environment;
     private vpcService;
@@ -371,13 +393,15 @@ export declare class FunctionService {
      * @returns {Promise<IResponseInfo>}
      */
     createFunctionTriggers(name: string, triggers?: ICloudFunctionTrigger[]): Promise<IResponseInfo>;
+    batchCreateTriggers(options: IFunctionBatchOptions): Promise<void>;
     /**
      * 删除云函数触发器
      * @param {string} name 云函数名称
      * @param {string} triggerName 云函数触发器名称
      * @returns {Promise<IResponseInfo>}
      */
-    deleteFunctionTrigger(name: string, triggerName: string): Promise<IResponseInfo>;
+    deleteFunctionTrigger(name: string, triggerName: string): Promise<void>;
+    batchDeleteTriggers(options: IFunctionBatchOptions): Promise<void>;
     /**
      * 下载云函数代码
      * @param {IFunctionCodeOptions} options
@@ -392,6 +416,10 @@ export declare class FunctionService {
      * @memberof FunctionService
      */
     getFunctionDownloadUrl(functionName: string, codeSecret?: string): Promise<IFunctionDownloadUrlRes>;
+    attachLayer(options: IAttachOptions): Promise<IResponseInfo>;
+    unAttachLayer(options: IAttachOptions): Promise<IResponseInfo>;
+    updateFunctionLayer(options: ISortOptions): Promise<IResponseInfo>;
+    downloadLayer(options: ILayerDownloadOptions): Promise<void>;
     createLayer(options: IFunctionLayerOptions): Promise<ICreateLayerResponse>;
     deleteLayerVersion(options: ILayerOptions): Promise<IResponseInfo>;
     listLayerVersions(options: IVersionListOptions): Promise<IListLayerVersionsRes>;