@oxiaom/adoremix 1.0.4 → 1.0.6

package/package.json

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

package/src/cli.js

@@ -132,6 +132,40 @@ function buildProgram() {
       process.exitCode = code || 0;
     });
 
+  config
+    .command('preurl')
+    .description('配置设备拉资源用的 URL（默认 http://IP:12080/，CDN 加速改成域名）')
+    .option('--workdir <path>')
+    .option('--url <url>', '直接指定 URL（如 http://cdn.your.com/）')
+    .option('--no-interactive', '用本机 IP 自动生成')
+    .action(async (opts) => {
+      const net = require('./config/network');
+      const code = await net.setupPreurl(resolveWorkdir(opts.workdir), {
+        url: opts.url,
+        interactive: opts.interactive !== false
+      });
+      process.exitCode = code || 0;
+    });
+
+  config
+    .command('log')
+    .description('日志开关 isopenrizhi（开启会保存播放日志 + mp3，长期会占存储）')
+    .option('--workdir <path>')
+    .option('--enable', '开启日志')
+    .option('--disable', '关闭日志（默认）')
+    .option('--no-interactive', '不询问')
+    .action(async (opts) => {
+      const net = require('./config/network');
+      let enable;
+      if (opts.enable) enable = true;
+      else if (opts.disable) enable = false;
+      const code = await net.setupLog(resolveWorkdir(opts.workdir), {
+        enable,
+        interactive: opts.interactive !== false
+      });
+      process.exitCode = code || 0;
+    });
+
   const runner = require('./runner');
   const nativeRef = () => {
     try { return paths.loadNative(); }

package/src/config/defaults.js

@@ -4,7 +4,7 @@ module.exports = {
   Settings: {
     ISLOCALHOST: false,
     wbport: 6082,
-    isopenrizhi: true,
+    isopenrizhi: false,
     exename: '',
     Meida_port: 6002,
     Meida_ip: '127.0.0.1',

package/src/config/network.js

@@ -10,6 +10,23 @@ const NET_KEYS = [
   'Settings.Fip'
 ];
 
+const PREURL_KEY = 'Settings.preurl';
+const HTTP_PORT_KEY = 'listener.port';
+
+// 默认 preurl 格式：http://<IP>:<port>/
+// 如果用户改成 CDN 域名（如 http://cdn.xxx.com/），改 IP 时不应该覆盖
+function extractPreurlHost(preurl) {
+  if (!preurl) return null;
+  const m = String(preurl).match(/^https?:\/\/([^:/]+)/);
+  return m ? m[1] : null;
+}
+
+function isPreurlCdn(preurl) {
+  const host = extractPreurlHost(preurl);
+  if (!host) return false;
+  return !isValidIPv4(host);  // 域名 = CDN，IP = 直连
+}
+
 function listInterfaces() {
   const ifaces = os.networkInterfaces();
   const list = [];
@@ -109,6 +126,19 @@ async function setupNetwork(workdir, opts) {
   }
   logger.ok(`已设置 ${NET_KEYS.map(k => k.split('.')[1]).join(' / ')} = ${ip}`);
 
+  // 智能更新 preurl：如果是 IP 格式（直连），同步改；CDN 域名不动
+  const currentPreurl = cfg.getConfigValue(workdir, PREURL_KEY);
+  const port = cfg.getConfigValue(workdir, HTTP_PORT_KEY) || 12080;
+  if (currentPreurl && isPreurlCdn(currentPreurl)) {
+    logger.log('');
+    logger.log(`preurl 当前是 CDN/域名：${currentPreurl}（保留不覆盖）`);
+    logger.log('  改 CDN 用：adoremix config preurl http://cdn.your.com/');
+  } else {
+    const newPreurl = `http://${ip}:${port}/`;
+    cfg.setConfigValue(workdir, PREURL_KEY, newPreurl);
+    logger.ok(`已同步更新 preurl = ${newPreurl}`);
+  }
+
   // 顺便显示当前端口配置，方便检查
   const ports = [
     ['listener.port', 'HTTP 网页'],
@@ -128,4 +158,101 @@ async function setupNetwork(workdir, opts) {
   return 0;
 }
 
-module.exports = { setupNetwork, listInterfaces, isValidIPv4, NET_KEYS };
+async function setupLog(workdir, opts) {
+  opts = opts || {};
+  const cfg = require('./index');
+  const KEY = 'Settings.isopenrizhi';
+  let val;
+  if (opts.enable !== undefined) {
+    val = !!opts.enable;
+  } else if (opts.interactive === false) {
+    val = false;
+  } else {
+    const cur = cfg.getConfigValue(workdir, KEY);
+    logger.log('');
+    logger.log('=== 日志开关 (isopenrizhi) ===');
+    logger.log('开启后：');
+    logger.log('  • 记录所有播放日志');
+    logger.log('  • 实时喊话推流的语音/音频自动保存为 mp3');
+    logger.log('注意：长期开启会占用大量磁盘空间');
+    logger.log(`当前：${cur ? '开启' : '关闭'}`);
+    logger.log('');
+    const resp = await prompts({
+      type: 'toggle',
+      name: 'val',
+      message: '是否开启日志',
+      initial: !!cur,
+      active: '开启',
+      inactive: '关闭'
+    });
+    val = resp.val;
+  }
+  cfg.setConfigValue(workdir, KEY, val);
+  logger.ok(`isopenrizhi = ${val}`);
+  if (val) {
+    logger.warn('日志已开启，长期运行会占用磁盘，建议定期清理 tty/ 和 logs/');
+  }
+  logger.log('改完后记得：adoremix restart');
+  return 0;
+}
+
+async function setupPreurl(workdir, opts) {
+  opts = opts || {};
+  const cfg = require('./index');
+  const current = cfg.getConfigValue(workdir, PREURL_KEY);
+  const port = cfg.getConfigValue(workdir, HTTP_PORT_KEY) || 12080;
+  const ip = cfg.getConfigValue(workdir, 'Settings.LocalIP') || '127.0.0.1';
+
+  let url;
+  if (opts.url) {
+    url = opts.url;
+  } else if (opts.interactive === false) {
+    url = `http://${ip}:${port}/`;
+  } else {
+    logger.log('');
+    logger.log('=== preurl 配置（设备拉资源用的 URL）===');
+    logger.log('说明：');
+    logger.log('  • 直连：http://<本机IP>:<端口>/（默认）');
+    logger.log('  • CDN 加速：http://cdn.your.com/（设备从 CDN 拉资源）');
+    logger.log(`  • 当前值：${current}`);
+    logger.log('');
+    const resp = await prompts({
+      type: 'select',
+      name: 'choice',
+      message: '选择 preurl 来源',
+      choices: [
+        { title: `用本机直连：http://${ip}:${port}/`, value: 'direct' },
+        { title: '🌐  手动输入 CDN/外网地址', value: 'custom' }
+      ]
+    });
+    if (resp.choice === 'direct') {
+      url = `http://${ip}:${port}/`;
+    } else if (resp.choice === 'custom') {
+      const r2 = await prompts({
+        type: 'text',
+        name: 'url',
+        message: '输入完整 URL（含 http(s):// 和末尾 /）',
+        initial: 'http://cdn.example.com/',
+        validate: v => /^https?:\/\/[^/]+\//.test(v) ? true : '格式：http(s)://域名或IP/'
+      });
+      url = r2.url;
+    } else {
+      return 1;
+    }
+  }
+  cfg.setConfigValue(workdir, PREURL_KEY, url);
+  logger.ok(`preurl = ${url}`);
+  logger.log('改完后记得：adoremix restart');
+  return 0;
+}
+
+module.exports = {
+  setupNetwork,
+  setupPreurl,
+  setupLog,
+  listInterfaces,
+  isValidIPv4,
+  isPreurlCdn,
+  NET_KEYS,
+  PREURL_KEY
+};