@cloudbase/manager-node 4.7.0 → 4.7.2

package/lib/constant.js

@@ -4,7 +4,7 @@
 //     static credentail = 'credential'
 // }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COS_SDK_KEEPALIVE = exports.COS_SDK_PROTOCOL = exports.USE_INTERNAL_ENDPOINT = exports.SCF_STATUS = exports.ROLE_NAME = exports.PUBLIC_RSA_KEY = exports.ERROR = exports.SERVICE_TYPE = exports.ENDPOINT = exports.RUN_ENV = exports.SDK_VERSION = exports.ENV_NAME = void 0;
+exports.COS_SDK_KEEPALIVE = exports.COS_SDK_PROTOCOL = exports.INTERNAL_ENDPOINT_REGION = exports.USE_INTERNAL_ENDPOINT = exports.SCF_STATUS = exports.ROLE_NAME = exports.PUBLIC_RSA_KEY = exports.ERROR = exports.SERVICE_TYPE = exports.ENDPOINT = exports.RUN_ENV = exports.SDK_VERSION = exports.ENV_NAME = void 0;
 exports.ENV_NAME = {
     ENV_SECRETID: 'TENCENTCLOUD_SECRETID',
     ENV_SECRETKEY: 'TENCENTCLOUD_SECRETKEY',
@@ -56,5 +56,6 @@ exports.SCF_STATUS = {
 };
 // 是否使用内网域名
 exports.USE_INTERNAL_ENDPOINT = "USE_INTERNAL_ENDPOINT" in process.env;
+exports.INTERNAL_ENDPOINT_REGION = process.env.INTERNAL_ENDPOINT_REGION;
 exports.COS_SDK_PROTOCOL = process.env.COS_SDK_PROTOCOL;
 exports.COS_SDK_KEEPALIVE = process.env.COS_SDK_KEEPALIVE;

package/lib/context.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudBaseContext = void 0;
 const constant_1 = require("./constant");
 class CloudBaseContext {
-    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '', useInternalEndpoint = undefined }) {
+    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '', useInternalEndpoint = undefined, internalEndpointRegion = undefined }) {
         this.secretId = secretId;
         this.secretKey = secretKey;
         this.token = token;
@@ -11,9 +11,13 @@ class CloudBaseContext {
         this.region = region;
         this.envType = envType;
         this.useInternalEndpoint = useInternalEndpoint;
+        this.internalEndpointRegion = internalEndpointRegion;
     }
     isInternalEndpoint() {
         return this.useInternalEndpoint !== undefined ? this.useInternalEndpoint : constant_1.USE_INTERNAL_ENDPOINT;
     }
+    getInternalEndpointRegion() {
+        return this.internalEndpointRegion || constant_1.INTERNAL_ENDPOINT_REGION;
+    }
 }
 exports.CloudBaseContext = CloudBaseContext;

package/lib/function/index.js

@@ -1298,12 +1298,12 @@ class FunctionService {
     }
     async getCodeParams(options, installDependency) {
         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
+        // 直接传入 base64Code 的情况，校验大小
+        // ZipFile 上传大小上限 1.5MB，base64 编码后长度约为原始大小的 4/3
+        const MAX_ZIP_SIZE = 1.5 * 1024 * 1024; // 1.5MB
+        const MAX_BASE64_LENGTH = Math.floor(MAX_ZIP_SIZE * 4 / 3); // ≈ 2097152
         if ((base64Code === null || base64Code === void 0 ? void 0 : base64Code.length) > MAX_BASE64_LENGTH) {
-            throw new error_1.CloudBaseError('ZIP 包不能大于 20MB');
+            throw new error_1.CloudBaseError('ZipFile 上传不能大于 1.5MB，请使用 COS 上传方式');
         }
         if (base64Code === null || base64Code === void 0 ? void 0 : base64Code.length) {
             return {
@@ -1323,10 +1323,14 @@ class FunctionService {
             root: functionRootPath
         });
         await packer.build();
-        // 如果指定了上传方式，按指定方式上传
-        // 判断是否需要走 COS 上传
+        // 判断是否超过 ZipFile 上传大小限制（1.5MB）
         const reachMax = await packer.isReachMaxSize();
-        const useCos = deployMode === 'cos' || (deployMode !== 'zip' && reachMax);
+        // 如果指定了 zip 上传方式但超过大小限制，直接报错
+        if (deployMode === 'zip' && reachMax) {
+            throw new error_1.CloudBaseError('ZipFile 上传不能大于 1.5MB，请使用 COS 上传方式（deployMode: "cos"）');
+        }
+        // 走 COS 上传：指定 cos 模式，或未指定模式但超过大小限制
+        const useCos = deployMode === 'cos' || reachMax;
         if (useCos) {
             // 先调用scf的 COS 上传方式
             const legacyResult = await this.uploadFunctionZipToCosLegacy(options, installDependency);

package/lib/function/packer.js

@@ -47,7 +47,8 @@ const error_1 = require("../error");
 const os = __importStar(require("os"));
 // 10 MB
 exports.BIG_FILE_SIZE = 10485760;
-exports.API_MAX_SIZE = 52428800;
+// ZipFile 上传最大 1.5MB
+exports.API_MAX_SIZE = 1.5 * 1024 * 1024;
 var CodeType;
 (function (CodeType) {
     CodeType[CodeType["File"] = 0] = "File";
@@ -136,7 +137,7 @@ class FunctionPacker {
         const fileStats = await promiseStat(this.zipFilePath);
         return fileStats.size > exports.BIG_FILE_SIZE;
     }
-    // API 最大 50MB
+    // ZipFile 上传最大 1.5MB
     async isReachMaxSize() {
         if (!this.zipFilePath) {
             await this.build();

package/lib/index.js

@@ -18,7 +18,7 @@ class CloudBase {
     }
     constructor(config = {}) {
         this.cloudBaseConfig = {};
-        let { secretId, secretKey, token, envId, proxy, region, envType, useInternalEndpoint } = config;
+        let { secretId, secretKey, token, envId, proxy, region, envType, useInternalEndpoint, internalEndpointRegion } = config;
         // config 中传入的 secretId secretkey 必须同时存在
         if ((secretId && !secretKey) || (!secretId && secretKey)) {
             throw new Error('secretId and secretKey must be a pair');
@@ -31,7 +31,8 @@ class CloudBase {
             envType,
             proxy,
             region,
-            useInternalEndpoint
+            useInternalEndpoint,
+            internalEndpointRegion,
         };
         // 初始化 context
         this.context = new context_1.CloudBaseContext(this.cloudBaseConfig);

package/lib/utils/cloud-api-request.js

@@ -62,6 +62,7 @@ class CloudService {
     }
     get baseUrl() {
         const internalEndpoint = this.cloudBaseContext.isInternalEndpoint();
+        const internalEndpointRegion = this.cloudBaseContext.getInternalEndpointRegion();
         const tcb = process.env.TCB_BASE_URL || 'https://tcb.tencentcloudapi.com';
         const urlMap = {
             tcb,
@@ -76,6 +77,9 @@ class CloudService {
             [service]: `https://${service}.internal.tencentcloudapi.com`,
         })).reduce((acc, cur) => (Object.assign(Object.assign({}, acc), cur)), {});
         if (internalEndpoint) {
+            if (internalEndpointRegion) {
+                return `https://${this.service}.${internalEndpointRegion}.tencentcloudapi.woa.com`;
+            }
             return intranetUrlMap[this.service] || `https://${this.service}.internal.tencentcloudapi.com`;
         }
         if (urlMap[this.service]) {

package/package.json

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

package/types/constant.d.ts

@@ -41,6 +41,7 @@ export declare const SCF_STATUS: {
     DELETE_FAILED: string;
 };
 export declare const USE_INTERNAL_ENDPOINT: boolean;
+export declare const INTERNAL_ENDPOINT_REGION: string;
 export declare const enum COS_ENDPOINT {
     INTERNAL = "{Bucket}.cos-internal.{Region}.tencentcos.cn",
     PUBLIC = "{Bucket}.cos.{Region}.tencentcos.cn"

package/types/context.d.ts

@@ -7,7 +7,8 @@ export declare class CloudBaseContext {
     readonly region: string;
     readonly envType: string;
     readonly useInternalEndpoint?: boolean;
-    constructor({ secretId, secretKey, token, proxy, region, envType, useInternalEndpoint }: {
+    readonly internalEndpointRegion?: string;
+    constructor({ secretId, secretKey, token, proxy, region, envType, useInternalEndpoint, internalEndpointRegion }: {
         secretId?: string;
         secretKey?: string;
         token?: string;
@@ -15,6 +16,8 @@ export declare class CloudBaseContext {
         region?: string;
         envType?: string;
         useInternalEndpoint?: any;
+        internalEndpointRegion?: any;
     });
     isInternalEndpoint(): boolean;
+    getInternalEndpointRegion(): string;
 }

package/types/function/packer.d.ts

@@ -1,5 +1,5 @@
 export declare const BIG_FILE_SIZE = 10485760;
-export declare const API_MAX_SIZE = 52428800;
+export declare const API_MAX_SIZE: number;
 export declare enum CodeType {
     File = 0,
     JavaFile = 1

package/types/index.d.ts

@@ -21,6 +21,7 @@ interface CloudBaseConfig {
     region?: string;
     envType?: string;
     useInternalEndpoint?: boolean;
+    internalEndpointRegion?: string;
 }
 declare class CloudBase {
     private static cloudBase;