@dangao/bun-server 3.2.0 → 3.3.0

package/src/cache/interceptors.ts

@@ -91,8 +91,8 @@ export class CacheableInterceptor 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> {
@@ -164,8 +164,8 @@ export class CacheEvictInterceptor 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> {
@@ -238,8 +238,8 @@ export class CachePutInterceptor 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> {

package/src/cache/service-proxy.ts

@@ -87,9 +87,9 @@ export class CacheServiceProxy {
 
         // 返回包装后的方法
         // 使用原型方法以确保拦截器能获取到正确的元数据
-        const originalMethod = prototypeMethod as (...args: unknown[]) => unknown;
+        const originalMethod = prototypeMethod as (...args: any[]) => unknown;
 
-        return async function (this: T, ...args: unknown[]): Promise<unknown> {
+        return async function (this: T, ...args: any[]): Promise<unknown> {
           // 按优先级执行拦截器：CacheEvict (beforeInvocation) -> Cacheable/CachePut -> CacheEvict (afterInvocation)
 
           // 如果有 @CacheEvict 且配置了 beforeInvocation

package/src/cache/service.ts

@@ -13,11 +13,14 @@ export class CacheService {
   private keyPrefix: string;
 
   public constructor(
-    @Inject(CACHE_OPTIONS_TOKEN) options: CacheModuleOptions,
+    @Inject(CACHE_OPTIONS_TOKEN) options: CacheModuleOptions | CacheStore,
   ) {
-    this.store = options.store!;
-    this.defaultTtl = options.defaultTtl ?? 3600000; // 1 小时
-    this.keyPrefix = options.keyPrefix ?? '';
+    const resolvedOptions: CacheModuleOptions = isCacheStore(options)
+      ? { store: options }
+      : options;
+    this.store = resolvedOptions.store!;
+    this.defaultTtl = resolvedOptions.defaultTtl ?? 3600000; // 1 小时
+    this.keyPrefix = resolvedOptions.keyPrefix ?? '';
   }
 
   /**
@@ -25,7 +28,7 @@ export class CacheService {
    * @param key - 缓存键
    * @returns 缓存值，如果不存在则返回 undefined
    */
-  public async get<T = unknown>(key: string): Promise<T | undefined> {
+  public async get<T = any>(key: string): Promise<T | undefined> {
     return this.store.get<T>(this.getKey(key));
   }
 
@@ -36,7 +39,7 @@ export class CacheService {
    * @param ttl - 过期时间（毫秒），0 表示永不过期，undefined 使用默认 TTL
    * @returns 是否设置成功
    */
-  public async set<T = unknown>(
+  public async set<T = any>(
     key: string,
     value: T,
     ttl?: number,
@@ -76,7 +79,7 @@ export class CacheService {
    * @param keys - 缓存键数组
    * @returns 缓存值映射
    */
-  public async getMany<T = unknown>(
+  public async getMany<T = any>(
     keys: string[],
   ): Promise<Map<string, T>> {
     const prefixedKeys = keys.map((k) => this.getKey(k));
@@ -97,7 +100,7 @@ export class CacheService {
    * @param ttl - 过期时间（毫秒），0 表示永不过期，undefined 使用默认 TTL
    * @returns 是否设置成功
    */
-  public async setMany<T = unknown>(
+  public async setMany<T = any>(
     entries: Array<{ key: string; value: T }>,
     ttl?: number,
   ): Promise<boolean> {
@@ -149,3 +152,9 @@ export class CacheService {
     return this.keyPrefix ? `${this.keyPrefix}${key}` : key;
   }
 }
+
+function isCacheStore(value: CacheModuleOptions | CacheStore): value is CacheStore {
+  return typeof (value as CacheStore).get === 'function' &&
+    typeof (value as CacheStore).set === 'function' &&
+    typeof (value as CacheStore).delete === 'function';
+}

package/src/cache/types.ts

@@ -7,7 +7,7 @@ export interface CacheStore {
    * @param key - 缓存键
    * @returns 缓存值，如果不存在则返回 undefined
    */
-  get<T = unknown>(key: string): Promise<T | undefined>;
+  get<T = any>(key: string): Promise<T | undefined>;
 
   /**
    * 设置缓存值
@@ -16,7 +16,7 @@ export interface CacheStore {
    * @param ttl - 过期时间（毫秒），0 表示永不过期
    * @returns 是否设置成功
    */
-  set<T = unknown>(key: string, value: T, ttl?: number): Promise<boolean>;
+  set<T = any>(key: string, value: T, ttl?: number): Promise<boolean>;
 
   /**
    * 删除缓存
@@ -43,7 +43,7 @@ export interface CacheStore {
    * @param keys - 缓存键数组
    * @returns 缓存值映射
    */
-  getMany<T = unknown>(keys: string[]): Promise<Map<string, T>>;
+  getMany<T = any>(keys: string[]): Promise<Map<string, T>>;
 
   /**
    * 设置多个缓存值
@@ -51,7 +51,7 @@ export interface CacheStore {
    * @param ttl - 过期时间（毫秒），0 表示永不过期
    * @returns 是否设置成功
    */
-  setMany<T = unknown>(
+  setMany<T = any>(
     entries: Array<{ key: string; value: T }>,
     ttl?: number,
   ): Promise<boolean>;
@@ -84,7 +84,7 @@ export class MemoryCacheStore implements CacheStore {
     }
   }
 
-  public async get<T = unknown>(key: string): Promise<T | undefined> {
+  public async get<T = any>(key: string): Promise<T | undefined> {
     const entry = this.store.get(key);
     if (!entry) {
       return undefined;
@@ -99,7 +99,7 @@ export class MemoryCacheStore implements CacheStore {
     return entry.value as T;
   }
 
-  public async set<T = unknown>(
+  public async set<T = any>(
     key: string,
     value: T,
     ttl?: number,
@@ -133,7 +133,7 @@ export class MemoryCacheStore implements CacheStore {
     return true;
   }
 
-  public async getMany<T = unknown>(
+  public async getMany<T = any>(
     keys: string[],
   ): Promise<Map<string, T>> {
     const result = new Map<string, T>();
@@ -154,7 +154,7 @@ export class MemoryCacheStore implements CacheStore {
     return result;
   }
 
-  public async setMany<T = unknown>(
+  public async setMany<T = any>(
     entries: Array<{ key: string; value: T }>,
     ttl?: number,
   ): Promise<boolean> {
@@ -239,7 +239,7 @@ export class RedisCacheStore implements CacheStore {
     return `${this.keyPrefix}${key}`;
   }
 
-  public async get<T = unknown>(key: string): Promise<T | undefined> {
+  public async get<T = any>(key: string): Promise<T | undefined> {
     const value = await this.client.get(this.getKey(key));
     if (value === null) {
       return undefined;
@@ -251,7 +251,7 @@ export class RedisCacheStore implements CacheStore {
     }
   }
 
-  public async set<T = unknown>(
+  public async set<T = any>(
     key: string,
     value: T,
     ttl?: number,
@@ -296,7 +296,7 @@ export class RedisCacheStore implements CacheStore {
     }
   }
 
-  public async getMany<T = unknown>(
+  public async getMany<T = any>(
     keys: string[],
   ): Promise<Map<string, T>> {
     const result = new Map<string, T>();
@@ -325,7 +325,7 @@ export class RedisCacheStore implements CacheStore {
     return result;
   }
 
-  public async setMany<T = unknown>(
+  public async setMany<T = any>(
     entries: Array<{ key: string; value: T }>,
     ttl?: number,
   ): Promise<boolean> {

package/src/config/service.ts

@@ -67,12 +67,12 @@ export class ConfigService<TConfig extends Record<string, unknown> = Record<stri
    * 更新配置（用于配置中心动态刷新）
    * @param newConfig - 新配置对象
    */
-  public updateConfig(newConfig: TConfig): void {
-    this.config = newConfig;
+  public updateConfig(newConfig: TConfig | Record<string, unknown>): void {
+    this.config = newConfig as TConfig;
     // 通知所有监听器
     for (const listener of this.configUpdateListeners) {
       try {
-        listener(newConfig);
+        listener(this.config);
       } catch (error) {
         console.error('[ConfigService] Error in config update listener:', error);
       }
@@ -83,7 +83,7 @@ export class ConfigService<TConfig extends Record<string, unknown> = Record<stri
    * 合并配置（用于配置中心增量更新）
    * @param partialConfig - 部分配置对象
    */
-  public mergeConfig(partialConfig: Partial<TConfig>): void {
+  public mergeConfig(partialConfig: Partial<TConfig> | Record<string, unknown>): void {
     this.config = {
       ...this.config,
       ...partialConfig,
@@ -125,6 +125,8 @@ export class ConfigService<TConfig extends Record<string, unknown> = Record<stri
    * @param key - 配置键（如 "db.host"）
    * @param defaultValue - 默认值（可选）
    */
+  public get(key: string): any;
+  public get<T>(key: string, defaultValue?: T): T | undefined;
   public get<T = unknown>(key: string, defaultValue?: T): T | undefined {
     const namespacedKey = this.applyNamespace(key);
     const value = this.getValueByPath(this.config, namespacedKey);
@@ -138,6 +140,8 @@ export class ConfigService<TConfig extends Record<string, unknown> = Record<stri
    * 获取必需的配置值，如果不存在则抛出错误
    * @param key - 配置键
    */
+  public getRequired(key: string): any;
+  public getRequired<T>(key: string): T;
   public getRequired<T = unknown>(key: string): T {
     const value = this.get<T>(key);
     if (value === undefined) {
@@ -191,5 +195,3 @@ export class ConfigService<TConfig extends Record<string, unknown> = Record<stri
     return current;
   }
 }
-
-

package/src/core/application.ts

@@ -490,6 +490,13 @@ export class Application {
     return this.server;
   }
 
+  /**
+   * 获取底层平台服务器实例
+   */
+  public getNativeServer(): unknown {
+    return this.server?.getNativeServer();
+  }
+
   /**
    * 自动注册服务到注册中心
    * 扫描所有使用 @ServiceRegistry 装饰器的控制器，自动注册服务
@@ -639,4 +646,3 @@ export class Application {
     this.signalHandlersInstalled = false;
   }
 }
-

package/src/core/context.ts

@@ -1,5 +1,6 @@
 import { BodyParser } from '../request/body-parser';
 import type { UploadedFileInfo } from '../files';
+import type { Container } from '../di/container';
 import type { BodyInit } from 'bun'
 import { type URLSearchParams, URL } from 'url';
 
@@ -32,7 +33,7 @@ export class Context {
   /**
    * 请求路径
    */
-  public readonly path: string;
+  public path: string;
 
   /**
    * 查询参数
@@ -80,8 +81,11 @@ export class Context {
    */
   public readonly signal: AbortSignal;
 
-  public constructor(request: Request) {
+  public readonly container?: Container;
+
+  public constructor(request: Request, container?: Container) {
     this.request = request;
+    this.container = container;
     this.url = new URL(request.url);
     this.method = request.method;
     this.path = this.url.pathname;
@@ -304,4 +308,3 @@ export class Context {
     return sanitized;
   }
 }
-

package/src/database/sqlite-adapter.ts

@@ -1,6 +1,8 @@
 import type { SqliteV2Config } from './types';
 import { getRuntime } from '../platform/runtime';
 
+type SqliteV2InputConfig = SqliteV2Config | Omit<SqliteV2Config, 'type'>;
+
 export interface DisposableLock {
   [Symbol.dispose](): void;
 }
@@ -47,7 +49,7 @@ export class SqliteAdapter {
   public readonly semaphore: Semaphore;
   private readonly isBun: boolean;
 
-  public constructor(config: SqliteV2Config) {
+  public constructor(config: SqliteV2InputConfig) {
     this.isBun = getRuntime().engine === 'bun';
 
     if (this.isBun) {
@@ -119,7 +121,7 @@ export class SqliteManager {
   private readonly instances = new Map<string, SqliteAdapter>();
   private defaultTenantId = 'default';
 
-  public getOrCreate(tenantId: string, config: SqliteV2Config): SqliteAdapter {
+  public getOrCreate(tenantId: string, config: SqliteV2InputConfig): SqliteAdapter {
     const existing = this.instances.get(tenantId);
     if (existing) {
       return existing;
@@ -167,4 +169,3 @@ export class SqliteManager {
     }
   }
 }
-

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 装饰器的类