@jayfong/x-server 2.16.4 → 2.16.5

package/lib/_cjs/services/captcha.js

@@ -3,36 +3,51 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.CaptchaService = void 0;
-var _svgCaptcha = _interopRequireDefault(require("svg-captcha"));
 var _miniSvgDataUri = _interopRequireDefault(require("mini-svg-data-uri"));
+var _svgCaptcha = _interopRequireDefault(require("svg-captcha"));
+var _vtils = require("vtils");
 var _x = require("../x");
 class CaptchaService {
-  constructor(options) {
-    this.options = options;
+  constructor() {
     this.serviceName = 'captcha';
+    this.charsetMap = {
+      '09': '0123456789'.split(''),
+      '19': '123456789'.split(''),
+      'az': 'abcdefghijklmnopqrstuvwxyz'.split(''),
+      'AZ': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      'aZ': 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      '0z': '0123456789abcdefghijklmnopqrstuvwxyz'.split(''),
+      '0Z': '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      '1z': '123456789abcdefghijklmnopqrstuvwxyz'.split(''),
+      '1Z': '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
+    };
   }
-  async generate(scene) {
-    const code = Math.random().toString().slice(0 - this.options.size);
+  async generate(payload) {
+    const chars = this.charsetMap[payload.charset];
+    let code = '';
+    for (let i = 0; i < payload.size; i++) {
+      code += (0, _vtils.sample)(chars);
+    }
     const token = await _x.x.cache.save({
-      code,
-      scene
-    }, this.options.ttl);
+      code: code,
+      scene: payload.scene
+    }, payload.ttl);
     return {
       token: token,
       code: code
     };
   }
-  async generateDataUrl(scene) {
+  async generateDataUrl(payload) {
     const {
       text: code,
       data: svg
     } = _svgCaptcha.default.create({
-      size: this.options.size
+      size: payload.size
     });
     const token = await _x.x.cache.save({
       code,
-      scene
-    }, this.options.ttl);
+      scene: payload.scene
+    }, payload.ttl);
     const dataUrl = (0, _miniSvgDataUri.default)(svg);
     return {
       token: token,
@@ -41,9 +56,6 @@ class CaptchaService {
     };
   }
   async verify(options) {
-    if (options.code.length !== this.options.size) {
-      return false;
-    }
     const expected = await _x.x.cache.get(options.token);
     if (expected == null) {
       return false;

package/lib/services/captcha.d.ts

@@ -1,6 +1,11 @@
+import { type MsValue } from 'vtils';
 import { BaseService } from './base';
-import type { MsValue } from 'vtils';
-export interface CaptchaServiceOptions {
+export type CaptchaServiceGenerateCharset = '09' | '19' | 'az' | 'AZ' | 'aZ' | '0z' | '0Z' | '1z' | '1Z';
+export interface CaptchaServiceGeneratePayload {
+    /**
+     * 场景值
+     */
+    scene: string;
     /**
      * 验证码长度
      */
@@ -9,6 +14,10 @@ export interface CaptchaServiceOptions {
      * 验证码存活时长
      */
     ttl: MsValue;
+    /**
+     * 字符集
+     */
+    charset: CaptchaServiceGenerateCharset;
 }
 export interface CaptchaServiceGenerateResult {
     token: string;
@@ -30,11 +39,10 @@ export interface CaptchaServiceVerifyOptions {
     scene: string;
 }
 export declare class CaptchaService implements BaseService {
-    private options;
     serviceName: string;
-    constructor(options: CaptchaServiceOptions);
-    generate(scene: string): Promise<CaptchaServiceGenerateResult>;
-    generateDataUrl(scene: string): Promise<CaptchaServiceGenerateDataUrlResult>;
+    private charsetMap;
+    generate(payload: CaptchaServiceGeneratePayload): Promise<CaptchaServiceGenerateResult>;
+    generateDataUrl(payload: CaptchaServiceGeneratePayload): Promise<CaptchaServiceGenerateDataUrlResult>;
     verify(options: CaptchaServiceVerifyOptions): Promise<boolean>;
 }
 declare module '../x' {

package/lib/services/captcha.js

@@ -1,33 +1,48 @@
-import svgCaptcha from 'svg-captcha';
 import svgToDataUrl from 'mini-svg-data-uri';
+import svgCaptcha from 'svg-captcha';
+import { sample } from 'vtils';
 import { x } from "../x";
 export class CaptchaService {
-  constructor(options) {
-    this.options = options;
+  constructor() {
     this.serviceName = 'captcha';
+    this.charsetMap = {
+      '09': '0123456789'.split(''),
+      '19': '123456789'.split(''),
+      'az': 'abcdefghijklmnopqrstuvwxyz'.split(''),
+      'AZ': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      'aZ': 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      '0z': '0123456789abcdefghijklmnopqrstuvwxyz'.split(''),
+      '0Z': '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+      '1z': '123456789abcdefghijklmnopqrstuvwxyz'.split(''),
+      '1Z': '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
+    };
   }
-  async generate(scene) {
-    const code = Math.random().toString().slice(0 - this.options.size);
+  async generate(payload) {
+    const chars = this.charsetMap[payload.charset];
+    let code = '';
+    for (let i = 0; i < payload.size; i++) {
+      code += sample(chars);
+    }
     const token = await x.cache.save({
-      code,
-      scene
-    }, this.options.ttl);
+      code: code,
+      scene: payload.scene
+    }, payload.ttl);
     return {
       token: token,
       code: code
     };
   }
-  async generateDataUrl(scene) {
+  async generateDataUrl(payload) {
     const {
       text: code,
       data: svg
     } = svgCaptcha.create({
-      size: this.options.size
+      size: payload.size
     });
     const token = await x.cache.save({
       code,
-      scene
-    }, this.options.ttl);
+      scene: payload.scene
+    }, payload.ttl);
     const dataUrl = svgToDataUrl(svg);
     return {
       token: token,
@@ -36,9 +51,6 @@ export class CaptchaService {
     };
   }
   async verify(options) {
-    if (options.code.length !== this.options.size) {
-      return false;
-    }
     const expected = await x.cache.get(options.token);
     if (expected == null) {
       return false;

package/package.json

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