@jayfong/x-server 2.9.1 → 2.9.3

package/lib/_cjs/core/server.js

@@ -46,7 +46,9 @@ class Server {
   async prepareFastify() {
     this.fastify = (0, _fastify.default)({
       logger: process.env.NODE_ENV === 'development' ? {
-        prettyPrint: true
+        transport: {
+          target: 'pino-pretty'
+        }
       } : false,
       // 信任 X-Forwarded-For 头以获取正确的 IP，
       // 否则通过 nginx 代理后 remoteAddr 将始终为 127.0.0.1

package/lib/_cjs/plugins/cors.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.CorsPlugin = void 0;
 
-var _fastifyCors = _interopRequireDefault(require("fastify-cors"));
+var _cors = _interopRequireDefault(require("@fastify/cors"));
 
 var _vtils = require("vtils");
 
@@ -34,7 +34,7 @@ class CorsPlugin {
       const pass = allows.some(item => item.type === 'equal' ? domain === item.domain : domain.endsWith(item.domain));
       return pass;
     });
-    fastify.register(_fastifyCors.default, {
+    fastify.register(_cors.default, {
       origin: (origin, cb) => allowAll ? cb(null, true) : cb(null, origin ? check(origin) : true),
       maxAge: (0, _date.ms)(this.options.ttl, true)
     });

package/lib/_cjs/plugins/file_parser.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.FileParserPlugin = void 0;
 
-var _fastifyMultipart = _interopRequireDefault(require("fastify-multipart"));
+var _multipart = _interopRequireDefault(require("@fastify/multipart"));
 
 /**
  * file 解析器插件
@@ -16,7 +16,7 @@ class FileParserPlugin {
   }
 
   register(fastify) {
-    fastify.register(_fastifyMultipart.default, this.options);
+    fastify.register(_multipart.default, this.options);
   }
 
 }

package/lib/_cjs/plugins/xml_parser.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.XmlParserPlugin = void 0;
 
-var _fastXmlParser = _interopRequireDefault(require("fast-xml-parser"));
+var _fastXmlParser = require("fast-xml-parser");
 
 /**
  * XML 解析器插件
@@ -22,6 +20,7 @@ class XmlParserPlugin {
       contentType = ['text/xml', 'application/xml'],
       ...parseOptions
     } = this.options || {};
+    const xmlParser = new _fastXmlParser.XMLParser(parseOptions);
     fastify.addContentTypeParser(contentType, (req, payload, done) => {
       let body = '';
 
@@ -34,7 +33,7 @@ class XmlParserPlugin {
         let err;
 
         try {
-          data = _fastXmlParser.default.parse(body, parseOptions);
+          data = xmlParser.parse(body);
         } catch (_err) {
           err = _err;
         }

package/lib/_cjs/services/redis.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.RedisService = void 0;
 
-var _ioredis = _interopRequireDefault(require("ioredis"));
+var _ioredis = require("ioredis");
 
-class RedisService extends _ioredis.default {
+class RedisService extends _ioredis.Redis {
   constructor(...args) {
     super(...args);
     this.serviceName = 'redis';

package/lib/core/server.js

@@ -32,7 +32,9 @@ export class Server {
   async prepareFastify() {
     this.fastify = Fastify({
       logger: process.env.NODE_ENV === 'development' ? {
-        prettyPrint: true
+        transport: {
+          target: 'pino-pretty'
+        }
       } : false,
       // 信任 X-Forwarded-For 头以获取正确的 IP，
       // 否则通过 nginx 代理后 remoteAddr 将始终为 127.0.0.1

package/lib/core/types.d.ts

@@ -9,7 +9,7 @@ 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 { MultipartFile } from '@fastify/multipart';
 import type { Queue } from 'bull';
 import type { SocketStream } from '@fastify/websocket';
 export declare namespace XServer {

package/lib/plugins/cors.js

@@ -1,4 +1,4 @@
-import FastifyCors from 'fastify-cors';
+import FastifyCors from '@fastify/cors';
 import { memoize } from 'vtils';
 import { ms } from 'vtils/date';
 

package/lib/plugins/file_parser.d.ts

@@ -1,4 +1,4 @@
-import { FastifyMultipartOptions } from 'fastify-multipart';
+import { FastifyMultipartOptions } from '@fastify/multipart';
 import { BasePlugin } from './base';
 import { FastifyInstance } from 'fastify';
 export interface FileParserPluginOptions extends FastifyMultipartOptions {

package/lib/plugins/file_parser.js

@@ -1,4 +1,4 @@
-import FastifyMultipart from 'fastify-multipart';
+import FastifyMultipart from '@fastify/multipart';
 
 /**
  * file 解析器插件

package/lib/plugins/form_body_parser.d.ts

@@ -1,7 +1,7 @@
-import { FormBodyPluginOptions } from '@fastify/formbody';
+import { FastifyFormbodyOptions } from '@fastify/formbody';
 import { BasePlugin } from './base';
 import { FastifyInstance } from 'fastify';
-export interface FormBodyParserPluginOptions extends FormBodyPluginOptions {
+export interface FormBodyParserPluginOptions extends FastifyFormbodyOptions {
 }
 /**
  * POST application/x-www-form-urlencoded 解析器插件

package/lib/plugins/xml_parser.d.ts

@@ -1,7 +1,7 @@
-import fxp from 'fast-xml-parser';
 import { BasePlugin } from './base';
 import { FastifyInstance } from 'fastify';
-export interface XmlParserPluginOptions extends Partial<fxp.X2jOptions> {
+import { X2jOptions } from 'fast-xml-parser';
+export interface XmlParserPluginOptions extends Partial<X2jOptions> {
     /**
      * 要处理的 `Content-Type`
      */

package/lib/plugins/xml_parser.js

@@ -1,4 +1,4 @@
-import fxp from 'fast-xml-parser';
+import { XMLParser } from 'fast-xml-parser';
 
 /**
  * XML 解析器插件
@@ -15,6 +15,7 @@ export class XmlParserPlugin {
       contentType = ['text/xml', 'application/xml'],
       ...parseOptions
     } = this.options || {};
+    const xmlParser = new XMLParser(parseOptions);
     fastify.addContentTypeParser(contentType, (req, payload, done) => {
       let body = '';
 
@@ -27,7 +28,7 @@ export class XmlParserPlugin {
         let err;
 
         try {
-          data = fxp.parse(body, parseOptions);
+          data = xmlParser.parse(body);
         } catch (_err) {
           err = _err;
         }

package/lib/services/redis.d.ts

@@ -1,6 +1,6 @@
-import Redis from 'ioredis';
 import { BaseService } from './base';
-export interface RedisServiceOptions extends Redis.RedisOptions {
+import { Redis, RedisOptions } from 'ioredis';
+export interface RedisServiceOptions extends RedisOptions {
 }
 export declare class RedisService extends Redis implements BaseService {
     serviceName: string;

package/lib/services/redis.js

@@ -1,4 +1,4 @@
-import Redis from 'ioredis';
+import { Redis } from 'ioredis';
 export class RedisService extends Redis {
   constructor(...args) {
     super(...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.9.1",
+  "version": "2.9.3",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -26,10 +26,11 @@
     }
   },
   "dependencies": {
-    "@fastify/formbody": "^6.0.0",
-    "@fastify/websocket": "^7.0.1",
+    "@fastify/cors": "^8.3.0",
+    "@fastify/formbody": "^7.4.0",
+    "@fastify/multipart": "^7.7.0",
+    "@fastify/websocket": "^8.1.0",
     "@prisma/client": "^4.8.0",
-    "@types/bull": "^3.15.8",
     "@types/busboy": "^0.3.2",
     "@types/cron": "^2.0.0",
     "@types/http-errors": "^1.8.2",
@@ -38,33 +39,31 @@
     "@types/ws": "^8.5.3",
     "alipay-sdk": "^3.2.0",
     "bufferutil": "^4.0.6",
-    "bull": "^4.8.1",
+    "bull": "^4.10.4",
     "chokidar": "^3.5.3",
     "comment-parser": "^1.3.1",
     "compressing": "^1.5.1",
-    "cron": "^2.0.0",
+    "cron": "^2.3.1",
     "cuid": "^2.1.8",
     "debug": "^4.3.4",
     "esbuild": "^0.14.36",
     "esbuild-register": "^3.3.2",
     "execa": "^5.1.1",
     "exit-hook": "^2.2.1",
-    "fast-xml-parser": "^3.21.1",
-    "fastify": "^3.28.0",
-    "fastify-cors": "^6.0.3",
-    "fastify-multipart": "^5.3.1",
+    "fast-xml-parser": "^4.2.5",
+    "fastify": "^4.19.2",
     "fs-extra": "^10.0.1",
     "globby": "^11",
     "got": "^11.8.2",
-    "http-errors": "^1.8.1",
-    "ioredis": "^4.28.5",
+    "http-errors": "^2.0.0",
+    "ioredis": "^5.3.2",
     "jsonwebtoken": "^8.5.1",
     "lz-string": "^1.4.4",
     "mini-svg-data-uri": "^1.4.4",
     "mint-filter": "^3.0.1",
     "node-ssh": "^12.0.4",
     "nodemailer": "^6.7.3",
-    "pino-pretty": "^7.6.1",
+    "pino-pretty": "^10.0.1",
     "prisma": "^4.8.0",
     "select-run": "^1.1.2",
     "supports-color": "^8",
@@ -78,20 +77,20 @@
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
-    "@types/ioredis": "^4.28.10",
+    "@types/ioredis": "^5.0.0",
     "@types/json-schema": "^7.0.11",
     "@types/lz-string": "^1.3.34",
     "axios": "^1.4.0",
     "eslint": "^7.32.0",
     "haoma": "^3.6.4",
     "husky": "^4.3.8",
-    "ioredis-mock": "^5.9.1",
+    "ioredis-mock": "^8.7.0",
     "jest": "^27.5.1",
     "lint-staged": "^10.5.4",
     "npm-check-updates": "^12.5.9",
     "prettier": "^2.8.8",
     "standard-version": "^9.3.2",
-    "typescript": "^5.0.4",
+    "typescript": "^5.1.6",
     "typescript-snapshots-plugin": "^1.7.0"
   },
   "publishConfig": {