befly 3.8.1 → 3.8.3

package/util.ts

@@ -5,11 +5,10 @@ import { isEmpty, isPlainObject } from 'es-toolkit/compat';
 import { snakeCase, camelCase, kebabCase } from 'es-toolkit/string';
 import { Env } from './env.js';
 import { Logger } from './lib/logger.js';
-import { projectDir } from './paths.js';
+import { projectDir, projectAddonsDir } from './paths.js';
 import type { KeyValue } from './types/common.js';
 import type { JwtPayload, JwtSignOptions, JwtVerifyOptions } from './types/jwt';
 import type { Plugin } from './types/plugin.js';
-import type { ParsedFieldRule } from './types/common.js';
 
 // ========================================
 // API 响应工具
@@ -39,6 +38,10 @@ export const No = <T = any>(msg: string = '', data: T | {} = {}, other: KeyValue
     };
 };
 
+// ========================================
+// 动态导入工具
+// ========================================
+
 // ========================================
 // 字段转换工具（重新导出 lib/convert.ts）
 // ========================================
@@ -170,48 +173,85 @@ export const calcPerfTime = (startTime: number, endTime: number = Bun.nanosecond
 };
 
 // ========================================
-// 表定义工具
+// Addon 工具函数
 // ========================================
 
 /**
- * 解析字段规则字符串
- * 格式："字段名|类型|最小值|最大值|默认值|必填|正则"
- * 注意：只分割前6个|，第7个|之后的所有内容（包括|）都属于正则表达式
+ * 扫描所有可用的 addon
+ * 优先从本地 addons/ 目录加载，其次从 node_modules/@befly-addon/ 加载
+ * @returns addon 名称数组
  */
-export const parseRule = (rule: string): ParsedFieldRule => {
-    const parts: string[] = [];
-    let currentPart = '';
-    let pipeCount = 0;
-
-    for (let i = 0; i < rule.length; i++) {
-        if (rule[i] === '|' && pipeCount < 6) {
-            parts.push(currentPart);
-            currentPart = '';
-            pipeCount++;
-        } else {
-            currentPart += rule[i];
+export const scanAddons = (): string[] => {
+    const addons = new Set<string>();
+
+    // 1. 扫描本地 addons 目录（优先级高）
+    // if (existsSync(projectAddonsDir)) {
+    //     try {
+    //         const localAddons = fs.readdirSync(projectAddonsDir).filter((name) => {
+    //             const fullPath = join(projectAddonsDir, name);
+    //             try {
+    //                 const stat = statSync(fullPath);
+    //                 return stat.isDirectory() && !name.startsWith('_');
+    //             } catch {
+    //                 return false;
+    //             }
+    //         });
+    //         localAddons.forEach((name) => addons.add(name));
+    //     } catch (err) {
+    //         // 忽略本地目录读取错误
+    //     }
+    // }
+
+    // 2. 扫描 node_modules/@befly-addon 目录
+    const beflyDir = join(projectDir, 'node_modules', '@befly-addon');
+    if (existsSync(beflyDir)) {
+        try {
+            const npmAddons = fs.readdirSync(beflyDir).filter((name) => {
+                // 如果本地已存在，跳过 npm 包版本
+                if (addons.has(name)) return false;
+
+                const fullPath = join(beflyDir, name);
+                try {
+                    const stat = statSync(fullPath);
+                    return stat.isDirectory();
+                } catch {
+                    return false;
+                }
+            });
+            npmAddons.forEach((name) => addons.add(name));
+        } catch {
+            // 忽略 npm 目录读取错误
         }
     }
-    parts.push(currentPart);
 
-    const [fieldName = '', fieldType = 'string', fieldMinStr = 'null', fieldMaxStr = 'null', fieldDefaultStr = 'null', fieldIndexStr = '0', fieldRegx = 'null'] = parts;
+    return Array.from(addons).sort();
+};
 
-    const fieldIndex = Number(fieldIndexStr) as 0 | 1;
-    const fieldMin = fieldMinStr !== 'null' ? Number(fieldMinStr) : null;
-    const fieldMax = fieldMaxStr !== 'null' ? Number(fieldMaxStr) : null;
+/**
+ * 获取 addon 的指定子目录路径
+ * 优先返回本地 addons 目录，其次返回 node_modules 目录
+ * @param name - addon 名称
+ * @param subDir - 子目录名称
+ * @returns 完整路径
+ */
+export const getAddonDir = (name: string, subDir: string): string => {
+    // 优先使用本地 addons 目录
+    // const localPath = join(projectAddonsDir, name, subDir);
+    // if (existsSync(localPath)) {
+    //     return localPath;
+    // }
 
-    let fieldDefault: any = fieldDefaultStr;
-    if (fieldType === 'number' && fieldDefaultStr !== 'null') {
-        fieldDefault = Number(fieldDefaultStr);
-    }
+    // 降级使用 node_modules 目录
+    return join(projectDir, 'node_modules', '@befly-addon', name, subDir);
+};
 
-    return {
-        name: fieldName,
-        type: fieldType as 'string' | 'number' | 'text' | 'array_string' | 'array_text',
-        min: fieldMin,
-        max: fieldMax,
-        default: fieldDefault,
-        index: fieldIndex,
-        regex: fieldRegx !== 'null' ? fieldRegx : null
-    };
+/**
+ * 检查 addon 子目录是否存在
+ * @param name - addon 名称
+ * @param subDir - 子目录名称
+ * @returns 是否存在
+ */
+export const addonDirExists = (name: string, subDir: string): boolean => {
+    const dir = getAddonDir(name, subDir);
+    return existsSync(dir) && statSync(dir).isDirectory();
 };

package/lib/addon.ts

@@ -1,77 +0,0 @@
-/**
- * Addon 管理工具类
- * 提供 addon 的扫描、路径获取等功能
- */
-
-import fs from 'node:fs';
-import { join } from 'pathe';
-import { existsSync, statSync, readdirSync } from 'node:fs';
-import { projectDir } from '../paths.js';
-
-/**
- * Addon 管理类
- */
-export class Addon {
-    /**
-     * 扫描所有可用的 addon
-     * @returns addon 名称数组
-     */
-    static scan(): string[] {
-        const beflyDir = join(projectDir, 'node_modules', '@befly-addon');
-
-        if (!existsSync(beflyDir)) {
-            return [];
-        }
-
-        try {
-            return fs
-                .readdirSync(beflyDir)
-                .filter((name) => {
-                    // addon 名称格式：admin, demo 等（不带 addon- 前缀）
-                    const fullPath = join(beflyDir, name);
-                    try {
-                        const stat = statSync(fullPath);
-                        return stat.isDirectory();
-                    } catch {
-                        return false;
-                    }
-                })
-                .sort();
-        } catch {
-            return [];
-        }
-    }
-
-    /**
-     * 获取 addon 的指定子目录路径
-     * @param name - addon 名称
-     * @param subDir - 子目录名称
-     * @returns 完整路径
-     */
-    static getDir(name: string, subDir: string): string {
-        return join(projectDir, 'node_modules', '@befly-addon', name, subDir);
-    }
-
-    /**
-     * 检查 addon 子目录是否存在
-     * @param name - addon 名称
-     * @param subDir - 子目录名称
-     * @returns 是否存在
-     */
-    static dirExists(name: string, subDir: string): boolean {
-        const dir = this.getDir(name, subDir);
-        return existsSync(dir) && statSync(dir).isDirectory();
-    }
-
-    /**
-     * 获取插件目录列表
-     * @param addonsDir - addons 根目录路径
-     * @returns 插件名称数组
-     */
-    static getDirs(addonsDir: string): string[] {
-        return readdirSync(addonsDir).filter((name) => {
-            const addonPath = join(addonsDir, name);
-            return statSync(addonPath).isDirectory() && !name.startsWith('_');
-        });
-    }
-}

package/lifecycle/bootstrap.ts

@@ -1,63 +0,0 @@
-/**
- * 服务启动引导器
- * 负责组装和启动Bun HTTP服务器
- */
-
-import { Logger } from '../lib/logger.js';
-import { calcPerfTime, No } from '../util.js';
-import { Env } from '../env.js';
-import { rootHandler } from '../router/root.js';
-import { apiHandler } from '../router/api.js';
-import { staticHandler } from '../router/static.js';
-
-import type { Server } from 'bun';
-import type { BeflyContext } from '../types/befly.js';
-import type { ApiRoute } from '../types/api.js';
-import type { Plugin } from '../types/plugin.js';
-
-/**
- * 引导器类
- */
-export class Bootstrap {
-    /**
-     * 启动HTTP服务器
-     * @param befly - Befly实例（需要访问 apiRoutes, pluginLists, appContext, appOptions）
-     * @param callback - 启动后的回调函数
-     */
-    static async start(
-        befly: {
-            apiRoutes: Map<string, ApiRoute>;
-            pluginLists: Plugin[];
-            appContext: BeflyContext;
-            appOptions: any;
-        },
-        callback?: (server: Server) => void
-    ): Promise<Server> {
-        const startTime = Bun.nanoseconds();
-
-        const server = Bun.serve({
-            port: Env.APP_PORT,
-            hostname: Env.APP_HOST,
-            routes: {
-                '/': rootHandler,
-                '/api/*': apiHandler(befly.apiRoutes, befly.pluginLists, befly.appContext),
-                '/*': staticHandler,
-                ...(befly.appOptions.routes || {})
-            },
-            error: (error: Error) => {
-                Logger.error('服务启动时发生错误', error);
-                return Response.json(No('内部服务器错误'));
-            }
-        });
-
-        const finalStartupTime = calcPerfTime(startTime);
-        Logger.info(`${Env.APP_NAME} 服务器启动成功! 服务器启动耗时: ${finalStartupTime}`);
-        Logger.info(`服务器监听地址: http://${Env.APP_HOST}:${Env.APP_PORT}`);
-
-        if (callback && typeof callback === 'function') {
-            callback(server);
-        }
-
-        return server;
-    }
-}

package/lifecycle/checker.ts

@@ -1,122 +0,0 @@
-/**
- * 系统检查管理器
- * 负责在框架启动前执行系统检查
- */
-
-import { join, basename } from 'pathe';
-import { existsSync, statSync } from 'node:fs';
-import { Logger } from '../lib/logger.js';
-import { calcPerfTime } from '../util.js';
-import { projectCheckDir } from '../paths.js';
-import { checkDefault } from '../check.js';
-import { Addon } from '../lib/addon.js';
-
-/**
- * 系统检查器类
- */
-export class Checker {
-    /**
-     * 执行所有系统检查
-     */
-    static async run(): Promise<void> {
-        try {
-            const checkStartTime = Bun.nanoseconds();
-
-            // 先执行默认检查（有异常会自动抛出）
-            await checkDefault();
-
-            const glob = new Bun.Glob('*.{ts}');
-
-            // 统计信息
-            const stats = {
-                totalChecks: 0,
-                passedChecks: 0,
-                failedChecks: 0
-            };
-
-            // 检查目录列表：先项目，后 addons
-            const checkDirs: Array<{ path: string; type: 'app' | 'addon'; addonName?: string }> = [];
-
-            // 添加项目 checks 目录（如果存在）
-            if (existsSync(projectCheckDir) && statSync(projectCheckDir).isDirectory()) {
-                checkDirs.push({ path: projectCheckDir, type: 'app' });
-            }
-
-            // 添加所有 addon 的 checks 目录
-            const addons = Addon.scan();
-            for (const addon of addons) {
-                if (Addon.dirExists(addon, 'checks')) {
-                    checkDirs.push({
-                        path: Addon.getDir(addon, 'checks'),
-                        type: 'addon',
-                        addonName: addon
-                    });
-                }
-            }
-
-            // 按顺序扫描并执行检查函数
-            for (const checkConfig of checkDirs) {
-                const { path: checkDir, type: type } = checkConfig;
-                const addonName = 'addonName' in checkConfig ? checkConfig.addonName : undefined;
-                const checkTypeLabel = type === 'app' ? '项目' : `组件${addonName}`;
-
-                for await (const file of glob.scan({
-                    cwd: checkDir,
-                    onlyFiles: true,
-                    absolute: true
-                })) {
-                    const fileName = basename(file);
-                    if (fileName.startsWith('_')) continue; // 跳过以下划线开头的文件
-
-                    try {
-                        stats.totalChecks++;
-                        const singleCheckStart = Bun.nanoseconds();
-
-                        // 导入检查模块
-                        const checkModule = await import(file);
-
-                        // 获取 default 导出的检查函数
-                        const checkFn = checkModule.default;
-
-                        // 执行检查函数
-                        if (typeof checkFn === 'function') {
-                            const checkResult = await checkFn();
-                            const singleCheckTime = calcPerfTime(singleCheckStart);
-
-                            // 检查返回值是否为 boolean
-                            if (typeof checkResult !== 'boolean') {
-                                Logger.warn(`${checkTypeLabel}检查 ${fileName} 返回值必须为 true 或 false，当前为 ${typeof checkResult}`);
-                                stats.failedChecks++;
-                            } else if (checkResult === true) {
-                                stats.passedChecks++;
-                            } else {
-                                Logger.warn(`${checkTypeLabel}检查未通过: ${fileName}`);
-                                stats.failedChecks++;
-                            }
-                        } else {
-                            Logger.warn(`${checkTypeLabel}检查文件 ${fileName} 未找到 default 导出的检查函数`);
-                            stats.failedChecks++;
-                        }
-                    } catch (error: any) {
-                        const singleCheckTime = calcPerfTime(Bun.nanoseconds());
-                        Logger.error(`${checkTypeLabel}检查失败 ${fileName}，耗时: ${singleCheckTime}`, error);
-                        stats.failedChecks++;
-                    }
-                }
-            }
-
-            const totalCheckTime = calcPerfTime(checkStartTime);
-
-            // 输出检查结果统计
-            if (stats.failedChecks > 0) {
-                Logger.error(`系统检查失败: ${stats.failedChecks}/${stats.totalChecks}，耗时: ${totalCheckTime}`);
-                process.exit(1);
-            } else if (stats.totalChecks > 0) {
-                Logger.info(`系统检查通过: ${stats.passedChecks}/${stats.totalChecks}，耗时: ${totalCheckTime}`);
-            }
-        } catch (error: any) {
-            Logger.error('执行系统检查时发生错误', error);
-            process.exit(1);
-        }
-    }
-}

package/lifecycle/lifecycle.ts

@@ -1,104 +0,0 @@
-/**
- * 生命周期管理器
- * 统一管理框架的启动流程：检查、加载插件、加载API、启动服务器
- */
-
-import { Logger } from '../lib/logger.js';
-import { Database } from '../lib/database.js';
-import { Loader } from './loader.js';
-import { Checker } from './checker.js';
-import { Env } from '../env.js';
-import { calcPerfTime } from '../util.js';
-import { Addon } from '../lib/addon.js';
-import { Bootstrap } from './bootstrap.js';
-
-import type { Server } from 'bun';
-import type { Plugin } from '../types/plugin.js';
-import type { ApiRoute } from '../types/api.js';
-import type { BeflyContext, BeflyOptions } from '../types/befly.js';
-
-/**
- * 生命周期管理类
- */
-export class Lifecycle {
-    /** API 路由映射表 */
-    private apiRoutes: Map<string, ApiRoute> = new Map();
-
-    /** 插件列表 */
-    private pluginLists: Plugin[] = [];
-
-    /** 应用配置选项 */
-    private options: BeflyOptions;
-
-    constructor(options: BeflyOptions = {}) {
-        this.options = options;
-    }
-
-    /**
-     * 启动完整的生命周期流程
-     * @param appContext - 应用上下文
-     * @param callback - 启动完成后的回调函数
-     */
-    async start(appContext: BeflyContext, callback?: (server: Server) => void): Promise<Server> {
-        const serverStartTime = Bun.nanoseconds();
-
-        // 1. 执行系统检查
-        await Checker.run();
-
-        // 2. 加载插件
-        await Loader.loadPlugins({ pluginLists: this.pluginLists, appContext });
-
-        // 3. 加载所有 API（addon + app）
-        await this.loadAllApis();
-
-        // 4. 启动 HTTP 服务器
-        const totalStartupTime = calcPerfTime(serverStartTime);
-
-        return await Bootstrap.start(
-            {
-                apiRoutes: this.apiRoutes,
-                pluginLists: this.pluginLists,
-                appContext,
-                appOptions: this.options
-            },
-            callback
-        );
-    }
-
-    /**
-     * 加载所有 API 路由
-     * 包括 core APIs、addon APIs 和 app APIs
-     */
-    private async loadAllApis(): Promise<void> {
-        // 1. 加载 Core APIs
-        try {
-            await Loader.loadApis('core', this.apiRoutes, { where: 'core' });
-        } catch (error: any) {
-            Logger.error(`核心 APIs 加载失败`, error);
-            throw error;
-        }
-
-        // 2. 加载 addon APIs
-        const addons = Addon.scan();
-
-        for (const addon of addons) {
-            const hasApis = Addon.dirExists(addon, 'apis');
-            if (hasApis) {
-                try {
-                    await Loader.loadApis(addon, this.apiRoutes, { where: 'addon', addonName: addon });
-                } catch (error: any) {
-                    Logger.error(`[组件 ${addon}] APIs 加载失败`, error);
-                    throw error;
-                }
-            }
-        }
-
-        // 3. 加载用户 APIs
-        try {
-            await Loader.loadApis('app', this.apiRoutes, { where: 'app' });
-        } catch (error: any) {
-            Logger.error(`用户 APIs 加载失败`, error);
-            throw error;
-        }
-    }
-}