@flun/node-mobile-app 2.1.1 → 3.0.0

package/src/copy.js

@@ -34,7 +34,7 @@ const BUILD_DIR_NAME = 'node-mobile-app-build',
   copyDirIncremental = (src, dst, exclude) => {
     ensureDir(dst);
 
-    const dstKeep = new Set(['node_modules', '.deps-hash', 'main.js', 'package.json', 'package-lock.json']),
+    const dstKeep = new Set(['node_modules', 'main.js', 'package.json', 'package-lock.json']),
       srcNames = new Set(fs.readdirSync(src));
     // 1. 删除 dst 里不该存在的条目
     for (const name of fs.readdirSync(dst)) {
@@ -66,36 +66,23 @@ const BUILD_DIR_NAME = 'node-mobile-app-build',
     if (!fs.existsSync(buildPkgPath)) return;
     const mainPkgPath = path.join(pkgRoot, 'package.json');
     if (!fs.existsSync(mainPkgPath)) return;
-
-    const buildPkg = readJson(buildPkgPath);
-    const mainPkg = readJson(mainPkgPath);
+    const buildPkg = readJson(buildPkgPath), mainPkg = readJson(mainPkgPath);
     if (!buildPkg.dependencies) return;
 
-    const mainDeps = mainPkg.dependencies || {};
-    const missing = [];
-    let depsUpdated = 0;
-    let needWrite = false;
+    const mainDeps = mainPkg.dependencies || {}, missing = [];
+    let depsUpdated = 0, needWrite = false;
 
     // 移除仅用于模板占位说明的 _comment 字段，避免带进最终 build 工程
-    if ('_comment' in buildPkg) {
-      delete buildPkg._comment;
-      needWrite = true;
-    }
+    if ('_comment' in buildPkg) delete buildPkg._comment, needWrite = true;
     for (const name of Object.keys(buildPkg.dependencies)) {
       const v = mainDeps[name];
       if (!v) { missing.push(name); continue; }
-      if (buildPkg.dependencies[name] !== v) {
-        buildPkg.dependencies[name] = v;
-        depsUpdated++;
-        needWrite = true;
-      }
+      if (buildPkg.dependencies[name] !== v) buildPkg.dependencies[name] = v, depsUpdated++, needWrite = true;
     }
 
     if (needWrite) {
       writeIfChanged(buildPkgPath, JSON.stringify(buildPkg, null, 2) + '\n');
-      if (depsUpdated > 0) {
-        console.log('  ✓ 已同步 ' + depsUpdated + ' 个依赖版本到 ' + BUILD_DIR_NAME + '/package.json');
-      }
+      if (depsUpdated > 0) console.log('  ✓ 已同步 ' + depsUpdated + ' 个依赖版本到 ' + BUILD_DIR_NAME + '/package.json');
     }
 
     if (missing.length > 0) {
@@ -245,10 +232,8 @@ const BUILD_DIR_NAME = 'node-mobile-app-build',
     const buildPkgPath = path.join(buildDir, 'package.json');
     if (!fs.existsSync(buildPkgPath)) return console.warn('  ⚠️  未找到 buildDir/package.json,跳过 extraRnDependencies');
 
-    const buildPkg = readJson(buildPkgPath);
+    const buildPkg = readJson(buildPkgPath), missing = [];
     if (!buildPkg.dependencies) buildPkg.dependencies = {};
-
-    const missing = [];
     let added = 0;
     for (const name of extras) {
       const pkgJson = path.join(userProjectDir, 'node_modules', name, 'package.json');

package/src/fingerprint.js

@@ -21,6 +21,26 @@ const FINGERPRINT_FILE = '.build-fingerprint.json',
     removeDir(path.join(buildDir, 'android', 'app', 'build'));
     removeDir(path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native', 'android', 'build'));
   },
+  hashTemplate = templateDir => {
+    const h = crypto.createHash('sha256'),
+      walk = d => {
+        let entries;
+        try { entries = fs.readdirSync(d, { withFileTypes: true }); } catch { return; }
+        entries.sort((a, b) => a.name.localeCompare(b.name));
+        for (const e of entries) {
+          if (e.name === 'node_modules' || e.name === '.git') continue;
+          const full = path.join(d, e.name), rel = path.relative(templateDir, full).replace(/\\/g, '/');
+          if (e.isDirectory()) { h.update('D:' + rel + '|'); walk(full); }
+          else if (e.isFile()) {
+            h.update('F:' + rel + '|');
+            try { h.update(fs.readFileSync(full)); } catch { h.update('err'); }
+            h.update('|');
+          }
+        }
+      };
+    walk(templateDir);
+    return h.digest('hex');
+  },
   computeFingerprint = (userProjectDir, config, pkgRoot) => {
     const abiFilters = [...(config.android.abiFilters || [])].sort(), libnode = {},
       pluginDir = path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native'),
@@ -36,12 +56,9 @@ const FINGERPRINT_FILE = '.build-fingerprint.json',
       }
     }
 
-    let pluginVersion = null;
-    const pluginPkg = path.join(pluginDir, 'package.json');
+    let pluginVersion = null, cliVersion = null;
+    const pluginPkg = path.join(pluginDir, 'package.json'), cliPkg = path.join(pkgRoot, 'package.json');
     if (fs.existsSync(pluginPkg)) try { pluginVersion = JSON.parse(fs.readFileSync(pluginPkg, 'utf-8')).version; } catch { };
-
-    let cliVersion = null;
-    const cliPkg = path.join(pkgRoot, 'package.json');
     if (fs.existsSync(cliPkg)) try { cliVersion = JSON.parse(fs.readFileSync(cliPkg, 'utf-8')).version; } catch { };
 
     const depsHash = hashUserDeps(userProjectDir), a = config.android || {},
@@ -58,7 +75,8 @@ const FINGERPRINT_FILE = '.build-fingerprint.json',
         permissions: [...(a.permissions || [])].sort(),
       };
 
-    return { abiFilters, libnode, pluginVersion, cliVersion, depsHash, appInfo };
+    const templateHash = hashTemplate(path.join(pkgRoot, 'template'));
+    return { abiFilters, libnode, pluginVersion, cliVersion, depsHash, appInfo, templateHash };
   },
   checkAndResetCache = (buildDir, userProjectDir, config, pkgRoot) => {
     ensureDir(buildDir);
@@ -66,14 +84,15 @@ const FINGERPRINT_FILE = '.build-fingerprint.json',
     const fpFile = path.join(buildDir, FINGERPRINT_FILE), newFp = computeFingerprint(userProjectDir, config, pkgRoot);
     let oldFp = null;
     if (fs.existsSync(fpFile)) try { oldFp = JSON.parse(fs.readFileSync(fpFile, 'utf-8')); } catch { };
-    if (!oldFp) return console.log('  ✓ 首次构建,无缓存可清'), writeFp(fpFile, newFp);
+    if (!oldFp) return console.log('  ✓ 全新构建,无缓存可清'), writeFp(fpFile, newFp);
 
     const abiChanged = JSON.stringify(oldFp.abiFilters) !== JSON.stringify(newFp.abiFilters),
       libnodeChanged = JSON.stringify(oldFp.libnode) !== JSON.stringify(newFp.libnode),
       pluginChanged = oldFp.pluginVersion !== newFp.pluginVersion,
       cliChanged = oldFp.cliVersion !== newFp.cliVersion, depsChanged = oldFp.depsHash !== newFp.depsHash,
       appInfoChanged = JSON.stringify(oldFp.appInfo) !== JSON.stringify(newFp.appInfo),
-      structural = abiChanged || libnodeChanged || pluginChanged || cliChanged;
+      templateChanged = oldFp.templateHash !== newFp.templateHash,
+      structural = abiChanged || libnodeChanged || pluginChanged || cliChanged || templateChanged;
 
     if (structural) {
       const reasons = [];
@@ -81,6 +100,7 @@ const FINGERPRINT_FILE = '.build-fingerprint.json',
       if (libnodeChanged) reasons.push('libnode.so');
       if (pluginChanged) reasons.push('插件版本');
       if (cliChanged) reasons.push('CLI 版本');
+      if (templateChanged) reasons.push('模板文件');
       if (depsChanged) reasons.push('用户依赖');
       if (appInfoChanged) reasons.push('应用信息');
       console.log('  ⚠️  检测到变化（' + reasons.join('、') + '），清理全部缓存');

package/src/install.js

@@ -1,53 +1,47 @@
 import path from 'path';
 import fs from 'fs';
-import crypto from 'crypto';
 import { run } from './utils.js';
-
-/**
- * 内部：依赖 hash（dependencies + type + 是否含原生模块 + 是否强制重编）
- * hasNative 纳入哈希：装/卸原生模块时会触发重装
- * forceRebuild 纳入哈希：用户显式要求重编时会强制重装
- */
-const hashDeps = (pkgPath, hasNative, forceRebuild) => {
-  const h = crypto.createHash('sha256');
-  if (fs.existsSync(pkgPath)) {
-    try {
-      const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-      h.update(JSON.stringify(pkg.dependencies || {})), h.update('|'), h.update(pkg.type || '');
-    } catch { h.update('read-error') }
-  }
-  else h.update('no-package');
-  h.update('|native=' + (hasNative ? '1' : '0'));
-  h.update('|force=' + (forceRebuild ? '1' : '0'));
-  return h.digest('hex');
-},
+import { optimizeNodeModules, clearVerified, SELF_HASH } from './optimize-node-modules.js';
+const
+  /**
+   * 内部：从 libnode 的 node_version.h 读取运行时 Node 主版本号
+   * 读不到直接报错退出（说明 libnode 目录不完整,继续执行必失败）
+   */
+  resolveRuntimeMajor = (userProjectDir, targetPlatform) => {
+    const sub = targetPlatform === 'ios' ? 'ios' : 'android',
+      header = path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native',
+        sub, 'libnode', 'include', 'node', 'node_version.h');
+    if (!fs.existsSync(header)) {
+      console.error('  [错误] 未找到 node_version.h: ' + header);
+      console.error('         说明 libnode 目录不完整,请重新安装依赖。'), process.exit(1);
+    }
+    const m = fs.readFileSync(header, 'utf-8').match(/#define\s+NODE_MAJOR_VERSION\s+(\d+)/);
+    if (!m) console.error('  [错误] 无法解析 node_version.h 中的 NODE_MAJOR_VERSION'), process.exit(1);
+    return m[1];
+  },
   /**
    * 内部：判断用户项目的生产依赖里是否含原生模块（binding.gyp）
    * 按用户根 package.json 的 dependencies 键名，去 userProjectDir/node_modules 下逐个查
-   * 不用扫 nodejs-project/node_modules：首次构建时它还不存在
+   * 不用扫 nodejs-project/node_modules：全新构建时它还不存在
    */
-  hasNativeModules = (userProjectDir) => {
+  hasNativeModules = userProjectDir => {
     const pkgPath = path.join(userProjectDir, 'package.json');
     if (!fs.existsSync(pkgPath)) return false;
     let deps = {};
     try {
       deps = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')).dependencies || {};
-    } catch {
-      return false;
-    }
+    } catch { return false; }
+
     const nodeModulesDir = path.join(userProjectDir, 'node_modules');
-    for (const name of Object.keys(deps)) {
+    for (const name of Object.keys(deps))
       if (fs.existsSync(path.join(nodeModulesDir, name, 'binding.gyp'))) return true;
-    }
     return false;
   },
   /**
    * 内部：定位 @flun/nodejs-mobile-react-native 插件目录
    */
   findPluginDir = userProjectDir => {
-    const candidates = [
-      path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native'),
-    ];
+    const candidates = [path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native')];
     for (const c of candidates) if (fs.existsSync(path.join(c, 'android', 'build.gradle'))) return c;
     return null;
   },
@@ -55,9 +49,7 @@ const hashDeps = (pkgPath, hasNative, forceRebuild) => {
    * 内部：iOS 的 WebView SSL 补丁
    */
   patchWebViewSslIos = userProjectDir => {
-    const file = path.join(
-      userProjectDir, 'node_modules', 'react-native-webview', 'apple', 'RNCWebViewImpl.m'
-    );
+    const file = path.join(userProjectDir, 'node_modules', 'react-native-webview', 'apple', 'RNCWebViewImpl.m');
     if (!fs.existsSync(file)) return;
 
     let c = fs.readFileSync(file, 'utf-8');
@@ -85,29 +77,81 @@ const hashDeps = (pkgPath, hasNative, forceRebuild) => {
   /**
    * 装用户项目的生产依赖到 <buildDir>/nodejs-assets/nodejs-project/
    * 只装 dependencies，不装 devDependencies
-   * 依赖未变化且 node_modules 存在时跳过（用 .deps-hash 记录）
+   * 依赖 + 环境未变化且上次构建完成时跳过；否则按需重装 / 仅优化
+   * 快照记录在 buildDir/.deps-snapshot.json（与桌面版一致）
    */
-  installUserDeps = (targetDir, userProjectDir, config) => {
+  installUserDeps = async (targetDir, userProjectDir, config, buildDir, targetPlatform) => {
     const assetsDir = path.dirname(targetDir), bnmFile = path.join(assetsDir, 'BUILD_NATIVE_MODULES.txt'),
-      hashFile = path.join(targetDir, '.deps-hash'), nodeModulesDir = path.join(targetDir, 'node_modules'),
-      forceRebuild = process.env.NODE_MOBILE_FORCE_REBUILD === '1', hasNative = hasNativeModules(userProjectDir);
-
-    fs.writeFileSync(bnmFile, hasNative ? '1' : '0'); // 自动检测是否有原生模块（binding.gyp）
-    // 计算当前依赖 hash（含 native + force 状态）
-    const pkgPath = path.join(targetDir, 'package.json'), currentHash = hashDeps(pkgPath, hasNative, forceRebuild),
-      hasModules = fs.existsSync(nodeModulesDir);
-    let oldHash = null;
-    if (fs.existsSync(hashFile)) try { oldHash = fs.readFileSync(hashFile, 'utf-8').trim(); } catch { };
-    if (hasModules && oldHash === currentHash && !forceRebuild) return console.log('  ✓ 依赖无变化,跳过安装');
-    if (forceRebuild) console.log('  ℹ️  NODE_MOBILE_FORCE_REBUILD=1，强制重装依赖');
-
-    const env = { ...process.env };
-    if (hasNative) env.NODEJS_MOBILE_BUILD_NATIVE_MODULES = '1', console.log(' ℹ️ 检测到原生模块（binding.gyp）,将编译原生代码');
-
-    console.log('  安装用户生产依赖（nodejs-assets/nodejs-project）...');
-    run('npm', ['install', '--omit=dev', '--no-audit', '--no-fund'], { cwd: targetDir, env });
-    fs.writeFileSync(hashFile, currentHash, 'utf-8');
-    console.log('  ✓ 用户依赖安装完成');
+      nodeModulesDir = path.join(targetDir, 'node_modules'), snapshotPath = path.join(buildDir, '.deps-snapshot.json'),
+      forceRebuild = process.env.NODE_MOBILE_FORCE_REBUILD === '1', hasNative = hasNativeModules(userProjectDir),
+      optimizeCfg = config.optimize || {}, thisOptimize = optimizeCfg.enabled !== false,
+      abiFilters = [...(config.android.abiFilters || [])].sort(),
+      runtimeMajor = resolveRuntimeMajor(userProjectDir, targetPlatform);
+
+    fs.writeFileSync(bnmFile, hasNative ? '1' : '0');
+    if (hasNative) console.log('  ℹ️  检测到原生模块（binding.gyp）,将编译原生代码');
+
+    const pkg = JSON.parse(fs.readFileSync(path.join(targetDir, 'package.json'), 'utf-8')), deps = pkg.dependencies || {},
+      sortedDeps = Object.keys(deps).sort().reduce((acc, k) => { acc[k] = deps[k]; return acc; }, {}),
+      snapshotData = { deps: sortedDeps, type: pkg.type || '', hasNative, forceRebuild };
+
+    let shouldInstall = true, shouldOptimize = thisOptimize, reasons = [];
+    if (fs.existsSync(snapshotPath)) {
+      const old = JSON.parse(fs.readFileSync(snapshotPath, 'utf-8')), verifiedOk = old.verified === true,
+        depsSame = JSON.stringify({
+          deps: old.deps, type: old.type, hasNative: old.hasNative, forceRebuild: old.forceRebuild
+        }) === JSON.stringify(snapshotData),
+        envSame = old.platform === targetPlatform && JSON.stringify(old.abiFilters) === JSON.stringify(abiFilters) &&
+          old.runtimeMajor === runtimeMajor,
+        lastOptimized = old.optimized !== false, selfHashSame = old.optimizeHash === SELF_HASH,
+        nmExists = fs.existsSync(nodeModulesDir);
+      if (!depsSame) reasons.push('依赖清单已变化');
+      if (!verifiedOk) reasons.push('上次构建未完成');
+      if (!envSame) reasons.push('运行环境已变化');
+      if (!nmExists) reasons.push('缓存目录缺失');
+      if (lastOptimized && !thisOptimize) reasons.push('优化已由开启转为关闭');
+      if (thisOptimize && !selfHashSame && lastOptimized) reasons.push('优化程序已更新');
+      if (reasons.length > 0) {
+        shouldInstall = true, shouldOptimize = thisOptimize;
+        console.log('  ℹ️  需要重新安装依赖(原因: ' + reasons.join(', ') + ')');
+      }
+      else if (thisOptimize && !lastOptimized)
+        shouldInstall = false, shouldOptimize = true, console.log('  ℹ️  依赖与环境未变化,仅需优化');
+      else {
+        shouldInstall = false, shouldOptimize = false, console.log('  ✓ 依赖与环境未变化,跳过安装与优化');
+        await clearVerified(buildDir);
+        return;
+      }
+    } else console.log('  ℹ️  需要重新安装依赖(原因: 缓存快照缺失)');
+
+    if (shouldInstall) {
+      if (fs.existsSync(nodeModulesDir))
+        console.log('  清理旧 node_modules...'), fs.rmSync(nodeModulesDir, { recursive: true, force: true });
+
+      try { fs.rmSync(snapshotPath, { force: true }); } catch { }
+      const env = { ...process.env };
+      if (hasNative) env.NODEJS_MOBILE_BUILD_NATIVE_MODULES = '1';
+      console.log('  安装用户生产依赖（nodejs-assets/nodejs-project）...');
+      run('npm', ['install', '--omit=dev', '--no-audit', '--no-fund'], { cwd: targetDir, env, inherit: true });
+      const snap = {
+        ...snapshotData, platform: targetPlatform, abiFilters, runtimeMajor,
+        optimizeHash: SELF_HASH, optimized: false, verified: false
+      };
+      fs.writeFileSync(snapshotPath, JSON.stringify(snap, null, 2));
+      console.log('  ✓ 用户依赖安装完成');
+    }
+
+    if (shouldOptimize) {
+      try {
+        await optimizeNodeModules(targetDir, {
+          targetPlatform, abiFilters, runtimeMajor, exclude: optimizeCfg.exclude || [], snapshotDir: buildDir
+        });
+      } catch (err) {
+        console.error('  [错误] node_modules 优化失败：' + err.message);
+        console.error('  [提示] 可在 mobileAppConfig.js 中设置 optimize: { enabled: false } 关闭优化,');
+        console.error('         或用 optimize: { exclude: ["包名"] } 排除问题包。'), process.exit(1);
+      }
+    }
   },
   /**
    * 修改 @flun/nodejs-mobile-react-native 插件 build.gradle 的 abiFilters
@@ -151,7 +195,8 @@ const hashDeps = (pkgPath, hasNative, forceRebuild) => {
           if (cancelIndex !== -1) {
             const newCode = [
               '// LOCALHOST_SSL_BYPASS: 对 localhost/127.0.0.1 放行自签名证书（仅本地测试用）',
-              '        if (failingUrl != null && (failingUrl.startsWith("https://127.0.0.1") || failingUrl.startsWith("https://localhost"))) {',
+              '        if (failingUrl != null',
+              '            && (failingUrl.startsWith("https://127.0.0.1") || failingUrl.startsWith("https://localhost"))) {',
               '            handler.proceed();',
               '            return;',
               '        }',