@jayfong/x-server 2.79.0 → 2.80.0

package/lib/_cjs/cli/cli.js

@@ -73,60 +73,63 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
-  if (argv.channel === '_') {
-    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
-  }
-  process.env.NODE_ENV = 'development';
-  let lastRun;
-  const run = () => {
-    lastRun = _dev_util.DevUtil.runFile({
-      file: 'src/main.ts',
-      cwd: process.cwd(),
-      runner: argv.tsx ? 'tsx' : 'esbuild-register'
-    });
-  };
-  if (argv.npc) {
-    const [server, vkey] = argv.npc.split('@');
-    (0, _execa.default)('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
-      cwd: process.cwd(),
-      stdio: 'inherit'
-    });
-  }
-  await _template_util.TemplateUtil.init(process.cwd());
-  const xsignoreFile = _path.default.join(process.cwd(), '.xsignore');
-  const xsignoreContent = (await _fsExtra.default.pathExists(xsignoreFile)) ? (await _fsExtra.default.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
-  const watcher = _chokidar.default.watch(['src', '.env', '.env*'], {
+  await _env_util.EnvUtil.withChannel({
     cwd: process.cwd(),
-    ignored: ['**/*.test.*', ...xsignoreContent]
-  });
-  watcher.on('all', (0, _vtils.debounce)(async () => {
-    const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
-    await _env_util.EnvUtil.importFile({
-      cwd: process.cwd(),
-      file: envFiles
-    });
-    _env_util.EnvUtil.outputTypes({
-      cwd: process.cwd(),
-      file: envFiles,
-      outFile: 'env.d.ts'
-    });
-    (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
-      cwd: process.cwd(),
-      patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
-      replaceFile: true,
-      onSuccess: filePath => {
-        console.log(`✔️ 索引文件已更新: ${filePath}`);
+    channel: argv.channel,
+    cb: async channel => {
+      process.env.NODE_ENV = 'development';
+      let lastRun;
+      const run = () => {
+        lastRun = _dev_util.DevUtil.runFile({
+          file: 'src/main.ts',
+          cwd: process.cwd(),
+          runner: argv.tsx ? 'tsx' : 'esbuild-register'
+        });
+      };
+      if (argv.npc) {
+        const [server, vkey] = argv.npc.split('@');
+        (0, _execa.default)('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
+          cwd: process.cwd(),
+          stdio: 'inherit'
+        });
       }
-    });
-    if (lastRun) {
-      console.log('==== 重启服务中 ====');
-      lastRun.kill();
-      setTimeout(run, 0);
-    } else {
-      console.log('==== 启动服务中 ====');
-      run();
+      await _template_util.TemplateUtil.init(process.cwd());
+      const xsignoreFile = _path.default.join(process.cwd(), '.xsignore');
+      const xsignoreContent = (await _fsExtra.default.pathExists(xsignoreFile)) ? (await _fsExtra.default.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
+      const watcher = _chokidar.default.watch(['src', '.env', '.env*'], {
+        cwd: process.cwd(),
+        ignored: ['**/*.test.*', ...xsignoreContent]
+      });
+      watcher.on('all', (0, _vtils.debounce)(async () => {
+        const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, channel);
+        await _env_util.EnvUtil.importFile({
+          cwd: process.cwd(),
+          file: envFiles
+        });
+        _env_util.EnvUtil.outputTypes({
+          cwd: process.cwd(),
+          file: envFiles,
+          outFile: 'env.d.ts'
+        });
+        (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
+          cwd: process.cwd(),
+          patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
+          replaceFile: true,
+          onSuccess: filePath => {
+            console.log(`✔️ 索引文件已更新: ${filePath}`);
+          }
+        });
+        if (lastRun) {
+          console.log('==== 重启服务中 ====');
+          lastRun.kill();
+          setTimeout(run, 0);
+        } else {
+          console.log('==== 启动服务中 ====');
+          run();
+        }
+      }, 30));
     }
-  }, 30));
+  });
 }).command('build', '构建', _ => _.positional('external', {
   alias: 'e',
   describe: '不应该被打的包',
@@ -207,16 +210,19 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
-  if (argv.channel === '_') {
-    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
-  }
-  process.env.NODE_ENV = 'production';
-  const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
-  await _env_util.EnvUtil.importFile({
+  await _env_util.EnvUtil.withChannel({
     cwd: process.cwd(),
-    file: envFiles
+    channel: argv.channel,
+    cb: async channel => {
+      process.env.NODE_ENV = 'production';
+      const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, channel);
+      await _env_util.EnvUtil.importFile({
+        cwd: process.cwd(),
+        file: envFiles
+      });
+      await new _api_generator.ApiGenerator().start();
+    }
   });
-  await new _api_generator.ApiGenerator().start();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
   alias: 'p',
   describe: '是否生产模式',

package/lib/_cjs/exports.js

@@ -97,6 +97,12 @@ Object.keys(_base).forEach(function (key) {
   if (key in exports && exports[key] === _base[key]) return;
   exports[key] = _base[key];
 });
+var _compress = require("./plugins/compress");
+Object.keys(_compress).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _compress[key]) return;
+  exports[key] = _compress[key];
+});
 var _cookie = require("./plugins/cookie");
 Object.keys(_cookie).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/_cjs/plugins/compress.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+exports.__esModule = true;
+exports.CompressPlugin = void 0;
+var _compress = _interopRequireDefault(require("@fastify/compress"));
+/**
+ * 响应压缩插件
+ */
+class CompressPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+  register(fastify) {
+    fastify.register(_compress.default, this.options);
+  }
+}
+exports.CompressPlugin = CompressPlugin;

package/lib/cli/cli.js

@@ -71,60 +71,63 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
-  if (argv.channel === '_') {
-    argv.channel = await EnvUtil.chooseChannel(process.cwd());
-  }
-  process.env.NODE_ENV = 'development';
-  let lastRun;
-  const run = () => {
-    lastRun = DevUtil.runFile({
-      file: 'src/main.ts',
-      cwd: process.cwd(),
-      runner: argv.tsx ? 'tsx' : 'esbuild-register'
-    });
-  };
-  if (argv.npc) {
-    const [server, vkey] = argv.npc.split('@');
-    execa('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
-      cwd: process.cwd(),
-      stdio: 'inherit'
-    });
-  }
-  await TemplateUtil.init(process.cwd());
-  const xsignoreFile = path.join(process.cwd(), '.xsignore');
-  const xsignoreContent = (await fs.pathExists(xsignoreFile)) ? (await fs.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
-  const watcher = chokidar.watch(['src', '.env', '.env*'], {
+  await EnvUtil.withChannel({
     cwd: process.cwd(),
-    ignored: ['**/*.test.*', ...xsignoreContent]
-  });
-  watcher.on('all', debounce(async () => {
-    const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
-    await EnvUtil.importFile({
-      cwd: process.cwd(),
-      file: envFiles
-    });
-    EnvUtil.outputTypes({
-      cwd: process.cwd(),
-      file: envFiles,
-      outFile: 'env.d.ts'
-    });
-    generateManyIndex({
-      cwd: process.cwd(),
-      patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
-      replaceFile: true,
-      onSuccess: filePath => {
-        console.log(`✔️ 索引文件已更新: ${filePath}`);
+    channel: argv.channel,
+    cb: async channel => {
+      process.env.NODE_ENV = 'development';
+      let lastRun;
+      const run = () => {
+        lastRun = DevUtil.runFile({
+          file: 'src/main.ts',
+          cwd: process.cwd(),
+          runner: argv.tsx ? 'tsx' : 'esbuild-register'
+        });
+      };
+      if (argv.npc) {
+        const [server, vkey] = argv.npc.split('@');
+        execa('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
+          cwd: process.cwd(),
+          stdio: 'inherit'
+        });
       }
-    });
-    if (lastRun) {
-      console.log('==== 重启服务中 ====');
-      lastRun.kill();
-      setTimeout(run, 0);
-    } else {
-      console.log('==== 启动服务中 ====');
-      run();
+      await TemplateUtil.init(process.cwd());
+      const xsignoreFile = path.join(process.cwd(), '.xsignore');
+      const xsignoreContent = (await fs.pathExists(xsignoreFile)) ? (await fs.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
+      const watcher = chokidar.watch(['src', '.env', '.env*'], {
+        cwd: process.cwd(),
+        ignored: ['**/*.test.*', ...xsignoreContent]
+      });
+      watcher.on('all', debounce(async () => {
+        const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
+        await EnvUtil.importFile({
+          cwd: process.cwd(),
+          file: envFiles
+        });
+        EnvUtil.outputTypes({
+          cwd: process.cwd(),
+          file: envFiles,
+          outFile: 'env.d.ts'
+        });
+        generateManyIndex({
+          cwd: process.cwd(),
+          patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
+          replaceFile: true,
+          onSuccess: filePath => {
+            console.log(`✔️ 索引文件已更新: ${filePath}`);
+          }
+        });
+        if (lastRun) {
+          console.log('==== 重启服务中 ====');
+          lastRun.kill();
+          setTimeout(run, 0);
+        } else {
+          console.log('==== 启动服务中 ====');
+          run();
+        }
+      }, 30));
     }
-  }, 30));
+  });
 }).command('build', '构建', _ => _.positional('external', {
   alias: 'e',
   describe: '不应该被打的包',
@@ -205,16 +208,19 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
-  if (argv.channel === '_') {
-    argv.channel = await EnvUtil.chooseChannel(process.cwd());
-  }
-  process.env.NODE_ENV = 'production';
-  const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
-  await EnvUtil.importFile({
+  await EnvUtil.withChannel({
     cwd: process.cwd(),
-    file: envFiles
+    channel: argv.channel,
+    cb: async channel => {
+      process.env.NODE_ENV = 'production';
+      const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
+      await EnvUtil.importFile({
+        cwd: process.cwd(),
+        file: envFiles
+      });
+      await new ApiGenerator().start();
+    }
   });
-  await new ApiGenerator().start();
 }).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
   alias: 'p',
   describe: '是否生产模式',

package/lib/exports.d.ts

@@ -14,6 +14,7 @@ export * from './core/http_redirect';
 export * from './core/server';
 export * from './core/types';
 export * from './plugins/base';
+export * from './plugins/compress';
 export * from './plugins/cookie';
 export * from './plugins/cors';
 export * from './plugins/file_parser';

package/lib/exports.js

@@ -15,6 +15,7 @@ export * from "./core/http_redirect";
 export * from "./core/server";
 export * from "./core/types";
 export * from "./plugins/base";
+export * from "./plugins/compress";
 export * from "./plugins/cookie";
 export * from "./plugins/cors";
 export * from "./plugins/file_parser";

package/lib/plugins/compress.d.ts

@@ -0,0 +1,13 @@
+import { FastifyCompressOptions } from '@fastify/compress';
+import { FastifyInstance } from 'fastify';
+import { BasePlugin } from './base';
+export interface CompressPluginOptions extends FastifyCompressOptions {
+}
+/**
+ * 响应压缩插件
+ */
+export declare class CompressPlugin implements BasePlugin {
+    private options?;
+    constructor(options?: CompressPluginOptions | undefined);
+    register(fastify: FastifyInstance<any, any, any, any, any>): void;
+}

package/lib/plugins/compress.js

@@ -0,0 +1,12 @@
+import FastifyCompress from '@fastify/compress';
+/**
+ * 响应压缩插件
+ */
+export class CompressPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+  register(fastify) {
+    fastify.register(FastifyCompress, this.options);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.79.0",
+  "version": "2.80.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -9,7 +9,9 @@
   "bin": {
     "xs": "lib/_cjs/cli/cli.js"
   },
-  "files": ["lib"],
+  "files": [
+    "lib"
+  ],
   "scripts": {
     "build": "haoma compile",
     "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
@@ -19,6 +21,7 @@
     "test_api_qiqi": "cd /Users/admin/Documents/jfWorks/qiqi-server && DEBUG=api tsx /Users/admin/Documents/jfWorks/x/packages/x-server/src/cli/cli.ts api"
   },
   "dependencies": {
+    "@fastify/compress": "^8.0.1",
     "@fastify/cookie": "^9.4.0",
     "@fastify/cors": "^8.3.0",
     "@fastify/formbody": "^7.4.0",