@flun/node-mobile-app 1.0.2 → 2.0.1

package/mobileAppConfig.js

@@ -63,7 +63,6 @@ export default {
     abiFilters: ['arm64-v8a'],        // 打包架构(真机用 arm64-v8a, 模拟器加 x86_64)
     icon: './build/icon.png',         // 应用图标(建议 512x512 PNG)
     usesCleartextTraffic: true,       // 是否允许明文流量(http)
-    buildNativeModules: false,        // 是否在 nodejs-project 里编译原生模块(bcrypt 等)
     permissions: [                    // 额外权限(按需添加)
       // 'android.permission.INTERNET',   // INTERNET 始终包含,不需配置
       // 'android.permission.ACCESS_NETWORK_STATE',
@@ -71,18 +70,18 @@ export default {
       // 'android.permission.READ_EXTERNAL_STORAGE',
     ],
     // 签名配置（可选）
-    //
-    // 不配置也能打 release：模板默认用 debug keystore 签名（可安装、可本地测试，不可上架）。
-    // 需要上架时再配置下面任一种：
-    //
-    // 方式一：Android SDK 自带 debug keystore（本地测试常用）
-    //   keystore:       %USERPROFILE%\.android\debug.keystore   (Windows)
-    //                   ~/.android/debug.keystore                 (macOS/Linux)
-    //   storePassword:  'android'
-    //   keyAlias:       'androiddebugkey'
-    //   keyPassword:    'android'
-    //
-    // 自定义签名：取消下面注释，填入你的 keystore 信息
+    //
+    // 不配置也能打 release：模板默认用 debug keystore 签名（可安装、可本地测试，不可上架）。
+    // 需要上架时再配置下面任一种：
+    //
+    // 方式一：Android SDK 自带 debug keystore（本地测试常用）
+    //   keystore:       %USERPROFILE%\.android\debug.keystore   (Windows)
+    //                   ~/.android/debug.keystore                 (macOS/Linux)
+    //   storePassword:  'android'
+    //   keyAlias:       'androiddebugkey'
+    //   keyPassword:    'android'
+    //
+    // 自定义签名：取消下面注释，填入你的 keystore 信息
     signing: {
       // keystore: './build/release.keystore',
       // storePassword: '',
@@ -144,8 +143,7 @@ export default {
     'out/',
     'build/',
     'tests/',
-    './mobileAppConfig.js',           // 配置文件本身不打包
-    'nodejs-assets/',                 // 插件 postinstall 生成的示例骨架
+    './mobileAppConfig.js'            // 配置文件本身不打包
   ],
 
   // ===== 允许执行安装脚本的包 =====

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@flun/node-mobile-app",
-  "version": "1.0.2",
-  "description": "将 Node.js 项目一键打包为 Android / iOS 移动应用（基于 nodejs-mobile-react-native）",
+  "version": "2.0.1",
+  "description": "将 Node.js 项目一键打包为 Android / iOS 移动应用,运行时由 @flun/nodejs-mobile-react-native 提供,无需修改你的 Node 代码;",
   "author": "flun <open@flun.top>",
   "keywords": [
     "node-mobile",
@@ -47,7 +47,6 @@
     "@react-native/babel-preset": "^0.87.1",
     "@react-native/metro-config": "^0.87.1",
     "jimp": "^1.6.1",
-    "nodejs-mobile-react-native": "^18.20.4",
     "react": "^19.3.0",
     "react-native": "^0.87.1",
     "react-native-webview": "^14.0.1",
@@ -56,17 +55,18 @@
     "eslint": "^10.11.0",
     "@eslint/js": "^10.0.1",
     "@babel/eslint-parser": "^7.29.9",
-    "@typescript-eslint/eslint-plugin": "^8.70.0",
-    "@typescript-eslint/parser": "^8.70.0",
+    "@typescript-eslint/eslint-plugin": "^8.70.1",
+    "@typescript-eslint/parser": "^8.70.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.1.1",
-    "eslint-plugin-react-native": "^5.0.0"
+    "eslint-plugin-react-native": "^5.0.0",
+    "@flun/nodejs-mobile-react-native": "^1.0.3"
   },
   "allowScripts": {
     "node": true,
-    "nodejs-mobile-react-native": true,
+    "@flun/nodejs-mobile-react-native": true,
     "unrs-resolver": true,
     "@parcel/watcher": true
   },

package/src/commands/build.js

@@ -42,7 +42,7 @@ const PKG_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'
     console.log('\n[2/7] 检查缓存指纹'), checkAndResetCache(buildDir, userProjectDir, config, PKG_ROOT);
     console.log('\n[3/7] 复制用户项目');
     const { moduleType, targetDir } = copyUserProject(userProjectDir, buildDir, config);
-    console.log('\n[4/7] 安装依赖'), installUserDeps(targetDir, config);
+    console.log('\n[4/7] 安装依赖'), installUserDeps(targetDir, userProjectDir, config);
     patchNodejsMobilePlugin(userProjectDir, config);
     patchWebViewSsl(userProjectDir, config);
     writeLocalProperties(buildDir, config);

package/src/commands/clean.js

@@ -8,7 +8,7 @@ const runClean = async () => {
     targets = [
       { label: '构建目录', path: buildDir },
       {
-        label: '插件 CMake 缓存', path: path.join(userProjectDir, 'node_modules', 'nodejs-mobile-react-native', 'android',
+        label: '插件 CMake 缓存', path: path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native', 'android',
           '.cxx')
       },
     ];

package/src/commands/test.js

@@ -40,7 +40,7 @@ const PKG_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'
     console.log('\n[3/9] 复制用户项目');
     const { moduleType, targetDir } = copyUserProject(userProjectDir, buildDir, config);
 
-    console.log('\n[4/9] 安装依赖'), installUserDeps(targetDir, config);
+    console.log('\n[4/9] 安装依赖'), installUserDeps(targetDir, userProjectDir, config);
     patchNodejsMobilePlugin(userProjectDir, config);
     patchWebViewSsl(userProjectDir, config);
     writeLocalProperties(buildDir, config);

package/src/config.js

@@ -29,9 +29,7 @@ const DEFAULT_CONFIG = {
     abiFilters: ['arm64-v8a'],
     icon: './build/icon.png',
     usesCleartextTraffic: true,
-    permissions: [],
-    buildNativeModules: false,
-    signing: {},
+    permissions: [],
    signing: {},
   },
   ios: {
     deploymentTarget: '15.1',

package/src/copy.js

@@ -54,6 +54,55 @@ const BUILD_DIR_NAME = 'node-mobile-app-build',
    * 获取 build 目录路径：<userProject>/node-mobile-app-build
    */
   getBuildDir = userProjectDir => path.join(userProjectDir, BUILD_DIR_NAME),
+
+  /**
+   * 把 buildDir/package.json 的依赖版本同步为主包 dependencies 的版本
+   * - 依赖名单来自 buildDir/package.json（模板声明需要哪些依赖）
+   * - 版本号来自 pkgRoot/package.json 的 dependencies（单一数据源）
+   * - 若主包缺少某个依赖，抛错中断（避免模板占位值被真正使用）
+   */
+  syncTemplateDependencies = (pkgRoot, buildDir) => {
+    const buildPkgPath = path.join(buildDir, 'package.json');
+    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);
+    if (!buildPkg.dependencies) return;
+
+    const mainDeps = mainPkg.dependencies || {};
+    const missing = [];
+    let updated = 0;
+
+    // 移除仅用于模板占位说明的 _comment 字段，避免带进最终 build 工程
+    if ('_comment' in buildPkg) {
+      delete buildPkg._comment;
+      updated++;
+    }
+    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;
+        updated++;
+      }
+    }
+
+    if (updated > 0) {
+      writeIfChanged(buildPkgPath, JSON.stringify(buildPkg, null, 2) + '\n');
+      console.log('  ✓ 已同步 ' + updated + ' 个依赖版本到 ' + BUILD_DIR_NAME + '/package.json');
+    }
+
+    if (missing.length > 0) {
+      throw new Error(
+        'template/package.json 声明的以下依赖在主包 dependencies 中不存在：\n' +
+        '       ' + missing.join(', ') + '\n' +
+        '     请在 @flun/node-mobile-app 的 package.json 中补上对应声明（版本号随意，\n' +
+        '     但必须存在，以便 syncTemplateDependencies 覆盖模板里的占位值）。'
+      );
+    }
+  },
   /**
    * 把 CLI 包里的 template/ 逐文件覆盖到 build 目录
    * - 只覆盖模板里存在的文件，不删除 buildDir 里已有的其他内容（保留 Gradle 增量缓存）
@@ -69,6 +118,7 @@ const BUILD_DIR_NAME = 'node-mobile-app-build',
     const keepSet = new Set((config && config.keepFiles) || []);
     copyDirOverwrite(templateDir, buildDir, TEMPLATE_EXCLUDE, buildDir, keepSet);
     fs.writeFileSync(path.join(buildDir, 'eslint.config.js'), buildEslintConfigSource(), 'utf-8');
+    syncTemplateDependencies(pkgRoot, buildDir);
     console.log('  ✓ 模板已更新到', BUILD_DIR_NAME + '/');
     if (keepSet.size > 0) console.log('    保留文件:', Array.from(keepSet).join(', '));
   },

package/src/fingerprint.js

@@ -19,11 +19,11 @@ const FINGERPRINT_FILE = '.build-fingerprint.json',
   clearCommonCaches = (buildDir, userProjectDir) => {
     removeDir(path.join(buildDir, 'android', 'build'));
     removeDir(path.join(buildDir, 'android', 'app', 'build'));
-    removeDir(path.join(userProjectDir, 'node_modules', 'nodejs-mobile-react-native', 'android', 'build'));
+    removeDir(path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native', 'android', 'build'));
   },
   computeFingerprint = (userProjectDir, config, pkgRoot) => {
     const abiFilters = [...(config.android.abiFilters || [])].sort(), libnode = {},
-      pluginDir = path.join(userProjectDir, 'node_modules', 'nodejs-mobile-react-native'),
+      pluginDir = path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native'),
       libnodeBin = path.join(pluginDir, 'android', 'libnode', 'bin');
 
     if (fs.existsSync(libnodeBin)) {
@@ -85,7 +85,7 @@ const FINGERPRINT_FILE = '.build-fingerprint.json',
       if (appInfoChanged) reasons.push('应用信息');
       console.log('  ⚠️  检测到变化（' + reasons.join('、') + '），清理全部缓存');
       clearCommonCaches(buildDir, userProjectDir);
-      removeDir(path.join(userProjectDir, 'node_modules', 'nodejs-mobile-react-native', 'android', '.cxx'));
+      removeDir(path.join(userProjectDir, 'node_modules', '@flun', 'nodejs-mobile-react-native', 'android', '.cxx'));
     }
     else if (depsChanged || appInfoChanged) {
       const reasons = [];

package/src/generate.js

@@ -12,7 +12,8 @@ import { writeIfChanged } from './utils.js';
 const generateMainJs = (targetDir, config, moduleType) => {
   const entry = config.serverPath.startsWith('./') ? config.serverPath : './' + config.serverPath,
     entryLabel = config.serverPath, hb = config.advanced.heartbeatInterval,
-    body = `const rn_bridge = require('rn-bridge');
+    body = `(async () => {
+    const rn_bridge = require('rn-bridge');
     const net = require('net'), https = require('https'), USER_ENTRY = ${JSON.stringify(entry)},
      ENTRY_LABEL = ${JSON.stringify(entryLabel)}, START_TIMEOUT_MS = 5000;
 
@@ -34,11 +35,11 @@ const generateMainJs = (targetDir, config, moduleType) => {
 
     rn_bridge.channel.send('Node was initialized.');
     process.on('uncaughtException', (err) => {
-      console.error('Uncaught Exception:', err);
+      console.error('未捕获的异常:', err);
       emitFailure('未捕获异常', err && err.message);
     });
     process.on('unhandledRejection', (reason) => {
-      console.error('Unhandled Rejection:', reason);
+      console.error('未处理的 Promise rejection:', reason);
       emitFailure('未处理的 Promise rejection', String(reason));
     });
 
@@ -77,7 +78,8 @@ const generateMainJs = (targetDir, config, moduleType) => {
 
     rn_bridge.channel.on('message', (msg) => {
       rn_bridge.channel.send('Echo: ' + msg);
-    });`,
+    });
+    })();`,
     header = moduleType === 'module'
       ? `import { createRequire } from 'module';\nconst require = createRequire(import.meta.url);\n\n` : '',
     file = path.join(targetDir, 'main.js'), changed = writeIfChanged(file, header + body);

package/src/install.js

@@ -4,9 +4,11 @@ import crypto from 'crypto';
 import { run } from './utils.js';
 
 /**
- * 内部：依赖 hash（dependencies + type）
+ * 内部：依赖 hash（dependencies + type + 是否含原生模块 + 是否强制重编）
+ * hasNative 纳入哈希：装/卸原生模块时会触发重装
+ * forceRebuild 纳入哈希：用户显式要求重编时会强制重装
  */
-const hashDeps = pkgPath => {
+const hashDeps = (pkgPath, hasNative, forceRebuild) => {
   const h = crypto.createHash('sha256');
   if (fs.existsSync(pkgPath)) {
     try {
@@ -15,14 +17,36 @@ const hashDeps = pkgPath => {
     } 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');
 },
   /**
-   * 内部：定位 nodejs-mobile-react-native 插件目录
+   * 内部：判断用户项目的生产依赖里是否含原生模块（binding.gyp）
+   * 按用户根 package.json 的 dependencies 键名，去 userProjectDir/node_modules 下逐个查
+   * 不用扫 nodejs-project/node_modules：首次构建时它还不存在
+   */
+  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;
+    }
+    const nodeModulesDir = path.join(userProjectDir, 'node_modules');
+    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', 'nodejs-mobile-react-native'),
+      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;
@@ -63,20 +87,33 @@ const hashDeps = pkgPath => {
    * 只装 dependencies，不装 devDependencies
    * 依赖未变化且 node_modules 存在时跳过（用 .deps-hash 记录）
    */
-  installUserDeps = (targetDir, config) => {
+  installUserDeps = (targetDir, userProjectDir, config) => {
     const assetsDir = path.dirname(targetDir), bnmFile = path.join(assetsDir, 'BUILD_NATIVE_MODULES.txt'),
-      hashFile = path.join(targetDir, '.deps-hash'), buildNative = !!config.android.buildNativeModules;
-    fs.writeFileSync(bnmFile, buildNative ? '1' : '0');
+      hashFile = path.join(targetDir, '.deps-hash'),
+      nodeModulesDir = path.join(targetDir, 'node_modules'),
+      forceRebuild = process.env.NODE_MOBILE_FORCE_REBUILD === '1';
+
+    // 自动检测是否有原生模块（binding.gyp）
+    const hasNative = hasNativeModules(userProjectDir);
+    fs.writeFileSync(bnmFile, hasNative ? '1' : '0');
 
-    // 计算当前依赖 hash
-    const pkgPath = path.join(targetDir, 'package.json'), currentHash = hashDeps(pkgPath),
-      nodeModulesDir = path.join(targetDir, 'node_modules'), hasModules = fs.existsSync(nodeModulesDir);
+    // 计算当前依赖 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) return console.log('  ✓ 依赖无变化，跳过安装');
+
+    if (hasModules && oldHash === currentHash && !forceRebuild) {
+      return console.log('  ✓ 依赖无变化，跳过安装');
+    }
+    if (forceRebuild) console.log('  ℹ️  NODE_MOBILE_FORCE_REBUILD=1，强制重装依赖');
 
     const env = { ...process.env };
-    if (buildNative) env.NODEJS_MOBILE_BUILD_NATIVE_MODULES = '1';
+    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 });
@@ -84,11 +121,11 @@ const hashDeps = pkgPath => {
     console.log('  ✓ 用户依赖安装完成');
   },
   /**
-   * 修改 nodejs-mobile-react-native 插件 build.gradle 的 abiFilters
+   * 修改 @flun/nodejs-mobile-react-native 插件 build.gradle 的 abiFilters
    */
   patchNodejsMobilePlugin = (userProjectDir, config) => {
     const pluginDir = findPluginDir(userProjectDir);
-    if (!pluginDir) return console.warn('  ⚠️  未找到 nodejs-mobile-react-native 插件，跳过 patch');
+    if (!pluginDir) return console.warn('  ⚠️  未找到 @flun/nodejs-mobile-react-native 插件，跳过 patch');
 
     const file = path.join(pluginDir, 'android', 'build.gradle'),
       abiList = config.android.abiFilters.map((x) => `"${x}"`).join(', ');

package/template/App.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { View, Text, ActivityIndicator, StyleSheet, useColorScheme } from 'react-native';
 import { WebView } from 'react-native-webview';
-import * as NodeMobile from 'nodejs-mobile-react-native';
+import * as NodeMobile from '@flun/nodejs-mobile-react-native';
 import runtime from './mobileApp.runtime';
 
 // 背景色解析：支持以下三种配置

package/template/package.json

@@ -1,18 +1,18 @@
-{
-  "name": "node-mobile-app-build",
-  "version": "0.0.0",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "android": "react-native run-android",
-    "ios": "react-native run-ios",
-    "start": "react-native start"
-  },
-  "dependencies": {
-    "react": "^19.2.8",
-    "react-native": "^0.87.1",
-    "nodejs-mobile-react-native": "^18.20.4",
-    "react-native-safe-area-context": "^5.9.1",
-    "react-native-webview": "^14.0.1"
-  }
-}
+{
+  "name": "node-mobile-app-build",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "_comment": "dependencies 的版本号由 @flun/node-mobile-app 在 copyTemplate 阶段从主包 package.json 同步；此处 \"*\" 仅为占位，请勿依赖此文件里的值。",
+  "dependencies": {
+    "react": "*",
+    "react-native": "*",
+    "@flun/nodejs-mobile-react-native": "*",
+    "react-native-webview": "*"
+  },
+  "scripts": {
+    "android": "react-native run-android",
+    "ios": "react-native run-ios",
+    "start": "react-native start"
+  }
+}