@oxiaom/adoremix 1.0.19 → 1.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxiaom/adoremix",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "AdoreMix broadcast server - cross-platform installer, runner and service manager",
   "bin": {
     "adoremix": "./bin/adoremix.js"

package/src/cli.js

@@ -308,15 +308,38 @@ function buildProgram() {
     .option('--file <path>', '指定日志文件')
     .option('-n, --lines <n>', '初始打印行数', parseInt, 50)
     .action((opts) => {
-      const wp = paths.workdirPaths(resolveWorkdir(opts.workdir));
-      const file = opts.file || wp.logfile;
+      const workdir = resolveWorkdir(opts.workdir);
+      const wp = paths.workdirPaths(workdir);
       const fs = require('fs');
       const { spawn } = require('child_process');
-      if (!fs.existsSync(file)) {
-        logger.warn(`日志文件不存在 ${file}`);
+      // 默认日志文件：选最近更新的。
+      //   systemd 模式 → logs/svc.log（unit 模板 StandardOutput=append 写这里）
+      //   前台/daemon 模式 → var/app.log（spawn 重定向）
+      // 用户可用 --file 覆盖。
+      let file = opts.file;
+      if (!file) {
+        const candidates = [
+          path.join(workdir, 'logs', 'svc.err'),   // systemd 模式：二进制实时输出（stderr，更新最频繁）
+          path.join(workdir, 'logs', 'svc.log'),   // systemd 模式：node logger（stdout）
+          wp.logfile                                 // 前台/daemon 模式：var/app.log
+        ];
+        let bestMtime = 0;
+        for (const f of candidates) {
+          try {
+            const m = fs.statSync(f).mtimeMs;
+            if (m > bestMtime) { bestMtime = m; file = f; }
+          } catch (e) {}
+        }
+      }
+      if (!file || !fs.existsSync(file)) {
+        logger.warn(`日志文件不存在（找了 logs/svc.err、logs/svc.log、${wp.logfile}）`);
+        logger.log('提示：systemd 模式也可用 journalctl -u adoremix -f');
         process.exitCode = 1;
         return;
       }
+      if (file !== wp.logfile && !opts.file) {
+        logger.log(`（自动选中 ${path.relative(workdir, file)}，--file 可指定其他）`);
+      }
       if (!opts.follow) {
         const tail = spawn(process.platform === 'win32' ? 'more' : 'tail', process.platform === 'win32' ? [file] : ['-n', String(opts.lines), file], { stdio: 'inherit' });
         tail.on('exit', (c) => process.exit(c || 0));

package/src/tts-deps.js

@@ -18,6 +18,10 @@ const { execSync, execFileSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
+// 二进制调外部命令 lame 把 TTS 生成的音频转码成 mp3（源码 cmd = "lame -S"），
+// 所有 provider 都需要，缺失时 node tts.js 生成 .txt 但 lame 转码 mp3 失败。
+const TRANSCODE_TOOLS = [{ name: 'lame', cmd: 'lame' }];
+
 const PROVIDER_DEPENDENCIES = {
   xf: {
     nodeModules: ['crypto-js', 'ws', 'log4node'],
@@ -28,14 +32,14 @@ const PROVIDER_DEPENDENCIES = {
     ],
     systemPkgs: [],
     pipPkgs: [],
-    executables: []
+    executables: TRANSCODE_TOOLS
   },
   minimax: {
     nodeModules: [],  // 用 Node 内置 https
     creds: [{ key: 'TTS.minimax_token', name: 'token' }],
     systemPkgs: [],
     pipPkgs: [],
-    executables: []
+    executables: TRANSCODE_TOOLS
   },
   edge: {
     nodeModules: [],
@@ -45,7 +49,7 @@ const PROVIDER_DEPENDENCIES = {
       { name: 'ffmpeg', cmd: 'ffmpeg' }
     ],
     pipPkgs: [{ pkg: 'edge-tts', import: 'edge_tts' }],
-    executables: [{ name: 'ffmpeg', cmd: 'ffmpeg' }]
+    executables: [{ name: 'ffmpeg', cmd: 'ffmpeg' }, ...TRANSCODE_TOOLS]
   }
 };
 
@@ -155,8 +159,13 @@ function checkDeps(workdir, providerName, cfg) {
     }
   }
 
-  // 2. Node 模块
-  for (const mod of deps.nodeModules) {
+  // 2. Node 模块（provider 自己的 + dispatcher 公共依赖）
+  // dispatcher tts.js 所有 provider 都走，它 require ini 读 config，
+  // 缺失时二进制调 node tts.js 直接 MODULE_NOT_FOUND（TTS 全挂）。
+  // 常见于 --skip-npm-install 安装或 npm install 失败的场景。
+  const DISPATCHER_NODE_DEPS = ['ini'];
+  const allNodeMods = [...new Set([...deps.nodeModules, ...DISPATCHER_NODE_DEPS])];
+  for (const mod of allNodeMods) {
     if (!nodeModuleInstalled(workdir, mod)) {
       issues.push({
         severity: 'error',
@@ -187,12 +196,13 @@ function checkDeps(workdir, providerName, cfg) {
   }
 
   // 4. 系统可执行
-  for (const exe of deps.execubles || deps.systemPkgs) {
+  for (const exe of deps.executables || deps.systemPkgs) {
     if (exe.cmd && !which(exe.cmd)) {
       // 推断 apt 包名
       let aptPkg = '';
       if (exe.name === 'python3') aptPkg = 'python3 python3-pip';
       else if (exe.name === 'ffmpeg') aptPkg = 'ffmpeg';
+      else if (exe.name === 'lame') aptPkg = 'lame';
       const pkgMgr = detectAptLike();
       issues.push({
         severity: 'error',
@@ -235,7 +245,12 @@ function fixDeps(workdir, issues, opts) {
     if (!issue.autoFixable) continue;
     try {
       if (issue.fixType === 'npm') {
-        execSync(`npm install ${issue.fixArgs.mod} --no-audit --no-fund`, {
+        // 国内默认 npm 源慢/易失败，走 npmmirror（ADOREMIX_NPM_REGISTRY 可覆盖，留空用官方源）
+        const registry = process.env.ADOREMIX_NPM_REGISTRY !== undefined
+          ? process.env.ADOREMIX_NPM_REGISTRY
+          : 'https://registry.npmmirror.com';
+        const regFlag = registry ? ` --registry ${registry}` : '';
+        execSync(`npm install ${issue.fixArgs.mod}${regFlag} --no-audit --no-fund`, {
           cwd: issue.fixArgs.cwd,
           stdio: 'inherit'
         });

package/templates/adoremix.service.tmpl

@@ -16,7 +16,7 @@ ExecStart=__NODE__ __CLI__ start --workdir __WORKDIR__
 Restart=on-failure
 RestartSec=5
 StandardOutput=append:__WORKDIR__/logs/svc.log
-StandardError=append:__WORKDIR__/logs/svc.err
+StandardError=append:__WORKDIR__/logs/svc.log
 LimitNOFILE=65536
 
 [Install]

package/templates/winservice.js.tmpl

@@ -17,7 +17,9 @@ const svc = new Service({
   description: SVC_DESC,
   script: CLI,
   execPath: NODE,
-  args: ['start', '--daemon', '--workdir', WORKDIR],
+  // 用前台模式（不加 --daemon）：node 持续运行作为服务主进程，winsw 才能正确跟踪/重启/停止。
+  // daemon 模式 node 会 unref 后退出，winsw 认为服务停了（跟 systemd 同 bug）。
+  args: ['start', '--workdir', WORKDIR],
   cwd: WORKDIR,
   env: [{
     name: 'NODE_ENV',

package/tts/providers/edge.js

@@ -15,26 +15,38 @@ const path = require('path');
 const os = require('os');
 
 // 短名 → edge-tts voice 全名
+// 注意：edge-tts 的 zh-CN voice 实际只有 8 个（--list-voices 确认）：
+//   女声 XiaoxiaoNeural(晓晓) XiaoyiNeural(晓伊)
+//   男声 YunxiNeural(云希) YunjianNeural(云健) YunxiaNeural(云夏) YunyangNeural(云扬)
+//   方言 liaoning-XiaobeiNeural shaanxi-XiaoniNeural
+// 讯飞/Qt 传的很多短名在 edge 无对应，就近映射到同性别有效 voice；
+// synthesize 另有 fallback 兜底（voice 调用失败回落 XiaoxiaoNeural）。
 const VOICES = {
+  // 直接对应
   xiaoxiao:   'zh-CN-XiaoxiaoNeural',
+  xiaoyi:     'zh-CN-XiaoyiNeural',
   yunxi:      'zh-CN-YunxiNeural',
   yunjian:    'zh-CN-YunjianNeural',
-  xiaoyi:     'zh-CN-XiaoyiNeural',
   yunxia:     'zh-CN-YunxiaNeural',
-  xiaochen:   'zh-CN-XiaochenNeural',
-  xiaohan:    'zh-CN-XiaohanNeural',
-  xiaomeng:   'zh-CN-XiaomengNeural',
-  xiaomo:     'zh-CN-XiaomoNeural',
-  xiaoqiu:    'zh-CN-XiaoqiuNeural',
-  xiaorui:    'zh-CN-XiaoruiNeural',
-  xiaoshuang: 'zh-CN-XiaoshuangNeural',
-  xiaoxuan:   'zh-CN-XiaoxuanNeural',
-  xiaoyan:    'zh-CN-XiaoyanNeural',
-  xiaoyou:    'zh-CN-XiaoyouNeural',
-  yunfeng:    'zh-CN-YunfengNeural',
-  yunhao:     'zh-CN-YunhaoNeural',
-  yunxiang:   'zh-CN-YunxiangNeural',
-  yunyang:    'zh-CN-YunyangNeural'
+  yunyang:    'zh-CN-YunyangNeural',
+  // edge 无对应，就近映射（女声→晓晓/晓伊，男声→云希/云健）
+  xiaoyan:    'zh-CN-XiaoxiaoNeural',
+  xiaochen:   'zh-CN-XiaoxiaoNeural',
+  xiaohan:    'zh-CN-XiaoxiaoNeural',
+  xiaomeng:   'zh-CN-XiaoyiNeural',
+  xiaomo:     'zh-CN-XiaoyiNeural',
+  xiaoqiu:    'zh-CN-XiaoxiaoNeural',
+  xiaorui:    'zh-CN-XiaoxiaoNeural',
+  xiaoshuang: 'zh-CN-XiaoyiNeural',
+  xiaoxuan:   'zh-CN-XiaoxiaoNeural',
+  xiaoyou:    'zh-CN-XiaoyiNeural',
+  yunfeng:    'zh-CN-YunxiNeural',
+  yunhao:     'zh-CN-YunxiNeural',
+  yunxiang:   'zh-CN-YunjianNeural',
+  // 讯飞原生发音人（WebUI 音色选项：小燕/许久/小萍/小婧）→ 映射到 edge 有效 voice
+  aisjiuxu:   'zh-CN-YunxiNeural',    // 许久（男）→ 云希
+  aisxping:   'zh-CN-XiaoxiaoNeural', // 小萍（女）→ 晓晓
+  aisjinger:  'zh-CN-XiaoyiNeural'    // 小婧（女）→ 晓伊
 };
 
 function findPython() {
@@ -77,7 +89,8 @@ function synthesize({ text, voice, volume, speed, outFile }, creds) {
     }
 
     const py = findPython();
-    const voiceId = VOICES[voice] || creds.edge_voice_override || 'zh-CN-XiaoxiaoNeural';
+    const DEFAULT_VOICE = 'zh-CN-XiaoxiaoNeural';
+    const wantedVoice = VOICES[voice] || creds.edge_voice_override || DEFAULT_VOICE;
 
     // edge-tts rate/volume 是百分比字符串，如 "+50%" / "-20%"
     const sp = parseInt(speed) || 50;
@@ -91,8 +104,8 @@ function synthesize({ text, voice, volume, speed, outFile }, creds) {
     const txtFile = path.join(tmpDir, `adoremix-edge-${Date.now()}.txt`);
     fs.writeFileSync(txtFile, text);
 
-    try {
-      // 用 python -m edge_tts 调用（避免命令找不到）
+    // 跑一次 edge-tts（指定 voice），voice 无效/网络抖动时回落默认 voice 重试
+    function runEdge(voiceId) {
       execFileSync(py, [
         '-m', 'edge_tts',
         '--voice', voiceId,
@@ -101,9 +114,23 @@ function synthesize({ text, voice, volume, speed, outFile }, creds) {
         '-f', txtFile,
         '--write-media', webmFile
       ], { stdio: 'pipe' });
+      if (!fs.existsSync(webmFile) || fs.statSync(webmFile).size === 0) {
+        throw new Error('edge-tts 未生成音频（voice 可能无效或网络问题）');
+      }
+    }
 
-      if (!fs.existsSync(webmFile)) {
-        throw new Error('edge-tts 未生成音频');
+    let usedVoice = wantedVoice;
+    try {
+      try {
+        runEdge(wantedVoice);
+      } catch (e) {
+        // voice 在 edge-tts 不存在（微软列表动态变化）或网络抖动 → 回落默认 voice 重试一次
+        if (wantedVoice !== DEFAULT_VOICE) {
+          usedVoice = DEFAULT_VOICE;
+          runEdge(DEFAULT_VOICE);
+        } else {
+          throw e;
+        }
       }
 
       // 2. ffmpeg 转 mp3
@@ -118,7 +145,7 @@ function synthesize({ text, voice, volume, speed, outFile }, creds) {
       // 3. 清理临时
       try { fs.unlinkSync(webmFile); fs.unlinkSync(txtFile); } catch (e) {}
 
-      resolve({ outFile, provider: 'edge', voice: voiceId });
+      resolve({ outFile, provider: 'edge', voice: usedVoice });
     } catch (e) {
       try { fs.unlinkSync(webmFile); fs.unlinkSync(txtFile); } catch (_) {}
       reject(new Error('edge-tts 失败: ' + e.message));