@oxiaom/adoremix 1.0.9 → 1.0.11

package/package.json

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

package/src/doctor.js

@@ -162,6 +162,31 @@ function runDoctor(workdir, opts) {
     logger.log(`○ 服务未运行（adoremix start 启动）`);
   }
 
+  // 8. TTS provider 依赖检查
+  logger.log('');
+  logger.log('=== TTS Provider 检查 ===');
+  const cfg = require('./config');
+  const cfgObj = cfg.readConfig(workdir) || {};
+  const ttsDeps = require('./tts-deps');
+  const providerName = (cfgObj.TTS && cfgObj.TTS.provider) || 'xf';
+  logger.log(`当前 provider: ${providerName}`);
+  const ttsResult = ttsDeps.checkDeps(workdir, providerName, cfgObj);
+  if (ttsResult.issues.length === 0) {
+    logger.ok(`✓ ${providerName} provider 所有依赖就绪`);
+  } else {
+    for (const iss of ttsResult.issues) {
+      const mark = iss.severity === 'error' ? '❌' : '⚠';
+      logger.log(`  ${mark} ${iss.msg}`);
+      if (iss.fixCmd) logger.log(`     修复：${iss.fixCmd}`);
+      if (iss.autoFixable) issues.push({ type: 'tts', severity: iss.severity, msg: iss.msg, fixCmd: iss.fixCmd });
+    }
+    if (opts.fix) {
+      logger.info('==> 自动修复 TTS 依赖...');
+      const r = ttsDeps.fixDeps(workdir, ttsResult.issues, { sudo: process.getuid && process.getuid() === 0 });
+      logger.ok(`✓ 修复 ${r.fixed} 项，失败 ${r.failed} 项`);
+    }
+  }
+
   return reportAndExit(issues, opts);
 }
 

package/src/install.js

@@ -17,7 +17,8 @@ const NODE_HELPER_DEPS = {
   'mysql': '^2.18.1',
   'request': '^2.88.2',
   'sqlite': '^4.2.0',
-  'ws': '^8.13.0'
+  'ws': '^8.13.0',
+  'ini': '^4.1.3'
 };
 
 function isWorkdirInitialized(workdir) {

package/src/tts-deps.js

@@ -0,0 +1,253 @@
+'use strict';
+
+/**
+ * TTS provider 依赖检查（最硬核版）
+ *
+ * 检查每个 provider 需要的所有东西：
+ *   xf:     crypto-js, ws, log4node (Node 包) + appid/apiSecret/apiKey (凭证)
+ *   minimax: token (凭证) - Node 内置 https，无外部依赖
+ *   edge:   python3, edge-tts (pip 包), ffmpeg (系统) - 完全免费但依赖多
+ *
+ * 用法：
+ *   const issues = checkDeps(workdir);
+ *   // issues: [{severity, msg, fixCmd, autoFixable}]
+ *   if (opts.fix) fixDeps(workdir, issues);
+ */
+
+const { execSync, execFileSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+const PROVIDER_DEPENDENCIES = {
+  xf: {
+    nodeModules: ['crypto-js', 'ws', 'log4node'],
+    creds: [
+      { key: 'TTS.xf_appid', name: 'appid' },
+      { key: 'TTS.xf_apiSecret', name: 'apiSecret' },
+      { key: 'TTS.xf_apiKey', name: 'apiKey' }
+    ],
+    systemPkgs: [],
+    pipPkgs: [],
+    executables: []
+  },
+  minimax: {
+    nodeModules: [],  // 用 Node 内置 https
+    creds: [{ key: 'TTS.minimax_token', name: 'token' }],
+    systemPkgs: [],
+    pipPkgs: [],
+    executables: []
+  },
+  edge: {
+    nodeModules: [],
+    creds: [],
+    systemPkgs: [
+      { name: 'python3', cmd: 'python3', altCmd: 'python' },
+      { name: 'ffmpeg', cmd: 'ffmpeg' }
+    ],
+    pipPkgs: [{ pkg: 'edge-tts', import: 'edge_tts' }],
+    executables: [{ name: 'ffmpeg', cmd: 'ffmpeg' }]
+  }
+};
+
+function which(cmd) {
+  try {
+    execSync(`command -v ${cmd} 2>/dev/null || which ${cmd} 2>/dev/null`, { stdio: 'pipe' });
+    return true;
+  } catch (e) { return false; }
+}
+
+function findPythonCmd() {
+  for (const c of ['python3', 'python']) {
+    if (which(c)) {
+      try {
+        const v = execSync(`${c} --version`, { stdio: 'pipe', encoding: 'utf8' });
+        if (/Python 3\./.test(v)) return c;
+      } catch (e) {}
+    }
+  }
+  return null;
+}
+
+function pythonHasModule(pyCmd, modName) {
+  if (!pyCmd) return false;
+  try {
+    execFileSync(pyCmd, ['-c', `import ${modName}`], { stdio: 'pipe' });
+    return true;
+  } catch (e) { return false; }
+}
+
+function nodeModuleInstalled(workdir, modName) {
+  try {
+    require.resolve(modName, { paths: [workdir] });
+    return true;
+  } catch (e) { return false; }
+}
+
+function getCredValue(cfg, dottedKey) {
+  const parts = dottedKey.split('.');
+  let cur = cfg;
+  for (const p of parts) {
+    if (cur == null || typeof cur !== 'object') return undefined;
+    cur = cur[p];
+  }
+  return cur;
+}
+
+function detectAptLike() {
+  if (which('apt-get')) return 'apt-get';
+  if (which('apt')) return 'apt';
+  if (which('yum')) return 'yum';
+  if (which('dnf')) return 'dnf';
+  if (which('apk')) return 'apk';
+  return null;
+}
+
+/**
+ * 检查指定 provider 的所有依赖
+ * @returns {issues: Array, provider: string}
+ */
+function checkDeps(workdir, providerName, cfg) {
+  const issues = [];
+  providerName = providerName || (cfg && cfg.TTS && cfg.TTS.provider) || 'xf';
+  const deps = PROVIDER_DEPENDENCIES[providerName];
+  if (!deps) {
+    return { issues: [{ severity: 'error', msg: `未知 provider: ${providerName}`, autoFixable: false }], provider: providerName };
+  }
+
+  // 1. 凭证
+  for (const c of deps.creds) {
+    const val = getCredValue(cfg, c.key);
+    if (!val) {
+      issues.push({
+        severity: 'error',
+        category: 'cred',
+        msg: `${providerName} 缺凭证 ${c.name}（${c.key}）`,
+        fixCmd: `adoremix config set ${c.key} <your_${c.name}>`,
+        autoFixable: false
+      });
+    }
+  }
+
+  // 2. Node 模块
+  for (const mod of deps.nodeModules) {
+    if (!nodeModuleInstalled(workdir, mod)) {
+      issues.push({
+        severity: 'error',
+        category: 'node_module',
+        msg: `Node 包未安装: ${mod}`,
+        fixCmd: `cd ${workdir} && npm install ${mod}`,
+        autoFixable: true,
+        fixType: 'npm',
+        fixArgs: { cwd: workdir, mod }
+      });
+    }
+  }
+
+  // 3. pip 包
+  const pyCmd = findPythonCmd();
+  for (const pip of deps.pipPkgs) {
+    if (!pythonHasModule(pyCmd, pip.import)) {
+      issues.push({
+        severity: 'error',
+        category: 'pip',
+        msg: `Python 包未安装: ${pip.pkg}`,
+        fixCmd: 'pip3 install ' + pip.pkg,
+        autoFixable: true,
+        fixType: 'pip',
+        fixArgs: { pkg: pip.pkg, pyCmd }
+      });
+    }
+  }
+
+  // 4. 系统可执行
+  for (const exe of deps.execubles || 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';
+      const pkgMgr = detectAptLike();
+      issues.push({
+        severity: 'error',
+        category: 'system',
+        msg: `系统命令未找到: ${exe.name}`,
+        fixCmd: aptPkg && pkgMgr ? `sudo ${pkgMgr} install -y ${aptPkg}` : '',
+        autoFixable: !!(aptPkg && pkgMgr),
+        fixType: 'system',
+        fixArgs: { pkgMgr, aptPkg }
+      });
+    }
+  }
+
+  // python3 特殊处理（如果 edge 需要 python3 但只装了 python）
+  if (providerName === 'edge' && !pyCmd) {
+    const pkgMgr = detectAptLike();
+    issues.push({
+      severity: 'error',
+      category: 'system',
+      msg: '需要 python3（未找到 Python 3.x）',
+      fixCmd: pkgMgr ? `sudo ${pkgMgr} install -y python3 python3-pip` : '',
+      autoFixable: !!pkgMgr,
+      fixType: 'system',
+      fixArgs: { pkgMgr, aptPkg: 'python3 python3-pip' }
+    });
+  }
+
+  return { issues, provider: providerName };
+}
+
+/**
+ * 自动修复（仅 autoFixable=true 的）
+ */
+function fixDeps(workdir, issues, opts) {
+  opts = opts || {};
+  const sudo = opts.sudo ? 'sudo ' : '';
+  let fixed = 0;
+  let failed = 0;
+  for (const issue of issues) {
+    if (!issue.autoFixable) continue;
+    try {
+      if (issue.fixType === 'npm') {
+        execSync(`npm install ${issue.fixArgs.mod} --no-audit --no-fund`, {
+          cwd: issue.fixArgs.cwd,
+          stdio: 'inherit'
+        });
+      } else if (issue.fixType === 'pip') {
+        const py = issue.fixArgs.pyCmd || findPythonCmd() || 'python3';
+        execSync(`${sudo}${py} -m pip install ${issue.fixArgs.pkg}`, { stdio: 'inherit' });
+      } else if (issue.fixType === 'system') {
+        if (!issue.fixArgs.pkgMgr) throw new Error('包管理器未识别');
+        execSync(`${sudo}${issue.fixArgs.pkgMgr} install -y ${issue.fixArgs.aptPkg}`, { stdio: 'inherit' });
+      }
+      fixed++;
+    } catch (e) {
+      console.error(`  ✗ 修复失败 [${issue.msg}]: ${e.message.split('\n')[0]}`);
+      failed++;
+    }
+  }
+  return { fixed, failed };
+}
+
+/**
+ * 列出所有 provider 的依赖（用于 adoremix tts deps 不带 provider 时）
+ */
+function listAllProviders(workdir, cfg) {
+  const result = {};
+  for (const name of Object.keys(PROVIDER_DEPENDENCIES)) {
+    const r = checkDeps(workdir, name, cfg);
+    result[name] = {
+      issues: r.issues,
+      ok: r.issues.length === 0
+    };
+  }
+  return result;
+}
+
+module.exports = {
+  PROVIDER_DEPENDENCIES,
+  checkDeps,
+  fixDeps,
+  listAllProviders,
+  which,
+  findPythonCmd
+};

package/tts/tts.js

@@ -45,10 +45,12 @@ async function main() {
   // 读 config.ini 找 provider
   const cfgPath = path.join(process.cwd(), 'config.ini');
   let ttsSection = {};
+  let settings = {};
   if (fs.existsSync(cfgPath)) {
     try {
       const cfg = ini.parse(fs.readFileSync(cfgPath, 'utf-8'));
       ttsSection = cfg.TTS || {};
+      settings = cfg.Settings || {};
     } catch (e) { err(`config.ini 解析失败: ${e.message}`); }
   }
   const providerName = (ttsSection.provider || 'xf').toLowerCase();
@@ -64,10 +66,11 @@ async function main() {
   const outFile = path.join(ttyDir, mp3Name);
 
   // 凭证：优先 config.ini，命令行参数兼容旧版 xf
+  // 兼容 Qt 已有字段：Settings.ttsxfAPPID / ttsxfAPISecret / ttsxfAPIKey
   const creds = {
-    xf_appid: ttsSection.xf_appid || appidArg || '',
-    xf_apiSecret: ttsSection.xf_apiSecret || apiSecretArg || '',
-    xf_apiKey: ttsSection.xf_apiKey || apiKeyArg || '',
+    xf_appid: ttsSection.xf_appid || settings.ttsxfAPPID || appidArg || '',
+    xf_apiSecret: ttsSection.xf_apiSecret || settings.ttsxfAPISecret || apiSecretArg || '',
+    xf_apiKey: ttsSection.xf_apiKey || settings.ttsxfAPIKey || apiKeyArg || '',
     xf_voice_override: ttsSection.xf_voice_override || '',
     minimax_token: ttsSection.minimax_token || '',
     edge_voice_override: ttsSection.edge_voice_override || ''