befly 3.2.1 → 3.3.1

package/bin/index.ts

@@ -0,0 +1,138 @@
+#!/usr/bin/env bun
+/**
+ * Befly CLI - 命令行工具入口
+ * 为 Befly 框架提供项目管理和脚本执行功能
+ */
+import { Command } from 'commander';
+import { scriptCommand } from '../commands/script.js';
+import { devCommand } from '../commands/dev.js';
+import { buildCommand } from '../commands/build.js';
+import { startCommand } from '../commands/start.js';
+import { syncDbCommand } from '../commands/syncDb.js';
+import { addonCommand } from '../commands/addon.js';
+import { syncApiCommand } from '../commands/syncApi.js';
+import { syncMenuCommand } from '../commands/syncMenu.js';
+import { syncDevCommand } from '../commands/syncDev.js';
+import { Logger } from '../lib/logger.js';
+
+/**
+ * Bun 版本要求
+ */
+const REQUIRED_BUN_VERSION = '1.3.0';
+
+/**
+ * 比较版本号
+ */
+function compareVersions(v1: string, v2: string): number {
+    const parts1 = v1.split('.').map(Number);
+    const parts2 = v2.split('.').map(Number);
+
+    for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+        const num1 = parts1[i] || 0;
+        const num2 = parts2[i] || 0;
+
+        if (num1 > num2) return 1;
+        if (num1 < num2) return -1;
+    }
+
+    return 0;
+}
+
+/**
+ * 获取 Bun 版本
+ */
+function getBunVersion(): string | null {
+    try {
+        if (typeof Bun !== 'undefined' && Bun.version) {
+            return Bun.version;
+        }
+
+        const proc = Bun.spawnSync(['bun', '--version'], {
+            stdout: 'pipe',
+            stderr: 'pipe'
+        });
+
+        if (proc.exitCode === 0) {
+            const version = proc.stdout.toString().trim();
+            return version;
+        }
+
+        return null;
+    } catch {
+        return null;
+    }
+}
+
+/**
+ * 检查 Bun 版本
+ */
+function checkBunVersion(): void {
+    const currentVersion = getBunVersion();
+
+    if (!currentVersion) {
+        Logger.error('未检测到 Bun 运行时');
+        Logger.info('\nBefly CLI 需要 Bun v1.3.0 或更高版本');
+        Logger.info('请访问 https://bun.sh 安装 Bun\n');
+        Logger.info('安装命令:');
+        Logger.info('  Windows (PowerShell): powershell -c "irm bun.sh/install.ps1 | iex"');
+        Logger.info('  macOS/Linux: curl -fsSL https://bun.sh/install | bash\n');
+        process.exit(1);
+    }
+
+    const comparison = compareVersions(currentVersion, REQUIRED_BUN_VERSION);
+
+    if (comparison < 0) {
+        Logger.error(`Bun 版本过低: ${currentVersion}`);
+        Logger.info(`\n需要 Bun v${REQUIRED_BUN_VERSION} 或更高版本`);
+        Logger.info('请升级 Bun:\n');
+        Logger.info('  bun upgrade\n');
+        process.exit(1);
+    }
+}
+
+// 检查 Bun 版本
+checkBunVersion();
+
+const program = new Command();
+
+program.name('befly').description('Befly CLI - 为 Befly 框架提供命令行工具').version('3.0.0');
+
+// script 命令 - 执行脚本
+program.command('script').description('列出并执行 befly 脚本').option('--dry-run', '预演模式，只显示不执行', false).action(scriptCommand);
+
+// dev 命令 - 开发服务器
+program.command('dev').description('启动开发服务器').option('-p, --port <number>', '端口号', '3000').option('-h, --host <string>', '主机地址', '0.0.0.0').option('--no-sync', '跳过表同步', false).option('-v, --verbose', '详细日志', false).action(devCommand);
+
+// build 命令 - 构建项目
+program.command('build').description('构建项目').option('-o, --outdir <path>', '输出目录', 'dist').option('--minify', '压缩代码', false).option('--sourcemap', '生成 sourcemap', false).action(buildCommand);
+
+// start 命令 - 启动生产服务器
+program.command('start').description('启动生产服务器').option('-p, --port <number>', '端口号', '3000').option('-h, --host <string>', '主机地址', '0.0.0.0').option('-c, --cluster <instances>', '集群模式（数字或 max）').action(startCommand);
+
+// syncDb 命令 - 同步数据库
+program.command('syncDb').description('同步数据库表结构').option('-t, --table <name>', '指定表名').option('--dry-run', '预览模式，只显示不执行', false).action(syncDbCommand);
+
+// syncApi 命令 - 同步 API 接口
+program.command('syncApi').description('同步 API 接口到数据库').option('--plan', '计划模式，只显示不执行', false).action(syncApiCommand);
+
+// syncMenu 命令 - 同步菜单
+program.command('syncMenu').description('同步菜单配置到数据库').option('--plan', '计划模式，只显示不执行', false).action(syncMenuCommand);
+
+// syncDev 命令 - 同步开发者账号
+program.command('syncDev').description('同步开发者管理员账号').option('--plan', '计划模式，只显示不执行', false).action(syncDevCommand);
+
+// addon 命令 - 插件管理
+const addon = program.command('addon').description('管理 Befly 插件');
+
+addon.command('install <name>').description('安装插件').option('-s, --source <url>', '插件源地址').action(addonCommand.install);
+
+addon.command('uninstall <name>').description('卸载插件').option('--keep-data', '保留插件数据', false).action(addonCommand.uninstall);
+
+addon.command('list').description('列出已安装的插件').action(addonCommand.list);
+
+// 显示建议和错误
+program.showSuggestionAfterError();
+program.showHelpAfterError();
+
+// 解析命令行参数
+program.parse();

package/checks/conflict.ts

@@ -3,11 +3,19 @@
  * 在系统启动前检测表名、API 路由、插件名等资源是否存在冲突
  */
 
-import path from 'node:path';
-import { Logger } from '../utils/logger.js';
+import { relative, basename } from 'pathe';
+import { Logger } from '../lib/logger.js';
 import { paths } from '../paths.js';
-import { scanAddons, getAddonDir, addonDirExists } from '../utils/helper.js';
-import { isReservedTableName, isReservedPluginName, isReservedAddonName, getReservedTablePrefixes, getReservedPlugins, getReservedAddonNames } from '../config/reserved.js';
+import { scanAddons, getAddonDir, addonDirExists } from '../util.js';
+
+/**
+ * 保留名称配置
+ */
+const RESERVED_NAMES = {
+    tablePrefix: ['sys_'],
+    plugins: ['db', 'logger', 'redis', 'tool'],
+    addonNames: ['app', 'api']
+} as const;
 
 /**
  * 资源注册表
@@ -33,11 +41,11 @@ async function collectCorePlugins(registry: ResourceRegistry): Promise<void> {
     try {
         const glob = new Bun.Glob('*.ts');
         for await (const file of glob.scan({
-            cwd: paths.rootPluginDir,
+            cwd: paths.projectPluginDir,
             onlyFiles: true,
             absolute: true
         })) {
-            const pluginName = path.basename(file).replace(/\.ts$/, '');
+            const pluginName = basename(file).replace(/\.ts$/, '');
             if (pluginName.startsWith('_')) continue;
 
             if (registry.plugins.has(pluginName)) {
@@ -58,8 +66,8 @@ async function collectAddonResources(addonName: string, registry: ResourceRegist
     const conflicts: string[] = [];
 
     // 检查 addon 名称是否使用保留名称
-    if (isReservedAddonName(addonName)) {
-        conflicts.push(`组件名称 "${addonName}" 使用了保留名称，保留名称包括: ${getReservedAddonNames().join(', ')}`);
+    if (RESERVED_NAMES.addonNames.includes(addonName.toLowerCase())) {
+        conflicts.push(`组件名称 "${addonName}" 使用了保留名称，保留名称包括: ${RESERVED_NAMES.addonNames.join(', ')}`);
         return conflicts;
     }
 
@@ -69,11 +77,11 @@ async function collectAddonResources(addonName: string, registry: ResourceRegist
         const glob = new Bun.Glob('*.json');
 
         for await (const file of glob.scan({
-            cwd: addonTablesDir,
+            cwd: paths.rootTableDir,
             onlyFiles: true,
             absolute: true
         })) {
-            const fileName = path.basename(file, '.json');
+            const fileName = basename(file, '.json');
             if (fileName.startsWith('_')) continue;
 
             try {
@@ -81,8 +89,8 @@ async function collectAddonResources(addonName: string, registry: ResourceRegist
                 const tableName = tableDefine.tableName || `${addonName}_${fileName}`;
 
                 // 检查是否使用保留前缀
-                if (isReservedTableName(tableName)) {
-                    conflicts.push(`组件 ${addonName} 表 "${tableName}" 使用了保留前缀，保留前缀包括: ${getReservedTablePrefixes().join(', ')}`);
+                if (RESERVED_NAMES.tablePrefix.some((prefix) => tableName.startsWith(prefix))) {
+                    conflicts.push(`组件 ${addonName} 表 "${tableName}" 使用了保留前缀，保留前缀包括: ${RESERVED_NAMES.tablePrefix.join(', ')}`);
                     continue;
                 }
 
@@ -108,7 +116,7 @@ async function collectAddonResources(addonName: string, registry: ResourceRegist
             onlyFiles: true,
             absolute: true
         })) {
-            const apiPath = path.relative(addonApisDir, file).replace(/\.ts$/, '').replace(/\\/g, '/');
+            const apiPath = relative(addonApisDir, file).replace(/\.ts$/, '');
             if (apiPath.indexOf('_') !== -1) continue;
 
             try {
@@ -143,15 +151,16 @@ async function collectAddonResources(addonName: string, registry: ResourceRegist
             onlyFiles: true,
             absolute: true
         })) {
-            const fileName = path.basename(file).replace(/\.ts$/, '');
+            const fileName = basename(file).replace(/\.ts$/, '');
             if (fileName.startsWith('_')) continue;
 
             // Addon 插件使用点号命名空间
             const pluginName = `${addonName}.${fileName}`;
 
-            // 检查是否使用保留名称
-            if (isReservedPluginName(pluginName)) {
-                conflicts.push(`组件 ${addonName} 插件 "${pluginName}" 使用了保留名称，保留名称包括: ${getReservedPlugins().join(', ')}`);
+            // 检查是否使用保留名称（检测核心插件名或点号前缀是保留名称）
+            const isReserved = RESERVED_NAMES.plugins.includes(pluginName) || (pluginName.includes('.') && RESERVED_NAMES.plugins.includes(pluginName.split('.')[0]));
+            if (isReserved) {
+                conflicts.push(`组件 ${addonName} 插件 "${pluginName}" 使用了保留名称，保留名称包括: ${RESERVED_NAMES.plugins.join(', ')}`);
                 continue;
             }
 
@@ -182,7 +191,7 @@ async function collectUserResources(registry: ResourceRegistry): Promise<string[
             onlyFiles: true,
             absolute: true
         })) {
-            const fileName = path.basename(file, '.json');
+            const fileName = basename(file, '.json');
             if (fileName.startsWith('_')) continue;
 
             try {
@@ -190,8 +199,8 @@ async function collectUserResources(registry: ResourceRegistry): Promise<string[
                 const tableName = tableDefine.tableName || fileName;
 
                 // 检查是否使用保留前缀
-                if (isReservedTableName(tableName)) {
-                    conflicts.push(`用户表 "${tableName}" 使用了保留前缀，保留前缀包括: ${getReservedTablePrefixes().join(', ')}`);
+                if (RESERVED_NAMES.tablePrefix.some((prefix) => tableName.startsWith(prefix))) {
+                    conflicts.push(`用户表 "${tableName}" 使用了保留前缀，保留前缀包括: ${RESERVED_NAMES.tablePrefix.join(', ')}`);
                     continue;
                 }
 
@@ -218,7 +227,7 @@ async function collectUserResources(registry: ResourceRegistry): Promise<string[
             onlyFiles: true,
             absolute: true
         })) {
-            const apiPath = path.relative(userApisDir, file).replace(/\.ts$/, '').replace(/\\/g, '/');
+            const apiPath = relative(userApisDir, file).replace(/\.ts$/, '');
             if (apiPath.indexOf('_') !== -1) continue;
 
             try {
@@ -254,12 +263,13 @@ async function collectUserResources(registry: ResourceRegistry): Promise<string[
             onlyFiles: true,
             absolute: true
         })) {
-            const pluginName = path.basename(file).replace(/\.ts$/, '');
+            const pluginName = basename(file).replace(/\.ts$/, '');
             if (pluginName.startsWith('_')) continue;
 
-            // 检查是否使用保留名称
-            if (isReservedPluginName(pluginName)) {
-                conflicts.push(`用户插件 "${pluginName}" 使用了保留名称，保留名称包括: ${getReservedPlugins().join(', ')}`);
+            // 检查是否使用保留名称（检测核心插件名或点号前缀是保留名称）
+            const isReserved = RESERVED_NAMES.plugins.includes(pluginName) || (pluginName.includes('.') && RESERVED_NAMES.plugins.includes(pluginName.split('.')[0]));
+            if (isReserved) {
+                conflicts.push(`用户插件 "${pluginName}" 使用了保留名称，保留名称包括: ${RESERVED_NAMES.plugins.join(', ')}`);
                 continue;
             }
 

package/checks/table.ts

@@ -3,11 +3,11 @@
  * 验证表定义文件的格式和规则
  */
 
-import path from 'node:path';
-import { Logger } from '../utils/logger.js';
-import { parseRule } from '../utils/index.js';
+import { basename } from 'pathe';
+import { Logger } from '../lib/logger.js';
+import { parseRule } from '../util.js';
 import { paths } from '../paths.js';
-import { scanAddons, getAddonDir } from '../utils/helper.js';
+import { scanAddons, getAddonDir } from '../util.js';
 
 /**
  * 表文件信息接口
@@ -97,8 +97,8 @@ export default async function (): Promise<boolean> {
         // 合并进行验证逻辑
         for (const { file, type, addonName } of allTableFiles) {
             totalFiles++;
-            const fileName = path.basename(file);
-            const fileBaseName = path.basename(file, '.json');
+            const fileName = basename(file);
+            const fileBaseName = basename(file, '.json');
             const fileType = type === 'project' ? '项目' : `组件${addonName}`;
 
             try {

package/commands/addon.ts

@@ -0,0 +1,57 @@
+/**
+ * Addon 命令 - 插件管理
+ */
+
+import { existsSync, mkdirSync, rmSync } from 'node:fs';
+import { join } from 'pathe';
+import ora from 'ora';
+import { Logger } from '../lib/logger.js';
+
+export const addonCommand = {
+    async install(name: string, options: { source?: string }) {
+        const spinner = ora({
+            text: `正在安装插件: ${name}`,
+            color: 'cyan',
+            spinner: 'dots'
+        }).start();
+
+        try {
+            // TODO: 实现插件安装逻辑
+            // 1. 从 source 或默认源下载插件
+            // 2. 解压到 addons 目录
+            // 3. 安装插件依赖
+            // 4. 执行插件安装脚本
+
+            spinner.warn(`插件安装功能开发中`);
+        } catch (error) {
+            spinner.fail(`插件 ${name} 安装失败`);
+            throw error;
+        }
+    },
+
+    async uninstall(name: string, options: { keepData: boolean }) {
+        const spinner = ora({
+            text: `正在卸载插件: ${name}`,
+            color: 'cyan',
+            spinner: 'dots'
+        }).start();
+
+        try {
+            // TODO: 实现插件卸载逻辑
+            // 1. 执行插件卸载脚本
+            // 2. 删除插件文件
+            // 3. 可选：删除插件数据
+
+            spinner.warn(`插件卸载功能开发中`);
+        } catch (error) {
+            spinner.fail(`插件 ${name} 卸载失败`);
+            throw error;
+        }
+    },
+
+    async list() {
+        // TODO: 读取已安装的插件列表
+        console.log('已安装的插件:\n');
+        console.log('(功能开发中)');
+    }
+};

package/commands/build.ts

@@ -0,0 +1,74 @@
+/**
+ * Build 命令 - 构建项目
+ */
+
+import { join } from 'pathe';
+import { existsSync } from 'node:fs';
+import ora from 'ora';
+import { Logger } from '../lib/logger.js';
+
+function getProjectRoot(): string {
+    let current = process.cwd();
+    const path = require('node:path');
+    while (current !== path.parse(current).root) {
+        if (existsSync(join(current, 'package.json'))) {
+            return current;
+        }
+        current = path.dirname(current);
+    }
+    return process.cwd();
+}
+
+interface BuildOptions {
+    outdir: string;
+    minify: boolean;
+    sourcemap: boolean;
+}
+
+export async function buildCommand(options: BuildOptions) {
+    try {
+        const projectRoot = getProjectRoot();
+        const mainFile = join(projectRoot, 'main.ts');
+
+        if (!existsSync(mainFile)) {
+            Logger.error('未找到 main.ts 文件');
+            process.exit(1);
+        }
+
+        const spinner = ora({
+            text: '正在构建项目...',
+            color: 'cyan',
+            spinner: 'dots'
+        }).start();
+
+        const args = ['build', mainFile, '--outdir', options.outdir, '--target', 'bun'];
+
+        if (options.minify) {
+            args.push('--minify');
+        }
+
+        if (options.sourcemap) {
+            args.push('--sourcemap');
+        }
+
+        const proc = Bun.spawn(['bun', ...args], {
+            cwd: projectRoot,
+            stdout: 'pipe',
+            stderr: 'pipe'
+        });
+
+        await proc.exited;
+
+        if (proc.exitCode === 0) {
+            spinner.succeed('项目构建完成');
+            Logger.success(`输出目录: ${options.outdir}`);
+        } else {
+            spinner.fail('项目构建失败');
+            process.exit(1);
+        }
+    } catch (error) {
+        Logger.error('构建失败:');
+        console.error(error);
+        process.exit(1);
+    }
+}

package/commands/dev.ts

@@ -0,0 +1,94 @@
+/**
+ * Dev 命令 - 启动开发服务器
+ */
+
+import { join } from 'pathe';
+import { existsSync } from 'node:fs';
+import { Logger } from '../lib/logger.js';
+
+interface DevOptions {
+    port: string;
+    host: string;
+    sync: boolean;
+    verbose: boolean;
+}
+
+function getProjectRoot(): string {
+    let current = process.cwd();
+    while (current !== require('node:path').parse(current).root) {
+        if (existsSync(join(current, 'package.json'))) {
+            return current;
+        }
+        current = require('node:path').dirname(current);
+    }
+    return process.cwd();
+}
+
+export async function devCommand(options: DevOptions) {
+    try {
+        const projectRoot = getProjectRoot();
+        const mainFile = join(projectRoot, 'main.ts');
+
+        if (!existsSync(mainFile)) {
+            Logger.error('未找到 main.ts 文件，请确保在 Befly 项目目录下');
+            process.exit(1);
+        }
+
+        // 设置环境变量
+        process.env.NODE_ENV = 'development';
+        process.env.APP_PORT = options.port;
+        process.env.APP_HOST = options.host;
+
+        if (options.verbose) {
+            process.env.LOG_DEBUG = '1';
+        }
+
+        Logger.info('正在启动开发服务器...\n');
+        Logger.info(`端口: ${options.port}`);
+        Logger.info(`主机: ${options.host}`);
+        Logger.info(`环境: development\n`);
+
+        // 检查环境变量文件
+        const envFile = join(projectRoot, '.env.development');
+        if (existsSync(envFile)) {
+            Logger.info(`环境变量文件: .env.development\n`);
+        }
+
+        // 使用 Bun.spawn 启动开发服务器（不使用 --watch 避免监听 node_modules）
+
+        const proc = Bun.spawn(['bun', '--env-file=.env.development', 'run', mainFile], {
+            cwd: projectRoot,
+            stdout: 'inherit',
+            stderr: 'inherit',
+            stdin: 'inherit',
+            env: {
+                // ...process.env,
+                // NODE_ENV: 'development',
+                // APP_PORT: options.port,
+                // APP_HOST: options.host,
+                // LOG_DEBUG: options.verbose ? '1' : process.env.LOG_DEBUG,
+                // FORCE_COLOR: '1'
+            }
+        });
+
+        // 添加信号处理，确保优雅关闭
+        const signals: NodeJS.Signals[] = ['SIGTERM', 'SIGINT', 'SIGHUP'];
+        signals.forEach((signal) => {
+            process.on(signal, () => {
+                console.log(`\nShutting down dev server (${signal})...`);
+                proc.kill(signal);
+                setTimeout(() => {
+                    proc.kill('SIGKILL');
+                    process.exit(1);
+                }, 5000); // 5 秒强制关闭
+            });
+        });
+
+        const exitCode = await proc.exited;
+        process.exit(exitCode || 0);
+    } catch (error) {
+        Logger.error('启动开发服务器失败:');
+        console.error(error);
+        process.exit(1);
+    }
+}