@oxiaom/adoremix 1.0.69 → 1.0.71
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/src/config/defaults.js +5 -1
- package/src/mp3server-server.js +5 -2
- package/src/mp3server.js +8 -3
package/package.json
CHANGED
package/src/config/defaults.js
CHANGED
|
@@ -17,6 +17,8 @@ module.exports = {
|
|
|
17
17
|
DPort: 3333,
|
|
18
18
|
DataPort: 6002,
|
|
19
19
|
EnableRedis: false,
|
|
20
|
+
// 设备静默多久判定离线(秒):局域网 12~15,公网 20~30
|
|
21
|
+
DevOfflineTimeout: 20,
|
|
20
22
|
LocalIP: '127.0.0.1',
|
|
21
23
|
ManagePort: 6007,
|
|
22
24
|
Netcross_Port0: 6000,
|
|
@@ -111,6 +113,8 @@ module.exports = {
|
|
|
111
113
|
MP3Server: {
|
|
112
114
|
port: 6665,
|
|
113
115
|
// 留空 = 工作目录下 etc/docroot(与 nginx 选装共用同一份媒体目录)
|
|
114
|
-
docroot: ''
|
|
116
|
+
docroot: '',
|
|
117
|
+
// 极老设备固件兼容:首包回 "well\n"(不带文件大小),默认 false
|
|
118
|
+
legacy_handshake: false
|
|
115
119
|
}
|
|
116
120
|
};
|
package/src/mp3server-server.js
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* 协议:
|
|
7
7
|
* 1. 客户端连上后发一行相对路径(music/a.mp3\n)
|
|
8
8
|
* 2. 服务端回一行音频字节数(已跳过 ID3v2 标签)+"\n"
|
|
9
|
+
* (legacyHandshake 模式改为回 "well\n",兼容极老固件)
|
|
9
10
|
* 3. 客户端发一行字节数 N,服务端回 N 字节音频;重复
|
|
10
11
|
* 4. 读到文件尾:服务端回 "close\n" 并断开;客户端可随时发 "close"
|
|
11
12
|
*
|
|
@@ -84,6 +85,7 @@ function startServer(opts) {
|
|
|
84
85
|
const root = path.resolve(opts.docroot);
|
|
85
86
|
const port = opts.port || 6665;
|
|
86
87
|
const host = opts.host || '0.0.0.0';
|
|
88
|
+
const legacyHandshake = !!opts.legacyHandshake;
|
|
87
89
|
const log = opts.log || ((m) => console.log(m));
|
|
88
90
|
const frameCache = new Map();
|
|
89
91
|
|
|
@@ -135,8 +137,9 @@ function startServer(opts) {
|
|
|
135
137
|
fileSize = st.size - audioStart;
|
|
136
138
|
offset = audioStart;
|
|
137
139
|
state = 'chunks';
|
|
138
|
-
log(`[info] ${peer} 推送 ${line} 起始=${audioStart} 大小=${fileSize}`);
|
|
139
|
-
|
|
140
|
+
log(`[info] ${peer} 推送 ${line} 起始=${audioStart} 大小=${fileSize}` + (legacyHandshake ? '(legacy 握手)' : ''));
|
|
141
|
+
// legacy: 极老固件认 "well\n" 作为首包,不带文件大小,靠边发边收到 close 结束
|
|
142
|
+
sock.write(legacyHandshake ? 'well\n' : String(fileSize) + '\n');
|
|
140
143
|
return;
|
|
141
144
|
}
|
|
142
145
|
|
package/src/mp3server.js
CHANGED
|
@@ -27,11 +27,14 @@ function readSettings(workdir) {
|
|
|
27
27
|
const cfg = require('./config');
|
|
28
28
|
const obj = cfg.readConfig(workdir) || {};
|
|
29
29
|
const s = obj.MP3Server || {};
|
|
30
|
+
const legacyRaw = String(s.legacy_handshake === undefined ? '' : s.legacy_handshake).toLowerCase();
|
|
30
31
|
return {
|
|
31
32
|
port: parseInt(s.port, 10) || DEFAULT_PORT,
|
|
32
33
|
docroot: s.docroot && String(s.docroot).trim()
|
|
33
34
|
? String(s.docroot).trim()
|
|
34
|
-
: path.join(workdir, 'etc', 'docroot')
|
|
35
|
+
: path.join(workdir, 'etc', 'docroot'),
|
|
36
|
+
// 极老固件兼容:首包回 "well\n" 而不是文件大小
|
|
37
|
+
legacyHandshake: legacyRaw === 'true' || legacyRaw === '1' || legacyRaw === 'yes'
|
|
35
38
|
};
|
|
36
39
|
}
|
|
37
40
|
|
|
@@ -50,7 +53,7 @@ function portOpen(port, host) {
|
|
|
50
53
|
function serve(opts) {
|
|
51
54
|
opts = opts || {};
|
|
52
55
|
const workdir = opts.workdir || paths.defaultWorkdir();
|
|
53
|
-
const { port, docroot } = readSettings(workdir);
|
|
56
|
+
const { port, docroot, legacyHandshake } = readSettings(workdir);
|
|
54
57
|
if (!fs.existsSync(docroot)) {
|
|
55
58
|
try { fs.mkdirSync(docroot, { recursive: true }); } catch (e) {}
|
|
56
59
|
}
|
|
@@ -59,6 +62,7 @@ function serve(opts) {
|
|
|
59
62
|
port,
|
|
60
63
|
host: opts.host || '0.0.0.0',
|
|
61
64
|
docroot,
|
|
65
|
+
legacyHandshake,
|
|
62
66
|
log: (m) => logger.log(m)
|
|
63
67
|
});
|
|
64
68
|
return null; // 常驻,不返回
|
|
@@ -198,7 +202,8 @@ async function status(opts) {
|
|
|
198
202
|
const { port, docroot } = readSettings(workdir);
|
|
199
203
|
let problems = 0;
|
|
200
204
|
|
|
201
|
-
|
|
205
|
+
const { legacyHandshake } = readSettings(workdir);
|
|
206
|
+
logger.log(`配置:port=${port} docroot=${docroot} legacy_handshake=${legacyHandshake ? 'true(回 well)' : 'false'}`);
|
|
202
207
|
if (!fs.existsSync(docroot)) {
|
|
203
208
|
logger.warn(`docroot 不存在:${docroot}`);
|
|
204
209
|
problems++;
|