befly 3.8.19 → 3.8.20

package/lib/redisHelper.ts

@@ -4,30 +4,27 @@
  */
 
 import { RedisClient } from 'bun';
-import { Env } from '../env.js';
 import { Logger } from '../lib/logger.js';
 import { Database } from './database.js';
 
-/**
- * Redis 键前缀
- */
-const prefix = Env.REDIS_KEY_PREFIX ? `${Env.REDIS_KEY_PREFIX}:` : '';
-
 /**
  * Redis 助手类
  */
 export class RedisHelper {
     private client: RedisClient;
+    private prefix: string;
 
     /**
      * 构造函数
+     * @param prefix - Key 前缀
      */
-    constructor() {
+    constructor(prefix: string = '') {
         const client = Database.getRedis();
         if (!client) {
             throw new Error('Redis 客户端未初始化，请先调用 Database.connectRedis()');
         }
         this.client = client;
+        this.prefix = prefix ? `${prefix}:` : '';
     }
 
     /**
@@ -40,7 +37,7 @@ export class RedisHelper {
     async setObject<T = any>(key: string, obj: T, ttl: number | null = null): Promise<string | null> {
         try {
             const data = JSON.stringify(obj);
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
 
             if (ttl) {
                 return await this.client.setex(pkey, ttl, data);
@@ -59,7 +56,7 @@ export class RedisHelper {
      */
     async getObject<T = any>(key: string): Promise<T | null> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             const data = await this.client.get(pkey);
             return data ? JSON.parse(data) : null;
         } catch (error: any) {
@@ -74,7 +71,7 @@ export class RedisHelper {
      */
     async delObject(key: string): Promise<void> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             await this.client.del(pkey);
         } catch (error: any) {
             Logger.error('Redis delObject 错误', error);
@@ -90,7 +87,7 @@ export class RedisHelper {
      */
     async genTimeID(): Promise<number> {
         const timestamp = Math.floor(Date.now() / 1000); // 秒级时间戳
-        const key = `${prefix}time_id_counter:${timestamp}`;
+        const key = `${this.prefix}time_id_counter:${timestamp}`;
 
         const counter = await this.client.incr(key);
         await this.client.expire(key, 1);
@@ -118,7 +115,7 @@ export class RedisHelper {
         }
 
         const timestamp = Math.floor(Date.now() / 1000); // 秒级时间戳
-        const key = `${prefix}time_id_counter:${timestamp}`;
+        const key = `${this.prefix}time_id_counter:${timestamp}`;
 
         // 使用 INCRBY 一次性获取 N 个连续计数
         const startCounter = await this.client.incrby(key, count);
@@ -143,7 +140,7 @@ export class RedisHelper {
      */
     async setString(key: string, value: string, ttl: number | null = null): Promise<string | null> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             if (ttl) {
                 return await this.client.setex(pkey, ttl, value);
             }
@@ -160,7 +157,7 @@ export class RedisHelper {
      */
     async getString(key: string): Promise<string | null> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.get(pkey);
         } catch (error: any) {
             Logger.error('Redis getString 错误', error);
@@ -174,7 +171,7 @@ export class RedisHelper {
      */
     async exists(key: string): Promise<number> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.exists(pkey);
         } catch (error: any) {
             Logger.error('Redis exists 错误', error);
@@ -189,7 +186,7 @@ export class RedisHelper {
      */
     async expire(key: string, seconds: number): Promise<number> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.expire(pkey, seconds);
         } catch (error: any) {
             Logger.error('Redis expire 错误', error);
@@ -203,7 +200,7 @@ export class RedisHelper {
      */
     async ttl(key: string): Promise<number> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.ttl(pkey);
         } catch (error: any) {
             Logger.error('Redis ttl 错误', error);
@@ -221,7 +218,7 @@ export class RedisHelper {
         try {
             if (members.length === 0) return 0;
 
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.sadd(pkey, ...members);
         } catch (error: any) {
             Logger.error('Redis sadd 错误', error);
@@ -237,7 +234,7 @@ export class RedisHelper {
      */
     async sismember(key: string, member: string): Promise<number> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.sismember(pkey, member);
         } catch (error: any) {
             Logger.error('Redis sismember 错误', error);
@@ -252,7 +249,7 @@ export class RedisHelper {
      */
     async scard(key: string): Promise<number> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.scard(pkey);
         } catch (error: any) {
             Logger.error('Redis scard 错误', error);
@@ -267,7 +264,7 @@ export class RedisHelper {
      */
     async smembers(key: string): Promise<string[]> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.smembers(pkey);
         } catch (error: any) {
             Logger.error('Redis smembers 错误', error);
@@ -282,7 +279,7 @@ export class RedisHelper {
      */
     async del(key: string): Promise<number> {
         try {
-            const pkey = `${prefix}${key}`;
+            const pkey = `${this.prefix}${key}`;
             return await this.client.del(pkey);
         } catch (error: any) {
             Logger.error('Redis del 错误', error);

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);
+    }
+}