@cloudbase/manager-node 4.4.7 → 4.4.9-beta.0

package/lib/function/index.js

@@ -258,20 +258,96 @@ class FunctionService {
         });
         return data;
     }
+    /**
+     * 列出所有函数
+     * @param {IListFunctionOptions} options
+     * @returns {Promise<Record<string, string>[]>}
+     */
+    async listAllFunctions(options) {
+        const allFunctions = [];
+        let currentOffset = 0;
+        const pageSize = 20;
+        const { envId } = options;
+        while (true) {
+            try {
+                const res = await this.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;
+            }
+            catch (error) {
+                throw new error_1.CloudBaseError(`获取函数列表失败: ${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;
+    }
     /**
      * 删除云函数
      * @param {string} name 云函数名称
      * @param {string} qualifier 需要删除的版本号，不填默认删除函数下全部版本。
      * @returns {Promise<IResponseInfo>}
      */
-    async deleteFunction(name, qualifier) {
+    async deleteFunction({ name }) {
+        var _a;
         const { namespace } = this.getFunctionConfig();
-        return this.scfService.request('DeleteFunction', {
+        // 检测是否绑定了 API 网关
+        const accessService = this.environment.getAccessService();
+        const res = await accessService.getAccessList({
+            name
+        });
+        // 删除绑定的 API 网关
+        if (((_a = res === null || res === void 0 ? void 0 : res.APISet) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            await accessService.deleteAccess({
+                name
+            });
+        }
+        await this.scfService.request('DeleteFunction', {
             FunctionName: name,
-            Namespace: namespace,
-            Qualifier: qualifier
+            Namespace: namespace
         });
     }
+    /**
+     * 批量删除云函数
+     * @param {Object} options
+     * @param {string[]} options.names 云函数名称列表
+     * @returns {Promise<void>}
+     */
+    async batchDeleteFunctions({ names }) {
+        const promises = names.map(name => (async () => {
+            try {
+                await this.deleteFunction({ name });
+                (0, utils_1.successLog)(`[${name}] 函数删除成功！`);
+            }
+            catch (e) {
+                throw new error_1.CloudBaseError(e.message);
+            }
+        })());
+        await Promise.all(promises);
+    }
     /**
      * 获取云函数详细信息
      * @param {string} name 云函数名称
@@ -306,13 +382,35 @@ class FunctionService {
             }
             catch (e) {
                 data.VpcConfig = {
-                    vpc: '',
-                    subnet: ''
+                    vpc: 'VpcId',
+                    subnet: 'SubnetId'
                 };
             }
         }
         return data;
     }
+    /**
+     * 批量获取云函数详细信息
+     * @param {Object} options
+     * @param {string[]} options.names 云函数名称列表
+     * @param {string} options.envId 环境 ID
+     * @param {string} options.codeSecret
+     * @returns {Promise<IFunctionInfo[]>}
+     */
+    async batchGetFunctionsDetail({ names, envId, codeSecret }) {
+        const data = [];
+        const promises = names.map(name => (async () => {
+            try {
+                const info = await this.getFunctionDetail(name, codeSecret);
+                data.push(info);
+            }
+            catch (e) {
+                throw new error_1.CloudBaseError(`${name} 获取信息失败：${e.message}`);
+            }
+        })());
+        await Promise.all(promises);
+        return data;
+    }
     /**
      * 获取函数日志
      * @deprecated 请使用 getFunctionLogsV2 代替
@@ -409,6 +507,33 @@ class FunctionService {
         const res = await this.tcbService.request('GetFunctionLogDetail', params);
         return res;
     }
+    /**
+     * 获取函数的完整调用日志
+     * 该方法会自动完成两步操作：1. 获取日志请求ID列表。 2. 根据ID列表获取每条日志的详细内容。
+     * @param {IFunctionLogOptionsV2} options - 查询选项
+     * @returns {Promise<IFunctionLogDetailRes[]>} 返回包含完整日志详情的数组
+     */
+    async getCompleteFunctionLogs(options) {
+        // 调用 getFunctionLogsV2 获取日志请求ID列表
+        const { name } = options;
+        const logs = await this.getFunctionLogsV2(options);
+        // 如果没有日志，直接返回空数组
+        if (logs.LogList.length === 0) {
+            return [];
+        }
+        const detailPromises = logs.LogList.map(async (log) => {
+            // 对每一个日志ID，调用 getFunctionLogDetail
+            const res = await this.getFunctionLogDetail({
+                logRequestId: log.RequestId,
+                startTime: options.startTime,
+                endTime: options.endTime
+            });
+            return Object.assign(Object.assign({}, res), { RetCode: log.RetCode, FunctionName: name });
+        });
+        // 并发执行所有详情查询，等待它们全部完成
+        const detailedLogs = await Promise.all(detailPromises);
+        return detailedLogs;
+    }
     /**
      * 更新云函数配置
      * @param {ICloudFunction} func 云函数配置
@@ -544,6 +669,28 @@ class FunctionService {
             throw new error_1.CloudBaseError(`[${name}] 调用失败：\n${e.message}`);
         }
     }
+    /**
+     * 批量调用云函数
+     * @param {IFunctionBatchOptions} options
+     * @returns {Promise<IFunctionInvokeRes[]>}
+     */
+    async batchInvokeFunctions(options) {
+        const { functions, envId, log = false } = options;
+        const promises = functions.map(func => (async () => {
+            try {
+                const result = await this.invokeFunction(func.name, func.params);
+                if (log) {
+                    (0, utils_1.successLog)(`[${func.name}] 调用成功\n响应结果：\n`);
+                    console.log(result);
+                }
+                return result;
+            }
+            catch (e) {
+                throw new error_1.CloudBaseError(`${func.name} 函数调用失败：${e.message}`);
+            }
+        })());
+        return Promise.all(promises);
+    }
     /**
      * 复制云函数
      * @param {string} name 云函数名称
@@ -608,6 +755,24 @@ class FunctionService {
             Type: 'timer'
         });
     }
+    /**
+     * 下载云函数代码
+     * @param {IFunctionCodeOptions} options
+     * @returns {Promise<void>}
+     */
+    async downloadFunctionCode(options) {
+        const { destPath, envId, functionName, codeSecret } = options;
+        // 检验路径是否存在
+        (0, utils_1.checkFullAccess)(destPath, true);
+        // 获取下载链接
+        const { Url } = await this.scfService.request('GetFunctionAddress', {
+            FunctionName: functionName,
+            Namespace: envId,
+            CodeSecret: codeSecret
+        });
+        // 下载文件
+        return (0, utils_1.downloadAndExtractRemoteZip)(Url, destPath);
+    }
     /**
      * 获取云函数代码下载 链接
      * @param {string} functionName
@@ -995,7 +1160,7 @@ class FunctionService {
             }, 300000);
             ticker = setInterval(async () => {
                 try {
-                    const { Status, StatusDesc, StatusReasons } = await this.getFunctionDetail(funcName, codeSecret);
+                    const { Status, StatusDesc, StatusReasons, RequestId } = await this.getFunctionDetail(funcName, codeSecret);
                     // 更新中
                     if (Status === constant_1.SCF_STATUS.CREATING || Status === constant_1.SCF_STATUS.UPDATING)
                         return;
@@ -1003,8 +1168,7 @@ class FunctionService {
                     if (Status === constant_1.SCF_STATUS.CREATE_FAILED) {
                         StatusDesc && console.log(`函数状态描述: ${StatusDesc}`);
                         const errorDetails = StatusReasons.map(item => `[${item.ErrorCode}] ${item.ErrorMessage}`).join('\n');
-                        console.error(`函数创建失败信息: ${errorDetails}`);
-                        throw new error_1.CloudBaseError('云函数创建失败');
+                        throw new error_1.CloudBaseError(`云函数创建失败\n失败信息: ${errorDetails}\nRequestId: ${RequestId}`);
                     }
                     // 函数状态正常
                     clearInterval(ticker);
@@ -1034,12 +1198,18 @@ __decorate([
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "listFunctions", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "listAllFunctions", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "deleteFunction", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "getFunctionDetail", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "batchGetFunctionsDetail", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "getFunctionLogs", null);
@@ -1049,6 +1219,9 @@ __decorate([
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "getFunctionLogDetail", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "getCompleteFunctionLogs", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "updateFunctionConfig", null);
@@ -1058,6 +1231,9 @@ __decorate([
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "invokeFunction", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "batchInvokeFunctions", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "copyFunction", null);

package/lib/utils/index.js

@@ -28,6 +28,7 @@ exports.sleep = sleep;
 exports.upperCaseStringFisrt = upperCaseStringFisrt;
 exports.upperCaseObjKey = upperCaseObjKey;
 exports.fetchTemplates = fetchTemplates;
+exports.successLog = successLog;
 const archiver_1 = __importDefault(require("archiver"));
 const crypto_1 = __importDefault(require("crypto"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -36,6 +37,7 @@ 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);
@@ -265,3 +267,7 @@ const getCompleteTimeRange = (timeRange) => {
     };
 };
 exports.getCompleteTimeRange = getCompleteTimeRange;
+function successLog(msg) {
+    // 空格，兼容中文字符编码长度问题
+    console.log(`${log_symbols_1.default.success} ${msg}`);
+}

package/package.json

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

package/types/function/index.d.ts

@@ -1,5 +1,5 @@
 import { Environment } from '../environment';
-import { IResponseInfo, ICloudFunction, IFunctionLogOptions, ICloudFunctionTrigger, IFunctionInvokeRes, IFunctionLogRes, IFunctionDownloadUrlRes, IFunctionLogDetailOptions, IFunctionLogDetailRes, IFunctionLogOptionsV2, IFunctionLogResV2 } from '../interfaces';
+import { IResponseInfo, ICloudFunction, ICloudFunctionV2, IFunctionLogOptions, ICloudFunctionTrigger, IFunctionInvokeRes, IFunctionLogRes, IFunctionDownloadUrlRes, IFunctionLogDetailOptions, IFunctionLogDetailRes, IFunctionLogOptionsV2, IFunctionLogResV2 } from '../interfaces';
 import { IFunctionInfo } from './types';
 export interface IFunctionCode {
     func: ICloudFunction;
@@ -173,6 +173,31 @@ export interface IGetFunctionAliasRes extends IResponseInfo {
     AddTime: string;
     ModTime: string;
 }
+export interface IListFunctionOptions {
+    limit?: number;
+    offset?: number;
+    envId: string;
+}
+export interface IFunctionBatchOptions {
+    functions: ICloudFunctionV2[];
+    envId: string;
+    log?: boolean;
+}
+export interface IGetAsyncEventStatusRes extends IResponseInfo {
+    Result: IAsyncEventStatus;
+    RequestId: string;
+}
+export interface IAsyncEventStatus {
+    InvokeRequestId: string;
+    Status: string;
+    StatusCode: number;
+}
+export interface IFunctionCodeOptions {
+    envId: string;
+    destPath: string;
+    functionName: string;
+    codeSecret?: string;
+}
 export declare class FunctionService {
     private environment;
     private vpcService;
@@ -214,19 +239,49 @@ export declare class FunctionService {
      * @returns {Promise<Record<string, string>[]>}
      */
     listFunctions(limit?: number, offset?: number): Promise<Record<string, string>[]>;
+    /**
+     * 列出所有函数
+     * @param {IListFunctionOptions} options
+     * @returns {Promise<Record<string, string>[]>}
+     */
+    listAllFunctions(options: IListFunctionOptions): Promise<Record<string, string>[]>;
     /**
      * 删除云函数
      * @param {string} name 云函数名称
      * @param {string} qualifier 需要删除的版本号，不填默认删除函数下全部版本。
      * @returns {Promise<IResponseInfo>}
      */
-    deleteFunction(name: string, qualifier?: string): Promise<IResponseInfo>;
+    deleteFunction({ name }: {
+        name: any;
+    }): Promise<void>;
+    /**
+     * 批量删除云函数
+     * @param {Object} options
+     * @param {string[]} options.names 云函数名称列表
+     * @returns {Promise<void>}
+     */
+    batchDeleteFunctions({ names }: {
+        names: any;
+    }): Promise<void>;
     /**
      * 获取云函数详细信息
      * @param {string} name 云函数名称
      * @returns {Promise<Record<string, string>>}
      */
     getFunctionDetail(name: string, codeSecret?: string): Promise<IFunctionInfo>;
+    /**
+     * 批量获取云函数详细信息
+     * @param {Object} options
+     * @param {string[]} options.names 云函数名称列表
+     * @param {string} options.envId 环境 ID
+     * @param {string} options.codeSecret
+     * @returns {Promise<IFunctionInfo[]>}
+     */
+    batchGetFunctionsDetail({ names, envId, codeSecret }: {
+        names: any;
+        envId: any;
+        codeSecret: any;
+    }): Promise<IFunctionInfo[]>;
     /**
      * 获取函数日志
      * @deprecated 请使用 getFunctionLogsV2 代替
@@ -267,6 +322,13 @@ export declare class FunctionService {
     * @returns {Promise<IFunctionLogDetailRes>}
     */
     getFunctionLogDetail(options: IFunctionLogDetailOptions): Promise<IFunctionLogDetailRes>;
+    /**
+     * 获取函数的完整调用日志
+     * 该方法会自动完成两步操作：1. 获取日志请求ID列表。 2. 根据ID列表获取每条日志的详细内容。
+     * @param {IFunctionLogOptionsV2} options - 查询选项
+     * @returns {Promise<IFunctionLogDetailRes[]>} 返回包含完整日志详情的数组
+     */
+    getCompleteFunctionLogs(options: IFunctionLogOptionsV2): Promise<IFunctionLogDetailRes[]>;
     /**
      * 更新云函数配置
      * @param {ICloudFunction} func 云函数配置
@@ -287,6 +349,12 @@ export declare class FunctionService {
      * @returns {Promise<IFunctionInvokeRes>}
      */
     invokeFunction(name: string, params?: Record<string, any>): Promise<IFunctionInvokeRes>;
+    /**
+     * 批量调用云函数
+     * @param {IFunctionBatchOptions} options
+     * @returns {Promise<IFunctionInvokeRes[]>}
+     */
+    batchInvokeFunctions(options: IFunctionBatchOptions): Promise<IFunctionInvokeRes[]>;
     /**
      * 复制云函数
      * @param {string} name 云函数名称
@@ -310,6 +378,12 @@ export declare class FunctionService {
      * @returns {Promise<IResponseInfo>}
      */
     deleteFunctionTrigger(name: string, triggerName: string): Promise<IResponseInfo>;
+    /**
+     * 下载云函数代码
+     * @param {IFunctionCodeOptions} options
+     * @returns {Promise<void>}
+     */
+    downloadFunctionCode(options: IFunctionCodeOptions): Promise<void>;
     /**
      * 获取云函数代码下载 链接
      * @param {string} functionName

package/types/function/types.d.ts

@@ -121,6 +121,62 @@ export interface IFunctionInfo {
         ErrorCode: string;
         ErrorMessage: string;
     }[];
+    RequestId: string;
+    Layers: ILayerVersionInfo[];
+}
+/**
+ * 层版本信息
+ * 被 GetFunction, ListLayerVersions, ListLayers 接口引用
+ */
+export interface ILayerVersionInfo {
+    /**
+     * 版本适用的运行时
+     * @example ["Python3.10","Python3.9"]
+     */
+    CompatibleRuntimes?: string[];
+    /**
+     * 创建时间
+     * @example 2024-11-22 16:52:21
+     */
+    AddTime?: string;
+    /**
+     * 版本描述
+     * @example "a layer"
+     */
+    Description?: string;
+    /**
+     * 许可证信息
+     * @example " "
+     */
+    LicenseInfo?: string | null;
+    /**
+     * 版本号
+     * @example 1
+     */
+    LayerVersion?: number;
+    /**
+     * 层名称
+     * @example "layer-name1"
+     */
+    LayerName?: string;
+    /**
+     * 层的具体版本当前状态
+     * Active：正常状态
+     */
+    Status?: string;
+    /**
+     * Stamp
+     * @example "Default"
+     */
+    Stamp?: string;
+    /**
+     * 返回层绑定的标签信息
+     */
+    Tags?: ITag1[];
+}
+export interface ITag1 {
+    Key: string;
+    Value: string[];
 }
 export interface IFunctionCode {
     CosBucketName?: string;

package/types/interfaces/function.interface.d.ts

@@ -33,6 +33,21 @@ export interface ICloudFunction extends ICloudFunctionConfig {
     }[];
     triggers?: ICloudFunctionTrigger[];
 }
+export interface ICloudFunctionV2 {
+    name: string;
+    config?: ICloudFunctionConfig;
+    triggers?: ICloudFunctionTrigger[];
+    params?: Record<string, string>;
+    handler?: string;
+    ignore?: string | string[];
+    timeout?: number;
+    envVariables?: Record<string, string | number | boolean>;
+    runtime?: string;
+    vpc?: IFunctionVPC;
+    l5?: boolean;
+    installDependency?: boolean;
+    isWaitInstall?: boolean;
+}
 export interface IFunctionLogOptions {
     name: string;
     offset?: number;
@@ -66,6 +81,7 @@ export interface IFunctionInvokeRes {
     Duration: number;
     BillDuration: number;
     FunctionRequestId: string;
+    InvokeResult: number;
 }
 export interface IFunctionLogRes {
     RequestId: string;

package/types/utils/index.d.ts

@@ -64,3 +64,4 @@ export declare const getCompleteTimeRange: (timeRange: {
     startTime: string;
     endTime: string;
 };
+export declare function successLog(msg: string): void;