@oxiaom/adoremix 1.0.85 → 1.0.86

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oxiaom/adoremix",
3
- "version": "1.0.85",
3
+ "version": "1.0.86",
4
4
  "description": "AdoreMix broadcast server - cross-platform installer, runner and service manager",
5
5
  "bin": {
6
6
  "adoremix": "./bin/adoremix.js"
package/src/cli.js CHANGED
@@ -105,13 +105,15 @@ function buildProgram() {
105
105
  .option('--force', '覆盖已有安装')
106
106
  .option('--skip-npm-install', '跳过工作目录内 npm install(tts.js 等协作脚本依赖)')
107
107
  .option('--no-interactive', '跳过配置向导,使用默认值')
108
+ .option('--port-series <n>', '端口系列号,如 117 → 所有端口都用 117xx(11733/11700/11706…)')
108
109
  .action(async (opts) => {
109
110
  const install = require('./install');
110
111
  const code = await install.runInstall({
111
112
  workdir: resolveWorkdir(opts.workdir),
112
113
  force: !!opts.force,
113
114
  skipNpmInstall: !!opts.skipNpmInstall,
114
- interactive: opts.interactive !== false
115
+ interactive: opts.interactive !== false,
116
+ portSeries: opts.portSeries
115
117
  });
116
118
  process.exitCode = code || 0;
117
119
  });
@@ -165,6 +167,44 @@ function buildProgram() {
165
167
  }
166
168
  });
167
169
 
170
+ config
171
+ .command('set-port-series <n>')
172
+ .description('把所有端口切到 nxx 系列(如 117 → 11733/11700/11706…)')
173
+ .option('--workdir <path>')
174
+ .action((n, opts) => {
175
+ const cfg = require('./config');
176
+ const logger2 = require('./logger');
177
+ const workdir = resolveWorkdir(opts.workdir);
178
+ const series = parseInt(n, 10);
179
+ if (!Number.isInteger(series) || series < 0 || series > 640) {
180
+ logger2.error(`端口系列号无效:${n}(应为 0~640 的整数)`);
181
+ process.exitCode = 1;
182
+ return;
183
+ }
184
+ const obj = cfg.readConfig(workdir);
185
+ if (!obj) {
186
+ logger2.error('配置不存在,请先 adoremix install 或 adoremix config init');
187
+ process.exitCode = 1;
188
+ return;
189
+ }
190
+ const updated = cfg.portseries.applySeries(obj, series);
191
+ updated.Settings.PortSeries = series;
192
+ cfg.writeConfig(workdir, updated);
193
+ logger2.ok(`端口已切换到 ${series}xx 系列:`);
194
+ const p = cfg.portseries.portsForSeries(series);
195
+ logger2.log(` 主控制 DPort = ${p.Settings.DPort}`);
196
+ logger2.log(` 设备备用 = ${p.Settings.DataPortBack3}`);
197
+ logger2.log(` MP3 跨接 = ${p.Settings.OPort0} / ${p.Settings.OPort1}`);
198
+ logger2.log(` 喊话裸流 = ${p.Settings.DataPort} / ${p.Settings.DataPortBack2}`);
199
+ logger2.log(` 运维命令 = ${p.Settings.PS1} / ${p.Settings.PS2}`);
200
+ logger2.log(` fcr 指令 = ${p.Settings.BjPort}`);
201
+ logger2.log(` 管理端口 = ${p.Settings.ManagePort}`);
202
+ logger2.log(` WebSocket 喊话 = ${p.Settings.wbport}`);
203
+ logger2.log(` HTTP 服务 = ${p.listener.port}`);
204
+ logger2.log(` MP3Server = ${p.MP3Server.port}`);
205
+ logger2.warn('改端口后要重启服务才生效');
206
+ });
207
+
168
208
  config
169
209
  .command('init')
170
210
  .description('生成默认 config.ini(已存在需 --force)')
@@ -5,6 +5,7 @@ const path = require('path');
5
5
  const ini = require('./ini');
6
6
  const defaults = require('./defaults');
7
7
  const wizard = require('./wizard');
8
+ const portseries = require('./portseries');
8
9
  const logger = require('../logger');
9
10
  const paths = require('../paths');
10
11
 
@@ -52,6 +53,17 @@ async function ensureConfig(workdir, opts) {
52
53
  const answers = await wizard.run(merged.Settings || {});
53
54
  merged.Settings = Object.assign({}, merged.Settings, answers);
54
55
  }
56
+ // 端口系列:--port-series 117 → 所有端口都用 117xx
57
+ if (opts.portSeries !== undefined && opts.portSeries !== null && opts.portSeries !== '') {
58
+ const series = parseInt(opts.portSeries, 10);
59
+ if (!Number.isInteger(series) || series < 0 || series > 640) {
60
+ logger.warn(`端口系列号无效(${opts.portSeries}),使用默认端口`);
61
+ } else {
62
+ merged = portseries.applySeries(merged, series);
63
+ merged.Settings.PortSeries = series;
64
+ logger.ok(`端口已设置为 ${series}xx 系列`);
65
+ }
66
+ }
55
67
  writeConfig(workdir, merged);
56
68
  logger.ok(`配置已生成 ${p}`);
57
69
  return true;
@@ -98,5 +110,6 @@ module.exports = {
98
110
  listConfig,
99
111
  getConfigValue,
100
112
  setConfigValue,
101
- mergeDeep
113
+ mergeDeep,
114
+ portseries
102
115
  };
@@ -0,0 +1,135 @@
1
+ 'use strict';
2
+
3
+ /**
4
+ * 端口系列(port series)
5
+ *
6
+ * 一套服务会占用十几个端口(设备控制、MP3 通道、喊话、运维命令、HTTP…)。
7
+ * 如果一台机器上要跑多套,或者要和别的服务避让,逐个改端口很痛苦。
8
+ *
9
+ * 这里引入"端口系列"概念:给一个系列号(如 117),所有端口都从 117xx 里取,
10
+ * 同一台机器上不同实例用不同系列号即可完全隔离。
11
+ *
12
+ * 系列 117 → 11733(主控制) 11731 11730 11700 11701 11702 11703
13
+ * 11704 11706 11707 11708 11782 11783 11790 11780 11765
14
+ *
15
+ * 端口在系列内的位置 = 「默认端口去掉万位/千位后的尾数」,
16
+ * 所以系列 117 时 DPort(3333) → 11733、DataPort(6002) → 11702、
17
+ * listener(12080) → 11780。这样同一个系列号下端口互不冲突,
18
+ * 且和默认端口的相对关系保持一致。
19
+ *
20
+ * 只覆盖**本机要监听**的端口;Fport(上游服务器的端口,来自
21
+ * snupdatareload.json)不属于本机,不在系列内。
22
+ */
23
+
24
+ // 各端口在系列内的偏移量(= 默认端口去掉前面的高位后的尾数)
25
+ const PORT_OFFSETS = {
26
+ // [Settings]
27
+ DPort: 33, // 设备主控制通道 3333
28
+ DataPortBack3: 31, // 设备备用控制通道 6031
29
+ OPort0: 0, // MP3 跨接 1 6000
30
+ OPort1: 1, // MP3 跨接 2 6001
31
+ Netcross_Port0: 0, // 同 OPort0
32
+ Netcross_Port1: 1, // 同 OPort1
33
+ DataPort: 2, // 喊话裸流入口 1 6002
34
+ DataPortBack2: 30, // 喊话裸流入口 2 6030
35
+ PS1: 3, // 运维命令通道 1 6003
36
+ BjPort: 4, // fcr 指令通道 6004
37
+ PS2: 6, // 运维命令通道 2 6006
38
+ ManagePort: 7, // 管理端口 6007
39
+ Pastcmd: 8, // 过去命令 6008
40
+ wbport: 82, // WebSocket 喊话 6082
41
+ cuteport: 83, // 录音端口 12083
42
+ RDDATAPORT: 90, // 二级数据端口 7636
43
+ // [listener]
44
+ listener_port: 80, // HTTP 主服务 12080
45
+ // [MP3Server]
46
+ MP3Server_port: 65, // MP3Server 6665
47
+ };
48
+
49
+ // 系列号 → 各端口的实际值
50
+ // series=117 → base 11700,DPort=11700+33=11733
51
+ function portsForSeries(series) {
52
+ const s = Number(series) || 0;
53
+ const base = s * 100; // 117 → 11700
54
+ const out = { Settings: {}, listener: {}, MP3Server: {} };
55
+ for (const [key, off] of Object.entries(PORT_OFFSETS)) {
56
+ const port = base + off;
57
+ if (key === 'listener_port') out.listener.port = port;
58
+ else if (key === 'MP3Server_port') out.MP3Server.port = port;
59
+ else out.Settings[key] = port;
60
+ }
61
+ // preurl 里的 HTTP 端口要跟着变
62
+ out.Settings.preurl = `http://127.0.0.1:${out.listener.port}/`;
63
+ return out;
64
+ }
65
+
66
+ // 判断一个端口值是否属于某个系列(用于校验配置是否成套)
67
+ function isPortInSeries(port, series) {
68
+ const s = Number(series) || 0;
69
+ const base = s * 100;
70
+ return Number(port) >= base && Number(port) < base + 100;
71
+ }
72
+
73
+ // 从现有配置反推系列号(取主控制端口去掉尾数后的部分)
74
+ // DPort=11733 → 117;DPort=3333 → 33
75
+ function seriesFromConfig(cfg) {
76
+ if (!cfg) return null;
77
+ const s = cfg.Settings || {};
78
+ const dport = Number(s.DPort);
79
+ if (!dport) return null;
80
+ return Math.floor(dport / 100);
81
+ }
82
+
83
+ // 把一个配置对象里的端口全部替换成某个系列的端口
84
+ // 只替换属于"本机监听"的端口,不动 MySQL(3307)/Redis 等外部依赖端口
85
+ function applySeries(cfg, series) {
86
+ const p = portsForSeries(series);
87
+ const out = JSON.parse(JSON.stringify(cfg || {}));
88
+ out.Settings = Object.assign({}, out.Settings, p.Settings);
89
+ out.listener = Object.assign({}, out.listener, { port: p.listener.port });
90
+ out.MP3Server = Object.assign({}, out.MP3Server, { port: p.MP3Server.port });
91
+ return out;
92
+ }
93
+
94
+ // 校验配置里的端口是否成套(同属一个系列)
95
+ // 返回 { ok, series, problems }
96
+ function checkSeries(cfg) {
97
+ const problems = [];
98
+ const series = seriesFromConfig(cfg);
99
+ if (series === null) return { ok: false, series: null, problems: ['读不到 DPort,无法判断系列'] };
100
+
101
+ const check = (section, key, label) => {
102
+ const v = cfg[section] && cfg[section][key];
103
+ if (v === undefined || v === null || v === '') return;
104
+ if (!isPortInSeries(v, series)) {
105
+ problems.push(`${label}=${v} 不属于 ${series}xx 系列`);
106
+ }
107
+ };
108
+ check('Settings', 'DPort', 'DPort');
109
+ check('Settings', 'DataPortBack3', 'DataPortBack3');
110
+ check('Settings', 'OPort0', 'OPort0');
111
+ check('Settings', 'OPort1', 'OPort1');
112
+ check('Settings', 'DataPort', 'DataPort');
113
+ check('Settings', 'DataPortBack2', 'DataPortBack2');
114
+ check('Settings', 'PS1', 'PS1');
115
+ check('Settings', 'PS2', 'PS2');
116
+ check('Settings', 'BjPort', 'BjPort');
117
+ check('Settings', 'ManagePort', 'ManagePort');
118
+ check('Settings', 'Pastcmd', 'Pastcmd');
119
+ check('Settings', 'wbport', 'wbport');
120
+ check('Settings', 'cuteport', 'cuteport');
121
+ check('Settings', 'RDDATAPORT', 'RDDATAPORT');
122
+ check('listener', 'port', 'listener.port');
123
+ check('MP3Server', 'port', 'MP3Server.port');
124
+
125
+ return { ok: problems.length === 0, series, problems };
126
+ }
127
+
128
+ module.exports = {
129
+ PORT_OFFSETS,
130
+ portsForSeries,
131
+ isPortInSeries,
132
+ seriesFromConfig,
133
+ applySeries,
134
+ checkSeries
135
+ };
package/src/install.js CHANGED
@@ -205,9 +205,35 @@ async function runInstall(opts) {
205
205
  const config = require('./config');
206
206
  // install 的 --force 只刷新二进制/资源,**不覆盖已存在的 config.ini**(避免客户升级时配置丢失)。
207
207
  // 需要重建配置请用:adoremix config init --force
208
- const cfgOk = await config.ensureConfig(workdir, { interactive: opts.interactive !== false, force: false });
208
+ const cfgOk = await config.ensureConfig(workdir, {
209
+ interactive: opts.interactive !== false,
210
+ force: false,
211
+ portSeries: opts.portSeries
212
+ });
209
213
  if (!cfgOk) {
210
214
  logger.warn('配置未生成。请稍后运行 adoremix config init');
215
+ } else {
216
+ // 已存在的 config.ini:--port-series 只在配置不存在时生效(不覆盖客户已有配置),
217
+ // 但客户可能是想换端口系列,所以这里显式提示一下。
218
+ const existing = config.readConfig(workdir);
219
+ if (opts.portSeries !== undefined && opts.portSeries !== null && opts.portSeries !== '' && existing) {
220
+ const cur = config.portseries.seriesFromConfig(existing);
221
+ const want = parseInt(opts.portSeries, 10);
222
+ if (cur !== want) {
223
+ logger.warn(`配置已存在,未改动端口(当前 ${cur}xx 系列)。`);
224
+ logger.warn(` 要换成 ${want}xx 系列:adoremix config set-port-series ${want}`);
225
+ }
226
+ }
227
+ // 打印实际端口,便于排查
228
+ const cfg = config.readConfig(workdir);
229
+ if (cfg) {
230
+ const ps = config.portseries.checkSeries(cfg);
231
+ logger.log(` 端口系列:${ps.series}xx(主控制 ${cfg.Settings.DPort},HTTP ${cfg.listener.port})`);
232
+ if (!ps.ok) {
233
+ logger.warn('端口不成套(下列端口不属于同一系列):');
234
+ ps.problems.forEach(p => logger.warn(' - ' + p));
235
+ }
236
+ }
211
237
  }
212
238
 
213
239
  logger.log('');