befly 3.74.3 → 3.75.1

package/index.js

@@ -6,16 +6,17 @@
 // 检查
 import { checkApi } from "#befly/checks/api.js";
 import { checkConfig } from "#befly/checks/config.js";
-import { checkHook } from "#befly/checks/hook.js";
+import { checkHook, checkPlugin } from "#befly/checks/items.js";
 import { checkMenu } from "#befly/checks/menu.js";
-import { checkPlugin } from "#befly/checks/plugin.js";
 import { checkTable } from "#befly/checks/table.js";
 // 配置
 import beflyConfig from "#befly/configs/beflyConfig.json";
 import beflyMenus from "#befly/configs/beflyMenus.json";
+import { BEFLY_ADMIN_TABLE, BEFLY_API_TABLE, BEFLY_MENU_TABLE, BEFLY_ROLE_TABLE } from "#befly/configs/constConfig.js";
 // ========== 相对导入（项目内部文件） ==========
 // 基础设施
 import { Connect } from "#befly/lib/connect.js";
+// oxlint-disable-next-line unicorn/prefer-export-from -- Logger 同时被本文件大量使用，不能合并为 re-export
 import { Logger } from "#befly/lib/logger.js";
 // 路由处理
 import { apiHandler } from "#befly/router/api.js";
@@ -27,14 +28,20 @@ import { syncDev } from "#befly/sync/dev.js";
 import { syncMenu } from "#befly/sync/menu.js";
 // 工具
 import { calcPerfTime } from "#befly/utils/calcPerfTime.js";
+import { formatYmdHms } from "#befly/utils/datetime.js";
 import { deepMerge } from "#befly/utils/deepMerge.js";
+import { createError } from "#befly/utils/error.js";
 import { isPrimaryProcess } from "#befly/utils/is.js";
 import { scanSources } from "#befly/utils/scanSources.js";
+import { getRunMode, waitFor } from "#befly/utils/util.js";
 
 export { syncDb } from "#befly/scripts/syncDb/index.js";
 export { xmlParse } from "#befly/lib/xmlParse.js";
 export { Logger };
 
+// 主进程同步完成的 Redis 就绪标记（非主进程等待此标记后再对外服务）
+const SYNC_READY_KEY = "befly:syncReady";
+
 function prefixMenuPaths(menus, prefix) {
     return menus.map((menu) => {
         const nextMenu = {
@@ -58,8 +65,7 @@ function prefixMenuPaths(menus, prefix) {
 async function syncReady(ctx) {
     const missingCtxKeys = ["ctx.redis", "ctx.mysql", "ctx.cache"].filter((key) => !ctx[key.slice(4)]);
     if (missingCtxKeys.length > 0) {
-        throw new Error(`启动失败：${missingCtxKeys.join("、")} 未初始化`, {
-            cause: null,
+        throw createError(`启动失败：${missingCtxKeys.join("、")} 未初始化`, {
             code: "runtime",
             subsystem: "sync",
             operation: "ctxCheck",
@@ -67,7 +73,7 @@ async function syncReady(ctx) {
         });
     }
 
-    const requiredTables = ["beflyApi", "beflyMenu", "beflyAdmin", "beflyRole"];
+    const requiredTables = [BEFLY_API_TABLE, BEFLY_MENU_TABLE, BEFLY_ADMIN_TABLE, BEFLY_ROLE_TABLE];
     const missingTables = [];
 
     for (const table of requiredTables) {
@@ -77,8 +83,7 @@ async function syncReady(ctx) {
     }
 
     if (missingTables.length > 0) {
-        throw new Error(`同步依赖表缺失: ${missingTables.join("、")}`, {
-            cause: null,
+        throw createError(`同步依赖表缺失: ${missingTables.join("、")}`, {
             code: "runtime",
             subsystem: "sync",
             operation: "tableExists",
@@ -93,13 +98,13 @@ export async function createBefly(config = {}, menus = []) {
     const mergedMenus = deepMerge(prefixMenuPaths(beflyMenus, "core"), menus);
 
     Logger.configure({
-        runtimeEnv: mergedConfig.runMode,
+        runtimeEnv: getRunMode(),
         ...mergedConfig.logger
     });
     Logger.info(`启动 合并配置 耗时 ${calcPerfTime(mergeStartTime)}`);
 
     let stageStartTime = Bun.nanoseconds();
-    const configHasError = await checkConfig(mergedConfig);
+    const configErrors = await checkConfig(mergedConfig);
     Logger.info(`启动 检查配置 耗时 ${calcPerfTime(stageStartTime)}`);
 
     stageStartTime = Bun.nanoseconds();
@@ -107,34 +112,48 @@ export async function createBefly(config = {}, menus = []) {
     Logger.info(`启动 扫描源码 耗时 ${calcPerfTime(stageStartTime)}`);
 
     stageStartTime = Bun.nanoseconds();
-    const apiHasError = await checkApi(apis);
+    const apiErrors = await checkApi(apis);
     Logger.info(`启动 检查接口 耗时 ${calcPerfTime(stageStartTime)}`);
 
     stageStartTime = Bun.nanoseconds();
-    const tableHasError = await checkTable(tables);
+    const tableErrors = await checkTable(tables);
     Logger.info(`启动 检查表 耗时 ${calcPerfTime(stageStartTime)}`);
 
     stageStartTime = Bun.nanoseconds();
-    const pluginHasError = await checkPlugin(plugins);
+    const pluginErrors = await checkPlugin(plugins);
     Logger.info(`启动 检查插件 耗时 ${calcPerfTime(stageStartTime)}`);
 
     stageStartTime = Bun.nanoseconds();
-    const hookHasError = await checkHook(hooks);
+    const hookErrors = await checkHook(hooks);
     Logger.info(`启动 检查钩子 耗时 ${calcPerfTime(stageStartTime)}`);
 
     stageStartTime = Bun.nanoseconds();
-    const menuHasError = await checkMenu(mergedMenus);
+    const menuErrors = await checkMenu(mergedMenus);
     Logger.info(`启动 检查菜单 耗时 ${calcPerfTime(stageStartTime)}`);
 
-    if (configHasError || apiHasError || tableHasError || pluginHasError || hookHasError || menuHasError) {
-        throw new Error("检查失败：存在配置/结构问题", {
-            cause: null,
+    // 汇总各检查明细，报错可直接定位到具体文件/路径/配置/字段
+    const failedChecks = [
+        { check: "配置", errors: configErrors },
+        { check: "接口", errors: apiErrors },
+        { check: "表结构", errors: tableErrors },
+        { check: "插件", errors: pluginErrors },
+        { check: "钩子", errors: hookErrors },
+        { check: "菜单", errors: menuErrors }
+    ].filter((entry) => entry.errors.length > 0);
+
+    if (failedChecks.length > 0) {
+        throw createError("检查失败：存在配置/结构问题", {
             code: "policy",
             subsystem: "checks",
-            operation: "checkAll"
+            operation: "checkAll",
+            errors: failedChecks
         });
     }
 
+    // 运行模式以环境为准（NODE_ENV，线上部署注入 production；本地开发默认 development），
+    // 覆盖配置值，保证 befly.config.runMode 与运行时判断一致
+    mergedConfig.runMode = getRunMode();
+
     return new Befly({
         config: mergedConfig,
         tables: tables,
@@ -168,12 +187,7 @@ export class Befly {
             return;
         }
 
-        throw new Error("请使用 createBefly(...) 创建实例后再调用 start", {
-            cause: null,
-            code: "policy",
-            subsystem: "start",
-            operation: "factoryGuard"
-        });
+        throw createError("请使用 createBefly(...) 创建实例后再调用 start", { code: "policy", subsystem: "start", operation: "factoryGuard" });
     }
 
     /**
@@ -207,7 +221,7 @@ export class Befly {
             await syncReady(this.context);
             Logger.info(`启动 同步就绪 耗时 ${calcPerfTime(stageStartTime)}`);
 
-            // 自动同步（PM2 cluster：主进程执行，其它进程等待同步完成）
+            // 自动同步（bm2 多实例：主进程执行同步并写就绪标记，其它进程等待同步完成后再对外服务）
             if (isPrimaryProcess()) {
                 stageStartTime = Bun.nanoseconds();
                 await syncApi(this.context, this.apis);
@@ -224,6 +238,20 @@ export class Befly {
                 stageStartTime = Bun.nanoseconds();
                 await syncCache(this.context);
                 Logger.info(`启动 同步缓存 耗时 ${calcPerfTime(stageStartTime)}`);
+
+                // 同步完成：写入就绪标记（TTL 防崩溃残留），非主进程据此放行
+                await this.context.redis.setString(SYNC_READY_KEY, String(Date.now()), 300);
+            } else {
+                // 非主进程：在监听端口前等待主进程本次同步完成（时间戳判断，同机时钟一致）
+                const startAt = Date.now();
+                await waitFor({
+                    label: "主进程同步完成",
+                    check: async () => {
+                        const ready = await this.context.redis.getString(SYNC_READY_KEY);
+                        return ready !== null && Number(ready) > startAt;
+                    }
+                });
+                Logger.info("启动 等待主进程同步完成 完成");
             }
 
             // 加载钩子
@@ -241,7 +269,7 @@ export class Befly {
             stageStartTime = Bun.nanoseconds();
             const server = Bun.serve({
                 port: this.context.config.appPort || 3000,
-                hostname: this.context.config.appHost || "0.0.0.0",
+                hostname: this.context.config.appHost || "127.0.0.1",
                 // 开发模式下启用详细错误信息
                 development: this.context.config.runMode === "development",
                 // 空闲连接超时时间（秒），防止恶意连接占用资源
@@ -256,6 +284,22 @@ export class Befly {
                         return staticFetch(req);
                     }
 
+                    // 根路径返回服务基本信息
+                    if (url.pathname === "/") {
+                        return Response.json(
+                            {
+                                code: 0,
+                                msg: "success",
+                                data: {
+                                    name: this.context.config.appName,
+                                    mode: this.context.config.runMode,
+                                    time: formatYmdHms(Date.now())
+                                }
+                            },
+                            { status: 200 }
+                        );
+                    }
+
                     return Response.json({ code: 1, msg: "路径不存在" }, { status: 200 });
                 },
                 error: (error) => {
@@ -302,7 +346,7 @@ export class Befly {
             // - 作为库代码，也不应该强行终止宿主进程
 
             // 注意：测试要求 start() 失败时必须 Logger.error 一次，所以这里始终调用 error。
-            Logger.error("项目启动失败", error, null, false);
+            Logger.error("项目启动失败", error);
 
             // 尽力把错误日志落盘/输出后再把异常抛给上层。
             try {
@@ -312,7 +356,7 @@ export class Befly {
                 // ignore
             }
 
-            throw new Error("运行时错误", {
+            throw createError("运行时错误", {
                 cause: error,
                 code: error?.code || "runtime",
                 subsystem: "start",