@oxiaom/adoremix 1.0.60 → 1.0.62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/tts/providers/audio8.js +28 -18
package/package.json
CHANGED
package/tts/providers/audio8.js
CHANGED
|
@@ -303,24 +303,21 @@ function install(opts) {
|
|
|
303
303
|
return 1;
|
|
304
304
|
}
|
|
305
305
|
|
|
306
|
+
// config 工作目录:与 adoremix 其余命令同源(root Linux 下是 /opt/adoremix,不是 ~/.local/share)
|
|
307
|
+
const pathsMod = require(path.join(__dirname, '..', '..', 'src', 'paths'));
|
|
308
|
+
const configWorkdir = () => opts.workdir || process.env.ADOREMIX_WORKDIR || pathsMod.defaultWorkdir();
|
|
309
|
+
|
|
306
310
|
// 检查 config.ini 是否有预托管模型(audio8_model_dir)
|
|
307
311
|
let modelDir = '';
|
|
308
312
|
try {
|
|
309
|
-
// 从主包内置 src/config 读取(避免 tts/src/config 这种错误路径)
|
|
310
313
|
const cfg = require(path.join(__dirname, '..', '..', 'src', 'config'));
|
|
311
|
-
|
|
312
|
-
modelDir = cfg.getConfigValue(wd, 'TTS.audio8_model_dir') || '';
|
|
314
|
+
modelDir = cfg.getConfigValue(configWorkdir(), 'TTS.audio8_model_dir') || '';
|
|
313
315
|
} catch (e) {}
|
|
314
|
-
const modelLink = `~/audio8/${AUDIO8_RUNTIME_DIR}/model`; // Audio8 期望的模型目录
|
|
315
|
-
//
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
execSync(`mkdir -p $(dirname ${modelLink}) && rm -rf ${modelLink} && ln -s ${modelDir} ${modelLink}`, { stdio: 'inherit', shell: '/bin/bash' });
|
|
320
|
-
} catch (e) {
|
|
321
|
-
logger.warn('链接模型失败: ' + e.message);
|
|
322
|
-
}
|
|
323
|
-
}
|
|
316
|
+
const modelLink = `~/audio8/${AUDIO8_RUNTIME_DIR}/model`; // Audio8 期望的模型目录(软链在源码就位后建)
|
|
317
|
+
// 重装保护:已有 model/voices(423MB+)先挪 /tmp 暂存,源码解压后还原——重跑 install 不用重新下模型
|
|
318
|
+
execSync(`rm -rf /tmp/audio8-keep && mkdir -p /tmp/audio8-keep; ` +
|
|
319
|
+
`for d in model voices; do if [ -e ~/audio8/${AUDIO8_RUNTIME_DIR}/$d ]; then mv ~/audio8/${AUDIO8_RUNTIME_DIR}/$d /tmp/audio8-keep/$d; fi; done; true`,
|
|
320
|
+
{ stdio: 'pipe', shell: '/bin/bash' });
|
|
324
321
|
|
|
325
322
|
// 拉 Audio8_TTS 源码:先试内置 tarball(主包 audio8-assets/audio8-tts.tgz,离线),再 git 镜像,最后 codeload
|
|
326
323
|
let cloned = false;
|
|
@@ -396,6 +393,19 @@ function install(opts) {
|
|
|
396
393
|
logger.log('当前内容: ' + execSync('ls ~/audio8', { shell: '/bin/bash', encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().replace(/\n/g, ' '));
|
|
397
394
|
return 1;
|
|
398
395
|
}
|
|
396
|
+
// 还原暂存的 model/voices(重装保护的后半段;新装机没有暂存则跳过)
|
|
397
|
+
execSync(`for d in model voices; do if [ -e /tmp/audio8-keep/$d ]; then mkdir -p ~/audio8/${AUDIO8_RUNTIME_DIR}; mv /tmp/audio8-keep/$d ~/audio8/${AUDIO8_RUNTIME_DIR}/$d; fi; done; rm -rf /tmp/audio8-keep; true`,
|
|
398
|
+
{ stdio: 'pipe', shell: '/bin/bash' });
|
|
399
|
+
|
|
400
|
+
// config 配了预托管模型目录(audio8_model_dir)则软链覆盖(优先级高于还原的模型)
|
|
401
|
+
if (modelDir) {
|
|
402
|
+
try {
|
|
403
|
+
logger.log('=== 链接预托管模型 ' + modelDir + ' → ' + modelLink + ' ===');
|
|
404
|
+
execSync(`mkdir -p $(dirname ${modelLink}) && rm -rf ${modelLink} && ln -s ${modelDir} ${modelLink}`, { stdio: 'inherit', shell: '/bin/bash' });
|
|
405
|
+
} catch (e) {
|
|
406
|
+
logger.warn('链接模型失败: ' + e.message);
|
|
407
|
+
}
|
|
408
|
+
}
|
|
399
409
|
|
|
400
410
|
// venv + pip install(Python 3.11+,numpy 2.4.3 需要)
|
|
401
411
|
// venv 路径必须与 AUDIO8_VENV_DIR/buildSystemdUnit 一致(~/audio8/onnx_runtime_0_1b_int8/.venv),
|
|
@@ -459,13 +469,13 @@ function install(opts) {
|
|
|
459
469
|
logger.log('前台排查: journalctl -u ' + AUDIO8_SYSTEMD_NAME + ' -n 30');
|
|
460
470
|
}
|
|
461
471
|
|
|
462
|
-
// 改本地 config.ini
|
|
472
|
+
// 改本地 config.ini(tts/providers/ → 主包 src/config 要退两级)
|
|
463
473
|
try {
|
|
464
|
-
const cfg = require(path.join(__dirname, '..', 'src', 'config'));
|
|
465
|
-
const wd =
|
|
474
|
+
const cfg = require(path.join(__dirname, '..', '..', 'src', 'config'));
|
|
475
|
+
const wd = configWorkdir();
|
|
466
476
|
cfg.setConfigValue(wd, 'TTS.provider', 'audio8');
|
|
467
477
|
cfg.setConfigValue(wd, 'TTS.audio8_base_url', `http://127.0.0.1:${AUDIO8_DEFAULT_PORT}`);
|
|
468
|
-
logger.ok(`config.ini
|
|
478
|
+
logger.ok(`config.ini 已更新(${wd}): provider=audio8, audio8_base_url=http://127.0.0.1:${AUDIO8_DEFAULT_PORT}`);
|
|
469
479
|
} catch (e) {
|
|
470
480
|
logger.warn('config.ini 更新失败: ' + e.message);
|
|
471
481
|
}
|
|
@@ -502,7 +512,7 @@ async function status(opts) {
|
|
|
502
512
|
await new Promise(resolve => {
|
|
503
513
|
const req = lib.request({ hostname: urlObj.hostname, port: urlObj.port, path: urlObj.pathname, method: 'GET', timeout: 5000 }, res => {
|
|
504
514
|
if (res.statusCode === 200) {
|
|
505
|
-
logger.ok(`Audio8 服务健康: ${baseUrl}/
|
|
515
|
+
logger.ok(`Audio8 服务健康: ${baseUrl}/api/health 返回 ${res.statusCode}`);
|
|
506
516
|
res.resume();
|
|
507
517
|
resolve(0);
|
|
508
518
|
} else {
|