@taicode/common-server 1.0.12 → 1.0.13

package/output/redis-queue/redis-queue-consumer.js

@@ -1,11 +1,11 @@
-import { createClient } from 'redis';
 import { catchIt } from '@taicode/common-base';
+import { RedisQueueCommon } from './redis-queue-common';
 /**
  * Redis 队列消费者
  *
  * 只负责消费任务,不包含入队逻辑
  *
- * @template T 任务数据类型
+ * @template K 队列键名类型
  *
  * @example
  * ```ts
@@ -33,76 +33,47 @@ import { catchIt } from '@taicode/common-base';
  * consumer.disconnect()
  * ```
  */
-export class RedisQueueConsumer {
+export class RedisQueueConsumer extends RedisQueueCommon {
     consumerRunning = false;
-    redis = null;
     consumerInterval = null;
     recoveryInterval = null;
     processingTasks = 0; // 当前正在处理的任务数
     config;
-    // 不同状态队列的键名
-    failedQueue;
-    pendingQueue;
-    processingQueue;
-    completedQueue;
     constructor(config) {
         // 验证必填参数
-        if (!config.redisUrl && !config.redisClient) {
-            throw new Error('[RedisQueueConsumer] Either redisUrl or redisClient is required');
-        }
-        if (config.redisUrl && config.redisClient) {
-            throw new Error('[RedisQueueConsumer] Cannot specify both redisUrl and redisClient');
-        }
-        if (!config.queueKey) {
-            throw new Error('[RedisQueueConsumer] queueKey is required');
-        }
-        if (typeof config.queueKey === 'string' && config.queueKey.length < 6) {
-            throw new Error('[RedisQueueConsumer] queueKey must be at least 6 characters long');
-        }
         if (!config.handler) {
             throw new Error('[RedisQueueConsumer] handler is required');
         }
+        // 调用父类构造函数
+        super({
+            redisUrl: config.redisUrl,
+            redisClient: config.redisClient,
+            queueKey: config.queueKey,
+            cleanupDelay: config.cleanupDelay ?? 86400,
+        });
         this.config = {
+            handler: config.handler,
             queueKey: config.queueKey,
             redisUrl: config.redisUrl,
             redisClient: config.redisClient,
-            handler: config.handler,
-            cleanupDelay: config.cleanupDelay ?? 86400, // 24 hours
             maxRetries: config.maxRetries ?? 3,
             concurrency: config.concurrency ?? 1,
             consumerInterval: config.consumerInterval ?? 1000,
-            processingTimeout: config.processingTimeout ?? 60000, // 60 seconds
+            processingTimeout: config.processingTimeout ?? 60000,
+            cleanupDelay: config.cleanupDelay ?? 86400,
         };
-        // 初始化不同状态队列的键名
-        this.failedQueue = `${config.queueKey}:failed`;
-        this.pendingQueue = `${config.queueKey}:pending`;
-        this.completedQueue = `${config.queueKey}:completed`;
-        this.processingQueue = `${config.queueKey}:processing`;
-        // 使用外部客户端或创建新客户端
-        if (config.redisClient) {
-            this.redis = config.redisClient;
-        }
-        else {
-            this.redis = createClient({ url: this.config.redisUrl });
-            // 添加错误处理
-            this.redis.on('error', (err) => {
-                console.error('[RedisQueueConsumer] Redis Client Error:', err);
-            });
-        }
+    }
+    getLogPrefix() {
+        return 'RedisQueueConsumer';
     }
     /**
      * 连接 Redis 并自动启动消费者
      */
     async connect() {
-        if (this.redis && !this.redis.isOpen) {
-            await this.redis.connect().catch((error) => {
-                console.error('[RedisQueueConsumer] Failed to connect to Redis:', error);
-                throw error;
-            });
-            // 连接成功后启动消费者和恢复机制
-            this.startConsumer();
-            this.startRecovery();
-        }
+        await super.connect();
+        // 连接成功后启动消费者和恢复机制
+        this.startConsumer();
+        this.startRecovery();
     }
     /**
      * 断开 Redis 连接并停止消费者
@@ -110,142 +81,7 @@ export class RedisQueueConsumer {
     disconnect() {
         this.stopConsumer();
         this.stopRecovery();
-        if (this.redis && this.redis.isOpen) {
-            this.redis.disconnect().catch((error) => {
-                console.error('[RedisQueueConsumer] Failed to disconnect:', error);
-            });
-        }
-    }
-    /**
-     * 获取任务详情
-     */
-    async getTask(taskId) {
-        if (!this.redis)
-            return null;
-        const taskKey = `${this.config.queueKey}:task:${taskId}`;
-        const taskData = await this.redis.get(taskKey);
-        if (!taskData)
-            return null;
-        return JSON.parse(taskData);
-    }
-    /**
-     * 更新任务状态并移动到对应队列（原子操作）
-     */
-    async applyStatus(taskId, oldStatus, newStatus) {
-        if (!this.redis)
-            return;
-        const task = await this.getTask(taskId);
-        if (!task)
-            return;
-        task.status = newStatus;
-        const taskKey = `${this.config.queueKey}:task:${taskId}`;
-        const oldQueue = this.getQueueByStatus(oldStatus);
-        const newQueue = this.getQueueByStatus(newStatus);
-        if (oldQueue !== newQueue) {
-            // 使用 Lua 脚本确保原子性：更新任务 + 移动队列
-            const script = `
-        redis.call('SETEX', KEYS[1], ARGV[1], ARGV[2])
-        redis.call('LREM', KEYS[2], 0, ARGV[3])
-        redis.call('RPUSH', KEYS[3], ARGV[3])
-        return 1
-      `;
-            await this.redis.eval(script, {
-                keys: [taskKey, oldQueue, newQueue],
-                arguments: [this.config.cleanupDelay.toString(), JSON.stringify(task), taskId],
-            });
-        }
-        else {
-            // 只更新任务数据
-            await this.redis.setEx(taskKey, this.config.cleanupDelay, JSON.stringify(task));
-        }
-    }
-    /**
-     * 根据状态获取对应的队列键
-     */
-    getQueueByStatus(status) {
-        switch (status) {
-            case 'pending': return this.pendingQueue;
-            case 'processing': return this.processingQueue;
-            case 'completed': return this.completedQueue;
-            case 'failed': return this.failedQueue;
-            default: return this.pendingQueue;
-        }
-    }
-    /**
-     * 恢复超时的任务
-     * 检查 processing 队列中的任务，将超时的任务直接标记为失败
-     * 使用 Lua 脚本批量处理以提高性能和原子性
-     */
-    async recoverStalledTasks() {
-        if (!this.redis)
-            return;
-        try {
-            const processingTaskIds = await this.redis.lRange(this.processingQueue, 0, -1);
-            if (processingTaskIds.length === 0) {
-                return;
-            }
-            // 使用 Lua 脚本批量恢复超时任务
-            const batchRecoveryScript = `
-        local processingQueue = KEYS[1]
-        local pendingQueue = KEYS[2]
-        local failedQueue = KEYS[3]
-        local queueKeyPrefix = ARGV[1]
-        local ttl = tonumber(ARGV[2])
-        local processingTimeout = tonumber(ARGV[3])
-        local now = tonumber(ARGV[4])
-        
-        local retryCount = 0
-        local failedCount = 0
-        local cleanupCount = 0
-        
-        -- ARGV[5], ARGV[6], ARGV[7]... 是 taskId
-        for i = 5, #ARGV do
-          local taskId = ARGV[i]
-          local taskKey = queueKeyPrefix .. ':task:' .. taskId
-          local taskData = redis.call('GET', taskKey)
-          
-          if not taskData then
-            -- 任务不存在，从队列中清理
-            redis.call('LREM', processingQueue, 0, taskId)
-            cleanupCount = cleanupCount + 1
-          else
-            local task = cjson.decode(taskData)
-            local processingTime = now - (task.processingStartTime or now)
-            
-            -- 检查是否超时
-            if processingTime > processingTimeout then
-              -- 超时直接标记为失败
-              task.status = 'failed'
-              task.processingStartTime = nil
-              
-              redis.call('SETEX', taskKey, ttl, cjson.encode(task))
-              redis.call('LREM', processingQueue, 0, taskId)
-              redis.call('RPUSH', failedQueue, taskId)
-              failedCount = failedCount + 1
-            end
-          end
-        end
-        
-        return {retryCount, failedCount, cleanupCount}
-      `;
-            const result = await this.redis.eval(batchRecoveryScript, {
-                keys: [this.processingQueue, this.pendingQueue, this.failedQueue],
-                arguments: [
-                    this.config.queueKey,
-                    this.config.cleanupDelay.toString(),
-                    this.config.processingTimeout.toString(),
-                    Date.now().toString(),
-                    ...processingTaskIds,
-                ],
-            });
-            const [retryCount, failedCount, cleanupCount] = result;
-            if (failedCount > 0 || cleanupCount > 0) {
-                console.log(`[RedisQueueConsumer] Recovered tasks - timeout failed: ${failedCount}, cleaned: ${cleanupCount}`);
-            }
-        }
-        catch (error) {
-            console.error('[RedisQueueConsumer] Failed to recover stalled tasks:', error);
-        }
+        super.disconnect();
     }
     /**
      * 处理单个任务
@@ -328,12 +164,12 @@ export class RedisQueueConsumer {
             return;
         }
         // 立即执行一次恢复
-        this.recoverStalledTasks().catch(error => {
+        this.recoverStalled(this.config.processingTimeout).catch(error => {
             console.error('[RedisQueueConsumer] Initial recovery error:', error);
         });
         // 定期检查（每 10 秒检查一次）
         this.recoveryInterval = setInterval(() => {
-            this.recoverStalledTasks().catch(error => {
+            this.recoverStalled(this.config.processingTimeout).catch(error => {
                 console.error('[RedisQueueConsumer] Recovery error:', error);
             });
         }, 10000);

package/output/redis-queue/redis-queue-consumer.test.d.ts

@@ -1,2 +1,7 @@
+declare module './types' {
+    interface RedisQueueRegistry {
+        'test-queue': Record<string, any>;
+    }
+}
 export {};
 //# sourceMappingURL=redis-queue-consumer.test.d.ts.map

package/output/redis-queue/redis-queue-consumer.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis-queue-consumer.test.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-consumer.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"redis-queue-consumer.test.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-consumer.test.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,kBAAkB;QAC1B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAClC;CACF"}

package/output/redis-queue/redis-queue-provider.d.ts

@@ -1,30 +1,29 @@
 import { RedisQueueCommon } from './redis-queue-common';
-import type { RedisQueueProviderConfig, TaskData, Task, QueueStats } from './types';
+import type { RedisQueueRegistry, RedisQueueProviderConfig, Task, QueueStats } from './types';
 /**
  * Redis 队列生产者
  *
  * 只负责任务的入队和队列管理,不包含消费逻辑
  *
- * @template T 任务数据类型
+ * @template K 队列键类型
  *
  * @example
  * ```ts
- * // 使用类型注册表
- * const provider = new RedisQueueProvider<'email-queue'>({
- *   redisUrl: 'redis://localhost:6379',
- *   queueKey: 'email-queue',
+ * // 注册类型后使用
+ * const provider = new RedisQueueProvider({
+ *   queueKey: 'email-queue', // 只能使用注册的键
  * })
  *
- * // 或直接指定类型
- * const provider = new RedisQueueProvider<EmailTask>({
- *   redisUrl: 'redis://localhost:6379',
- *   queueKey: 'email-queue',
+ * await provider.enqueue({
+ *   to: 'user@example.com', // 类型自动推断
+ *   subject: 'Hello',
+ *   body: 'World'
  * })
  * ```
  */
-export declare class RedisQueueProvider<T extends TaskData = TaskData> extends RedisQueueCommon<T> {
+export declare class RedisQueueProvider<K extends keyof RedisQueueRegistry> extends RedisQueueCommon {
     private readonly processingDelay;
-    constructor(config: RedisQueueProviderConfig<string, T>);
+    constructor(config: RedisQueueProviderConfig<K>);
     protected getLogPrefix(): string;
     /**
      * 将任务推入队列(支持单个或批量)
@@ -38,12 +37,12 @@ export declare class RedisQueueProvider<T extends TaskData = TaskData> extends R
      * await provider.enqueue({ id: 'email-123', to: 'user@example.com' })
      * await provider.enqueue({ id: 'email-123', to: 'user@example.com' }) // 会被跳过
      */
-    enqueue(data: T[]): Promise<string[]>;
-    enqueue(data: T): Promise<string>;
+    enqueue(data: RedisQueueRegistry[K]): Promise<string>;
+    enqueue(data: RedisQueueRegistry[K]): Promise<string[]>;
     /**
      * 获取任务详情
      */
-    getTask(taskId: string): Promise<Task<T> | null>;
+    getTask(taskId: string): Promise<Task<RedisQueueRegistry[K]> | null>;
     /**
      * 获取队列统计信息（O(1) 时间复杂度）
      */

package/output/redis-queue/redis-queue-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis-queue-provider.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAGnF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACxF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;gBAE5B,MAAM,EAAE,wBAAwB,CAAC,MAAM,EAAE,CAAC,CAAC;IAWvD,SAAS,CAAC,YAAY,IAAI,MAAM;IAMhC;;;;;;;;;;;OAWG;IACG,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IACrC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAiFvC;;OAEG;IACG,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAWtD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC;IAevC;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAmD7B"}
+{"version":3,"file":"redis-queue-provider.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAE7F;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,MAAM,kBAAkB,CAAE,SAAQ,gBAAgB;IAC1F,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;gBAE5B,MAAM,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAW/C,SAAS,CAAC,YAAY,IAAI,MAAM;IAMhC;;;;;;;;;;;OAWG;IACG,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IACrD,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAiF7D;;OAEG;IACG,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAW1E;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC;IAevC;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAmD7B"}

package/output/redis-queue/redis-queue-provider.js

@@ -5,20 +5,19 @@ import { RedisQueueCommon } from './redis-queue-common';
  *
  * 只负责任务的入队和队列管理,不包含消费逻辑
  *
- * @template T 任务数据类型
+ * @template K 队列键类型
  *
  * @example
  * ```ts
- * // 使用类型注册表
- * const provider = new RedisQueueProvider<'email-queue'>({
- *   redisUrl: 'redis://localhost:6379',
- *   queueKey: 'email-queue',
+ * // 注册类型后使用
+ * const provider = new RedisQueueProvider({
+ *   queueKey: 'email-queue', // 只能使用注册的键
  * })
  *
- * // 或直接指定类型
- * const provider = new RedisQueueProvider<EmailTask>({
- *   redisUrl: 'redis://localhost:6379',
- *   queueKey: 'email-queue',
+ * await provider.enqueue({
+ *   to: 'user@example.com', // 类型自动推断
+ *   subject: 'Hello',
+ *   body: 'World'
  * })
  * ```
  */

package/output/redis-queue/redis-queue-provider.test.d.ts

@@ -1,2 +1,7 @@
+declare module './types' {
+    interface RedisQueueRegistry {
+        'test-queue': Record<string, any>;
+    }
+}
 export {};
 //# sourceMappingURL=redis-queue-provider.test.d.ts.map

package/output/redis-queue/redis-queue-provider.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis-queue-provider.test.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-provider.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"redis-queue-provider.test.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-provider.test.ts"],"names":[],"mappings":"AAKA,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,kBAAkB;QAC1B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAClC;CACF"}

package/output/redis-queue/types.d.ts

@@ -1,4 +1,41 @@
+import { CatchResult } from '@taicode/common-base';
 import type { RedisClientType } from 'redis';
+/**
+ * 队列注册表
+ *
+ * 使用 interface 合并模式来定义队列键和对应的任务数据类型
+ *
+ * @example
+ * ```ts
+ * // 在项目中声明队列类型 (types/redis-queue.d.ts)
+ * declare module '@taicode/common-server' {
+ *   interface RedisQueueRegistry {
+ *     'email-queue': { to: string; subject: string; body: string }
+ *     'sms-queue': { phone: string; message: string }
+ *     'payment-queue': { orderId: string; amount: number }
+ *   }
+ * }
+ *
+ * // 使用时自动类型检查和推断
+ * const provider = new RedisQueueProvider({
+ *   queueKey: 'email-queue', // ✅ 只能使用注册的键
+ * })
+ *
+ * const consumer = new RedisQueueConsumer({
+ *   queueKey: 'email-queue',
+ *   handler: async (data) => {
+ *     // data 自动推断为 { to: string; subject: string; body: string }
+ *     console.log(data.to)
+ *     return catchIt(() => {})
+ *   }
+ * })
+ * ```
+ */
+export interface RedisQueueRegistry {
+    'test': {
+        example: string;
+    };
+}
 /**
  * 任务状态
  */
@@ -6,8 +43,9 @@ export type Status = 'pending' | 'processing' | 'completed' | 'failed';
 /**
  * 任务数据类型,支持可选的 id 字段用于幂等性
  */
-export type TaskData = Record<string, unknown> & {
+export type TaskData = {
     id?: string;
+    [key: string]: any;
 };
 /**
  * 任务数据结构
@@ -37,13 +75,13 @@ export interface QueueStats {
 export interface RedisQueueCommonConfig {
     redisUrl?: string;
     redisClient?: RedisClientType;
-    queueKey: string;
+    queueKey: keyof RedisQueueRegistry;
     cleanupDelay?: number;
 }
 /**
  * 队列生产者配置
  */
-export interface RedisQueueProviderConfig<K extends string = string, T extends TaskData = TaskData> {
+export interface RedisQueueProviderConfig<K extends keyof RedisQueueRegistry = keyof RedisQueueRegistry> {
     redisUrl?: string;
     redisClient?: RedisClientType;
     queueKey: K;
@@ -53,11 +91,11 @@ export interface RedisQueueProviderConfig<K extends string = string, T extends T
 /**
  * 队列消费者配置
  */
-export interface RedisQueueConsumerConfig<K extends string = string, T extends TaskData = TaskData> {
+export interface RedisQueueConsumerConfig<K extends keyof RedisQueueRegistry> {
     redisUrl?: string;
     redisClient?: RedisClientType;
     queueKey: K;
-    handler: TaskHandler<T>;
+    handler: TaskHandler<RedisQueueRegistry[K]>;
     maxRetries?: number;
     concurrency?: number;
     consumerInterval?: number;
@@ -67,15 +105,15 @@ export interface RedisQueueConsumerConfig<K extends string = string, T extends T
 /**
  * 任务处理器函数
  */
-export type TaskHandler<T extends TaskData = TaskData> = (data: T) => Promise<import('@taicode/common-base').CatchResult<unknown, string>>;
+export type TaskHandler<T extends TaskData = TaskData> = (data: T) => Promise<CatchResult<unknown, string>>;
 /**
  * 批量消费者配置
  */
-export interface BatchConsumerConfig<K extends string = string, T extends TaskData = TaskData> {
+export interface BatchConsumerConfig<K extends keyof RedisQueueRegistry> {
     redisUrl?: string;
     redisClient?: RedisClientType;
     queueKey: K;
-    handler: BatchTaskHandler<T>;
+    handler: BatchTaskHandler<RedisQueueRegistry[K]>;
     batchSize?: number;
     maxRetries?: number;
     concurrency?: number;
@@ -86,5 +124,5 @@ export interface BatchConsumerConfig<K extends string = string, T extends TaskDa
 /**
  * 批量任务处理器函数
  */
-export type BatchTaskHandler<T extends TaskData = TaskData> = (dataList: T[]) => Promise<import('@taicode/common-base').CatchResult<unknown, string>>;
+export type BatchTaskHandler<T extends TaskData = TaskData> = (dataList: T[]) => Promise<CatchResult<unknown, string>>;
 //# sourceMappingURL=types.d.ts.map

package/output/redis-queue/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../source/redis-queue/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../source/redis-queue/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taicode/common-server",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "author": "Alain",
   "license": "ISC",
   "description": "",

package/output/logger/logger.d.ts

@@ -1,33 +0,0 @@
-import { FastifyBaseLogger } from 'fastify';
-import { Bindings, ChildLoggerOptions } from 'fastify/types/logger';
-import { LevelWithSilentOrString, LogFn } from 'pino';
-import { LoggerOptions } from '@taicode/common-base/logger';
-export declare class FastifyLogger implements FastifyBaseLogger {
-    private logger;
-    private _msgPrefix?;
-    constructor(options?: LoggerOptions);
-    /**
-     * 创建子 logger
-     */
-    child(bindings: Bindings, options?: ChildLoggerOptions): FastifyBaseLogger;
-    /**
-     * Pino 兼容的 level getter/setter
-     */
-    get level(): LevelWithSilentOrString;
-    set level(newLevel: LevelWithSilentOrString);
-    /**
-     * 获取消息前缀
-     */
-    get msgPrefix(): string | undefined;
-    /**
-     * 日志方法实现
-     */
-    fatal: LogFn;
-    error: LogFn;
-    warn: LogFn;
-    info: LogFn;
-    debug: LogFn;
-    trace: LogFn;
-    silent: LogFn;
-}
-//# sourceMappingURL=logger.d.ts.map

package/output/logger/logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../source/logger/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,EAAE,uBAAuB,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AACrD,OAAO,EAAU,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAEnE,qBAAa,aAAc,YAAW,iBAAiB;IACrD,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,UAAU,CAAC,CAAQ;gBAEf,OAAO,CAAC,EAAE,aAAa;IAInC;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,iBAAiB;IAgB1E;;OAEG;IACH,IAAI,KAAK,IAAI,uBAAuB,CAEnC;IAED,IAAI,KAAK,CAAC,QAAQ,EAAE,uBAAuB,EAK1C;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED;;OAEG;IACH,KAAK,EAAE,KAAK,CAEX;IAED,KAAK,EAAE,KAAK,CAEX;IAED,IAAI,EAAE,KAAK,CAEV;IAED,IAAI,EAAE,KAAK,CAEV;IAED,KAAK,EAAE,KAAK,CAEX;IAED,KAAK,EAAE,KAAK,CAEX;IAED,MAAM,EAAE,KAAK,CAEZ;CACF"}

package/output/logger/logger.js

@@ -1,65 +0,0 @@
-import { Logger } from '@taicode/common-base/logger';
-export class FastifyLogger {
-    logger;
-    _msgPrefix;
-    constructor(options) {
-        this.logger = new Logger(options);
-    }
-    /**
-     * 创建子 logger
-     */
-    child(bindings, options) {
-        const childOptions = {
-            level: options?.level,
-            transports: this.logger.getTransports(),
-        };
-        const childLogger = new FastifyLogger(childOptions);
-        // 如果 bindings 包含 msgPrefix，保存它
-        if (bindings && typeof bindings === 'object' && 'msgPrefix' in bindings) {
-            childLogger._msgPrefix = bindings.msgPrefix;
-        }
-        return childLogger;
-    }
-    /**
-     * Pino 兼容的 level getter/setter
-     */
-    get level() {
-        return this.logger.level;
-    }
-    set level(newLevel) {
-        // 过滤掉 'silent' 因为我们的 Logger 不支持它作为 level
-        if (newLevel !== 'silent') {
-            this.logger.level = newLevel;
-        }
-    }
-    /**
-     * 获取消息前缀
-     */
-    get msgPrefix() {
-        return this._msgPrefix;
-    }
-    /**
-     * 日志方法实现
-     */
-    fatal = (...args) => {
-        this.logger.fatal(...args);
-    };
-    error = (...args) => {
-        this.logger.error(...args);
-    };
-    warn = (...args) => {
-        this.logger.warn(...args);
-    };
-    info = (...args) => {
-        this.logger.info(...args);
-    };
-    debug = (...args) => {
-        this.logger.debug(...args);
-    };
-    trace = (...args) => {
-        this.logger.trace(...args);
-    };
-    silent = (...args) => {
-        this.logger.silent();
-    };
-}

package/output/logger/logger.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=logger.test.d.ts.map

package/output/logger/logger.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.test.d.ts","sourceRoot":"","sources":["../../source/logger/logger.test.ts"],"names":[],"mappings":""}