@taicode/common-server 1.0.12 → 1.0.14

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

@@ -1,6 +1,7 @@
 export { RedisQueueProvider } from './redis-queue-provider';
 export { RedisQueueConsumer } from './redis-queue-consumer';
-export { RedisBatchConsumer } from './redis-batch-consumer';
+export { RedisQueueBatchConsumer } from './redis-queue-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,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAGtE,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/index.js

@@ -1,4 +1,4 @@
 // 核心类导出
 export { RedisQueueProvider } from './redis-queue-provider';
 export { RedisQueueConsumer } from './redis-queue-consumer';
-export { RedisBatchConsumer } from './redis-batch-consumer';
+export { RedisQueueBatchConsumer } from './redis-queue-batch-consumer';

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;
     /**
      * 批量处理任务
      */
@@ -81,5 +76,14 @@ export declare class RedisBatchConsumer<T extends TaskData = TaskData> extends R
      * 健康检查
      */
     health(): Promise<boolean>;
+    /**
+     * 立即派发批量任务进行处理(仅供测试工具调用)
+     *
+     * ⚠️ 此方法为 private,仅通过 test-helpers 暴露给测试代码使用
+     *
+     * @param taskIds 要立即处理的任务 ID 列表
+     * @returns Promise,等待所有任务批次处理完成
+     */
+    private dispatch;
 }
 //# sourceMappingURL=redis-batch-consumer.d.ts.map

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;IAOhC;;;;;;;OAOG;YACW,QAAQ;CA+DvB"}

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);
@@ -357,4 +305,67 @@ export class RedisBatchConsumer extends RedisQueueCommon {
         const result = await catchIt(() => this.redis.ping());
         return !result.isError() && result.value === 'PONG';
     }
+    /**
+     * 立即派发批量任务进行处理(仅供测试工具调用)
+     *
+     * ⚠️ 此方法为 private,仅通过 test-helpers 暴露给测试代码使用
+     *
+     * @param taskIds 要立即处理的任务 ID 列表
+     * @returns Promise,等待所有任务批次处理完成
+     */
+    async dispatch(taskIds) {
+        if (!this.redis || !this.redis.isOpen) {
+            throw new Error('[RedisBatchConsumer] Redis is not connected');
+        }
+        if (taskIds.length === 0) {
+            return;
+        }
+        // 使用 Lua 脚本将任务从 pending 移到 processing(忽略延迟时间)
+        const moveToProcessingScript = `
+      local pendingQueue = KEYS[1]
+      local processingQueue = KEYS[2]
+      local movedIds = {}
+      
+      -- ARGV[1], ARGV[2], ... 是 taskId
+      for i = 1, #ARGV do
+        local taskId = ARGV[i]
+        local removed = redis.call('LREM', pendingQueue, 0, taskId)
+        if removed > 0 then
+          redis.call('RPUSH', processingQueue, taskId)
+          table.insert(movedIds, taskId)
+        end
+      end
+      
+      return movedIds
+    `;
+        const movedIds = await this.redis.eval(moveToProcessingScript, {
+            keys: [this.pendingQueue, this.processingQueue],
+            arguments: taskIds,
+        });
+        if (movedIds.length === 0) {
+            console.warn('[RedisBatchConsumer] No tasks were moved to processing queue');
+            return;
+        }
+        // 按照 batchSize 分批处理并等待完成
+        const batches = [];
+        for (let i = 0; i < movedIds.length; i += this.config.batchSize) {
+            batches.push(movedIds.slice(i, i + this.config.batchSize));
+        }
+        // 串行处理每个批次(遵循批量消费语义)
+        for (const batch of batches) {
+            await this.processBatch(batch);
+        }
+        // 检查是否有任务需要重试(已放回 pending 队列)
+        const retryIds = [];
+        for (const taskId of movedIds) {
+            const task = await this.getTask(taskId);
+            if (task && task.status === 'pending' && task.retryCount > 0) {
+                retryIds.push(taskId);
+            }
+        }
+        // 递归处理重试任务
+        if (retryIds.length > 0) {
+            await this.dispatch(retryIds);
+        }
+    }
 }

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/{batch-consumer.d.ts → redis-queue-batch-consumer.d.ts}

@@ -1,20 +1,16 @@
-import type { BatchConsumerConfig, TaskData, QueueStats } from './types';
+import { RedisQueueCommon } from './redis-queue-common';
+import type { BatchConsumerConfig, QueueStats, RedisQueueRegistry } from './types';
 /**
  * Redis 批量队列消费者
  *
  * 批量消费任务,每次处理多条
  *
- * @template T 任务数据类型
+ * @template K 队列键名类型
  *
  * @example
  * ```ts
- * interface EmailTask {
- *   to: string
- * }
- *
- * const consumer = new RedisBatchConsumer<EmailTask>({
+ * const consumer = new RedisQueueBatchConsumer('email-queue', {
  *   redisUrl: 'redis://localhost:6379',
- *   queueKey: 'email-queue',
  *   batchSize: 50,
  *   handler: async (dataList) => {
  *     await sendEmailsBatch(dataList.map(d => d.to))
@@ -31,46 +27,24 @@ import type { BatchConsumerConfig, TaskData, QueueStats } from './types';
  * consumer.disconnect()
  * ```
  */
-export declare class RedisBatchConsumer<T extends TaskData = TaskData> {
+export declare class RedisQueueBatchConsumer<K extends keyof RedisQueueRegistry> extends RedisQueueCommon {
     private consumerRunning;
-    private redis;
     private consumerInterval;
     private recoveryInterval;
     private processingBatches;
+    private processingPromises;
     private readonly config;
-    private readonly failedQueue;
-    private readonly pendingQueue;
-    private readonly processingQueue;
-    private readonly completedQueue;
-    constructor(config: BatchConsumerConfig<T>);
+    constructor(queueKey: K, config: BatchConsumerConfig<K>);
+    protected getLogPrefix(): string;
     /**
      * 连接 Redis 并自动启动消费者
      */
     connect(): Promise<void>;
     /**
      * 断开 Redis 连接并停止消费者
+     * 会等待所有正在处理的批次完成后再断开连接
      */
-    disconnect(): void;
-    /**
-     * 获取任务详情
-     */
-    private getTask;
-    /**
-     * 更新任务状态并移动到对应队列（原子操作）
-     */
-    private applyStatus;
-    /**
-     * 批量更新任务状态
-     */
-    private applyStatusBatch;
-    /**
-     * 根据状态获取对应的队列键
-     */
-    private getQueueByStatus;
-    /**
-     * 恢复超时的任务
-     */
-    private recoverStalledTasks;
+    disconnect(): Promise<void>;
     /**
      * 批量处理任务
      */
@@ -95,13 +69,9 @@ export declare class RedisBatchConsumer<T extends TaskData = TaskData> {
      * 获取队列统计信息（O(1) 时间复杂度）
      */
     statistics(): Promise<QueueStats>;
-    /**
-     * 清空所有队列和任务数据
-     */
-    clear(): Promise<void>;
     /**
      * 健康检查
      */
     health(): Promise<boolean>;
 }
-//# sourceMappingURL=batch-consumer.d.ts.map
+//# sourceMappingURL=redis-queue-batch-consumer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"redis-queue-batch-consumer.d.ts","sourceRoot":"","sources":["../../source/redis-queue/redis-queue-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;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,uBAAuB,CAAC,CAAC,SAAS,MAAM,kBAAkB,CAAE,SAAQ,gBAAgB;IAC/F,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAOtB;gBAEW,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAuBvD,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBjC;;OAEG;YACW,YAAY;IA2G1B;;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"}