react-native-bspatch 1.1.2 → 1.1.4

package/tools/bump_version.js

@@ -0,0 +1,133 @@
+#!/usr/bin/env node
+// ─────────────────────────────────────────────────────────────────────────────
+// bump_version.js — Synchronize App Version Across Platforms
+//
+// Updates:
+//   - package.json ("version")
+//   - android/app/build.gradle (versionName & increments versionCode)
+//   - ios/*.xcodeproj/project.pbxproj (MARKETING_VERSION & increments CURRENT_PROJECT_VERSION)
+//   - src/ota/otaConfig.ts (APP_VERSION, if it exists)
+//
+// Usage:
+//   node bump_version.js <new_version> [--root <path>]
+//   e.g. node bump_version.js 1.0.2
+// ─────────────────────────────────────────────────────────────────────────────
+
+const fs = require('fs');
+const path = require('path');
+
+const args = process.argv.slice(2);
+let newVersion = '';
+let rootDir = process.cwd();
+
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === '--root' && args[i + 1]) {
+    rootDir = path.resolve(args[i + 1]);
+    i++;
+  } else if (!args[i].startsWith('--')) {
+    newVersion = args[i].trim();
+  }
+}
+
+if (!newVersion) {
+  console.error('Usage: node bump_version.js <new_version> [--root <path>]');
+  console.error('Example: node bump_version.js 1.0.2');
+  process.exit(1);
+}
+
+// Validate semver format loosely (e.g. 1.0.2 or 1.0.2-beta)
+if (!/^\d+\.\d+\.\d+.*$/.test(newVersion)) {
+  console.error(`Invalid version format: "${newVersion}". Expected semver (e.g. 1.0.2)`);
+  process.exit(1);
+}
+
+console.log(`\n=== Bumping App Version to ${newVersion} ===\n`);
+let changedCount = 0;
+
+// 1. package.json
+const pkgPath = path.join(rootDir, 'package.json');
+if (fs.existsSync(pkgPath)) {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+    const oldVer = pkg.version;
+    pkg.version = newVersion;
+    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+    console.log(`  ✓ package.json: ${oldVer} → ${newVersion}`);
+    changedCount++;
+  } catch (e) {
+    console.warn(`  ⚠ Failed to update package.json: ${e.message}`);
+  }
+}
+
+// 2. android/app/build.gradle
+const gradlePath = path.join(rootDir, 'android/app/build.gradle');
+if (fs.existsSync(gradlePath)) {
+  try {
+    let content = fs.readFileSync(gradlePath, 'utf8');
+    let oldName = '';
+    let newCode = 1;
+
+    // Bump versionName
+    content = content.replace(/versionName\s+["']([^"']+)["']/, (_, old) => {
+      oldName = old;
+      return `versionName "${newVersion}"`;
+    });
+
+    // Increment versionCode
+    content = content.replace(/versionCode\s+(\d+)/, (_, code) => {
+      newCode = parseInt(code, 10) + 1;
+      return `versionCode ${newCode}`;
+    });
+
+    fs.writeFileSync(gradlePath, content, 'utf8');
+    console.log(`  ✓ android/app/build.gradle: versionName "${oldName}" → "${newVersion}", versionCode → ${newCode}`);
+    changedCount++;
+  } catch (e) {
+    console.warn(`  ⚠ Failed to update build.gradle: ${e.message}`);
+  }
+}
+
+// 3. iOS Xcode project.pbxproj
+const iosDir = path.join(rootDir, 'ios');
+if (fs.existsSync(iosDir)) {
+  try {
+    const files = fs.readdirSync(iosDir);
+    for (const f of files) {
+      if (f.endsWith('.xcodeproj')) {
+        const pbxPath = path.join(iosDir, f, 'project.pbxproj');
+        if (fs.existsSync(pbxPath)) {
+          let content = fs.readFileSync(pbxPath, 'utf8');
+
+          // Replace MARKETING_VERSION
+          content = content.replace(/MARKETING_VERSION\s*=\s*[^;]+;/g, `MARKETING_VERSION = ${newVersion};`);
+
+          // Increment CURRENT_PROJECT_VERSION if numeric
+          content = content.replace(/CURRENT_PROJECT_VERSION\s*=\s*(\d+);/g, (_, v) => {
+            const nextV = parseInt(v, 10) + 1;
+            return `CURRENT_PROJECT_VERSION = ${nextV};`;
+          });
+
+          fs.writeFileSync(pbxPath, content, 'utf8');
+          console.log(`  ✓ ios/${f}/project.pbxproj: MARKETING_VERSION → ${newVersion}`);
+          changedCount++;
+        }
+      }
+    }
+  } catch (e) {
+    console.warn(`  ⚠ Failed to update iOS project: ${e.message}`);
+  }
+}
+
+// 4. src/ota/otaConfig.ts (if exists)
+const otaConfigPath = path.join(rootDir, 'src/ota/otaConfig.ts');
+if (fs.existsSync(otaConfigPath)) {
+  try {
+    let content = fs.readFileSync(otaConfigPath, 'utf8');
+    content = content.replace(/export const APP_VERSION = ['"][^'"]+['"];/, `export const APP_VERSION = '${newVersion}';`);
+    fs.writeFileSync(otaConfigPath, content, 'utf8');
+    console.log(`  ✓ src/ota/otaConfig.ts: APP_VERSION → '${newVersion}'`);
+    changedCount++;
+  } catch (e) {}
+}
+
+console.log(`\n✓ Done! Updated ${changedCount} file(s) to version ${newVersion}.\n`);

package/tools/generate_keys.js

@@ -0,0 +1,75 @@
+#!/usr/bin/env node
+// ─────────────────────────────────────────────────────────────────────────────
+// generate_keys.js — Generate Asymmetric Keypair for OTA Patch Signing
+//
+// Usage:
+//   node tools/generate_keys.js [--type rsa|ec] [--out <dir>]
+//   e.g. node tools/generate_keys.js
+// ─────────────────────────────────────────────────────────────────────────────
+
+const crypto = require('crypto');
+const fs = require('fs');
+const path = require('path');
+
+const args = process.argv.slice(2);
+let keyType = 'rsa';
+let outDir = process.cwd();
+
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === '--type' && args[i + 1]) {
+    keyType = args[i + 1].toLowerCase();
+    i++;
+  } else if (args[i] === '--out' && args[i + 1]) {
+    outDir = path.resolve(args[i + 1]);
+    i++;
+  }
+}
+
+console.log(`\n=== Generating ${keyType.toUpperCase()} Keypair for OTA Patch Security ===\n`);
+
+let privateKey, publicKey;
+
+if (keyType === 'ec') {
+  const keypair = crypto.generateKeyPairSync('ec', {
+    namedCurve: 'prime256v1',
+    publicKeyEncoding: { type: 'spki', format: 'pem' },
+    privateKeyEncoding: { type: 'pkcs8', format: 'pem' }
+  });
+  privateKey = keypair.privateKey;
+  publicKey = keypair.publicKey;
+} else {
+  // Default: RSA 2048
+  const keypair = crypto.generateKeyPairSync('rsa', {
+    modulusLength: 2048,
+    publicKeyEncoding: { type: 'spki', format: 'pem' },
+    privateKeyEncoding: { type: 'pkcs8', format: 'pem' }
+  });
+  privateKey = keypair.privateKey;
+  publicKey = keypair.publicKey;
+}
+
+const privPath = path.join(outDir, 'ota_private_key.pem');
+const pubPath = path.join(outDir, 'ota_public_key.pem');
+
+fs.writeFileSync(privPath, privateKey, { mode: 0o600 });
+fs.writeFileSync(pubPath, publicKey, { mode: 0o644 });
+
+// Clean public key string for inline JS config
+const pubKeyClean = publicKey
+  .replace(/-----BEGIN PUBLIC KEY-----/, '')
+  .replace(/-----END PUBLIC KEY-----/, '')
+  .replace(/\s+/g, '');
+
+console.log(`  ✓ Private Key saved to: ${privPath}`);
+console.log(`  ✓ Public Key saved to:  ${pubPath}`);
+console.log('\n────────────────────────────────────────────────────────');
+console.log('  HOW TO USE:');
+console.log('  1. KEEP PRIVATE KEY SAFE on your build machine / CI server:');
+console.log('     Add "ota_private_key.pem" to .gitignore!');
+console.log('');
+console.log('  2. ADD PUBLIC KEY TO YOUR CLIENT APP CONFIG:');
+console.log('     const otaConfig: OtaConfig = {');
+console.log(`       publicKey: '${pubKeyClean}',`);
+console.log('       ...');
+console.log('     };');
+console.log('────────────────────────────────────────────────────────\n');

package/tools/setup_project.js

@@ -60,6 +60,13 @@ const XCODE_BUNDLE_SYNC_SNIPPET = [
     '  mkdir -p "$(dirname \\"$DEST_FILE\\")"',
     '  cp "$BUNDLE_RESULT" "$DEST_FILE"',
     '  echo "Bundle synced to $DEST_FILE"',
+    '  if [ "$CONFIGURATION" = "Release" ]; then',
+    '    APP_VER="${MARKETING_VERSION:-1.0.0}"',
+    '    mkdir -p "$PROJECT_DIR/output"',
+    '    cp "$BUNDLE_RESULT" "$PROJECT_DIR/output/bundle_${APP_VER}_v1_ios_production.hbc"',
+    '    cp "$BUNDLE_RESULT" "$PROJECT_DIR/output/bundle_${APP_VER}_v1_ios_development.hbc" 2>/dev/null || true',
+    '    echo "[react-native-bspatch] ✓ Auto-captured iOS base bundle v1 to output/"',
+    '  fi',
     'else',
     '  echo "Bundle not found at $BUNDLE_RESULT (skipping sync)"',
     'fi',
@@ -68,6 +75,48 @@ const XCODE_BUNDLE_SYNC_SNIPPET = [
 // The escaped version as it appears in pbxproj shellScript value
 const XCODE_BUNDLE_SYNC_MARKER = 'react-native-bspatch] Sync compiled bundle to output/';
 
+const ANDROID_GRADLE_MARKER = '[react-native-bspatch] Auto-capture Base Bundle';
+const ANDROID_GRADLE_SNIPPET = `
+// [react-native-bspatch] Auto-capture Base Bundle on Release builds
+afterEvaluate {
+    android.applicationVariants.all { variant ->
+        if (variant.buildType.name == 'release') {
+            def flavorName = (variant.flavorName ?: 'development').toLowerCase()
+            if (flavorName == 'dev') flavorName = 'development'
+            if (flavorName == 'prod') flavorName = 'production'
+            def versionName = variant.versionName ?: '1.0.0'
+            def capVariant = variant.name.capitalize()
+            def bundleTask = tasks.findByName("createBundle\${capVariant}JsAndAssets")
+            if (bundleTask != null) {
+                def saveTask = tasks.register("saveOtaBaseBundle\${capVariant}") {
+                    doLast {
+                        def bundleDir = file("\$buildDir/generated/assets/react/\${variant.name}")
+                        def bundleFile = file("\$bundleDir/index.android.bundle")
+                        def outputDir = file("\$rootDir/output")
+                        if (bundleFile.exists()) {
+                            outputDir.mkdirs()
+                            def destName = "bundle_\${versionName}_v1_android_\${flavorName}.hbc"
+                            copy {
+                                from bundleFile
+                                into outputDir
+                                rename { destName }
+                            }
+                            println "[react-native-bspatch] ✓ Auto-captured base bundle: android/output/\${destName}"
+                        }
+                    }
+                }
+                bundleTask.finalizedBy(saveTask)
+            }
+        }
+    }
+}
+`;
+
+function patchAppBuildGradle(content) {
+    if (content.includes(ANDROID_GRADLE_MARKER)) return content;
+    return content.trimEnd() + '\n' + ANDROID_GRADLE_SNIPPET;
+}
+
 const IOS_IMPORT = 'import react_native_bspatch';
 const IOS_BUNDLE_URL_OVERRIDE = `
   override func bundleURL() -> URL? {
@@ -275,12 +324,28 @@ function main() {
         patchFile(mainAppFiles[0], 'MainApplication.kt', patchMainApplication);
     }
 
+    const appGradleFiles = findFile(path.join(ANDROID_DIR, 'app'), (name) => name === 'build.gradle');
+    if (appGradleFiles.length === 0) {
+        console.log('  ⚠  No android/app/build.gradle found.');
+    } else {
+        patchFile(appGradleFiles[0], 'android/app/build.gradle (auto-capture base bundle)', patchAppBuildGradle);
+    }
+
+    // Ensure android/output/ exists
+    const androidOutputDir = path.join(ANDROID_DIR, 'output');
+    if (!fs.existsSync(androidOutputDir)) {
+        fs.mkdirSync(androidOutputDir, { recursive: true });
+        console.log('  ✓  Created android/output/ directory');
+    }
+
     console.log('\n=== Setup Complete ===');
     console.log('Next steps:');
-    console.log('  1. iOS: Run Xcode build once to populate ios/output/main.jsbundle');
-    console.log('         (or run: yarn ota:init --platform ios)');
-    console.log('  2. Android: Run: yarn ota:init --platform android');
-    console.log('  3. Then: yarn ota:build to start publishing OTA updates\n');
+    console.log('  1. Base bundles will now automatically be captured on Release builds (Gradle & Xcode).');
+    console.log('  2. Or seed directly from an existing Store binary:');
+    console.log('         yarn react-native-bspatch seed --apk path/to/release.apk');
+    console.log('         yarn react-native-bspatch seed --ipa path/to/release.ipa');
+    console.log('  3. Or create base release manually: yarn ota:init');
+    console.log('  4. Then publish OTA updates safely with: yarn ota:build\n');
 }
 
 main();

package/tools/update_registry.js

@@ -12,6 +12,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const crypto = require('crypto');
 
 const [
   projectRoot,
@@ -61,6 +62,24 @@ if (!registry.apps[appVersion].flavors[flavor]) {
 const flavorGroup = registry.apps[appVersion].flavors[flavor];
 flavorGroup.latestOtaVersion = toOtaVersion;
 
+// ── Check for private key for asymmetric signing ───────────────────────────
+let signingKey = process.env.OTA_PRIVATE_KEY || null;
+if (!signingKey) {
+  const candidateKeyPaths = [
+    path.join(process.cwd(), 'ota_private_key.pem'),
+    path.join(path.dirname(registryPath), 'ota_private_key.pem'),
+    path.join(path.dirname(registryPath), '../ota_private_key.pem'),
+  ];
+  for (const kp of candidateKeyPaths) {
+    if (fs.existsSync(kp)) {
+      try {
+        signingKey = fs.readFileSync(kp, 'utf8');
+        break;
+      } catch (e) {}
+    }
+  }
+}
+
 // ── Update patches ──────────────────────────────────────────────────────────
 if (newPatches.length > 0) {
   // We merge patches by platform to avoid overwriting between Android and iOS
@@ -71,7 +90,32 @@ if (newPatches.length > 0) {
     const fullBundleName = `bundle_${appVersion}_v${toOtaVersion}_${platform}_${flavor}.hbc`;
     const manifestName = path.basename(_assetManifestFile);
 
-    return {
+    let signature = undefined;
+    if (signingKey) {
+      try {
+        const patchFileCandidates = [
+          path.join(path.dirname(registryPath), p.file),
+          path.join(process.cwd(), p.file),
+        ];
+        let patchData = null;
+        for (const pfc of patchFileCandidates) {
+          if (fs.existsSync(pfc)) {
+            patchData = fs.readFileSync(pfc);
+            break;
+          }
+        }
+        if (patchData) {
+          const signer = crypto.createSign('SHA256');
+          signer.update(patchData);
+          signature = signer.sign(signingKey, 'base64');
+          console.log(`  ✓ Signed patch ${p.file} with asymmetric private key`);
+        }
+      } catch (signErr) {
+        console.warn(`  ⚠ Could not sign patch ${p.file}: ${signErr.message}`);
+      }
+    }
+
+    const patchObj = {
       id: `v${p.from}-to-v${p.to}-${flavor}-${platform}`,
       label: `V${p.from} → V${p.to} (${flavor} ${platform})`,
       appVersion,
@@ -85,6 +129,12 @@ if (newPatches.length > 0) {
       assetManifestUrl: manifestName,
       flavor: flavor,
     };
+
+    if (signature) {
+      patchObj.signature = signature;
+    }
+
+    return patchObj;
   });
 
   flavorGroup.patches = [...otherPlatformPatches, ...mappedNewPatches];