@jayfong/x-server 1.33.1 → 1.33.4

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 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.33.4](https://github.com/jfWorks/x-server/compare/v1.33.3...v1.33.4) (2022-07-17)
+
+
+### Bug Fixes
+
+* remove console log ([13df7b1](https://github.com/jfWorks/x-server/commit/13df7b1728ab67df8206e79b2742f03143ff5668))
+
+### [1.33.3](https://github.com/jfWorks/x-server/compare/v1.33.2...v1.33.3) (2022-07-07)
+
+### [1.33.2](https://github.com/jfWorks/x-server/compare/v1.33.1...v1.33.2) (2022-06-28)
+
 ### [1.33.1](https://github.com/jfWorks/x-server/compare/v1.33.0...v1.33.1) (2022-06-12)
 
 ## [1.33.0](https://github.com/jfWorks/x-server/compare/v1.32.1...v1.33.0) (2022-06-11)

package/lib/_cjs/cli/build_util.js

@@ -164,7 +164,12 @@ class BuildUtil {
 
     await (0, _execa.default)('tyn', {
       cwd: distDir,
-      stdio: 'inherit'
+      stdio: 'inherit',
+      env: {
+        // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
+        // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
+        yarn_disable_self_update_check: 'true'
+      }
     }); // 打包为 tgz
 
     await _compressing.default.tgz.compressDir(distDir, distBundleFile);

package/lib/_cjs/services/captcha.js

@@ -17,16 +17,19 @@ class CaptchaService {
     this.serviceName = 'captcha';
   }
 
-  async generate() {
+  async generate(scene) {
     const code = Math.random().toString().slice(0 - this.options.size);
-    const token = await _x.x.cache.save(code, this.options.ttl);
+    const token = await _x.x.cache.save({
+      code,
+      scene
+    }, this.options.ttl);
     return {
       token: token,
       code: code
     };
   }
 
-  async generateImage() {
+  async generateImage(scene) {
     const {
       text: code,
       data: svg
@@ -34,7 +37,10 @@ class CaptchaService {
       size: this.options.size
     });
 
-    const token = await _x.x.cache.save(code, this.options.ttl);
+    const token = await _x.x.cache.save({
+      code,
+      scene
+    }, this.options.ttl);
     return {
       token: token,
       code: code,
@@ -42,12 +48,12 @@ class CaptchaService {
     };
   }
 
-  async generateDataUrl() {
+  async generateDataUrl(scene) {
     const {
       token,
       code,
       svg
-    } = await this.generateImage();
+    } = await this.generateImage(scene);
     const dataUrl = (0, _miniSvgDataUri.default)(svg);
     return {
       token: token,
@@ -61,14 +67,14 @@ class CaptchaService {
       return false;
     }
 
-    const expectedCode = await _x.x.cache.get(options.token);
+    const expected = await _x.x.cache.get(options.token);
 
-    if (expectedCode == null) {
+    if (expected == null) {
       return false;
     }
 
     await _x.x.cache.remove(options.token);
-    return options.code.toLowerCase() === expectedCode.toLowerCase();
+    return expected.scene === options.scene && options.code.toLowerCase() === expected.code.toLowerCase();
   }
 
 }

package/lib/_cjs/services/jwt.js

@@ -29,7 +29,6 @@ class JwtService {
         ignoreExpiration: false
       }, (err, data) => {
         if (err) {
-          console.log(err);
           reject(new _http_error.HttpError.Unauthorized());
         } else {
           resolve(data);

package/lib/cli/build_util.js

@@ -138,7 +138,12 @@ export class BuildUtil {
 
     await exec('tyn', {
       cwd: distDir,
-      stdio: 'inherit'
+      stdio: 'inherit',
+      env: {
+        // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
+        // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
+        yarn_disable_self_update_check: 'true'
+      }
     }); // 打包为 tgz
 
     await compressing.tgz.compressDir(distDir, distBundleFile);

package/lib/services/captcha.d.ts

@@ -27,14 +27,15 @@ export interface CaptchaServiceGenerateDataUrlResult {
 export interface CaptchaServiceVerifyOptions {
     token: string;
     code: string;
+    scene: string;
 }
 export declare class CaptchaService implements BaseService {
     private options;
     serviceName: string;
     constructor(options: CaptchaServiceOptions);
-    generate(): Promise<CaptchaServiceGenerateResult>;
-    generateImage(): Promise<CaptchaServiceGenerateImageResult>;
-    generateDataUrl(): Promise<CaptchaServiceGenerateDataUrlResult>;
+    generate(scene: string): Promise<CaptchaServiceGenerateResult>;
+    generateImage(scene: string): Promise<CaptchaServiceGenerateImageResult>;
+    generateDataUrl(scene: string): Promise<CaptchaServiceGenerateDataUrlResult>;
     verify(options: CaptchaServiceVerifyOptions): Promise<boolean>;
 }
 declare module '../x' {

package/lib/services/captcha.js

@@ -7,23 +7,29 @@ export class CaptchaService {
     this.serviceName = 'captcha';
   }
 
-  async generate() {
+  async generate(scene) {
     const code = Math.random().toString().slice(0 - this.options.size);
-    const token = await x.cache.save(code, this.options.ttl);
+    const token = await x.cache.save({
+      code,
+      scene
+    }, this.options.ttl);
     return {
       token: token,
       code: code
     };
   }
 
-  async generateImage() {
+  async generateImage(scene) {
     const {
       text: code,
       data: svg
     } = svgCaptcha.create({
       size: this.options.size
     });
-    const token = await x.cache.save(code, this.options.ttl);
+    const token = await x.cache.save({
+      code,
+      scene
+    }, this.options.ttl);
     return {
       token: token,
       code: code,
@@ -31,12 +37,12 @@ export class CaptchaService {
     };
   }
 
-  async generateDataUrl() {
+  async generateDataUrl(scene) {
     const {
       token,
       code,
       svg
-    } = await this.generateImage();
+    } = await this.generateImage(scene);
     const dataUrl = svgToDataUrl(svg);
     return {
       token: token,
@@ -50,14 +56,14 @@ export class CaptchaService {
       return false;
     }
 
-    const expectedCode = await x.cache.get(options.token);
+    const expected = await x.cache.get(options.token);
 
-    if (expectedCode == null) {
+    if (expected == null) {
       return false;
     }
 
     await x.cache.remove(options.token);
-    return options.code.toLowerCase() === expectedCode.toLowerCase();
+    return expected.scene === options.scene && options.code.toLowerCase() === expected.code.toLowerCase();
   }
 
 }

package/lib/services/jwt.js

@@ -19,7 +19,6 @@ export class JwtService {
         ignoreExpiration: false
       }, (err, data) => {
         if (err) {
-          console.log(err);
           reject(new HttpError.Unauthorized());
         } else {
           resolve(data);

package/package.json

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