@oxiaom/adoremix 1.0.26 → 1.0.28
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 -2
- package/src/doctor.js +12 -3
- package/src/paths.js +1 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxiaom/adoremix",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.28",
|
|
4
4
|
"description": "AdoreMix broadcast server - cross-platform installer, runner and service manager",
|
|
5
5
|
"bin": {
|
|
6
6
|
"adoremix": "./bin/adoremix.js"
|
|
@@ -15,7 +15,6 @@
|
|
|
15
15
|
"@oxiaom/adoremix-linux-x64": "^1.0.0",
|
|
16
16
|
"@oxiaom/adoremix-linux-arm64": "^1.0.0",
|
|
17
17
|
"@oxiaom/adoremix-linux-arm": "^1.0.0",
|
|
18
|
-
"@oxiaom/adoremix-darwin-x64": "^1.0.0",
|
|
19
18
|
"@oxiaom/adoremix-darwin-arm64": "^1.0.0"
|
|
20
19
|
},
|
|
21
20
|
"dependencies": {
|
package/src/doctor.js
CHANGED
|
@@ -207,12 +207,14 @@ function runDoctor(workdir, opts) {
|
|
|
207
207
|
logger.ok(`✓ 动态库依赖完整`);
|
|
208
208
|
} else {
|
|
209
209
|
logger.error(`❌ 缺动态库：${missing.join(', ')}`);
|
|
210
|
-
// 分类：apt 可装 / ICU 70
|
|
210
|
+
// 分类：apt 可装 / ICU(分已知 70 / 其他版本) / 完全未知
|
|
211
211
|
const pkgs = [];
|
|
212
212
|
const icu70 = [];
|
|
213
|
+
const icuOther = [];
|
|
213
214
|
const unknown = [];
|
|
214
215
|
for (const lib of missing) {
|
|
215
216
|
if (ICU70_LIBS.includes(lib)) icu70.push(lib);
|
|
217
|
+
else if (lib.startsWith('libicu')) icuOther.push(lib);
|
|
216
218
|
else if (LIB_TO_PKG[lib]) pkgs.push(LIB_TO_PKG[lib]);
|
|
217
219
|
else unknown.push(lib);
|
|
218
220
|
}
|
|
@@ -236,10 +238,10 @@ function runDoctor(workdir, opts) {
|
|
|
236
238
|
}
|
|
237
239
|
}
|
|
238
240
|
|
|
239
|
-
// 2) ICU 70
|
|
241
|
+
// 2) ICU 70 跨发行版兜底（旧包，Debian 12 / 树莓派 OS / Armbian 等无 libicu70）
|
|
240
242
|
let icuSolved = icu70.length === 0;
|
|
241
243
|
if (icu70.length > 0) {
|
|
242
|
-
const icuMsg = `ICU 70 缺失（${icu70.join(', ')}）—
|
|
244
|
+
const icuMsg = `ICU 70 缺失（${icu70.join(', ')}）— 旧包在 Ubuntu 22.04 编译需 libicu70。建议先升级到最新版（v1.0.27+ 已把 ICU 捆绑进 lib/），或 doctor --fix 自动装 libicu70`;
|
|
243
245
|
if (opts.fix) {
|
|
244
246
|
if (tryFixIcu70()) {
|
|
245
247
|
logger.ok('✓ libicu70 已安装（ICU 70 兜底）');
|
|
@@ -254,6 +256,13 @@ function runDoctor(workdir, opts) {
|
|
|
254
256
|
}
|
|
255
257
|
}
|
|
256
258
|
|
|
259
|
+
// 2.5) 其他版本 ICU 缺失（v1.0.27+ 已捆绑 ICU，正常不应缺；缺了说明安装目录 lib/ 不完整）
|
|
260
|
+
if (icuOther.length > 0) {
|
|
261
|
+
const icuOtherMsg = `ICU 缺失（${icuOther.join(', ')}）。v1.0.27+ 已把 ICU 捆绑进 lib/，出现此错误说明安装目录 lib/ 不完整，请重新 adoremix install --force 刷新；或系统缺对应版本 libicu。`;
|
|
262
|
+
issues.push({ type: 'icu-other', severity: 'error', msg: icuOtherMsg });
|
|
263
|
+
logger.error(`❌ ${icuOtherMsg}`);
|
|
264
|
+
}
|
|
265
|
+
|
|
257
266
|
// 3) 未解决的记 issue
|
|
258
267
|
if (!aptSolved) {
|
|
259
268
|
issues.push({
|
package/src/paths.js
CHANGED
|
@@ -10,7 +10,6 @@ const PLATFORM_PKG = {
|
|
|
10
10
|
'linux_x64': '@oxiaom/adoremix-linux-x64',
|
|
11
11
|
'linux_arm64': '@oxiaom/adoremix-linux-arm64',
|
|
12
12
|
'linux_arm': '@oxiaom/adoremix-linux-arm',
|
|
13
|
-
'darwin_x64': '@oxiaom/adoremix-darwin-x64',
|
|
14
13
|
'darwin_arm64': '@oxiaom/adoremix-darwin-arm64'
|
|
15
14
|
}[PLATFORM_KEY];
|
|
16
15
|
|
|
@@ -21,7 +20,7 @@ function loadNative() {
|
|
|
21
20
|
if (_native) return _native;
|
|
22
21
|
if (_loadError) throw _loadError;
|
|
23
22
|
if (!PLATFORM_PKG) {
|
|
24
|
-
_loadError = new Error(`不支持的平台：${PLATFORM_KEY}。当前支持 win32-x64 / linux-x64 / linux-arm64 / linux-arm / darwin-
|
|
23
|
+
_loadError = new Error(`不支持的平台：${PLATFORM_KEY}。当前支持 win32-x64 / linux-x64 / linux-arm64 / linux-arm / darwin-arm64（macOS 仅支持 Apple Silicon，Intel 已放弃）。`);
|
|
25
24
|
throw _loadError;
|
|
26
25
|
}
|
|
27
26
|
try {
|