@cloudbase/manager-node 4.6.9 → 4.7.0

package/lib/environment.js

@@ -23,6 +23,7 @@ class Environment {
         this.cloudBaseContext = context;
         this.envType = context.envType;
         // 拉取当前环境 的环境信息 todo
+        this.userService = new user_1.UserService(this);
         this.functionService = new function_1.FunctionService(this);
         this.cloudRunService = new cloudrun_1.CloudRunService(this);
         this.agentService = new agent_1.AgentService(this);

package/lib/function/index.js

@@ -13,6 +13,7 @@ exports.FunctionService = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const lodash_1 = __importDefault(require("lodash"));
+const cos_nodejs_sdk_v5_1 = __importDefault(require("cos-nodejs-sdk-v5"));
 const packer_1 = require("./packer");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
@@ -77,6 +78,14 @@ function configToParams(options) {
         }));
         params.Layers = transformLayers;
     }
+    // HTTP 云函数类型
+    if ((func === null || func === void 0 ? void 0 : func.type) === 'HTTP') {
+        params.Type = 'HTTP';
+    }
+    // 云函数描述
+    if (func === null || func === void 0 ? void 0 : func.description) {
+        params.Description = func.description;
+    }
     return params;
 }
 class FunctionService {
@@ -85,6 +94,7 @@ class FunctionService {
         this.scfService = new utils_1.CloudService(environment.cloudBaseContext, 'scf', '2018-04-16');
         this.vpcService = new utils_1.CloudService(environment.cloudBaseContext, 'vpc', '2017-03-12');
         this.tcbService = new utils_1.CloudService(environment.cloudBaseContext, 'tcb', '2018-06-08');
+        this.userService = environment.getUserService();
     }
     /**
      * 增量更新函数代码
@@ -93,12 +103,12 @@ class FunctionService {
      * @memberof FunctionService
      */
     async updateFunctionIncrementalCode(funcParam) {
-        const { namespace } = this.getFunctionConfig();
+        const { env } = this.getFunctionConfig();
         const { functionRootPath, func, deleteFiles, addFiles } = funcParam;
         const { name, runtime } = func;
         const params = {
             FunctionName: name,
-            Namespace: namespace
+            EnvId: env
         };
         let packer;
         let base64;
@@ -122,7 +132,7 @@ class FunctionService {
             }
             params.AddFiles = base64;
         }
-        return this.scfService.request('UpdateFunctionIncrementalCode', params);
+        return this.tcbService.request('UpdateFunctionIncrementalCode', params);
     }
     /**
      * 创建云函数
@@ -130,14 +140,14 @@ class FunctionService {
      * @returns {(Promise<IResponseInfo | ICreateFunctionRes>)}
      */
     async createFunction(funcParam) {
-        const { namespace } = this.getFunctionConfig();
-        const { func, functionRootPath, force = false, base64Code, codeSecret, functionPath } = funcParam;
+        const { env } = this.getFunctionConfig();
+        const { func, functionRootPath, force = false, base64Code, codeSecret, functionPath, deployMode } = funcParam;
         const funcName = func.name;
         const params = configToParams({
             func,
             codeSecret,
             baseParams: {
-                Namespace: namespace,
+                EnvId: env,
                 Role: 'TCB_QcsRole',
                 Stamp: 'MINI_QCBASE'
             }
@@ -146,14 +156,15 @@ class FunctionService {
             func,
             base64Code,
             functionPath,
-            functionRootPath
+            functionRootPath,
+            deployMode
         }, params.InstallDependency);
         const { TopicId, LogsetId } = this.getClsServiceConfig();
         params.ClsTopicId = TopicId;
         params.ClsLogsetId = LogsetId;
         try {
             // 创建云函数
-            const res = await this.scfService.request('CreateFunction', params);
+            const res = await this.tcbService.request('CreateFunction', params);
             // 等待函数状态正常
             await this.waitFunctionActive(funcName, codeSecret);
             // 创建函数触发器、失败自动重试
@@ -222,9 +233,9 @@ class FunctionService {
      */
     async getFunctionList(limit = 20, offset = 0) {
         // 获取Function 环境配置
-        const { namespace } = this.getFunctionConfig();
-        const res = await this.scfService.request('ListFunctions', {
-            Namespace: namespace,
+        const { env } = this.getFunctionConfig();
+        const res = await this.tcbService.request('ListFunctions', {
+            EnvId: env,
             Limit: limit,
             Offset: offset
         });
@@ -355,16 +366,17 @@ class FunctionService {
      * @returns {Promise<Record<string, string>>}
      */
     async getFunctionDetail(name, codeSecret) {
-        const { namespace } = this.getFunctionConfig();
+        const { env } = this.getFunctionConfig();
         const params = {
             FunctionName: name,
-            Namespace: namespace,
-            ShowCode: 'TRUE'
+            EnvId: env,
+            ShowCode: 'TRUE',
+            Namespace: env
         };
         if (codeSecret) {
             params.CodeSecret = codeSecret;
         }
-        const data = await this.scfService.request('GetFunction', params);
+        const data = await this.tcbService.request('GetFunction', params);
         // 解析 VPC 配置
         const { VpcId = '', SubnetId = '' } = data.VpcConfig || {};
         if (VpcId && SubnetId) {
@@ -554,6 +566,9 @@ class FunctionService {
             Namespace: namespace,
             L5Enable: l5Enable
         };
+        if (func === null || func === void 0 ? void 0 : func.description) {
+            params.Description = func.description;
+        }
         // 修复参数存在 undefined 字段时，会出现鉴权失败的情况
         // Environment 为覆盖式修改，不保留已有字段
         envVariables.length && (params.Environment = { Variables: envVariables });
@@ -610,9 +625,9 @@ class FunctionService {
      * @memberof FunctionService
      */
     async updateFunctionCode(funcParam) {
-        const { func, functionRootPath, base64Code, codeSecret, functionPath } = funcParam;
+        const { func, functionRootPath, base64Code, codeSecret, functionPath, deployMode } = funcParam;
         const funcName = func.name;
-        const { namespace } = this.getFunctionConfig();
+        const { env } = this.getFunctionConfig();
         let installDependency;
         // Node 函数默认安装依赖
         installDependency = isNodeFunction(func.runtime) ? 'TRUE' : 'FALSE';
@@ -624,9 +639,16 @@ class FunctionService {
             func,
             functionPath,
             functionRootPath,
-            base64Code
+            base64Code,
+            deployMode
         }, installDependency);
-        const params = Object.assign({ FunctionName: funcName, Namespace: namespace, Handler: func.handler || 'index.main', InstallDependency: installDependency }, codeParams);
+        const params = {
+            FunctionName: funcName,
+            EnvId: env,
+            Handler: func.handler || 'index.main',
+            InstallDependency: installDependency,
+            Code: codeParams
+        };
         if (codeSecret) {
             params.CodeSecret = codeSecret;
         }
@@ -634,7 +656,7 @@ class FunctionService {
             // 等待函数状态正常
             await this.waitFunctionActive(funcName, codeSecret);
             // 更新云函数代码
-            const res = await this.scfService.request('UpdateFunctionCode', params);
+            const res = await this.tcbService.request('UpdateFunctionCode', params);
             if (installDependency && func.isWaitInstall === true) {
                 await this.waitFunctionActive(funcName, codeSecret);
             }
@@ -989,6 +1011,45 @@ class FunctionService {
             LayerVersion: version
         });
     }
+    // 检查函数状态，部分操作在函数更新中时不可进行
+    async waitFunctionActive(funcName, codeSecret) {
+        let ticker;
+        let timer;
+        let resolved;
+        return new Promise((resolve, reject) => {
+            // 超时时间 5 分钟
+            timer = setTimeout(() => {
+                clearInterval(ticker);
+                if (!resolved) {
+                    reject(new error_1.CloudBaseError('函数状态异常，检查超时'));
+                }
+            }, 300000);
+            ticker = setInterval(async () => {
+                try {
+                    const { Status, StatusDesc, StatusReasons, RequestId } = await this.getFunctionDetail(funcName, codeSecret);
+                    // 更新中
+                    if (Status === constant_1.SCF_STATUS.CREATING || Status === constant_1.SCF_STATUS.UPDATING)
+                        return;
+                    // 创建失败
+                    if (Status === constant_1.SCF_STATUS.CREATE_FAILED) {
+                        StatusDesc && console.log(`函数状态描述: ${StatusDesc}`);
+                        const errorDetails = StatusReasons.map(item => `[${item.ErrorCode}] ${item.ErrorMessage}`).join('\n');
+                        throw new error_1.CloudBaseError(`云函数创建失败\n失败信息: ${errorDetails}\nRequestId: ${RequestId}`);
+                    }
+                    // 函数状态正常
+                    clearInterval(ticker);
+                    clearTimeout(timer);
+                    resolve();
+                }
+                catch (e) {
+                    clearInterval(ticker);
+                    clearTimeout(timer);
+                    reject(e);
+                }
+                resolved = true;
+            }, 1000);
+        });
+    }
     /**
      * 设置预置并发
      * @private
@@ -1104,6 +1165,114 @@ class FunctionService {
             Namespace: namespace
         });
     }
+    /**
+     * 通过scf COS 上传方式（通过 GetTempCosInfo + COS SDK 上传）
+     * 返回 TempCosObjectName 用于创建/更新函数
+     */
+    async uploadFunctionZipToCosLegacy(options, installDependency) {
+        const { func, functionPath, functionRootPath } = options;
+        const { env } = this.getFunctionConfig();
+        const { CloudAppId } = await this.userService.getTcbAccountInfo();
+        const objectPath = `${CloudAppId}/${env}/${func.name}.zip`;
+        // 1. 生成存放函数包的临时 Cos 目录
+        const { Date: cosDate, Sign } = await this.scfService.request('GetTempCosInfo', {
+            ObjectPath: `${objectPath}`
+        });
+        // 2. 本地压缩
+        const codeType = packer_1.CodeType.File;
+        // 云端安装依赖，自动忽略 node_modules 目录
+        const ignore = installDependency === 'TRUE'
+            ? ['node_modules/**/*', 'node_modules', ...(func.ignore || [])]
+            : [...(func.ignore || [])];
+        const packer = new packer_1.FunctionPacker({
+            ignore,
+            codeType,
+            functionPath,
+            name: func.name,
+            root: functionRootPath
+        });
+        const zipFilePath = await packer.compressFiles();
+        // 3. 初始化 cos 并上传
+        const tempCosObjectName = `/${cosDate}/${objectPath}`;
+        const TEMP_COS_APPID = '1253665819';
+        const uploadParams = {
+            Bucket: `shtempcos-${TEMP_COS_APPID}`,
+            Key: tempCosObjectName,
+            Region: 'ap-shanghai',
+            FilePath: zipFilePath,
+        };
+        const cos = new cos_nodejs_sdk_v5_1.default({
+            getAuthorization: function (options, callback) {
+                // 注入上一步获取的临时密钥
+                callback(Sign);
+            }
+        });
+        return new Promise((resolve, reject) => {
+            cos.sliceUploadFile(uploadParams, async (err, data) => {
+                // 清理临时文件
+                await packer.clean();
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(data);
+                }
+            });
+        });
+    }
+    /**
+     * 新的 COS 上传方式（通过 DescribeBuildServiceCosInfo + PUT 上传）
+     * 返回 CosTimestamp 用于创建/更新函数
+     */
+    async uploadFunctionZipToCos(options, installDependency) {
+        const { func, functionPath, functionRootPath } = options;
+        const { env } = this.getFunctionConfig();
+        // 1. 生成存放函数包的临时 Cos 目录
+        const { UploadUrl, UnixTimestamp, UploadHeaders } = await this.tcbService.request('DescribeBuildServiceCosInfo', {
+            EnvId: env,
+            ServiceName: func.name,
+            Business: 'scf',
+            Suffix: '.zip'
+        });
+        // 2. 本地压缩
+        const codeType = packer_1.CodeType.File;
+        // 云端安装依赖，自动忽略 node_modules 目录
+        const ignore = installDependency === 'TRUE'
+            ? ['node_modules/**/*', 'node_modules', ...(func.ignore || [])]
+            : [...(func.ignore || [])];
+        const packer = new packer_1.FunctionPacker({
+            ignore,
+            codeType,
+            functionPath,
+            name: func.name,
+            root: functionRootPath
+        });
+        const zipFilePath = await packer.compressFiles();
+        // 3. 通过 UploadUrl 直接上传
+        const fileBuffer = fs_1.default.readFileSync(zipFilePath);
+        // 构建请求头
+        const headers = {
+            'Content-Type': 'application/zip'
+        };
+        if (UploadHeaders && UploadHeaders.length > 0) {
+            UploadHeaders.forEach(item => {
+                headers[item.Key] = item.Value;
+            });
+        }
+        const response = await fetch(UploadUrl, {
+            method: 'PUT',
+            body: fileBuffer,
+            headers
+        });
+        if (!response.ok) {
+            throw new error_1.CloudBaseError(`上传失败: ${response.status} ${response.statusText}`);
+        }
+        // 清理临时文件
+        await packer.clean();
+        return {
+            UnixTimestamp
+        };
+    }
     async createAccessPath(name, path) {
         const access = this.environment.getAccessService();
         try {
@@ -1128,11 +1297,13 @@ class FunctionService {
         }
     }
     async getCodeParams(options, installDependency) {
-        const { func, functionPath, functionRootPath, base64Code } = options;
-        // 20MB
-        const BIG_LENGTH = 167772160;
-        if ((base64Code === null || base64Code === void 0 ? void 0 : base64Code.length) > BIG_LENGTH) {
-            throw new error_1.CloudBaseError('base64 不能大于 20 MB');
+        const { func, functionPath, functionRootPath, base64Code, deployMode } = options;
+        // 更新的时候直接上传的zip包的情况
+        // ZIP 包大小上限 20MB，base64 编码后长度约为原始大小的 4/3
+        const MAX_ZIP_SIZE = 20 * 1024 * 1024; // 20MB
+        const MAX_BASE64_LENGTH = Math.floor(MAX_ZIP_SIZE * 4 / 3); // ≈ 27962026
+        if ((base64Code === null || base64Code === void 0 ? void 0 : base64Code.length) > MAX_BASE64_LENGTH) {
+            throw new error_1.CloudBaseError('ZIP 包不能大于 20MB');
         }
         if (base64Code === null || base64Code === void 0 ? void 0 : base64Code.length) {
             return {
@@ -1152,11 +1323,22 @@ class FunctionService {
             root: functionRootPath
         });
         await packer.build();
-        // 通过云 API 传输的代码大小不能超过 50MB
+        // 如果指定了上传方式，按指定方式上传
+        // 判断是否需要走 COS 上传
         const reachMax = await packer.isReachMaxSize();
-        if (reachMax) {
-            throw new error_1.CloudBaseError('函数代码不能大于 50MB');
+        const useCos = deployMode === 'cos' || (deployMode !== 'zip' && reachMax);
+        if (useCos) {
+            // 先调用scf的 COS 上传方式
+            const legacyResult = await this.uploadFunctionZipToCosLegacy(options, installDependency);
+            // 再调用tcb COS 上传方式
+            const cosResult = await this.uploadFunctionZipToCos(options, installDependency);
+            return {
+                CosTimestamp: cosResult.UnixTimestamp,
+                CosBucketRegion: 'ap-shanghai',
+                TempCosObjectName: `/${legacyResult.Key}`
+            };
         }
+        // ZIP base64 上传
         const base64 = await packer.getBase64Code();
         if (!(base64 === null || base64 === void 0 ? void 0 : base64.length)) {
             throw new error_1.CloudBaseError('文件不能为空');
@@ -1250,45 +1432,6 @@ class FunctionService {
         });
         return SubnetSet;
     }
-    // 检查函数状态，部分操作在函数更新中时不可进行
-    async waitFunctionActive(funcName, codeSecret) {
-        let ticker;
-        let timer;
-        let resolved;
-        return new Promise((resolve, reject) => {
-            // 超时时间 5 分钟
-            timer = setTimeout(() => {
-                clearInterval(ticker);
-                if (!resolved) {
-                    reject(new error_1.CloudBaseError('函数状态异常，检查超时'));
-                }
-            }, 300000);
-            ticker = setInterval(async () => {
-                try {
-                    const { Status, StatusDesc, StatusReasons, RequestId } = await this.getFunctionDetail(funcName, codeSecret);
-                    // 更新中
-                    if (Status === constant_1.SCF_STATUS.CREATING || Status === constant_1.SCF_STATUS.UPDATING)
-                        return;
-                    // 创建失败
-                    if (Status === constant_1.SCF_STATUS.CREATE_FAILED) {
-                        StatusDesc && console.log(`函数状态描述: ${StatusDesc}`);
-                        const errorDetails = StatusReasons.map(item => `[${item.ErrorCode}] ${item.ErrorMessage}`).join('\n');
-                        throw new error_1.CloudBaseError(`云函数创建失败\n失败信息: ${errorDetails}\nRequestId: ${RequestId}`);
-                    }
-                    // 函数状态正常
-                    clearInterval(ticker);
-                    clearTimeout(timer);
-                    resolve();
-                }
-                catch (e) {
-                    clearInterval(ticker);
-                    clearTimeout(timer);
-                    reject(e);
-                }
-                resolved = true;
-            }, 1000);
-        });
-    }
 }
 exports.FunctionService = FunctionService;
 __decorate([
@@ -1399,6 +1542,12 @@ __decorate([
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "getFunctionAlias", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "uploadFunctionZipToCosLegacy", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], FunctionService.prototype, "uploadFunctionZipToCos", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "createAccessPath", null);

package/lib/function/packer.js

@@ -88,6 +88,7 @@ class FunctionPacker {
             zipOption.pattern = this.incrementalPath;
         }
         await (0, utils_1.compressToZip)(zipOption);
+        return this.zipFilePath;
     }
     // 获取 Java 代码
     getJavaFile() {

package/lib/user/index.js

@@ -111,6 +111,9 @@ class UserService {
                 }]
         });
     }
+    async getTcbAccountInfo() {
+        return this.tcbService.request('DescribeTcbAccountInfo');
+    }
     isValidStr(obj) {
         return typeof obj === 'string' && obj.trim().length > 0;
     }

package/package.json

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

package/types/function/index.d.ts

@@ -6,6 +6,7 @@ export interface IFunctionCode {
     functionRootPath?: string;
     base64Code?: string;
     functionPath?: string;
+    deployMode?: 'cos' | 'zip';
 }
 export interface ICreateFunctionParam {
     func: ICloudFunction & {
@@ -16,6 +17,7 @@ export interface ICreateFunctionParam {
     base64Code?: string;
     functionPath?: string;
     codeSecret?: string;
+    deployMode?: 'cos' | 'zip';
 }
 export interface IUpdateFunctionCodeParam {
     func: ICloudFunction;
@@ -23,6 +25,7 @@ export interface IUpdateFunctionCodeParam {
     functionRootPath?: string;
     base64Code?: string;
     codeSecret?: string;
+    deployMode?: 'cos' | 'zip';
 }
 export interface IUpdateFunctionIncrementalCodeParam {
     func: ICloudFunction;
@@ -225,6 +228,7 @@ export declare class FunctionService {
     private vpcService;
     private scfService;
     private tcbService;
+    private userService;
     constructor(environment: Environment);
     /**
      * 增量更新函数代码
@@ -425,6 +429,7 @@ export declare class FunctionService {
     listLayerVersions(options: IVersionListOptions): Promise<IListLayerVersionsRes>;
     listLayers(options: ILayerListOptions): Promise<IListLayerRes>;
     getLayerVersion(options: ILayerOptions): Promise<IGetLayerVersionRes>;
+    waitFunctionActive(funcName: string, codeSecret?: string): Promise<void>;
     /**
      * 设置预置并发
      * @private
@@ -477,6 +482,20 @@ export declare class FunctionService {
      * @memberof FunctionService
      */
     getFunctionAlias(params: IGetFunctionAlias): Promise<IGetFunctionAliasRes>;
+    /**
+     * 通过scf COS 上传方式（通过 GetTempCosInfo + COS SDK 上传）
+     * 返回 TempCosObjectName 用于创建/更新函数
+     */
+    uploadFunctionZipToCosLegacy(options: IFunctionCode, installDependency: 'TRUE' | 'FALSE'): Promise<{
+        Key: string;
+    }>;
+    /**
+     * 新的 COS 上传方式（通过 DescribeBuildServiceCosInfo + PUT 上传）
+     * 返回 CosTimestamp 用于创建/更新函数
+     */
+    uploadFunctionZipToCos(options: IFunctionCode, installDependency: 'TRUE' | 'FALSE'): Promise<{
+        UnixTimestamp: string;
+    }>;
     private createAccessPath;
     private getCodeParams;
     private getTempCosInfo;
@@ -503,5 +522,4 @@ export declare class FunctionService {
      * @returns
      */
     private getSubnets;
-    private waitFunctionActive;
 }

package/types/function/packer.d.ts

@@ -27,7 +27,7 @@ export declare class FunctionPacker {
     incrementalPath: string;
     codeType: CodeType;
     constructor(options: IPackerOptions);
-    compressFiles(): Promise<void>;
+    compressFiles(): Promise<string>;
     getJavaFile(): void;
     build(): Promise<void>;
     isBigFile(): Promise<boolean>;

package/types/function/types.d.ts

@@ -181,7 +181,10 @@ export interface ITag1 {
 export interface IFunctionCode {
     CosBucketName?: string;
     CosObjectName?: string;
-    ZipFile: string;
+    CosBucketRegion?: string;
+    TempCosObjectName?: string;
+    ZipFile?: string;
+    CosTimestamp?: string;
 }
 export interface ILayerVersionItem {
     LayerName: string;

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

@@ -23,6 +23,8 @@ export interface LayerVersionSimple {
 }
 export interface ICloudFunction extends ICloudFunctionConfig {
     name: string;
+    description?: string;
+    type?: 'Event' | 'HTTP';
     handler?: string;
     codeSecret?: string;
     isWaitInstall?: boolean;

package/types/user/index.d.ts

@@ -48,5 +48,11 @@ export declare class UserService {
     }): Promise<{
         RequestId: string;
     }>;
+    getTcbAccountInfo(): Promise<{
+        CloudUin: string;
+        CloudAppId: string;
+        WxAppId: string;
+        Channel: "ide" | "low_code";
+    }>;
     private isValidStr;
 }