befly 2.1.0 → 2.2.0

package/README.md

@@ -1,3 +1,3 @@
 # Befly - 蜜蜂飞舞
 
-道生一，一生二，二生三，三生万物，v3版本发布后可才是公测版本。
+道生一，一生二，二生三，三生万物，v3 版本发布后可才是公测版本。

package/apis/health/info.js

@@ -1,6 +1,6 @@
 import { Env } from '../../config/env.js';
 import { Api } from '../../utils/api.js';
-import { RYes, RNo } from '../../utils/util.js';
+import { RYes, RNo } from '../../utils/index.js';
 
 export default Api.POST(
     //

package/apis/tool/tokenCheck.js

@@ -1,6 +1,6 @@
 import { Env } from '../../config/env.js';
 import { Api } from '../../utils/api.js';
-import { RYes, RNo } from '../../utils/util.js';
+import { RYes, RNo } from '../../utils/index.js';
 import { Jwt } from '../../utils/jwt.js';
 
 export default Api.POST(

package/bunfig.toml

@@ -0,0 +1,3 @@
+[install]
+linker = "isolated"
+node-gyp = "bun x node-gyp"

package/checks/table.js

@@ -1,51 +1,11 @@
 import path from 'node:path';
 import { Logger } from '../utils/logger.js';
-import { parseFieldRule } from '../utils/util.js';
+import { parseFieldRule, validateFieldName, validateFieldType, validateMinMax, validateDefaultValue, validateIndex, validateRegex } from '../utils/index.js';
 import { __dirtables, getProjectDir } from '../system.js';
 
-// 验证字段名称是否为中文、数字、字母
-const validateFieldName = (name) => {
-    const nameRegex = /^[\u4e00-\u9fa5a-zA-Z0-9]+$/;
-    return nameRegex.test(name);
-};
-
-// 验证字段类型是否为指定的四种类型之一
-const validateFieldType = (type) => {
-    const validTypes = ['string', 'number', 'text', 'array'];
-    return validTypes.includes(type);
-};
-
-// 验证最小值/最大值是否为null或数字
-const validateMinMax = (value) => {
-    return value === 'null' || (!isNaN(parseFloat(value)) && isFinite(parseFloat(value)));
-};
-
-// 验证默认值是否为null、字符串或数字
-const validateDefaultValue = (value) => {
-    if (value === 'null') return true;
-    // 检查是否为数字
-    if (!isNaN(parseFloat(value)) && isFinite(parseFloat(value))) return true;
-    // 其他情况视为字符串，都是有效的
-    return true;
-};
-
-// 验证索引标识是否为0或1
-const validateIndex = (value) => {
-    return value === '0' || value === '1';
-};
-
-// 验证正则表达式是否有效
-const validateRegex = (value) => {
-    if (value === 'null') return true;
-    try {
-        new RegExp(value);
-        return true;
-    } catch (e) {
-        return false;
-    }
-};
+// 所有校验函数均复用 utils/index.js 导出的实现
 
-export default async () => {
+export const checkTable = async () => {
     try {
         const tablesGlob = new Bun.Glob('*.json');
 

package/config/env.js

@@ -25,14 +25,12 @@ export const Env = {
     TZ: process.env.TZ,
     // 数据库配置
     MYSQL_ENABLE: Number(process.env.MYSQL_ENABLE),
-    MYSQL_URL: process.env.MYSQL_URL,
     MYSQL_HOST: process.env.MYSQL_HOST,
     MYSQL_PORT: Number(process.env.MYSQL_PORT),
     MYSQL_DB: process.env.MYSQL_DB,
     MYSQL_USER: process.env.MYSQL_USER,
     MYSQL_PASSWORD: process.env.MYSQL_PASSWORD,
     MYSQL_DEBUG: Number(process.env.MYSQL_DEBUG),
-    MYSQL_POOL_TIMEOUT: Number(process.env.MYSQL_POOL_TIMEOUT),
     MYSQL_POOL_MAX: Number(process.env.MYSQL_POOL_MAX),
     // Redis配置
     REDIS_URL: process.env.REDIS_URL,

package/main.js

@@ -5,10 +5,10 @@ import { Logger } from './utils/logger.js';
 import { Jwt } from './utils/jwt.js';
 import { validator } from './utils/validate.js';
 import { Crypto2 } from './utils/crypto.js';
-import { Xml } from './libs/xml.js';
+import { Xml } from './utils/xml.js';
 import { SyncDb } from './scripts/syncDb.js';
 import { __dirchecks, __dirplugins, __dirapis, getProjectDir } from './system.js';
-import { isEmptyObject, isType, pickFields, sortPlugins, RYes, RNo, filterLogFields, setCorsOptions, calculateElapsedTime } from './utils/util.js';
+import { isEmptyObject, isType, pickFields, sortPlugins, RYes, RNo, filterLogFields, setCorsOptions, calcPerfTime } from './utils/index.js';
 
 class Befly {
     constructor(options = {}) {
@@ -48,7 +48,7 @@ class Befly {
                     // 执行默认导出的函数
                     if (typeof check.default === 'function') {
                         const checkResult = await check.default(this.appContext);
-                        const singleCheckTime = calculateElapsedTime(singleCheckStart);
+                        const singleCheckTime = calcPerfTime(singleCheckStart);
 
                         if (checkResult === true) {
                             passedChecks++;
@@ -58,12 +58,12 @@ class Befly {
                             failedChecks++;
                         }
                     } else {
-                        const singleCheckTime = calculateElapsedTime(singleCheckStart);
+                        const singleCheckTime = calcPerfTime(singleCheckStart);
                         Logger.warn(`文件 ${fileName} 未导出默认函数，耗时: ${singleCheckTime}`);
                         failedChecks++;
                     }
                 } catch (error) {
-                    const singleCheckTime = calculateElapsedTime(singleCheckStart);
+                    const singleCheckTime = calcPerfTime(singleCheckStart);
                     Logger.error({
                         msg: `检查失败 ${fileName}，耗时: ${singleCheckTime}`,
                         error: error.message,
@@ -73,7 +73,7 @@ class Befly {
                 }
             }
 
-            const totalCheckTime = calculateElapsedTime(checkStartTime);
+            const totalCheckTime = calcPerfTime(checkStartTime);
 
             // 输出检查结果统计
             Logger.info(`系统检查完成! 总耗时: ${totalCheckTime}，总检查数: ${totalChecks}, 通过: ${passedChecks}, 失败: ${failedChecks}`);
@@ -103,6 +103,7 @@ class Befly {
             const corePlugins = [];
             const userPlugins = [];
             const loadedPluginNames = new Set(); // 用于跟踪已加载的插件名称
+            let hadPluginError = false; // 统一记录插件阶段是否有错误
 
             // 扫描核心插件目录
             const corePluginsScanStart = Bun.nanoseconds();
@@ -114,18 +115,27 @@ class Befly {
                 const fileName = path.basename(file, '.js');
                 if (fileName.startsWith('_')) continue;
 
-                const importStart = Bun.nanoseconds();
-                const plugin = await import(file);
-                const importTime = calculateElapsedTime(importStart);
-
-                const pluginInstance = plugin.default;
-                pluginInstance.pluginName = fileName;
-                corePlugins.push(pluginInstance);
-                loadedPluginNames.add(fileName); // 记录已加载的核心插件名称
-
-                Logger.info(`核心插件 ${fileName} 导入耗时: ${importTime}`);
+                try {
+                    const importStart = Bun.nanoseconds();
+                    const plugin = await import(file);
+                    const importTime = calcPerfTime(importStart);
+
+                    const pluginInstance = plugin.default;
+                    pluginInstance.pluginName = fileName;
+                    corePlugins.push(pluginInstance);
+                    loadedPluginNames.add(fileName); // 记录已加载的核心插件名称
+
+                    Logger.info(`核心插件 ${fileName} 导入耗时: ${importTime}`);
+                } catch (err) {
+                    hadPluginError = true;
+                    Logger.error({
+                        msg: `核心插件 ${fileName} 导入失败`,
+                        error: err.message,
+                        stack: err.stack
+                    });
+                }
             }
-            const corePluginsScanTime = calculateElapsedTime(corePluginsScanStart);
+            const corePluginsScanTime = calcPerfTime(corePluginsScanStart);
             Logger.info(`核心插件扫描完成，耗时: ${corePluginsScanTime}，共找到 ${corePlugins.length} 个插件`);
 
             const sortedCorePlugins = sortPlugins(corePlugins);
@@ -141,10 +151,11 @@ class Befly {
                     this.pluginLists.push(plugin);
                     this.appContext[plugin.pluginName] = typeof plugin?.onInit === 'function' ? await plugin?.onInit(this.appContext) : {};
                 } catch (error) {
-                    Logger.warn(`插件 ${plugin.pluginName} 初始化失败:`, error.message);
+                    hadPluginError = true;
+                    Logger.warn(`插件 ${plugin.pluginName} 初始化失败: ${error.message}`);
                 }
             }
-            const corePluginsInitTime = calculateElapsedTime(corePluginsInitStart);
+            const corePluginsInitTime = calcPerfTime(corePluginsInitStart);
             Logger.info(`核心插件初始化完成，耗时: ${corePluginsInitTime}`);
 
             // 扫描用户插件目录
@@ -163,17 +174,26 @@ class Befly {
                     continue;
                 }
 
-                const importStart = Bun.nanoseconds();
-                const plugin = await import(file);
-                const importTime = calculateElapsedTime(importStart);
+                try {
+                    const importStart = Bun.nanoseconds();
+                    const plugin = await import(file);
+                    const importTime = calcPerfTime(importStart);
 
-                const pluginInstance = plugin.default;
-                pluginInstance.pluginName = fileName;
-                userPlugins.push(pluginInstance);
+                    const pluginInstance = plugin.default;
+                    pluginInstance.pluginName = fileName;
+                    userPlugins.push(pluginInstance);
 
-                Logger.info(`用户插件 ${fileName} 导入耗时: ${importTime}`);
+                    Logger.info(`用户插件 ${fileName} 导入耗时: ${importTime}`);
+                } catch (err) {
+                    hadPluginError = true;
+                    Logger.error({
+                        msg: `用户插件 ${fileName} 导入失败`,
+                        error: err.message,
+                        stack: err.stack
+                    });
+                }
             }
-            const userPluginsScanTime = calculateElapsedTime(userPluginsScanStart);
+            const userPluginsScanTime = calcPerfTime(userPluginsScanStart);
             Logger.info(`用户插件扫描完成，耗时: ${userPluginsScanTime}，共找到 ${userPlugins.length} 个插件`);
 
             const sortedUserPlugins = sortPlugins(userPlugins);
@@ -190,22 +210,31 @@ class Befly {
                         this.pluginLists.push(plugin);
                         this.appContext[plugin.pluginName] = typeof plugin?.onInit === 'function' ? await plugin?.onInit(this.appContext) : {};
                     } catch (error) {
-                        Logger.warn(`插件 ${plugin.pluginName} 初始化失败:`, error.message);
+                        hadPluginError = true;
+                        Logger.warn(`插件 ${plugin.pluginName} 初始化失败: ${error.message}`);
                     }
                 }
-                const userPluginsInitTime = calculateElapsedTime(userPluginsInitStart);
+                const userPluginsInitTime = calcPerfTime(userPluginsInitStart);
                 Logger.info(`用户插件初始化完成，耗时: ${userPluginsInitTime}`);
             }
 
-            const totalLoadTime = calculateElapsedTime(loadStartTime);
+            const totalLoadTime = calcPerfTime(loadStartTime);
             const totalPluginCount = sortedCorePlugins.length + sortedUserPlugins.length;
             Logger.info(`插件加载完成! 总耗时: ${totalLoadTime}，共加载 ${totalPluginCount} 个插件`);
+
+            // 如果任意插件导入或初始化失败，统一退出进程
+            if (hadPluginError) {
+                Logger.error('检测到插件导入或初始化失败，进程即将退出');
+                process.exit(1);
+            }
         } catch (error) {
             Logger.error({
                 msg: '加载插件时发生错误',
                 error: error.message,
                 stack: error.stack
             });
+            // 兜底退出，避免服务在插件阶段异常后继续运行
+            process.exit(1);
         }
     }
     async loadApis(dirName) {
@@ -257,11 +286,11 @@ class Befly {
                     api.route = `${api.method.toUpperCase()}/api/${dirName}/${apiPath}`;
                     this.apiRoutes.set(api.route, api);
 
-                    const singleApiTime = calculateElapsedTime(singleApiStart);
+                    const singleApiTime = calcPerfTime(singleApiStart);
                     loadedApis++;
                     // Logger.info(`${dirDisplayName}接口 ${apiPath} 加载成功，耗时: ${singleApiTime}`);
                 } catch (error) {
-                    const singleApiTime = calculateElapsedTime(singleApiStart);
+                    const singleApiTime = calcPerfTime(singleApiStart);
                     failedApis++;
                     Logger.error({
                         msg: `${dirDisplayName}接口 ${apiPath} 加载失败，耗时: ${singleApiTime}`,
@@ -271,7 +300,7 @@ class Befly {
                 }
             }
 
-            const totalLoadTime = calculateElapsedTime(loadStartTime);
+            const totalLoadTime = calcPerfTime(loadStartTime);
             Logger.info(`${dirDisplayName}接口加载完成! 总耗时: ${totalLoadTime}，总数: ${totalApis}, 成功: ${loadedApis}, 失败: ${failedApis}`);
         } catch (error) {
             Logger.error({
@@ -294,7 +323,7 @@ class Befly {
         await this.loadApis('core');
         await this.loadApis('app');
 
-        const totalStartupTime = calculateElapsedTime(serverStartTime);
+        const totalStartupTime = calcPerfTime(serverStartTime);
         Logger.info(`服务器启动准备完成，总耗时: ${totalStartupTime}`);
 
         const server = Bun.serve({
@@ -528,7 +557,7 @@ class Befly {
             }
         });
 
-        const finalStartupTime = calculateElapsedTime(serverStartTime);
+        const finalStartupTime = calcPerfTime(serverStartTime);
         Logger.info(`Befly 服务器启动成功! 完整启动耗时: ${finalStartupTime}`);
         Logger.info(`服务器监听地址: http://${Env.APP_HOST}:${Env.APP_PORT}`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "description": "Buma - 为 Bun 专属打造的 API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -15,12 +15,7 @@
     "scripts": {
         "ra": "bun run release.js -a",
         "rb": "bun run release.js -b",
-        "rc": "bun run release.js -c",
-        "test": "bun test",
-        "test:jwt": "bun test tests/jwt.test.js",
-        "dev": "bun run project/main.js",
-        "server": "bunx --bun pm2 start pm2.config.cjs -a",
-        "syncDb": "bun run scripts/syncDb.js"
+        "rc": "bun run release.js -c"
     },
     "keywords": [
         "bun",
@@ -39,7 +34,6 @@
         "apis/",
         "checks/",
         "config/",
-        "libs/",
         "plugins/",
         "scripts/",
         "tables/",
@@ -51,25 +45,18 @@
         ".npmrc",
         ".prettierignore",
         ".prettierrc",
+        "bunfig.toml",
         "LICENSE",
         "main.js",
         "system.js",
         "package.json",
-        "README.md",
-        "USEAGE.md",
-        "vitest.config.js"
+        "README.md"
     ],
-    "gitHead": "1dc5f118a723969456559e758e2ba889f4601224",
-    "dependencies": {},
     "simple-git-hooks": {
         "pre-commit": "bunx --bun lint-staged"
     },
     "lint-staged": {
         "*.{js,css,scss,less,ts,jsx,vue,html,json,md,yaml}": "bunx --bun prettier --write --cache --ignore-unknown"
     },
-    "devDependencies": {
-        "lint-staged": "^16.1.5",
-        "prettier": "^3.6.2",
-        "simple-git-hooks": "^2.13.1"
-    }
+    "gitHead": "1dc5f118a723969456559e758e2ba889f4601224"
 }