@oxiaom/adoremix 1.0.35 → 1.0.37

package/package.json

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

package/src/cli.js

@@ -425,6 +425,46 @@ function buildProgram() {
       }
     });
 
+  const nginx = program
+    .command('nginx')
+    .description('NGINX 静态加速：媒体文件走 nginx（端口 9876）减轻设备服务压力，开机自启');
+
+  nginx
+    .command('install')
+    .description('安装并配置 nginx（端口 9876 挂 etc/docroot，preurl 自动改为 IP:9876）')
+    .option('--workdir <path>')
+    .action((opts) => {
+      const mod = require('./nginx');
+      try {
+        process.exitCode = mod.install(resolveWorkdir(opts.workdir));
+      } catch (e) {
+        logger.error(e.message);
+        process.exitCode = 1;
+      }
+    });
+
+  nginx
+    .command('uninstall')
+    .description('卸载 nginx 加速（还原 preurl 到原端口）')
+    .option('--workdir <path>')
+    .action((opts) => {
+      const mod = require('./nginx');
+      try {
+        process.exitCode = mod.uninstall(resolveWorkdir(opts.workdir));
+      } catch (e) {
+        logger.error(e.message);
+        process.exitCode = 1;
+      }
+    });
+
+  nginx
+    .command('status')
+    .description('查看 nginx 运行状态')
+    .action(() => {
+      const mod = require('./nginx');
+      try { process.exitCode = mod.status(); } catch (e) { logger.error(e.message); process.exitCode = 1; }
+    });
+
   program
     .command('uninstall')
     .description('完全卸载：停服务 + 卸载 systemd 服务；加 --purge 删除工作目录（含配置/数据库，不可恢复）')

package/src/doctor.js

@@ -335,24 +335,35 @@ function runDoctor(workdir, opts) {
         }
       }
 
-      // C. Qt 捆绑一致性：必须加载捆绑 lib/ 里的 Qt，不能加载系统 Qt（版本可能不匹配）
-      const qtSonames = Object.keys(resolved).filter(k => /^libQt5.*\.so\.5$/.test(k));
+      // C. 捆绑库一致性：自包含包中，Qt/ICU/pcre/z/glib/krb5/sqlite/ssl 等应全部从捆绑 lib/ 解析。
+      //    若某个库从系统路径加载，说明捆绑不完整或 RPATH 未生效，版本可能不匹配（如系统 ICU72 vs 捆绑 ICU67）。
+      const BUNDLED_PREFIXES = [
+        'libQt5', 'libicu', 'libpcre', 'libz', 'libglib-2.0',
+        'libgssapi_krb5', 'libkrb5', 'libk5crypto', 'libkrb5support',
+        'libcom_err', 'libkeyutils', 'libdouble-conversion', 'libsqlite3',
+        'libssl', 'libcrypto', 'libhiredis', 'libmariadb', 'libopus', 'libmp3lame'
+      ];
       const libDirNorm = path.normalize(libDir);
-      for (const so of qtSonames) {
+      let bundledChecked = 0;
+      let bundledFromSystem = 0;
+      for (const so of Object.keys(resolved)) {
+        if (!BUNDLED_PREFIXES.some(p => so.startsWith(p))) continue;
+        bundledChecked++;
         const rp = resolved[so];
         if (!rp) {
-          issues.push({ type: 'qt-missing', severity: 'error', msg: `${so} 未能解析，捆绑 Qt 加载失败` });
-          logger.error(`❌ ${so} 未解析（捆绑 Qt 加载失败）`);
+          issues.push({ type: 'bundled-lib-missing', severity: 'error', msg: `${so} 未能解析（应捆绑在 lib/）` });
+          logger.error(`❌ ${so} 未解析（捆绑库加载失败）`);
         } else if (!path.normalize(rp).startsWith(libDirNorm + path.sep)) {
-          issues.push({ type: 'qt-bundle', severity: 'error', msg: `${so} 加载系统 Qt：${rp}（应为捆绑 ${libDir}），版本可能不匹配` });
-          logger.error(`❌ ${so} => ${rp}（非捆绑 Qt）`);
+          bundledFromSystem++;
+          issues.push({ type: 'bundled-lib-system', severity: 'error', msg: `${so} 从系统加载：${rp}（应捆绑 ${libDir}），版本可能不匹配` });
+          logger.error(`❌ ${so} => ${rp}（非捆绑，可能版本不匹配）`);
         } else {
           logger.ok(`✓ ${so} => 捆绑 ${path.basename(rp)}`);
         }
       }
 
       // D. 依赖解析统计（信息性）
-      logger.log(`  已解析依赖 ${Object.keys(resolved).length} 项，缺库 ${missing.length} 项`);
+      logger.log(`  已解析依赖 ${Object.keys(resolved).length} 项，缺库 ${missing.length} 项，捆绑库 ${bundledChecked} 项（其中从系统加载 ${bundledFromSystem} 项）`);
     } catch (e) {
       logger.warn(`⚠  ldd 检查失败（非 Linux 或权限问题）：${e.message.split('\n')[0]}`);
     }

package/src/nginx.js

@@ -0,0 +1,132 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+const logger = require('./logger');
+const config = require('./config');
+
+const NGINX_PORT = 9876;
+const NGINX_CONF = '/etc/nginx/conf.d/adoremix.conf';
+
+function whichNginx() {
+  try { return execSync('which nginx', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim(); }
+  catch (e) { return null; }
+}
+
+function buildConfig(workdir) {
+  const docroot = path.join(workdir, 'etc', 'docroot');
+  return `# AdoreMix 静态加速（由 adoremix nginx install 生成）
+# 用途：媒体文件（mp3 等）走 nginx 直接出，减轻 AdoreMix 设备服务压力。
+server {
+    listen ${NGINX_PORT};
+    server_name _;
+
+    root ${docroot};
+    index index.html;
+
+    client_max_body_size 100m;
+    access_log off;
+
+    # 媒体文件：mp3 等大文件长缓存
+    location ~* \\.(mp3|wav|m4a|aac|ogg|opus|flac)$ {
+        expires 30d;
+        add_header Cache-Control "public, immutable";
+    }
+
+    # 静态资源缓存
+    location ~* \\.(js|css|png|jpg|jpeg|gif|svg|woff2?|ttf|ico)$ {
+        expires 7d;
+        add_header Cache-Control "public";
+    }
+
+    location / {
+        try_files $uri $uri/ =404;
+    }
+}
+`;
+}
+
+function install(workdir) {
+  if (process.platform !== 'linux') {
+    logger.error('NGINX 静态加速仅支持 Linux');
+    return 1;
+  }
+
+  // 1. 检测/安装 nginx
+  if (!whichNginx()) {
+    logger.info('未检测到 nginx，尝试 apt 安装...');
+    try {
+      execSync('apt-get update && apt-get install -y nginx', { stdio: 'inherit' });
+    } catch (e) {
+      logger.error(`nginx 安装失败：${(e.message || '').split('\n')[0]}`);
+      logger.warn('  请手动安装：sudo apt-get install -y nginx');
+      return 1;
+    }
+  }
+  logger.ok('nginx 已就绪');
+
+  // 2. 写配置
+  try {
+    fs.mkdirSync('/etc/nginx/conf.d', { recursive: true });
+    fs.writeFileSync(NGINX_CONF, buildConfig(workdir), 'utf8');
+    logger.ok(`写入 ${NGINX_CONF}`);
+  } catch (e) {
+    logger.error(`写 nginx 配置失败：${(e.message || '').split('\n')[0]}（可能需要 root）`);
+    return 1;
+  }
+
+  // 3. 测试配置
+  try {
+    execSync('nginx -t', { stdio: 'inherit' });
+  } catch (e) {
+    logger.error('nginx 配置校验失败，请检查');
+    return 1;
+  }
+
+  // 4. 开机自启 + 启动
+  try {
+    execSync('systemctl enable nginx', { stdio: 'inherit' });
+    execSync('systemctl restart nginx', { stdio: 'inherit' });
+    logger.ok('nginx 已启动并设为开机自启');
+  } catch (e) {
+    logger.warn(`systemctl 操作失败：${(e.message || '').split('\n')[0]}（可能非 systemd 环境，请手动启动）`);
+  }
+
+  // 5. preurl 自动改为 IP:9876
+  const ip = config.getConfigValue(workdir, 'Settings.LocalIP') || '127.0.0.1';
+  const preurl = `http://${ip}:${NGINX_PORT}/`;
+  config.setConfigValue(workdir, 'Settings.preurl', preurl);
+  logger.ok(`preurl 已更新为 ${preurl}（媒体文件走 nginx）`);
+  logger.log('改完后记得：adoremix restart');
+  return 0;
+}
+
+function uninstall(workdir) {
+  if (process.platform !== 'linux') return 0;
+  try { execSync('systemctl disable nginx', { stdio: 'ignore' }); } catch (e) {}
+  try { execSync('systemctl stop nginx', { stdio: 'ignore' }); } catch (e) {}
+  try { fs.unlinkSync(NGINX_CONF); logger.ok('已删除 nginx 配置'); } catch (e) {}
+
+  // 还原 preurl 到原 HTTP 端口
+  const ip = config.getConfigValue(workdir, 'Settings.LocalIP') || '127.0.0.1';
+  const port = config.getConfigValue(workdir, 'listener.port') || 12080;
+  config.setConfigValue(workdir, 'Settings.preurl', `http://${ip}:${port}/`);
+  logger.ok(`preurl 已还原为 http://${ip}:${port}/`);
+  logger.log('改完后记得：adoremix restart');
+  return 0;
+}
+
+function status() {
+  if (process.platform !== 'linux') { logger.warn('仅 Linux 支持'); return 1; }
+  try {
+    const out = execSync('systemctl is-active nginx', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+    if (out === 'active') { logger.ok('nginx 运行中'); return 0; }
+    logger.warn(`nginx 状态：${out}`); return 1;
+  } catch (e) {
+    logger.warn('nginx 未运行');
+    return 1;
+  }
+}
+
+module.exports = { install, uninstall, status, NGINX_PORT };