@taicode/common-server 1.0.12 → 1.0.14

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

@@ -0,0 +1,320 @@
+import { catchIt } from '@taicode/common-base';
+import { RedisQueueCommon } from './redis-queue-common';
+/**
+ * Redis 批量队列消费者
+ *
+ * 批量消费任务,每次处理多条
+ *
+ * @template K 队列键名类型
+ *
+ * @example
+ * ```ts
+ * const consumer = new RedisQueueBatchConsumer('email-queue', {
+ *   redisUrl: 'redis://localhost:6379',
+ *   batchSize: 50,
+ *   handler: async (dataList) => {
+ *     await sendEmailsBatch(dataList.map(d => d.to))
+ *     return catchIt(() => {})
+ *   }
+ * })
+ *
+ * await consumer.connect() // 自动开始消费
+ *
+ * // 获取统计信息
+ * const stats = await consumer.statistics()
+ *
+ * // 停止消费
+ * consumer.disconnect()
+ * ```
+ */
+export class RedisQueueBatchConsumer extends RedisQueueCommon {
+    consumerRunning = false;
+    consumerInterval = null;
+    recoveryInterval = null;
+    processingBatches = 0; // 当前正在处理的批次数
+    processingPromises = new Set(); // 跟踪所有正在处理的批次
+    config;
+    constructor(queueKey, config) {
+        // 验证必填参数
+        if (!config.handler) {
+            throw new Error('[RedisQueueBatchConsumer] handler is required');
+        }
+        // 调用父类构造函数
+        super(queueKey, {
+            redisUrl: config.redisUrl,
+            redisClient: config.redisClient,
+            cleanupDelay: config.cleanupDelay ?? 86400,
+        });
+        this.config = {
+            handler: config.handler,
+            batchSize: config.batchSize ?? 10,
+            maxRetries: config.maxRetries ?? 3,
+            concurrency: config.concurrency ?? 1,
+            consumerInterval: config.consumerInterval ?? 1000,
+            processingTimeout: config.processingTimeout ?? 60000, // 60 seconds
+        };
+    }
+    getLogPrefix() {
+        return 'RedisQueueBatchConsumer';
+    }
+    /**
+     * 连接 Redis 并自动启动消费者
+     */
+    async connect() {
+        await super.connect();
+        // 连接成功后启动消费者和恢复机制
+        this.startConsumer();
+        this.startRecovery();
+    }
+    /**
+     * 断开 Redis 连接并停止消费者
+     * 会等待所有正在处理的批次完成后再断开连接
+     */
+    async disconnect() {
+        // 先停止消费者和恢复机制，不再接受新任务
+        this.stopConsumer();
+        this.stopRecovery();
+        // 等待所有正在处理的批次完成
+        if (this.processingPromises.size > 0) {
+            console.log(`[RedisQueueBatchConsumer] Waiting for ${this.processingPromises.size} batches to complete...`);
+            await Promise.allSettled(this.processingPromises);
+            console.log(`[RedisQueueBatchConsumer] All batches completed`);
+        }
+        // 最后断开 Redis 连接
+        super.disconnect();
+    }
+    /**
+     * 批量处理任务
+     */
+    async processBatch(taskIds) {
+        this.processingBatches++;
+        // 创建一个 Promise 来跟踪这个批次的处理过程
+        const batchPromise = (async () => {
+            try {
+                // 获取所有任务
+                const tasks = await Promise.all(taskIds.map(id => this.getTask(id)));
+                const validTasks = tasks.filter((task) => task !== null);
+                if (validTasks.length === 0) {
+                    console.warn(`[RedisQueueBatchConsumer] No valid tasks found in batch`);
+                    return;
+                }
+                // 过滤出有效的待处理任务
+                const tasksToProcess = [];
+                for (const task of validTasks) {
+                    // 检查状态
+                    if (task.status !== 'pending') {
+                        console.log(`[RedisQueueBatchConsumer] Task ${task.id} has invalid status (${task.status}), marking as failed`);
+                        await this.applyStatus(task.id, task.status, 'failed');
+                        continue;
+                    }
+                    tasksToProcess.push(task);
+                }
+                if (tasksToProcess.length === 0) {
+                    return;
+                }
+                try {
+                    // 任务已在 processing 队列中(由 Lua 脚本完成),只需更新状态和开始时间
+                    const taskIdList = tasksToProcess.map(t => t.id);
+                    const now = Date.now();
+                    await Promise.all(tasksToProcess.map(task => {
+                        task.status = 'processing';
+                        task.processingStartTime = now;
+                        const taskKey = `${this.queueKey}:task:${task.id}`;
+                        return this.redis.setEx(taskKey, this.cleanupDelay, JSON.stringify(task));
+                    }));
+                    // 批量处理所有任务
+                    const dataList = tasksToProcess.map(t => t.data);
+                    await this.config.handler(dataList);
+                    // 批量更新状态为完成
+                    const updatedCount = await this.applyStatusBatch(taskIdList, 'processing', 'completed');
+                    console.log(`[RedisQueueBatchConsumer] Batch completed: ${updatedCount} tasks`);
+                }
+                catch (error) {
+                    console.error(`[RedisQueueBatchConsumer] Batch failed:`, error);
+                    // 批量重试或失败
+                    for (const task of tasksToProcess) {
+                        if (task.retryCount < task.maxRetries) {
+                            task.retryCount++;
+                            task.status = 'pending';
+                            task.processingStartTime = undefined;
+                            const taskKey = `${this.queueKey}:task:${task.id}`;
+                            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.pendingQueue],
+                                arguments: [this.cleanupDelay.toString(), JSON.stringify(task), task.id],
+                            });
+                            console.log(`[RedisQueueBatchConsumer] Task ${task.id} will retry (${task.retryCount}/${task.maxRetries})`);
+                        }
+                        else {
+                            task.status = 'failed';
+                            task.processingStartTime = undefined;
+                            const taskKey = `${this.queueKey}:task:${task.id}`;
+                            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), task.id],
+                            });
+                            console.error(`[RedisQueueBatchConsumer] Task ${task.id} failed after ${task.maxRetries} retries`);
+                        }
+                    }
+                }
+            }
+            finally {
+                this.processingBatches--;
+            }
+        })();
+        // 将批次 Promise 添加到集合中
+        this.processingPromises.add(batchPromise);
+        // 批次完成后从集合中移除
+        batchPromise.finally(() => {
+            this.processingPromises.delete(batchPromise);
+        });
+        // 返回批次 Promise
+        return batchPromise;
+    }
+    /**
+     * 启动恢复机制
+     */
+    startRecovery() {
+        if (this.recoveryInterval || !this.redis) {
+            return;
+        }
+        // 立即执行一次恢复
+        this.recoverStalled(this.config.processingTimeout).catch(error => {
+            console.error('[RedisQueueBatchConsumer] Initial recovery error:', error);
+        });
+        // 定期检查（每 10 秒检查一次）
+        this.recoveryInterval = setInterval(() => {
+            this.recoverStalled(this.config.processingTimeout).catch(error => {
+                console.error('[RedisQueueBatchConsumer] Recovery error:', error);
+            });
+        }, 10000);
+        console.log('[RedisQueueBatchConsumer] Recovery mechanism started');
+    }
+    /**
+     * 停止恢复机制
+     */
+    stopRecovery() {
+        if (this.recoveryInterval) {
+            clearInterval(this.recoveryInterval);
+            this.recoveryInterval = null;
+            console.log('[RedisQueueBatchConsumer] Recovery mechanism stopped');
+        }
+    }
+    /**
+     * 启动消费者
+     */
+    startConsumer() {
+        if (this.consumerRunning || !this.redis) {
+            return;
+        }
+        this.consumerRunning = true;
+        console.log(`[RedisQueueBatchConsumer] Consumer started with batchSize: ${this.config.batchSize}, concurrency: ${this.config.concurrency}`);
+        // Lua 脚本: 批量原子化从 pending 取出任务并移到 processing
+        const popAndMoveBatchScript = `
+      local pendingQueue = KEYS[1]
+      local processingQueue = KEYS[2]
+      local queueKeyPrefix = KEYS[3]
+      local count = tonumber(ARGV[1])
+      local currentTime = tonumber(ARGV[2])
+      
+      local taskIds = {}
+      local checkedCount = 0
+      local maxCheck = count * 3
+      
+      while #taskIds < count and checkedCount < maxCheck do
+        local taskId = redis.call('LPOP', pendingQueue)
+        if not taskId then
+          break
+        end
+        
+        checkedCount = checkedCount + 1
+        
+        local taskKey = queueKeyPrefix .. ':task:' .. taskId
+        local taskData = redis.call('GET', taskKey)
+        
+        if taskData then
+          local task = cjson.decode(taskData)
+          local delayUntil = task.delayUntil
+          
+          if not delayUntil or delayUntil <= currentTime then
+            redis.call('RPUSH', processingQueue, taskId)
+            table.insert(taskIds, taskId)
+          else
+            redis.call('RPUSH', pendingQueue, taskId)
+          end
+        end
+      end
+      
+      return taskIds
+    `;
+        this.consumerInterval = setInterval(async () => {
+            try {
+                // 检查当前是否有可用的并发槽位
+                const availableSlots = this.config.concurrency - this.processingBatches;
+                if (availableSlots <= 0) {
+                    return; // 已达到并发限制
+                }
+                // 批量取出任务
+                const taskIds = await this.redis.eval(popAndMoveBatchScript, {
+                    keys: [this.pendingQueue, this.processingQueue, this.queueKey],
+                    arguments: [this.config.batchSize.toString(), Date.now().toString()],
+                });
+                if (taskIds.length > 0) {
+                    // 处理这批任务（不等待完成）
+                    this.processBatch(taskIds).catch(error => {
+                        console.error(`[RedisQueueBatchConsumer] Unhandled error in processBatch:`, error);
+                    });
+                }
+            }
+            catch (error) {
+                console.error('[RedisQueueBatchConsumer] Consumer error:', error);
+            }
+        }, this.config.consumerInterval);
+    }
+    /**
+     * 停止消费者
+     */
+    stopConsumer() {
+        if (this.consumerInterval) {
+            clearInterval(this.consumerInterval);
+            this.consumerInterval = null;
+        }
+        this.consumerRunning = false;
+        console.log('[RedisQueueBatchConsumer] Consumer stopped');
+    }
+    /**
+     * 获取队列统计信息（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 };
+    }
+    /**
+     * 健康检查
+     */
+    async health() {
+        if (!this.redis)
+            return false;
+        const result = await catchIt(() => this.redis.ping());
+        return !result.isError() && result.value === 'PONG';
+    }
+}

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

@@ -0,0 +1,26 @@
+type TestTaskData = {
+    id?: string;
+    value?: number | string;
+    test?: boolean | string;
+    index?: number;
+    payload?: string;
+    order?: number;
+    taskId?: number;
+    message?: string;
+    name?: string;
+    shouldFail?: boolean;
+    step?: number;
+    real?: boolean;
+    nested?: {
+        value: number;
+    };
+    example?: string;
+    data?: any;
+};
+declare module './types' {
+    interface RedisQueueRegistry {
+        [key: `test:batch:${string}`]: TestTaskData;
+    }
+}
+export {};
+//# sourceMappingURL=redis-queue-batch-consumer.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"redis-queue-batch-consumer.test.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-batch-consumer.test.ts"],"names":[],"mappings":"AAQA,KAAK,YAAY,GAAG;IAClB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,GAAG,CAAA;CACX,CAAA;AAGD,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,kBAAkB;QAC1B,CAAC,GAAG,EAAE,cAAc,MAAM,EAAE,GAAG,YAAY,CAAA;KAC5C;CACF"}

package/output/redis-queue/{batch-consumer.test.js → redis-queue-batch-consumer.test.js}

@@ -1,22 +1,18 @@
 import { describe, it, expect, afterEach } from 'vitest';
 import { catchIt } from '@taicode/common-base';
 import { RedisQueueProvider } from './redis-queue-provider';
-import { RedisBatchConsumer } from './batch-consumer';
+import { RedisQueueBatchConsumer } from './redis-queue-batch-consumer';
+import { dispatchQueueTask, waitQueueCompletion, clearQueue, getQueueTasks } from './test-helpers';
 const REDIS_URL = process.env.REDIS_URL || 'redis://localhost:6379';
-describe('RedisBatchConsumer', () => {
+describe('RedisQueueBatchConsumer', () => {
     const providers = [];
     const consumers = [];
     afterEach(async () => {
         for (const consumer of consumers) {
-            consumer.disconnect();
+            await clearQueue(consumer);
+            await consumer.disconnect();
         }
         for (const provider of providers) {
-            try {
-                await provider.clear();
-            }
-            catch (error) {
-                // 忽略清理错误
-            }
             provider.disconnect();
         }
         providers.length = 0;
@@ -24,13 +20,11 @@ describe('RedisBatchConsumer', () => {
     });
     const createQueue = (handler, options) => {
         const uniqueKey = `test:batch:${Date.now()}:${Math.random()}`;
-        const provider = new RedisQueueProvider({
+        const provider = new RedisQueueProvider(uniqueKey, {
             redisUrl: REDIS_URL,
-            queueKey: uniqueKey,
         });
-        const consumer = new RedisBatchConsumer({
+        const consumer = new RedisQueueBatchConsumer(uniqueKey, {
             redisUrl: REDIS_URL,
-            queueKey: uniqueKey,
             consumerInterval: 100,
             maxRetries: 2,
             batchSize: 10,
@@ -79,6 +73,27 @@ describe('RedisBatchConsumer', () => {
             const stats = await consumer.statistics();
             expect(stats.completed).toBe(5);
         });
+        it('应该能够使用 dispatchQueueTask 立即处理批量任务', async () => {
+            const processedBatches = [];
+            const { provider, consumer } = createQueue(async (dataList) => {
+                processedBatches.push([...dataList]);
+                return catchIt(() => { });
+            }, { batchSize: 3 });
+            await provider.connect();
+            await consumer.connect();
+            const taskIds = await provider.enqueue([
+                { value: 1 }, { value: 2 }, { value: 3 },
+                { value: 4 }, { value: 5 },
+            ]);
+            // 使用 dispatchQueueTask 立即处理任务
+            await dispatchQueueTask(consumer, taskIds);
+            // 应该有 2 个批次（3+2）
+            expect(processedBatches).toHaveLength(2);
+            expect(processedBatches[0]).toHaveLength(3);
+            expect(processedBatches[1]).toHaveLength(2);
+            const stats = await consumer.statistics();
+            expect(stats.completed).toBe(5);
+        });
         it('应该能处理大批量任务', async () => {
             let totalProcessed = 0;
             const { provider, consumer } = createQueue(async (dataList) => {
@@ -92,6 +107,41 @@ describe('RedisBatchConsumer', () => {
             await new Promise(resolve => setTimeout(resolve, 3000));
             expect(totalProcessed).toBe(200);
         });
+        it('应该能够使用 waitQueueCompletion 等待批量处理完成', async () => {
+            const processedBatches = [];
+            const { provider, consumer } = createQueue(async (dataList) => {
+                processedBatches.push(dataList.length);
+                await new Promise(resolve => setTimeout(resolve, 100));
+                return catchIt(() => { });
+            }, { batchSize: 5 });
+            await provider.connect();
+            await consumer.connect();
+            await provider.enqueue(Array.from({ length: 15 }, (_, i) => ({ index: i })));
+            // 等待所有任务完成
+            await waitQueueCompletion(consumer, stats => stats.pending === 0 && stats.processing === 0 && stats.completed === 15);
+            // 应该有 3 个批次
+            expect(processedBatches).toHaveLength(3);
+            expect(processedBatches).toEqual([5, 5, 5]);
+        });
+        it('应该能够使用 getQueueTasks 获取批量任务详情', async () => {
+            const { provider, consumer } = createQueue(async () => {
+                // 模拟失败
+                throw new Error('Batch failed');
+            }, { batchSize: 3, maxRetries: 0 });
+            await provider.connect();
+            await consumer.connect();
+            const taskIds = await provider.enqueue([
+                { name: 'task1' }, { name: 'task2' }, { name: 'task3' }
+            ]);
+            // 立即处理
+            await dispatchQueueTask(consumer, taskIds);
+            // 等待一下确保任务处理完成
+            await new Promise(resolve => setTimeout(resolve, 100));
+            // 获取失败任务
+            const failedTasks = await getQueueTasks(provider, 'failed');
+            expect(failedTasks.length).toBeGreaterThan(0);
+            expect(failedTasks.every(t => t.status === 'failed')).toBe(true);
+        });
     });
     describe('重试机制', () => {
         it('失败的批次应该重试', async () => {
@@ -107,6 +157,35 @@ describe('RedisBatchConsumer', () => {
             const stats = await consumer.statistics();
             expect(stats.failed).toBe(2);
         });
+        it('disconnect 应该等待正在处理的批次完成', async () => {
+            const processedBatches = [];
+            let processingBatch = null;
+            const { provider, consumer } = createQueue(async (dataList) => {
+                processingBatch = dataList.map(d => d.index || 0);
+                await new Promise(resolve => setTimeout(resolve, 500)); // 模拟长时间处理
+                processedBatches.push(dataList.map(d => d.index || 0));
+                processingBatch = null;
+                return catchIt(() => { });
+            }, { batchSize: 2 });
+            await provider.connect();
+            await consumer.connect();
+            // 添加一批任务
+            await provider.enqueue([{ index: 1 }, { index: 2 }]);
+            // 等待批次开始处理
+            await new Promise(resolve => setTimeout(resolve, 200));
+            expect(processingBatch).toEqual([1, 2]);
+            expect(processedBatches).toHaveLength(0);
+            // 调用 disconnect，应该等待批次完成
+            const disconnectPromise = consumer.disconnect();
+            // 此时批次应该还在处理中
+            expect(processingBatch).toEqual([1, 2]);
+            // 等待 disconnect 完成
+            await disconnectPromise;
+            // disconnect 完成后，批次应该已经处理完成
+            expect(processingBatch).toBe(null);
+            expect(processedBatches).toHaveLength(1);
+            expect(processedBatches[0]).toEqual([1, 2]);
+        });
     });
     describe('幂等性', () => {
         it('应该支持在 data 中指定 id 来实现幂等性', async () => {
@@ -144,22 +223,19 @@ describe('RedisBatchConsumer', () => {
             let consumer1Count = 0;
             let consumer2Count = 0;
             const uniqueKey = `test:batch:concurrent:${Date.now()}:${Math.random()}`;
-            const provider = new RedisQueueProvider({
+            const provider = new RedisQueueProvider(uniqueKey, {
                 redisUrl: REDIS_URL,
-                queueKey: uniqueKey,
             });
-            const consumer1 = new RedisBatchConsumer({
+            const consumer1 = new RedisQueueBatchConsumer(uniqueKey, {
                 redisUrl: REDIS_URL,
-                queueKey: uniqueKey,
                 batchSize: 5,
                 handler: async (dataList) => {
                     consumer1Count += dataList.length;
                     return catchIt(() => { });
                 },
             });
-            const consumer2 = new RedisBatchConsumer({
+            const consumer2 = new RedisQueueBatchConsumer(uniqueKey, {
                 redisUrl: REDIS_URL,
-                queueKey: uniqueKey,
                 batchSize: 5,
                 handler: async (dataList) => {
                     consumer2Count += dataList.length;
@@ -213,4 +289,53 @@ describe('RedisBatchConsumer', () => {
             expect(receivedData[0].data).toBe(largeString);
         });
     });
+    describe('超时恢复', () => {
+        it('超时的任务应该直接标记为失败', { timeout: 15000 }, async () => {
+            let processCount = 0;
+            const { provider, consumer } = createQueue(async (dataList) => {
+                processCount++;
+                // 模拟处理卡住，永远不完成 (但超时机制会检测到)
+                await new Promise(resolve => setTimeout(resolve, 20000));
+                return catchIt(() => { });
+            }, {
+                batchSize: 1,
+                processingTimeout: 500, // 500ms 超时
+                consumerInterval: 100,
+            });
+            await provider.connect();
+            await consumer.connect();
+            await provider.enqueue([{ value: 1 }]);
+            // 等待任务被处理和超时恢复 (需要等待至少2个恢复周期: 10秒)
+            await new Promise(resolve => setTimeout(resolve, 12000));
+            const stats = await consumer.statistics();
+            // 超时后直接标记为失败,不应该重试
+            expect(stats.failed).toBe(1);
+            expect(stats.pending).toBe(0);
+            expect(stats.processing).toBe(0);
+            expect(stats.completed).toBe(0);
+            // 应该只处理一次,不会重试
+            expect(processCount).toBe(1);
+        });
+        it('未超时的失败任务应该正常重试', async () => {
+            let attemptCount = 0;
+            const { provider, consumer } = createQueue(async () => {
+                attemptCount++;
+                throw new Error('Task failed');
+            }, {
+                batchSize: 1,
+                maxRetries: 3,
+                processingTimeout: 5000, // 5秒超时,足够长不会触发
+                consumerInterval: 100,
+            });
+            await provider.connect();
+            await consumer.connect();
+            await provider.enqueue([{ value: 1 }]);
+            // 等待所有重试完成
+            await new Promise(resolve => setTimeout(resolve, 3000));
+            const stats = await consumer.statistics();
+            // 应该重试 3 次后失败
+            expect(stats.failed).toBe(1);
+            expect(attemptCount).toBe(4); // 初始 1 次 + 3 次重试
+        });
+    });
 });

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;
@@ -14,7 +14,7 @@ export declare abstract class RedisQueueCommon<T extends TaskData = TaskData> {
     protected readonly pendingQueue: string;
     protected readonly processingQueue: string;
     protected readonly completedQueue: string;
-    constructor(config: RedisQueueCommonConfig);
+    constructor(queueKey: string, config?: RedisQueueCommonConfig);
     /**
      * 获取日志前缀(子类实现)
      */
@@ -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,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,sBAA2B;IAwCjE;;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"}