@jayfong/x-server 1.34.5 → 1.35.0

package/lib/_cjs/core/define_task.js

@@ -3,10 +3,13 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 exports.__esModule = true;
+exports.defineSliceTask = defineSliceTask;
 exports.defineTask = defineTask;
 
 var _bull = _interopRequireDefault(require("bull"));
 
+var _date = require("vtils/date");
+
 var _x = require("../x");
 
 function defineTask(options) {
@@ -27,4 +30,34 @@ function defineTask(options) {
     return options.handle(job.data);
   });
   return queue;
+}
+
+function defineSliceTask(options) {
+  const task = defineTask({
+    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 redisKeyPrefix = `${_x.x.appId}_batch_task_${options.name}`;
+  const res = {
+    add: async (data, addOptions) => {
+      const key = (addOptions == null ? void 0 : addOptions.key) || '';
+      const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
+      const res = await _x.x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
+
+      if (parseInt(res[0][1], 10) === 0) {
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        }, {
+          delay: typeof options.duration === 'function' ? (0, _date.ms)(options.duration(key)) : (0, _date.ms)(options.duration)
+        });
+      }
+    }
+  };
+  return res;
 }

package/lib/_cjs/services/cache.js

@@ -27,7 +27,7 @@ class CacheService {
    *
    * @param key 键
    * @param value 值
-   * @param ttl 缓存时间（单位：时）
+   * @param ttl 缓存时间
    * @returns 返回设置的缓存内容
    */
 
@@ -36,8 +36,12 @@ class CacheService {
     const redisKey = this.toRedisKey(key);
     const redisValue = JSON.stringify(value);
     const redisTtl = typeof ttl === 'function' ? ttl(value, this.options.ttl) : ttl;
-    await _x.x.redis.set(redisKey, redisValue, // 毫秒
-    'PX', (0, _date.ms)(redisTtl));
+
+    if (redisTtl) {
+      await _x.x.redis.set(redisKey, redisValue, // 毫秒
+      'PX', (0, _date.ms)(redisTtl));
+    }
+
     return value;
   }
   /**
@@ -100,7 +104,7 @@ class CacheService {
    *
    * @param key 键
    * @param action 获取缓存内容的操作
-   * @param ttl 缓存时间（单位：时）
+   * @param ttl 缓存时间
    * @returns 返回获取到的内容
    */
 

package/lib/core/define_task.d.ts

@@ -1,2 +1,4 @@
 import type { XTask } from './types';
-export declare function defineTask<T>(options: XTask.Options<T>): XTask.Task<T>;
+export declare function defineTask<T>(options: XTask.TaskOptions<T>): XTask.Task<T>;
+export declare function defineSliceTask<T>(options: XTask.SliceTaskOptions<T, any>): XTask.SliceTaskNoKey<T>;
+export declare function defineSliceTask<T, K extends string | number>(options: XTask.SliceTaskOptions<T, K>): XTask.SliceTask<T, K>;

package/lib/core/define_task.js

@@ -1,4 +1,5 @@
 import Queue from 'bull';
+import { ms } from 'vtils/date';
 import { x } from "../x";
 export function defineTask(options) {
   const queue = new Queue(options.name, {
@@ -18,4 +19,33 @@ export function defineTask(options) {
     return options.handle(job.data);
   });
   return queue;
+}
+export function defineSliceTask(options) {
+  const task = defineTask({
+    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 redisKeyPrefix = `${x.appId}_batch_task_${options.name}`;
+  const res = {
+    add: async (data, addOptions) => {
+      const key = (addOptions == null ? void 0 : addOptions.key) || '';
+      const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
+      const res = await x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
+
+      if (parseInt(res[0][1], 10) === 0) {
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        }, {
+          delay: typeof options.duration === 'function' ? ms(options.duration(key)) : ms(options.duration)
+        });
+      }
+    }
+  };
+  return res;
 }

package/lib/core/types.d.ts

@@ -8,6 +8,7 @@ import type { AsyncOrSync, LiteralUnion, OneOrMore, RequiredDeep } from 'vtils/t
 import type { DisposeService } from '../services/dispose';
 import type { Handler } from './handler';
 import type { IncomingHttpHeaders } from 'http';
+import type { MsValue } from 'vtils/date';
 import type { MultipartFile } from 'fastify-multipart';
 import type { Queue } from 'bull';
 import type { SocketStream } from '@fastify/websocket';
@@ -138,7 +139,7 @@ export declare namespace XHandler {
     type Hook = (options: Options, ...args: Parameters<Handle>) => AsyncOrSync<void>;
 }
 export declare namespace XTask {
-    interface Options<T> {
+    interface TaskOptions<T> {
         /**
          * 任务名称
          */
@@ -156,6 +157,28 @@ export declare namespace XTask {
     }
     interface Task<T> extends Queue<T> {
     }
+    interface SliceTaskOptions<T, K> {
+        /**
+         * 任务名称
+         */
+        name: string;
+        /**
+         * 持续时长
+         */
+        duration: MsValue | ((key: K) => MsValue);
+        /**
+         * 处理器
+         */
+        handle: (data: T[], key: K) => any;
+    }
+    interface SliceTaskNoKey<T> {
+        add: (data: T) => Promise<void>;
+    }
+    interface SliceTask<T, K> {
+        add: (data: T, options: {
+            key: K;
+        }) => Promise<void>;
+    }
 }
 export declare namespace XCron {
     interface Options {

package/lib/services/cache.d.ts

@@ -27,7 +27,7 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
      *
      * @param key 键
      * @param value 值
-     * @param ttl 缓存时间（单位：时）
+     * @param ttl 缓存时间
      * @returns 返回设置的缓存内容
      */
     set<K extends TKeyPath, V extends Value<TData, K>>(key: K, value: V, ttl?: MsValue | ((data: V, defaultTTL: MsValue) => MsValue)): Promise<V>;
@@ -57,7 +57,7 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
      *
      * @param key 键
      * @param action 获取缓存内容的操作
-     * @param ttl 缓存时间（单位：时）
+     * @param ttl 缓存时间
      * @returns 返回获取到的内容
      */
     remember<K extends TKeyPath, V extends Value<TData, K>>(key: K, action: () => V | Promise<V>, ttl?: MsValue | ((data: V, defaultTTL: MsValue) => MsValue)): Promise<V>;

package/lib/services/cache.js

@@ -17,7 +17,7 @@ export class CacheService {
    *
    * @param key 键
    * @param value 值
-   * @param ttl 缓存时间（单位：时）
+   * @param ttl 缓存时间
    * @returns 返回设置的缓存内容
    */
 
@@ -26,8 +26,12 @@ export class CacheService {
     const redisKey = this.toRedisKey(key);
     const redisValue = JSON.stringify(value);
     const redisTtl = typeof ttl === 'function' ? ttl(value, this.options.ttl) : ttl;
-    await x.redis.set(redisKey, redisValue, // 毫秒
-    'PX', ms(redisTtl));
+
+    if (redisTtl) {
+      await x.redis.set(redisKey, redisValue, // 毫秒
+      'PX', ms(redisTtl));
+    }
+
     return value;
   }
   /**
@@ -90,7 +94,7 @@ export class CacheService {
    *
    * @param key 键
    * @param action 获取缓存内容的操作
-   * @param ttl 缓存时间（单位：时）
+   * @param ttl 缓存时间
    * @returns 返回获取到的内容
    */
 

package/package.json

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