befly 3.8.1 → 3.8.3

package/loader/loadPlugins.ts

@@ -0,0 +1,244 @@
+/**
+ * 插件加载器
+ * 负责扫描和初始化所有插件（核心、组件、用户）
+ */
+
+import { basename } from 'pathe';
+import { existsSync } from 'node:fs';
+import { camelCase } from 'es-toolkit/string';
+import { Logger } from '../lib/logger.js';
+import { calcPerfTime } from '../util.js';
+import { corePluginDir, projectPluginDir } from '../paths.js';
+import { scanAddons, getAddonDir, addonDirExists } from '../util.js';
+import type { Plugin } from '../types/plugin.js';
+import type { BeflyContext } from '../types/befly.js';
+
+/**
+ * 排序插件（根据依赖关系）
+ */
+function sortPlugins(plugins: Plugin[]): Plugin[] | false {
+    const result: Plugin[] = [];
+    const visited = new Set<string>();
+    const visiting = new Set<string>();
+    const pluginMap: Record<string, Plugin> = Object.fromEntries(plugins.map((p) => [p.pluginName || p.name, p]));
+    let isPass = true;
+
+    const visit = (name: string): void => {
+        if (visited.has(name)) return;
+        if (visiting.has(name)) {
+            isPass = false;
+            return;
+        }
+
+        const plugin = pluginMap[name];
+        if (!plugin) return;
+
+        visiting.add(name);
+        (plugin.after || []).forEach(visit);
+        visiting.delete(name);
+        visited.add(name);
+        result.push(plugin);
+    };
+
+    plugins.forEach((p) => visit(p.pluginName || p.name));
+    return isPass ? result : false;
+}
+
+/**
+ * 扫描核心插件
+ */
+async function scanCorePlugins(loadedPluginNames: Set<string>): Promise<Plugin[]> {
+    const plugins: Plugin[] = [];
+    const glob = new Bun.Glob('*.ts');
+
+    for await (const file of glob.scan({
+        cwd: corePluginDir,
+        onlyFiles: true,
+        absolute: true
+    })) {
+        const fileName = basename(file).replace(/\.ts$/, '');
+        if (fileName.startsWith('_')) continue;
+
+        try {
+            const pluginImport = await import(file);
+            const plugin = pluginImport.default;
+            plugin.pluginName = fileName;
+            plugins.push(plugin);
+            loadedPluginNames.add(fileName);
+        } catch (err: any) {
+            Logger.error(`核心插件 ${fileName} 导入失败`, err);
+            process.exit(1);
+        }
+    }
+
+    return plugins;
+}
+
+/**
+ * 扫描组件插件
+ */
+async function scanAddonPlugins(loadedPluginNames: Set<string>): Promise<Plugin[]> {
+    const plugins: Plugin[] = [];
+    const glob = new Bun.Glob('*.ts');
+    const addons = scanAddons();
+
+    for (const addon of addons) {
+        if (!addonDirExists(addon, 'plugins')) continue;
+
+        const addonPluginsDir = getAddonDir(addon, 'plugins');
+        for await (const file of glob.scan({
+            cwd: addonPluginsDir,
+            onlyFiles: true,
+            absolute: true
+        })) {
+            const fileName = basename(file).replace(/\.ts$/, '');
+            if (fileName.startsWith('_')) continue;
+
+            const addonCamelCase = camelCase(addon);
+            const fileNameCamelCase = camelCase(fileName);
+            const pluginFullName = `addon${addonCamelCase.charAt(0).toUpperCase() + addonCamelCase.slice(1)}_${fileNameCamelCase}`;
+
+            if (loadedPluginNames.has(pluginFullName)) {
+                continue;
+            }
+
+            try {
+                const pluginImport = await import(file);
+                const plugin = pluginImport.default;
+                plugin.pluginName = pluginFullName;
+                plugins.push(pluginInstance);
+                loadedPluginNames.add(pluginFullName);
+            } catch (err: any) {
+                Logger.error(`组件${addon} ${fileName} 导入失败`, err);
+                process.exit(1);
+            }
+        }
+    }
+
+    return plugins;
+}
+
+/**
+ * 扫描用户插件
+ */
+async function scanUserPlugins(loadedPluginNames: Set<string>): Promise<Plugin[]> {
+    const plugins: Plugin[] = [];
+
+    if (!existsSync(projectPluginDir)) {
+        return plugins;
+    }
+
+    const glob = new Bun.Glob('*.ts');
+    for await (const file of glob.scan({
+        cwd: projectPluginDir,
+        onlyFiles: true,
+        absolute: true
+    })) {
+        const fileName = basename(file).replace(/\.ts$/, '');
+        if (fileName.startsWith('_')) continue;
+
+        const fileNameCamelCase = camelCase(fileName);
+        const pluginFullName = `app${fileNameCamelCase.charAt(0).toUpperCase() + fileNameCamelCase.slice(1)}`;
+
+        if (loadedPluginNames.has(pluginFullName)) {
+            continue;
+        }
+
+        try {
+            const pluginImport = await import(file);
+            const plugin = pluginImport.default;
+            plugin.pluginName = pluginFullName;
+            plugins.push(pluginInstance);
+            loadedPluginNames.add(pluginFullName);
+        } catch (err: any) {
+            Logger.error(`用户插件 ${fileName} 导入失败`, err);
+            process.exit(1);
+        }
+    }
+
+    return plugins;
+}
+
+/**
+ * 初始化单个插件
+ */
+async function initPlugin(befly: { pluginLists: Plugin[]; appContext: BeflyContext }, plugin: Plugin): Promise<void> {
+    befly.pluginLists.push(plugin);
+
+    if (typeof plugin?.onInit === 'function') {
+        befly.appContext[plugin.pluginName] = await plugin?.onInit(befly.appContext);
+    } else {
+        befly.appContext[plugin.pluginName] = {};
+    }
+}
+
+/**
+ * 加载所有插件
+ * @param befly - Befly实例（需要访问 pluginLists 和 appContext）
+ */
+export async function loadPlugins(befly: { pluginLists: Plugin[]; appContext: BeflyContext }): Promise<void> {
+    try {
+        const loadStartTime = Bun.nanoseconds();
+        const loadedPluginNames = new Set<string>();
+
+        // 阶段1：扫描所有插件
+        const corePlugins = await scanCorePlugins(loadedPluginNames);
+        const addonPlugins = await scanAddonPlugins(loadedPluginNames);
+        const userPlugins = await scanUserPlugins(loadedPluginNames);
+
+        // 阶段2：分层排序插件
+        const sortedCorePlugins = sortPlugins(corePlugins);
+        if (sortedCorePlugins === false) {
+            Logger.error('核心插件依赖关系错误，请检查插件的 after 属性');
+            process.exit(1);
+        }
+
+        const sortedAddonPlugins = sortPlugins(addonPlugins);
+        if (sortedAddonPlugins === false) {
+            Logger.error('组件插件依赖关系错误，请检查插件的 after 属性');
+            process.exit(1);
+        }
+
+        const sortedUserPlugins = sortPlugins(userPlugins);
+        if (sortedUserPlugins === false) {
+            Logger.error('用户插件依赖关系错误，请检查插件的 after 属性');
+            process.exit(1);
+        }
+
+        // 阶段3：分层初始化插件（核心 → 组件 → 用户）
+        // 3.1 初始化核心插件
+        for (const plugin of sortedCorePlugins) {
+            try {
+                await initPlugin(befly, plugin);
+            } catch (error: any) {
+                Logger.error(`核心插件 ${plugin.pluginName} 初始化失败`, error);
+                process.exit(1);
+            }
+        }
+
+        // 3.2 初始化组件插件
+        for (const plugin of sortedAddonPlugins) {
+            try {
+                await initPlugin(befly, plugin);
+            } catch (error: any) {
+                Logger.error(`组件插件 ${plugin.pluginName} 初始化失败`, error);
+                process.exit(1);
+            }
+        }
+
+        // 3.3 初始化用户插件
+        for (const plugin of sortedUserPlugins) {
+            try {
+                await initPlugin(befly, plugin);
+            } catch (error: any) {
+                Logger.error(`用户插件 ${plugin.pluginName} 初始化失败`, error);
+                process.exit(1);
+            }
+        }
+
+        const totalLoadTime = calcPerfTime(loadStartTime);
+    } catch (error: any) {
+        Logger.error('加载插件时发生错误', error);
+        process.exit(1);
+    }
+}

package/main.ts

@@ -1,46 +1,136 @@
 /**
  * Befly 框架主入口文件
- * 提供简洁的框架接口，核心逻辑已提取到 lifecycle 层
+ * 提供简洁的框架接口，核心逻辑已提取到 loader 层
  */
 
 import { Env } from './env.js';
-import { Yes, No } from './util.js';
+
 import { Logger } from './lib/logger.js';
 import { Cipher } from './lib/cipher.js';
 import { Jwt } from './lib/jwt.js';
 import { Database } from './lib/database.js';
-import { Lifecycle } from './lifecycle/lifecycle.js';
+import { loadPlugins } from './loader/loadPlugins.js';
+import { loadApis } from './loader/loadApis.js';
+import { rootHandler } from './router/root.js';
+import { apiHandler } from './router/api.js';
+import { staticHandler } from './router/static.js';
 import { coreDir } from './paths.js';
 import { DbHelper } from './lib/dbHelper.js';
 import { RedisHelper } from './lib/redisHelper.js';
-import { Addon } from './lib/addon.js';
-import { checkDefault } from './check.js';
-import * as utilFunctions from './util.js';
+import { checkTable, checkApi, checkApp } from './check.js';
+import {
+    //
+    Yes,
+    No,
+    keysToSnake,
+    keysToCamel,
+    arrayKeysToCamel,
+    pickFields,
+    fieldClear,
+    calcPerfTime,
+    scanAddons,
+    getAddonDir,
+    addonDirExists
+} from './util.js';
 
 import type { Server } from 'bun';
-import type { BeflyContext, BeflyOptions } from './types/befly.js';
+import type { BeflyContext } from './types/befly.js';
+import type { Plugin } from './types/plugin.js';
+import type { ApiRoute } from './types/api.js';
 /**
  * Befly 框架核心类
  * 职责：管理应用上下文和生命周期
  */
 export class Befly {
-    /** 生命周期管理器 */
-    private lifecycle: Lifecycle;
+    /** API 路由映射表 */
+    private apiRoutes: Map<string, ApiRoute> = new Map();
+
+    /** 插件列表 */
+    private pluginLists: Plugin[] = [];
 
     /** 应用上下文 */
     public appContext: BeflyContext;
 
-    constructor(options: BeflyOptions = {}) {
-        this.lifecycle = new Lifecycle(options);
+    constructor() {
         this.appContext = {};
     }
 
+    /**
+     * 启动完整的生命周期流程
+     * @returns HTTP 服务器实例
+     */
+    private async start(): Promise<Server> {
+        const serverStartTime = Bun.nanoseconds();
+
+        // 1. 加载所有 API（动态导入必须在最前面，避免 Bun 1.3.2 的崩溃 bug）
+        await loadApis(this.apiRoutes);
+
+        // 2. 执行项目结构检查
+        const appCheckResult = await checkApp();
+        if (!appCheckResult) {
+            Logger.error('项目结构检查失败，程序退出');
+            process.exit(1);
+        }
+
+        // 3. 执行表定义检查
+        const tableCheckResult = await checkTable();
+        if (!tableCheckResult) {
+            Logger.error('表定义检查失败，程序退出');
+            process.exit(1);
+        }
+
+        // 4. 执行 API 定义检查
+        const apiCheckResult = await checkApi();
+        if (!apiCheckResult) {
+            Logger.error('API 定义检查失败，程序退出');
+            process.exit(1);
+        }
+
+        // 5. 加载插件
+        await loadPlugins({
+            pluginLists: this.pluginLists,
+            appContext: this.appContext
+        });
+
+        // 4. 启动 HTTP 服务器
+        const totalStartupTime = calcPerfTime(serverStartTime);
+
+        return await this.startServer();
+    }
+
+    /**
+     * 启动 HTTP 服务器
+     * @returns HTTP 服务器实例
+     */
+    private async startServer(): Promise<Server> {
+        const startTime = Bun.nanoseconds();
+
+        const server = Bun.serve({
+            port: Env.APP_PORT,
+            hostname: Env.APP_HOST,
+            routes: {
+                '/': rootHandler,
+                '/api/*': apiHandler(this.apiRoutes, this.pluginLists, this.appContext),
+                '/*': staticHandler
+            },
+            error: (error: Error) => {
+                Logger.error('服务启动时发生错误', error);
+                return Response.json({ code: 1, msg: '内部服务器错误' });
+            }
+        });
+
+        const finalStartupTime = calcPerfTime(startTime);
+        Logger.info(`${Env.APP_NAME} 服务器启动成功! 服务器启动耗时: ${finalStartupTime}`);
+        Logger.info(`服务器监听地址: http://${Env.APP_HOST}:${Env.APP_PORT}`);
+
+        return server;
+    }
+
     /**
      * 启动服务器并注册优雅关闭处理
-     * @param callback - 启动完成后的回调函数
      */
-    async listen(callback?: (server: Server) => void): Promise<Server> {
-        const server = await this.lifecycle.start(this.appContext, callback);
+    async listen(): Promise<Server> {
+        const server = await this.start();
 
         const gracefulShutdown = async (signal: string) => {
             // 1. 停止接收新请求
@@ -78,18 +168,21 @@ export {
     Database,
     DbHelper,
     RedisHelper,
-    Addon,
     coreDir,
-    checkDefault
+    checkTable,
+    checkApi,
+    checkApp
 };
 
 // 工具函数命名空间导出
 export const utils = {
-    keysToSnake: utilFunctions.keysToSnake,
-    keysToCamel: utilFunctions.keysToCamel,
-    arrayKeysToCamel: utilFunctions.arrayKeysToCamel,
-    pickFields: utilFunctions.pickFields,
-    fieldClear: utilFunctions.fieldClear,
-    calcPerfTime: utilFunctions.calcPerfTime,
-    parseRule: utilFunctions.parseRule
+    keysToSnake: keysToSnake,
+    keysToCamel: keysToCamel,
+    arrayKeysToCamel: arrayKeysToCamel,
+    pickFields: pickFields,
+    fieldClear: fieldClear,
+    calcPerfTime: calcPerfTime,
+    scanAddons: scanAddons,
+    getAddonDir: getAddonDir,
+    addonDirExists: addonDirExists
 };

package/menu.json

@@ -1,22 +1,22 @@
 [
     {
         "name": "首页",
-        "path": "/",
-        "icon": "Home",
+        "path": "/addon/admin",
+        "icon": "",
         "sort": 1,
         "type": 1
     },
     {
         "name": "人员管理",
-        "path": "/internal/people",
-        "icon": "UserCircle",
+        "path": "_people",
+        "icon": "",
         "sort": 2,
         "type": 1,
         "children": [
             {
                 "name": "管理员管理",
-                "path": "/admin",
-                "icon": "Users",
+                "path": "/addon/admin/admin",
+                "icon": "",
                 "sort": 2,
                 "type": 1
             }
@@ -24,22 +24,22 @@
     },
     {
         "name": "权限设置",
-        "path": "/internal/settings",
-        "icon": "Settings",
+        "path": "_permission",
+        "icon": "",
         "sort": 3,
         "type": 1,
         "children": [
             {
                 "name": "菜单管理",
-                "path": "/menu",
-                "icon": "Menu",
+                "path": "/addon/admin/menu",
+                "icon": "",
                 "sort": 4,
                 "type": 1
             },
             {
                 "name": "角色管理",
-                "path": "/role",
-                "icon": "Users",
+                "path": "/addon/admin/role",
+                "icon": "",
                 "sort": 5,
                 "type": 1
             }
@@ -47,8 +47,8 @@
     },
     {
         "name": "字典管理",
-        "path": "/internal/dict",
-        "icon": "BookOpen",
+        "path": "/addon/admin/dict",
+        "icon": "",
         "sort": 6,
         "type": 1
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.8.1",
+    "version": "3.8.3",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -39,8 +39,8 @@
     "license": "Apache-2.0",
     "files": [
         "lib/",
-        "lifecycle/",
-        "plugins/",
+        "loader/",
+        "middleware/",
         "router/",
         "types/",
         ".gitignore",
@@ -69,5 +69,5 @@
         "es-toolkit": "^1.41.0",
         "pathe": "^2.0.3"
     },
-    "gitHead": "da3ca0f3da53574d9b1053ad5cb2247acc11d384"
+    "gitHead": "51d86162e5f0b94ecc44a833a98ebf97c27f7bd6"
 }

package/paths.ts

@@ -89,3 +89,10 @@ export const projectApiDir = join(projectDir, 'apis');
  * @usage 存放用户业务表定义（JSON 格式）
  */
 export const projectTableDir = join(projectDir, 'tables');
+
+/**
+ * 项目组件目录
+ * @description {projectDir}/addons/
+ * @usage 存放本地组件（优先级高于 node_modules 中的组件）
+ */
+export const projectAddonsDir = join(projectDir, 'addons');

package/types/common.d.ts

@@ -21,9 +21,33 @@ export interface ValidationResult {
 }
 
 /**
- * 字段规则字符串
+ * 字段定义类型（对象格式）
+ */
+export interface FieldDefinition {
+    name: string; // 字段标签/描述
+    detail: string; // 字段详细说明
+    type: 'string' | 'number' | 'text' | 'array_string' | 'array_text';
+    min: number | null; // 最小值/最小长度
+    max: number | null; // 最大值/最大长度
+    default: any; // 默认值
+    index: boolean; // 是否创建索引
+    unique: boolean; // 是否唯一
+    comment: string; // 字段注释
+    nullable: boolean; // 是否允许为空
+    unsigned: boolean; // 是否无符号（仅number类型）
+    regexp: string | null; // 正则验证
+}
+
+/**
+ * 表定义类型（对象格式）
+ */
+export type TableDefinition = Record<string, FieldDefinition>;
+
+/**
+ * 字段规则字符串（已废弃，保留用于兼容）
  * 格式: "字段名|类型|最小值|最大值|默认值|是否索引|正则约束"
  *
+ * @deprecated 请使用 FieldDefinition 对象格式
  * @example
  * "用户名|string|2|50|null|1|^[a-zA-Z0-9_]+$"
  * "年龄|number|0|150|18|0|null"
@@ -31,12 +55,9 @@ export interface ValidationResult {
 export type FieldRule = string;
 
 /**
- * 表定义类型
- */
-export type TableDefinition = Record<string, FieldRule>;
-
-/**
- * 解析后的字段规则
+ * 解析后的字段规则（已废弃，保留用于兼容）
+ *
+ * @deprecated 请使用 FieldDefinition 对象格式
  */
 export interface ParsedFieldRule {
     name: string; // 字段名称