react-native-bspatch 2.0.1 → 3.0.1

package/tools/cli.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+// Yarn Berry runs package bins with node regardless of the shebang, so the bash CLI needs a JS entry
+const { spawnSync } = require('child_process');
+const path = require('path');
+
+const result = spawnSync('bash', [path.join(__dirname, 'build_ota.sh'), ...process.argv.slice(2)], {
+  stdio: 'inherit',
+});
+process.exit(result.status ?? 1);

package/tools/setup_project.js

@@ -3,8 +3,7 @@
 // react-native-bspatch Setup Script
 //
 // Automatically injects OTA integration into a React Native project:
-//   - iOS:     Patches project.pbxproj (Xcode build phase bundle sync)
-//              Patches AppDelegate.swift (import + bundleURL override)
+//   - iOS:     Patches AppDelegate.swift (import + bundleURL override)
 //   - Android: Patches MainApplication.kt (import + jsBundleFilePath)
 //
 // Idempotent: safe to run multiple times; skips already-patched files.
@@ -50,84 +49,17 @@ function patchFile(filePath, label, patchFn) {
 
 // ── Constants ─────────────────────────────────────────────────────────────────
 
-// Plain shell; escaped below for the pbxproj shellScript string literal
-const XCODE_BUNDLE_SYNC_SNIPPET = [
-    '',
-    '# [react-native-bspatch] Sync compiled bundle to output/ for OTA builds',
-    'DEST_FILE="$PROJECT_DIR/output/main.jsbundle"',
-    'BUNDLE_RESULT="$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle"',
-    '',
-    'if [ -f "$BUNDLE_RESULT" ]; then',
-    '  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}"',
-    '    # v1 = the store build; never overwrite it (delete the file to re-capture)',
-    '    for FLAVOR in development staging production; do',
-    '      DEST_V1="$PROJECT_DIR/output/bundle_${APP_VER}_v1_ios_${FLAVOR}.hbc"',
-    '      if [ ! -f "$DEST_V1" ]; then',
-    '        cp "$BUNDLE_RESULT" "$DEST_V1"',
-    '        echo "[react-native-bspatch] ✓ Auto-captured iOS base bundle v1 ($FLAVOR)"',
-    '      fi',
-    '    done',
-    '  fi',
-    'else',
-    '  echo "Bundle not found at $BUNDLE_RESULT (skipping sync)"',
-    'fi',
-].join('\n').replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
-
-// 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")
-                        // v1 = the store build; never overwrite it (delete the file to re-capture).
-                        // build_ota.sh runs this same bundle task for every OTA build.
-                        def destFile = file("\$outputDir/bundle_\${versionName}_v1_android_\${flavorName}.hbc")
-                        if (bundleFile.exists() && !destFile.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) {
-    const markerIdx = content.indexOf('// ' + ANDROID_GRADLE_MARKER);
-    if (markerIdx === -1) return content.trimEnd() + '\n' + ANDROID_GRADLE_SNIPPET;
+// Older versions injected these to capture the store bundle (v1) as a patch source.
+// OTA no longer patches from the store bundle, so setup removes them.
+const LEGACY_XCODE_MARKER = '\\n# [react-native-bspatch] Sync compiled bundle to output/';
+const LEGACY_GRADLE_MARKER = '// [react-native-bspatch] Auto-capture Base Bundle';
 
-    // Replace an older snippet in place: from the marker to the afterEvaluate block's closing brace
-    const end = findClosingParen(content, content.indexOf('{', content.indexOf('afterEvaluate', markerIdx)), '{', '}');
+function removeAppBuildGradleSnippet(content) {
+    const idx = content.indexOf(LEGACY_GRADLE_MARKER);
+    if (idx === -1) return content;
+    const end = findClosingParen(content, content.indexOf('{', content.indexOf('afterEvaluate', idx)), '{', '}');
     if (end === -1) return content;
-    return content.slice(0, markerIdx) + ANDROID_GRADLE_SNIPPET.trim() + content.slice(end + 1);
+    return content.slice(0, idx).trimEnd() + '\n' + content.slice(end + 1).trimStart();
 }
 
 const IOS_IMPORT = 'import react_native_bspatch';
@@ -165,34 +97,10 @@ function findClosingParen(source, openParenIdx, open = '(', close = ')') {
 
 // ── iOS: project.pbxproj ─────────────────────────────────────────────────────
 
-function patchPbxproj(content) {
-    if (content.includes(XCODE_BUNDLE_SYNC_SNIPPET)) return content;
-
-    // Older snippet present → replace it in place (it lacked the base bundle auto-capture)
-    const oldIdx = content.indexOf('\\n# [' + XCODE_BUNDLE_SYNC_MARKER);
-    if (oldIdx !== -1) {
-        const endIdx = content.indexOf('";', oldIdx);
-        return content.slice(0, oldIdx) + XCODE_BUNDLE_SYNC_SNIPPET + content.slice(endIdx);
-    }
-
-    // Search by phase name
-    const nameIdx = content.indexOf('name = "Bundle React Native code and images";');
-    if (nameIdx !== -1) {
-        const shellScriptIdx = content.indexOf('shellScript = "', nameIdx);
-        if (shellScriptIdx !== -1) {
-            const endIdx = content.indexOf('";', shellScriptIdx + 15);
-            if (endIdx !== -1) {
-                return (
-                    content.slice(0, endIdx) +
-                    XCODE_BUNDLE_SYNC_SNIPPET +
-                    content.slice(endIdx)
-                );
-            }
-        }
-    }
-
-    console.log('    ⚠  Could not find "Bundle React Native code and images" build phase in project.pbxproj.');
-    return content;
+function removePbxprojSnippet(content) {
+    const idx = content.indexOf(LEGACY_XCODE_MARKER);
+    if (idx === -1) return content;
+    return content.slice(0, idx) + content.slice(content.indexOf('";', idx));
 }
 
 // ── iOS: AppDelegate.swift ────────────────────────────────────────────────────
@@ -316,7 +224,7 @@ function main() {
         console.log('  ⚠  No project.pbxproj found. Is this an iOS project?');
     } else {
         const pbxproj = pbxprojFiles[0];
-        patchFile(pbxproj, 'project.pbxproj (Xcode build phase)', patchPbxproj);
+        patchFile(pbxproj, 'project.pbxproj (remove legacy bundle capture)', removePbxprojSnippet);
     }
 
     // AppDelegate.swift
@@ -347,7 +255,7 @@ function main() {
     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);
+        patchFile(appGradleFiles[0], 'android/app/build.gradle (remove legacy bundle capture)', removeAppBuildGradleSnippet);
     }
 
     // Ensure android/output/ exists
@@ -358,13 +266,7 @@ function main() {
     }
 
     console.log('\n=== Setup Complete ===');
-    console.log('Next steps:');
-    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');
+    console.log('Next: release the app to the store (v1), then publish OTA updates with: npx react-native-bspatch\n');
 }
 
 main();

package/tools/update_registry.js

@@ -6,8 +6,7 @@
  * 1. Reads  : android/output/ota_registry.json (or ios/output/...)
  * 2. Scopes to : appVersion (e.g. "1.0.0")
  * 3. Scopes to : flavor (e.g. "dev", "staging", "production")
- * 4. Updates patches and latestOtaVersion for that specific app+flavor combination.
- * 5. Writes : otaPatches.generated.ts (flattened across all app versions/flavors)
+ * 4. Writes the full-bundle entry + patch entries and latestOtaVersion for that app+flavor.
  */
 
 const fs = require('fs');
@@ -33,10 +32,6 @@ const registryPath = projectRoot.endsWith('.json')
   ? projectRoot 
   : path.join(projectRoot, 'ota_registry.json');
 
-const generatedPath = projectRoot.endsWith('.json')
-  ? path.join(path.dirname(projectRoot), 'src/ota/otaPatches.generated.ts')
-  : path.join(projectRoot, 'src/ota/otaPatches.generated.ts');
-
 // ── Load or init registry ───────────────────────────────────────────────────
 let registry = { apps: {} };
 if (fs.existsSync(registryPath)) {
@@ -80,8 +75,9 @@ if (!signingKey) {
   }
 }
 
-// ── Update patches ──────────────────────────────────────────────────────────
-if (newPatches.length > 0) {
+// ── Update entries ──────────────────────────────────────────────────────────
+// One full-bundle entry (no `filename`) + one entry per patch from an earlier OTA version
+{
   // We merge patches by platform to avoid overwriting between Android and iOS
   const otherPlatformPatches = flavorGroup.patches.filter(p => p.platform !== platform);
   
@@ -107,33 +103,36 @@ if (newPatches.length > 0) {
   // path and the full-bundle fallback, so a tampered registry can't swap bundles.
   const bundleSignature = sign(fullBundleName);
 
-  const mappedNewPatches = newPatches.map(p => {
-    const signature = sign(p.file);
-
-    const patchObj = {
-      id: `v${p.from}-to-v${p.to}-${flavor}-${platform}`,
-      label: `V${p.from} → V${p.to} (${flavor} ${platform})`,
-      appVersion,
-      filename: p.file,
-      fromVersion: p.from,
-      toVersion: p.to,
-      platform,
-      baseHash: p.baseHash || '',
-      bundleHash: p.bundleHash || '',
-      fullBundleUrl: fullBundleName,
-      assetManifestUrl: manifestName,
-      flavor: flavor,
-    };
-
-    if (signature) {
-      patchObj.signature = signature;
-      patchObj.bundleSignature = bundleSignature;
-    }
+  const bundleHash = crypto
+    .createHash('sha256')
+    .update(fs.readFileSync(path.join(outputDir, fullBundleName)))
+    .digest('hex');
+
+  const entry = (from, extra) => ({
+    id: `v${from}-to-v${toOtaVersion}-${flavor}-${platform}`,
+    label: `V${from} → V${toOtaVersion} (${flavor} ${platform})`,
+    appVersion,
+    fromVersion: from,
+    toVersion: toOtaVersion,
+    platform,
+    bundleHash,
+    fullBundleUrl: fullBundleName,
+    assetManifestUrl: manifestName,
+    flavor,
+    bundleSignature,
+    ...extra,
+  });
 
-    return patchObj;
+  // fromVersion 1 = the store build, whose clients always take the full bundle
+  const fullEntry = entry(1, {
+    id: `full-to-v${toOtaVersion}-${flavor}-${platform}`,
+    label: `Full V${toOtaVersion} (${flavor} ${platform})`,
   });
+  const patchEntries = newPatches.map(p =>
+    entry(p.from, { filename: p.file, baseHash: p.baseHash, signature: sign(p.file) }),
+  );
 
-  flavorGroup.patches = [...otherPlatformPatches, ...mappedNewPatches];
+  flavorGroup.patches = [...otherPlatformPatches, fullEntry, ...patchEntries];
 }
 
 // ── Write updated registry ───────────────────────────────────────────────────

package/tools/upload_ota.sh

@@ -1,16 +1,13 @@
 #!/bin/bash
 
 # ─────────────────────────────────────────────────────────────────────────────
-# OTA Upload Script — GitHub storage repository
+# OTA Upload Script — Cloudflare R2 (when OTA_R2_BUCKET is set) or a GitHub storage repository
 # Uploads:  1) All .patch & .hbc files  →  {baseFolder}/{appVersion}/{channel}/
 #           2) ota_registry.json         →  {baseFolder}/ota_registry.json
 # ─────────────────────────────────────────────────────────────────────────────
 
-# Load environment variables if .env exists
+# Env (.env.<flavor> + .env.ota) is loaded and exported by build_ota.sh
 ROOT_DIR=$(pwd)
-if [ -f "$ROOT_DIR/.env" ]; then
-    set -a; . "$ROOT_DIR/.env"; set +a
-fi
 
 BASE_URL="${OTA_BASE_URL:-}"
 BASE_FOLDER="${OTA_FOLDER:-${6:-ota}}"
@@ -26,9 +23,6 @@ if [[ "$PLATFORM" == "ios" ]]; then
     OUTPUT_DIR="$ROOT_DIR/ios/output"
 fi
 
-echo ""
-echo "=== OTA Upload | App: $APP_VERSION | Channel: $CHANNEL | V$OTA_VERSION | Platform: $PLATFORM ==="
-echo "  Output dir: $OUTPUT_DIR"
 
 # Validate
 if [[ -z "$APP_VERSION" || -z "$OTA_VERSION" ]]; then
@@ -48,14 +42,68 @@ for ARG in "$@"; do
     fi
 done
 
-# Files of this app version + channel only (bundle_/patch_/asset-manifest_ carry both;
-# base-assets_<platform>_<channel>.json carries just the channel)
+# Files of this app version + channel only (bundle_/patch_/asset-manifest_ carry both)
 is_release_file() {
     local FNAME="$1"
-    if [[ "$FNAME" == "base-assets_"*"_${CHANNEL}.json" ]]; then return 0; fi
     [[ "$FNAME" == *"_${APP_VERSION}_"* ]] && [[ "$FNAME" == *"_${CHANNEL}."* || "$FNAME" == *"_${CHANNEL}_"* ]]
 }
 
+# ── Cloudflare R2 (S3 API, signed by curl --aws-sigv4; no CLI needed) ────────
+if [[ -n "${OTA_R2_BUCKET:-}" ]]; then
+    : "${OTA_R2_ACCOUNT_ID:?set OTA_R2_ACCOUNT_ID}" "${OTA_R2_ACCESS_KEY_ID:?set OTA_R2_ACCESS_KEY_ID}" "${OTA_R2_SECRET_ACCESS_KEY:?set OTA_R2_SECRET_ACCESS_KEY}"
+    R2_URL="https://${OTA_R2_ACCOUNT_ID}.r2.cloudflarestorage.com/${OTA_R2_BUCKET}"
+    r2() { curl -sS --aws-sigv4 "aws:amz:auto:s3" --user "$OTA_R2_ACCESS_KEY_ID:$OTA_R2_SECRET_ACCESS_KEY" "$@"; }
+    r2_put() { # <file> <key> <cache-control> [label]
+        local SIZE PROGRESS=(-s)
+        SIZE=$(wc -c < "$1" | tr -d ' ')
+        # Progress bar for big files (bundles) in a terminal
+        if [ -t 2 ] && [ "$SIZE" -gt 1048576 ]; then echo "      ↑ ${4:-$2}"; PROGRESS=(-#); fi
+        curl -S "${PROGRESS[@]}" -f --aws-sigv4 "aws:amz:auto:s3" --user "$OTA_R2_ACCESS_KEY_ID:$OTA_R2_SECRET_ACCESS_KEY" \
+            -X PUT -T "$1" -H "Cache-Control: $3" "$R2_URL/$2" -o /dev/null || { echo "  ❌ Upload failed: $2"; exit 1; }
+        echo "      ✓ ${4:-$2} ($(human_size "$SIZE"))"
+    }
+    RELEASE_PREFIX="$BASE_FOLDER/$APP_VERSION/$CHANNEL"
+    IMMUTABLE="public, max-age=31536000, immutable"
+
+    echo "      → Cloudflare R2: $OTA_R2_BUCKET/$RELEASE_PREFIX"
+    if [ "$CLEAN_REMOTE" = true ]; then
+        echo "  Deleting $RELEASE_PREFIX/ ..."
+        # ponytail: one ListObjectsV2 page (1000 keys); a release+channel holds far fewer
+        for KEY in $(r2 -f "$R2_URL?list-type=2&prefix=$RELEASE_PREFIX/" | grep -o '<Key>[^<]*</Key>' | sed 's/<[^>]*>//g'); do
+            r2 -f -X DELETE "$R2_URL/$KEY" -o /dev/null && echo "  ✗ $KEY"
+        done
+    else
+        # Only this version's files: earlier bundles/patches are already uploaded and never change
+        RELEASE_FILES=()
+        for FILE in "$OUTPUT_DIR"/*_v"${OTA_VERSION}"_*.{patch,hbc,json}; do
+            [[ -f "$FILE" ]] && is_release_file "$(basename "$FILE")" && RELEASE_FILES+=("$FILE")
+        done
+        N=0
+        for FILE in "${RELEASE_FILES[@]}"; do
+            N=$((N + 1)); FNAME=$(basename "$FILE")
+            r2_put "$FILE" "$RELEASE_PREFIX/$FNAME" "$IMMUTABLE" "($N/${#RELEASE_FILES[@]}) $FNAME"
+        done
+        # Content-addressed assets: upload only hashes the bucket doesn't have yet
+        ASSETS=("$OUTPUT_DIR"/asset-store/*)
+        [[ -f "${ASSETS[0]}" ]] || ASSETS=()
+        N=0; NEW=0; NEW_BYTES=0
+        for FILE in "${ASSETS[@]}"; do
+            N=$((N + 1))
+            KEY="$BASE_FOLDER/assets/$(basename "$FILE")"
+            if ! r2 -f -I "$R2_URL/$KEY" -o /dev/null 2>/dev/null; then
+                r2 -f -X PUT -T "$FILE" -H "Cache-Control: $IMMUTABLE" "$R2_URL/$KEY" -o /dev/null || { echo "  ❌ Upload failed: $KEY"; exit 1; }
+                NEW=$((NEW + 1)); NEW_BYTES=$((NEW_BYTES + $(wc -c < "$FILE")))
+            fi
+            if [ -t 1 ]; then printf "\r      assets %d/%d checked, %d uploaded" "$N" "${#ASSETS[@]}" "$NEW"; fi
+        done
+        if [ -t 1 ] && [ ${#ASSETS[@]} -gt 0 ]; then printf "\r\033[K"; fi
+        echo "      ✓ assets: ${#ASSETS[@]} total, $NEW uploaded ($(human_size "$NEW_BYTES")), $((${#ASSETS[@]} - NEW)) already on R2"
+    fi
+    # Registry last: clients never see a version whose files aren't uploaded yet
+    r2_put "$REGISTRY_FILE" "$BASE_FOLDER/ota_registry.json" "no-cache" "ota_registry.json"
+    exit 0
+fi
+
 # ── GitHub Auto-Push Integration ──────────────────────────────────────────────
 if [[ "$BASE_URL" != "https://raw.githubusercontent.com/"* ]]; then
     echo "ERROR: OTA_BASE_URL must be https://raw.githubusercontent.com/<owner>/<repo>/<branch>"
@@ -108,9 +156,8 @@ fi
 
     # 2. Copy generated files into storage repo (or reset remote)
     if [ "$CLEAN_REMOTE" = true ]; then
-        echo "  Resetting remote storage state for channel '$CHANNEL' (base bundle v1 + base-assets kept)..."
-        find "$GH_REPO_DIR/$BASE_FOLDER/$APP_VERSION/$CHANNEL" -type f \
-            -not -name "bundle_${APP_VERSION}_v1_*" -not -name 'base-assets_*' -delete 2>/dev/null || true
+        echo "  Resetting remote storage state for channel '$CHANNEL' ..."
+        rm -rf "$GH_REPO_DIR/$BASE_FOLDER/$APP_VERSION/${CHANNEL:?}"
         mkdir -p "$GH_REPO_DIR/$BASE_FOLDER"
         cp "$REGISTRY_FILE" "$GH_REPO_DIR/$BASE_FOLDER/ota_registry.json"
         cp "$REGISTRY_FILE" "$GH_REPO_DIR/ota_registry.json" 2>/dev/null || true