@jayfong/x-server 2.32.0 → 2.34.0

package/lib/_cjs/core/define_task.js

@@ -40,58 +40,74 @@ function defineSliceTask(options) {
       }
     }
   });
-  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, _vtils.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _vtils.ms)(options.duration(key)) : options.duration && (0, _vtils.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, _vtils.ms)(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? (0, _vtils.ms)(options.thresholdTimeout(key)) : options.thresholdTimeout && (0, _vtils.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 addAction = async (data, addOptions) => {
+    const redisKeyPrefix = `${_x.x.appId}_batch_task_${options.name}`;
+    const key = (addOptions == null ? void 0 : addOptions.key) || '';
+    const duration = (addOptions == null ? void 0 : addOptions.duration) != null ? (0, _vtils.ms)(addOptions.duration) : typeof options.duration === 'function' ? (0, _vtils.ms)(options.duration(key)) : options.duration && (0, _vtils.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, _vtils.ms)(addOptions.thresholdTimeout) : typeof options.thresholdTimeout === 'function' ? (0, _vtils.ms)(options.thresholdTimeout(key)) : options.thresholdTimeout && (0, _vtils.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;
 
-      // 仅时段
-      // 1分钟内的合并推送
-      if (duration != null) {
-        if (count === 1) {
-          await task.add({
-            key: key,
-            redisKey: redisKey
-          }, {
-            delay: duration
-          });
-        }
+    // 仅时段
+    // 1分钟内的合并推送
+    if (duration != null) {
+      if (count === 1) {
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        }, {
+          delay: duration
+        });
       }
-      // 仅阈值
-      // 满10条推送
-      else if (threshold != null) {
-        const delayTaskId = redisKey;
-        const prevJob = await task.getJob(delayTaskId);
+    }
+    // 仅阈值
+    // 满10条推送
+    else if (threshold != null) {
+      const delayTaskId = redisKey;
+      const prevJob = await task.getJob(delayTaskId);
 
-        // 到达阈值，立即发送
-        if (count === threshold) {
-          await (prevJob == null ? void 0 : prevJob.remove());
+      // 到达阈值，立即发送
+      if (count === threshold) {
+        await (prevJob == null ? void 0 : prevJob.remove());
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        });
+      }
+      // 存在超时设置
+      else if (thresholdTimeout) {
+        if (!prevJob) {
           await task.add({
             key: key,
             redisKey: redisKey
+          }, {
+            jobId: delayTaskId,
+            delay: thresholdTimeout
           });
         }
-        // 存在超时设置
-        else if (thresholdTimeout) {
-          if (!prevJob) {
-            await task.add({
-              key: key,
-              redisKey: redisKey
-            }, {
-              jobId: delayTaskId,
-              delay: thresholdTimeout
-            });
-          }
-        }
       }
     }
   };
+  const addTask = defineTask({
+    name: `${options.name}_add`,
+    concurrency: 1,
+    handle: async payload => {
+      await addAction(payload.data, payload.options);
+    }
+  });
+  const res = {
+    add: async (data, addOptions) => {
+      const delay = addOptions.delay && (0, _vtils.ms)(addOptions.delay) || 0;
+      await addTask.add({
+        data: data,
+        options: addOptions
+      }, {
+        delay: delay
+      });
+    }
+  };
   return res;
 }

package/lib/_cjs/core/handler.js

@@ -10,8 +10,7 @@ var vae = _interopRequireWildcard(require("vtils/vae"));
 var _validator = require("vtils/validator");
 var _http_error = require("../core/http_error");
 var _dispose = require("../services/dispose");
-// @ts-ignore
-// prettier-ignore
+var _server = require("./server");
 _validator.yup.setLocale((0, _validator.getZhCN)({
   getLabel: params => params.label || params.path
 }));
@@ -79,9 +78,18 @@ class Handler {
           '_#': _lzString.default.compress(JSON.stringify(res))
         };
       }
+
+      // 加密返回数据
+      if (this.options.responseDataEncrypt && _server.Server.options.responseEncryptAlgorithm) {
+        if (_server.Server.options.responseEncryptAlgorithm === 'simple') {
+          res = {
+            _$: (0, _vtils.rot13)((0, _vtils.base64UrlEncode)(`${Date.now()}${JSON.stringify(res)}`))
+          };
+        }
+      }
       return res == null ? {} : res;
     };
-    this.handleWs = async (data, ctx) => {
+    this.handleWs = async (_data, ctx) => {
       const dispose = new _dispose.DisposeService();
       ctx.ws.socket.on('message', async payload => {
         try {

package/lib/_cjs/core/server.js

@@ -6,9 +6,9 @@ exports.Server = void 0;
 var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
 var _fastify = _interopRequireDefault(require("fastify"));
 var _vtils = require("vtils");
-var _http_method = require("./http_method");
-var _http_error = require("./http_error");
 var _x = require("../x");
+var _http_error = require("./http_error");
+var _http_method = require("./http_method");
 class Server {
   constructor(options) {
     this.options = options;
@@ -97,7 +97,6 @@ class Server {
         if (handlerMethod === 'FILE') {
           const part = await req.file();
           files = Object.keys(part.fields).reduce((res, name) => {
-            ;
             res[name] = (0, _vtils.castArray)(part.fields[name]).map(item => item.file ? item : item.value)[0];
             return res;
           }, {});

package/lib/core/define_task.js

@@ -34,58 +34,74 @@ export function defineSliceTask(options) {
       }
     }
   });
-  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);
-      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 addAction = async (data, addOptions) => {
+    const redisKeyPrefix = `${x.appId}_batch_task_${options.name}`;
+    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;
 
-      // 仅时段
-      // 1分钟内的合并推送
-      if (duration != null) {
-        if (count === 1) {
-          await task.add({
-            key: key,
-            redisKey: redisKey
-          }, {
-            delay: duration
-          });
-        }
+    // 仅时段
+    // 1分钟内的合并推送
+    if (duration != null) {
+      if (count === 1) {
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        }, {
+          delay: duration
+        });
       }
-      // 仅阈值
-      // 满10条推送
-      else if (threshold != null) {
-        const delayTaskId = redisKey;
-        const prevJob = await task.getJob(delayTaskId);
+    }
+    // 仅阈值
+    // 满10条推送
+    else if (threshold != null) {
+      const delayTaskId = redisKey;
+      const prevJob = await task.getJob(delayTaskId);
 
-        // 到达阈值，立即发送
-        if (count === threshold) {
-          await (prevJob == null ? void 0 : prevJob.remove());
+      // 到达阈值，立即发送
+      if (count === threshold) {
+        await (prevJob == null ? void 0 : prevJob.remove());
+        await task.add({
+          key: key,
+          redisKey: redisKey
+        });
+      }
+      // 存在超时设置
+      else if (thresholdTimeout) {
+        if (!prevJob) {
           await task.add({
             key: key,
             redisKey: redisKey
+          }, {
+            jobId: delayTaskId,
+            delay: thresholdTimeout
           });
         }
-        // 存在超时设置
-        else if (thresholdTimeout) {
-          if (!prevJob) {
-            await task.add({
-              key: key,
-              redisKey: redisKey
-            }, {
-              jobId: delayTaskId,
-              delay: thresholdTimeout
-            });
-          }
-        }
       }
     }
   };
+  const addTask = defineTask({
+    name: `${options.name}_add`,
+    concurrency: 1,
+    handle: async payload => {
+      await addAction(payload.data, payload.options);
+    }
+  });
+  const res = {
+    add: async (data, addOptions) => {
+      const delay = addOptions.delay && ms(addOptions.delay) || 0;
+      await addTask.add({
+        data: data,
+        options: addOptions
+      }, {
+        delay: delay
+      });
+    }
+  };
   return res;
 }

package/lib/core/handler.d.ts

@@ -1,6 +1,6 @@
 import * as vae from 'vtils/vae';
 import type { XHandler } from './types';
-export type { HandlerMethodMap, HandlerPath, HandlerPayloadMap, HandlerResultMap } from '.x/routes';
+export type { HandlerMethodMap, HandlerPath, HandlerPayloadMap, HandlerResultMap, } from '.x/routes';
 export declare class Handler<TReqData extends any = void, TResData extends any = void, TReqMethod extends XHandler.Method = XHandler.Method> {
     readonly options: XHandler.Options<TReqData, TResData, TReqMethod>;
     private requestDataSchema;

package/lib/core/handler.js

@@ -1,12 +1,10 @@
 import LZString from 'lz-string';
-import { DataPacker } from 'vtils';
+import { DataPacker, base64UrlEncode, rot13 } from 'vtils';
 import * as vae from 'vtils/vae';
 import { getZhCN, yup } from 'vtils/validator';
 import { HttpError } from "../core/http_error";
 import { DisposeService } from "../services/dispose";
-
-// @ts-ignore
-// prettier-ignore
+import { Server } from "./server";
 yup.setLocale(getZhCN({
   getLabel: params => params.label || params.path
 }));
@@ -74,9 +72,18 @@ export class Handler {
           '_#': LZString.compress(JSON.stringify(res))
         };
       }
+
+      // 加密返回数据
+      if (this.options.responseDataEncrypt && Server.options.responseEncryptAlgorithm) {
+        if (Server.options.responseEncryptAlgorithm === 'simple') {
+          res = {
+            _$: rot13(base64UrlEncode(`${Date.now()}${JSON.stringify(res)}`))
+          };
+        }
+      }
       return res == null ? {} : res;
     };
-    this.handleWs = async (data, ctx) => {
+    this.handleWs = async (_data, ctx) => {
       const dispose = new DisposeService();
       ctx.ws.socket.on('message', async payload => {
         try {

package/lib/core/server.js

@@ -1,8 +1,8 @@
 import Fastify from 'fastify';
 import { base64UrlDecode, castArray, keyBy, noop, rot13 } from 'vtils';
-import { HandlerMethodToHttpMethod } from "./http_method";
-import { HttpError } from "./http_error";
 import { x } from "../x";
+import { HttpError } from "./http_error";
+import { HandlerMethodToHttpMethod } from "./http_method";
 export class Server {
   constructor(options) {
     this.options = options;
@@ -91,7 +91,6 @@ export class Server {
         if (handlerMethod === 'FILE') {
           const part = await req.file();
           files = Object.keys(part.fields).reduce((res, name) => {
-            ;
             res[name] = castArray(part.fields[name]).map(item => item.file ? item : item.value)[0];
             return res;
           }, {});

package/lib/core/types.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
 /// <reference types="got/dist/source/core/utils/timed-out" />
+import type { IncomingHttpHeaders } from 'http';
 import type { MultipartFile } from '@fastify/multipart';
 import type { SocketStream } from '@fastify/websocket';
 import type { Queue } from 'bull';
 import { CronJob } from 'cron';
 import { FastifyReply, FastifyRequest, FastifyServerOptions } from 'fastify';
-import type { IncomingHttpHeaders } from 'http';
 import type { MsValue } from 'vtils';
 import type { AsyncOrSync, LiteralUnion, OneOrMore, RequiredDeep } from 'vtils/types';
 import * as vae from 'vtils/vae';
@@ -36,6 +36,14 @@ export declare namespace XServer {
          * 监听端口
          */
         port: number;
+        /**
+         * 响应加密算法
+         */
+        responseEncryptAlgorithm?: 'simple';
+        /**
+         * 响应加密密钥
+         */
+        responseEncryptKey?: string;
         /**
          * 透传给 Fastify 的选项
          */
@@ -126,6 +134,7 @@ export declare namespace XHandler {
          * @default false
          */
         responseDataObfuscate?: boolean;
+        responseDataEncrypt?: boolean;
         /**
          * 响应的 Content-Type 头
          */
@@ -199,6 +208,7 @@ export declare namespace XTask {
             duration?: MsValue;
             threshold?: number;
             thresholdTimeout?: MsValue;
+            delay?: MsValue;
         }) => Promise<void>;
     }
 }

package/package.json

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