@cloudbase/manager-node 5.7.0-beta.2 → 5.7.0

package/types/function/index.d.ts

@@ -232,6 +232,9 @@ export declare class FunctionService {
     private tcbService;
     private userService;
     constructor(environment: Environment);
+    private get useTcbFunctionApi();
+    private get functionCloudService();
+    private get namespaceParamKey();
     /**
      * 增量更新函数代码
      * @param {IUpdateFunctionIncrementalCodeParam} funcParam

package/types/function/types.d.ts

@@ -105,21 +105,6 @@ export interface IFunctionInfo {
         Variables: IEnvVariable[];
     };
     Type: string;
-    /** HTTP 函数协议类型；SCF 缺省时表示普通 HTTP */
-    ProtocolType?: string;
-    /** 自定义镜像函数配置 */
-    ImageConfig?: {
-        ImageType?: string;
-        ImageUri?: string;
-        RegistryId?: string;
-        EntryPoint?: string;
-        Command?: string;
-        Args?: string;
-        ContainerImageAccelerate?: boolean;
-        ImagePort?: number;
-        CommandList?: string[];
-        ArgsList?: string[];
-    };
     EipConfig: {
         EipFixed: 'FALSE' | 'TRUE';
         Eips: string[];

package/types/hosting/index.d.ts

@@ -122,12 +122,6 @@ export interface IRoutingRules {
 export interface IBucketWebsiteOptiosn {
     indexDocument: string;
     errorDocument?: string;
-    /** 错误文档是否保留原始 HTTP 状态码：Enabled / Disabled（SPA 回退需 Disabled） */
-    originalHttpStatus?: string;
-    /** 404 是否展示腾讯云公益页面：Enabled / Disabled（SPA 回退需 Disabled） */
-    charity404?: string;
-    /** 忽略 HTML 扩展名：Enabled / Disabled */
-    autoAddressing?: string;
     routingRules?: Array<IRoutingRules>;
 }
 export interface IFindOptions {

package/types/index.d.ts

@@ -1,6 +1,5 @@
 import { EnvService } from './env';
 import { FunctionService } from './function';
-import { FunctionDeployer } from './deploy/FunctionDeployer';
 import { CloudRunService } from './cloudrun';
 import { AgentService } from './agent';
 import { StorageService } from './storage';
@@ -22,8 +21,6 @@ import { CloudAppService } from './cloudApp';
 import { AiModelService } from './aiModel';
 import { IntegrationService } from './integration';
 import { MonitorService } from './monitor';
-import { ProjectValidator } from './projectValidator';
-import { DeployOrchestrator } from './deploy/DeployOrchestrator';
 interface CloudBaseConfig {
     secretId?: string;
     secretKey?: string;
@@ -50,17 +47,10 @@ declare class CloudBase {
     private cloudBaseConfig;
     private environmentManager;
     private docsService;
-    private projectValidatorService;
-    private deployOrchestratorService;
     constructor(config?: CloudBaseConfig);
     addEnvironment(envId: string): void;
     currentEnvironment(): Environment;
     get functions(): FunctionService;
-    /**
-     * 函数部署编排器（FunctionDeployer）
-     * 在现有 FunctionService 之上，按 buildStrategy 编排 Event/HTTP 函数的创建、更新与访问收敛
-     */
-    get functionDeployer(): FunctionDeployer;
     get cloudrun(): CloudRunService;
     get agent(): AgentService;
     get storage(): StorageService;
@@ -111,14 +101,6 @@ declare class CloudBase {
      */
     get monitor(): MonitorService;
     get docs(): DocsService;
-    get projectValidator(): ProjectValidator;
-    getProjectValidator(): ProjectValidator;
-    /**
-     * 声明式部署编排器
-     * 顺序：database → functions → app → hosting → gateway；支持 dry-run / only / skip / 幂等重试
-     */
-    get deployOrchestrator(): DeployOrchestrator;
-    getDeployOrchestrator(): DeployOrchestrator;
     getEnvironmentManager(): EnvironmentManager;
     getManagerConfig(): CloudBaseConfig;
     get isInternalEndpoint(): Boolean;

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

@@ -44,7 +44,7 @@ export interface ICloudFunction extends ICloudFunctionConfig {
     name: string;
     description?: string;
     type?: 'Event' | 'HTTP';
-    protocolType?: 'HTTP' | 'WS';
+    protocolType?: 'WS';
     protocolParams?: {
         wsParams?: {
             idleTimeOut?: number;

package/types/storage/index.d.ts

@@ -49,12 +49,6 @@ export interface IRoutingRules {
 export interface IBucketWebsiteOptions {
     indexDocument: string;
     errorDocument?: string;
-    /** 错误文档是否保留原始 HTTP 状态码：Enabled / Disabled（SPA 回退需 Disabled，否则 404 状态码使前端路由失效） */
-    originalHttpStatus?: string;
-    /** 404 是否展示腾讯云公益页面：Enabled / Disabled（SPA 回退需 Disabled，否则覆盖错误文档） */
-    charity404?: string;
-    /** 忽略 HTML 扩展名：Enabled / Disabled（未传则保持默认 Disabled） */
-    autoAddressing?: string;
     routingRules?: Array<IRoutingRules>;
     region: string;
     bucket: string;

package/types/utils/index.d.ts

@@ -6,24 +6,11 @@ export * from './envLazy';
 export * from './fs';
 export * from './http-request';
 export { guid6 } from './uuid';
-interface IZipExtraEntry {
-    /** zip 包内的相对路径 */
-    zipPath: string;
-    /** 文件文本内容 */
-    content: string | Buffer;
-    /** unix 权限位（八进制），如 0o755 */
-    mode?: number;
-}
 interface IZipOption {
     dirPath: string;
     outputPath: string;
     ignore?: string | string[];
     pattern?: string;
-    /**
-     * 额外注入 zip 的文件条目（不来自 dirPath），用于把 SDK 生成的辅助文件
-     * （如构建推送脚本）打进包内，而不污染用户源码目录。
-     */
-    extraEntries?: IZipExtraEntry[];
 }
 export declare function compressToZip(option: IZipOption): Promise<unknown>;
 /**

package/lib/deploy/DatabaseDeployer.js

@@ -1,238 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DatabaseDeployer = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const error_1 = require("../error");
-/** migration 文件名正则：14位数字 + 下划线 + 小写字母下划线名称 + .sql */
-const MIGRATION_FILE_PATTERN = /^(\d{14})_([a-z_]+)\.sql$/;
-/** 轮询间隔（毫秒） */
-const POLL_INTERVAL_MS = 2000;
-/** 默认超时（毫秒） */
-const DEFAULT_TIMEOUT_MS = 3000000;
-class DatabaseDeployer {
-    constructor(environment) {
-        this.environment = environment;
-    }
-    /**
-     * 从本地目录解析 migration 文件列表
-     *
-     * 文件名格式：{14位时间戳}_{小写下划线名称}.sql
-     * 例如：20260526000000_create_users.sql
-     *
-     * 按文件名升序排列（即按版本号从早到晚）
-     */
-    parseMigrationFiles(migrationsDir) {
-        if (!fs_1.default.existsSync(migrationsDir)) {
-            throw new error_1.CloudBaseError(`数据库迁移目录不存在: ${migrationsDir}`);
-        }
-        const files = fs_1.default.readdirSync(migrationsDir)
-            .filter(f => f.endsWith('.sql'))
-            .sort();
-        const migrations = [];
-        for (const file of files) {
-            const match = file.match(MIGRATION_FILE_PATTERN);
-            if (!match) {
-                throw new error_1.CloudBaseError(`migration 文件名格式错误: ${file}，应为 {14位时间戳}_{小写下划线名称}.sql`);
-            }
-            const [, version, name] = match;
-            const filePath = path_1.default.join(migrationsDir, file);
-            const query = fs_1.default.readFileSync(filePath, 'utf-8');
-            if (!query.trim()) {
-                throw new error_1.CloudBaseError(`migration 文件内容为空: ${file}`);
-            }
-            migrations.push({ Version: version, Name: name, Query: query });
-        }
-        return migrations;
-    }
-    /**
-     * 生成部署计划
-     *
-     * 调用 previewPGUserMigrations 获取云端对比结果，
-     * 返回每条migration 的状态（pending / applied / conflict）
-     */
-    async plan(config, cwd, envId) {
-        this.assertDatabaseType(config);
-        const migrationsDir = this.resolveMigrationsDir(cwd, config.migrations);
-        const migrations = this.parseMigrationFiles(migrationsDir);
-        if (migrations.length === 0) {
-            return [];
-        }
-        const dbService = this.environment.getDatabaseService();
-        let preview;
-        try {
-            preview = await dbService.previewPGUserMigrations({
-                EnvId: envId,
-                Migrations: migrations
-            });
-        }
-        catch (error) {
-            const err = error;
-            throw new error_1.CloudBaseError(`数据库迁移预览失败 [EnvId=${envId}]：${(err === null || err === void 0 ? void 0 : err.message) || String(error)}`, {
-                requestId: (err === null || err === void 0 ? void 0 : err.RequestId) || (err === null || err === void 0 ? void 0 : err.requestId),
-                original: err instanceof Error ? err : undefined
-            });
-        }
-        const items = [];
-        // pending：将要执行的
-        for (const p of preview.Pending || []) {
-            items.push({ version: p.Version, name: p.Name, status: 'pending' });
-        }
-        // applied：已经执行过的
-        for (const a of preview.Applied || []) {
-            items.push({ version: a.Version, name: a.Name, status: 'applied' });
-        }
-        // conflict：有冲突的
-        for (const c of preview.Conflicts || []) {
-            items.push({
-                version: c.Version,
-                name: c.Name || '',
-                status: 'conflict',
-                reason: c.Reason || c.Message || 'checksum mismatch'
-            });
-        }
-        return items;
-    }
-    /**
-     * 执行数据库迁移
-     *
-     * 流程：
-     * 1. 解析本地 migration 文件
-     * 2. 预览确认无冲突（有冲突直接 throw，中断整个部署）
-     * 3. 无 pending 则跳过
-     * 4. 提交 pushPGUserMigrations
-     * 5. 轮询describeTaskResult 等待完成
-     */
-    async deploy(config, cwd, envId) {
-        this.assertDatabaseType(config);
-        const migrationsDir = this.resolveMigrationsDir(cwd, config.migrations);
-        const migrations = this.parseMigrationFiles(migrationsDir);
-        if (migrations.length === 0) {
-            return { taskId: '' };
-        }
-        const dbService = this.environment.getDatabaseService();
-        // 1. 预览：确认无冲突
-        let preview;
-        try {
-            preview = await dbService.previewPGUserMigrations({
-                EnvId: envId,
-                Migrations: migrations
-            });
-        }
-        catch (error) {
-            const err = error;
-            throw new error_1.CloudBaseError(`数据库迁移预览失败 [EnvId=${envId}]：${(err === null || err === void 0 ? void 0 : err.message) || String(error)}`, {
-                requestId: (err === null || err === void 0 ? void 0 : err.RequestId) || (err === null || err === void 0 ? void 0 : err.requestId),
-                original: err instanceof Error ? err : undefined
-            });
-        }
-        if (!preview.Executable) {
-            const conflictDetails = (preview.Conflicts || [])
-                .map((c) => `  - ${c.Version}_${c.Name || '?'}: ${c.Reason || c.Message || 'unknown'}`)
-                .join('\n');
-            throw new error_1.CloudBaseError(`数据库迁移存在冲突，中断部署。请先解决以下冲突：\n${conflictDetails}`, {
-                requestId: preview.RequestId
-            });
-        }
-        // 2. 无 pending → 全部已applied，跳过
-        if (!preview.Pending || preview.Pending.length === 0) {
-            return { taskId: '' };
-        }
-        // 3. 提交执行
-        let result;
-        try {
-            result = await dbService.pushPGUserMigrations({
-                EnvId: envId,
-                Migrations: migrations
-            });
-        }
-        catch (error) {
-            const err = error;
-            throw new error_1.CloudBaseError(`数据库迁移提交失败 [EnvId=${envId}]：${(err === null || err === void 0 ? void 0 : err.message) || String(error)}`, {
-                requestId: (err === null || err === void 0 ? void 0 : err.RequestId) || (err === null || err === void 0 ? void 0 : err.requestId),
-                original: err instanceof Error ? err : undefined
-            });
-        }
-        // 4. 轮询等待完成
-        try {
-            await this.waitForTask(envId, result.TaskId, DEFAULT_TIMEOUT_MS);
-        }
-        catch (error) {
-            if (error instanceof error_1.CloudBaseError) {
-                throw error;
-            }
-            const err = error;
-            throw new error_1.CloudBaseError(`数据库迁移任务等待失败 [TaskId=${result.TaskId}]：${(err === null || err === void 0 ? void 0 : err.message) || String(error)}`, {
-                requestId: (err === null || err === void 0 ? void 0 : err.RequestId) || (err === null || err === void 0 ? void 0 : err.requestId),
-                original: err instanceof Error ? err : undefined
-            });
-        }
-        return { taskId: result.TaskId };
-    }
-    /**
-     * 解析 migrations 目录路径
-     * - 未配置：默认 ./cloudbase/migrations
-     * - 仅允许相对路径（禁止 / 开头）
-     */
-    resolveMigrationsDir(cwd, migrations) {
-        const raw = migrations || './cloudbase/migrations';
-        if (path_1.default.isAbsolute(raw) || raw.startsWith('/')) {
-            throw new error_1.CloudBaseError('database.migrations 仅支持相对路径（例如 ./cloudbase/migrations）');
-        }
-        return path_1.default.resolve(cwd, raw);
-    }
-    /**
-     * 校验 database.type（当前仅支持 postgresql）
-     */
-    assertDatabaseType(config) {
-        if (config.type !== 'postgresql') {
-            throw new error_1.CloudBaseError(`database.type 仅支持 postgresql，当前为: ${String(config.type)}`);
-        }
-    }
-    /**
-     * 轮询等待异步任务完成
-     */
-    async waitForTask(envId, taskId, timeoutMs) {
-        const dbService = this.environment.getDatabaseService();
-        const startTime = Date.now();
-        while (true) {
-            let task;
-            try {
-                task = await dbService.describeTaskResult({ EnvId: envId, TaskId: taskId });
-            }
-            catch (error) {
-                if (Date.now() - startTime > timeoutMs) {
-                    const err = error;
-                    throw new error_1.CloudBaseError(`数据库迁移任务状态查询超时（${timeoutMs / 1000}s），TaskId: ${taskId}，最后错误：${(err === null || err === void 0 ? void 0 : err.message) || String(error)}`, {
-                        requestId: (err === null || err === void 0 ? void 0 : err.RequestId) || (err === null || err === void 0 ? void 0 : err.requestId),
-                        original: err instanceof Error ? err : undefined
-                    });
-                }
-                await new Promise(resolve => {
-                    setTimeout(resolve, POLL_INTERVAL_MS);
-                });
-                continue;
-            }
-            if (task.Status === 'Succeed') {
-                return;
-            }
-            if (task.Status === 'Failed') {
-                throw new error_1.CloudBaseError(`数据库迁移任务失败 [TaskId=${taskId}]: ${task.Reason || '未知原因'}`, {
-                    requestId: task.RequestId
-                });
-            }
-            if (Date.now() - startTime > timeoutMs) {
-                throw new error_1.CloudBaseError(`数据库迁移任务超时（${timeoutMs / 1000}s），TaskId: ${taskId}，当前状态: ${task.Status}/${task.Phase}`, {
-                    requestId: task.RequestId
-                });
-            }
-            await new Promise(resolve => {
-                setTimeout(resolve, POLL_INTERVAL_MS);
-            });
-        }
-    }
-}
-exports.DatabaseDeployer = DatabaseDeployer;