@jayfong/x-server 1.16.0 → 1.18.0

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.18.0](https://github.com/jfWorks/x-server/compare/v1.17.0...v1.18.0) (2022-04-27)
+
+
+### Features
+
+* setHeader ([07596ba](https://github.com/jfWorks/x-server/commit/07596ba1c83f6a7583e16b969332936339bd06a8))
+
+## [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)
 
 

package/lib/_cjs/core/server.js

@@ -87,14 +87,22 @@ 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,
+              setHeader: res.header,
               redirect: undefined,
               ws: req
             });
@@ -120,7 +128,9 @@ class Server {
             ...req.body,
             ...files
           }, {
+            url: url,
             headers: req.headers,
+            setHeader: res.header,
             redirect: url => res.redirect(url),
             ws: undefined
           });

package/lib/_cjs/services/rate_limit.js

@@ -8,14 +8,14 @@ var _x = require("../x");
 class RateLimitService {
   constructor() {
     this.serviceName = 'rateLimit';
-    this.cacheService = _x.x.cache.fork();
   }
 
   async limitByCount(options) {
-    const remainingCount = await this.cacheService.get(['rateLimit', options.key]);
+    const cacheKey = `rateLimit_${options.key}`;
+    const remainingCount = await _x.x.cache.get(cacheKey);
 
     if (remainingCount == null) {
-      await this.cacheService.set(['rateLimit', options.key], options.count, options.ttl);
+      await _x.x.cache.set(cacheKey, options.count, options.ttl);
       return options.count;
     }
 
@@ -23,7 +23,7 @@ class RateLimitService {
       return 0;
     }
 
-    await this.cacheService.decrease(['rateLimit', options.key]);
+    await _x.x.cache.decrease(cacheKey);
     return remainingCount - 1;
   }
 

package/lib/core/server.js

@@ -74,14 +74,20 @@ 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,
+              setHeader: res.header,
               redirect: undefined,
               ws: req
             });
@@ -107,7 +113,9 @@ export class Server {
             ...req.body,
             ...files
           }, {
+            url: url,
             headers: req.headers,
+            setHeader: res.header,
             redirect: url => res.redirect(url),
             ws: undefined
           });

package/lib/core/types.d.ts

@@ -45,10 +45,18 @@ export declare namespace XHandler {
     interface ExtraContext {
     }
     interface Context extends ExtraContext {
+        /**
+         * 当前请求的地址
+         */
+        url: string;
         /**
          * 请求头
          */
         headers: IncomingHttpHeaders;
+        /**
+         * 设置响应头
+         */
+        setHeader: (key: keyof IncomingHttpHeaders, value: string) => void;
         /**
          * HTTP 跳转
          */

package/lib/services/rate_limit.d.ts

@@ -7,7 +7,6 @@ export interface RateLimitLimitByCountOptions {
 }
 export declare class RateLimitService implements BaseService {
     serviceName: string;
-    private cacheService;
     limitByCount(options: RateLimitLimitByCountOptions): Promise<number>;
 }
 declare module '../x' {

package/lib/services/rate_limit.js

@@ -2,14 +2,14 @@ import { x } from "../x";
 export class RateLimitService {
   constructor() {
     this.serviceName = 'rateLimit';
-    this.cacheService = x.cache.fork();
   }
 
   async limitByCount(options) {
-    const remainingCount = await this.cacheService.get(['rateLimit', options.key]);
+    const cacheKey = `rateLimit_${options.key}`;
+    const remainingCount = await x.cache.get(cacheKey);
 
     if (remainingCount == null) {
-      await this.cacheService.set(['rateLimit', options.key], options.count, options.ttl);
+      await x.cache.set(cacheKey, options.count, options.ttl);
       return options.count;
     }
 
@@ -17,7 +17,7 @@ export class RateLimitService {
       return 0;
     }
 
-    await this.cacheService.decrease(['rateLimit', options.key]);
+    await x.cache.decrease(cacheKey);
     return remainingCount - 1;
   }
 

package/package.json

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