befly 3.13.5 → 3.13.7

package/README.md

@@ -81,7 +81,7 @@ my-api/
 import { Befly } from "befly";
 
 const app = new Befly();
-await app.start();
+await app.start(Bun.env);
 ```
 
 ## 编写第一个 API

package/dist/befly.config.d.ts

@@ -4,4 +4,4 @@
  * 支持环境分离：befly.common.json + befly.development/production.json
  */
 import type { BeflyOptions } from "./types/befly";
-export declare function loadBeflyConfig(): Promise<BeflyOptions>;
+export declare function loadBeflyConfig(nodeEnv?: string): Promise<BeflyOptions>;

package/dist/befly.config.js

@@ -71,15 +71,19 @@ const defaultOptions = {
     // ========== Addon 配置 ==========
     addons: {}
 };
-export async function loadBeflyConfig() {
-    const nodeEnv = process.env.NODE_ENV || "development";
-    const envSuffix = nodeEnv === "production" ? "production" : "development";
+export async function loadBeflyConfig(nodeEnv) {
+    if (nodeEnv !== "development" && nodeEnv !== "production") {
+        throw new Error(`配置错误：NODE_ENV 只能是 'development' 或 'production'，当前值=${String(nodeEnv)}`);
+    }
     // 使用 importDefault 加载 configs 目录下的配置文件。
     // 合并顺序：defaultOptions ← befly.common.json ← befly.development/production.json
     const configsDir = join(process.cwd(), "configs");
     const commonConfig = await importDefault(join(configsDir, "befly.common.json"), {});
-    const envConfig = await importDefault(join(configsDir, `befly.${envSuffix}.json`), {});
+    const envConfig = await importDefault(join(configsDir, `befly.${nodeEnv}.json`), {});
     const config = mergeAndConcat(defaultOptions, commonConfig, envConfig);
+    // 重要：nodeEnv 的来源只从 Befly.start(env) 的入参 env.NODE_ENV 传入，避免 process.env 在 bundle 阶段被常量折叠。
+    // 同时确保运行时行为（例如 Bun.serve development 标记）与实际选择的配置文件一致。
+    config.nodeEnv = nodeEnv;
     // 配置校验：redis.prefix 作为 key 前缀，由 RedisHelper 统一拼接 ":"。
     // 因此 prefix 本身不允许包含 ":"，否则会导致 key 结构出现空段或多段分隔（例如 "prefix::key"），
     // 在 RedisInsight 等工具里可能显示 [NO NAME] 空分组，且容易造成 key 管理混乱。

package/dist/befly.js

@@ -7608,13 +7608,15 @@ var defaultOptions = {
   disableMenus: ["**/404", "**/403", "**/500", "**/login"],
   addons: {}
 };
-async function loadBeflyConfig() {
-  const nodeEnv = "development";
-  const envSuffix = nodeEnv === "production" ? "production" : "development";
+async function loadBeflyConfig(nodeEnv) {
+  if (nodeEnv !== "development" && nodeEnv !== "production") {
+    throw new Error(`\u914D\u7F6E\u9519\u8BEF\uFF1ANODE_ENV \u53EA\u80FD\u662F 'development' \u6216 'production'\uFF0C\u5F53\u524D\u503C=${String(nodeEnv)}`);
+  }
   const configsDir = join(process.cwd(), "configs");
   const commonConfig = await importDefault(join(configsDir, "befly.common.json"), {});
-  const envConfig = await importDefault(join(configsDir, `befly.${envSuffix}.json`), {});
+  const envConfig = await importDefault(join(configsDir, `befly.${nodeEnv}.json`), {});
   const config2 = mergeAndConcat(defaultOptions, commonConfig, envConfig);
+  config2.nodeEnv = nodeEnv;
   const redisPrefix = config2?.redis?.prefix;
   if (typeof redisPrefix === "string") {
     const trimmedPrefix = redisPrefix.trim();
@@ -10559,9 +10561,10 @@ var calcPerfTime = (startTime, endTime = Bun.nanoseconds()) => {
 };
 
 // utils/processInfo.ts
-function getProcessRole() {
-  const bunWorkerId = process.env.BUN_WORKER_ID;
-  const pm2InstanceId = process.env.PM2_INSTANCE_ID;
+function getProcessRole(env) {
+  const runtimeEnv = env || {};
+  const bunWorkerId = runtimeEnv.BUN_WORKER_ID;
+  const pm2InstanceId = runtimeEnv.PM2_INSTANCE_ID;
   if (bunWorkerId !== undefined) {
     return {
       role: bunWorkerId === "" ? "primary" : "worker",
@@ -15269,11 +15272,13 @@ class Befly {
   hooks = [];
   context = {};
   config = null;
-  async start() {
+  async start(env) {
     try {
       const serverStartTime = Bun.nanoseconds();
-      this.config = await loadBeflyConfig();
+      const runtimeEnv = env || {};
+      this.config = await loadBeflyConfig(runtimeEnv.NODE_ENV);
       this.context.config = this.config;
+      this.context.env = runtimeEnv;
       const { apis, tables, plugins, hooks, addons } = await scanSources();
       this.context.addons = addons;
       await checkApi(apis);
@@ -15333,7 +15338,7 @@ class Befly {
         }
       });
       const finalStartupTime = calcPerfTime(serverStartTime);
-      const processRole = getProcessRole();
+      const processRole = getProcessRole(runtimeEnv);
       const roleLabel = processRole.role === "primary" ? "\u4E3B\u8FDB\u7A0B" : `\u5DE5\u4F5C\u8FDB\u7A0B #${processRole.instanceId}`;
       const envLabel = processRole.env === "standalone" ? "" : ` [${processRole.env}]`;
       Logger.info(`${this.config.appName} \u542F\u52A8\u6210\u529F! (${roleLabel}${envLabel})`);