@cloudbase/manager-node 5.7.1-beta.1 → 5.8.0-beta.1

package/lib/cloudApp/index.js

@@ -123,10 +123,14 @@ 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 = [], onPhase } = params;
+        const { serviceName, localPath, ignore = [], excludeNodeModules = true, onPhase } = params;
         // 1. 验证本地路径
         if (!fs_1.default.existsSync(localPath)) {
             throw new error_1.CloudBaseError(`本地路径不存在: ${localPath}`);
@@ -135,9 +139,14 @@ class CloudAppService {
         if (!stat.isDirectory()) {
             throw new error_1.CloudBaseError(`localPath 必须是目录: ${localPath}`);
         }
-        // 2. 打包本地文件为 ZIP
+        // 2. 打包本地文件为 ZIP（node_modules 按场景决定是否排除）
         const tmpZipPath = path_1.default.join(os_1.default.tmpdir(), `cloudapp-${Date.now()}-${Math.random().toString(36).slice(2)}.zip`);
-        const defaultIgnore = ['node_modules/**', '.git/**', '.DS_Store', '**/.DS_Store'];
+        const defaultIgnore = [
+            ...(excludeNodeModules ? ['node_modules/**'] : []),
+            '.git/**',
+            '.DS_Store',
+            '**/.DS_Store'
+        ];
         const packStart = Date.now();
         await (0, utils_1.compressToZip)({
             dirPath: localPath,

package/lib/deploy/DatabaseDeployer.js

@@ -0,0 +1,238 @@
+"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;