@jayfong/x-server 1.10.3 → 1.11.2

package/lib/plugins/file_parser.js

@@ -1,19 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileParserPlugin = void 0;
-const fastify_multipart_1 = __importDefault(require("fastify-multipart"));
+import FastifyMultipart from 'fastify-multipart';
+
 /**
  * file 解析器插件
  */
-class FileParserPlugin {
-    constructor(options) {
-        this.options = options;
-    }
-    register(fastify) {
-        fastify.register(fastify_multipart_1.default, this.options);
-    }
-}
-exports.FileParserPlugin = FileParserPlugin;
+export class FileParserPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+
+  register(fastify) {
+    fastify.register(FastifyMultipart, this.options);
+  }
+
+}

package/lib/plugins/ws_parser.d.ts

@@ -8,6 +8,6 @@ export interface WsParserPluginOptions extends WebsocketPluginOptions {
  */
 export declare class WsParserPlugin implements BasePlugin {
     private options?;
-    constructor(options?: WsParserPluginOptions | undefined);
+    constructor(options?: WsParserPluginOptions);
     register(fastify: FastifyInstance): void;
 }

package/lib/plugins/ws_parser.js

@@ -1,19 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WsParserPlugin = void 0;
-const fastify_websocket_1 = __importDefault(require("fastify-websocket"));
+import FastifyWebsocket from 'fastify-websocket';
+
 /**
  * websocket 解析器插件
  */
-class WsParserPlugin {
-    constructor(options) {
-        this.options = options;
-    }
-    register(fastify) {
-        fastify.register(fastify_websocket_1.default, this.options);
-    }
-}
-exports.WsParserPlugin = WsParserPlugin;
+export class WsParserPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+
+  register(fastify) {
+    fastify.register(FastifyWebsocket, this.options);
+  }
+
+}

package/lib/plugins/xml_parser.d.ts

@@ -14,6 +14,6 @@ export interface XmlParserPluginOptions extends Partial<fxp.X2jOptions> {
  */
 export declare class XmlParserPlugin implements BasePlugin {
     private options?;
-    constructor(options?: XmlParserPluginOptions | undefined);
+    constructor(options?: XmlParserPluginOptions);
     register(fastify: FastifyInstance): void;
 }

package/lib/plugins/xml_parser.js

@@ -1,48 +1,52 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XmlParserPlugin = void 0;
-const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
+import fxp from 'fast-xml-parser';
+
 /**
  * XML 解析器插件
  *
  * 底层解析器是 [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser)
  */
-class XmlParserPlugin {
-    constructor(options) {
-        this.options = options;
-    }
-    register(fastify) {
-        const { contentType = ['text/xml', 'application/xml'], ...parseOptions } = this.options || {};
-        fastify.addContentTypeParser(contentType, (req, payload, done) => {
-            let body = '';
-            const handleError = (err) => done(err);
-            const handleData = (data) => (body += data);
-            const handleEnd = () => {
-                let data;
-                let err;
-                try {
-                    data = fast_xml_parser_1.default.parse(body, parseOptions);
-                }
-                catch (_err) {
-                    err = _err;
-                }
-                payload.removeListener('error', handleError);
-                payload.removeListener('data', handleData);
-                payload.removeListener('end', handleEnd);
-                if (err) {
-                    done(err);
-                }
-                else {
-                    done(null, data);
-                }
-            };
-            payload.on('error', handleError);
-            payload.on('data', handleData);
-            payload.on('end', handleEnd);
-        });
-    }
-}
-exports.XmlParserPlugin = XmlParserPlugin;
+export class XmlParserPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+
+  register(fastify) {
+    const {
+      contentType = ['text/xml', 'application/xml'],
+      ...parseOptions
+    } = this.options || {};
+    fastify.addContentTypeParser(contentType, (req, payload, done) => {
+      let body = '';
+
+      const handleError = err => done(err);
+
+      const handleData = data => body += data;
+
+      const handleEnd = () => {
+        let data;
+        let err;
+
+        try {
+          data = fxp.parse(body, parseOptions);
+        } catch (_err) {
+          err = _err;
+        }
+
+        payload.removeListener('error', handleError);
+        payload.removeListener('data', handleData);
+        payload.removeListener('end', handleEnd);
+
+        if (err) {
+          done(err);
+        } else {
+          done(null, data);
+        }
+      };
+
+      payload.on('error', handleError);
+      payload.on('data', handleData);
+      payload.on('end', handleEnd);
+    });
+  }
+
+}

package/lib/services/base.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/services/cache.js

@@ -1,196 +1,219 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheService = void 0;
-const cuid_1 = __importDefault(require("cuid"));
-const date_1 = require("vtils/date");
-const x_1 = require("../x");
-class CacheService {
-    constructor(options) {
-        this.options = options;
-        this.serviceName = 'cache';
-        this.prefix = `${x_1.x.appName}:`;
+import cuid from 'cuid';
+import { ms } from 'vtils/date';
+import { x } from "../x";
+export class CacheService {
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'cache';
+    this.prefix = void 0;
+    this.prefix = `${x.appName}:`;
+  }
+
+  toRedisKey(key) {
+    return `${this.prefix}${Array.isArray(key) ? key.join('_') : String(key)}`;
+  }
+  /**
+   * 设置缓存内容。对象类内容尽量避免使用，以免造成问题。
+   *
+   * @param key 键
+   * @param value 值
+   * @param ttl 缓存时间（单位：时）
+   * @returns 返回设置的缓存内容
+   */
+
+
+  async set(key, value, ttl = this.options.ttl) {
+    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));
+    return value;
+  }
+  /**
+   * 存储值然后返回其对应的键，该键 URL 友好。
+   *
+   * @param value 值
+   * @param ttl 存活时间
+   */
+
+
+  async save(value, ttl = this.options.ttl) {
+    const key = `X__${cuid()}`;
+    await this.set(key, typeof value === 'function' ? await value(key) : value, ttl);
+    return key;
+  }
+  /**
+   * 获取缓存内容。
+   *
+   * @param key 键
+   * @returns 返回获取到的缓存内容
+   */
+
+
+  async get(key) {
+    const redisKey = this.toRedisKey(key);
+    const gotValue = await x.redis.get(redisKey);
+
+    if (gotValue) {
+      try {
+        return JSON.parse(gotValue);
+      } catch {}
     }
-    toRedisKey(key) {
-        return `${this.prefix}${Array.isArray(key) ? key.join('_') : String(key)}`;
-    }
-    /**
-     * 设置缓存内容。对象类内容尽量避免使用，以免造成问题。
-     *
-     * @param key 键
-     * @param value 值
-     * @param ttl 缓存时间（单位：时）
-     * @returns 返回设置的缓存内容
-     */
-    async set(key, value, ttl = this.options
-        .ttl) {
-        const redisKey = this.toRedisKey(key);
-        const redisValue = JSON.stringify(value);
-        const redisTtl = typeof ttl === 'function' ? ttl(value, this.options.ttl) : ttl;
-        await x_1.x.redis.set(redisKey, redisValue, 
-        // 毫秒
-        'PX', (0, date_1.ms)(redisTtl));
-        return value;
-    }
-    /**
-     * 存储值然后返回其对应的键，该键 URL 友好。
-     *
-     * @param value 值
-     * @param ttl 存活时间
-     */
-    async save(value, ttl = this.options.ttl) {
-        const key = `X__${(0, cuid_1.default)()}`;
-        await this.set(key, typeof value === 'function' ? await value(key) : value, ttl);
-        return key;
-    }
-    /**
-     * 获取缓存内容。
-     *
-     * @param key 键
-     * @returns 返回获取到的缓存内容
-     */
-    async get(key) {
-        const redisKey = this.toRedisKey(key);
-        const gotValue = await x_1.x.redis.get(redisKey);
-        if (gotValue) {
-            try {
-                return JSON.parse(gotValue);
-            }
-            catch { }
-        }
+
+    return null;
+  }
+  /**
+   * 获取多个缓存内容。
+   *
+   * @param keys 键
+   * @returns 返回获取到的缓存内容
+   */
+
+
+  async getMany(...keys) {
+    const redisKeys = keys.map(key => this.toRedisKey(key));
+    if (!redisKeys.length) return [];
+    const gotValues = await x.redis.mget(...redisKeys);
+    return gotValues.map(value => {
+      if (value == null) return null;
+
+      try {
+        return JSON.parse(value);
+      } catch {
         return null;
+      }
+    });
+  }
+  /**
+   * 缓存内容。
+   *
+   * @param key 键
+   * @param action 获取缓存内容的操作
+   * @param ttl 缓存时间（单位：时）
+   * @returns 返回获取到的内容
+   */
+
+
+  async remember(key, action, ttl = this.options.ttl) {
+    let value = await this.get(key);
+
+    if (value === null) {
+      value = await action();
+      await this.set(key, value, ttl);
     }
-    /**
-     * 获取多个缓存内容。
-     *
-     * @param keys 键
-     * @returns 返回获取到的缓存内容
-     */
-    async getMany(...keys) {
-        const redisKeys = keys.map(key => this.toRedisKey(key));
-        if (!redisKeys.length)
-            return [];
-        const gotValues = await x_1.x.redis.mget(...redisKeys);
-        return gotValues.map(value => {
-            if (value == null)
-                return null;
-            try {
-                return JSON.parse(value);
-            }
-            catch {
-                return null;
-            }
-        });
-    }
-    /**
-     * 缓存内容。
-     *
-     * @param key 键
-     * @param action 获取缓存内容的操作
-     * @param ttl 缓存时间（单位：时）
-     * @returns 返回获取到的内容
-     */
-    async remember(key, action, ttl = this.options
-        .ttl) {
-        let value = await this.get(key);
-        if (value === null) {
-            value = await action();
-            await this.set(key, value, ttl);
-        }
-        return value;
-    }
-    /**
-     * 自增。
-     *
-     * @param key 键
-     * @param increment 增量
-     */
-    async increase(key, increment = 1) {
-        const redisKey = this.toRedisKey(key);
-        return x_1.x.redis.incrby(redisKey, increment);
-    }
-    /**
-     * 自减。
-     *
-     * @param key 键
-     * @param decrement 减量
-     */
-    async decrease(key, decrement = 1) {
-        return this.increase(key, -decrement);
-    }
-    /**
-     * 新增元素。
-     *
-     * @param key 键
-     * @param values 元素列表
-     */
-    async push(key, ...values) {
-        const redisKey = this.toRedisKey(key);
-        return x_1.x.redis.rpush(redisKey, ...values.map(value => JSON.stringify(value)));
-    }
-    /**
-     * 从头部弹出元素并返回。
-     *
-     * @param key 键
-     * @param count 弹出元素个数
-     */
-    async shift(key, count = 1) {
-        const redisKey = this.toRedisKey(key);
-        const res = [];
-        for (let i = 0; i < count; i++) {
-            const item = await x_1.x.redis.lpop(redisKey);
-            if (item) {
-                res.push(JSON.parse(item));
-            }
-            else {
-                break;
-            }
-        }
-        return res;
-    }
-    /**
-     * 删除缓存。
-     *
-     * @param keys 键列表
-     */
-    async remove(...keys) {
-        return Promise.all(keys.map(async (key) => {
-            const redisKey = this.toRedisKey(key);
-            return x_1.x.redis.del(redisKey);
-        }));
-    }
-    /**
-     * 清空全部缓存。
-     */
-    async clearAll() {
-        const keys = await x_1.x.redis.keys(`${this.prefix}*`);
-        if (keys.length) {
-            return x_1.x.redis.del(...keys);
-        }
-        return 0;
+
+    return value;
+  }
+  /**
+   * 自增。
+   *
+   * @param key 键
+   * @param increment 增量
+   */
+
+
+  async increase(key, increment = 1) {
+    const redisKey = this.toRedisKey(key);
+    return x.redis.incrby(redisKey, increment);
+  }
+  /**
+   * 自减。
+   *
+   * @param key 键
+   * @param decrement 减量
+   */
+
+
+  async decrease(key, decrement = 1) {
+    return this.increase(key, -decrement);
+  }
+  /**
+   * 新增元素。
+   *
+   * @param key 键
+   * @param values 元素列表
+   */
+
+
+  async push(key, ...values) {
+    const redisKey = this.toRedisKey(key);
+    return x.redis.rpush(redisKey, ...values.map(value => JSON.stringify(value)));
+  }
+  /**
+   * 从头部弹出元素并返回。
+   *
+   * @param key 键
+   * @param count 弹出元素个数
+   */
+
+
+  async shift(key, count = 1) {
+    const redisKey = this.toRedisKey(key);
+    const res = [];
+
+    for (let i = 0; i < count; i++) {
+      const item = await x.redis.lpop(redisKey);
+
+      if (item) {
+        res.push(JSON.parse(item));
+      } else {
+        break;
+      }
     }
-    /**
-     * 清空指定前缀的缓存。
-     */
-    async clear(...prefixes) {
-        const keys = (await Promise.all(prefixes.map(prefix => x_1.x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
-        if (keys.length) {
-            return x_1.x.redis.del(...keys);
-        }
-        return 0;
+
+    return res;
+  }
+  /**
+   * 删除缓存。
+   *
+   * @param keys 键列表
+   */
+
+
+  async remove(...keys) {
+    return Promise.all(keys.map(async key => {
+      const redisKey = this.toRedisKey(key);
+      return x.redis.del(redisKey);
+    }));
+  }
+  /**
+   * 清空全部缓存。
+   */
+
+
+  async clearAll() {
+    const keys = await x.redis.keys(`${this.prefix}*`);
+
+    if (keys.length) {
+      return x.redis.del(...keys);
     }
-    /**
-     * 派生出一个指定类型的缓存服务。
-     */
-    fork(options) {
-        return options
-            ? new CacheService({
-                ...this.options,
-                ...options,
-            })
-            : this;
+
+    return 0;
+  }
+  /**
+   * 清空指定前缀的缓存。
+   */
+
+
+  async clear(...prefixes) {
+    const keys = (await Promise.all(prefixes.map(prefix => x.redis.keys(`${this.toRedisKey(prefix)}*`)))).flat();
+
+    if (keys.length) {
+      return x.redis.del(...keys);
     }
-}
-exports.CacheService = CacheService;
+
+    return 0;
+  }
+  /**
+   * 派生出一个指定类型的缓存服务。
+   */
+
+
+  fork(options) {
+    return options ? new CacheService({ ...this.options,
+      ...options
+    }) : this;
+  }
+
+}

package/lib/services/captcha.js

@@ -1,34 +1,33 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CaptchaService = void 0;
-const svg_captcha_1 = __importDefault(require("svg-captcha"));
-const x_1 = require("../x");
-class CaptchaService {
-    constructor(options) {
-        this.options = options;
-        this.serviceName = 'captcha';
+import svgCaptcha from 'svg-captcha';
+import { x } from "../x";
+export class CaptchaService {
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'captcha';
+  }
+
+  async generate() {
+    const res = svgCaptcha.create({
+      size: this.options.size
+    });
+    const token = await x.cache.save(res.text, this.options.ttl);
+    return {
+      text: res.text,
+      svg: res.data,
+      token: token
+    };
+  }
+
+  async verify(options) {
+    var _options$text;
+
+    if (((_options$text = options.text) == null ? void 0 : _options$text.length) !== this.options.size) {
+      return false;
     }
-    async generate() {
-        const res = svg_captcha_1.default.create({
-            size: this.options.size,
-        });
-        const token = await x_1.x.cache.save(res.text, this.options.ttl);
-        return {
-            text: res.text,
-            svg: res.data,
-            token: token,
-        };
-    }
-    async verify(options) {
-        if (options.text?.length !== this.options.size) {
-            return false;
-        }
-        const expectedText = await x_1.x.cache.get(options.token);
-        await x_1.x.cache.remove(options.token);
-        return options.text === expectedText;
-    }
-}
-exports.CaptchaService = CaptchaService;
+
+    const expectedText = await x.cache.get(options.token);
+    await x.cache.remove(options.token);
+    return options.text === expectedText;
+  }
+
+}

package/lib/services/dispose.d.ts

@@ -5,7 +5,7 @@ export interface DisposeOptions {
 export declare class DisposeService implements BaseService {
     private options?;
     serviceName: string;
-    constructor(options?: DisposeOptions | undefined);
+    constructor(options?: DisposeOptions);
     private disposes;
     add(fn: () => any): void;
     dispose(): Promise<any[]>;