@jayfong/x-server 1.14.0 → 1.15.1

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.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)
+
+
+### Features
+
+* x.env ([e39771f](https://github.com/jfWorks/x-server/commit/e39771f998f4b952bda528105fb18b6895e0ce81))
+
+### [1.14.1](https://github.com/jfWorks/x-server/compare/v1.14.0...v1.14.1) (2022-04-26)
+
+
+### Bug Fixes
+
+* requestDataSchema ([8b4f910](https://github.com/jfWorks/x-server/commit/8b4f910b1e9efbc082571b9ef407d7baf31b6319))
+
 ## [1.14.0](https://github.com/jfWorks/x-server/compare/v1.13.1...v1.14.0) (2022-04-26)
 
 

package/lib/_cjs/cli/build_util.js

@@ -75,7 +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(';')}` || ''};`
+        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/cli/env_util.js

@@ -105,9 +105,18 @@ class EnvUtil {
   }
 
   static async importFile(options) {
-    for (const env of await EnvUtil.parseFile(options)) {
+    const envs = await EnvUtil.parseFile(options);
+    const envsObj = {};
+
+    for (const env of envs) {
+      envsObj[env.key] = env.value;
       process.env[env.key] = env.value;
     }
+
+    process.env.X_SERVER_ENVS = JSON.stringify({ // @ts-ignore
+      ...JSON.parse(process.env.X_SERVER_ENVS || '{}'),
+      ...envsObj
+    });
   }
 
   static makeTypes(envs) {

package/lib/_cjs/core/handler.js

@@ -9,9 +9,12 @@ var _dispose = require("../services/dispose");
 
 var _http_error = require("../core/http_error");
 
+var _validator = require("vtils/validator");
+
 class Handler {
   constructor(options) {
     this.options = options;
+    this.requestDataSchema = void 0;
 
     this.handle = async (data, ctx) => {
       // 前置 hook
@@ -27,11 +30,10 @@ class Handler {
     };
 
     this.handleHttp = async (data, ctx) => {
-      // 输入验证
-      if (this.options.requestDataSchema) {
+      // 请求数据验证
+      if (this.requestDataSchema) {
         try {
-          data = await this.options.requestDataSchema.validate( // @ts-ignore
-          data, {
+          data = await this.requestDataSchema.validate(data, {
             strict: true,
             abortEarly: true,
             stripUnknown: true
@@ -92,6 +94,10 @@ class Handler {
         dispose.dispose();
       });
     };
+
+    if (options.requestDataSchema) {
+      this.requestDataSchema = options.requestDataSchema(_validator.yup);
+    }
   }
 
   static addHook(hook) {

package/lib/_cjs/services/captcha.js

@@ -41,9 +41,7 @@ class CaptchaService {
   }
 
   async verify(options) {
-    var _options$code;
-
-    if (((_options$code = options.code) == null ? void 0 : _options$code.length) !== this.options.size) {
+    if (options.code.length !== this.options.size) {
       return false;
     }
 

package/lib/_cjs/x.js

@@ -5,8 +5,10 @@ exports.x = void 0;
 
 var _dispose = require("./services/dispose");
 
+const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 const x = {
-  appId: process.env.APP_ID,
+  appId: env.APP_ID,
+  env: env,
   register: (...services) => {
     for (const service of services) {
       // @ts-ignore

package/lib/cli/build_util.js

@@ -51,7 +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(';')}` || ''};`
+        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/cli/env_util.js

@@ -95,9 +95,18 @@ export class EnvUtil {
   }
 
   static async importFile(options) {
-    for (const env of await EnvUtil.parseFile(options)) {
+    const envs = await EnvUtil.parseFile(options);
+    const envsObj = {};
+
+    for (const env of envs) {
+      envsObj[env.key] = env.value;
       process.env[env.key] = env.value;
     }
+
+    process.env.X_SERVER_ENVS = JSON.stringify({ // @ts-ignore
+      ...JSON.parse(process.env.X_SERVER_ENVS || '{}'),
+      ...envsObj
+    });
   }
 
   static makeTypes(envs) {

package/lib/core/handler.d.ts

@@ -1,6 +1,7 @@
 import type { XHandler } from './types';
 export declare class Handler<TReqData extends any = void, TResData extends any = void, TReqMethod extends XHandler.Method = XHandler.Method> {
     readonly options: XHandler.Options<TReqData, TResData, TReqMethod>;
+    private requestDataSchema;
     constructor(options: XHandler.Options<TReqData, TResData, TReqMethod>);
     handle: XHandler.Handle<TReqData, TResData, TReqMethod>;
     private handleHttp;

package/lib/core/handler.js

@@ -1,9 +1,11 @@
 import { DataPacker } from 'vtils';
 import { DisposeService } from "../services/dispose";
 import { HttpError } from "../core/http_error";
+import { yup } from 'vtils/validator';
 export class Handler {
   constructor(options) {
     this.options = options;
+    this.requestDataSchema = void 0;
 
     this.handle = async (data, ctx) => {
       // 前置 hook
@@ -19,11 +21,10 @@ export class Handler {
     };
 
     this.handleHttp = async (data, ctx) => {
-      // 输入验证
-      if (this.options.requestDataSchema) {
+      // 请求数据验证
+      if (this.requestDataSchema) {
         try {
-          data = await this.options.requestDataSchema.validate( // @ts-ignore
-          data, {
+          data = await this.requestDataSchema.validate(data, {
             strict: true,
             abortEarly: true,
             stripUnknown: true
@@ -84,6 +85,10 @@ export class Handler {
         dispose.dispose();
       });
     };
+
+    if (options.requestDataSchema) {
+      this.requestDataSchema = options.requestDataSchema(yup);
+    }
   }
 
   static addHook(hook) {

package/lib/services/captcha.js

@@ -31,9 +31,7 @@ export class CaptchaService {
   }
 
   async verify(options) {
-    var _options$code;
-
-    if (((_options$code = options.code) == null ? void 0 : _options$code.length) !== this.options.size) {
+    if (options.code.length !== this.options.size) {
       return false;
     }
 

package/lib/x.d.ts

@@ -1,7 +1,9 @@
+/// <reference types="node" />
 import { BaseService } from './services/base';
 import './services/dispose';
 export interface X {
     readonly appId: string;
+    readonly env: NodeJS.ProcessEnv;
     readonly register: (...services: BaseService[]) => void;
 }
 export declare const x: X;

package/lib/x.js

@@ -1,6 +1,8 @@
 import { DisposeService } from "./services/dispose";
+const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 export const x = {
-  appId: process.env.APP_ID,
+  appId: env.APP_ID,
+  env: env,
   register: (...services) => {
     for (const service of services) {
       // @ts-ignore

package/package.json

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