@jayfong/x-server 1.15.1 → 1.16.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.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)
+
+
+### Bug Fixes
+
+* verify ([aeaddd0](https://github.com/jfWorks/x-server/commit/aeaddd0eb307e815ee3d8f92e48dd7755cabce89))
+
+### [1.15.2](https://github.com/jfWorks/x-server/compare/v1.15.1...v1.15.2) (2022-04-26)
+
+
+### Bug Fixes
+
+* 验证码应取小写判断 ([36fa3f8](https://github.com/jfWorks/x-server/commit/36fa3f83374777740c28b1775efc4d1f5694a918))
+
 ### [1.15.1](https://github.com/jfWorks/x-server/compare/v1.15.0...v1.15.1) (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/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/captcha.js

@@ -46,8 +46,13 @@ class CaptchaService {
     }
 
     const expectedCode = await _x.x.cache.get(options.token);
+
+    if (expectedCode == null) {
+      return false;
+    }
+
     await _x.x.cache.remove(options.token);
-    return options.code === expectedCode;
+    return options.code.toLowerCase() === expectedCode.toLowerCase();
   }
 
 }

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';
+    this.cacheService = _x.x.cache.fork();
+  }
+
+  async limitByCount(options) {
+    const remainingCount = await this.cacheService.get(['rateLimit', options.key]);
+
+    if (remainingCount == null) {
+      await this.cacheService.set(['rateLimit', options.key], options.count, options.ttl);
+      return options.count;
+    }
+
+    if (remainingCount === 0) {
+      return 0;
+    }
+
+    await this.cacheService.decrease(['rateLimit', options.key]);
+    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/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/captcha.js

@@ -36,8 +36,13 @@ export class CaptchaService {
     }
 
     const expectedCode = await x.cache.get(options.token);
+
+    if (expectedCode == null) {
+      return false;
+    }
+
     await x.cache.remove(options.token);
-    return options.code === expectedCode;
+    return options.code.toLowerCase() === expectedCode.toLowerCase();
   }
 
 }

package/lib/services/rate_limit.d.ts

@@ -0,0 +1,17 @@
+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;
+    private cacheService;
+    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';
+    this.cacheService = x.cache.fork();
+  }
+
+  async limitByCount(options) {
+    const remainingCount = await this.cacheService.get(['rateLimit', options.key]);
+
+    if (remainingCount == null) {
+      await this.cacheService.set(['rateLimit', options.key], options.count, options.ttl);
+      return options.count;
+    }
+
+    if (remainingCount === 0) {
+      return 0;
+    }
+
+    await this.cacheService.decrease(['rateLimit', options.key]);
+    return remainingCount - 1;
+  }
+
+}

package/package.json

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