@bravemobile/react-native-code-push 12.1.4 → 12.2.0

package/README.md

@@ -10,6 +10,9 @@
 
 Supports React Native 0.74 ~ 0.82.
 
+> [!NOTE]
+> If you are using React Native 0.76 or lower, please use version `12.0.2` of this library.
+
 (Tested on the React Native CLI template apps)
 
 ### ✅ Requirements

package/android/app/proguard-rules.pro

@@ -20,17 +20,14 @@
 -keepclassmembers class com.facebook.react.ReactInstanceManager {
     private final ** mBundleLoader;
 }
--keepclassmembers class com.facebook.react.ReactDelegate {
-    private ** mReactHost; # bridgeless
-    public void reload(...); # RN 0.74 and above
-}
 # bridgeless
 -keepclassmembers class com.facebook.react.defaults.DefaultReactHostDelegate {
     private ** jsBundleLoader;
 }
 # bridgeless
 -keepclassmembers class com.facebook.react.runtime.ReactHostImpl {
-    private final ** mReactHostDelegate;
+    private final ** mReactHostDelegate; # RN < 0.81
+    private final ** reactHostDelegate; # RN 0.81+
 }
 
 # Can't find referenced class org.bouncycastle.**

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java

@@ -12,8 +12,8 @@ import androidx.annotation.OptIn;
 
 import com.facebook.react.ReactDelegate;
 import com.facebook.react.ReactHost;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.JSBundleLoader;
@@ -126,7 +126,9 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
 
             ReactHost reactHost = resolveReactHost();
             if (reactHost == null) {
+                CodePushUtils.log("Unable to resolve ReactHost");
                 // Bridge, Old Architecture
+                setJSBundleLoaderBridge(latestJSBundleLoader);
                 return;
             }
 
@@ -138,11 +140,27 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
         }
     }
 
+    private void setJSBundleLoaderBridge(JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
+        ReactDelegate reactDelegate = resolveReactDelegate();
+        assert reactDelegate != null;
+        ReactInstanceManager instanceManager = reactDelegate.getReactInstanceManager();
+        Field bundleLoaderField = instanceManager.getClass().getDeclaredField("mBundleLoader");
+        bundleLoaderField.setAccessible(true);
+        bundleLoaderField.set(instanceManager, latestJSBundleLoader);
+    }
+
     @OptIn(markerClass = UnstableReactNativeAPI.class)
     private void setJSBundleLoaderBridgeless(ReactHost reactHost, JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
-        Field mReactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
-        mReactHostDelegateField.setAccessible(true);
-        ReactHostDelegate reactHostDelegate = (ReactHostDelegate) mReactHostDelegateField.get(reactHost);
+        Field reactHostDelegateField;
+        try {
+            // RN < 0.81
+            reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
+        } catch (NoSuchFieldException e) {
+            // RN >= 0.81
+            reactHostDelegateField = reactHost.getClass().getDeclaredField("reactHostDelegate");
+        }
+        reactHostDelegateField.setAccessible(true);
+        ReactHostDelegate reactHostDelegate = (ReactHostDelegate) reactHostDelegateField.get(reactHost);
         assert reactHostDelegate != null;
         Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
         jsBundleLoaderField.setAccessible(true);
@@ -216,16 +234,11 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     private ReactHost resolveReactHost() {
         ReactDelegate reactDelegate = resolveReactDelegate();
         if (reactDelegate == null) {
+            CodePushUtils.log("Unable to resolve ReactDelegate");
             return null;
         }
 
-        try {
-            Field reactHostField = reactDelegate.getClass().getDeclaredField("mReactHost");
-            reactHostField.setAccessible(true);
-            return (ReactHost) reactHostField.get(reactDelegate);
-        } catch (Exception e) {
-            return null;
-        }
+        return reactDelegate.getReactHost();
     }
 
     private void restartAppInternal(boolean onlyIfUpdateIsPending) {

package/cli/commands/releaseCommand/index.ts

@@ -19,6 +19,7 @@ type Options = {
     skipBundle: boolean;
     skipCleanup: boolean;
     outputBundleDir: string;
+    hashCalc?: boolean;
 }
 
 program.command('release')
@@ -36,6 +37,7 @@ program.command('release')
     .option('--enable <bool>', 'make the release to be enabled', parseBoolean, true)
     .option('--rollout <number>', 'rollout percentage (0-100)', parseFloat)
     .option('--skip-bundle <bool>', 'skip bundle process', parseBoolean, false)
+    .option('--hash-calc <bool>', 'calculates the bundle file hash used for packageHash in the release history (Requires setting --skip-bundle to true)', parseBoolean)
     .option('--skip-cleanup <bool>', 'skip cleanup process', parseBoolean, false)
     .option('--output-bundle-dir <string>', 'name of directory containing the bundle file created by the "bundle" command', OUTPUT_BUNDLE_DIR)
     .action(async (options: Options) => {
@@ -46,6 +48,11 @@ program.command('release')
             process.exit(1);
         }
 
+        if (options.hashCalc && !options.skipBundle) {
+            console.error('--hash-calc option can be used only when --skip-bundle is set to true.');
+            process.exit(1);
+        }
+
         await release(
             config.bundleUploader,
             config.getReleaseHistory,
@@ -64,6 +71,7 @@ program.command('release')
             options.skipBundle,
             options.skipCleanup,
             `${options.outputPath}/${options.outputBundleDir}`,
+            options.hashCalc,
         )
 
         console.log('🚀 Release completed.')

package/cli/commands/releaseCommand/release.ts

@@ -3,6 +3,8 @@ import path from "path";
 import { bundleCodePush } from "../bundleCommand/bundleCodePush.js";
 import { addToReleaseHistory } from "./addToReleaseHistory.js";
 import type { CliConfigInterface } from "../../../typings/react-native-code-push.d.ts";
+import { generatePackageHashFromDirectory } from "../../utils/hash-utils.js";
+import { unzip } from "../../utils/unzip.js";
 
 export async function release(
     bundleUploader: CliConfigInterface['bundleUploader'],
@@ -22,12 +24,21 @@ export async function release(
     skipBundle: boolean,
     skipCleanup: boolean,
     bundleDirectory: string,
+    hashCalc?: boolean,
 ): Promise<void> {
     const bundleFileName = skipBundle
         ? readBundleFileNameFrom(bundleDirectory)
         : await bundleCodePush(framework, platform, outputPath, entryFile, jsBundleName, bundleDirectory);
     const bundleFilePath = `${bundleDirectory}/${bundleFileName}`;
 
+    const packageHash = await (() => {
+        if (skipBundle && hashCalc) {
+            return calcHashFromBundleFile(bundleFilePath);
+        }
+        // If not using --skip-bundle, the bundleFileName represents package hash already.
+        return bundleFileName;
+    })();
+
     const downloadUrl = await (async () => {
         try {
             const { downloadUrl } = await bundleUploader(bundleFilePath, platform, identifier);
@@ -42,7 +53,7 @@ export async function release(
         appVersion,
         binaryVersion,
         downloadUrl,
-        bundleFileName,
+        packageHash,
         getReleaseHistory,
         setReleaseHistory,
         platform,
@@ -70,3 +81,22 @@ function readBundleFileNameFrom(bundleDirectory: string): string {
     const bundleFilePath = path.join(bundleDirectory, files[0]);
     return path.basename(bundleFilePath);
 }
+
+async function calcHashFromBundleFile(bundleFilePath: string): Promise<string> {
+    const tempDir = path.resolve(path.join(path.dirname(bundleFilePath), 'temp_contents_for_hash_calc'));
+    const zipFilePath = path.resolve(bundleFilePath);
+
+    if (fs.existsSync(tempDir)) {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+    fs.mkdirSync(tempDir, { recursive: true });
+
+    try {
+        await unzip(zipFilePath, tempDir);
+        const hash = await generatePackageHashFromDirectory(tempDir, tempDir);
+        console.log(`log: Calculated package hash from existing bundle file: ${hash}`);
+        return hash;
+    } finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+}

package/cli/dist/commands/releaseCommand/index.js

@@ -17,6 +17,7 @@ program.command('release')
     .option('--enable <bool>', 'make the release to be enabled', parseBoolean, true)
     .option('--rollout <number>', 'rollout percentage (0-100)', parseFloat)
     .option('--skip-bundle <bool>', 'skip bundle process', parseBoolean, false)
+    .option('--hash-calc <bool>', 'calculates the bundle file hash used for packageHash in the release history (Requires setting --skip-bundle to true)', parseBoolean)
     .option('--skip-cleanup <bool>', 'skip cleanup process', parseBoolean, false)
     .option('--output-bundle-dir <string>', 'name of directory containing the bundle file created by the "bundle" command', OUTPUT_BUNDLE_DIR)
     .action(async (options) => {
@@ -25,7 +26,11 @@ program.command('release')
         console.error('Rollout percentage number must be between 0 and 100 (inclusive).');
         process.exit(1);
     }
-    await release(config.bundleUploader, config.getReleaseHistory, config.setReleaseHistory, options.binaryVersion, options.appVersion, options.framework, options.platform, options.identifier, options.outputPath, options.entryFile, options.bundleName, options.mandatory, options.enable, options.rollout, options.skipBundle, options.skipCleanup, `${options.outputPath}/${options.outputBundleDir}`);
+    if (options.hashCalc && !options.skipBundle) {
+        console.error('--hash-calc option can be used only when --skip-bundle is set to true.');
+        process.exit(1);
+    }
+    await release(config.bundleUploader, config.getReleaseHistory, config.setReleaseHistory, options.binaryVersion, options.appVersion, options.framework, options.platform, options.identifier, options.outputPath, options.entryFile, options.bundleName, options.mandatory, options.enable, options.rollout, options.skipBundle, options.skipCleanup, `${options.outputPath}/${options.outputBundleDir}`, options.hashCalc);
     console.log('🚀 Release completed.');
 });
 function parseBoolean(value) {

package/cli/dist/commands/releaseCommand/release.js

@@ -2,11 +2,20 @@ import fs from "fs";
 import path from "path";
 import { bundleCodePush } from "../bundleCommand/bundleCodePush.js";
 import { addToReleaseHistory } from "./addToReleaseHistory.js";
-export async function release(bundleUploader, getReleaseHistory, setReleaseHistory, binaryVersion, appVersion, framework, platform, identifier, outputPath, entryFile, jsBundleName, mandatory, enable, rollout, skipBundle, skipCleanup, bundleDirectory) {
+import { generatePackageHashFromDirectory } from "../../utils/hash-utils.js";
+import { unzip } from "../../utils/unzip.js";
+export async function release(bundleUploader, getReleaseHistory, setReleaseHistory, binaryVersion, appVersion, framework, platform, identifier, outputPath, entryFile, jsBundleName, mandatory, enable, rollout, skipBundle, skipCleanup, bundleDirectory, hashCalc) {
     const bundleFileName = skipBundle
         ? readBundleFileNameFrom(bundleDirectory)
         : await bundleCodePush(framework, platform, outputPath, entryFile, jsBundleName, bundleDirectory);
     const bundleFilePath = `${bundleDirectory}/${bundleFileName}`;
+    const packageHash = await (() => {
+        if (skipBundle && hashCalc) {
+            return calcHashFromBundleFile(bundleFilePath);
+        }
+        // If not using --skip-bundle, the bundleFileName represents package hash already.
+        return bundleFileName;
+    })();
     const downloadUrl = await (async () => {
         try {
             const { downloadUrl } = await bundleUploader(bundleFilePath, platform, identifier);
@@ -17,7 +26,7 @@ export async function release(bundleUploader, getReleaseHistory, setReleaseHisto
             process.exit(1);
         }
     })();
-    await addToReleaseHistory(appVersion, binaryVersion, downloadUrl, bundleFileName, getReleaseHistory, setReleaseHistory, platform, identifier, mandatory, enable, rollout);
+    await addToReleaseHistory(appVersion, binaryVersion, downloadUrl, packageHash, getReleaseHistory, setReleaseHistory, platform, identifier, mandatory, enable, rollout);
     if (!skipCleanup) {
         cleanUpOutputs(outputPath);
     }
@@ -34,3 +43,20 @@ function readBundleFileNameFrom(bundleDirectory) {
     const bundleFilePath = path.join(bundleDirectory, files[0]);
     return path.basename(bundleFilePath);
 }
+async function calcHashFromBundleFile(bundleFilePath) {
+    const tempDir = path.resolve(path.join(path.dirname(bundleFilePath), 'temp_contents_for_hash_calc'));
+    const zipFilePath = path.resolve(bundleFilePath);
+    if (fs.existsSync(tempDir)) {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+    fs.mkdirSync(tempDir, { recursive: true });
+    try {
+        await unzip(zipFilePath, tempDir);
+        const hash = await generatePackageHashFromDirectory(tempDir, tempDir);
+        console.log(`log: Calculated package hash from existing bundle file: ${hash}`);
+        return hash;
+    }
+    finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+}

package/cli/dist/utils/unzip.js

@@ -0,0 +1,41 @@
+import fs from "fs";
+import path from "path";
+import yauzl from "yauzl";
+export function unzip(zipPath, outputDir) {
+    return new Promise((resolve, reject) => {
+        yauzl.open(zipPath, { lazyEntries: true }, (err, zipFile) => {
+            if (err)
+                return reject(err);
+            zipFile.readEntry();
+            zipFile.on("entry", (entry) => {
+                const fullPath = path.join(outputDir, entry.fileName);
+                // Handle directory entry
+                if (/\/$/.test(entry.fileName)) {
+                    fs.mkdir(fullPath, { recursive: true }, (err) => {
+                        if (err)
+                            return reject(err);
+                        zipFile.readEntry();
+                    });
+                    return;
+                }
+                // Handle file entry
+                zipFile.openReadStream(entry, (err, readStream) => {
+                    if (err)
+                        return reject(err);
+                    fs.mkdir(path.dirname(fullPath), { recursive: true }, (err) => {
+                        if (err)
+                            return reject(err);
+                        const writeStream = fs.createWriteStream(fullPath);
+                        readStream.pipe(writeStream);
+                        // Continue to the next entry after writing
+                        writeStream.on("close", () => {
+                            zipFile.readEntry();
+                        });
+                    });
+                });
+            });
+            zipFile.on("end", resolve);
+            zipFile.on("error", reject);
+        });
+    });
+}

package/cli/package.json

@@ -14,7 +14,8 @@
     "commander": "^12.1.0",
     "shelljs": "^0.10.0",
     "xcode": "^3.0.1",
-    "yazl": "^3.3.1"
+    "yazl": "^3.3.1",
+    "yauzl": "^3.2.0"
   },
   "peerDependencies": {
     "ts-node": ">=10"
@@ -28,6 +29,7 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "@types/yazl": "^3.3.0"
+    "@types/yazl": "^3.3.0",
+    "@types/yauzl": "^2.10.3"
   }
 }

package/cli/utils/unzip.ts

@@ -0,0 +1,46 @@
+import fs from "fs";
+import path from "path";
+import yauzl from "yauzl";
+
+export function unzip(zipPath: string, outputDir: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        yauzl.open(zipPath, { lazyEntries: true }, (err, zipFile) => {
+            if (err) return reject(err);
+
+            zipFile.readEntry();
+
+            zipFile.on("entry", (entry) => {
+                const fullPath = path.join(outputDir, entry.fileName);
+
+                // Handle directory entry
+                if (/\/$/.test(entry.fileName)) {
+                    fs.mkdir(fullPath, { recursive: true }, (err) => {
+                        if (err) return reject(err);
+                        zipFile.readEntry();
+                    });
+                    return;
+                }
+
+                // Handle file entry
+                zipFile.openReadStream(entry, (err, readStream) => {
+                    if (err) return reject(err);
+
+                    fs.mkdir(path.dirname(fullPath), { recursive: true }, (err) => {
+                        if (err) return reject(err);
+
+                        const writeStream = fs.createWriteStream(fullPath);
+                        readStream.pipe(writeStream);
+
+                        // Continue to the next entry after writing
+                        writeStream.on("close", () => {
+                            zipFile.readEntry();
+                        });
+                    });
+                });
+            });
+
+          zipFile.on("end", resolve);
+          zipFile.on("error", reject);
+        });
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "12.1.4",
+  "version": "12.2.0",
   "description": "React Native plugin for the CodePush service",
   "main": "src/CodePush.js",
   "react-native": "src/CodePush.js",
@@ -81,7 +81,8 @@
     "semver": "^7.3.5",
     "shelljs": "^0.10.0",
     "xcode": "^3.0.1",
-    "yazl": "^3.3.1"
+    "yazl": "^3.3.1",
+    "yauzl": "^3.2.0"
   },
   "peerDependencies": {
     "expo": ">=50.0.0",
@@ -104,6 +105,7 @@
     "@types/q": "^1.5.4",
     "@types/semver": "^7.5.8",
     "@types/shelljs": "^0.8.15",
+    "@types/yauzl": "^2.10.3",
     "archiver": "latest",
     "babel-jest": "^29.7.0",
     "body-parser": "latest",