@dangao/bun-server 3.1.0 → 3.3.0

package/src/database/types.ts

@@ -3,6 +3,19 @@
  */
 export type DatabaseType = 'sqlite' | 'postgres' | 'mysql';
 
+/**
+ * SQL 驱动选择
+ *
+ * 与运行时平台（fs/crypto/http server 等）解耦，仅决定 Postgres/MySQL 连接走哪套底层驱动。
+ *
+ * - `'auto'`（默认）：Bun 运行时使用内建 `Bun.SQL`，Node.js 运行时使用 `mysql2` / `postgres` 纯 JS 驱动（保持历史行为）。
+ * - `'mysql2'`：无论运行时是 Bun 还是 Node，都使用 `mysql2`（仅适用于 `type: 'mysql'`）。
+ *   适合 `bun build --compile` 场景，绕开编译二进制内焊死的 `Bun.SQL` MySQL 适配 bug。
+ * - `'postgres'`：无论运行时如何，都使用 `postgres` 纯 JS 驱动（仅适用于 `type: 'postgres'`）。
+ * - `'bun-sql'`：强制使用 `Bun.SQL`（仅在 Bun 运行时合法，Node.js 下会抛出清晰错误）。
+ */
+export type DatabaseDriver = 'auto' | 'bun-sql' | 'mysql2' | 'postgres';
+
 /**
  * SQLite 配置
  */
@@ -72,11 +85,13 @@ export interface MysqlConfig {
 
 /**
  * 数据库配置（联合类型）
+ *
+ * Postgres/MySQL 支持可选的 `driver` 字段，用于显式选择底层驱动（与运行时平台解耦）。
  */
 export type DatabaseConfig =
   | { type: 'sqlite'; config: SqliteConfig }
-  | { type: 'postgres'; config: PostgresConfig }
-  | { type: 'mysql'; config: MysqlConfig };
+  | { type: 'postgres'; config: PostgresConfig; driver?: DatabaseDriver }
+  | { type: 'mysql'; config: MysqlConfig; driver?: DatabaseDriver };
 
 /**
  * Bun.SQL 连接池配置
@@ -111,6 +126,11 @@ export interface BunSQLConfig {
   type: 'postgres' | 'mysql';
   url: string;
   pool?: BunSQLPoolOptions;
+  /**
+   * 显式选择底层驱动（与运行时平台解耦）。
+   * @default 'auto'
+   */
+  driver?: DatabaseDriver;
 }
 
 /**
@@ -183,6 +203,11 @@ export interface DatabaseModuleOptions {
    * 单租户：数据库类型（V2）
    */
   type?: DatabaseType;
+  /**
+   * 单租户：显式选择底层驱动（V2，与运行时平台解耦）
+   * @default 'auto'
+   */
+  driver?: DatabaseDriver;
   /**
    * 单租户：Postgres/MySQL URL（V2）
    */

package/src/di/container.ts

@@ -78,10 +78,21 @@ export class Container {
    * @param token - 提供者标识符（类构造函数或 token）
    * @param config - 提供者配置
    */
+  public register<T>(
+    token: Constructor<T> | string | symbol,
+    implementation: Constructor<unknown>,
+  ): void;
   public register<T>(
     token: Constructor<T> | string | symbol,
     config?: ProviderConfig,
+  ): void;
+  public register<T>(
+    token: Constructor<T> | string | symbol,
+    configOrImplementation?: ProviderConfig | Constructor<unknown>,
   ): void {
+    const config: ProviderConfig | undefined = typeof configOrImplementation === 'function'
+      ? { implementation: configOrImplementation }
+      : configOrImplementation;
     const tokenKey = this.getTokenKey(token);
 
     // 如果配置中没有指定生命周期，尝试从装饰器元数据获取
@@ -170,6 +181,8 @@ export class Container {
    * @param token - 提供者标识符
    * @returns 解析后的实例
    */
+  public resolve(token: string | symbol): any;
+  public resolve<T>(token: Constructor<T> | string | symbol): T;
   public resolve<T>(token: Constructor<T> | string | symbol): T {
     const tokenKey = this.getTokenKey(token);
     const provider = this.providers.get(tokenKey);

package/src/di/module-registry.ts

@@ -1,7 +1,7 @@
 import { ControllerRegistry } from '../controller/controller';
 import { Container } from './container';
 import { Lifecycle } from './types';
-import { getModuleMetadata, type ModuleClass, type ModuleProvider, type ProviderToken } from './module';
+import { getModuleMetadata, invokeFactoryProvider, type ModuleClass, type ModuleProvider, type ProviderToken } from './module';
 import { isGlobalModule } from './decorators';
 import type { Constructor } from '@/core/types';
 import type { ApplicationExtension } from '../extensions/types';
@@ -160,7 +160,7 @@ export class ModuleRegistry {
       if ('useFactory' in provider) {
         container.register(provider.provide, {
           lifecycle: provider.lifecycle ?? Lifecycle.Singleton,
-          factory: () => provider.useFactory(container),
+          factory: () => invokeFactoryProvider(provider, container),
         });
         continue;
       }
@@ -378,4 +378,3 @@ export class ModuleRegistry {
     });
   }
 }
-

package/src/di/module.ts

@@ -22,10 +22,30 @@ export interface ValueProvider {
 
 export interface FactoryProvider {
   provide: ProviderToken;
-  useFactory: (container: Container) => unknown;
+  /**
+   * 同步工厂函数。
+   * - 当 inject 存在且非空时，按 inject 顺序解析 token，并作为位置参数传入。
+   * - 当 inject 缺省或为空时，为保持向后兼容，将当前 Container 作为唯一参数传入。
+   */
+  useFactory: (...args: any[]) => unknown;
+  /**
+   * 可选的依赖 token 列表。依赖会在工厂被调用时按容器规则惰性解析。
+   */
+  inject?: ProviderToken[];
   lifecycle?: Lifecycle;
 }
 
+export function invokeFactoryProvider(
+  provider: FactoryProvider,
+  container: Container,
+): unknown {
+  const inject = provider.inject ?? [];
+  if (inject.length > 0) {
+    return provider.useFactory(...inject.map((token) => container.resolve(token)));
+  }
+  return provider.useFactory(container);
+}
+
 /**
  * NestJS 风格别名：`provide` 解析为已注册的 `useExisting` 同一实例（不新建）。
  */
@@ -76,4 +96,3 @@ export function getModuleMetadata(moduleClass: ModuleClass): Required<Omit<Modul
     middlewares: metadata.middlewares ?? [],
   };
 }
-

package/src/di/types.ts

@@ -71,7 +71,7 @@ export interface ProviderConfig {
   /**
    * 实际实现类（当 token 为 string/symbol 时用于实例化）
    */
-  implementation?: new (...args: unknown[]) => unknown;
+  implementation?: Constructor<unknown>;
 }
 
 /**
@@ -93,4 +93,3 @@ export interface DependencyMetadata {
    */
   token?: string | symbol;
 }
-

package/src/error/handler.ts

@@ -4,6 +4,7 @@ import { ExceptionFilterRegistry } from './filter';
 import { ValidationError } from '../validation';
 import { ErrorMessageI18n } from './i18n';
 import { LoggerManager } from '@dangao/logsmith';
+import { ERROR_CODE_MESSAGES, type ErrorCode } from './error-codes';
 
 /**
  * 全局错误处理
@@ -29,12 +30,12 @@ export async function handleError(error: unknown, context: Context): Promise<Res
 
     // 如果异常有错误码，尝试国际化消息
     let errorMessage = error.message;
-    if (error.code) {
+    if (error.code && error.code in ERROR_CODE_MESSAGES) {
       const acceptLanguage = context.getHeader('accept-language');
       const language = ErrorMessageI18n.parseLanguageFromHeader(acceptLanguage);
       // 如果提供了消息模板参数，使用参数替换占位符
       errorMessage = ErrorMessageI18n.getMessage(
-        error.code,
+        error.code as ErrorCode,
         language,
         error.messageParams,
       );
@@ -79,5 +80,3 @@ export async function handleError(error: unknown, context: Context): Promise<Res
     details: process.env.NODE_ENV === 'production' ? undefined : message,
   });
 }
-
-

package/src/error/http-exception.ts

@@ -6,7 +6,7 @@ import type { MessageParams } from './i18n';
  */
 export class HttpException extends Error {
   public readonly status: number;
-  public readonly code?: ErrorCode;
+  public readonly code?: ErrorCode | string;
   public readonly details?: unknown;
   public readonly messageParams?: MessageParams;
 
@@ -14,7 +14,7 @@ export class HttpException extends Error {
     status: number,
     message: string,
     details?: unknown,
-    code?: ErrorCode,
+    code?: ErrorCode | string,
     messageParams?: MessageParams,
   ) {
     super(message);
@@ -46,13 +46,14 @@ export class HttpException extends Error {
    * ```
    */
   public static withCode(
-    code: ErrorCode,
+    code: ErrorCode | string,
     message?: string,
     details?: unknown,
     messageParams?: MessageParams,
   ): HttpException {
-    const status = ERROR_CODE_TO_STATUS[code] || 500;
-    const finalMessage = message || ERROR_CODE_MESSAGES[code] || 'Internal Server Error';
+    const knownCode = code as ErrorCode;
+    const status = ERROR_CODE_TO_STATUS[knownCode] || 500;
+    const finalMessage = message || ERROR_CODE_MESSAGES[knownCode] || 'Internal Server Error';
     return new HttpException(status, finalMessage, details, code, messageParams);
   }
 }
@@ -61,7 +62,7 @@ export class BadRequestException extends HttpException {
   public constructor(
     message: string = 'Bad Request',
     details?: unknown,
-    code?: ErrorCode,
+    code?: ErrorCode | string,
     messageParams?: MessageParams,
   ) {
     super(400, message, details, code, messageParams);
@@ -72,7 +73,7 @@ export class UnauthorizedException extends HttpException {
   public constructor(
     message: string = 'Unauthorized',
     details?: unknown,
-    code?: ErrorCode,
+    code?: ErrorCode | string,
     messageParams?: MessageParams,
   ) {
     super(401, message, details, code, messageParams);
@@ -83,7 +84,7 @@ export class ForbiddenException extends HttpException {
   public constructor(
     message: string = 'Forbidden',
     details?: unknown,
-    code?: ErrorCode,
+    code?: ErrorCode | string,
     messageParams?: MessageParams,
   ) {
     super(403, message, details, code, messageParams);
@@ -94,7 +95,7 @@ export class NotFoundException extends HttpException {
   public constructor(
     message: string = 'Not Found',
     details?: unknown,
-    code?: ErrorCode,
+    code?: ErrorCode | string,
     messageParams?: MessageParams,
   ) {
     super(404, message, details, code, messageParams);
@@ -105,11 +106,10 @@ export class InternalServerErrorException extends HttpException {
   public constructor(
     message: string = 'Internal Server Error',
     details?: unknown,
-    code?: ErrorCode,
+    code?: ErrorCode | string,
     messageParams?: MessageParams,
   ) {
     super(500, message, details, code, messageParams);
   }
 }
 
-

package/src/error/index.ts

@@ -12,5 +12,5 @@ export { handleError } from './handler';
 export { ErrorCode, ERROR_CODE_MESSAGES, ERROR_CODE_TO_STATUS } from './error-codes';
 export { ErrorMessageI18n } from './i18n';
 export type { SupportedLanguage, MessageParams } from './i18n';
-
+export type { Context } from '../core/context';
 

package/src/events/service.ts

@@ -36,7 +36,7 @@ export class EventEmitterService implements EventEmitter {
   /**
    * 发布事件（同步触发所有监听器，不等待异步监听器完成）
    */
-  public emit<T>(event: string | symbol, payload: T): void {
+  public emit<T = undefined>(event: string | symbol, payload?: T): void {
     const eventName = this.resolveEventName(event);
     const matchedListeners = this.getMatchedListeners(eventName);
 
@@ -70,7 +70,7 @@ export class EventEmitterService implements EventEmitter {
   /**
    * 异步发布事件（等待所有监听器完成）
    */
-  public async emitAsync<T>(event: string | symbol, payload: T): Promise<void> {
+  public async emitAsync<T = undefined>(event: string | symbol, payload?: T): Promise<void> {
     const eventName = this.resolveEventName(event);
     const matchedListeners = this.getMatchedListeners(eventName);
 
@@ -342,6 +342,8 @@ export class EventEmitterService implements EventEmitter {
   ): void {
     if (this.options.onError) {
       this.options.onError(error, event, payload);
+    } else if (this.options.errorHandler) {
+      this.options.errorHandler(String(event), error, payload);
     } else {
       console.error(
         `[EventEmitter] Error in listener for event "${String(event)}":`,

package/src/events/types.ts

@@ -3,7 +3,7 @@
  * @template T - 事件负载类型
  */
 export interface EventListener<T = unknown> {
-  (payload: T): void | Promise<void>;
+  (payload: T): unknown | Promise<unknown>;
 }
 
 /**
@@ -62,14 +62,14 @@ export interface EventEmitter {
    * @param event - 事件名称或标识符
    * @param payload - 事件负载
    */
-  emit<T>(event: string | symbol, payload: T): void;
+  emit<T = undefined>(event: string | symbol, payload?: T): void;
 
   /**
    * 异步发布事件（等待所有监听器完成）
    * @param event - 事件名称或标识符
    * @param payload - 事件负载
    */
-  emitAsync<T>(event: string | symbol, payload: T): Promise<void>;
+  emitAsync<T = undefined>(event: string | symbol, payload?: T): Promise<void>;
 
   /**
    * 订阅事件
@@ -166,6 +166,12 @@ export interface EventModuleOptions {
    */
   maxListeners?: number;
 
+  /**
+   * 默认是否异步处理监听器，兼容早期模块配置。
+   * @default false
+   */
+  async?: boolean;
+
   /**
    * 错误处理函数
    * @param error - 错误对象
@@ -174,6 +180,11 @@ export interface EventModuleOptions {
    */
   onError?: (error: Error, event: string | symbol, payload: unknown) => void;
 
+  /**
+   * 错误处理函数别名，参数顺序为 (event, error)。
+   */
+  errorHandler?: (event: string, error: Error, payload: unknown) => void;
+
   /**
    * 是否自动扫描和注册事件监听器
    * 当设置为 true 时，框架会在应用启动时自动扫描所有模块中使用 @OnEvent 装饰器的类

package/src/interceptor/base-interceptor.ts

@@ -15,11 +15,11 @@ export abstract class BaseInterceptor implements Interceptor {
   public abstract execute<T>(
     target: unknown,
     propertyKey: string | symbol,
-    originalMethod: (...args: unknown[]) => T | Promise<T>,
-    args: unknown[],
+    originalMethod: (...args: any[]) => T | Promise<T>,
+    args: any[],
     container: Container,
     context?: Context,
-  ): Promise<T>;
+  ): Promise<any>;
 
   /**
    * 前置处理（可选）
@@ -33,7 +33,7 @@ export abstract class BaseInterceptor implements Interceptor {
   protected async before(
     target: unknown,
     propertyKey: string | symbol,
-    args: unknown[],
+    args: any[],
     container: Container,
     context?: Context,
   ): Promise<void> {
@@ -141,7 +141,7 @@ export abstract class BaseInterceptor implements Interceptor {
    */
   protected resolveService<T>(
     container: Container,
-    token: (new (...args: unknown[]) => T) | string | symbol,
+    token: (new (...args: any[]) => T) | string | symbol,
   ): T {
     return container.resolve<T>(token);
   }
@@ -200,4 +200,3 @@ export abstract class BaseInterceptor implements Interceptor {
     return context.getParam(paramName);
   }
 }
-

package/src/interceptor/builtin/log-interceptor.ts

@@ -84,8 +84,8 @@ export class LogInterceptor extends BaseInterceptor {
   public async execute<T>(
     target: unknown,
     propertyKey: string | symbol,
-    originalMethod: (...args: unknown[]) => T | Promise<T>,
-    args: unknown[],
+    originalMethod: (...args: any[]) => T | Promise<T>,
+    args: any[],
     container: Container,
     context?: Context,
   ): Promise<T> {
@@ -175,4 +175,3 @@ export class LogInterceptor extends BaseInterceptor {
     }
   }
 }
-

package/src/interceptor/builtin/permission-interceptor.ts

@@ -91,8 +91,8 @@ export class PermissionInterceptor extends BaseInterceptor {
   public async execute<T>(
     target: unknown,
     propertyKey: string | symbol,
-    originalMethod: (...args: unknown[]) => T | Promise<T>,
-    args: unknown[],
+    originalMethod: (...args: any[]) => T | Promise<T>,
+    args: any[],
     container: Container,
     context?: Context,
   ): Promise<T> {
@@ -170,4 +170,3 @@ export class PermissionInterceptor extends BaseInterceptor {
     return null;
   }
 }
-

package/src/interceptor/interceptor-chain.ts

@@ -22,8 +22,8 @@ export class InterceptorChain {
     interceptors: Interceptor[],
     target: unknown,
     propertyKey: string | symbol,
-    originalMethod: (...args: unknown[]) => T | Promise<T>,
-    args: unknown[],
+    originalMethod: (...args: any[]) => T | Promise<T>,
+    args: any[],
     container: Container,
     context?: Context,
   ): Promise<T> {
@@ -36,7 +36,7 @@ export class InterceptorChain {
     let index = 0;
     let currentArgs = args; // Track arguments that might be modified by interceptors
     
-    const next = async (modifiedArgs?: unknown[]): Promise<T> => {
+    const next = async (modifiedArgs?: any[]): Promise<T> => {
       // 如果拦截器传递了新参数，使用新参数；否则使用当前参数
       if (modifiedArgs && modifiedArgs.length > 0) {
         currentArgs = modifiedArgs;
@@ -50,11 +50,11 @@ export class InterceptorChain {
       const interceptor = interceptors[index++];
       
       // 执行当前拦截器，传递 next 作为下一个执行函数
-      // 注意：拦截器接口要求 originalMethod 的类型是 (...args: unknown[]) => T | Promise<T>
+      // 注意：拦截器接口要求 originalMethod 的类型是 (...args: any[]) => T | Promise<T>
       // 这允许原始方法可以是同步（返回 T）或异步（返回 Promise<T>）
       // 虽然 next 函数是异步的（总是返回 Promise<T>），但我们保持类型签名为 T | Promise<T>
       // 以符合拦截器接口的要求。拦截器应该使用 Promise.resolve() 来统一处理同步和异步返回值
-      const wrappedNext = (...nextArgs: unknown[]): T | Promise<T> => {
+      const wrappedNext = (...nextArgs: any[]): T | Promise<T> => {
         // 如果拦截器传递了新参数，传递给 next；否则传递 undefined（使用当前参数）
         // next 是异步函数，总是返回 Promise<T>，但类型签名允许 T | Promise<T>
         const result = next(nextArgs.length > 0 ? nextArgs : undefined);
@@ -70,10 +70,9 @@ export class InterceptorChain {
         currentArgs, // Pass current args to the interceptor
         container,
         context,
-      );
+      ) as T;
     };
 
     return await next();
   }
 }
-

package/src/interceptor/interceptor-registry.ts

@@ -22,8 +22,11 @@ export class InterceptorRegistry {
   public register(
     metadataKey: symbol,
     interceptor: Interceptor,
-    priority: number = 100,
+    priority: number | { priority?: number } = 100,
   ): void {
+    const resolvedPriority = typeof priority === 'number'
+      ? priority
+      : priority.priority ?? 100;
     if (!this.interceptors.has(metadataKey)) {
       this.interceptors.set(metadataKey, []);
     }
@@ -39,7 +42,7 @@ export class InterceptorRegistry {
       metadataList.push({
         metadataKey,
         interceptor,
-        priority,
+        priority: resolvedPriority,
       });
       
       // 按优先级排序（数字越小优先级越高）
@@ -129,4 +132,3 @@ export class InterceptorRegistry {
     return total;
   }
 }
-

package/src/interceptor/types.ts

@@ -6,6 +6,12 @@ import type { Context } from '../core/context';
  * 定义拦截器的核心执行方法
  */
 export interface Interceptor {
+  /**
+   * Optional priority used by registries/tests that carry interceptor metadata
+   * alongside the executable interceptor instance.
+   */
+  priority?: number;
+
   /**
    * 执行拦截器逻辑
    * @param target - 目标对象（控制器实例的原型）
@@ -19,11 +25,11 @@ export interface Interceptor {
   execute<T>(
     target: unknown,
     propertyKey: string | symbol,
-    originalMethod: (...args: unknown[]) => T | Promise<T>,
-    args: unknown[],
+    originalMethod: (...args: any[]) => T | Promise<T>,
+    args: any[],
     container: Container,
     context?: Context,
-  ): Promise<T>;
+  ): Promise<any>;
 }
 
 /**
@@ -49,4 +55,3 @@ export interface InterceptorMetadata {
  * 拦截器注册表 Token
  */
 export const INTERCEPTOR_REGISTRY_TOKEN = Symbol('@dangao/bun-server:interceptor-registry');
-

package/src/microservice/service-client/types.ts

@@ -1,4 +1,5 @@
 import type { ServiceInstance } from '../service-registry/types';
+export type { ServiceInstance } from '../service-registry/types';
 
 /**
  * 负载均衡策略类型
@@ -183,4 +184,3 @@ export class ServiceCallError extends Error {
     this.name = 'ServiceCallError';
   }
 }
-

package/src/microservice/tracing/tracer.ts

@@ -172,14 +172,27 @@ export class Tracer {
   /**
    * 添加 Span 事件
    */
-  public addSpanEvent(spanId: SpanId, event: Omit<SpanEvent, 'timestamp'>): void {
+  public addSpanEvent(
+    spanId: SpanId,
+    event: string,
+    attributes?: Record<string, string | number | boolean>,
+  ): void;
+  public addSpanEvent(spanId: SpanId, event: Omit<SpanEvent, 'timestamp'>): void;
+  public addSpanEvent(
+    spanId: SpanId,
+    event: string | Omit<SpanEvent, 'timestamp'>,
+    attributes?: Record<string, string | number | boolean>,
+  ): void {
     const span = this.activeSpans.get(spanId);
     if (span) {
       if (!span.events) {
         span.events = [];
       }
+      const spanEvent = typeof event === 'string'
+        ? { name: event, attributes }
+        : event;
       span.events.push({
-        ...event,
+        ...spanEvent,
         timestamp: Date.now(),
       });
     }
@@ -290,4 +303,3 @@ export class Tracer {
     this.activeSpans.clear();
   }
 }
-

package/src/middleware/builtin/file-upload.ts

@@ -3,13 +3,15 @@ import { FileHandler } from '../../request/file-handler';
 
 export interface FileUploadOptions {
   maxSize?: number;
+  maxFileSize?: number;
+  uploadDir?: string;
 }
 
 /**
  * 简单的文件上传中间件：解析 multipart/form-data 并将文件附加到 context.body
  */
 export function createFileUploadMiddleware(options: FileUploadOptions = {}): Middleware {
-  const maxSize = options.maxSize ?? 10 * 1024 * 1024;
+  const maxSize = options.maxSize ?? options.maxFileSize ?? 10 * 1024 * 1024;
 
   return async (context, next) => {
     const contentType = context.getHeader('Content-Type');
@@ -39,4 +41,3 @@ export function createFileUploadMiddleware(options: FileUploadOptions = {}): Mid
   };
 }
 
-