@cloudbase/manager-node 5.7.0-beta.3 → 5.7.1-beta.1

package/jest.config.unit.js

@@ -0,0 +1,14 @@
+// 仅供不依赖真实云凭证的单元测试使用：跳过 globalSetup
+module.exports = {
+    roots: ['<rootDir>/test'],
+    globals: {
+        'ts-jest': {
+            tsConfig: 'tsconfig.test.json'
+        }
+    },
+    transform: {
+        '^.+\\.ts?$': 'ts-jest'
+    },
+    transformIgnorePatterns: ['node_modules'],
+    testEnvironment: 'node'
+}

package/lib/cloudApp/index.js

@@ -123,14 +123,10 @@ class CloudAppService {
      * 注意：此方法不依赖应用是否已创建，可在创建应用前调用
      * 返回的 cosTimestamp 用于 createApp 时传入 staticConfig.cosTimestamp
      *
-     * 内置默认忽略：.git 目录、.DS_Store（含任意层级）；node_modules 仅在
-     * excludeNodeModules 为 true（默认）时排除——云端构建（需云端 install）场景应传
-     * excludeNodeModules: false 允许私有/离线依赖随源码包上传。
-     *
      * @param params 上传参数
      */
     async uploadCode(params) {
-        const { serviceName, localPath, ignore = [], excludeNodeModules = true, onPhase } = params;
+        const { serviceName, localPath, ignore = [], onPhase } = params;
         // 1. 验证本地路径
         if (!fs_1.default.existsSync(localPath)) {
             throw new error_1.CloudBaseError(`本地路径不存在: ${localPath}`);
@@ -139,14 +135,9 @@ class CloudAppService {
         if (!stat.isDirectory()) {
             throw new error_1.CloudBaseError(`localPath 必须是目录: ${localPath}`);
         }
-        // 2. 打包本地文件为 ZIP（node_modules 按场景决定是否排除）
+        // 2. 打包本地文件为 ZIP
         const tmpZipPath = path_1.default.join(os_1.default.tmpdir(), `cloudapp-${Date.now()}-${Math.random().toString(36).slice(2)}.zip`);
-        const defaultIgnore = [
-            ...(excludeNodeModules ? ['node_modules/**'] : []),
-            '.git/**',
-            '.DS_Store',
-            '**/.DS_Store'
-        ];
+        const defaultIgnore = ['node_modules/**', '.git/**', '.DS_Store', '**/.DS_Store'];
         const packStart = Date.now();
         await (0, utils_1.compressToZip)({
             dirPath: localPath,

package/lib/env/index.js

@@ -28,6 +28,7 @@ class EnvService {
         this.tcbService = new utils_1.CloudService(environment.cloudBaseContext, 'tcb', '2018-06-08');
         this.commonService = environment.getCommonService('lowcode', '2021-01-08');
         this.billingService = new billing_1.BillingService(environment.cloudBaseContext);
+        this.certificateCloudService = new utils_1.CloudService(environment.cloudBaseContext, 'ssl', '2019-12-05');
         this.tokenCache = new Map();
     }
     /**
@@ -769,6 +770,23 @@ class EnvService {
     async describeCreditsUsageDetail(params) {
         return this.cloudService.request('DescribeCreditsUsageDetail', Object.assign({}, params));
     }
+    /**
+     * 获取当前凭证有权限访问的 SSL 证书列表。
+     *
+     * 证书用于自定义域名 HTTPS 配置，本接口不依赖 CloudBase 环境信息。
+     * @param {DescribeCertificatesParams} params 查询参数
+     * @returns {Promise<DescribeCertificatesRes>}
+     */
+    async describeCertificates(params = {}) {
+        if (params.Offset !== undefined && (!Number.isInteger(params.Offset) || params.Offset < 0)) {
+            throw new error_1.CloudBaseError('Offset 必须是大于等于 0 的整数');
+        }
+        if (params.Limit !== undefined &&
+            (!Number.isInteger(params.Limit) || params.Limit < 1 || params.Limit > 1000)) {
+            throw new error_1.CloudBaseError('Limit 必须是 1 至 1000 的整数');
+        }
+        return this.certificateCloudService.request('DescribeCertificates', params);
+    }
     /**
      * 查询HTTP访问服务域名路由信息
      * @param {DescribeHttpServiceRouteParams} params 查询参数
@@ -777,6 +795,15 @@ class EnvService {
     async describeHttpServiceRoute(params) {
         return this.cloudService.request('DescribeHTTPServiceRoute', Object.assign({}, params));
     }
+    /**
+     * 校验HTTP访问服务域名路由
+     * 此操作为只读预检，不会创建任何资源。
+     * @param {VerifyHttpServiceRouteParams} params 校验参数
+     * @returns {Promise<VerifyHttpServiceRouteRes>}
+     */
+    async verifyHttpServiceRoute(params) {
+        return this.cloudService.request('VerifyHTTPServiceRoute', Object.assign({}, params));
+    }
     /**
      * 创建HTTP访问服务域名路由
      * @param {CreateHttpServiceRouteParams} params 创建参数

package/lib/environment.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Environment = void 0;
 const database_1 = require("./database");
 const function_1 = require("./function");
-const FunctionDeployer_1 = require("./deploy/FunctionDeployer");
 const cloudrun_1 = require("./cloudrun");
 const agent_1 = require("./agent");
 const storage_1 = require("./storage");
@@ -84,16 +83,6 @@ class Environment {
     getFunctionService() {
         return this.functionService;
     }
-    /**
-     * 获取函数部署编排器
-     * 采用懒初始化，避免模块循环引用导致的初始化顺序问题
-     */
-    getFunctionDeployer() {
-        if (!this.functionDeployer) {
-            this.functionDeployer = new FunctionDeployer_1.FunctionDeployer(this);
-        }
-        return this.functionDeployer;
-    }
     getCloudRunService() {
         return this.cloudRunService;
     }

package/lib/function/index.js

@@ -18,6 +18,17 @@ const packer_1 = require("./packer");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
 const constant_1 = require("../constant");
+/**
+ * 解析环境变量为布尔值
+ * 视 'true'/'1'/'yes'/'on'（大小写不敏感）为 true，
+ * 其余（含 'false'/'0'/'no'/'off'/空串/undefined）为 false
+ * 避免 `!!process.env.X` 把 'FALSE'/'0' 等非空字符串误判为 true
+ */
+function parseEnvBoolean(value) {
+    if (!value)
+        return false;
+    return ['true', '1', 'yes', 'on'].includes(value.toLowerCase());
+}
 // 是否为 Node 函数
 function isNodeFunction(runtime) {
     // 不严格限制
@@ -244,6 +255,18 @@ class FunctionService {
         this.tcbService = new utils_1.CloudService(environment.cloudBaseContext, 'tcb', '2018-06-08');
         this.userService = environment.getUserService();
     }
+    // 是否启用 TCB 函数接口（ENABLE_TCBF 为真时开启：true/1/yes/on，大小写不敏感）
+    get useTcbFunctionApi() {
+        return parseEnvBoolean(process.env.ENABLE_TCBF);
+    }
+    // 函数操作使用的 CloudService 实例：开关开启走 tcb，否则走 scf
+    get functionCloudService() {
+        return this.useTcbFunctionApi ? this.tcbService : this.scfService;
+    }
+    // namespace 参数名：tcb 用 EnvId，scf 用 Namespace
+    get namespaceParamKey() {
+        return this.useTcbFunctionApi ? 'EnvId' : 'Namespace';
+    }
     /**
      * 增量更新函数代码
      * @param {IUpdateFunctionIncrementalCodeParam} funcParam
@@ -293,17 +316,27 @@ class FunctionService {
         const { func, functionRootPath, force = false, base64Code, codeSecret, functionPath, deployMode, code } = funcParam;
         const funcName = func.name;
         const { TopicId, LogsetId } = this.getClsServiceConfig();
+        const baseParams = {
+            [this.namespaceParamKey]: namespace,
+            Stamp: 'MINI_QCBASE',
+            ClsTopicId: TopicId,
+            ClsLogsetId: LogsetId
+        };
+        // 默认注入 TCB_QcsRole，DISABLE_DEFAULT_TCB_ROLE 为真时跳过（由 func.role 决定或留空）
+        if (!parseEnvBoolean(process.env.DISABLE_DEFAULT_TCB_ROLE)) {
+            baseParams.Role = 'TCB_QcsRole';
+        }
         const params = configToParams({
             func,
             codeSecret,
-            baseParams: {
-                Namespace: namespace,
-                Role: 'TCB_QcsRole',
-                Stamp: 'MINI_QCBASE',
-                ClsTopicId: TopicId,
-                ClsLogsetId: LogsetId
-            }
+            baseParams
         });
+        // ENABLE_TCBF 开启时，runtime 适配 tcb 风格
+        if (this.useTcbFunctionApi) {
+            if (!func.runtime) {
+                params.Runtime = 'Nodejs24.14';
+            }
+        }
         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;
@@ -340,7 +373,7 @@ class FunctionService {
         }
         try {
             // 创建云函数
-            const res = await this.scfService.request('CreateFunction', params);
+            const res = await this.functionCloudService.request('CreateFunction', params);
             // 等待函数状态正常
             await this.waitFunctionActive(funcName, codeSecret);
             // 创建函数触发器、失败自动重试
@@ -536,9 +569,9 @@ class FunctionService {
                 name: funcName
             });
         }
-        return await this.scfService.request('DeleteFunction', {
+        return await this.functionCloudService.request('DeleteFunction', {
             FunctionName: funcName,
-            Namespace: namespace
+            [this.namespaceParamKey]: namespace
         });
     }
     /**
@@ -569,12 +602,12 @@ class FunctionService {
         const params = {
             FunctionName: name,
             ShowCode: 'TRUE',
-            Namespace: namespace
+            [this.namespaceParamKey]: namespace
         };
         if (codeSecret) {
             params.CodeSecret = codeSecret;
         }
-        const data = await this.scfService.request('GetFunction', params);
+        const data = await this.functionCloudService.request('GetFunction', params);
         // 解析 VPC 配置
         const { VpcId = '', SubnetId = '' } = data.VpcConfig || {};
         if (VpcId && SubnetId) {
@@ -713,7 +746,7 @@ class FunctionService {
         const { TopicId, LogsetId } = this.getClsServiceConfig();
         // 构建参数
         const params = {
-            Namespace: namespace,
+            [this.namespaceParamKey]: namespace,
             FunctionName: func.name,
             ClsTopicId: TopicId,
             ClsLogsetId: LogsetId
@@ -727,7 +760,9 @@ class FunctionService {
             params[pascalKey] = toPascalCaseKeys(func[key]);
         }
         // 特殊处理：安装依赖标志（支持 boolean | string）
-        if (func.installDependency !== undefined) {
+        // 注意：ENABLE_TCBF 开启时，InstallDependency 属于 UpdateFunctionCode 的参数，
+        // tcb 的 UpdateFunctionConfiguration 不认，故跳过
+        if (func.installDependency !== undefined && !this.useTcbFunctionApi) {
             params.InstallDependency = toBooleanString(func.installDependency);
         }
         // 特殊处理：L5 配置（支持 boolean | string）
@@ -807,7 +842,7 @@ class FunctionService {
                     console.warn(`[${func.name}] 触发器更新失败：${triggerError.message}`);
                 }
             }
-            return this.scfService.request('UpdateFunctionConfiguration', params);
+            return this.functionCloudService.request('UpdateFunctionConfiguration', params);
         }
         catch (e) {
             throw new error_1.CloudBaseError(`[${func.name}] 更新函数配置失败：${e.message}`, {
@@ -830,7 +865,7 @@ class FunctionService {
         if (deployMode === 'image') {
             const params = {
                 FunctionName: funcName,
-                Namespace: namespace,
+                [this.namespaceParamKey]: namespace,
                 Code: {
                     ImageConfig: buildImageConfig(func.imageConfig)
                 }
@@ -841,7 +876,7 @@ class FunctionService {
             try {
                 // 等待函数状态正常
                 await this.waitFunctionActive(funcName, codeSecret);
-                return await this.scfService.request('UpdateFunctionCode', params);
+                return await this.functionCloudService.request('UpdateFunctionCode', params);
             }
             catch (e) {
                 throw new error_1.CloudBaseError(`[${funcName}] 函数代码更新失败：${e.message}`, {
@@ -871,7 +906,7 @@ class FunctionService {
         }, installDependency);
         const params = {
             FunctionName: funcName,
-            Namespace: namespace,
+            [this.namespaceParamKey]: namespace,
             Handler: func.handler || 'index.main',
             InstallDependency: installDependency,
             Code: codeParams
@@ -883,7 +918,7 @@ class FunctionService {
             // 等待函数状态正常
             await this.waitFunctionActive(funcName, codeSecret);
             // 更新云函数代码
-            const res = await this.scfService.request('UpdateFunctionCode', params);
+            const res = await this.functionCloudService.request('UpdateFunctionCode', params);
             if (installDependency && func.isWaitInstall === true) {
                 await this.waitFunctionActive(funcName, codeSecret);
             }
@@ -1109,12 +1144,16 @@ class FunctionService {
         const { destPath, envId, functionName, codeSecret } = options;
         // 检验路径是否存在
         (0, utils_1.checkFullAccess)(destPath, true);
-        // 获取下载链接
-        const { Url } = await this.scfService.request('GetFunctionAddress', {
+        // 获取下载链接：ENABLE_TCBF 开启走 tcb 的 DownloadFunction，否则走 scf 的 GetFunctionAddress
+        const action = this.useTcbFunctionApi ? 'DownloadFunction' : 'GetFunctionAddress';
+        const params = {
             FunctionName: functionName,
-            Namespace: envId,
-            CodeSecret: codeSecret
-        });
+            [this.namespaceParamKey]: envId
+        };
+        if (codeSecret) {
+            params.CodeSecret = codeSecret;
+        }
+        const { Url } = await this.functionCloudService.request(action, params);
         // 下载文件
         return (0, utils_1.downloadAndExtractRemoteZip)(Url, destPath);
     }
@@ -1129,13 +1168,15 @@ class FunctionService {
         const { namespace } = this.getFunctionConfig();
         const params = {
             FunctionName: functionName,
-            Namespace: namespace
+            [this.namespaceParamKey]: namespace
         };
         if (codeSecret) {
             params.CodeSecret = codeSecret;
         }
         try {
-            const { Url, CodeSha256, RequestId } = await this.scfService.request('GetFunctionAddress', params);
+            // ENABLE_TCBF 开启走 tcb 的 DownloadFunction，否则走 scf 的 GetFunctionAddress
+            const action = this.useTcbFunctionApi ? 'DownloadFunction' : 'GetFunctionAddress';
+            const { Url, CodeSha256, RequestId } = await this.functionCloudService.request(action, params);
             return { Url, RequestId, CodeSha256 };
         }
         catch (e) {

package/lib/hosting/index.js

@@ -364,7 +364,7 @@ class HostingService {
      * @param options
      */
     async setWebsiteDocument(options) {
-        const { indexDocument, errorDocument, originalHttpStatus, charity404, autoAddressing, routingRules } = options;
+        const { indexDocument, errorDocument, routingRules } = options;
         const hosting = await this.checkStatus();
         const { Bucket, Regoin } = hosting;
         const storageService = await this.environment.getStorageService();
@@ -373,9 +373,6 @@ class HostingService {
             region: Regoin,
             indexDocument,
             errorDocument,
-            originalHttpStatus,
-            charity404,
-            autoAddressing,
             routingRules
         });
         return res;

package/lib/index.js

@@ -2,8 +2,6 @@
 const context_1 = require("./context");
 const environmentManager_1 = require("./environmentManager");
 const docs_1 = require("./docs");
-const projectValidator_1 = require("./projectValidator");
-const DeployOrchestrator_1 = require("./deploy/DeployOrchestrator");
 class CloudBase {
     /**
      * init 初始化 为单例
@@ -51,13 +49,6 @@ class CloudBase {
     get functions() {
         return this.currentEnvironment().getFunctionService();
     }
-    /**
-     * 函数部署编排器（FunctionDeployer）
-     * 在现有 FunctionService 之上，按 buildStrategy 编排 Event/HTTP 函数的创建、更新与访问收敛
-     */
-    get functionDeployer() {
-        return this.currentEnvironment().getFunctionDeployer();
-    }
     get cloudrun() {
         return this.currentEnvironment().getCloudRunService();
     }
@@ -155,28 +146,6 @@ class CloudBase {
         }
         return this.docsService;
     }
-    get projectValidator() {
-        if (!this.projectValidatorService) {
-            this.projectValidatorService = new projectValidator_1.ProjectValidator();
-        }
-        return this.projectValidatorService;
-    }
-    getProjectValidator() {
-        return this.projectValidator;
-    }
-    /**
-     * 声明式部署编排器
-     * 顺序：database → functions → app → hosting → gateway；支持 dry-run / only / skip / 幂等重试
-     */
-    get deployOrchestrator() {
-        if (!this.deployOrchestratorService) {
-            this.deployOrchestratorService = new DeployOrchestrator_1.DeployOrchestrator(this.currentEnvironment());
-        }
-        return this.deployOrchestratorService;
-    }
-    getDeployOrchestrator() {
-        return this.deployOrchestrator;
-    }
     getEnvironmentManager() {
         return this.environmentManager;
     }

package/lib/storage/index.js

@@ -1046,19 +1046,20 @@ class StorageService {
      * 配置文档
      */
     async putBucketWebsite(options) {
-        const { indexDocument, errorDocument, originalHttpStatus, charity404, autoAddressing, bucket, region, routingRules } = options;
+        const { indexDocument, errorDocument, bucket, region, routingRules } = options;
         const cos = this.getCos();
         const putBucketWebsite = util_1.default.promisify(cos.putBucketWebsite).bind(cos);
         let params = {
             Bucket: bucket,
             Region: region,
-            WebsiteConfiguration: Object.assign(Object.assign(Object.assign({}, (autoAddressing ? { AutoAddressing: { Status: autoAddressing } } : {})), { IndexDocument: {
+            WebsiteConfiguration: {
+                IndexDocument: {
                     Suffix: indexDocument
-                } }), (errorDocument !== undefined
-                ? {
-                    ErrorDocument: Object.assign(Object.assign({ Key: errorDocument }, (originalHttpStatus ? { OriginalHttpStatus: originalHttpStatus } : {})), (charity404 ? { Charity404: charity404 } : {}))
+                },
+                ErrorDocument: {
+                    Key: errorDocument
                 }
-                : {}))
+            }
         };
         if (routingRules) {
             params.WebsiteConfiguration.RoutingRules = [];

package/lib/utils/index.js

@@ -34,7 +34,6 @@ const archiver_1 = __importDefault(require("archiver"));
 const crypto_1 = __importDefault(require("crypto"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
-const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const unzipper_1 = __importDefault(require("unzipper"));
 const constant_1 = require("../constant");
@@ -48,53 +47,18 @@ __exportStar(require("./http-request"), exports);
 var uuid_1 = require("./uuid");
 Object.defineProperty(exports, "guid6", { enumerable: true, get: function () { return uuid_1.guid6; } });
 async function compressToZip(option) {
-    const { dirPath, outputPath, ignore, pattern = '**/*', extraEntries } = option;
-    // 额外注入的文件先落地到临时目录，用 archive.file() 追加，
-    // 使 archiver 正确计算 CRC/size（archiver 3.x 的 append(buffer/string)
-    // 会写出 CRC=0 的流式条目，被严格解压器判为 bad CRC）。
-    let extraTmpDir;
-    if (extraEntries && extraEntries.length > 0) {
-        extraTmpDir = path_1.default.join(os_1.default.tmpdir(), `zip-extra-${Date.now()}-${Math.random().toString(36).slice(2)}`);
-        fs_extra_1.default.mkdirpSync(extraTmpDir);
-    }
+    const { dirPath, outputPath, ignore, pattern = '**/*' } = option;
     return new Promise((resolve, reject) => {
-        // 幂等清理：archiver 的 error 事件与 output.close 事件在不同代码路径上，
-        // 但 extraEntries 写入异常分支调用 archive.abort() 后的异步收尾流程
-        // 仍可能间接触发 archive.error，导致 cleanupExtra 被多次调用。
-        // 用 done 标志保证清理和 resolve/reject 仅生效一次。
-        let done = false;
-        const settle = (fn) => {
-            if (done)
-                return;
-            done = true;
-            fn();
-        };
-        const cleanupExtra = () => {
-            if (extraTmpDir) {
-                try {
-                    fs_extra_1.default.removeSync(extraTmpDir);
-                }
-                catch (_a) {
-                    // 清理临时目录失败不影响主流程
-                }
-            }
-        };
         const output = fs_extra_1.default.createWriteStream(outputPath);
         const archive = (0, archiver_1.default)('zip');
         output.on('close', function () {
-            settle(() => {
-                cleanupExtra();
-                resolve({
-                    zipPath: outputPath,
-                    size: Math.ceil(archive.pointer() / 1024)
-                });
+            resolve({
+                zipPath: outputPath,
+                size: Math.ceil(archive.pointer() / 1024)
             });
         });
         archive.on('error', function (err) {
-            settle(() => {
-                cleanupExtra();
-                reject(err);
-            });
+            reject(err);
         });
         archive.pipe(output);
         // append files from a glob pattern
@@ -104,27 +68,6 @@ async function compressToZip(option) {
             ignore: ignore,
             dot: true
         });
-        // 追加 SDK 注入的额外文件（如构建推送脚本），不污染用户源码目录
-        if (extraEntries && extraEntries.length > 0 && extraTmpDir) {
-            try {
-                extraEntries.forEach((entry, index) => {
-                    const tmpFile = path_1.default.join(extraTmpDir, `entry-${index}`);
-                    const buf = Buffer.isBuffer(entry.content)
-                        ? entry.content
-                        : Buffer.from(entry.content, 'utf8');
-                    fs_extra_1.default.writeFileSync(tmpFile, buf, { mode: entry.mode });
-                    archive.file(tmpFile, { name: entry.zipPath, mode: entry.mode });
-                });
-            }
-            catch (error) {
-                settle(() => {
-                    cleanupExtra();
-                    archive.abort();
-                    reject(error);
-                });
-                return;
-            }
-        }
         archive.finalize();
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "5.7.0-beta.3",
+    "version": "5.7.1-beta.1",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {
@@ -42,7 +42,6 @@
     },
     "dependencies": {
         "@cloudbase/signature-nodejs": "^1.0.0",
-        "@cloudbase/toolbox": "^0.8.3-beta.0",
         "@cloudbase/database": "^0.6.2",
         "archiver": "^3.1.1",
         "cos-nodejs-sdk-v5": "^2.14.0",

package/types/cloudApp/index.d.ts

@@ -57,10 +57,6 @@ export declare class CloudAppService {
      * 注意：此方法不依赖应用是否已创建，可在创建应用前调用
      * 返回的 cosTimestamp 用于 createApp 时传入 staticConfig.cosTimestamp
      *
-     * 内置默认忽略：.git 目录、.DS_Store（含任意层级）；node_modules 仅在
-     * excludeNodeModules 为 true（默认）时排除——云端构建（需云端 install）场景应传
-     * excludeNodeModules: false 允许私有/离线依赖随源码包上传。
-     *
      * @param params 上传参数
      */
     uploadCode(params: IUploadCloudAppCodeParams): Promise<IUploadCloudAppCodeResult>;