@jayfong/x-server 1.15.3 → 1.17.0

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.17.0](https://github.com/jfWorks/x-server/compare/v1.16.1...v1.17.0) (2022-04-27)
+
+
+### Features
+
+* add ctx.url ([1092009](https://github.com/jfWorks/x-server/commit/10920094646e975e74dc0339ecc290e257f3ca52))
+
+### [1.16.1](https://github.com/jfWorks/x-server/compare/v1.16.0...v1.16.1) (2022-04-27)
+
+
+### Bug Fixes
+
+* RateLimitService ([20a489e](https://github.com/jfWorks/x-server/commit/20a489e3cb119ba055d4c77983354f607f61af0b))
+
+## [1.16.0](https://github.com/jfWorks/x-server/compare/v1.15.3...v1.16.0) (2022-04-27)
+
+
+### Features
+
+* add RateLimitService ([49b5edb](https://github.com/jfWorks/x-server/commit/49b5edba451dd355a24a1b5cc4e52ec14a8769e4))
+
+
+### Bug Fixes
+
+* X_SERVER_ENVS ([6586cec](https://github.com/jfWorks/x-server/commit/6586cec0eb69336c379a52eb7bb67b29f6694785))
+
 ### [1.15.3](https://github.com/jfWorks/x-server/compare/v1.15.2...v1.15.3) (2022-04-26)
 
 

package/lib/_cjs/cli/build_util.js

@@ -75,10 +75,10 @@ class BuildUtil {
       sourcemap: false,
       treeShaking: true,
       banner: {
-        js: `${`;${(_options$inlineEnvs = options.inlineEnvs) == null ? void 0 : _options$inlineEnvs.map(env => `process.env[${JSON.stringify(env.key)}]=${JSON.stringify(env.value)}`).join(';')}` || ''};process.env.X_SERVER_ENVS=${JSON.stringify((options.inlineEnvs || []).reduce((res, item) => {
+        js: `${`;${(_options$inlineEnvs = options.inlineEnvs) == null ? void 0 : _options$inlineEnvs.map(env => `process.env[${JSON.stringify(env.key)}]=${JSON.stringify(env.value)}`).join(';')}` || ''};process.env.X_SERVER_ENVS=${JSON.stringify(JSON.stringify((options.inlineEnvs || []).reduce((res, item) => {
           res[item.key] = item.value;
           return res;
-        }, {}))};`
+        }, {})))};`
       },
       plugins: [{
         name: 'extract-assets',

package/lib/_cjs/core/server.js

@@ -87,13 +87,20 @@ class Server {
       const handlerMethod = handlerOptions.requestMethod || 'POST';
       const isWS = handlerMethod === 'WS';
       const serverMethod = isWS ? 'GET' : _http_method.HandlerMethodToHttpMethod[handlerMethod];
+
+      const appUrl = _x.x.env.APP_URL.replace(/\/+$/, '');
+
       this.fastify.route({
         method: serverMethod,
         url: item.path,
         websocket: isWS,
         handler: async (req, res) => {
+          const url = `${appUrl}${// 结构：/test/sss?x=2
+          req.url}`;
+
           if (isWS) {
             await item.handler.handle(undefined, {
+              url: url,
               headers: req.headers,
               redirect: undefined,
               ws: req
@@ -120,6 +127,7 @@ class Server {
             ...req.body,
             ...files
           }, {
+            url: url,
             headers: req.headers,
             redirect: url => res.redirect(url),
             ws: undefined

package/lib/_cjs/index.js

@@ -170,6 +170,14 @@ Object.keys(_mail).forEach(function (key) {
   exports[key] = _mail[key];
 });
 
+var _rate_limit = require("./services/rate_limit");
+
+Object.keys(_rate_limit).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _rate_limit[key]) return;
+  exports[key] = _rate_limit[key];
+});
+
 var _redis = require("./services/redis");
 
 Object.keys(_redis).forEach(function (key) {

package/lib/_cjs/services/rate_limit.js

@@ -0,0 +1,32 @@
+"use strict";
+
+exports.__esModule = true;
+exports.RateLimitService = void 0;
+
+var _x = require("../x");
+
+class RateLimitService {
+  constructor() {
+    this.serviceName = 'rateLimit';
+  }
+
+  async limitByCount(options) {
+    const cacheKey = `rateLimit_${options.key}`;
+    const remainingCount = await _x.x.cache.get(cacheKey);
+
+    if (remainingCount == null) {
+      await _x.x.cache.set(cacheKey, options.count, options.ttl);
+      return options.count;
+    }
+
+    if (remainingCount === 0) {
+      return 0;
+    }
+
+    await _x.x.cache.decrease(cacheKey);
+    return remainingCount - 1;
+  }
+
+}
+
+exports.RateLimitService = RateLimitService;

package/lib/cli/build_util.js

@@ -51,10 +51,10 @@ export class BuildUtil {
       sourcemap: false,
       treeShaking: true,
       banner: {
-        js: `${`;${(_options$inlineEnvs = options.inlineEnvs) == null ? void 0 : _options$inlineEnvs.map(env => `process.env[${JSON.stringify(env.key)}]=${JSON.stringify(env.value)}`).join(';')}` || ''};process.env.X_SERVER_ENVS=${JSON.stringify((options.inlineEnvs || []).reduce((res, item) => {
+        js: `${`;${(_options$inlineEnvs = options.inlineEnvs) == null ? void 0 : _options$inlineEnvs.map(env => `process.env[${JSON.stringify(env.key)}]=${JSON.stringify(env.value)}`).join(';')}` || ''};process.env.X_SERVER_ENVS=${JSON.stringify(JSON.stringify((options.inlineEnvs || []).reduce((res, item) => {
           res[item.key] = item.value;
           return res;
-        }, {}))};`
+        }, {})))};`
       },
       plugins: [{
         name: 'extract-assets',

package/lib/core/server.js

@@ -74,13 +74,18 @@ export class Server {
       const handlerMethod = handlerOptions.requestMethod || 'POST';
       const isWS = handlerMethod === 'WS';
       const serverMethod = isWS ? 'GET' : HandlerMethodToHttpMethod[handlerMethod];
+      const appUrl = x.env.APP_URL.replace(/\/+$/, '');
       this.fastify.route({
         method: serverMethod,
         url: item.path,
         websocket: isWS,
         handler: async (req, res) => {
+          const url = `${appUrl}${// 结构：/test/sss?x=2
+          req.url}`;
+
           if (isWS) {
             await item.handler.handle(undefined, {
+              url: url,
               headers: req.headers,
               redirect: undefined,
               ws: req
@@ -107,6 +112,7 @@ export class Server {
             ...req.body,
             ...files
           }, {
+            url: url,
             headers: req.headers,
             redirect: url => res.redirect(url),
             ws: undefined

package/lib/core/types.d.ts

@@ -45,6 +45,10 @@ export declare namespace XHandler {
     interface ExtraContext {
     }
     interface Context extends ExtraContext {
+        /**
+         * 当前请求的地址
+         */
+        url: string;
         /**
          * 请求头
          */

package/lib/index.d.ts

@@ -19,6 +19,7 @@ export * from './services/captcha';
 export * from './services/dispose';
 export * from './services/jwt';
 export * from './services/mail';
+export * from './services/rate_limit';
 export * from './services/redis';
 export * from './x';
 export * from '.x/models';

package/lib/index.js

@@ -20,6 +20,7 @@ export * from "./services/captcha";
 export * from "./services/dispose";
 export * from "./services/jwt";
 export * from "./services/mail";
+export * from "./services/rate_limit";
 export * from "./services/redis";
 export * from "./x"; // @endindex
 // @ts-ignore

package/lib/services/rate_limit.d.ts

@@ -0,0 +1,16 @@
+import { BaseService } from './base';
+import { MsValue } from 'vtils/date';
+export interface RateLimitLimitByCountOptions {
+    key: string;
+    count: number;
+    ttl: MsValue;
+}
+export declare class RateLimitService implements BaseService {
+    serviceName: string;
+    limitByCount(options: RateLimitLimitByCountOptions): Promise<number>;
+}
+declare module '../x' {
+    interface X {
+        rateLimit: RateLimitService;
+    }
+}

package/lib/services/rate_limit.js

@@ -0,0 +1,24 @@
+import { x } from "../x";
+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;
+  }
+
+}

package/package.json

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