@oxiaom/adoremix 1.0.14 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxiaom/adoremix",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "AdoreMix broadcast server - cross-platform installer, runner and service manager",
   "bin": {
     "adoremix": "./bin/adoremix.js"
@@ -38,7 +38,8 @@
     "bin",
     "src",
     "templates",
-    "tts"
+    "tts",
+    "webui"
   ],
   "keywords": [
     "adoremix",

package/src/cli.js

@@ -229,6 +229,21 @@ function buildProgram() {
       process.exitCode = code || 0;
     });
 
+  config
+    .command('webui')
+    .description('切换 WebUI 版本（low=16k 互联网 / high=44.1k 局域网）')
+    .option('--workdir <path>')
+    .option('--variant <v>', '直接指定: low | high')
+    .option('--no-interactive', '用当前配置部署')
+    .action(async (opts) => {
+      const webui = require('./config/webui');
+      const code = await webui.setupWebui(resolveWorkdir(opts.workdir), {
+        variant: opts.variant,
+        interactive: opts.interactive !== false
+      });
+      process.exitCode = code || 0;
+    });
+
   const runner = require('./runner');
   const nativeRef = () => {
     try { return paths.loadNative(); }

package/src/config/defaults.js

@@ -54,7 +54,8 @@ module.exports = {
     ttsxfAPISecret: '',
     ttsxfAPIKey: '',
     cutepath: 'etc/docroot',
-    cuteport: 12083
+    cuteport: 12083,
+    webui: 'low'
   },
   listener: {
     port: 12080,

package/src/config/webui.js

@@ -0,0 +1,118 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const fse = require('fs-extra');
+const prompts = require('prompts');
+const logger = require('../logger');
+const cfg = require('./index');
+
+const WEBUI_KEY = 'Settings.webui';
+
+const WEBUI_VARIANTS = {
+  low: {
+    name: '低码率',
+    desc: '16k stereo / 32kbps（WiFi 音响、互联网环境）',
+    dir: 'low'
+  },
+  high: {
+    name: '高码率',
+    desc: '44.1k stereo / 64kbps（局域网、音质要求高）',
+    dir: 'high'
+  }
+};
+
+function getWebuiDir(variant) {
+  const v = WEBUI_VARIANTS[variant];
+  if (!v) return null;
+  // npm 包里 webui/ 在主包根
+  return path.join(__dirname, '..', '..', 'webui', v.dir);
+}
+
+function deployWebui(workdir, variant) {
+  const srcDir = getWebuiDir(variant);
+  if (!srcDir) {
+    logger.error(`未知 webui 变体: ${variant}（可选: low / high）`);
+    return false;
+  }
+  if (!fs.existsSync(srcDir)) {
+    logger.error(`webui 源目录不存在: ${srcDir}`);
+    logger.warn('主包可能没包含 webui/（旧版？）');
+    return false;
+  }
+  const docroot = path.join(workdir, 'etc', 'docroot');
+  // 备份原 docroot（如果存在且不是我们自己部署的）
+  // 简单做法：直接覆盖（用户业务资源应该在其他地方，docroot 是纯前端 UI）
+  if (fs.existsSync(docroot)) {
+    // 保留 docroot/mp3/ 目录（广播系统运行时存 mp3 的地方）
+    const mp3Backup = path.join(workdir, 'etc', 'docroot_mp3_backup');
+    const mp3Dir = path.join(docroot, 'mp3');
+    if (fs.existsSync(mp3Dir)) {
+      fse.removeSync(mp3Backup);
+      fse.moveSync(mp3Dir, mp3Backup);
+    }
+    fse.removeSync(docroot);
+  } else {
+    fse.ensureDirSync(path.join(workdir, 'etc'));
+  }
+  fse.copySync(srcDir, docroot);
+  // 恢复 mp3/
+  const mp3Backup = path.join(workdir, 'etc', 'docroot_mp3_backup');
+  if (fs.existsSync(mp3Backup)) {
+    fse.moveSync(mp3Backup, path.join(docroot, 'mp3'));
+  }
+  return true;
+}
+
+async function setupWebui(workdir, opts) {
+  opts = opts || {};
+  const current = cfg.getConfigValue(workdir, WEBUI_KEY) || 'low';
+
+  let variant;
+  if (opts.variant) {
+    if (!WEBUI_VARIANTS[opts.variant]) {
+      logger.error(`未知变体: ${opts.variant}（可选: ${Object.keys(WEBUI_VARIANTS).join(' / ')}）`);
+      return 1;
+    }
+    variant = opts.variant;
+  } else if (opts.interactive === false) {
+    variant = current;
+  } else {
+    logger.log('');
+    logger.log('=== WebUI 版本选择 ===');
+    logger.log('说明：');
+    logger.log('  • 低码率 (16k/32kbps)  - WiFi 音响、互联网环境，省流量');
+    logger.log('  • 高码率 (44.1k/64kbps) - 局域网、音质要求高');
+    logger.log(`当前：${current}（${WEBUI_VARIANTS[current].desc}）`);
+    logger.log('');
+    const resp = await prompts({
+      type: 'select',
+      name: 'variant',
+      message: '选择 WebUI 版本',
+      choices: Object.keys(WEBUI_VARIANTS).map(k => ({
+        title: `${WEBUI_VARIANTS[k].name.padEnd(6)} ${WEBUI_VARIANTS[k].desc}`,
+        value: k
+      })),
+      initial: Object.keys(WEBUI_VARIANTS).indexOf(current)
+    });
+    if (!resp.variant) return 1;
+    variant = resp.variant;
+  }
+
+  logger.info(`部署 WebUI: ${variant} (${WEBUI_VARIANTS[variant].desc})`);
+  const ok = deployWebui(workdir, variant);
+  if (!ok) return 1;
+
+  cfg.setConfigValue(workdir, WEBUI_KEY, variant);
+  logger.ok(`Settings.webui = ${variant}`);
+  logger.ok(`已部署到 ${path.join(workdir, 'etc', 'docroot')}`);
+  logger.log('改完后记得：adoremix restart');
+  return 0;
+}
+
+module.exports = {
+  setupWebui,
+  deployWebui,
+  WEBUI_VARIANTS,
+  WEBUI_KEY
+};

package/src/install.js

@@ -140,6 +140,22 @@ function deployTtsDispatcher(workdir) {
   logger.log('    测试：adoremix tts test "你好"');
 }
 
+// 部署 WebUI 到 etc/docroot/（按 Settings.webui 配置选 low/high）
+function deployWebuiIfPresent(workdir) {
+  try {
+    const webui = require('./config/webui');
+    const cfg = require('./config');
+    const variant = cfg.getConfigValue(workdir, 'Settings.webui') || 'low';
+    if (webui.deployWebui(workdir, variant)) {
+      logger.ok(`部署 WebUI: ${variant} → etc/docroot/`);
+      logger.log('    切换：adoremix config webui');
+    }
+  } catch (e) {
+    // 静默失败（webui 目录不存在时不算错误）
+    logger.warn(`WebUI 部署跳过：${e.message}`);
+  }
+}
+
 async function runInstall(opts) {
   opts = opts || {};
   const workdir = opts.workdir || paths.defaultWorkdir();
@@ -177,6 +193,7 @@ async function runInstall(opts) {
     return 1;
   }
   deployTtsDispatcher(workdir);
+  deployWebuiIfPresent(workdir);
 
   const config = require('./config');
   const cfgOk = await config.ensureConfig(workdir, { interactive: opts.interactive !== false, force: opts.force });

package/src/tts-cli.js

@@ -192,12 +192,10 @@ async function cmdTest(workdir, text, opts) {
     return 1;
   }
 
-  // 准备文本 + 输出
+  // 准备文本 + 输出（都用相对路径，dispatcher 在 cwd=workdir 下跑）
   const ttyDir = path.join(workdir, 'tty');
   if (!fs.existsSync(ttyDir)) fs.mkdirSync(ttyDir, { recursive: true });
-  const txtFile = path.join(ttyDir, '_cli_test.txt');
-  const outFile = path.join(ttyDir, '_cli_test.mp3');
-  fs.writeFileSync(txtFile, text);
+  fs.writeFileSync(path.join(ttyDir, '_cli_test.txt'), text);
 
   // 调用 dispatcher
   const ttsJs = path.join(workdir, 'tts.js');
@@ -207,10 +205,12 @@ async function cmdTest(workdir, text, opts) {
   }
   logger.info(`provider=${c.provider} voice=${voice} text="${text.slice(0, 40)}${text.length > 40 ? '...' : ''}"`);
   try {
-    execSync(`node "${ttsJs}" ${volume} ${speed} ${voice} _cli_test.mp3 _cli_test.txt`, {
+    // dispatcher 接收：mp3 名（写到 ./tty/）+ txt 路径（cwd 相对）
+    execSync(`node "${ttsJs}" ${volume} ${speed} ${voice} _cli_test.mp3 tty/_cli_test.txt`, {
       cwd: workdir,
       stdio: 'inherit'
     });
+    const outFile = path.join(ttyDir, '_cli_test.mp3');
     if (fs.existsSync(outFile)) {
       const size = fs.statSync(outFile).size;
       logger.ok(`✓ 生成成功: ${outFile} (${(size / 1024).toFixed(1)} KB)`);