@cloudbase/manager-node 5.6.3 → 5.6.4

package/lib/function/index.js

@@ -290,7 +290,7 @@ class FunctionService {
     async createFunction(funcParam) {
         var _a, _b, _c;
         const { namespace } = this.getFunctionConfig();
-        const { func, functionRootPath, force = false, base64Code, codeSecret, functionPath, deployMode } = funcParam;
+        const { func, functionRootPath, force = false, base64Code, codeSecret, functionPath, deployMode, code } = funcParam;
         const funcName = func.name;
         const { TopicId, LogsetId } = this.getClsServiceConfig();
         const params = configToParams({
@@ -304,20 +304,30 @@ class FunctionService {
                 ClsLogsetId: LogsetId
             }
         });
+        const customCode = code;
+        const customImageCode = customCode === null || customCode === void 0 ? void 0 : customCode.ImageConfig;
+        const funcImageCode = (_a = params.Code) === null || _a === void 0 ? void 0 : _a.ImageConfig;
         // 根据部署方式处理 Code 参数
-        // 优先使用显式指定的 deployMode，如果未指定但存在 imageConfig 则认为是镜像部署
-        const isImageDeploy = deployMode === 'image' || (!deployMode && ((_a = params.Code) === null || _a === void 0 ? void 0 : _a.ImageConfig));
+        // 优先级：deployMode=image > 显式传入 code > 原有自动打包逻辑（base64Code/functionPath/functionRootPath）
+        const isImageDeploy = deployMode === 'image' || Boolean(customImageCode) || (!deployMode && Boolean(funcImageCode));
         if (isImageDeploy) {
-            // 镜像部署：Code 参数已在 configToParams 中通过 imageConfig 设置
+            // 镜像部署优先使用显式 code.ImageConfig；未传时回退到 func.imageConfig（configToParams 生成）
+            if (customImageCode) {
+                params.Code = customCode;
+            }
             if (!((_c = (_b = params.Code) === null || _b === void 0 ? void 0 : _b.ImageConfig) === null || _c === void 0 ? void 0 : _c.ImageUri)) {
                 throw new error_1.CloudBaseError('镜像部署需要配置 imageConfig.imageUri');
             }
-            // 镜像部署的特殊配置
-            // 镜像函数不需要 Handler
+            // 镜像函数不需要 Handler / InstallDependency
             delete params.Handler;
-            // 镜像函数不需要安装依赖
             delete params.InstallDependency;
         }
+        else if (customCode) {
+            if (base64Code || functionPath || functionRootPath) {
+                console.warn(`[${funcName}] 检测到同时传入 code 与本地打包参数，已优先使用 code 参数`);
+            }
+            params.Code = customCode;
+        }
         else {
             // 代码部署：通过 getCodeParams 获取代码参数
             params.Code = await this.getCodeParams({
@@ -372,7 +382,8 @@ class FunctionService {
                         functionPath,
                         functionRootPath,
                         codeSecret: codeSecret,
-                        deployMode: isImageDeploy ? 'image' : undefined
+                        deployMode: isImageDeploy ? 'image' : deployMode,
+                        code
                     });
                     // 等待函数状态正常
                     await this.waitFunctionActive(funcName, codeSecret);
@@ -877,7 +888,7 @@ class FunctionService {
      * @memberof FunctionService
      */
     async updateFunctionCode(funcParam) {
-        const { func, functionRootPath, base64Code, codeSecret, functionPath, deployMode } = funcParam;
+        const { func, functionRootPath, base64Code, codeSecret, functionPath, deployMode, code } = funcParam;
         const funcName = func.name;
         const { namespace } = this.getFunctionConfig();
         // 镜像部署：使用镜像配置更新函数代码
@@ -904,6 +915,10 @@ class FunctionService {
                 });
             }
         }
+        const customCode = code;
+        if (customCode && (base64Code || functionPath || functionRootPath)) {
+            console.warn(`[${funcName}] 检测到同时传入 code 与本地打包参数，已优先使用 code 参数`);
+        }
         // 代码部署：原有逻辑
         let installDependency;
         // Node 函数默认安装依赖
@@ -912,7 +927,7 @@ class FunctionService {
         if (func.installDependency !== undefined) {
             installDependency = toBooleanString(func.installDependency);
         }
-        const codeParams = await this.getCodeParams({
+        const codeParams = customCode || await this.getCodeParams({
             func,
             functionPath,
             functionRootPath,

package/package.json

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

package/types/function/index.d.ts

@@ -1,6 +1,6 @@
 import { Environment } from '../environment';
 import { IResponseInfo, ICloudFunction, ICloudFunctionV2, IFunctionLogOptions, ICloudFunctionTrigger, IFunctionInvokeRes, IFunctionLogRes, IFunctionDownloadUrlRes, IFunctionLogDetailOptions, IFunctionLogDetailRes, IFunctionLogOptionsV2, IFunctionLogResV2 } from '../interfaces';
-import { IFunctionInfo } from './types';
+import { IFunctionInfo, IFunctionCode as IScfFunctionCode } from './types';
 export interface IFunctionCode {
     func: ICloudFunction;
     functionRootPath?: string;
@@ -18,6 +18,7 @@ export interface ICreateFunctionParam {
     functionPath?: string;
     codeSecret?: string;
     deployMode?: 'cos' | 'zip' | 'image';
+    code?: IScfFunctionCode;
 }
 export interface IUpdateFunctionCodeParam {
     func: ICloudFunction;
@@ -26,6 +27,7 @@ export interface IUpdateFunctionCodeParam {
     base64Code?: string;
     codeSecret?: string;
     deployMode?: 'cos' | 'zip' | 'image';
+    code?: IScfFunctionCode;
 }
 export interface IUpdateFunctionIncrementalCodeParam {
     func: ICloudFunction;