@jayfong/x-server 1.35.3 → 1.35.5

package/lib/_cjs/core/define_task.js

@@ -53,19 +53,15 @@ function defineSliceTask(options) {
       const key = (addOptions == null ? void 0 : addOptions.key) || '';
       const duration = (addOptions == null ? void 0 : addOptions.duration) != null ? (0, _date.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _date.ms)(options.duration(key)) : options.duration && (0, _date.ms)(options.duration);
       const threshold = (addOptions == null ? void 0 : addOptions.threshold) || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
+      const thresholdTimeout = (addOptions == null ? void 0 : addOptions.thresholdTimeout) != null ? (0, _date.ms)(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? (0, _date.ms)(options.thresholdTimeout(key)) : options.thresholdTimeout && (0, _date.ms)(options.thresholdTimeout);
       (0, _assert.default)(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
       const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
       const res = await _x.x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
-      const count = parseInt(res[0][1], 10) + 1; // 时段与阈值并存
+      const count = parseInt(res[0][1], 10) + 1; // 仅时段
+      // 1分钟内的合并推送
 
-      if (duration != null && threshold != null) {
-        if (count === threshold) {
-          await task.add({
-            key: key,
-            redisKey: redisKey,
-            count: threshold
-          });
-        } else if (count === 1) {
+      if (duration != null) {
+        if (count === 1) {
           await task.add({
             key: key,
             redisKey: redisKey
@@ -73,18 +69,21 @@ function defineSliceTask(options) {
             delay: duration
           });
         }
-      } // 仅时段
-      else if (duration != null) {
-        if (count === 1) {
+      } // 仅阈值
+      // 满10条推送
+      else if (threshold != null) {
+        if (thresholdTimeout) {
+          const delayTaskId = redisKey;
+          await task.getJob(delayTaskId).then(job => job == null ? void 0 : job.remove());
           await task.add({
             key: key,
             redisKey: redisKey
           }, {
-            delay: duration
+            jobId: delayTaskId,
+            delay: thresholdTimeout
           });
         }
-      } // 仅阈值
-      else if (threshold != null) {
+
         if (count === threshold) {
           await task.add({
             key: key,

package/lib/core/define_task.js

@@ -40,19 +40,15 @@ export function defineSliceTask(options) {
       const key = (addOptions == null ? void 0 : addOptions.key) || '';
       const duration = (addOptions == null ? void 0 : addOptions.duration) != null ? ms(addOptions.duration) : typeof options.duration === 'function' ? ms(options.duration(key)) : options.duration && ms(options.duration);
       const threshold = (addOptions == null ? void 0 : addOptions.threshold) || typeof options.threshold && (typeof options.threshold === 'function' ? options.threshold(key) : options.threshold);
+      const thresholdTimeout = (addOptions == null ? void 0 : addOptions.thresholdTimeout) != null ? ms(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? ms(options.thresholdTimeout(key)) : options.thresholdTimeout && ms(options.thresholdTimeout);
       assert(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
       const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
       const res = await x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
-      const count = parseInt(res[0][1], 10) + 1; // 时段与阈值并存
+      const count = parseInt(res[0][1], 10) + 1; // 仅时段
+      // 1分钟内的合并推送
 
-      if (duration != null && threshold != null) {
-        if (count === threshold) {
-          await task.add({
-            key: key,
-            redisKey: redisKey,
-            count: threshold
-          });
-        } else if (count === 1) {
+      if (duration != null) {
+        if (count === 1) {
           await task.add({
             key: key,
             redisKey: redisKey
@@ -60,18 +56,21 @@ export function defineSliceTask(options) {
             delay: duration
           });
         }
-      } // 仅时段
-      else if (duration != null) {
-        if (count === 1) {
+      } // 仅阈值
+      // 满10条推送
+      else if (threshold != null) {
+        if (thresholdTimeout) {
+          const delayTaskId = redisKey;
+          await task.getJob(delayTaskId).then(job => job == null ? void 0 : job.remove());
           await task.add({
             key: key,
             redisKey: redisKey
           }, {
-            delay: duration
+            jobId: delayTaskId,
+            delay: thresholdTimeout
           });
         }
-      } // 仅阈值
-      else if (threshold != null) {
+
         if (count === threshold) {
           await task.add({
             key: key,

package/lib/core/types.d.ts

@@ -170,6 +170,10 @@ export declare namespace XTask {
          * 阈值数量
          */
         threshold?: number | ((key: K) => number);
+        /**
+         * 阈值数量超时时间
+         */
+        thresholdTimeout?: MsValue | ((key: K) => MsValue);
         /**
          * 处理器
          */
@@ -179,6 +183,7 @@ export declare namespace XTask {
         add: (data: T, options?: {
             duration?: MsValue;
             threshold?: number;
+            thresholdTimeout?: MsValue;
         }) => Promise<void>;
     }
     interface SliceTask<T, K> {
@@ -186,6 +191,7 @@ export declare namespace XTask {
             key: K;
             duration?: MsValue;
             threshold?: number;
+            thresholdTimeout?: MsValue;
         }) => Promise<void>;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.35.3",
+  "version": "1.35.5",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",