befly 1.1.0 → 1.1.2

package/main.js

@@ -100,7 +100,6 @@ class Befly {
     async loadPlugins() {
         try {
             const loadStartTime = Bun.nanoseconds();
-            Logger.info('开始加载插件...');
 
             const glob = new Bun.Glob('*.js');
             const corePlugins = [];
@@ -108,7 +107,6 @@ class Befly {
             const loadedPluginNames = new Set(); // 用于跟踪已加载的插件名称
 
             // 扫描核心插件目录
-            Logger.info('正在扫描核心插件...');
             const corePluginsScanStart = Bun.nanoseconds();
             for await (const file of glob.scan({
                 cwd: path.join(dirname2(import.meta.url), 'plugins'),
@@ -139,15 +137,11 @@ class Befly {
             }
 
             // 初始化核心插件
-            Logger.info('正在初始化核心插件...');
             const corePluginsInitStart = Bun.nanoseconds();
             for (const plugin of sortedCorePlugins) {
                 try {
-                    const initStart = Bun.nanoseconds();
                     this.pluginLists.push(plugin);
                     this.appContext[plugin.pluginName] = typeof plugin?.onInit === 'function' ? await plugin?.onInit(this.appContext) : {};
-                    const initTime = (Bun.nanoseconds() - initStart) / 1_000_000;
-                    Logger.info(`核心插件 ${plugin.pluginName} 初始化耗时: ${initTime.toFixed(2)}ms`);
                 } catch (error) {
                     Logger.warn(`插件 ${plugin.pluginName} 初始化失败:`, error.message);
                 }
@@ -156,7 +150,6 @@ class Befly {
             Logger.info(`核心插件初始化完成，耗时: ${corePluginsInitTime.toFixed(2)}ms`);
 
             // 扫描用户插件目录
-            Logger.info('正在扫描用户插件...');
             const userPluginsScanStart = Bun.nanoseconds();
             for await (const file of glob.scan({
                 cwd: path.join(process.cwd(), 'plugins'),
@@ -193,15 +186,11 @@ class Befly {
 
             // 初始化用户插件
             if (userPlugins.length > 0) {
-                Logger.info('正在初始化用户插件...');
                 const userPluginsInitStart = Bun.nanoseconds();
                 for (const plugin of sortedUserPlugins) {
                     try {
-                        const initStart = Bun.nanoseconds();
                         this.pluginLists.push(plugin);
                         this.appContext[plugin.pluginName] = typeof plugin?.onInit === 'function' ? await plugin?.onInit(this.appContext) : {};
-                        const initTime = (Bun.nanoseconds() - initStart) / 1_000_000;
-                        Logger.info(`用户插件 ${plugin.pluginName} 初始化耗时: ${initTime.toFixed(2)}ms`);
                     } catch (error) {
                         Logger.warn(`插件 ${plugin.pluginName} 初始化失败:`, error.message);
                     }
@@ -225,7 +214,6 @@ class Befly {
         try {
             const loadStartTime = Bun.nanoseconds();
             const dirDisplayName = dirName === 'core' ? '核心' : '用户';
-            Logger.info(`开始加载${dirDisplayName}接口...`);
 
             const coreApisDir = path.join(dirname2(import.meta.url), 'apis');
             const userApisDir = path.join(process.cwd(), 'apis');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "1.1.0",
+    "version": "1.1.2",
     "description": "Buma - 为 Bun 专属打造的 API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -49,5 +49,5 @@
         "README.md",
         "vitest.config.js"
     ],
-    "gitHead": "c86df1d32fd5321912fed97a1bf7c1348ce9c730"
+    "gitHead": "d1a26096e103683507f21e2932cb0305e034c2d0"
 }

package/plugins/db.js

@@ -35,8 +35,7 @@ export default {
                 // 测试数据库连接
                 const result = await sql`SELECT VERSION() AS version`.execute(db);
                 if (result?.rows?.[0]?.version) {
-                    // 扩展数据库实例
-                    return new Crud(db, befly.redis, sql);
+                    return db;
                 } else {
                     return {};
                 }

package/plugins/tool.js

@@ -0,0 +1,45 @@
+export default {
+    after: ['_redis', '_db'],
+    async onInit(befly) {
+        // 增强的更新方法 - 自动添加 updated_at
+
+        // 辅助函数：过滤掉 undefined 值和指定字段
+        const filterData = (obj, excludeFields = []) => {
+            return Object.fromEntries(Object.entries(obj).filter(([key, value]) => value !== undefined && !excludeFields.includes(key)));
+        };
+
+        return {
+            async updData(data) {
+                const updateData = {
+                    ...filterData(data, ['id', 'created_at', 'deleted_at']),
+                    updated_at: Date.now()
+                };
+
+                return updateData;
+            },
+            async insData(data) {
+                const now = Date.now();
+
+                if (Array.isArray(data)) {
+                    const data2 = await Promise.all(
+                        data.map(async (item) => ({
+                            ...filterData(item),
+                            id: await redis.genTimeID(),
+                            created_at: now,
+                            updated_at: now
+                        }))
+                    );
+                    return data2;
+                } else {
+                    const data2 = {
+                        ...filterData(data),
+                        id: await redis.genTimeID(),
+                        created_at: now,
+                        updated_at: now
+                    };
+                    return data2;
+                }
+            }
+        };
+    }
+};

package/utils/curd.js

@@ -1,186 +0,0 @@
-import { omitFields } from './util.js';
-
-export class Crud {
-    constructor(db, redis, sql) {
-        this.db = db;
-        this.redis = redis;
-        this.sql = sql;
-        this.initMethods();
-    }
-
-    initMethods() {
-        // 将所有 CRUD 方法直接挂载到 db 实例上
-        this.db.insData = this.insData.bind(this);
-        this.db.updData = this.updData.bind(this);
-        this.db.delData = this.delData.bind(this);
-        this.db.getOne = this.getOne.bind(this);
-        this.db.getList = this.getList.bind(this);
-        this.db.getAll = this.getAll.bind(this);
-        this.db.getCount = this.getCount.bind(this);
-    }
-
-    // 事务方法
-    async trans(callback) {
-        return await this.db.transaction().execute(async (trx) => {
-            // 创建一个临时的 Crud 实例，使用事务连接
-            const transactionCrud = new Crud(trx, this.redis, this.sql);
-            return await callback(transactionCrud);
-        });
-    }
-
-    // 增强的插入方法 - 自动添加 ID 和时间戳，支持链式调用
-    insData(tableName, data) {
-        const insertQuery = this.db.insertInto(tableName);
-        const redis = this.redis;
-
-        insertQuery.exec = async function () {
-            const now = Date.now();
-            let processedData = data;
-
-            if (Array.isArray(data)) {
-                processedData = await Promise.all(
-                    data.map(async (item) => ({
-                        ...item,
-                        id: await redis.genTimeID(),
-                        created_at: now,
-                        updated_at: now
-                    }))
-                );
-            } else {
-                processedData = {
-                    ...data,
-                    id: await redis.genTimeID(),
-                    created_at: now,
-                    updated_at: now
-                };
-            }
-
-            const result = await this.values(processedData).execute();
-            return { data: result }; // 返回统一格式
-        };
-
-        return insertQuery;
-    }
-
-    // 增强的更新方法 - 自动添加 updated_at，支持链式调用
-    updData(tableName, data) {
-        // 剔除 undefined 值
-        const filteredData = Object.fromEntries(Object.entries(data).filter(([key, value]) => value !== undefined));
-
-        const updateData = {
-            ...omitFields(filteredData, ['id', 'created_at', 'deleted_at']),
-            updated_at: Date.now()
-        };
-
-        const updateQuery = this.db.updateTable(tableName).set(updateData);
-
-        updateQuery.exec = async function () {
-            const result = await this.execute();
-            return { data: result }; // 返回统一格式
-        };
-
-        return updateQuery;
-    }
-
-    // 增强的删除方法 - 支持链式调用
-    delData(tableName) {
-        const deleteQuery = this.db.deleteFrom(tableName);
-
-        deleteQuery.exec = async function () {
-            const result = await this.execute();
-            return { data: result }; // 返回统一格式
-        };
-
-        return deleteQuery;
-    }
-
-    // 查询单条记录 - 支持链式调用
-    getOne(tableName, fields) {
-        let selectQuery;
-
-        if (fields) {
-            selectQuery = Array.isArray(fields) ? this.db.selectFrom(tableName).select(fields) : this.db.selectFrom(tableName).select([fields]);
-        } else {
-            selectQuery = this.db.selectFrom(tableName).selectAll();
-        }
-
-        // 默认过滤软删除的数据
-        selectQuery = selectQuery.where('state', '<>', 2);
-
-        // 添加 exec 方法，自动返回单条记录
-        selectQuery.exec = async function () {
-            const result = await this.executeTakeFirst();
-            return { data: result }; // 返回统一格式
-        };
-
-        return selectQuery;
-    }
-
-    // 查询列表 - 支持链式调用和分页
-    getList(tableName, fields, page = 1, pageSize = 20) {
-        let selectQuery;
-
-        if (fields) {
-            selectQuery = Array.isArray(fields) ? this.db.selectFrom(tableName).select(fields) : this.db.selectFrom(tableName).select([fields]);
-        } else {
-            selectQuery = this.db.selectFrom(tableName).selectAll();
-        }
-
-        // 默认过滤软删除的数据
-        selectQuery = selectQuery.where('state', '<>', 2);
-
-        // 添加 exec 方法 - 支持分页，只返回数据列表
-        selectQuery.exec = async function () {
-            const offset = (page - 1) * pageSize;
-            const result = await this.limit(pageSize).offset(offset).execute();
-            return { data: result };
-        };
-
-        return selectQuery;
-    }
-
-    // 查询所有记录 - 支持链式调用
-    getAll(tableName, fields) {
-        let selectQuery;
-
-        if (fields) {
-            selectQuery = Array.isArray(fields) ? this.db.selectFrom(tableName).select(fields) : this.db.selectFrom(tableName).select([fields]);
-        } else {
-            selectQuery = this.db.selectFrom(tableName).selectAll();
-        }
-
-        // 默认过滤软删除的数据
-        selectQuery = selectQuery.where('state', '<>', 2);
-
-        // 添加 exec 方法，执行查询所有记录
-        selectQuery.exec = async function () {
-            const result = await this.execute();
-            return { data: result }; // 返回统一格式
-        };
-
-        return selectQuery;
-    }
-
-    // 便捷的计数方法 - 支持链式调用
-    getCount(tableName) {
-        const sql = this.sql;
-        const countQuery = this.db
-            .selectFrom(tableName)
-            .select(sql`count(*)`.as('total'))
-            .where('state', '<>', 2);
-
-        // 添加便捷的 exec 方法
-        countQuery.exec = async function () {
-            const result = await this.executeTakeFirst();
-            const count = Number(result?.total || 0);
-            return { data: count }; // 返回统一格式
-        };
-
-        return countQuery;
-    }
-
-    // 获取原始数据库实例
-    getDb() {
-        return this.db;
-    }
-}