befly 3.8.18 → 3.8.20

package/loader/loadPlugins.ts

@@ -1,249 +1,80 @@
 /**
  * 插件加载器
- * 负责扫描和初始化所有插件（核心、组件、用户）
+ * 负责扫描和初始化所有插件（核心、组件、项目）
  */
 
-import { basename } from 'pathe';
-import { existsSync } from 'node:fs';
-import { camelCase } from 'es-toolkit/string';
+import { scanAddons, getAddonDir } from 'befly-util';
+
 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 { sortModules, scanModules } 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,js}');
-
-    for await (const file of glob.scan({
-        cwd: corePluginDir,
-        onlyFiles: true,
-        absolute: true
-    })) {
-        if (file.endsWith('.d.ts')) continue;
-        const fileName = basename(file).replace(/\.(ts|js)$/, '');
-        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,js}');
-    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
-        })) {
-            if (file.endsWith('.d.ts')) continue;
-            const fileName = basename(file).replace(/\.(ts|js)$/, '');
-            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 normalizedFilePath = file.replace(/\\/g, '/');
-                const pluginImport = await import(normalizedFilePath);
-                const plugin = pluginImport.default;
-                plugin.pluginName = pluginFullName;
-                plugins.push(plugin);
-                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,js}');
-    for await (const file of glob.scan({
-        cwd: projectPluginDir,
-        onlyFiles: true,
-        absolute: true
-    })) {
-        if (file.endsWith('.d.ts')) continue;
-        const fileName = basename(file).replace(/\.(ts|js)$/, '');
-        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 normalizedFilePath = file.replace(/\\/g, '/');
-            const pluginImport = await import(normalizedFilePath);
-            const plugin = pluginImport.default;
-            plugin.pluginName = pluginFullName;
-            plugins.push(plugin);
-            loadedPluginNames.add(pluginFullName);
-        } catch (err: any) {
-            Logger.error(`用户插件 ${fileName} 导入失败`, err);
-            process.exit(1);
+export async function loadPlugins(befly: {
+    //
+    pluginLists: Plugin[];
+    appContext: BeflyContext;
+    pluginsConfig?: Record<string, any>;
+}): Promise<void> {
+    try {
+        const allPlugins: Plugin[] = [];
+
+        // 1. 扫描核心插件
+        const corePlugins = await scanModules<Plugin>(corePluginDir, 'core', '插件', befly.pluginsConfig);
+
+        // 2. 扫描组件插件
+        const addonPlugins: Plugin[] = [];
+        const addons = scanAddons();
+        for (const addon of addons) {
+            const dir = getAddonDir(addon, 'plugins');
+            const plugins = await scanModules<Plugin>(dir, 'addon', '插件', befly.pluginsConfig, addon);
+            addonPlugins.push(...plugins);
         }
-    }
-
-    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>();
+        // 3. 扫描项目插件
+        const appPlugins = await scanModules<Plugin>(projectPluginDir, 'app', '插件', befly.pluginsConfig);
 
-        // 阶段1：扫描所有插件
-        const corePlugins = await scanCorePlugins(loadedPluginNames);
-        const addonPlugins = await scanAddonPlugins(loadedPluginNames);
-        const userPlugins = await scanUserPlugins(loadedPluginNames);
+        // 4. 合并所有插件
+        allPlugins.push(...corePlugins);
+        allPlugins.push(...addonPlugins);
+        allPlugins.push(...appPlugins);
 
-        // 阶段2：分层排序插件
-        const sortedCorePlugins = sortPlugins(corePlugins);
-        if (sortedCorePlugins === false) {
-            Logger.error('核心插件依赖关系错误，请检查插件的 after 属性');
-            process.exit(1);
-        }
+        // 5. 过滤禁用的插件
+        const disablePlugins = (befly as any).config?.disablePlugins || [];
+        const enabledPlugins = allPlugins.filter((plugin) => !disablePlugins.includes(plugin.name));
 
-        const sortedAddonPlugins = sortPlugins(addonPlugins);
-        if (sortedAddonPlugins === false) {
-            Logger.error('组件插件依赖关系错误，请检查插件的 after 属性');
-            process.exit(1);
+        if (disablePlugins.length > 0) {
+            Logger.info(`禁用插件: ${disablePlugins.join(', ')}`);
         }
 
-        const sortedUserPlugins = sortPlugins(userPlugins);
-        if (sortedUserPlugins === false) {
-            Logger.error('用户插件依赖关系错误，请检查插件的 after 属性');
+        // 6. 排序与初始化
+        const sortedPlugins = sortModules(enabledPlugins);
+        if (sortedPlugins === false) {
+            Logger.error('插件依赖关系错误，请检查 after 属性');
             process.exit(1);
         }
 
-        // 阶段3：分层初始化插件（核心 → 组件 → 用户）
-        // 3.1 初始化核心插件
-        for (const plugin of sortedCorePlugins) {
+        for (const plugin of sortedPlugins) {
             try {
-                await initPlugin(befly, plugin);
-            } catch (error: any) {
-                Logger.error(`核心插件 ${plugin.pluginName} 初始化失败`, error);
-                process.exit(1);
-            }
-        }
+                befly.pluginLists.push(plugin);
 
-        // 3.2 初始化组件插件
-        for (const plugin of sortedAddonPlugins) {
-            try {
-                await initPlugin(befly, plugin);
+                if (typeof plugin.handler === 'function') {
+                    befly.appContext[plugin.name!] = await plugin.handler(befly.appContext);
+                } else {
+                    befly.appContext[plugin.name!] = {};
+                }
             } catch (error: any) {
-                Logger.error(`组件插件 ${plugin.pluginName} 初始化失败`, error);
+                Logger.error(`插件 ${plugin.name} 初始化失败`, 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);
     }
 }
+
+// ==================== 钩子加载逻辑 ====================
+// 已移动到 loadHooks.ts

package/main.ts

@@ -3,39 +3,34 @@
  * 提供简洁的框架接口，核心逻辑已提取到 loader 层
  */
 
-import { Env } from './env.js';
+// ========== 外部依赖 ==========
+import { calcPerfTime } from 'befly-util';
 
+// ========== 相对导入 ==========
 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 { DbHelper } from './lib/dbHelper.js';
+import { RedisHelper } from './lib/redisHelper.js';
 import { loadPlugins } from './loader/loadPlugins.js';
+import { loadHooks } from './loader/loadHooks.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 { checkApp } from './checks/checkApp.js';
+import { checkTable } from './checks/checkTable.js';
+import { checkApi } from './checks/checkApi.js';
+import { syncAllCommand } from './sync/syncAll.js';
 import { coreDir } from './paths.js';
-import { DbHelper } from './lib/dbHelper.js';
-import { RedisHelper } from './lib/redisHelper.js';
-import { checkTable, checkApi, checkApp } from './check.js';
-import {
-    //
-    Yes,
-    No,
-    keysToSnake,
-    keysToCamel,
-    arrayKeysToCamel,
-    pickFields,
-    fieldClear,
-    calcPerfTime,
-    scanAddons,
-    getAddonDir,
-    addonDirExists
-} from './util.js';
+import { defaultOptions } from './config.js';
 
+// ========== 类型导入 ==========
 import type { Server } from 'bun';
-import type { BeflyContext } from './types/befly.js';
+import type { BeflyContext, BeflyOptions } from './types/befly.js';
 import type { Plugin } from './types/plugin.js';
+import type { Hook } from './types/hook.js';
 import type { ApiRoute } from './types/api.js';
 /**
  * Befly 框架核心类
@@ -48,142 +43,120 @@ export class Befly {
     /** 插件列表 */
     private pluginLists: Plugin[] = [];
 
+    /** 钩子列表 */
+    private hookLists: Hook[] = [];
+
     /** 应用上下文 */
     public appContext: BeflyContext;
 
-    constructor() {
+    /** 最终配置（合并默认值后） */
+    public config: BeflyOptions;
+
+    constructor(options: BeflyOptions = {}) {
         this.appContext = {};
+        // 合并配置：用户配置 > 默认配置（最多 2 级）
+        this.config = { ...defaultOptions };
+        for (const key in options) {
+            const value = options[key as keyof BeflyOptions];
+            if (value !== undefined && value !== null) {
+                if (typeof value === 'object' && !Array.isArray(value)) {
+                    this.config[key as keyof BeflyOptions] = { ...defaultOptions[key as keyof typeof defaultOptions], ...value } as any;
+                } else {
+                    this.config[key as keyof BeflyOptions] = value as any;
+                }
+            }
+        }
     }
 
     /**
      * 启动完整的生命周期流程
      * @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('项目结构检查失败，程序退出');
+    public async start(): Promise<Server> {
+        try {
+            const serverStartTime = Bun.nanoseconds();
+
+            // 1. 执行启动检查
+            await checkApp();
+            await checkTable();
+            await checkApi();
+
+            // 4. 加载插件
+            await loadPlugins({
+                pluginLists: this.pluginLists,
+                appContext: this.appContext,
+                pluginsConfig: this.config as any
+            });
+
+            // 5. 加载钩子
+            await loadHooks({
+                hookLists: this.hookLists,
+                pluginsConfig: this.config as any
+            });
+
+            // 6. 加载所有 API
+            await loadApis(this.apiRoutes);
+
+            // 7. 自动同步 (默认开启)
+            await syncAllCommand(this.config);
+
+            // 8. 启动 HTTP 服务器
+            const server = Bun.serve({
+                port: this.config.appPort,
+                hostname: this.config.appHost,
+                routes: {
+                    '/': rootHandler,
+                    '/api/*': apiHandler(this.apiRoutes, this.hookLists, this.appContext),
+                    '/*': staticHandler(this.config.cors)
+                },
+                error: (error: Error) => {
+                    Logger.error('服务启动时发生错误', error);
+                    return Response.json({ code: 1, msg: '内部服务器错误' });
+                }
+            });
+
+            const finalStartupTime = calcPerfTime(serverStartTime);
+            Logger.info(`${this.config.appName} 启动成功! `);
+            Logger.info(`服务器启动耗时: ${finalStartupTime}`);
+            Logger.info(`服务器监听地址: http://${this.config.appHost}:${this.config.appPort}`);
+
+            // 9. 注册优雅关闭处理
+            const gracefulShutdown = async (signal: string) => {
+                // 停止接收新请求
+                server.stop(true);
+                Logger.info('HTTP 服务器已停止');
+
+                // 关闭数据库连接
+                try {
+                    await Database.disconnect();
+                    Logger.info('数据库连接已关闭');
+                } catch (error: any) {
+                    Logger.error('关闭数据库连接时出错:', error);
+                }
+
+                Logger.info('服务器已优雅关闭');
+                process.exit(0);
+            };
+
+            process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
+            process.on('SIGINT', () => gracefulShutdown('SIGINT'));
+
+            return server;
+        } catch (error: any) {
+            Logger.error('Befly 启动失败', 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} 启动成功! `);
-        Logger.info(`服务器启动耗时: ${finalStartupTime}`);
-        Logger.info(`服务器监听地址: http://${Env.APP_HOST}:${Env.APP_PORT}`);
-
-        return server;
-    }
-
-    /**
-     * 启动服务器并注册优雅关闭处理
-     */
-    async listen(): Promise<Server> {
-        const server = await this.start();
-
-        const gracefulShutdown = async (signal: string) => {
-            // 1. 停止接收新请求
-            server.stop(true);
-            Logger.info('HTTP 服务器已停止');
-
-            // 2. 关闭数据库连接
-            try {
-                await Database.disconnect();
-                Logger.info('数据库连接已关闭');
-            } catch (error: any) {
-                Logger.err('关闭数据库连接时出错:', error);
-            }
-
-            Logger.info('服务器已优雅关闭');
-            process.exit(0);
-        };
-
-        process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
-        process.on('SIGINT', () => gracefulShutdown('SIGINT'));
-
-        return server;
     }
 }
 
 // 核心类和工具导出
 export {
     // 配置
-    Env,
     Logger,
     Cipher,
     Jwt,
-    Yes,
-    No,
     Database,
     DbHelper,
     RedisHelper,
-    coreDir,
-    checkTable,
-    checkApi,
-    checkApp
-};
-
-// 工具函数命名空间导出
-export const utils = {
-    keysToSnake: keysToSnake,
-    keysToCamel: keysToCamel,
-    arrayKeysToCamel: arrayKeysToCamel,
-    pickFields: pickFields,
-    fieldClear: fieldClear,
-    calcPerfTime: calcPerfTime,
-    scanAddons: scanAddons,
-    getAddonDir: getAddonDir,
-    addonDirExists: addonDirExists
+    coreDir
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.8.18",
+    "version": "3.8.20",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -9,14 +9,15 @@
         "registry": "https://registry.npmjs.org"
     },
     "main": "main.ts",
-    "types": "./types/index.d.ts",
+    "types": "main.ts",
     "exports": {
         ".": {
+            "types": "./main.ts",
             "default": "./main.ts"
         },
         "./types": {
-            "types": "./types/index.d.ts",
-            "default": "./types/index.d.ts"
+            "types": "./types/index.ts",
+            "default": "./types/index.ts"
         }
     },
     "scripts": {
@@ -38,6 +39,8 @@
     "homepage": "https://chensuiyi.me",
     "license": "Apache-2.0",
     "files": [
+        "sync/",
+        "config/",
         "lib/",
         "loader/",
         "plugins/",
@@ -51,9 +54,9 @@
         "LICENSE",
         "main.ts",
         "check.ts",
-        "env.ts",
         "paths.ts",
-        "util.ts",
+        "response.ts",
+        "dist/",
         "package.json",
         "README.md",
         "LICENSE"
@@ -62,8 +65,13 @@
         "bun": ">=1.3.0"
     },
     "dependencies": {
+        "befly-util": "0.1.2",
+        "chalk": "^5.6.2",
         "es-toolkit": "^1.41.0",
         "pathe": "^2.0.3"
     },
-    "gitHead": "29e1bc79619581b841052206a59b124e027dfd20"
+    "gitHead": "e43aefa3abeda7a35669778793d39b23b4180c4e",
+    "devDependencies": {
+        "typescript": "^5.9.3"
+    }
 }

package/paths.ts

@@ -39,6 +39,16 @@ export const coreCheckDir = join(__dirname, 'checks');
  */
 export const corePluginDir = join(__dirname, 'plugins');
 
+/**
+ * Core 框架钩子目录
+ * @description packages/core/hooks/
+ * @usage 存放内置钩子（auth, cors, parser 等）
+ */
+export const coreHookDir = join(__dirname, 'hooks');
+
+/**
+ * Core 框架 API 目录
+
 /**
  * Core 框架 API 目录
  * @description packages/core/apis/
@@ -76,6 +86,16 @@ export const projectCheckDir = join(projectDir, 'checks');
  */
 export const projectPluginDir = join(projectDir, 'plugins');
 
+/**
+ * 项目钩子目录
+ * @description {projectDir}/hooks/
+ * @usage 存放用户自定义钩子
+ */
+export const projectHookDir = join(projectDir, 'hooks');
+
+/**
+ * 项目 API 目录
+
 /**
  * 项目 API 目录
  * @description {projectDir}/apis/