@jayfong/x-server 1.15.0 → 1.15.3

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.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)
+
+
+### Bug Fixes
+
+* env ([4ae102e](https://github.com/jfWorks/x-server/commit/4ae102eabe2fb0f99f6367d75314d9b2db6b556e))
+* envs ([6fe04ee](https://github.com/jfWorks/x-server/commit/6fe04eedcc2875edd5e0b7398b3fe8f7a826c3e1))
+
 ## [1.15.0](https://github.com/jfWorks/x-server/compare/v1.14.1...v1.15.0) (2022-04-26)
 
 

package/lib/_cjs/cli/build_util.js

@@ -23,7 +23,7 @@ var _vtils = require("vtils");
 
 class BuildUtil {
   static async build(options) {
-    var _options$minify;
+    var _options$minify, _options$inlineEnvs;
 
     const mainFile = _nodePath.default.join(options.cwd, 'src/main.ts');
 
@@ -75,10 +75,10 @@ class BuildUtil {
       sourcemap: false,
       treeShaking: true,
       banner: {
-        js: `;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((options.inlineEnvs || []).reduce((res, item) => {
           res[item.key] = item.value;
           return res;
-        }, {}))}};`
+        }, {}))};`
       },
       plugins: [{
         name: 'extract-assets',

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/cli/build_util.js

@@ -8,7 +8,7 @@ import path from 'node:path';
 import { dedent, uniq } from 'vtils';
 export class BuildUtil {
   static async build(options) {
-    var _options$minify;
+    var _options$minify, _options$inlineEnvs;
 
     const mainFile = path.join(options.cwd, 'src/main.ts');
     const pkgFile = path.join(options.cwd, 'package.json');
@@ -51,10 +51,10 @@ export class BuildUtil {
       sourcemap: false,
       treeShaking: true,
       banner: {
-        js: `;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((options.inlineEnvs || []).reduce((res, item) => {
           res[item.key] = item.value;
           return res;
-        }, {}))}};`
+        }, {}))};`
       },
       plugins: [{
         name: 'extract-assets',

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/package.json

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