befly 3.4.16 → 3.5.0

package/commands/build.ts

@@ -4,7 +4,6 @@
 
 import { join } from 'pathe';
 import { existsSync } from 'node:fs';
-import ora from 'ora';
 import { Logger } from '../lib/logger.js';
 import { getProjectRoot } from './util.js';
 
@@ -28,11 +27,7 @@ export async function buildCommand(options: BuildOptions) {
         // 使用内置默认入口文件
         const entryFile = join(import.meta.dir, '..', 'entry.ts');
 
-        const spinner = ora({
-            text: '正在构建项目...',
-            color: 'cyan',
-            spinner: 'dots'
-        }).start();
+        Logger.info('正在构建项目...');
 
         const args = ['build', entryFile, '--outdir', options.outdir, '--target', 'bun'];
 
@@ -53,10 +48,10 @@ export async function buildCommand(options: BuildOptions) {
         await proc.exited;
 
         if (proc.exitCode === 0) {
-            spinner.succeed('项目构建完成');
+            Logger.success('项目构建完成');
             Logger.success(`输出目录: ${options.outdir}`);
         } else {
-            spinner.fail('项目构建失败');
+            Logger.error('项目构建失败');
             process.exit(1);
         }
     } catch (error) {

package/commands/index.ts

@@ -4,7 +4,6 @@
 
 import { join } from 'pathe';
 import { existsSync } from 'node:fs';
-import ora from 'ora';
 import { Logger } from '../lib/logger.js';
 import { getProjectRoot } from './util.js';
 
@@ -25,11 +24,7 @@ export async function buildCommand(options: BuildOptions) {
             process.exit(1);
         }
 
-        const spinner = ora({
-            text: '正在构建项目...',
-            color: 'cyan',
-            spinner: 'dots'
-        }).start();
+        Logger.info('正在构建项目...');
 
         const args = ['build', mainFile, '--outdir', options.outdir, '--target', 'bun'];
 
@@ -50,10 +45,10 @@ export async function buildCommand(options: BuildOptions) {
         await proc.exited;
 
         if (proc.exitCode === 0) {
-            spinner.succeed('项目构建完成');
+            Logger.success('项目构建完成');
             Logger.success(`输出目录: ${options.outdir}`);
         } else {
-            spinner.fail('项目构建失败');
+            Logger.error('项目构建失败');
             process.exit(1);
         }
     } catch (error) {
@@ -126,11 +121,7 @@ export async function syncCommand(options: SyncOptions) {
             process.exit(1);
         }
 
-        const spinner = ora({
-            text: '正在同步数据库表...',
-            color: 'cyan',
-            spinner: 'dots'
-        }).start();
+        Logger.info('正在同步数据库表...');
 
         const args = ['run', syncScript];
 
@@ -160,9 +151,9 @@ export async function syncCommand(options: SyncOptions) {
         await proc.exited;
 
         if (proc.exitCode === 0) {
-            spinner.succeed('数据库同步完成');
+            Logger.success('数据库同步完成');
         } else {
-            spinner.fail('数据库同步失败');
+            Logger.error('数据库同步失败');
             process.exit(1);
         }
     } catch (error) {
@@ -175,11 +166,7 @@ export async function syncCommand(options: SyncOptions) {
 // ========== Addon 命令 ==========
 export const addonCommand = {
     async install(name: string, options: { source?: string }) {
-        const spinner = ora({
-            text: `正在安装插件: ${name}`,
-            color: 'cyan',
-            spinner: 'dots'
-        }).start();
+        Logger.info(`正在安装插件: ${name}`);
 
         try {
             // TODO: 实现插件安装逻辑
@@ -188,19 +175,15 @@ export const addonCommand = {
             // 3. 安装插件依赖
             // 4. 执行插件安装脚本
 
-            spinner.succeed(`插件 ${name} 安装成功`);
+            Logger.success(`插件 ${name} 安装成功`);
         } catch (error) {
-            spinner.fail(`插件 ${name} 安装失败`);
+            Logger.error(`插件 ${name} 安装失败`);
             throw error;
         }
     },
 
     async uninstall(name: string, options: { keepData: boolean }) {
-        const spinner = ora({
-            text: `正在卸载插件: ${name}`,
-            color: 'cyan',
-            spinner: 'dots'
-        }).start();
+        Logger.info(`正在卸载插件: ${name}`);
 
         try {
             // TODO: 实现插件卸载逻辑
@@ -208,9 +191,9 @@ export const addonCommand = {
             // 2. 删除插件文件
             // 3. 可选：删除插件数据
 
-            spinner.succeed(`插件 ${name} 卸载成功`);
+            Logger.success(`插件 ${name} 卸载成功`);
         } catch (error) {
-            spinner.fail(`插件 ${name} 卸载失败`);
+            Logger.error(`插件 ${name} 卸载失败`);
             throw error;
         }
     },

package/commands/syncDb.ts

@@ -5,7 +5,6 @@
 import { Command } from 'commander';
 import { join } from 'pathe';
 import { existsSync } from 'node:fs';
-import ora from 'ora';
 import { Logger } from '../lib/logger.js';
 import { SyncDb } from './syncDb/index.js';
 

package/lib/middleware.ts

@@ -58,40 +58,12 @@ export interface CorsResult {
  * @returns CORS 配置对象
  */
 export const setCorsOptions = (req: Request): CorsResult => {
-    const requestOrigin = req.headers.get('origin');
-    let allowedOrigin = '*';
-
-    // 如果配置了 CORS_ALLOWED_ORIGIN
-    if (Env.CORS_ALLOWED_ORIGIN) {
-        // 如果配置为 *，使用请求的 origin（而不是返回 *）
-        if (Env.CORS_ALLOWED_ORIGIN === '*') {
-            allowedOrigin = requestOrigin || '*';
-        } else {
-            // 支持多个源，用逗号分隔
-            const allowedOrigins = Env.CORS_ALLOWED_ORIGIN.split(',').map((origin) => origin.trim());
-
-            // 如果请求的 origin 在允许列表中，返回该 origin
-            if (requestOrigin && allowedOrigins.includes(requestOrigin)) {
-                allowedOrigin = requestOrigin;
-            } else if (allowedOrigins.length === 1) {
-                // 如果只配置了一个源，直接使用
-                allowedOrigin = allowedOrigins[0];
-            } else {
-                // 多个源但请求源不在列表中，不允许跨域
-                allowedOrigin = 'null';
-            }
-        }
-    } else if (requestOrigin) {
-        // 没有配置 CORS_ALLOWED_ORIGIN，使用请求的 origin
-        allowedOrigin = requestOrigin;
-    }
-
     return {
         headers: {
-            'Access-Control-Allow-Origin': allowedOrigin,
-            'Access-Control-Allow-Methods': Env.CORS_ALLOWED_METHODS || 'GET, POST, PUT, DELETE, OPTIONS',
-            'Access-Control-Allow-Headers': Env.CORS_ALLOWED_HEADERS || 'Content-Type, Authorization, authorization, token',
-            'Access-Control-Expose-Headers': Env.CORS_EXPOSE_HEADERS || 'Content-Range, X-Content-Range, Authorization, authorization, token',
+            'Access-Control-Allow-Origin': Env.CORS_ALLOWED_ORIGIN === '*' ? req.headers.get('origin') : Env.CORS_ALLOWED_ORIGIN,
+            'Access-Control-Allow-Methods': Env.CORS_ALLOWED_METHODS,
+            'Access-Control-Allow-Headers': Env.CORS_ALLOWED_HEADERS,
+            'Access-Control-Expose-Headers': Env.CORS_EXPOSE_HEADERS,
             'Access-Control-Max-Age': Env.CORS_MAX_AGE || 86400,
             'Access-Control-Allow-Credentials': Env.CORS_ALLOW_CREDENTIALS || 'true'
         }

package/main.ts

@@ -8,6 +8,7 @@ import { Yes, No } from './util.js';
 import { Logger } from './lib/logger.js';
 import { Cipher } from './lib/cipher.js';
 import { Jwt } from './lib/jwt.js';
+import { Database } from './lib/database.js';
 import { Lifecycle } from './lifecycle/lifecycle.js';
 
 import type { Server } from 'bun';
@@ -34,6 +35,7 @@ export class Befly {
      */
     async listen(callback?: (server: Server) => void): Promise<Server> {
         const server = await this.lifecycle.start(this.appContext, callback);
+        Logger.info('数据库======:' + Env.APP_NAME);
 
         // 注册优雅关闭信号处理器
         const gracefulShutdown = async (signal: string) => {
@@ -45,7 +47,6 @@ export class Befly {
 
             // 2. 关闭数据库连接
             try {
-                const { Database } = await import('./lib/database.js');
                 await Database.disconnect();
                 Logger.info('✅ 数据库连接已关闭');
             } catch (error: any) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "3.4.16",
+    "version": "3.5.0",
     "description": "Befly - 为 Bun 专属打造的 TypeScript API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -78,8 +78,7 @@
         "commander": "^14.0.2",
         "es-toolkit": "^1.41.0",
         "inquirer": "^12.10.0",
-        "ora": "^9.0.0",
         "pathe": "^2.0.3"
     },
-    "gitHead": "e1533f0a123ef756790fad4fc34dd9690a30f72e"
+    "gitHead": "6d065b50bd57e1330a81d5a62423b204a2a49205"
 }

package/router/api.ts

@@ -21,7 +21,6 @@ import type { BeflyContext } from '../types/befly.js';
 export function apiHandler(apiRoutes: Map<string, ApiRoute>, pluginLists: Plugin[], appContext: BeflyContext) {
     return async (req: Request): Promise<Response> => {
         const corsOptions = setCorsOptions(req);
-        console.log('🔥[ corsOptions ]-24', corsOptions);
         let ctx: RequestContext | null = null;
         let api: ApiRoute | undefined;
         let apiPath = '';
@@ -118,37 +117,7 @@ export function apiHandler(apiRoutes: Map<string, ApiRoute>, pluginLists: Plugin
             // 记录详细的错误日志
             Logger.warn(api ? `接口 [${api.name}] 执行失败` : '处理接口请求时发生错误', error);
 
-            // 根据错误类型返回不同的错误信息
-            let errorMessage = '内部服务器错误';
-            let errorDetail = {};
-
-            // 数据库错误
-            if (error.message?.includes('ECONNREFUSED') || error.message?.includes('database')) {
-                errorMessage = '数据库连接失败';
-            }
-            // Redis错误
-            else if (error.message?.includes('Redis') || error.message?.includes('redis')) {
-                errorMessage = 'Redis服务异常';
-            }
-            // 权限错误
-            else if (error.message?.includes('permission') || error.message?.includes('权限')) {
-                errorMessage = '权限不足';
-            }
-            // 认证错误
-            else if (error.message?.includes('token') || error.message?.includes('认证')) {
-                errorMessage = '认证失败';
-            }
-
-            // 开发环境返回详细错误信息
-            if (Env.NODE_ENV === 'development') {
-                errorDetail = {
-                    type: error.constructor?.name || 'Error',
-                    message: error.message,
-                    stack: error.stack
-                };
-            }
-
-            return Response.json(No(errorMessage, errorDetail), {
+            return Response.json(No('内部服务器错误'), {
                 headers: corsOptions.headers
             });
         }