@jayfong/x-server 2.12.7 → 2.12.15

package/lib/services/rate_limit.js

@@ -4,32 +4,24 @@ export class RateLimitService {
   constructor() {
     this.serviceName = 'rateLimit';
   }
-
   async limitByCount(options) {
     const cacheKey = `rateLimit_${options.key}`;
     const remainingCount = await x.cache.get(cacheKey);
-
     if (remainingCount == null) {
       await x.cache.set(cacheKey, options.count, options.ttl);
       return options.count;
     }
-
     if (remainingCount === 0) {
       return 0;
     }
-
     await x.cache.decrease(cacheKey);
     return remainingCount - 1;
   }
-
   async limitByCountOrFail(options) {
     const count = await this.limitByCount(options);
-
     if (count === 0) {
       throw new HttpError.Forbidden(options.message);
     }
-
     return count;
   }
-
 }

package/lib/services/redis.js

@@ -4,5 +4,4 @@ export class RedisService extends Redis {
     super(...args);
     this.serviceName = 'redis';
   }
-
 }

package/lib/services/request.d.ts

@@ -1,135 +1,8 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import FormData from 'form-data';
-import FormStream from 'formstream';
-import Request from 'got/dist/source/core';
 import { BaseService } from './base';
-import { CookieJar } from 'tough-cookie';
-import { OmitStrict } from 'vtils/types';
-import { Readable } from 'stream';
-export interface RequestServiceOptions {
-    /**
-     * 请求地址
-     */
-    url: string;
-    /**
-     * 代理地址
-     */
-    proxyUrl?: string;
-    /**
-     * 超时毫秒数
-     */
-    timeoutMs?: number;
-    /**
-     * 头
-     */
-    headers?: Record<string, any>;
-    /**
-     * 是否跟随跳转
-     *
-     * @default true
-     */
-    followRedirect?: boolean;
-    /**
-     * COOKIE 容器
-     */
-    cookieJar?: CookieJar;
-    /**
-     * 用户代理
-     *
-     * @default "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36"
-     */
-    userAgent?: string;
-    /**
-     * 是否自动设置来源地址，设为 true 后若未手动设置来源页则将把请求地址设为来源地址
-     *
-     * @default false
-     */
-    autoReferer?: boolean;
-}
-export interface RequestServiceResponse<T> {
-    status: number;
-    headers: Record<string, any>;
-    data: T;
-}
-export interface RequestServiceGetOptions extends RequestServiceOptions {
-    data?: Record<string, any>;
-}
-export interface RequestServicePostOptions extends RequestServiceOptions {
-    data?: Record<string, any> | FormData | URLSearchParams;
-}
-export interface RequestServiceGetStreamOptions extends RequestServiceOptions {
-    data?: Record<string, any>;
-}
-export interface RequestServicePostStreamOptions extends RequestServiceOptions {
-    data?: Record<string, any> | FormData | URLSearchParams | FormStream;
-}
-export declare class RequestFormUrlencoded extends URLSearchParams {
-}
-export declare class RequestFormData extends FormData {
-    constructor(cbOrObject?: ((formData: FormData) => FormData) | Record<string, any>);
-}
-export declare class RequestFormStream extends FormStream {
-    constructor(cbOrObject?: ((formStream: FormStream) => FormStream) | Record<string, any>);
-}
-export declare class RequestFormFile {
-    file: any;
-    options?: {
-        name?: string;
-        type?: string;
-    };
-    constructor(file: Buffer, options: {
-        name: string;
-        type?: string;
-    });
-    constructor(file: Readable, options: {
-        name: string;
-        type?: string;
-    });
-    constructor(file: string, options?: {
-        name?: string;
-        type?: string;
-    });
-}
-export declare class RequestService implements BaseService {
-    private options?;
+import { XRequest } from '@jayfong/x-request';
+export * from '@jayfong/x-request';
+export declare class RequestService extends XRequest implements BaseService {
     serviceName: string;
-    private static getGotOptions;
-    static getRaw(options: RequestServiceGetStreamOptions): Promise<RequestServiceResponse<Buffer>>;
-    static getRaw(options: RequestServiceGetStreamOptions, responseType: 'buffer'): Promise<RequestServiceResponse<Buffer>>;
-    static getRaw(options: RequestServiceGetStreamOptions, responseType: 'text'): Promise<RequestServiceResponse<string>>;
-    static getRaw<T>(options: RequestServiceGetStreamOptions, responseType: 'json'): Promise<RequestServiceResponse<T>>;
-    static getRaw(options: RequestServiceGetStreamOptions, responseType: 'stream'): Request;
-    static postRaw(options: RequestServicePostOptions): Promise<RequestServiceResponse<Buffer>>;
-    static postRaw(options: RequestServicePostOptions, responseType: 'buffer'): Promise<RequestServiceResponse<Buffer>>;
-    static postRaw(options: RequestServicePostOptions, responseType: 'text'): Promise<RequestServiceResponse<string>>;
-    static postRaw<T>(options: RequestServicePostOptions, responseType: 'json'): Promise<RequestServiceResponse<T>>;
-    static postRaw(options: RequestServicePostOptions, responseType: 'stream'): Request;
-    static getText(options: RequestServiceGetStreamOptions): Promise<RequestServiceResponse<string>>;
-    static postText(options: RequestServicePostOptions): Promise<RequestServiceResponse<string>>;
-    static get<T>(options: RequestServiceGetStreamOptions): Promise<RequestServiceResponse<T>>;
-    static post<T>(options: RequestServicePostOptions): Promise<RequestServiceResponse<T>>;
-    static getStream(options: RequestServiceGetOptions): Request;
-    static postStream(options: RequestServicePostStreamOptions): Request;
-    static isTimeoutError(err: any): boolean;
-    constructor(options?: OmitStrict<RequestServiceOptions, 'url'>);
-    getRaw(options: RequestServiceGetStreamOptions): Promise<RequestServiceResponse<Buffer>>;
-    getRaw(options: RequestServiceGetStreamOptions, responseType: 'buffer'): Promise<RequestServiceResponse<Buffer>>;
-    getRaw(options: RequestServiceGetStreamOptions, responseType: 'text'): Promise<RequestServiceResponse<string>>;
-    getRaw<T>(options: RequestServiceGetStreamOptions, responseType: 'json'): Promise<RequestServiceResponse<T>>;
-    getRaw(options: RequestServiceGetStreamOptions, responseType: 'stream'): Request;
-    postRaw(options: RequestServicePostOptions): Promise<RequestServiceResponse<Buffer>>;
-    postRaw(options: RequestServicePostOptions, responseType: 'buffer'): Promise<RequestServiceResponse<Buffer>>;
-    postRaw(options: RequestServicePostOptions, responseType: 'text'): Promise<RequestServiceResponse<string>>;
-    postRaw<T>(options: RequestServicePostOptions, responseType: 'json'): Promise<RequestServiceResponse<T>>;
-    postRaw(options: RequestServicePostOptions, responseType: 'stream'): Request;
-    getText(options: RequestServiceGetStreamOptions): Promise<RequestServiceResponse<string>>;
-    postText(options: RequestServicePostOptions): Promise<RequestServiceResponse<string>>;
-    get<T>(options: RequestServiceGetStreamOptions): Promise<RequestServiceResponse<T>>;
-    post<T>(options: RequestServicePostOptions): Promise<RequestServiceResponse<T>>;
-    getStream(options: RequestServiceGetOptions): Request;
-    postStream(options: RequestServicePostStreamOptions): Request;
-    isTimeoutError(err: any): boolean;
 }
 declare module '../x' {
     interface X {

package/lib/services/request.js

@@ -1,277 +1,8 @@
-import assert from 'assert';
-import FormData from 'form-data';
-import FormStream from 'formstream';
-import fs from 'fs';
-import got from 'got';
-import { mapKeys } from 'vtils';
-import { ProxyAgent } from 'proxy-agent';
-import { Readable } from 'stream';
-export class RequestFormUrlencoded extends URLSearchParams {}
-export class RequestFormData extends FormData {
-  constructor(cbOrObject) {
-    super();
-
-    if (cbOrObject) {
-      if (typeof cbOrObject === 'function') {
-        cbOrObject(this);
-      } else {
-        Object.keys(cbOrObject).forEach(key => {
-          const value = cbOrObject[key];
-
-          if (value instanceof RequestFormFile) {
-            var _value$options, _value$options2;
-
-            this.append(key, typeof value.file === 'string' ? fs.createReadStream(value.file) : value.file, {
-              filename: (_value$options = value.options) == null ? void 0 : _value$options.name,
-              contentType: (_value$options2 = value.options) == null ? void 0 : _value$options2.type
-            });
-          } else {
-            this.append(key, value);
-          }
-        });
-      }
-    }
-  }
-
-}
-export class RequestFormStream extends FormStream {
-  constructor(cbOrObject) {
-    super();
-
-    if (cbOrObject) {
-      if (typeof cbOrObject === 'function') {
-        cbOrObject(this);
-      } else {
-        Object.keys(cbOrObject).forEach(key => {
-          const value = cbOrObject[key];
-
-          if (value instanceof RequestFormFile) {
-            if (typeof value.file === 'string') {
-              var _value$options3;
-
-              this.file(key, value.file, (_value$options3 = value.options) == null ? void 0 : _value$options3.name);
-            } else if (Buffer.isBuffer(value.file)) {
-              this.buffer(key, value.file, value.options.name, value.options.type);
-            } else if (value.file instanceof Readable) {
-              this.stream(key, value.file, value.options.name, value.options.type);
-            }
-          } else {
-            this.field(key, value);
-          }
-        });
-      }
-    }
-  }
-
-}
-export class RequestFormFile {
-  constructor(file, options) {
-    this.file = file;
-    this.options = options;
-
-    if (Buffer.isBuffer(file) || file instanceof Readable) {
-      assert(options == null ? void 0 : options.name, 'options.name is required');
-    }
-  }
-
-}
-export class RequestService {
-  static getGotOptions(options, responseType) {
-    var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
-
-    const gotOptions = {
-      url: options.url,
-      responseType: responseType === 'stream' ? undefined : responseType,
-      https: {
-        rejectUnauthorized: false
-      },
-      isStream: responseType === 'stream'
-    };
-
-    if (options.headers) {
-      gotOptions.headers = options.headers;
-    }
-
-    if (options.followRedirect != null) {
-      gotOptions.followRedirect = options.followRedirect;
-    }
-
-    if (options.timeoutMs) {
-      gotOptions.timeout = options.timeoutMs;
-    }
-
-    if (options.proxyUrl) {
-      const proxyAgent = new ProxyAgent({
-        getProxyForUrl: () => options.proxyUrl
-      });
-      gotOptions.agent = {
-        http: proxyAgent,
-        https: proxyAgent,
-        http2: proxyAgent
-      };
-    }
-
-    if (options.cookieJar) {
-      gotOptions.cookieJar = options.cookieJar;
-    } // 头处理
-
-
-    gotOptions.headers = mapKeys(gotOptions.headers || {}, (v, k) => k.toLowerCase());
-    (_gotOptions$headers$_ = (_gotOptions$headers = gotOptions.headers)[_userAgent = 'user-agent']) != null ? _gotOptions$headers$_ : _gotOptions$headers[_userAgent] = (_options$userAgent = options.userAgent) != null ? _options$userAgent : 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36';
-
-    if (options.autoReferer && gotOptions.headers['referer'] == null) {
-      gotOptions.headers['referer'] = options.url;
-    }
-
-    return gotOptions;
-  }
-
-  static getRaw(options, responseType) {
-    let url = options.url;
-
-    if (options.data) {
-      const _url = new URL(url);
-
-      Object.keys(options.data).forEach(key => {
-        _url.searchParams.set(key, options.data[key]);
-      });
-      url = _url.toString();
-    }
-
-    options.url = url;
-    const res = got({
-      method: 'GET',
-      ...this.getGotOptions(options, responseType || 'buffer')
-    });
-
-    if (responseType === 'stream') {
-      return res;
-    }
-
-    return res.then(res => ({
-      status: res.statusCode,
-      headers: res.headers,
-      data: res.body
-    }));
-  }
-
-  static postRaw(options, responseType) {
-    const gotOptions = this.getGotOptions(options, responseType || 'buffer');
-
-    if (responseType === 'stream' && options.data instanceof FormStream) {
-      gotOptions.headers = options.data.headers(gotOptions.headers);
-    }
-
-    const res = got({
-      method: 'POST',
-      ...(options.data == null ? {
-        body: ''
-      } : options.data instanceof FormData ? {
-        body: options.data
-      } : options.data instanceof URLSearchParams ? {
-        form: options.data
-      } : options.data instanceof FormStream ? {} : {
-        json: options.data
-      }),
-      ...gotOptions
-    });
-
-    if (responseType === 'stream' && options.data instanceof FormStream) {
-      options.data.pipe(res);
-    }
-
-    if (responseType === 'stream') {
-      return res;
-    }
-
-    return res.then(res => ({
-      status: res.statusCode,
-      headers: res.headers,
-      data: res.body
-    }));
-  }
-
-  static async getText(options) {
-    return this.getRaw(options, 'text');
-  }
-
-  static async postText(options) {
-    return this.postRaw(options, 'text');
-  }
-
-  static async get(options) {
-    return this.getRaw(options, 'json');
-  }
-
-  static async post(options) {
-    return this.postRaw(options, 'json');
-  }
-
-  static getStream(options) {
-    return this.getRaw(options, 'stream');
-  }
-
-  static postStream(options) {
-    return this.postRaw(options, 'stream');
-  }
-
-  static isTimeoutError(err) {
-    return err instanceof got.TimeoutError;
-  }
-
-  constructor(options) {
-    this.options = options;
+import { XRequest } from '@jayfong/x-request';
+export * from '@jayfong/x-request';
+export class RequestService extends XRequest {
+  constructor(...args) {
+    super(...args);
     this.serviceName = 'request';
   }
-
-  getRaw(options, responseType) {
-    var _this$options;
-
-    return RequestService.getRaw({ ...this.options,
-      ...options,
-      headers: { ...((_this$options = this.options) == null ? void 0 : _this$options.headers),
-        ...options.headers
-      }
-    }, responseType);
-  }
-
-  postRaw(options, responseType) {
-    var _this$options2;
-
-    return RequestService.postRaw({ ...this.options,
-      ...options,
-      headers: { ...((_this$options2 = this.options) == null ? void 0 : _this$options2.headers),
-        ...options.headers
-      }
-    }, responseType);
-  }
-
-  async getText(options) {
-    return this.getRaw(options, 'text');
-  }
-
-  async postText(options) {
-    return this.postRaw(options, 'text');
-  }
-
-  async get(options) {
-    return this.getRaw(options, 'json');
-  }
-
-  async post(options) {
-    return this.postRaw(options, 'json');
-  }
-
-  getStream(options) {
-    return this.getRaw(options, 'stream');
-  }
-
-  postStream(options) {
-    return this.postRaw(options, 'stream');
-  }
-
-  isTimeoutError(err) {
-    return RequestService.isTimeoutError(err);
-  }
-
 }

package/lib/services/sensitive_words.js

@@ -1,6 +1,5 @@
 import Mint from 'mint-filter';
 import { removeBlankChars, removeNonWordChars, toHalfWidthString } from 'vtils';
-
 /**
  * 敏感词服务。
  */
@@ -10,30 +9,32 @@ export class SensitiveWordsService {
     this.serviceName = 'sensitiveWords';
     this.mint = void 0;
   }
+
   /**
    * 文本转换。
    */
-
-
   transform(text) {
-    return (// 移除空白字符
-      removeBlankChars( // 移除非单词字符
-      removeNonWordChars( // 全角转半角
-      toHalfWidthString(text))) // 转小写
-      .toLowerCase() // 叠词归一
+    return (
+      // 移除空白字符
+      removeBlankChars(
+      // 移除非单词字符
+      removeNonWordChars(
+      // 全角转半角
+      toHalfWidthString(text)))
+      // 转小写
+      .toLowerCase()
+      // 叠词归一
       .replace(/(.)\1+/g, '$1')
     );
   }
+
   /**
    * 处理文本，敏感词将被替换为 * 号。
    */
-
-
   async process(text) {
     if (!this.mint) {
       this.mint = new Mint(this.options.words);
     }
-
     const res = await this.mint.filter(this.transform(text), {
       every: true,
       replace: true,
@@ -41,16 +42,14 @@ export class SensitiveWordsService {
     });
     return res.text;
   }
+
   /**
    * 验证文本是否包含敏感词。
    */
-
-
   async validate(text, every) {
     if (!this.mint) {
       this.mint = new Mint(this.options.words);
     }
-
     const res = await this.mint.filter(this.transform(text), {
       replace: false,
       every: !!every,
@@ -61,5 +60,4 @@ export class SensitiveWordsService {
       words: res.words
     };
   }
-
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.12.7",
+  "version": "2.12.15",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -13,25 +13,17 @@
     "lib"
   ],
   "scripts": {
-    "bootstrap": "tyn --frozen-lockfile",
     "build": "haoma compile",
     "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
-    "dev": "rm -rf lib && tsc -w -p ./tsconfig.build.json",
-    "release": "source proxy-use-trojan.sh && tyn test && standard-version -a && tyn build && npm publish && haoma run ./scripts/publish_client_helper_package.ts && git push --follow-tags origin master",
     "test": "tsc --noEmit -p ./tsconfig.build.json && jest \"$(pwd)/src/\"",
-    "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest",
-    "updeps": "tnpx npm-check-updates --target minor --upgrade"
-  },
-  "husky": {
-    "hooks": {
-      "post-merge": "tyn bootstrap"
-    }
+    "test_all": "tsc --noEmit -p ./tsconfig.build.json && jest"
   },
   "dependencies": {
     "@fastify/cors": "^8.3.0",
     "@fastify/formbody": "^7.4.0",
     "@fastify/multipart": "^7.7.0",
     "@fastify/websocket": "^8.1.0",
+    "@jayfong/x-request": "^2.12.15",
     "@prisma/client": "^4.8.0",
     "@types/busboy": "^0.3.2",
     "@types/cron": "^2.0.0",
@@ -49,15 +41,11 @@
     "cuid": "^2.1.8",
     "debug": "^4.3.4",
     "esbuild": "^0.18.11",
-    "esbuild-register": "^3.4.2",
     "execa": "^5.1.1",
     "exit-hook": "^2.2.1",
     "fast-xml-parser": "^4.2.5",
     "fastify": "^4.19.2",
-    "form-data": "^4.0.0",
-    "formstream": "^1.2.0",
     "fs-extra": "^10.0.1",
-    "get-port": "^7.0.0",
     "globby": "^11",
     "got": "^11.8.2",
     "http-errors": "^2.0.0",
@@ -71,11 +59,9 @@
     "nodemailer": "^6.7.3",
     "pino-pretty": "^10.0.1",
     "prisma": "^4.8.0",
-    "proxy-agent": "^6.2.2",
     "select-run": "^1.1.2",
     "supports-color": "^8",
     "svg-captcha": "^1.4.0",
-    "tough-cookie": "^4.1.3",
     "ts-morph": "^12.2.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
@@ -90,20 +76,10 @@
     "@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": "^8.7.0",
-    "jest": "^27.5.1",
     "json-xml-parse": "^1.2.4",
-    "lint-staged": "^10.5.4",
     "node-fetch": "^3.3.1",
-    "npm-check-updates": "^12.5.9",
-    "prettier": "^2.8.8",
-    "proxy": "^2.1.1",
-    "standard-version": "^9.3.2",
-    "typescript": "^5.1.6",
-    "typescript-snapshots-plugin": "^1.7.0"
+    "npm-check-updates": "^12.5.9"
   },
   "publishConfig": {
     "access": "public"

package/README.md

@@ -1,51 +0,0 @@
-# x-server
-
-X 服务端。
-
-## 技术栈
-
-- [fastify v3](https://github.com/fastify/fastify)
-- [prisma v3](https://github.com/prisma/prisma)
-
-## 特性
-
-- 通过 `cache` 支持 redis 缓存
-- 通过 `jwt` 支持用户认证
-- 通过 `captcha` 支持验证码
-- 通过 `defineHandler` 支持 POST、GET、POST、FILE、WS、XML 请求
-- 通过 `defineTask` 支持定时任务
-
-## 命令
-
-### xs dev
-
-开始开发
-
-- `-i aaa -i bbb`: 额外需要生成的索引文件
-- `-npc xxx@bbbb`: npc 地址及密钥，格式：地址@密钥
-
-### xs build
-
-构建
-
-- `-e aaa -e bbb`: 不应该被打的包
-
-### xs deploy
-
-部署
-
-### xs api
-
-生成 API
-
-### xs prisma
-
-prisma 代理，主要为了注入环境变量
-
-- `-p false`: 是否生产模式
-
-### xs run
-
-执行 package.json 里的脚本
-
-- `-p false`: 是否生产模式

package/lib/_cjs/cli/register.js

@@ -1,8 +0,0 @@
-"use strict";
-
-var _node = require("esbuild-register/dist/node");
-
-(0, _node.register)({
-  hookIgnoreNodeModules: false,
-  hookMatcher: filename => filename.includes('/.x/') || !filename.includes('/node_modules/')
-});