@jayfong/x-server 2.72.1 → 2.73.0

package/lib/_cjs/cli/cli.js

@@ -31,6 +31,9 @@ _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 = () => {
@@ -102,6 +105,9 @@ _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 externals = (0, _vtils.castArray)(argv.external || []).flatMap(item => item.split(',')).filter(Boolean);
   const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
@@ -133,6 +139,9 @@ _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({
@@ -150,6 +159,9 @@ _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 = argv.production ? 'production' : 'development';
   const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await _env_util.EnvUtil.importFile({
@@ -188,6 +200,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '使用 tsx 运行',
   type: 'boolean'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   const envFiles = _env_util.EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await _env_util.EnvUtil.importFile({
@@ -216,6 +231,9 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await _env_util.EnvUtil.chooseChannel(process.cwd());
+  }
   const deployEnvFiles = _env_util.EnvUtil.getFile('deploy', argv.channel, true);
   const deployEnv = await _env_util.EnvUtil.parseFileAsMap({
     cwd: process.cwd(),

package/lib/_cjs/cli/env_util.js

@@ -5,9 +5,30 @@ exports.__esModule = true;
 exports.EnvUtil = void 0;
 var _nodePath = _interopRequireDefault(require("node:path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _globby = _interopRequireDefault(require("globby"));
+var _inquirer = _interopRequireDefault(require("inquirer"));
 var _vtils = require("vtils");
 var _yaml = require("yaml");
 class EnvUtil {
+  static async chooseChannel(cwd) {
+    const channelFiles = await (0, _globby.default)(['.env@*.{yml,yaml}'], {
+      cwd: cwd,
+      onlyFiles: true,
+      absolute: false
+    });
+    if (channelFiles.length === 0) {
+      return undefined;
+    }
+    const channels = channelFiles.map(channel => channel.split('@').pop().split('.')[0]);
+    if (channels.length === 1) return channels[0];
+    const res = await _inquirer.default.prompt([{
+      name: 'channel',
+      type: 'select',
+      message: '请选择渠道',
+      choices: channels
+    }]);
+    return res.channel || undefined;
+  }
   static getFile(env, channel, noBase) {
     const file = noBase ? [] : ['.env'];
     if (!noBase && channel) {

package/lib/_cjs/exports.js

@@ -0,0 +1,243 @@
+"use strict";
+
+exports.__esModule = true;
+var _ctx_storage = require("./core/ctx_storage");
+Object.keys(_ctx_storage).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _ctx_storage[key]) return;
+  exports[key] = _ctx_storage[key];
+});
+var _define_bus = require("./core/define_bus");
+Object.keys(_define_bus).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _define_bus[key]) return;
+  exports[key] = _define_bus[key];
+});
+var _define_cron = require("./core/define_cron");
+Object.keys(_define_cron).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _define_cron[key]) return;
+  exports[key] = _define_cron[key];
+});
+var _define_handler = require("./core/define_handler");
+Object.keys(_define_handler).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _define_handler[key]) return;
+  exports[key] = _define_handler[key];
+});
+var _define_hook = require("./core/define_hook");
+Object.keys(_define_hook).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _define_hook[key]) return;
+  exports[key] = _define_hook[key];
+});
+var _define_server = require("./core/define_server");
+Object.keys(_define_server).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _define_server[key]) return;
+  exports[key] = _define_server[key];
+});
+var _define_task = require("./core/define_task");
+Object.keys(_define_task).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _define_task[key]) return;
+  exports[key] = _define_task[key];
+});
+var _get_handler_url = require("./core/get_handler_url");
+Object.keys(_get_handler_url).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _get_handler_url[key]) return;
+  exports[key] = _get_handler_url[key];
+});
+var _handler = require("./core/handler");
+Object.keys(_handler).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _handler[key]) return;
+  exports[key] = _handler[key];
+});
+var _http_error = require("./core/http_error");
+Object.keys(_http_error).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _http_error[key]) return;
+  exports[key] = _http_error[key];
+});
+var _http_header = require("./core/http_header");
+Object.keys(_http_header).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _http_header[key]) return;
+  exports[key] = _http_header[key];
+});
+var _http_method = require("./core/http_method");
+Object.keys(_http_method).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _http_method[key]) return;
+  exports[key] = _http_method[key];
+});
+var _http_redirect = require("./core/http_redirect");
+Object.keys(_http_redirect).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _http_redirect[key]) return;
+  exports[key] = _http_redirect[key];
+});
+var _server = require("./core/server");
+Object.keys(_server).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _server[key]) return;
+  exports[key] = _server[key];
+});
+var _types = require("./core/types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _types[key]) return;
+  exports[key] = _types[key];
+});
+var _base = require("./plugins/base");
+Object.keys(_base).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _base[key]) return;
+  exports[key] = _base[key];
+});
+var _cookie = require("./plugins/cookie");
+Object.keys(_cookie).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _cookie[key]) return;
+  exports[key] = _cookie[key];
+});
+var _cors = require("./plugins/cors");
+Object.keys(_cors).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _cors[key]) return;
+  exports[key] = _cors[key];
+});
+var _file_parser = require("./plugins/file_parser");
+Object.keys(_file_parser).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _file_parser[key]) return;
+  exports[key] = _file_parser[key];
+});
+var _form_body_parser = require("./plugins/form_body_parser");
+Object.keys(_form_body_parser).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _form_body_parser[key]) return;
+  exports[key] = _form_body_parser[key];
+});
+var _ws_parser = require("./plugins/ws_parser");
+Object.keys(_ws_parser).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _ws_parser[key]) return;
+  exports[key] = _ws_parser[key];
+});
+var _xml_parser = require("./plugins/xml_parser");
+Object.keys(_xml_parser).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _xml_parser[key]) return;
+  exports[key] = _xml_parser[key];
+});
+var _base2 = require("./services/base");
+Object.keys(_base2).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _base2[key]) return;
+  exports[key] = _base2[key];
+});
+var _cache = require("./services/cache");
+Object.keys(_cache).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _cache[key]) return;
+  exports[key] = _cache[key];
+});
+var _captcha = require("./services/captcha");
+Object.keys(_captcha).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _captcha[key]) return;
+  exports[key] = _captcha[key];
+});
+var _crypto = require("./services/crypto");
+Object.keys(_crypto).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _crypto[key]) return;
+  exports[key] = _crypto[key];
+});
+var _db_value = require("./services/db_value");
+Object.keys(_db_value).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _db_value[key]) return;
+  exports[key] = _db_value[key];
+});
+var _dingtalk = require("./services/dingtalk");
+Object.keys(_dingtalk).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _dingtalk[key]) return;
+  exports[key] = _dingtalk[key];
+});
+var _dispose = require("./services/dispose");
+Object.keys(_dispose).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _dispose[key]) return;
+  exports[key] = _dispose[key];
+});
+var _emoji = require("./services/emoji");
+Object.keys(_emoji).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _emoji[key]) return;
+  exports[key] = _emoji[key];
+});
+var _jwt = require("./services/jwt");
+Object.keys(_jwt).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _jwt[key]) return;
+  exports[key] = _jwt[key];
+});
+var _log = require("./services/log");
+Object.keys(_log).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _log[key]) return;
+  exports[key] = _log[key];
+});
+var _mail = require("./services/mail");
+Object.keys(_mail).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _mail[key]) return;
+  exports[key] = _mail[key];
+});
+var _pay = require("./services/pay");
+Object.keys(_pay).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _pay[key]) return;
+  exports[key] = _pay[key];
+});
+var _rate_limit = require("./services/rate_limit");
+Object.keys(_rate_limit).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _rate_limit[key]) return;
+  exports[key] = _rate_limit[key];
+});
+var _redis = require("./services/redis");
+Object.keys(_redis).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _redis[key]) return;
+  exports[key] = _redis[key];
+});
+var _sensitive_words = require("./services/sensitive_words");
+Object.keys(_sensitive_words).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _sensitive_words[key]) return;
+  exports[key] = _sensitive_words[key];
+});
+var _sms = require("./services/sms");
+Object.keys(_sms).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _sms[key]) return;
+  exports[key] = _sms[key];
+});
+var _dto = require("./types/dto");
+Object.keys(_dto).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _dto[key]) return;
+  exports[key] = _dto[key];
+});
+var _x = require("./x");
+Object.keys(_x).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _x[key]) return;
+  exports[key] = _x[key];
+});

package/lib/_cjs/index.js

@@ -1,245 +1,11 @@
 "use strict";
 
 exports.__esModule = true;
-var _ctx_storage = require("./core/ctx_storage");
-Object.keys(_ctx_storage).forEach(function (key) {
+var _exports = require("./exports");
+Object.keys(_exports).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _ctx_storage[key]) return;
-  exports[key] = _ctx_storage[key];
-});
-var _define_bus = require("./core/define_bus");
-Object.keys(_define_bus).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _define_bus[key]) return;
-  exports[key] = _define_bus[key];
-});
-var _define_cron = require("./core/define_cron");
-Object.keys(_define_cron).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _define_cron[key]) return;
-  exports[key] = _define_cron[key];
-});
-var _define_handler = require("./core/define_handler");
-Object.keys(_define_handler).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _define_handler[key]) return;
-  exports[key] = _define_handler[key];
-});
-var _define_hook = require("./core/define_hook");
-Object.keys(_define_hook).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _define_hook[key]) return;
-  exports[key] = _define_hook[key];
-});
-var _define_server = require("./core/define_server");
-Object.keys(_define_server).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _define_server[key]) return;
-  exports[key] = _define_server[key];
-});
-var _define_task = require("./core/define_task");
-Object.keys(_define_task).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _define_task[key]) return;
-  exports[key] = _define_task[key];
-});
-var _get_handler_url = require("./core/get_handler_url");
-Object.keys(_get_handler_url).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _get_handler_url[key]) return;
-  exports[key] = _get_handler_url[key];
-});
-var _handler = require("./core/handler");
-Object.keys(_handler).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _handler[key]) return;
-  exports[key] = _handler[key];
-});
-var _http_error = require("./core/http_error");
-Object.keys(_http_error).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _http_error[key]) return;
-  exports[key] = _http_error[key];
-});
-var _http_header = require("./core/http_header");
-Object.keys(_http_header).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _http_header[key]) return;
-  exports[key] = _http_header[key];
-});
-var _http_method = require("./core/http_method");
-Object.keys(_http_method).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _http_method[key]) return;
-  exports[key] = _http_method[key];
-});
-var _http_redirect = require("./core/http_redirect");
-Object.keys(_http_redirect).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _http_redirect[key]) return;
-  exports[key] = _http_redirect[key];
-});
-var _server = require("./core/server");
-Object.keys(_server).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _server[key]) return;
-  exports[key] = _server[key];
-});
-var _types = require("./core/types");
-Object.keys(_types).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _types[key]) return;
-  exports[key] = _types[key];
-});
-var _base = require("./plugins/base");
-Object.keys(_base).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _base[key]) return;
-  exports[key] = _base[key];
-});
-var _cookie = require("./plugins/cookie");
-Object.keys(_cookie).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _cookie[key]) return;
-  exports[key] = _cookie[key];
-});
-var _cors = require("./plugins/cors");
-Object.keys(_cors).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _cors[key]) return;
-  exports[key] = _cors[key];
-});
-var _file_parser = require("./plugins/file_parser");
-Object.keys(_file_parser).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _file_parser[key]) return;
-  exports[key] = _file_parser[key];
-});
-var _form_body_parser = require("./plugins/form_body_parser");
-Object.keys(_form_body_parser).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _form_body_parser[key]) return;
-  exports[key] = _form_body_parser[key];
-});
-var _ws_parser = require("./plugins/ws_parser");
-Object.keys(_ws_parser).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _ws_parser[key]) return;
-  exports[key] = _ws_parser[key];
-});
-var _xml_parser = require("./plugins/xml_parser");
-Object.keys(_xml_parser).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _xml_parser[key]) return;
-  exports[key] = _xml_parser[key];
-});
-var _base2 = require("./services/base");
-Object.keys(_base2).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _base2[key]) return;
-  exports[key] = _base2[key];
-});
-var _cache = require("./services/cache");
-Object.keys(_cache).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _cache[key]) return;
-  exports[key] = _cache[key];
-});
-var _captcha = require("./services/captcha");
-Object.keys(_captcha).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _captcha[key]) return;
-  exports[key] = _captcha[key];
-});
-var _crypto = require("./services/crypto");
-Object.keys(_crypto).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _crypto[key]) return;
-  exports[key] = _crypto[key];
-});
-var _db_value = require("./services/db_value");
-Object.keys(_db_value).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _db_value[key]) return;
-  exports[key] = _db_value[key];
-});
-var _dingtalk = require("./services/dingtalk");
-Object.keys(_dingtalk).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _dingtalk[key]) return;
-  exports[key] = _dingtalk[key];
-});
-var _dispose = require("./services/dispose");
-Object.keys(_dispose).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _dispose[key]) return;
-  exports[key] = _dispose[key];
-});
-var _emoji = require("./services/emoji");
-Object.keys(_emoji).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _emoji[key]) return;
-  exports[key] = _emoji[key];
-});
-var _jwt = require("./services/jwt");
-Object.keys(_jwt).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _jwt[key]) return;
-  exports[key] = _jwt[key];
-});
-var _log = require("./services/log");
-Object.keys(_log).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _log[key]) return;
-  exports[key] = _log[key];
-});
-var _mail = require("./services/mail");
-Object.keys(_mail).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _mail[key]) return;
-  exports[key] = _mail[key];
-});
-var _pay = require("./services/pay");
-Object.keys(_pay).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _pay[key]) return;
-  exports[key] = _pay[key];
-});
-var _rate_limit = require("./services/rate_limit");
-Object.keys(_rate_limit).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _rate_limit[key]) return;
-  exports[key] = _rate_limit[key];
-});
-var _redis = require("./services/redis");
-Object.keys(_redis).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _redis[key]) return;
-  exports[key] = _redis[key];
-});
-var _sensitive_words = require("./services/sensitive_words");
-Object.keys(_sensitive_words).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _sensitive_words[key]) return;
-  exports[key] = _sensitive_words[key];
-});
-var _sms = require("./services/sms");
-Object.keys(_sms).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _sms[key]) return;
-  exports[key] = _sms[key];
-});
-var _dto = require("./types/dto");
-Object.keys(_dto).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _dto[key]) return;
-  exports[key] = _dto[key];
-});
-var _x = require("./x");
-Object.keys(_x).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _x[key]) return;
-  exports[key] = _x[key];
+  if (key in exports && exports[key] === _exports[key]) return;
+  exports[key] = _exports[key];
 });
 var _models = require(".x/models");
 Object.keys(_models).forEach(function (key) {

package/lib/cli/cli.js

@@ -28,6 +28,9 @@ 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 = () => {
@@ -99,6 +102,9 @@ 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 externals = castArray(argv.external || []).flatMap(item => item.split(',')).filter(Boolean);
   const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
@@ -130,6 +136,9 @@ 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({
@@ -147,6 +156,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await EnvUtil.importFile({
@@ -185,6 +197,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '使用 tsx 运行',
   type: 'boolean'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   const envFiles = EnvUtil.getFile(process.env.NODE_ENV, argv.channel);
   await EnvUtil.importFile({
@@ -213,6 +228,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '渠道',
   type: 'string'
 }), async argv => {
+  if (argv.channel === '') {
+    argv.channel = await EnvUtil.chooseChannel(process.cwd());
+  }
   const deployEnvFiles = EnvUtil.getFile('deploy', argv.channel, true);
   const deployEnv = await EnvUtil.parseFileAsMap({
     cwd: process.cwd(),

package/lib/cli/env_util.d.ts

@@ -9,6 +9,7 @@ export declare class EnvUtil {
     static RE_NEWLINES: RegExp;
     static NEWLINES_MATCH: RegExp;
     static COMMENT_MATCH: RegExp;
+    static chooseChannel(cwd: string): Promise<string | undefined>;
     static getFile(env?: string, channel?: string, noBase?: boolean): string[];
     static parseContent(src: string): ParsedEnv[];
     static parseFile(options: {

package/lib/cli/env_util.js

@@ -1,8 +1,29 @@
 import path from 'node:path';
 import fs from 'fs-extra';
+import globby from 'globby';
+import inquirer from 'inquirer';
 import { dedent, escapeRegExp, isPlainObject } from 'vtils';
 import { parse as yamlParse } from 'yaml';
 export class EnvUtil {
+  static async chooseChannel(cwd) {
+    const channelFiles = await globby(['.env@*.{yml,yaml}'], {
+      cwd: cwd,
+      onlyFiles: true,
+      absolute: false
+    });
+    if (channelFiles.length === 0) {
+      return undefined;
+    }
+    const channels = channelFiles.map(channel => channel.split('@').pop().split('.')[0]);
+    if (channels.length === 1) return channels[0];
+    const res = await inquirer.prompt([{
+      name: 'channel',
+      type: 'select',
+      message: '请选择渠道',
+      choices: channels
+    }]);
+    return res.channel || undefined;
+  }
   static getFile(env, channel, noBase) {
     const file = noBase ? [] : ['.env'];
     if (!noBase && channel) {

package/lib/exports.d.ts

@@ -0,0 +1,40 @@
+export * from './core/ctx_storage';
+export * from './core/define_bus';
+export * from './core/define_cron';
+export * from './core/define_handler';
+export * from './core/define_hook';
+export * from './core/define_server';
+export * from './core/define_task';
+export * from './core/get_handler_url';
+export * from './core/handler';
+export * from './core/http_error';
+export * from './core/http_header';
+export * from './core/http_method';
+export * from './core/http_redirect';
+export * from './core/server';
+export * from './core/types';
+export * from './plugins/base';
+export * from './plugins/cookie';
+export * from './plugins/cors';
+export * from './plugins/file_parser';
+export * from './plugins/form_body_parser';
+export * from './plugins/ws_parser';
+export * from './plugins/xml_parser';
+export * from './services/base';
+export * from './services/cache';
+export * from './services/captcha';
+export * from './services/crypto';
+export * from './services/db_value';
+export * from './services/dingtalk';
+export * from './services/dispose';
+export * from './services/emoji';
+export * from './services/jwt';
+export * from './services/log';
+export * from './services/mail';
+export * from './services/pay';
+export * from './services/rate_limit';
+export * from './services/redis';
+export * from './services/sensitive_words';
+export * from './services/sms';
+export * from './types/dto';
+export * from './x';

package/lib/exports.js

@@ -0,0 +1,42 @@
+// @index(['./**/*.ts', '!**/*.test.ts', '!./cli/**', '!**/_*', '!./index.ts'], f => `export * from '${f.path}';`)
+export * from "./core/ctx_storage";
+export * from "./core/define_bus";
+export * from "./core/define_cron";
+export * from "./core/define_handler";
+export * from "./core/define_hook";
+export * from "./core/define_server";
+export * from "./core/define_task";
+export * from "./core/get_handler_url";
+export * from "./core/handler";
+export * from "./core/http_error";
+export * from "./core/http_header";
+export * from "./core/http_method";
+export * from "./core/http_redirect";
+export * from "./core/server";
+export * from "./core/types";
+export * from "./plugins/base";
+export * from "./plugins/cookie";
+export * from "./plugins/cors";
+export * from "./plugins/file_parser";
+export * from "./plugins/form_body_parser";
+export * from "./plugins/ws_parser";
+export * from "./plugins/xml_parser";
+export * from "./services/base";
+export * from "./services/cache";
+export * from "./services/captcha";
+export * from "./services/crypto";
+export * from "./services/db_value";
+export * from "./services/dingtalk";
+export * from "./services/dispose";
+export * from "./services/emoji";
+export * from "./services/jwt";
+export * from "./services/log";
+export * from "./services/mail";
+export * from "./services/pay";
+export * from "./services/rate_limit";
+export * from "./services/redis";
+export * from "./services/sensitive_words";
+export * from "./services/sms";
+export * from "./types/dto";
+export * from "./x";
+// @endindex

package/lib/index.d.ts

@@ -1,41 +1,2 @@
-export * from './core/ctx_storage';
-export * from './core/define_bus';
-export * from './core/define_cron';
-export * from './core/define_handler';
-export * from './core/define_hook';
-export * from './core/define_server';
-export * from './core/define_task';
-export * from './core/get_handler_url';
-export * from './core/handler';
-export * from './core/http_error';
-export * from './core/http_header';
-export * from './core/http_method';
-export * from './core/http_redirect';
-export * from './core/server';
-export * from './core/types';
-export * from './plugins/base';
-export * from './plugins/cookie';
-export * from './plugins/cors';
-export * from './plugins/file_parser';
-export * from './plugins/form_body_parser';
-export * from './plugins/ws_parser';
-export * from './plugins/xml_parser';
-export * from './services/base';
-export * from './services/cache';
-export * from './services/captcha';
-export * from './services/crypto';
-export * from './services/db_value';
-export * from './services/dingtalk';
-export * from './services/dispose';
-export * from './services/emoji';
-export * from './services/jwt';
-export * from './services/log';
-export * from './services/mail';
-export * from './services/pay';
-export * from './services/rate_limit';
-export * from './services/redis';
-export * from './services/sensitive_words';
-export * from './services/sms';
-export * from './types/dto';
-export * from './x';
+export * from './exports';
 export * from '.x/models';

package/lib/index.js

@@ -1,45 +1,3 @@
-// @index(['./**/*.ts', '!**/*.test.ts', '!./cli/**', '!**/_*'], f => `export * from '${f.path}';`)
-export * from "./core/ctx_storage";
-export * from "./core/define_bus";
-export * from "./core/define_cron";
-export * from "./core/define_handler";
-export * from "./core/define_hook";
-export * from "./core/define_server";
-export * from "./core/define_task";
-export * from "./core/get_handler_url";
-export * from "./core/handler";
-export * from "./core/http_error";
-export * from "./core/http_header";
-export * from "./core/http_method";
-export * from "./core/http_redirect";
-export * from "./core/server";
-export * from "./core/types";
-export * from "./plugins/base";
-export * from "./plugins/cookie";
-export * from "./plugins/cors";
-export * from "./plugins/file_parser";
-export * from "./plugins/form_body_parser";
-export * from "./plugins/ws_parser";
-export * from "./plugins/xml_parser";
-export * from "./services/base";
-export * from "./services/cache";
-export * from "./services/captcha";
-export * from "./services/crypto";
-export * from "./services/db_value";
-export * from "./services/dingtalk";
-export * from "./services/dispose";
-export * from "./services/emoji";
-export * from "./services/jwt";
-export * from "./services/log";
-export * from "./services/mail";
-export * from "./services/pay";
-export * from "./services/rate_limit";
-export * from "./services/redis";
-export * from "./services/sensitive_words";
-export * from "./services/sms";
-export * from "./types/dto";
-export * from "./x";
-// @endindex
-
+export * from "./exports";
 // @ts-ignore
 export * from '.x/models';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.72.1",
+  "version": "2.73.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -51,6 +51,7 @@
     "globby": "^11",
     "got": "^11.8.2",
     "http-errors": "^2.0.0",
+    "inquirer": "^12.5.0",
     "ioredis": "^5.3.2",
     "jsonwebtoken": "^8.5.1",
     "lru-cache": "^10.0.0",