@oxiaom/adoremix 1.0.55 → 1.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxiaom/adoremix",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "AdoreMix broadcast server - cross-platform installer, runner and service manager",
   "bin": {
     "adoremix": "./bin/adoremix.js"
@@ -41,7 +41,8 @@
     "templates",
     "tts",
     "webui",
-    "config-manager"
+    "config-manager",
+    "audio8-assets"
   ],
   "keywords": [
     "adoremix",

package/src/cli.js

@@ -510,6 +510,33 @@ function buildProgram() {
       }
     });
 
+  audio8
+    .command('fetch-model [url]')
+    .description('单独下载 Audio8 TTS 模型（572MB 0.1B INT8）到 /root/audio8/model/，与 audio8 install 解耦避免 install 卡住')
+    .action(async (url) => {
+      const mod = require('../tts/providers/audio8');
+      try {
+        process.exitCode = await mod.fetchModel({ url });
+      } catch (e) {
+        logger.error(e.message);
+        process.exitCode = 1;
+      }
+    });
+
+  // 顶级命令(不依赖 audio8 group)
+  program
+    .command('audio8-fetch-model [url]')
+    .description('下载 Audio8 TTS 模型（单独使用，不依赖 audio8 install）')
+    .action(async (url) => {
+      const mod = require('../tts/providers/audio8');
+      try {
+        process.exitCode = await mod.fetchModel({ url });
+      } catch (e) {
+        logger.error(e.message);
+        process.exitCode = 1;
+      }
+    });
+
   const cfgmgr = program
     .command('config-manager')
     .description('设备配置管理 UI（配置 IP / 修改 config.ini / 查看日志），端口 9877，开机自启');

package/tts/providers/audio8.js

@@ -296,7 +296,8 @@ function install(opts) {
   // 检查 config.ini 是否有预托管模型（audio8_model_dir）
   let modelDir = '';
   try {
-    const cfg = require(path.join(__dirname, '..', 'src', 'config'));
+    // 从主包内置 src/config 读取（避免 tts/src/config 这种错误路径）
+    const cfg = require(path.join(__dirname, '..', '..', 'src', 'config'));
     const wd = opts.workdir || process.env.ADOREMIX_WORKDIR || path.join(os.homedir(), '.local', 'share', 'adoremix');
     modelDir = cfg.getConfigValue(wd, 'TTS.audio8_model_dir') || '';
   } catch (e) {}
@@ -311,30 +312,45 @@ function install(opts) {
     }
   }
 
-  // 拉 Audio8_TTS 源码：先试 git clone（多个镜像），全失败再走 codeload tarball（最后备选）
-  const MIRRORS = [
-    AUDIO8_REPO,                                                       // 官方 https
-    'https://ghproxy.cn/https://github.com/Audio8-AI/Audio8_TTS.git',   // 国内代理
-    'https://hub.fastgit.xyz/Audio8-AI/Audio8_TTS.git'                  // fastgit 镜像
-  ];
+  // 拉 Audio8_TTS 源码：先试内置 tarball（主包 audio8-assets/audio8-tts.tgz，离线），再 git 镜像，最后 codeload
   let cloned = false;
-  for (let attempt = 1; attempt <= 2; attempt++) {
-    for (const url of MIRRORS) {
-      try {
-        logger.log(`=== 克隆 Audio8_TTS（第 ${attempt} 次尝试）: ${url} ===`);
-        execSync(`rm -rf ~/audio8_temp && git clone --depth=1 "${url}" ~/audio8_temp 2>&1 | tail -3`, { stdio: 'inherit', shell: '/bin/bash' });
-        execSync(`bash -c "cd ~/audio8_temp && (shopt -s dotglob; mv -- * ~/audio8/ 2>/dev/null || true)"`, { stdio: 'inherit', shell: '/bin/bash' });
-        execSync('rm -rf ~/audio8_temp', { stdio: 'ignore', shell: '/bin/bash' });
-        cloned = true;
-        break;
-      } catch (e) {
-        logger.warn(`克隆失败（${url.slice(0, 60)}...）: ${String(e.message).slice(0, 100)}`);
+  // 1) 主包内置 tarball（最稳，完全离线）
+  const BUNDLED_TARBALL = path.join(__dirname, '..', '..', 'audio8-assets', 'audio8-tts.tgz');
+  if (fs.existsSync(BUNDLED_TARBALL)) {
+    try {
+      logger.log('=== 使用主包内置 Audio8_TTS tarball（离线） ===');
+      execSync(`rm -rf ~/audio8 && mkdir -p ~/audio8 && tar xzf "${BUNDLED_TARBALL}" --strip-components=1 -C ~/audio8 && ls ~/audio8 | head -3`, { stdio: 'inherit', shell: '/bin/bash' });
+      cloned = true;
+    } catch (e) {
+      logger.warn('内置 tarball 解压失败：' + e.message);
+    }
+  } else {
+    logger.warn(`主包内置 tarball 不存在：${BUNDLED_TARBALL}`);
+  }
+  // 2) Git 镜像（fallback）
+  if (!cloned) {
+    const MIRRORS = [
+      AUDIO8_REPO,
+      'https://ghproxy.cn/https://github.com/Audio8-AI/Audio8_TTS.git',
+      'https://hub.fastgit.xyz/Audio8-AI/Audio8_TTS.git'
+    ];
+    for (let attempt = 1; attempt <= 2 && !cloned; attempt++) {
+      for (const url of MIRRORS) {
+        try {
+          logger.log(`=== 克隆 Audio8_TTS（第 ${attempt} 次）: ${url} ===`);
+          execSync(`rm -rf ~/audio8_temp && git clone --depth=1 "${url}" ~/audio8_temp 2>&1 | tail -3`, { stdio: 'inherit', shell: '/bin/bash' });
+          execSync(`bash -c "cd ~/audio8_temp && (shopt -s dotglob; mv -- * ~/audio8/ 2>/dev/null || true)"`, { stdio: 'inherit', shell: '/bin/bash' });
+          execSync('rm -rf ~/audio8_temp', { stdio: 'ignore', shell: '/bin/bash' });
+          cloned = true;
+          break;
+        } catch (e) {
+          logger.warn(`克隆失败：${String(e.message).slice(0, 100)}`);
+        }
       }
+      if (!cloned) execSync('sleep 5', { stdio: 'ignore', shell: '/bin/bash' });
     }
-    if (cloned) break;
-    execSync('sleep 5', { stdio: 'ignore', shell: '/bin/bash' });
   }
-  // 备选：codeload 直接下 master 分支 tarball（绕过 git，HTTP 而已，国内更稳定）
+  // 3) codeload tarball（最后备选）
   if (!cloned) {
     try {
       logger.log('=== 备选：codeload github tarball ===');
@@ -345,8 +361,8 @@ function install(opts) {
     }
   }
   if (!cloned) {
-    logger.error('所有镜像和重试都失败，无法克隆 Audio8_TTS 仓库');
-    logger.warn('解决：手动在 ~/audio8 下放好 Audio8_TTS 源码再重试 install（跳过 git clone 步骤）');
+    logger.error('所有源都失败，无法获取 Audio8_TTS 源码');
+    logger.warn('解决：手动在 ~/audio8 下放好 Audio8_TTS 源码再重试 install');
     return 1;
   }
 
@@ -455,4 +471,66 @@ async function status(opts) {
   }
 }
 
-module.exports = { synthesize, checkDeps, VOICES, DEFAULT_BASE_URL, install, uninstall, status };
+module.exports = { synthesize, checkDeps, VOICES, DEFAULT_BASE_URL, install, uninstall, status, fetchModel };
+
+// === fetchModel: 单独下载 Audio8 TTS 模型 ===
+// 默认 URL:HuggingFace 0.1B INT8(~572MB,公司网差可改为自家 OSS 链接)
+const MODEL_DEFAULT_URL = process.env.ADOREMIX_AUDIO8_MODEL_URL
+  || 'https://huggingface.co/Audio8/audio8-TTS-0.1B-ONNX-INT8/resolve/main/';
+// 模型要的所有文件(必须下完整,Audio8 启动会校验)
+const MODEL_FILES = [
+  'config.json', 'tokenizer.json', 'tokenizer_config.json', 'special_tokens_map.json',
+  'model.onnx', 'model.onnx.data'
+];
+
+async function downloadOne(baseUrl, file, targetDir, log) {
+  const url = baseUrl.replace(/\/$/, '') + '/' + file;
+  const target = path.join(targetDir, file);
+  return new Promise((resolve, reject) => {
+    const lib = url.startsWith('https:') ? require('https') : require('http');
+    const req = lib.get(url, response => {
+      if (response.statusCode !== 200) {
+        response.resume();
+        return reject(new Error(file + ' HTTP ' + response.statusCode));
+      }
+      const ws = require('fs').createWriteStream(target);
+      response.pipe(ws);
+      ws.on('finish', () => ws.close(() => resolve(file)));
+      ws.on('error', reject);
+    });
+    req.on('error', reject);
+    req.setTimeout(600000, () => req.destroy(new Error(file + ' timeout (10min)')));
+  });
+}
+
+async function fetchModel(opts) {
+  opts = opts || {};
+  const targetDir = process.env.ADOREMIX_AUDIO8_MODEL_DIR || '/root/audio8/model';
+  const baseUrl = opts.url || MODEL_DEFAULT_URL;
+  const log = (m) => console.log(m);
+
+  log('Audio8 模型下载 → ' + targetDir);
+  log('源 URL: ' + baseUrl);
+  if (!baseUrl.endsWith('/') && !baseUrl.includes('resolve/main')) {
+    log('  (URL 应以 /resolve/main/ 结尾,自动补)');
+  }
+  require('fs').mkdirSync(targetDir, { recursive: true });
+
+  let ok = 0, fail = 0;
+  for (const f of MODEL_FILES) {
+    try {
+      log('  → ' + f + ' ...');
+      await downloadOne(baseUrl, targetDir, f, log);
+      ok++;
+    } catch (e) {
+      log('  ✗ ' + f + ' 失败: ' + e.message);
+      fail++;
+    }
+  }
+  if (fail > 0) {
+    log('失败 ' + fail + ' 个,模型可能不完整(重启 Audio8 会报错)');
+    return 1;
+  }
+  log('✓ Audio8 模型就绪(' + ok + ' 个文件):' + targetDir);
+  return 0;
+}