@oxiaom/adoremix 1.0.33 → 1.0.35

package/package.json

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

package/src/doctor.js

@@ -166,6 +166,25 @@ function runDoctor(workdir, opts) {
     native = paths.loadNative();
     logger.ok(`✓ 平台子包 ${native.pkgName}`);
   } catch (e) {
+    if (e && e.code === 'NATIVE_VERSION_MISMATCH') {
+      const mainVer = e.mainVersion || require('../package.json').version;
+      const fixCmd = `npm install -g @oxiaom/adoremix@${mainVer} --registry https://registry.npmjs.org`;
+      issues.push({ type: 'native-version-mismatch', severity: 'error', msg: e.message, fixCmd });
+      logger.error(`❌ ${e.message.split('\n')[0]}`);
+      logger.log(`    自动修复：adoremix doctor --fix（用官方源重装到 v${mainVer}）`);
+      logger.log(`    或手动执行：${fixCmd}`);
+      if (opts.fix) {
+        logger.info('==> 用官方源重装主包（含最新子包）...');
+        try {
+          execSync(fixCmd, { stdio: 'inherit' });
+          logger.ok('✓ 已重装，请重新运行 adoremix doctor 确认');
+        } catch (e2) {
+          logger.error(`重装失败：${(e2.message || '').split('\n')[0]}`);
+          logger.warn(`  请手动执行：${fixCmd}`);
+        }
+      }
+      return reportAndExit(issues, opts);
+    }
     issues.push({ type: 'native', severity: 'error', msg: e.message });
     logger.error(`❌ 平台子包未加载：${e.message.split('\n')[0]}`);
     return reportAndExit(issues, opts);

package/src/paths.js

@@ -34,6 +34,27 @@ function loadNative() {
     );
     throw _loadError;
   }
+  // 版本一致性校验：主包与平台子包必须同版本。
+  // 国内镜像（npmmirror 等）对平台子包同步可能滞后，导致 install 时嵌套了旧版子包，
+  // 应用就会加载到旧 native（如旧 ICU 版本），运行报缺库。这里给出明确指引。
+  try {
+    const mainVer = require('../package.json').version;
+    const subPkg = require(`${PLATFORM_PKG}/package.json`);
+    if (subPkg && subPkg.version && mainVer && subPkg.version !== mainVer) {
+      _native = null;
+      _loadError = new Error(
+        `平台子包版本不一致：主包 @oxiaom/adoremix@${mainVer}，但加载到 ${PLATFORM_PKG}@${subPkg.version}。\n` +
+        `  通常是 npm 镜像（npmmirror 等）没同步最新子包导致。请用官方源重装：\n` +
+        `  npm install -g @oxiaom/adoremix@${mainVer} --registry https://registry.npmjs.org`
+      );
+      _loadError.code = 'NATIVE_VERSION_MISMATCH';
+      _loadError.mainVersion = mainVer;
+      throw _loadError;
+    }
+  } catch (e) {
+    if (e === _loadError) throw e;
+    // package.json 读不到等情况忽略，不阻塞
+  }
   return _native;
 }