@jayfong/x-server 1.35.2 → 1.35.4

package/lib/_cjs/core/define_task.js

@@ -6,6 +6,8 @@ exports.__esModule = true;
 exports.defineSliceTask = defineSliceTask;
 exports.defineTask = defineTask;
 
+var _assert = _interopRequireDefault(require("assert"));
+
 var _bull = _interopRequireDefault(require("bull"));
 
 var _date = require("vtils/date");
@@ -37,25 +39,65 @@ function defineSliceTask(options) {
     name: options.name,
     concurrency: 1,
     handle: async data => {
-      const res = await _x.x.redis.multi([['lrange', data.redisKey, '0', '-1'], ['del', data.redisKey]]).exec();
-      const list = res[0][1].map(item => JSON.parse(item));
-      return options.handle(list, data.key);
+      const res = data.count ? await _x.x.redis.multi([['lrange', data.redisKey, `-${data.count}`, '-1'], ['ltrim', data.redisKey, '0', `-${data.count + 1}`]]).exec() : await _x.x.redis.multi([['lrange', data.redisKey, '0', '-1'], ['del', data.redisKey]]).exec();
+      const list = res[0][1].reverse().map(item => JSON.parse(item));
+
+      if (list.length) {
+        return options.handle(list, data.key);
+      }
     }
   });
   const redisKeyPrefix = `${_x.x.appId}_batch_task_${options.name}`;
   const res = {
     add: async (data, addOptions) => {
       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);
+      (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; // 时段与阈值并存
+      // 满10条推送，若超过1分钟仍未满10条，则亦推送
 
-      if (parseInt(res[0][1], 10) === 0) {
+      if (duration != null && threshold != null) {
+        const delayTaskId = redisKey;
+        await task.getJob(delayTaskId).then(job => job == null ? void 0 : job.remove());
         await task.add({
           key: key,
           redisKey: redisKey
         }, {
-          delay: (addOptions == null ? void 0 : addOptions.duration) != null ? (0, _date.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _date.ms)(options.duration(key)) : (0, _date.ms)(options.duration)
+          jobId: delayTaskId,
+          delay: duration
         });
+
+        if (count === threshold) {
+          await task.add({
+            key: key,
+            redisKey: redisKey,
+            count: threshold
+          });
+        }
+      } // 仅时段
+      // 1分钟内的合并推送
+      else if (duration != null) {
+        if (count === 1) {
+          await task.add({
+            key: key,
+            redisKey: redisKey
+          }, {
+            delay: duration
+          });
+        }
+      } // 仅阈值
+      // 满10条推送
+      else if (threshold != null) {
+        if (count === threshold) {
+          await task.add({
+            key: key,
+            redisKey: redisKey,
+            count: threshold
+          });
+        }
       }
     }
   };

package/lib/core/define_task.js

@@ -1,3 +1,4 @@
+import assert from 'assert';
 import Queue from 'bull';
 import { ms } from 'vtils/date';
 import { x } from "../x";
@@ -25,25 +26,65 @@ export function defineSliceTask(options) {
     name: options.name,
     concurrency: 1,
     handle: async data => {
-      const res = await x.redis.multi([['lrange', data.redisKey, '0', '-1'], ['del', data.redisKey]]).exec();
-      const list = res[0][1].map(item => JSON.parse(item));
-      return options.handle(list, data.key);
+      const res = data.count ? await x.redis.multi([['lrange', data.redisKey, `-${data.count}`, '-1'], ['ltrim', data.redisKey, '0', `-${data.count + 1}`]]).exec() : await x.redis.multi([['lrange', data.redisKey, '0', '-1'], ['del', data.redisKey]]).exec();
+      const list = res[0][1].reverse().map(item => JSON.parse(item));
+
+      if (list.length) {
+        return options.handle(list, data.key);
+      }
     }
   });
   const redisKeyPrefix = `${x.appId}_batch_task_${options.name}`;
   const res = {
     add: async (data, addOptions) => {
       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);
+      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; // 时段与阈值并存
+      // 满10条推送，若超过1分钟仍未满10条，则亦推送
 
-      if (parseInt(res[0][1], 10) === 0) {
+      if (duration != null && threshold != null) {
+        const delayTaskId = redisKey;
+        await task.getJob(delayTaskId).then(job => job == null ? void 0 : job.remove());
         await task.add({
           key: key,
           redisKey: redisKey
         }, {
-          delay: (addOptions == null ? void 0 : addOptions.duration) != null ? ms(addOptions.duration) : typeof options.duration === 'function' ? ms(options.duration(key)) : ms(options.duration)
+          jobId: delayTaskId,
+          delay: duration
         });
+
+        if (count === threshold) {
+          await task.add({
+            key: key,
+            redisKey: redisKey,
+            count: threshold
+          });
+        }
+      } // 仅时段
+      // 1分钟内的合并推送
+      else if (duration != null) {
+        if (count === 1) {
+          await task.add({
+            key: key,
+            redisKey: redisKey
+          }, {
+            delay: duration
+          });
+        }
+      } // 仅阈值
+      // 满10条推送
+      else if (threshold != null) {
+        if (count === threshold) {
+          await task.add({
+            key: key,
+            redisKey: redisKey,
+            count: threshold
+          });
+        }
       }
     }
   };

package/lib/core/types.d.ts

@@ -157,7 +157,7 @@ export declare namespace XTask {
     }
     interface Task<T> extends Queue<T> {
     }
-    interface SliceTaskOptions<T, K> {
+    type SliceTaskOptions<T, K> = {
         /**
          * 任务名称
          */
@@ -165,21 +165,27 @@ export declare namespace XTask {
         /**
          * 持续时长
          */
-        duration: MsValue | ((key: K) => MsValue);
+        duration?: MsValue | ((key: K) => MsValue);
+        /**
+         * 阈值数量
+         */
+        threshold?: number | ((key: K) => number);
         /**
          * 处理器
          */
         handle: (data: T[], key: K) => any;
-    }
+    };
     interface SliceTaskNoKey<T> {
         add: (data: T, options?: {
             duration?: MsValue;
+            threshold?: number;
         }) => Promise<void>;
     }
     interface SliceTask<T, K> {
         add: (data: T, options: {
             key: K;
             duration?: MsValue;
+            threshold?: number;
         }) => Promise<void>;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.35.2",
+  "version": "1.35.4",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -71,7 +71,7 @@
     "ts-morph": "^12.2.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.6.0",
-    "vtils": "^4.60.0",
+    "vtils": "^4.67.0",
     "yargs": "^17.4.1"
   },
   "devDependencies": {