@taicode/common-server 1.0.12 → 1.0.13

package/output/index.d.ts

@@ -1,2 +1,3 @@
 export * from './schema';
+export * from './redis-queue';
 //# sourceMappingURL=index.d.ts.map

package/output/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"AACA,cAAc,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"AACA,cAAc,UAAU,CAAA;AACxB,cAAc,eAAe,CAAA"}

package/output/index.js

@@ -1,2 +1,3 @@
 // 根 index.ts，统一导出 mock 目录下所有能力
 export * from './schema';
+export * from './redis-queue';

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

@@ -3,4 +3,5 @@ export { RedisQueueConsumer } from './redis-queue-consumer';
 export { RedisBatchConsumer } from './redis-batch-consumer';
 export type { RedisQueueProviderConfig, RedisQueueConsumerConfig, BatchConsumerConfig } from './types';
 export type { TaskData } from './types';
+export type { RedisQueueRegistry } from './types';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/redis-queue/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAG3D,YAAY,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAGtG,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/redis-queue/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAG3D,YAAY,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAGtG,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAGvC,YAAY,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA"}

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

@@ -1,11 +1,11 @@
 import { RedisQueueCommon } from './redis-queue-common';
-import type { BatchConsumerConfig, TaskData, QueueStats } from './types';
+import type { BatchConsumerConfig, QueueStats, RedisQueueRegistry } from './types';
 /**
  * Redis 批量队列消费者
  *
  * 批量消费任务,每次处理多条
  *
- * @template T 任务数据类型
+ * @template K 队列键名类型
  *
  * @example
  * ```ts
@@ -32,13 +32,13 @@ import type { BatchConsumerConfig, TaskData, QueueStats } from './types';
  * consumer.disconnect()
  * ```
  */
-export declare class RedisBatchConsumer<T extends TaskData = TaskData> extends RedisQueueCommon<T> {
+export declare class RedisBatchConsumer<K extends keyof RedisQueueRegistry> extends RedisQueueCommon {
     private consumerRunning;
     private consumerInterval;
     private recoveryInterval;
     private processingBatches;
     private readonly config;
-    constructor(config: BatchConsumerConfig<string, T>);
+    constructor(config: BatchConsumerConfig<K>);
     protected getLogPrefix(): string;
     /**
      * 连接 Redis 并自动启动消费者
@@ -48,11 +48,6 @@ export declare class RedisBatchConsumer<T extends TaskData = TaskData> extends R
      * 断开 Redis 连接并停止消费者
      */
     disconnect(): void;
-    /**
-     * 恢复超时的任务
-     * 检查 processing 队列中的任务，将超时的任务直接标记为失败
-     */
-    private recoverStalledTasks;
     /**
      * 批量处理任务
      */

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

@@ -1 +1 @@
-{"version":3,"file":"redis-batch-consumer.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-batch-consumer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAA4B,QAAQ,EAAQ,UAAU,EAAE,MAAM,SAAS,CAAA;AAExG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACxF,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,iBAAiB,CAAI;IAE7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAOtB;gBAEW,MAAM,EAAE,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC;IA2BlD,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAMlB;;;OAGG;YACW,mBAAmB;IAwDjC;;OAEG;YACW,YAAY;IA4F1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAoBrB;;OAEG;IACH,OAAO,CAAC,YAAY;IAQpB;;OAEG;IACH,OAAO,CAAC,aAAa;IAyErB;;OAEG;IACH,OAAO,CAAC,YAAY;IASpB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC;IAevC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CAMjC"}
+{"version":3,"file":"redis-batch-consumer.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-batch-consumer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAA0B,UAAU,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAE1G;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,MAAM,kBAAkB,CAAE,SAAQ,gBAAgB;IAC1F,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,iBAAiB,CAAI;IAE7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAOtB;gBAEW,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;IA2B1C,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAMlB;;OAEG;YACW,YAAY;IA4F1B;;OAEG;IACH,OAAO,CAAC,aAAa;IAoBrB;;OAEG;IACH,OAAO,CAAC,YAAY;IAQpB;;OAEG;IACH,OAAO,CAAC,aAAa;IAyErB;;OAEG;IACH,OAAO,CAAC,YAAY;IASpB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC;IAevC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CAMjC"}

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

@@ -5,7 +5,7 @@ import { RedisQueueCommon } from './redis-queue-common';
  *
  * 批量消费任务,每次处理多条
  *
- * @template T 任务数据类型
+ * @template K 队列键名类型
  *
  * @example
  * ```ts
@@ -82,58 +82,6 @@ export class RedisBatchConsumer extends RedisQueueCommon {
         this.stopRecovery();
         super.disconnect();
     }
-    /**
-     * 恢复超时的任务
-     * 检查 processing 队列中的任务，将超时的任务直接标记为失败
-     */
-    async recoverStalledTasks() {
-        if (!this.redis)
-            return;
-        try {
-            const processingTaskIds = await this.redis.lRange(this.processingQueue, 0, -1);
-            if (processingTaskIds.length === 0) {
-                return;
-            }
-            const now = Date.now();
-            let recoveredCount = 0;
-            for (const taskId of processingTaskIds) {
-                const task = await this.getTask(taskId);
-                if (!task) {
-                    // 任务不存在，从队列中移除
-                    await this.redis.lRem(this.processingQueue, 0, taskId);
-                    continue;
-                }
-                // 检查是否超时
-                const processingTime = now - (task.processingStartTime || now);
-                if (processingTime > this.config.processingTimeout) {
-                    console.log(`[RedisBatchConsumer] Task timeout: ${taskId} (processing time: ${processingTime}ms)`);
-                    const taskKey = `${this.queueKey}:task:${taskId}`;
-                    // 超时直接标记为失败
-                    task.status = 'failed';
-                    task.processingStartTime = undefined;
-                    // 使用 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, this.processingQueue, this.failedQueue],
-                        arguments: [this.cleanupDelay.toString(), JSON.stringify(task), taskId],
-                    });
-                    console.error(`[RedisBatchConsumer] Task ${taskId} failed after timeout`);
-                    recoveredCount++;
-                }
-            }
-            if (recoveredCount > 0) {
-                console.log(`[RedisBatchConsumer] Recovered ${recoveredCount} timeout tasks`);
-            }
-        }
-        catch (error) {
-            console.error('[RedisBatchConsumer] Failed to recover stalled tasks:', error);
-        }
-    }
     /**
      * 批量处理任务
      */
@@ -230,12 +178,12 @@ export class RedisBatchConsumer extends RedisQueueCommon {
             return;
         }
         // 立即执行一次恢复
-        this.recoverStalledTasks().catch(error => {
+        this.recoverStalled(this.config.processingTimeout).catch(error => {
             console.error('[RedisBatchConsumer] Initial recovery error:', error);
         });
         // 定期检查（每 10 秒检查一次）
         this.recoveryInterval = setInterval(() => {
-            this.recoverStalledTasks().catch(error => {
+            this.recoverStalled(this.config.processingTimeout).catch(error => {
                 console.error('[RedisBatchConsumer] Recovery error:', error);
             });
         }, 10000);

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

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

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

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

@@ -1,10 +1,10 @@
 import { RedisClientType } from 'redis';
-import type { Status, TaskData, Task, RedisQueueCommonConfig } from './types';
+import type { Status, Task, RedisQueueCommonConfig } from './types';
 /**
  * Redis 队列基础类
  * 封装 Provider 和 Consumer 的公共逻辑
  */
-export declare abstract class RedisQueueCommon<T extends TaskData = TaskData> {
+export declare abstract class RedisQueueCommon {
     protected redis: RedisClientType | null;
     protected isExternalRedis: boolean;
     protected readonly queueKey: string;
@@ -30,7 +30,7 @@ export declare abstract class RedisQueueCommon<T extends TaskData = TaskData> {
     /**
      * 获取任务详情
      */
-    protected getTask(taskId: string): Promise<Task<T> | null>;
+    protected getTask(taskId: string): Promise<Task | null>;
     /**
      * 根据状态获取对应的队列键
      */
@@ -57,5 +57,17 @@ export declare abstract class RedisQueueCommon<T extends TaskData = TaskData> {
      * 健康检查
      */
     health(): Promise<boolean>;
+    /**
+     * 恢复超时的任务
+     * 检查 processing 队列中的任务，将超时的任务直接标记为失败
+     * 使用 Lua 脚本批量处理以提高性能和原子性
+     *
+     * @param processingTimeout 处理超时时间（毫秒）
+     * @returns 恢复的任务统计 {timeoutFailed: number, cleaned: number}
+     */
+    protected recoverStalled(processingTimeout: number): Promise<{
+        timeoutFailed: number;
+        cleaned: number;
+    }>;
 }
 //# sourceMappingURL=redis-queue-common.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"redis-queue-common.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,eAAe,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAA;AAE7E;;;GAGG;AACH,8BAAsB,gBAAgB,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IAClE,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAO;IAC9C,SAAS,CAAC,eAAe,EAAE,OAAO,CAAQ;IAE1C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACnC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACpC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAGvC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IACtC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IACvC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAA;IAC1C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;gBAE7B,MAAM,EAAE,sBAAsB;IAwC1C;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,IAAI,MAAM;IAEzC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAalB;;OAEG;cACa,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAWhE;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAUlD;;OAEG;cACa,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqChG;;;OAGG;cACa,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqD1G;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAevG;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CASjC"}
+{"version":3,"file":"redis-queue-common.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,eAAe,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,KAAK,EAAE,MAAM,EAAY,IAAI,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAA;AAE7E;;;GAGG;AACH,8BAAsB,gBAAgB;IACpC,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAO;IAC9C,SAAS,CAAC,eAAe,EAAE,OAAO,CAAQ;IAE1C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACnC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACpC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IAGvC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IACtC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;IACvC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAA;IAC1C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;gBAE7B,MAAM,EAAE,sBAAsB;IAwC1C;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,IAAI,MAAM;IAEzC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAalB;;OAEG;cACa,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAW7D;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAUlD;;OAEG;cACa,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqChG;;;OAGG;cACa,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqD1G;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAevG;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAUhC;;;;;;;OAOG;cACa,cAAc,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CA4E/G"}

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

@@ -219,4 +219,84 @@ export class RedisQueueCommon {
             return false;
         }
     }
+    /**
+     * 恢复超时的任务
+     * 检查 processing 队列中的任务，将超时的任务直接标记为失败
+     * 使用 Lua 脚本批量处理以提高性能和原子性
+     *
+     * @param processingTimeout 处理超时时间（毫秒）
+     * @returns 恢复的任务统计 {timeoutFailed: number, cleaned: number}
+     */
+    async recoverStalled(processingTimeout) {
+        if (!this.redis || !this.redis.isOpen) {
+            return { timeoutFailed: 0, cleaned: 0 };
+        }
+        try {
+            const processingTaskIds = await this.redis.lRange(this.processingQueue, 0, -1);
+            if (processingTaskIds.length === 0) {
+                return { timeoutFailed: 0, cleaned: 0 };
+            }
+            // 使用 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.queueKey,
+                    this.cleanupDelay.toString(),
+                    processingTimeout.toString(),
+                    Date.now().toString(),
+                    ...processingTaskIds,
+                ],
+            });
+            const [, failedCount, cleanupCount] = result;
+            return { timeoutFailed: failedCount, cleaned: cleanupCount };
+        }
+        catch (error) {
+            const logPrefix = this.getLogPrefix();
+            console.error(`[${logPrefix}] Failed to recover stalled tasks:`, error);
+            return { timeoutFailed: 0, cleaned: 0 };
+        }
+    }
 }

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

@@ -1,2 +1,19 @@
+declare module './types' {
+    interface RedisQueueRegistry {
+        'test-queue': Record<string, any>;
+        'test-queue-error': Record<string, any>;
+        'short': Record<string, any>;
+        'valid-key': Record<string, any>;
+        'test-default': Record<string, any>;
+        'test-custom': Record<string, any>;
+        '': Record<string, any>;
+        'my-queue': Record<string, any>;
+        'test-error': Record<string, any>;
+        'test-bad': Record<string, any>;
+        'queue-one': Record<string, any>;
+        'queue-two': Record<string, any>;
+        [key: `test:reconnect:${number}`]: Record<string, any>;
+    }
+}
 export {};
 //# sourceMappingURL=redis-queue-common.test.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"redis-queue-common.test.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-common.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"redis-queue-common.test.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-common.test.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,kBAAkB;QAC1B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QACjC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QACvC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC5B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAChC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QACnC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAClC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAChC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAChC,CAAC,GAAG,EAAE,kBAAkB,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KACvD;CACF"}

package/output/redis-queue/redis-queue-common.test.js

@@ -8,26 +8,26 @@ class TestRedisQueueCommon extends RedisQueueCommon {
     }
     // 暴露 protected 方法用于测试
     testGetTask(taskId) {
-        return this['getTask'](taskId);
+        return this.getTask(taskId);
     }
     testGetQueueByStatus(status) {
-        return this['getQueueByStatus'](status);
+        return this.getQueueByStatus(status);
     }
     async testApplyStatus(taskId, oldStatus, newStatus) {
-        return this['applyStatus'](taskId, oldStatus, newStatus);
+        return this.applyStatus(taskId, oldStatus, newStatus);
     }
     getRedisClient() {
-        return this['redis'];
+        return this.redis;
     }
     getConfig() {
         return {
-            queueKey: this['queueKey'],
-            redisUrl: this['redisUrl'],
-            cleanupDelay: this['cleanupDelay'],
-            pendingQueue: this['pendingQueue'],
-            processingQueue: this['processingQueue'],
-            completedQueue: this['completedQueue'],
-            failedQueue: this['failedQueue'],
+            queueKey: this.queueKey,
+            redisUrl: this.redisUrl,
+            cleanupDelay: this.cleanupDelay,
+            pendingQueue: this.pendingQueue,
+            processingQueue: this.processingQueue,
+            completedQueue: this.completedQueue,
+            failedQueue: this.failedQueue,
         };
     }
 }

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

@@ -1,10 +1,11 @@
-import type { RedisQueueConsumerConfig, TaskData, QueueStats } from './types';
+import { RedisQueueCommon } from './redis-queue-common';
+import type { RedisQueueConsumerConfig, RedisQueueRegistry, QueueStats } from './types';
 /**
  * Redis 队列消费者
  *
  * 只负责消费任务,不包含入队逻辑
  *
- * @template T 任务数据类型
+ * @template K 队列键名类型
  *
  * @example
  * ```ts
@@ -32,18 +33,14 @@ import type { RedisQueueConsumerConfig, TaskData, QueueStats } from './types';
  * consumer.disconnect()
  * ```
  */
-export declare class RedisQueueConsumer<T extends TaskData = TaskData> {
+export declare class RedisQueueConsumer<K extends keyof RedisQueueRegistry> extends RedisQueueCommon {
     private consumerRunning;
-    private redis;
     private consumerInterval;
     private recoveryInterval;
     private processingTasks;
     private readonly config;
-    private readonly failedQueue;
-    private readonly pendingQueue;
-    private readonly processingQueue;
-    private readonly completedQueue;
-    constructor(config: RedisQueueConsumerConfig<string, T>);
+    constructor(config: RedisQueueConsumerConfig<K>);
+    protected getLogPrefix(): string;
     /**
      * 连接 Redis 并自动启动消费者
      */
@@ -52,24 +49,6 @@ export declare class RedisQueueConsumer<T extends TaskData = TaskData> {
      * 断开 Redis 连接并停止消费者
      */
     disconnect(): void;
-    /**
-     * 获取任务详情
-     */
-    private getTask;
-    /**
-     * 更新任务状态并移动到对应队列（原子操作）
-     */
-    private applyStatus;
-    /**
-     * 根据状态获取对应的队列键
-     */
-    private getQueueByStatus;
-    /**
-     * 恢复超时的任务
-     * 检查 processing 队列中的任务，将超时的任务直接标记为失败
-     * 使用 Lua 脚本批量处理以提高性能和原子性
-     */
-    private recoverStalledTasks;
     /**
      * 处理单个任务
      */

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

@@ -1 +1 @@
-{"version":3,"file":"redis-queue-consumer.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-consumer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,wBAAwB,EAAuB,QAAQ,EAAQ,UAAU,EAAE,MAAM,SAAS,CAAA;AAExG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IAC3D,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,eAAe,CAAI;IAE3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAOtB;IAGD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;IACxC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;gBAE3B,MAAM,EAAE,wBAAwB,CAAC,MAAM,EAAE,CAAC,CAAC;IAgDvD;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAY9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAUlB;;OAEG;YACW,OAAO;IAWrB;;OAEG;YACW,WAAW;IA8BzB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;;OAIG;YACW,mBAAmB;IA2EjC;;OAEG;YACW,WAAW;IA4EzB;;OAEG;IACH,OAAO,CAAC,aAAa;IAoBrB;;OAEG;IACH,OAAO,CAAC,YAAY;IAQpB;;OAEG;IACH,OAAO,CAAC,aAAa;IA4ErB;;OAEG;IACH,OAAO,CAAC,YAAY;IASpB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC;IAevC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CAMjC"}
+{"version":3,"file":"redis-queue-consumer.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-consumer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAe,kBAAkB,EAAgB,UAAU,EAAE,MAAM,SAAS,CAAA;AAElH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,MAAM,kBAAkB,CAAE,SAAQ,gBAAgB;IAC1F,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,eAAe,CAAI;IAE3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAUtB;gBAEW,MAAM,EAAE,wBAAwB,CAAC,CAAC,CAAC;IA2B/C,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;OAEG;IACH,UAAU,IAAI,IAAI;IAMlB;;OAEG;YACW,WAAW;IA4EzB;;OAEG;IACH,OAAO,CAAC,aAAa;IAoBrB;;OAEG;IACH,OAAO,CAAC,YAAY;IAQpB;;OAEG;IACH,OAAO,CAAC,aAAa;IA4ErB;;OAEG;IACH,OAAO,CAAC,YAAY;IASpB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC;IAevC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CAMjC"}