@cloudbase/manager-node 4.10.0 → 4.10.2

package/lib/constant.js

@@ -62,5 +62,13 @@ exports.COS_SDK_KEEPALIVE = process.env.COS_SDK_KEEPALIVE;
 // SCF 临时 COS 配置（用于函数代码上传）
 exports.SCF_TEMP_COS = {
     APPID: '1253665819',
-    REGION: 'ap-shanghai'
+    // 区域前缀映射：region -> bucket 前缀
+    REGION_PREFIX_MAP: {
+        'ap-shanghai': 'sh',
+        'ap-guangzhou': 'gz',
+        'ap-beijing': 'bj',
+        'ap-singapore': 'sg'
+    },
+    DEFAULT_REGION_PREFIX: 'sh',
+    DEFAULT_REGION: 'ap-shanghai'
 };

package/lib/function/index.js

@@ -23,6 +23,30 @@ function isNodeFunction(runtime) {
     // 不严格限制
     return runtime === 'Nodejs10.15' || runtime === 'Nodejs8.9' || (runtime === null || runtime === void 0 ? void 0 : runtime.includes('Nodejs'));
 }
+/**
+ * 构建镜像配置对象
+ * @param imageConfig 镜像配置
+ * @param options 可选配置
+ * @param options.includeCommandList 是否包含 CommandList/ArgsList（仅 CreateFunction 支持）
+ * @returns 构建好的镜像配置对象
+ */
+function buildImageConfig(imageConfig, options) {
+    var _a, _b;
+    const { includeCommandList = false } = options || {};
+    const config = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ ImageType: imageConfig.imageType || 'enterprise', ImageUri: imageConfig.imageUri }, (imageConfig.registryId && { RegistryId: imageConfig.registryId })), (imageConfig.entryPoint && { EntryPoint: imageConfig.entryPoint })), (imageConfig.command && { Command: imageConfig.command })), (imageConfig.args && { Args: imageConfig.args })), (typeof imageConfig.containerImageAccelerate === 'boolean' && {
+        ContainerImageAccelerate: imageConfig.containerImageAccelerate
+    })), { ImagePort: imageConfig.imagePort || 9000 });
+    // CommandList 和 ArgsList 仅在 CreateFunction 时支持
+    if (includeCommandList) {
+        if ((_a = imageConfig.commandList) === null || _a === void 0 ? void 0 : _a.length) {
+            config.CommandList = imageConfig.commandList;
+        }
+        if ((_b = imageConfig.argsList) === null || _b === void 0 ? void 0 : _b.length) {
+            config.ArgsList = imageConfig.argsList;
+        }
+    }
+    return config;
+}
 // 解析函数配置，换成请求参数
 function configToParams(options) {
     var _a, _b, _c, _d, _e, _f, _g;
@@ -106,6 +130,12 @@ function configToParams(options) {
     if (func === null || func === void 0 ? void 0 : func.description) {
         params.Description = func.description;
     }
+    // 镜像配置（用于镜像部署）
+    if (func === null || func === void 0 ? void 0 : func.imageConfig) {
+        params.Code = {
+            ImageConfig: buildImageConfig(func.imageConfig, { includeCommandList: true })
+        };
+    }
     return params;
 }
 class FunctionService {
@@ -161,6 +191,7 @@ class FunctionService {
      * @returns {(Promise<IResponseInfo | ICreateFunctionRes>)}
      */
     async createFunction(funcParam) {
+        var _a;
         const { env } = this.getFunctionConfig();
         const { func, functionRootPath, force = false, base64Code, codeSecret, functionPath, deployMode } = funcParam;
         const funcName = func.name;
@@ -173,13 +204,30 @@ class FunctionService {
                 Stamp: 'MINI_QCBASE'
             }
         });
-        params.Code = await this.getCodeParams({
-            func,
-            base64Code,
-            functionPath,
-            functionRootPath,
-            deployMode
-        }, params.InstallDependency);
+        // 根据部署方式处理 Code 参数
+        // 优先使用显式指定的 deployMode，如果未指定但存在 imageConfig 则认为是镜像部署
+        const isImageDeploy = deployMode === 'image' || (!deployMode && func.imageConfig);
+        if (isImageDeploy) {
+            // 镜像部署：Code 参数已在 configToParams 中通过 imageConfig 设置
+            if (!((_a = func.imageConfig) === null || _a === void 0 ? void 0 : _a.imageUri)) {
+                throw new error_1.CloudBaseError('镜像部署需要配置 imageConfig.imageUri');
+            }
+            // 镜像部署的特殊配置
+            // 镜像函数不需要 Handler
+            delete params.Handler;
+            // 镜像函数不需要安装依赖
+            delete params.InstallDependency;
+        }
+        else {
+            // 代码部署：通过 getCodeParams 获取代码参数
+            params.Code = await this.getCodeParams({
+                func,
+                base64Code,
+                functionPath,
+                functionRootPath,
+                deployMode
+            }, params.InstallDependency);
+        }
         const { TopicId, LogsetId } = this.getClsServiceConfig();
         params.ClsTopicId = TopicId;
         params.ClsLogsetId = LogsetId;
@@ -203,13 +251,14 @@ class FunctionService {
             const functionExist = e.code === 'ResourceInUse.FunctionName' || e.code === 'ResourceInUse.Function';
             // 已存在同名函数，强制更新
             if (functionExist && force) {
-                // 1. 更新函数配置和代码，同名函数可能存在 codeSecret，先修改代码，清除 codeSecret
+                // 1. 更新函数代码（通过 deployMode 区分镜像部署和代码部署）
                 const codeRes = await this.updateFunctionCode({
                     func,
                     base64Code,
                     functionPath,
                     functionRootPath,
-                    codeSecret: codeSecret
+                    codeSecret: codeSecret,
+                    deployMode: isImageDeploy ? 'image' : undefined
                 });
                 // 等待函数状态正常
                 await this.waitFunctionActive(funcName, codeSecret);
@@ -663,9 +712,35 @@ class FunctionService {
      * @memberof FunctionService
      */
     async updateFunctionCode(funcParam) {
+        var _a;
         const { func, functionRootPath, base64Code, codeSecret, functionPath, deployMode } = funcParam;
         const funcName = func.name;
         const { env } = this.getFunctionConfig();
+        // 镜像部署：使用镜像配置更新函数代码
+        if (deployMode === 'image') {
+            if (!((_a = func.imageConfig) === null || _a === void 0 ? void 0 : _a.imageUri)) {
+                throw new error_1.CloudBaseError('镜像部署需要配置 imageConfig.imageUri');
+            }
+            const params = {
+                FunctionName: funcName,
+                EnvId: env,
+                Code: {
+                    ImageConfig: buildImageConfig(func.imageConfig)
+                }
+            };
+            try {
+                // 等待函数状态正常
+                await this.waitFunctionActive(funcName, codeSecret);
+                return await this.tcbService.request('UpdateFunctionCode', params);
+            }
+            catch (e) {
+                throw new error_1.CloudBaseError(`[${funcName}] 函数代码更新失败：${e.message}`, {
+                    code: e.code,
+                    requestId: e.requestId
+                });
+            }
+        }
+        // 代码部署：原有逻辑
         let installDependency;
         // Node 函数默认安装依赖
         installDependency = isNodeFunction(func.runtime) ? 'TRUE' : 'FALSE';
@@ -1237,11 +1312,14 @@ class FunctionService {
         });
         const zipFilePath = await packer.compressFiles();
         // 3. 初始化 cos 并上传
+        // 根据环境 region 获取对应的 bucket 前缀
+        const region = this.environment.cloudBaseContext.region || constant_1.SCF_TEMP_COS.DEFAULT_REGION;
+        const regionPrefix = constant_1.SCF_TEMP_COS.REGION_PREFIX_MAP[region] || constant_1.SCF_TEMP_COS.DEFAULT_REGION_PREFIX;
         const tempCosObjectName = `/${cosDate}/${objectPath}`;
         const uploadParams = {
-            Bucket: `shtempcos-${constant_1.SCF_TEMP_COS.APPID}`,
+            Bucket: `${regionPrefix}tempcos-${constant_1.SCF_TEMP_COS.APPID}`,
             Key: tempCosObjectName,
-            Region: constant_1.SCF_TEMP_COS.REGION,
+            Region: region,
             FilePath: zipFilePath,
         };
         const cos = new cos_nodejs_sdk_v5_1.default({
@@ -1384,9 +1462,10 @@ class FunctionService {
         }
         // 默认走 COS 上传
         console.log(`[${func.name}] 部署方式: COS 上传`);
+        const region = this.environment.cloudBaseContext.region || constant_1.SCF_TEMP_COS.DEFAULT_REGION;
         const legacyResult = await this.uploadFunctionZipToCosLegacy(options, installDependency);
         return {
-            CosBucketRegion: constant_1.SCF_TEMP_COS.REGION,
+            CosBucketRegion: region,
             TempCosObjectName: `/${legacyResult.Key}`
         };
     }

package/package.json

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

package/types/constant.d.ts

@@ -50,5 +50,7 @@ export declare const COS_SDK_PROTOCOL: string;
 export declare const COS_SDK_KEEPALIVE: string;
 export declare const SCF_TEMP_COS: {
     APPID: string;
-    REGION: string;
+    REGION_PREFIX_MAP: Record<string, string>;
+    DEFAULT_REGION_PREFIX: string;
+    DEFAULT_REGION: string;
 };

package/types/function/index.d.ts

@@ -6,7 +6,7 @@ export interface IFunctionCode {
     functionRootPath?: string;
     base64Code?: string;
     functionPath?: string;
-    deployMode?: 'cos' | 'zip';
+    deployMode?: 'cos' | 'zip' | 'image';
 }
 export interface ICreateFunctionParam {
     func: ICloudFunction & {
@@ -17,7 +17,7 @@ export interface ICreateFunctionParam {
     base64Code?: string;
     functionPath?: string;
     codeSecret?: string;
-    deployMode?: 'cos' | 'zip';
+    deployMode?: 'cos' | 'zip' | 'image';
 }
 export interface IUpdateFunctionCodeParam {
     func: ICloudFunction;
@@ -25,7 +25,7 @@ export interface IUpdateFunctionCodeParam {
     functionRootPath?: string;
     base64Code?: string;
     codeSecret?: string;
-    deployMode?: 'cos' | 'zip';
+    deployMode?: 'cos' | 'zip' | 'image';
 }
 export interface IUpdateFunctionIncrementalCodeParam {
     func: ICloudFunction;
@@ -36,7 +36,7 @@ export interface IUpdateFunctionIncrementalCodeParam {
 export interface ICreateFunctionRes {
     triggerRes: IResponseInfo;
     configRes: IResponseInfo;
-    codeRes: IResponseInfo;
+    codeRes?: IResponseInfo;
 }
 export interface IFunctionLayerOptions {
     contentPath?: string;

package/types/function/types.d.ts

@@ -191,22 +191,22 @@ export interface ILayerVersionItem {
     LayerVersion: number;
 }
 export interface IFunctionUpdateAttribute {
-    Code: IFunctionCode;
-    Description: string;
+    Code?: IFunctionCode;
+    Description?: string;
     FunctionName: string;
-    MemorySize: number;
-    Timeout: number;
-    UseGpu: 'FALSE' | 'TRUE';
-    Namespace: string;
-    Environment: {
+    MemorySize?: number;
+    Timeout?: number;
+    UseGpu?: 'FALSE' | 'TRUE';
+    Namespace?: string;
+    Environment?: {
         Variables: IEnvVariable[];
     };
-    VpcConfig: {
+    VpcConfig?: {
         VpcId: string;
         SubnetId: string;
     };
     InstallDependency?: 'FALSE' | 'TRUE';
-    PublicNetConfig: {
+    PublicNetConfig?: {
         PublicNetStatus: string;
         EipConfig: {
             EipStatus: string;
@@ -216,4 +216,20 @@ export interface IFunctionUpdateAttribute {
     Layers?: ILayerVersionItem[];
     ClsLogsetId?: string;
     ClsTopicId?: string;
+    Runtime?: string;
+    Handler?: string;
+    Role?: string;
+    L5Enable?: string | null;
+    CodeSecret?: string;
+    Type?: string;
+    ProtocolType?: string;
+    ProtocolParams?: {
+        WSParams?: {
+            IdleTimeOut?: number;
+        };
+    };
+    InstanceConcurrencyConfig?: {
+        DynamicEnabled?: 'FALSE' | 'TRUE';
+        MaxConcurrency?: number;
+    };
 }

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

@@ -21,6 +21,18 @@ export interface LayerVersionSimple {
     LayerName: string;
     LayerVersion: number;
 }
+export interface IFunctionImageConfig {
+    imageType: 'enterprise' | 'personal';
+    imageUri: string;
+    registryId?: string;
+    entryPoint?: string;
+    command?: string;
+    args?: string;
+    containerImageAccelerate?: boolean;
+    imagePort?: number;
+    commandList?: string[];
+    argsList?: string[];
+}
 export interface ICloudFunction extends ICloudFunctionConfig {
     name: string;
     description?: string;
@@ -44,6 +56,7 @@ export interface ICloudFunction extends ICloudFunctionConfig {
         version: number;
     }[];
     triggers?: ICloudFunctionTrigger[];
+    imageConfig?: IFunctionImageConfig;
 }
 export interface ICloudFunctionV2 {
     name: string;