@taicode/common-server 1.0.11 → 1.0.13

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

@@ -0,0 +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,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

@@ -0,0 +1,187 @@
+import { randomUUID } from 'node:crypto';
+import { RedisQueueCommon } from './redis-queue-common';
+/**
+ * Redis 队列生产者
+ *
+ * 只负责任务的入队和队列管理,不包含消费逻辑
+ *
+ * @template K 队列键类型
+ *
+ * @example
+ * ```ts
+ * // 注册类型后使用
+ * const provider = new RedisQueueProvider({
+ *   queueKey: 'email-queue', // 只能使用注册的键
+ * })
+ *
+ * await provider.enqueue({
+ *   to: 'user@example.com', // 类型自动推断
+ *   subject: 'Hello',
+ *   body: 'World'
+ * })
+ * ```
+ */
+export class RedisQueueProvider extends RedisQueueCommon {
+    processingDelay;
+    constructor(config) {
+        super({
+            redisUrl: config.redisUrl,
+            redisClient: config.redisClient,
+            queueKey: config.queueKey,
+            cleanupDelay: config.cleanupDelay,
+        });
+        this.processingDelay = config.processingDelay ?? 0; // 默认立即执行
+    }
+    getLogPrefix() {
+        return 'RedisQueueProvider';
+    }
+    async enqueue(data) {
+        if (!this.redis) {
+            console.warn('[RedisQueueProvider] Redis not available, skipping task enqueue');
+            return Array.isArray(data) ? [] : '';
+        }
+        // 统一处理为数组
+        const dataList = Array.isArray(data) ? data : [data];
+        const taskIds = [];
+        const tasks = [];
+        // 准备任务数据
+        for (const item of dataList) {
+            const customId = item.id;
+            const taskId = customId || randomUUID();
+            const task = {
+                id: taskId,
+                data: item,
+                retryCount: 0,
+                maxRetries: 3, // 默认值,实际由 Consumer 控制
+                createdTime: new Date().toISOString(),
+                status: 'pending',
+                ...(this.processingDelay > 0 && { delayUntil: Date.now() + this.processingDelay }),
+            };
+            taskIds.push(taskId);
+            tasks.push(task);
+        }
+        // 使用 Lua 脚本批量原子化入队
+        const batchEnqueueScript = `
+      local pendingQueue = KEYS[1]
+      local ttl = tonumber(ARGV[1])
+      local queueKeyPrefix = ARGV[2]
+      local successCount = 0
+      
+      -- ARGV[3], ARGV[5], ARGV[7]... 是 taskId
+      -- ARGV[4], ARGV[6], ARGV[8]... 是 taskData
+      for i = 3, #ARGV, 2 do
+        local taskId = ARGV[i]
+        local taskData = ARGV[i + 1]
+        local taskKey = queueKeyPrefix .. ':task:' .. taskId
+        
+        -- 检查任务是否已存在
+        local exists = redis.call('EXISTS', taskKey)
+        if exists == 0 then
+          -- 原子化操作: 创建任务 + 推入队列
+          redis.call('SETEX', taskKey, ttl, taskData)
+          redis.call('RPUSH', pendingQueue, taskId)
+          successCount = successCount + 1
+        end
+      end
+      
+      return successCount
+    `;
+        // 构建参数数组
+        const args = [this.cleanupDelay.toString(), this.queueKey];
+        for (let i = 0; i < tasks.length; i++) {
+            args.push(taskIds[i]);
+            args.push(JSON.stringify(tasks[i]));
+        }
+        const successCount = await this.redis.eval(batchEnqueueScript, {
+            keys: [this.pendingQueue],
+            arguments: args,
+        });
+        if (successCount < tasks.length) {
+            console.log(`[RedisQueueProvider] ${tasks.length - successCount} tasks already exist, skipped`);
+        }
+        if (successCount > 0) {
+            console.log(`[RedisQueueProvider] Enqueued ${successCount} tasks`);
+        }
+        // 返回单个 ID 或 ID 数组
+        return Array.isArray(data) ? taskIds : taskIds[0];
+    }
+    /**
+     * 获取任务详情
+     */
+    async getTask(taskId) {
+        if (!this.redis)
+            return null;
+        const taskKey = `${this.queueKey}:task:${taskId}`;
+        const taskData = await this.redis.get(taskKey);
+        if (!taskData)
+            return null;
+        return JSON.parse(taskData);
+    }
+    /**
+     * 获取队列统计信息（O(1) 时间复杂度）
+     */
+    async statistics() {
+        if (!this.redis) {
+            return { pending: 0, processing: 0, completed: 0, failed: 0 };
+        }
+        const [pending, processing, completed, failed] = await Promise.all([
+            this.redis.lLen(this.pendingQueue),
+            this.redis.lLen(this.processingQueue),
+            this.redis.lLen(this.completedQueue),
+            this.redis.lLen(this.failedQueue),
+        ]);
+        return { pending, processing, completed, failed };
+    }
+    /**
+     * 清空所有队列和任务数据
+     * 使用 Lua 脚本确保原子性
+     */
+    async clear() {
+        if (!this.redis)
+            return;
+        // 使用 Lua 脚本原子化清空队列和任务
+        const clearScript = `
+      local queueKeyPrefix = ARGV[1]
+      local pendingQueue = KEYS[1]
+      local processingQueue = KEYS[2]
+      local completedQueue = KEYS[3]
+      local failedQueue = KEYS[4]
+      
+      -- 获取所有队列中的任务 ID
+      local allTaskIds = {}
+      local pendingIds = redis.call('LRANGE', pendingQueue, 0, -1)
+      local processingIds = redis.call('LRANGE', processingQueue, 0, -1)
+      local completedIds = redis.call('LRANGE', completedQueue, 0, -1)
+      local failedIds = redis.call('LRANGE', failedQueue, 0, -1)
+      
+      -- 合并所有任务 ID
+      for _, id in ipairs(pendingIds) do table.insert(allTaskIds, id) end
+      for _, id in ipairs(processingIds) do table.insert(allTaskIds, id) end
+      for _, id in ipairs(completedIds) do table.insert(allTaskIds, id) end
+      for _, id in ipairs(failedIds) do table.insert(allTaskIds, id) end
+      
+      -- 删除所有任务数据
+      for _, taskId in ipairs(allTaskIds) do
+        local taskKey = queueKeyPrefix .. ':task:' .. taskId
+        redis.call('DEL', taskKey)
+      end
+      
+      -- 删除所有队列
+      redis.call('DEL', pendingQueue, processingQueue, completedQueue, failedQueue)
+      
+      return #allTaskIds
+    `;
+        const deletedCount = await this.redis.eval(clearScript, {
+            keys: [
+                this.pendingQueue,
+                this.processingQueue,
+                this.completedQueue,
+                this.failedQueue,
+            ],
+            arguments: [this.queueKey],
+        });
+        if (deletedCount > 0) {
+            console.log(`[RedisQueueProvider] Cleared ${deletedCount} tasks`);
+        }
+    }
+}

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

@@ -0,0 +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

@@ -0,0 +1 @@
+{"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/redis-queue-provider.test.js

@@ -0,0 +1,114 @@
+import { describe, it, expect, afterEach } from 'vitest';
+import { RedisQueueProvider } from './redis-queue-provider';
+const REDIS_URL = process.env.REDIS_URL || 'redis://localhost:6379';
+describe('RedisQueueProvider', () => {
+    const providers = [];
+    afterEach(async () => {
+        for (const provider of providers) {
+            try {
+                await provider.clear();
+            }
+            catch (error) {
+                // 忽略清理错误
+            }
+            provider.disconnect();
+        }
+        providers.length = 0;
+    });
+    const createProvider = (options) => {
+        const uniqueKey = `test:provider:${Date.now()}:${Math.random()}`;
+        const provider = new RedisQueueProvider({
+            redisUrl: REDIS_URL,
+            queueKey: uniqueKey,
+            ...options,
+        });
+        providers.push(provider);
+        return provider;
+    };
+    describe('连接管理', () => {
+        it('应该成功连接到 Redis', async () => {
+            const provider = createProvider();
+            await provider.connect();
+            const health = await provider.health();
+            expect(health).toBe(true);
+        });
+    });
+    describe('任务入队', () => {
+        it('应该成功将任务推入队列', async () => {
+            const provider = createProvider();
+            await provider.connect();
+            const taskId = await provider.enqueue({ foo: 'bar' });
+            expect(taskId).toBeTruthy();
+            const stats = await provider.statistics();
+            expect(stats.pending).toBe(1);
+        });
+        it('应该能够批量入队任务', async () => {
+            const provider = createProvider();
+            await provider.connect();
+            const taskIds = await provider.enqueue([
+                { value: 1 },
+                { value: 2 },
+                { value: 3 },
+            ]);
+            expect(taskIds).toHaveLength(3);
+            const stats = await provider.statistics();
+            expect(stats.pending).toBe(3);
+        });
+        it('入队的任务应该包含正确的元数据', async () => {
+            const provider = createProvider();
+            await provider.connect();
+            const taskId = await provider.enqueue({ test: 'data', number: 42 });
+            const task = await provider.getTask(taskId);
+            expect(task).toBeTruthy();
+            expect(task?.id).toBe(taskId);
+            expect(task?.data).toEqual({ test: 'data', number: 42 });
+            expect(task?.status).toBe('pending');
+            expect(task?.retryCount).toBe(0);
+        });
+    });
+    describe('队列操作', () => {
+        it('应该正确返回队列统计信息', async () => {
+            const provider = createProvider();
+            await provider.connect();
+            await provider.enqueue([
+                { test: '1' },
+                { test: '2' },
+                { test: '3' },
+            ]);
+            const stats = await provider.statistics();
+            expect(stats.pending).toBe(3);
+            expect(stats.processing).toBe(0);
+            expect(stats.completed).toBe(0);
+            expect(stats.failed).toBe(0);
+        });
+        it('应该能够清空队列', async () => {
+            const provider = createProvider();
+            await provider.connect();
+            await provider.enqueue([{ data: 1 }, { data: 2 }]);
+            await provider.clear();
+            const stats = await provider.statistics();
+            expect(stats.pending).toBe(0);
+        });
+    });
+    describe('幂等性', () => {
+        it('应该支持在 data 中指定 id 来实现幂等性', async () => {
+            const provider = createProvider();
+            await provider.connect();
+            await provider.enqueue({ id: 'unique-1', value: 1 });
+            await provider.enqueue({ id: 'unique-1', value: 2 });
+            await provider.enqueue({ id: 'unique-2', value: 3 });
+            const stats = await provider.statistics();
+            expect(stats.pending).toBe(2); // 只有 unique-1 和 unique-2
+        });
+    });
+    describe('延迟处理', () => {
+        it('应该支持延迟入队任务', async () => {
+            const provider = createProvider({ processingDelay: 2000 });
+            await provider.connect();
+            const taskId = await provider.enqueue({ test: true });
+            const task = await provider.getTask(taskId);
+            expect(task?.delayUntil).toBeDefined();
+            expect(task?.delayUntil).toBeGreaterThan(Date.now());
+        });
+    });
+});

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

@@ -1,3 +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;
+    };
+}
 /**
  * 任务状态
  */
@@ -5,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;
 };
 /**
  * 任务数据结构
@@ -31,40 +70,59 @@ export interface QueueStats {
     processing: number;
 }
 /**
- * 任务队列配置
+ * Redis 队列基础配置
  */
-export interface TaskQueueConfig<T extends TaskData = TaskData> {
-    redisUrl: string;
-    queueKey: string;
-    handler: TaskHandler<T>;
-    maxRetries?: number;
-    concurrency?: number;
+export interface RedisQueueCommonConfig {
+    redisUrl?: string;
+    redisClient?: RedisClientType;
+    queueKey: keyof RedisQueueRegistry;
+    cleanupDelay?: number;
+}
+/**
+ * 队列生产者配置
+ */
+export interface RedisQueueProviderConfig<K extends keyof RedisQueueRegistry = keyof RedisQueueRegistry> {
+    redisUrl?: string;
+    redisClient?: RedisClientType;
+    queueKey: K;
     cleanupDelay?: number;
     processingDelay?: number;
+}
+/**
+ * 队列消费者配置
+ */
+export interface RedisQueueConsumerConfig<K extends keyof RedisQueueRegistry> {
+    redisUrl?: string;
+    redisClient?: RedisClientType;
+    queueKey: K;
+    handler: TaskHandler<RedisQueueRegistry[K]>;
+    maxRetries?: number;
+    concurrency?: number;
     consumerInterval?: number;
     processingTimeout?: number;
+    cleanupDelay?: number;
 }
 /**
- * 批量任务队列配置
+ * 任务处理器函数
  */
-export interface BatchTaskQueueConfig<T extends TaskData = TaskData> {
-    redisUrl: string;
-    queueKey: string;
-    handler: BatchTaskHandler<T>;
+export type TaskHandler<T extends TaskData = TaskData> = (data: T) => Promise<CatchResult<unknown, string>>;
+/**
+ * 批量消费者配置
+ */
+export interface BatchConsumerConfig<K extends keyof RedisQueueRegistry> {
+    redisUrl?: string;
+    redisClient?: RedisClientType;
+    queueKey: K;
+    handler: BatchTaskHandler<RedisQueueRegistry[K]>;
     batchSize?: number;
     maxRetries?: number;
     concurrency?: number;
     cleanupDelay?: number;
-    processingDelay?: number;
     consumerInterval?: number;
     processingTimeout?: number;
 }
-/**
- * 任务处理器函数
- */
-export type TaskHandler<T extends TaskData = TaskData> = (data: T) => Promise<import('@taicode/common-base').CatchResult<unknown, string>>;
 /**
  * 批量任务处理器函数
  */
-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":"AAAA;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,QAAQ,CAAA;AAEtE;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhE;;GAEG;AACH,MAAM,WAAW,IAAI,CAAC,CAAC,GAAG,QAAQ;IAChC,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,CAAC,CAAA;IACP,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IAC5D,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACjE,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,sBAAsB,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;AAE1I;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,OAAO,sBAAsB,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA"}
+{"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.11",
+  "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":""}

package/output/logger/logger.test.js

@@ -1,87 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { FastifyLogger } from './logger';
-describe('FastifyLogger', () => {
-    let printMock;
-    let loggerOptions;
-    beforeEach(() => {
-        printMock = vi.fn();
-        loggerOptions = {
-            print: printMock,
-            level: 'info'
-        };
-    });
-    it('应该创建一个 FastifyLogger 实例', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        expect(logger).toBeInstanceOf(FastifyLogger);
-    });
-    it('应该支持所有日志级别方法', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        logger.trace('trace message');
-        logger.debug('debug message');
-        logger.info('info message');
-        logger.warn('warn message');
-        logger.error('error message');
-        logger.fatal('fatal message');
-        // 由于默认级别是 info，trace 和 debug 不应该被调用
-        expect(printMock).not.toHaveBeenCalledWith('trace', 'trace message');
-        expect(printMock).not.toHaveBeenCalledWith('debug', 'debug message');
-        expect(printMock).toHaveBeenCalledWith('info', 'info message');
-        expect(printMock).toHaveBeenCalledWith('warn', 'warn message');
-        expect(printMock).toHaveBeenCalledWith('error', 'error message');
-        expect(printMock).toHaveBeenCalledWith('fatal', 'fatal message');
-    });
-    it('应该支持 silent 方法', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        // silent 方法不应该抛出错误
-        expect(() => logger.silent('test')).not.toThrow();
-        // silent 方法不应该调用 print
-        expect(printMock).not.toHaveBeenCalled();
-    });
-    it('应该支持 level getter/setter', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        expect(logger.level).toBe('info');
-        logger.level = 'warn';
-        expect(logger.level).toBe('warn');
-        // 验证新级别生效
-        printMock.mockClear();
-        logger.info('info message');
-        logger.warn('warn message');
-        expect(printMock).not.toHaveBeenCalledWith('info', 'info message');
-        expect(printMock).toHaveBeenCalledWith('warn', 'warn message');
-    });
-    it('应该忽略 silent 级别设置', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        logger.level = 'silent';
-        // silent 不是有效的 logger 级别，所以应该保持原来的级别
-        expect(logger.level).toBe('info');
-    });
-    it('应该支持创建子 logger', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        const childLogger = logger.child({ requestId: '123' });
-        expect(childLogger).toBeInstanceOf(FastifyLogger);
-        expect(childLogger).not.toBe(logger);
-    });
-    it('应该在子 logger 中保存 msgPrefix', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        const childLogger = logger.child({ msgPrefix: '[Request] ' });
-        expect(childLogger.msgPrefix).toBe('[Request] ');
-    });
-    it('子 logger 应该继承父 logger 的配置', () => {
-        const logger = new FastifyLogger({ ...loggerOptions, level: 'warn' });
-        const childLogger = logger.child({}, { level: 'debug' });
-        // 子 logger 应该使用传入的 level
-        expect(childLogger.level).toBe('debug');
-    });
-    it('应该支持多个参数的日志输出', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        logger.info('message');
-        expect(printMock).toHaveBeenCalledWith('info', 'message');
-    });
-    it('应该正确处理错误对象', () => {
-        const logger = new FastifyLogger(loggerOptions);
-        const error = new Error('test error');
-        logger.error(error);
-        // 验证 print 被调用，不验证具体的格式化内容
-        expect(printMock).toHaveBeenCalledWith('error', expect.stringContaining('test error'));
-    });
-});