befly 3.8.19 → 3.8.21

package/loader/loadApis.ts

@@ -1,18 +1,22 @@
 /**
  * API 加载器
- * 负责扫描和加载所有 API 路由（组件、用户）
+ * 负责扫描和加载所有 API 路由（组件、项目）
  */
 
-import { relative, basename, join } from 'pathe';
+// 内部依赖
 import { existsSync } from 'node:fs';
+
+// 外部依赖
+import { relative, basename, join } from 'pathe';
 import { isPlainObject } from 'es-toolkit/compat';
+import { calcPerfTime, scanFiles, scanAddons, getAddonDir, addonDirExists } from 'befly-util';
+
+// 相对导入
 import { Logger } from '../lib/logger.js';
-import { calcPerfTime } from '../util.js';
 import { projectApiDir } from '../paths.js';
-import { scanAddons, getAddonDir, addonDirExists } from '../util.js';
-import type { ApiRoute } from '../types/api.js';
 
-const API_GLOB_PATTERN = '**/*.{ts,js}';
+// 类型导入
+import type { ApiRoute } from '../types/api.js';
 
 /**
  * API 默认字段定义
@@ -52,103 +56,6 @@ const DEFAULT_API_FIELDS = {
     }
 } as const;
 
-/**
- * 扫描用户 API 文件
- */
-async function scanUserApis(): Promise<Array<{ file: string; routePrefix: string; displayName: string }>> {
-    const apis: Array<{ file: string; routePrefix: string; displayName: string }> = [];
-
-    if (!existsSync(projectApiDir)) {
-        return apis;
-    }
-
-    const glob = new Bun.Glob(API_GLOB_PATTERN);
-
-    for await (const file of glob.scan({
-        cwd: projectApiDir,
-        onlyFiles: true,
-        absolute: true
-    })) {
-        if (file.endsWith('.d.ts')) {
-            continue;
-        }
-        const apiPath = relative(projectApiDir, file).replace(/\.(ts|js)$/, '');
-        if (apiPath.indexOf('_') !== -1) continue;
-
-        apis.push({
-            file: file,
-            routePrefix: '',
-            displayName: '用户'
-        });
-    }
-
-    return apis;
-}
-
-/**
- * 扫描组件 API 文件
- */
-async function scanAddonApis(): Promise<Array<{ file: string; routePrefix: string; displayName: string }>> {
-    const apis: Array<{ file: string; routePrefix: string; displayName: string }> = [];
-    const glob = new Bun.Glob(API_GLOB_PATTERN);
-    const addons = scanAddons();
-
-    for (const addon of addons) {
-        if (!addonDirExists(addon, 'apis')) continue;
-
-        const addonApiDir = getAddonDir(addon, 'apis');
-        for await (const file of glob.scan({
-            cwd: addonApiDir,
-            onlyFiles: true,
-            absolute: true
-        })) {
-            if (file.endsWith('.d.ts')) {
-                continue;
-            }
-            const apiPath = relative(addonApiDir, file).replace(/\.(ts|js)$/, '');
-            if (apiPath.indexOf('_') !== -1) continue;
-
-            apis.push({
-                file: file,
-                routePrefix: `addon/${addon}`,
-                displayName: `组件${addon}`
-            });
-        }
-    }
-
-    return apis;
-}
-
-/**
- * 初始化单个 API
- */
-async function initApi(apiRoutes: Map<string, ApiRoute>, apiInfo: { file: string; routePrefix: string; displayName: string }): Promise<void> {
-    const { file, routePrefix, displayName } = apiInfo;
-    const apiDir = routePrefix === '' ? projectApiDir : getAddonDir(routePrefix.replace('addon/', ''), 'apis');
-    const apiPath = relative(apiDir, file).replace(/\.(ts|js)$/, '');
-
-    try {
-        // Windows 下路径需要转换为正斜杠格式
-        const filePath = file.replace(/\\/g, '/');
-        const apiImport = await import(filePath);
-        const api = apiImport.default;
-
-        // 设置默认值
-        api.method = api.method || 'POST';
-        api.auth = api.auth !== undefined ? api.auth : true;
-        // 合并默认字段：默认字段作为基础，API 自定义字段优先级更高
-        api.fields = { ...DEFAULT_API_FIELDS, ...(api.fields || {}) };
-        api.required = api.required || [];
-
-        // 构建路由
-        api.route = `${api.method.toUpperCase()}/api/${routePrefix ? routePrefix + '/' : ''}${apiPath}`;
-        apiRoutes.set(api.route, api);
-    } catch (error: any) {
-        Logger.error(`[${displayName}] 接口 ${apiPath} 加载失败`, error);
-        process.exit(1);
-    }
-}
-
 /**
  * 加载所有 API 路由
  * @param apiRoutes - API 路由映射表
@@ -157,19 +64,67 @@ export async function loadApis(apiRoutes: Map<string, ApiRoute>): Promise<void>
     try {
         const loadStartTime = Bun.nanoseconds();
 
-        // 阶段1：扫描所有 API
-        const userApis = await scanUserApis();
-        const addonApis = await scanAddonApis();
-
-        // 阶段2：初始化所有 API（用户 → 组件）
-        // 2.1 初始化用户 APIs
-        for (const apiInfo of userApis) {
-            await initApi(apiRoutes, apiInfo);
+        // 1. 扫描项目 API
+        const projectApiFiles = await scanFiles(projectApiDir);
+        const projectApiList = projectApiFiles.map((file) => ({
+            filePath: file.filePath,
+            relativePath: file.relativePath,
+            type: 'project' as const,
+            routePrefix: '',
+            typeName: '项目'
+        }));
+
+        // 2. 扫描组件 API
+        const addonApiList: Array<{
+            filePath: string;
+            relativePath: string;
+            type: 'addon';
+            routePrefix: string;
+            typeName: string;
+        }> = [];
+        const addons = scanAddons();
+        for (const addon of addons) {
+            if (!addonDirExists(addon, 'apis')) continue;
+
+            const addonApiDir = getAddonDir(addon, 'apis');
+            const addonApiFiles = await scanFiles(addonApiDir);
+
+            for (const file of addonApiFiles) {
+                addonApiList.push({
+                    filePath: file.filePath,
+                    relativePath: file.relativePath,
+                    type: 'addon' as const,
+                    routePrefix: `addon/${addon}`,
+                    typeName: `组件${addon}`
+                });
+            }
         }
 
-        // 2.2 初始化组件 APIs
-        for (const apiInfo of addonApis) {
-            await initApi(apiRoutes, apiInfo);
+        // 3. 合并所有 API 文件
+        const allApiFiles = [...projectApiList, ...addonApiList];
+
+        // 4. 遍历处理所有 API 文件
+        for (const apiFile of allApiFiles) {
+            try {
+                // Windows 下路径需要转换为正斜杠格式
+                const normalizedFilePath = apiFile.filePath.replace(/\\/g, '/');
+                const apiImport = await import(normalizedFilePath);
+                const api = apiImport.default;
+
+                // 设置默认值
+                api.method = api.method || 'POST';
+                api.auth = api.auth !== undefined ? api.auth : true;
+                // 合并默认字段：默认字段作为基础，API 自定义字段优先级更高
+                api.fields = { ...DEFAULT_API_FIELDS, ...(api.fields || {}) };
+                api.required = api.required || [];
+
+                // 构建路由
+                api.route = `${api.method.toUpperCase()}/api/${apiFile.routePrefix ? apiFile.routePrefix + '/' : ''}${apiFile.relativePath}`;
+                apiRoutes.set(api.route, api);
+            } catch (error: any) {
+                Logger.error(`[${apiFile.typeName}] 接口 ${apiFile.relativePath} 加载失败`, error);
+                process.exit(1);
+            }
         }
 
         const totalLoadTime = calcPerfTime(loadStartTime);

package/loader/loadHooks.ts

@@ -0,0 +1,65 @@
+/**
+ * 钩子加载器
+ * 负责扫描和初始化所有钩子（核心、组件、项目）
+ */
+
+// 外部依赖
+import { scanAddons, getAddonDir } from 'befly-util';
+
+// 相对导入
+import { Logger } from '../lib/logger.js';
+import { coreHookDir, projectHookDir } from '../paths.js';
+import { sortModules, scanModules } from '../util.js';
+
+// 类型导入
+import type { Hook } from '../types/hook.js';
+
+export async function loadHooks(befly: {
+    //
+    hookLists: Hook[];
+    pluginsConfig?: Record<string, any>;
+}): Promise<void> {
+    try {
+        const allHooks: Hook[] = [];
+
+        // 1. 扫描核心钩子
+        const coreHooks = await scanModules<Hook>(coreHookDir, 'core', '钩子', befly.pluginsConfig);
+
+        // 2. 扫描组件钩子
+        const addonHooks: Hook[] = [];
+        const addons = scanAddons();
+        for (const addon of addons) {
+            const dir = getAddonDir(addon, 'hooks');
+            const hooks = await scanModules<Hook>(dir, 'addon', '钩子', befly.pluginsConfig, addon);
+            addonHooks.push(...hooks);
+        }
+
+        // 3. 扫描项目钩子
+        const appHooks = await scanModules<Hook>(projectHookDir, 'app', '钩子', befly.pluginsConfig);
+
+        // 4. 合并所有钩子
+        allHooks.push(...coreHooks);
+        allHooks.push(...addonHooks);
+        allHooks.push(...appHooks);
+
+        // 5. 过滤禁用的钩子
+        const disableHooks = (befly as any).config?.disableHooks || [];
+        const enabledHooks = allHooks.filter((hook) => !disableHooks.includes(hook.name));
+
+        if (disableHooks.length > 0) {
+            Logger.info(`禁用钩子: ${disableHooks.join(', ')}`);
+        }
+
+        // 6. 排序
+        const sortedHooks = sortModules(enabledHooks);
+        if (sortedHooks === false) {
+            Logger.error('钩子依赖关系错误，请检查 after 属性');
+            process.exit(1);
+        }
+
+        befly.hookLists.push(...sortedHooks);
+    } catch (error: any) {
+        Logger.error('加载钩子时发生错误', error);
+        process.exit(1);
+    }
+}

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