befly 3.4.8 → 3.4.10

package/bin/index.ts

@@ -27,18 +27,14 @@ import { syncMenuCommand } from '../commands/syncMenu.js';
 import { syncDevCommand } from '../commands/syncDev.js';
 import { Logger } from '../lib/logger.js';
 import { join } from 'pathe';
+import { getPackageVersion } from '../commands/util.js';
 
 /**
  * 读取 package.json 版本号
  */
 function getVersion(): string {
-    try {
-        const pkgPath = join(import.meta.dir, '..', 'package.json');
-        const pkg = require(pkgPath);
-        return pkg.version || '0.0.0';
-    } catch (error) {
-        return '0.0.0';
-    }
+    const coreDir = join(import.meta.dir, '..');
+    return getPackageVersion(coreDir);
 }
 
 /**
@@ -124,12 +120,13 @@ const program = new Command();
 program.name('befly').description('Befly CLI - 为 Befly 框架提供命令行工具').version(getVersion());
 
 /**
- * 包装命令处理函数，在执行前打印环境
+ * 包装命令处理函数，在执行后打印环境
  */
 function wrapCommand<T extends (...args: any[]) => any>(fn: T): T {
     return (async (...args: any[]) => {
+        const result = await fn(...args);
         Logger.printEnv();
-        return await fn(...args);
+        return result;
     }) as T;
 }
 

package/bin/launcher.ts

@@ -71,12 +71,15 @@ export async function launch(entryFile: string): Promise<void> {
     }
 
     // 确定环境名称
-    const envArgIndex = process.argv.indexOf('--env');
+    const longEnvIndex = process.argv.indexOf('--env');
+    const shortEnvIndex = process.argv.indexOf('-e');
     let envInput = 'development'; // 默认环境
 
-    if (envArgIndex !== -1 && process.argv[envArgIndex + 1]) {
-        // 如果指定了 --env 参数
-        envInput = process.argv[envArgIndex + 1];
+    // 检查 --env 或 -e 参数
+    if (longEnvIndex !== -1 && process.argv[longEnvIndex + 1]) {
+        envInput = process.argv[longEnvIndex + 1];
+    } else if (shortEnvIndex !== -1 && process.argv[shortEnvIndex + 1]) {
+        envInput = process.argv[shortEnvIndex + 1];
     } else if (process.env.NODE_ENV) {
         // 如果设置了 NODE_ENV 环境变量
         envInput = process.env.NODE_ENV;
@@ -86,10 +89,10 @@ export async function launch(entryFile: string): Promise<void> {
     const envName = resolveEnvName(envInput);
     const envFile = `.env.${envName}`;
 
-    // 过滤掉 --env 参数（已通过 --env-file 处理）
+    // 过滤掉 --env/-e 参数（已通过 --env-file 处理）
     const filteredArgs = process.argv.slice(2).filter((arg, i, arr) => {
-        if (arg === '--env') return false;
-        if (arr[i - 1] === '--env') return false;
+        if (arg === '--env' || arg === '-e') return false;
+        if (arr[i - 1] === '--env' || arr[i - 1] === '-e') return false;
         return true;
     });
 
@@ -98,9 +101,13 @@ export async function launch(entryFile: string): Promise<void> {
         cwd: process.cwd(),
         stdio: ['inherit', 'inherit', 'inherit'],
         env: {
-            ...process.env,
+            // 不继承父进程的环境变量，只使用以下变量
             BEFLY_SUBPROCESS: '1', // 标记为子进程
-            NODE_ENV: envName // 同时设置 NODE_ENV
+            NODE_ENV: envName, // 设置 NODE_ENV
+            PATH: process.env.PATH, // 保留 PATH
+            SYSTEMROOT: process.env.SYSTEMROOT, // Windows 需要
+            TEMP: process.env.TEMP, // Windows 需要
+            TMP: process.env.TMP // Windows 需要
         }
     });
 

package/commands/build.ts

@@ -6,18 +6,7 @@ import { join } from 'pathe';
 import { existsSync } from 'node:fs';
 import ora from 'ora';
 import { Logger } from '../lib/logger.js';
-
-function getProjectRoot(): string {
-    let current = process.cwd();
-    const path = require('node:path');
-    while (current !== path.parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        current = path.dirname(current);
-    }
-    return process.cwd();
-}
+import { getProjectRoot } from './util.js';
 
 interface BuildOptions {
     outdir: string;

package/commands/dev.ts

@@ -6,6 +6,7 @@ import { join } from 'pathe';
 import { existsSync } from 'node:fs';
 import { Logger } from '../lib/logger.js';
 import { Befly } from '../main.js';
+import { getProjectRoot } from './util.js';
 
 interface DevOptions {
     port: string;
@@ -14,17 +15,6 @@ interface DevOptions {
     verbose: boolean;
 }
 
-function getProjectRoot(): string {
-    let current = process.cwd();
-    while (current !== require('node:path').parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        current = require('node:path').dirname(current);
-    }
-    return process.cwd();
-}
-
 export async function devCommand(options: DevOptions) {
     try {
         const projectRoot = getProjectRoot();

package/commands/index.ts

@@ -6,18 +6,7 @@ import { join } from 'pathe';
 import { existsSync } from 'node:fs';
 import ora from 'ora';
 import { Logger } from '../lib/logger.js';
-
-function getProjectRoot(): string {
-    let current = process.cwd();
-    const path = require('node:path');
-    while (current !== path.parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        current = path.dirname(current);
-    }
-    return process.cwd();
-}
+import { getProjectRoot } from './util.js';
 
 // ========== Build 命令 ==========
 interface BuildOptions {

package/commands/start.ts

@@ -7,18 +7,7 @@ import { existsSync } from 'node:fs';
 import { Logger } from '../lib/logger.js';
 import { ClusterManager } from '../lifecycle/cluster.js';
 import { Befly } from '../main.js';
-
-function getProjectRoot(): string {
-    let current = process.cwd();
-    const path = require('node:path');
-    while (current !== path.parse(current).root) {
-        if (existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        current = path.dirname(current);
-    }
-    return process.cwd();
-}
+import { getProjectRoot } from './util.js';
 
 interface StartOptions {
     port: string;

package/commands/util.ts

@@ -0,0 +1,58 @@
+/**
+ * Commands 工具函数
+ * 提供命令间可复用的通用功能
+ */
+
+import { join, parse, dirname } from 'pathe';
+import { existsSync, readFileSync } from 'node:fs';
+
+/**
+ * 获取项目根目录
+ * 向上查找包含 package.json 的目录
+ *
+ * @returns 项目根目录路径
+ */
+export function getProjectRoot(): string {
+    let current = process.cwd();
+    const root = parse(current).root;
+
+    while (current !== root) {
+        if (existsSync(join(current, 'package.json'))) {
+            return current;
+        }
+        current = dirname(current);
+    }
+
+    return process.cwd();
+}
+
+/**
+ * 读取 package.json 文件内容
+ *
+ * @param pkgPath package.json 文件路径
+ * @returns package.json 的内容对象
+ */
+export function readPackageJson(pkgPath: string): Record<string, any> {
+    try {
+        const content = readFileSync(pkgPath, 'utf-8');
+        return JSON.parse(content);
+    } catch (error) {
+        throw new Error(`读取 package.json 失败: ${error}`);
+    }
+}
+
+/**
+ * 获取指定目录的 package.json 版本号
+ *
+ * @param dir 目录路径
+ * @returns 版本号字符串
+ */
+export function getPackageVersion(dir: string): string {
+    try {
+        const pkgPath = join(dir, 'package.json');
+        const pkg = readPackageJson(pkgPath);
+        return pkg.version || '0.0.0';
+    } catch (error) {
+        return '0.0.0';
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.4.8",
+    "version": "3.4.10",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -81,5 +81,5 @@
         "ora": "^9.0.0",
         "pathe": "^2.0.3"
     },
-    "gitHead": "8b7e6187e0a0ed12656ed2a2ff4107e0f76a7e31"
+    "gitHead": "cff7a359c94cef609c5d7fa0b34b114d34fbe04f"
 }