@jayfong/x-server 2.10.0 → 2.11.0

package/lib/_cjs/cli/cli.js

@@ -142,7 +142,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   await _env_util.EnvUtil.importFile({
     cwd: process.cwd(),
     file: '.env'
-  });
+  }); // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
+  // https://github.com/motdotla/dotenv#override
+
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
   await (0, _execa.default)('tnpx', ['prisma', ...argv._.slice(1), '--schema', 'src/db/schema.prisma'], {
     cwd: process.cwd(),
@@ -179,18 +181,38 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
       stdio: 'inherit'
     });
   }
-}).command('deploy', '部署', async () => {
-  await _env_util.EnvUtil.importFile({
+}).command('deploy [type]', '部署', _ => _.positional('type', {
+  describe: '类型',
+  type: 'string',
+  choices: ['env']
+}), async argv => {
+  const deployEnv = await _env_util.EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
     file: '.env.deploy'
   });
-  await _deploy_util.DeployUtil.deploy({
-    cwd: process.cwd(),
-    host: process.env.HOST,
-    user: process.env.USER,
-    key: process.env.KEY,
-    dir: process.env.DIR,
-    cmd: process.env.CMD,
-    memory: process.env.MEMORY
-  });
+
+  if (argv.type === 'env') {
+    const appEnv = await _env_util.EnvUtil.parseFileAsMap({
+      cwd: process.cwd(),
+      file: '.env'
+    });
+    await _deploy_util.DeployUtil.deployEnv({
+      host: deployEnv.HOST,
+      user: deployEnv.USER,
+      key: deployEnv.KEY,
+      token: appEnv.APP_TOKEN,
+      port: appEnv.APP_PORT,
+      env: appEnv
+    });
+  } else {
+    await _deploy_util.DeployUtil.deploy({
+      cwd: process.cwd(),
+      host: deployEnv.HOST,
+      user: deployEnv.USER,
+      key: deployEnv.KEY,
+      dir: deployEnv.DIR,
+      cmd: deployEnv.CMD,
+      memory: deployEnv.MEMORY
+    });
+  }
 }).parse();

package/lib/_cjs/cli/deploy_util.js

@@ -57,6 +57,30 @@ class DeployUtil {
     ssh.dispose();
   }
 
+  static async deployEnv(options) {
+    const ssh = new _nodeSsh.NodeSSH();
+    await ssh.connect({
+      host: options.host,
+      username: options.user,
+      privateKey: options.key
+    });
+    await ssh.execCommand((0, _vtils.dedent)`
+        set -ex
+        curl --header "Content-Type: application/json" \\
+          --request "POST" \\
+          --data ${JSON.stringify(JSON.stringify({
+      token: options.token,
+      type: 'updateEnv',
+      data: options.env
+    }))} \\
+          "http://localhost:${options.port}/$"
+      `, {
+      onStdout: buf => console.log(buf.toString()),
+      onStderr: buf => console.log(buf.toString())
+    });
+    ssh.dispose();
+  }
+
 }
 
 exports.DeployUtil = DeployUtil;

package/lib/_cjs/cli/env_util.js

@@ -11,80 +11,106 @@ var _nodePath = _interopRequireDefault(require("node:path"));
 
 var _vtils = require("vtils");
 
+var _yaml = require("yaml");
+
 class EnvUtil {
   static normalizeValue(value) {
-    if (value.includes(' || ')) {
-      const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
-      return (0, _vtils.devOrProd)(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
+    if (typeof value === 'string') {
+      if (value.includes(' || ')) {
+        const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
+        return (0, _vtils.devOrProd)(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
+      }
+
+      return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : (0, _vtils.isNumeric)(value) ? Number(value) : value;
+    } else if (value && typeof value === 'object') {
+      if (value.dev != null && value.prod != null) {
+        return (0, _vtils.devOrProd)(() => value.dev, () => value.prod);
+      }
+
+      return value;
     }
 
-    return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : (0, _vtils.isNumeric)(value) ? Number(value) : value;
+    return value;
   }
 
-  static parseContent(src) {
-    const envs = []; // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
+  static parseContent(src, isYaml = false) {
+    const envs = [];
 
-    const multilineLineBreaks = true; // convert Buffers before splitting into lines and processing
+    if (isYaml) {
+      const envObj = (0, _yaml.parse)(src);
+      Object.keys(envObj).forEach(key => {
+        var _src$match;
 
-    const lines = src.toString().split(EnvUtil.NEWLINES_MATCH);
-    let lastComment = '';
+        envs.push({
+          key: key,
+          value: this.normalizeValue(envObj[key]),
+          comment: ((_src$match = src.match(new RegExp(`#\\s*(.+?)\\s*[\\r\\n]+\\s*${(0, _vtils.escapeRegExp)(key)}:`))) == null ? void 0 : _src$match[1]) || ''
+        });
+      });
+    } else {
+      // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
+      const multilineLineBreaks = true; // convert Buffers before splitting into lines and processing
 
-    for (let idx = 0; idx < lines.length; idx++) {
-      let line = lines[idx]; // matching "KEY' and 'VAL' in 'KEY=VAL'
+      const lines = src.split(EnvUtil.NEWLINES_MATCH);
+      let lastComment = '';
 
-      const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL); // matched?
+      for (let idx = 0; idx < lines.length; idx++) {
+        let line = lines[idx]; // matching "KEY' and 'VAL' in 'KEY=VAL'
 
-      if (keyValueArr != null) {
-        const key = keyValueArr[1]; // default undefined or missing values to empty string
+        const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL); // matched?
 
-        let val = keyValueArr[2] || '';
-        let end = val.length - 1;
-        const isDoubleQuoted = val[0] === '"' && val[end] === '"';
-        const isSingleQuoted = val[0] === "'" && val[end] === "'";
-        const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
-        const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'"); // if parsing line breaks and the value starts with a quote
+        if (keyValueArr != null) {
+          const key = keyValueArr[1]; // default undefined or missing values to empty string
 
-        if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
-          const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
-          val = val.substring(1);
+          let val = keyValueArr[2] || '';
+          let end = val.length - 1;
+          const isDoubleQuoted = val[0] === '"' && val[end] === '"';
+          const isSingleQuoted = val[0] === "'" && val[end] === "'";
+          const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
+          const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'"); // if parsing line breaks and the value starts with a quote
 
-          while (idx++ < lines.length - 1) {
-            line = lines[idx];
-            end = line.length - 1;
+          if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
+            const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
+            val = val.substring(1);
 
-            if (line[end] === quoteChar) {
-              val += EnvUtil.NEWLINE + line.substring(0, end);
-              break;
+            while (idx++ < lines.length - 1) {
+              line = lines[idx];
+              end = line.length - 1;
+
+              if (line[end] === quoteChar) {
+                val += EnvUtil.NEWLINE + line.substring(0, end);
+                break;
+              }
+
+              val += EnvUtil.NEWLINE + line;
             }
 
-            val += EnvUtil.NEWLINE + line;
-          }
+            val = (0, _vtils.dedent)(val); // if single or double quoted, remove quotes
+          } else if (isSingleQuoted || isDoubleQuoted) {
+            val = val.substring(1, end); // if double quoted, expand newlines
 
-          val = (0, _vtils.dedent)(val); // if single or double quoted, remove quotes
-        } else if (isSingleQuoted || isDoubleQuoted) {
-          val = val.substring(1, end); // if double quoted, expand newlines
+            if (isDoubleQuoted) {
+              val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
+            }
 
-          if (isDoubleQuoted) {
-            val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
+            val = (0, _vtils.dedent)(val);
+          } else {
+            // remove surrounding whitespace
+            val = (0, _vtils.dedent)(val).trim();
           }
 
-          val = (0, _vtils.dedent)(val);
+          envs.push({
+            key: key,
+            value: EnvUtil.normalizeValue(val),
+            comment: lastComment
+          });
+          lastComment = '';
         } else {
-          // remove surrounding whitespace
-          val = (0, _vtils.dedent)(val).trim();
-        }
-
-        envs.push({
-          key: key,
-          value: EnvUtil.normalizeValue(val),
-          comment: lastComment
-        });
-        lastComment = '';
-      } else {
-        const commentArr = line.match(EnvUtil.COMMENT_MATCH);
+          const commentArr = line.match(EnvUtil.COMMENT_MATCH);
 
-        if (commentArr) {
-          lastComment = commentArr[1];
+          if (commentArr) {
+            lastComment = commentArr[1];
+          }
         }
       }
     }
@@ -95,15 +121,32 @@ class EnvUtil {
   static async parseFile(options) {
     const envFile = _nodePath.default.join(options.cwd, options.file);
 
-    if (await _fsExtra.default.pathExists(envFile)) {
-      const envContent = await _fsExtra.default.readFile(envFile, 'utf-8');
-      const envs = EnvUtil.parseContent(envContent);
+    const envYmlFile = _nodePath.default.join(options.cwd, `${options.file}.yml`);
+
+    const envYamlFile = _nodePath.default.join(options.cwd, `${options.file}.yaml`);
+
+    const file = (await _fsExtra.default.pathExists(envYmlFile)) ? envYmlFile : (await _fsExtra.default.pathExists(envYamlFile)) ? envYamlFile : (await _fsExtra.default.pathExists(envFile)) ? envFile : '';
+
+    if (file) {
+      const envContent = await _fsExtra.default.readFile(file, 'utf-8');
+      const envs = EnvUtil.parseContent(envContent, /\.ya?ml$/i.test(file));
       return envs;
     }
 
     return [];
   }
 
+  static async parseFileAsMap(options) {
+    const envs = await EnvUtil.parseFile(options);
+    const envsObj = {};
+
+    for (const env of envs) {
+      envsObj[env.key] = env.value;
+    }
+
+    return envsObj;
+  }
+
   static async importFile(options) {
     const envs = await EnvUtil.parseFile(options);
     const envsObj = {};

package/lib/_cjs/cli/templates/routes.ts

@@ -26,16 +26,26 @@ export type HandlerMap = UnionToIntersection<
   }[keyof RouteMap]
 >
 export type HandlerPath = keyof HandlerMap
+export type HandlerMetaMap = {
+  [K in HandlerPath]: HandlerMap[K] extends Handler<infer X, infer Y, infer Z>
+    ? {
+        payload: X
+        result: Y
+        method: Z
+      }
+    : {}
+}
 export type HandlerPayloadMap = {
-  [K in HandlerPath]: HandlerMap[K] extends Handler<infer X, any> ? X : {}
+  // @ts-ignore
+  [K in HandlerPath]: HandlerMetaMap[K]['payload']
 }
 export type HandlerResultMap = {
-  [K in HandlerPath]: HandlerMap[K] extends Handler<any, infer X> ? X : {}
+  // @ts-ignore
+  [K in HandlerPath]: HandlerMetaMap[K]['result']
 }
 export type HandlerMethodMap = {
-  [K in HandlerPath]: HandlerMap[K] extends Handler<any, any, infer X>
-    ? X
-    : never
+  // @ts-ignore
+  [K in HandlerPath]: HandlerMetaMap[K]['method']
 }
 
 export const routes: XServer.Route[] = basePathWithHandlers.reduce<

package/lib/_cjs/core/handler.js

@@ -38,7 +38,6 @@ class Handler {
       if (this.requestDataSchema) {
         try {
           data = await this.requestDataSchema.validate(data, {
-            strict: true,
             abortEarly: true,
             stripUnknown: true
           });

package/lib/_cjs/core/server.js

@@ -159,7 +159,8 @@ class Server {
           websocket: isWS,
           handler: (req, res) => handleRoute(item, req, res)
         });
-      }
+      } // 接口统一入口
+
 
       fastify.route({
         method: 'POST',
@@ -183,6 +184,22 @@ class Server {
 
           return handleRoute(routeMap[requestPath], req, res, requestPath);
         }
+      }); // 开发管理入口
+
+      fastify.route({
+        method: 'POST',
+        url: '/$',
+        handler: async req => {
+          const payload = req.body;
+
+          if (payload && typeof payload === 'object' && _x.x.env.APP_TOKEN && payload.token === _x.x.env.APP_TOKEN) {
+            if (payload.type === 'ping') {
+              return 'ping:success';
+            } else if (payload.type === 'updateEnv') {
+              Object.assign(_x.x.env, payload.data);
+            }
+          }
+        }
       });
     });
   }

package/lib/cli/cli.js

@@ -124,7 +124,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   await EnvUtil.importFile({
     cwd: process.cwd(),
     file: '.env'
-  });
+  }); // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
+  // https://github.com/motdotla/dotenv#override
+
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
   await execa('tnpx', ['prisma', ...argv._.slice(1), '--schema', 'src/db/schema.prisma'], {
     cwd: process.cwd(),
@@ -161,18 +163,38 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
       stdio: 'inherit'
     });
   }
-}).command('deploy', '部署', async () => {
-  await EnvUtil.importFile({
+}).command('deploy [type]', '部署', _ => _.positional('type', {
+  describe: '类型',
+  type: 'string',
+  choices: ['env']
+}), async argv => {
+  const deployEnv = await EnvUtil.parseFileAsMap({
     cwd: process.cwd(),
     file: '.env.deploy'
   });
-  await DeployUtil.deploy({
-    cwd: process.cwd(),
-    host: process.env.HOST,
-    user: process.env.USER,
-    key: process.env.KEY,
-    dir: process.env.DIR,
-    cmd: process.env.CMD,
-    memory: process.env.MEMORY
-  });
+
+  if (argv.type === 'env') {
+    const appEnv = await EnvUtil.parseFileAsMap({
+      cwd: process.cwd(),
+      file: '.env'
+    });
+    await DeployUtil.deployEnv({
+      host: deployEnv.HOST,
+      user: deployEnv.USER,
+      key: deployEnv.KEY,
+      token: appEnv.APP_TOKEN,
+      port: appEnv.APP_PORT,
+      env: appEnv
+    });
+  } else {
+    await DeployUtil.deploy({
+      cwd: process.cwd(),
+      host: deployEnv.HOST,
+      user: deployEnv.USER,
+      key: deployEnv.KEY,
+      dir: deployEnv.DIR,
+      cmd: deployEnv.CMD,
+      memory: deployEnv.MEMORY
+    });
+  }
 }).parse();

package/lib/cli/deploy_util.d.ts

@@ -7,6 +7,15 @@ export interface DeployOptions {
     memory?: string;
     cmd?: string;
 }
+export interface DeployEnvOptions {
+    host: string;
+    user: string;
+    key: string;
+    port: number;
+    token: string;
+    env: Record<string, any>;
+}
 export declare class DeployUtil {
     static deploy(options: DeployOptions): Promise<void>;
+    static deployEnv(options: DeployEnvOptions): Promise<void>;
 }

package/lib/cli/deploy_util.js

@@ -45,4 +45,28 @@ export class DeployUtil {
     ssh.dispose();
   }
 
+  static async deployEnv(options) {
+    const ssh = new NodeSSH();
+    await ssh.connect({
+      host: options.host,
+      username: options.user,
+      privateKey: options.key
+    });
+    await ssh.execCommand(dedent`
+        set -ex
+        curl --header "Content-Type: application/json" \\
+          --request "POST" \\
+          --data ${JSON.stringify(JSON.stringify({
+      token: options.token,
+      type: 'updateEnv',
+      data: options.env
+    }))} \\
+          "http://localhost:${options.port}/$"
+      `, {
+      onStdout: buf => console.log(buf.toString()),
+      onStderr: buf => console.log(buf.toString())
+    });
+    ssh.dispose();
+  }
+
 }

package/lib/cli/env_util.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export interface ParsedEnv {
     comment: string;
     key: string;
@@ -10,12 +9,16 @@ export declare class EnvUtil {
     static RE_NEWLINES: RegExp;
     static NEWLINES_MATCH: RegExp;
     static COMMENT_MATCH: RegExp;
-    static normalizeValue(value: string): any;
-    static parseContent(src: string | Buffer): ParsedEnv[];
+    static normalizeValue(value: any): any;
+    static parseContent(src: string, isYaml?: boolean): ParsedEnv[];
     static parseFile(options: {
         cwd: string;
         file: string;
     }): Promise<ParsedEnv[]>;
+    static parseFileAsMap(options: {
+        cwd: string;
+        file: string;
+    }): Promise<Record<string, any>>;
     static importFile(options: {
         cwd: string;
         file: string;

package/lib/cli/env_util.js

@@ -1,80 +1,105 @@
 import fs from 'fs-extra';
 import path from 'node:path';
-import { dedent, devOrProd, isNumeric } from 'vtils';
+import { dedent, devOrProd, escapeRegExp, isNumeric } from 'vtils';
+import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
   static normalizeValue(value) {
-    if (value.includes(' || ')) {
-      const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
-      return devOrProd(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
+    if (typeof value === 'string') {
+      if (value.includes(' || ')) {
+        const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
+        return devOrProd(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
+      }
+
+      return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : isNumeric(value) ? Number(value) : value;
+    } else if (value && typeof value === 'object') {
+      if (value.dev != null && value.prod != null) {
+        return devOrProd(() => value.dev, () => value.prod);
+      }
+
+      return value;
     }
 
-    return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : isNumeric(value) ? Number(value) : value;
+    return value;
   }
 
-  static parseContent(src) {
-    const envs = []; // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
+  static parseContent(src, isYaml = false) {
+    const envs = [];
 
-    const multilineLineBreaks = true; // convert Buffers before splitting into lines and processing
+    if (isYaml) {
+      const envObj = yamlParse(src);
+      Object.keys(envObj).forEach(key => {
+        var _src$match;
 
-    const lines = src.toString().split(EnvUtil.NEWLINES_MATCH);
-    let lastComment = '';
+        envs.push({
+          key: key,
+          value: this.normalizeValue(envObj[key]),
+          comment: ((_src$match = src.match(new RegExp(`#\\s*(.+?)\\s*[\\r\\n]+\\s*${escapeRegExp(key)}:`))) == null ? void 0 : _src$match[1]) || ''
+        });
+      });
+    } else {
+      // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
+      const multilineLineBreaks = true; // convert Buffers before splitting into lines and processing
 
-    for (let idx = 0; idx < lines.length; idx++) {
-      let line = lines[idx]; // matching "KEY' and 'VAL' in 'KEY=VAL'
+      const lines = src.split(EnvUtil.NEWLINES_MATCH);
+      let lastComment = '';
 
-      const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL); // matched?
+      for (let idx = 0; idx < lines.length; idx++) {
+        let line = lines[idx]; // matching "KEY' and 'VAL' in 'KEY=VAL'
 
-      if (keyValueArr != null) {
-        const key = keyValueArr[1]; // default undefined or missing values to empty string
+        const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL); // matched?
 
-        let val = keyValueArr[2] || '';
-        let end = val.length - 1;
-        const isDoubleQuoted = val[0] === '"' && val[end] === '"';
-        const isSingleQuoted = val[0] === "'" && val[end] === "'";
-        const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
-        const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'"); // if parsing line breaks and the value starts with a quote
+        if (keyValueArr != null) {
+          const key = keyValueArr[1]; // default undefined or missing values to empty string
 
-        if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
-          const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
-          val = val.substring(1);
+          let val = keyValueArr[2] || '';
+          let end = val.length - 1;
+          const isDoubleQuoted = val[0] === '"' && val[end] === '"';
+          const isSingleQuoted = val[0] === "'" && val[end] === "'";
+          const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
+          const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'"); // if parsing line breaks and the value starts with a quote
 
-          while (idx++ < lines.length - 1) {
-            line = lines[idx];
-            end = line.length - 1;
+          if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
+            const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
+            val = val.substring(1);
 
-            if (line[end] === quoteChar) {
-              val += EnvUtil.NEWLINE + line.substring(0, end);
-              break;
+            while (idx++ < lines.length - 1) {
+              line = lines[idx];
+              end = line.length - 1;
+
+              if (line[end] === quoteChar) {
+                val += EnvUtil.NEWLINE + line.substring(0, end);
+                break;
+              }
+
+              val += EnvUtil.NEWLINE + line;
             }
 
-            val += EnvUtil.NEWLINE + line;
-          }
+            val = dedent(val); // if single or double quoted, remove quotes
+          } else if (isSingleQuoted || isDoubleQuoted) {
+            val = val.substring(1, end); // if double quoted, expand newlines
 
-          val = dedent(val); // if single or double quoted, remove quotes
-        } else if (isSingleQuoted || isDoubleQuoted) {
-          val = val.substring(1, end); // if double quoted, expand newlines
+            if (isDoubleQuoted) {
+              val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
+            }
 
-          if (isDoubleQuoted) {
-            val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
+            val = dedent(val);
+          } else {
+            // remove surrounding whitespace
+            val = dedent(val).trim();
           }
 
-          val = dedent(val);
+          envs.push({
+            key: key,
+            value: EnvUtil.normalizeValue(val),
+            comment: lastComment
+          });
+          lastComment = '';
         } else {
-          // remove surrounding whitespace
-          val = dedent(val).trim();
-        }
-
-        envs.push({
-          key: key,
-          value: EnvUtil.normalizeValue(val),
-          comment: lastComment
-        });
-        lastComment = '';
-      } else {
-        const commentArr = line.match(EnvUtil.COMMENT_MATCH);
+          const commentArr = line.match(EnvUtil.COMMENT_MATCH);
 
-        if (commentArr) {
-          lastComment = commentArr[1];
+          if (commentArr) {
+            lastComment = commentArr[1];
+          }
         }
       }
     }
@@ -84,16 +109,30 @@ export class EnvUtil {
 
   static async parseFile(options) {
     const envFile = path.join(options.cwd, options.file);
+    const envYmlFile = path.join(options.cwd, `${options.file}.yml`);
+    const envYamlFile = path.join(options.cwd, `${options.file}.yaml`);
+    const file = (await fs.pathExists(envYmlFile)) ? envYmlFile : (await fs.pathExists(envYamlFile)) ? envYamlFile : (await fs.pathExists(envFile)) ? envFile : '';
 
-    if (await fs.pathExists(envFile)) {
-      const envContent = await fs.readFile(envFile, 'utf-8');
-      const envs = EnvUtil.parseContent(envContent);
+    if (file) {
+      const envContent = await fs.readFile(file, 'utf-8');
+      const envs = EnvUtil.parseContent(envContent, /\.ya?ml$/i.test(file));
       return envs;
     }
 
     return [];
   }
 
+  static async parseFileAsMap(options) {
+    const envs = await EnvUtil.parseFile(options);
+    const envsObj = {};
+
+    for (const env of envs) {
+      envsObj[env.key] = env.value;
+    }
+
+    return envsObj;
+  }
+
   static async importFile(options) {
     const envs = await EnvUtil.parseFile(options);
     const envsObj = {};

package/lib/cli/templates/routes.ts

@@ -26,16 +26,26 @@ export type HandlerMap = UnionToIntersection<
   }[keyof RouteMap]
 >
 export type HandlerPath = keyof HandlerMap
+export type HandlerMetaMap = {
+  [K in HandlerPath]: HandlerMap[K] extends Handler<infer X, infer Y, infer Z>
+    ? {
+        payload: X
+        result: Y
+        method: Z
+      }
+    : {}
+}
 export type HandlerPayloadMap = {
-  [K in HandlerPath]: HandlerMap[K] extends Handler<infer X, any> ? X : {}
+  // @ts-ignore
+  [K in HandlerPath]: HandlerMetaMap[K]['payload']
 }
 export type HandlerResultMap = {
-  [K in HandlerPath]: HandlerMap[K] extends Handler<any, infer X> ? X : {}
+  // @ts-ignore
+  [K in HandlerPath]: HandlerMetaMap[K]['result']
 }
 export type HandlerMethodMap = {
-  [K in HandlerPath]: HandlerMap[K] extends Handler<any, any, infer X>
-    ? X
-    : never
+  // @ts-ignore
+  [K in HandlerPath]: HandlerMetaMap[K]['method']
 }
 
 export const routes: XServer.Route[] = basePathWithHandlers.reduce<

package/lib/core/handler.js

@@ -26,7 +26,6 @@ export class Handler {
       if (this.requestDataSchema) {
         try {
           data = await this.requestDataSchema.validate(data, {
-            strict: true,
             abortEarly: true,
             stripUnknown: true
           });

package/lib/core/server.js

@@ -144,7 +144,8 @@ export class Server {
           websocket: isWS,
           handler: (req, res) => handleRoute(item, req, res)
         });
-      }
+      } // 接口统一入口
+
 
       fastify.route({
         method: 'POST',
@@ -168,6 +169,22 @@ export class Server {
 
           return handleRoute(routeMap[requestPath], req, res, requestPath);
         }
+      }); // 开发管理入口
+
+      fastify.route({
+        method: 'POST',
+        url: '/$',
+        handler: async req => {
+          const payload = req.body;
+
+          if (payload && typeof payload === 'object' && x.env.APP_TOKEN && payload.token === x.env.APP_TOKEN) {
+            if (payload.type === 'ping') {
+              return 'ping:success';
+            } else if (payload.type === 'updateEnv') {
+              Object.assign(x.env, payload.data);
+            }
+          }
+        }
       });
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -75,6 +75,7 @@
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
     "vtils": "^4.85.2",
+    "yaml": "^2.3.1",
     "yargs": "^17.4.1"
   },
   "devDependencies": {