@turbopush/react-native-code-push 10.2.6 → 10.3.0-rc.1

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

@@ -150,12 +150,20 @@ public class CodePushNativeModule extends BaseJavaModule {
                 latestJSBundleLoader = JSBundleLoader.createFileLoader(latestJSBundleFile);
             }
 
-            Field bundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+            // ExpoReactHostDelegate (Kotlin) exposes jsBundleLoader as a computed property whose
+            // backing field is named "_jsBundleLoader". Setting it makes the getter return the new
+            // loader on the next reload. Fall back to the non-prefixed name for other delegates.
+            Field bundleLoaderField;
+            try {
+                bundleLoaderField = reactHostDelegate.getClass().getDeclaredField("_jsBundleLoader");
+            } catch (NoSuchFieldException ignored) {
+                bundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+            }
             bundleLoaderField.setAccessible(true);
             bundleLoaderField.set(reactHostDelegate, latestJSBundleLoader);
 
         } catch (NoSuchFieldException nsfe) {
-            CodePushUtils.log("Field 'jsBundleLoader' NOT FOUND on " + (reactHostDelegate != null ? reactHostDelegate.getClass().getName() : "null") + ". This is an EXPECTED and IGNORED failure with ExpoReactHostDelegate. Will rely on reactHost.reload(). Original log: Unable to set JSBundle of ReactHostDelegate - CodePush may not support this version of React Native");
+            CodePushUtils.log("Neither '_jsBundleLoader' nor 'jsBundleLoader' field found on " + (reactHostDelegate != null ? reactHostDelegate.getClass().getName() : "null") + ". Unable to update JS bundle for reload.");
             // DO NOT THROW for NoSuchFieldException.
         }catch (Exception e) {
             CodePushUtils.log("Unable to set JSBundle of ReactHostDelegate - CodePush may not support this version of React Native");
@@ -197,31 +205,26 @@ public class CodePushNativeModule extends BaseJavaModule {
 
      
                 try {
-                    if (reactHost instanceof ReactHostImpl) { 
-                        ReactHostDelegate delegate = getReactHostDelegate((ReactHostImpl) reactHost); 
+                    if (reactHost instanceof ReactHostImpl) {
+                        ReactHostDelegate delegate = getReactHostDelegate((ReactHostImpl) reactHost);
                         if (delegate != null) {
-                            // #2) Update the locally stored JS bundle file path
-                            setJSBundle(delegate, latestJSBundleFile); 
+                            // #2) Update the bundle loader on the delegate so the next reload uses it
+                            setJSBundle(delegate, latestJSBundleFile);
                         } else {
                             CodePushUtils.log("Could not get ReactHostDelegate from ReactHostImpl.");
                         }
                     } else {
-                        CodePushUtils.log("ReactHost is not a direct ReactHostImpl instance (" + reactHost.getClass().getName() + "), skipping direct setJSBundle reflection attempt. This is expected with Expo.");
+                        CodePushUtils.log("ReactHost is not ReactHostImpl (" + reactHost.getClass().getName() + ")");
                     }
-                } catch (ClassCastException cce) {
-                    CodePushUtils.log(new Exception("ClassCastException trying to get/use ReactHostDelegate. Skipping reflection call to setJSBundle. This is expected for Expo.", cce));
-                }catch (Exception e) {
-                    // Catch any unexpected errors from the attempt to call setJSBundle, e.g., if getReactHostDelegate itself fails
-                    CodePushUtils.log("Exception during the reflective setJSBundle block: " + e.getMessage());
+                } catch (Exception e) {
+                    CodePushUtils.log("Exception during setJSBundle: " + e.getMessage());
                 }
 
-                // #3) Get the context creation method
+                // #3) Trigger reload and initialize update state
                 try {
                     reactHost.reload("CodePush triggers reload");
                     mCodePush.initializeUpdateAfterRestart();
                 } catch (Exception e) {
-                    // The recreation method threw an unknown exception
-                    // so just simply fallback to restarting the Activity (if it exists)
                     loadBundleLegacy();
                 }
 
@@ -856,14 +859,23 @@ public class CodePushNativeModule extends BaseJavaModule {
     }
 
     public ReactHostDelegate getReactHostDelegate(ReactHostImpl reactHostImpl) {
+        // RN 0.76+ (used in Expo SDK 55+) names the field "reactHostDelegate" (Kotlin constructor
+        // property, no "m" prefix). Older versions used "mReactHostDelegate".
+        String[] candidateFields = {"reactHostDelegate", "mReactHostDelegate"};
         try {
             Class<?> clazz = reactHostImpl.getClass();
-            Field field = clazz.getDeclaredField("mReactHostDelegate");
-            field.setAccessible(true);
-
-            // Get the value of the field for the provided instance
-            return (ReactHostDelegate) field.get(reactHostImpl);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
+            for (String fieldName : candidateFields) {
+                try {
+                    Field field = clazz.getDeclaredField(fieldName);
+                    field.setAccessible(true);
+                    return (ReactHostDelegate) field.get(reactHostImpl);
+                } catch (NoSuchFieldException ignored) {
+                    // try next candidate
+                }
+            }
+            CodePushUtils.log("Could not find reactHostDelegate field on " + clazz.getName());
+            return null;
+        } catch (IllegalAccessException e) {
             e.printStackTrace();
             return null;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turbopush/react-native-code-push",
-  "version": "10.2.6",
+  "version": "10.3.0-rc.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",

package/request-fetch-adapter.js

@@ -1,7 +1,21 @@
 const packageJson = require("./package.json");
+const { Platform } = require("react-native");
+
+const { major, minor, patch } = Platform.constants.reactNativeVersion;
+const rnVersion = `${major}.${minor}.${patch}`;
+
+let expoVersion;
+try {
+  expoVersion = require("expo/package.json").version;
+} catch (_) { }
+
+let turbopushExpoPluginVersion;
+try {
+  turbopushExpoPluginVersion = require("@turbopush/turbopush-expo-plugin/package.json").version;
+} catch (_) { }
 
 module.exports = {
-  async request(verb, url, requestBody, callback) {
+  request(verb, url, requestBody, callback) {
     if (typeof requestBody === "function") {
       callback = requestBody;
       requestBody = null;
@@ -12,26 +26,32 @@ module.exports = {
       "Content-Type": "application/json",
       "X-CodePush-Plugin-Name": packageJson.name,
       "X-CodePush-Plugin-Version": packageJson.version,
-      "X-CodePush-SDK-Version": packageJson.dependencies["code-push"]
+      "X-CodePush-SDK-Version": packageJson.dependencies["code-push"],
+      "X-React-Native-Version": rnVersion,
+      ...(expoVersion && { "X-Expo-Version": expoVersion }),
+      ...(turbopushExpoPluginVersion && { "X-Turbopush-Expo-Plugin-Version": turbopushExpoPluginVersion }),
     };
 
     if (requestBody && typeof requestBody === "object") {
       requestBody = JSON.stringify(requestBody);
     }
 
-    try {
-      const response = await fetch(url, {
-        method: getHttpMethodName(verb),
-        headers: headers,
-        body: requestBody
-      });
-
-      const statusCode = response.status;
-      const body = await response.text();
-      callback(null, { statusCode, body });
-    } catch (err) {
-      callback(err);
-    }
+    const xhr = new XMLHttpRequest();
+    xhr.open(getHttpMethodName(verb), url, true);
+
+    Object.entries(headers).forEach(([key, value]) => {
+      xhr.setRequestHeader(key, value);
+    });
+
+    xhr.onload = () => {
+      callback(null, { statusCode: xhr.status, body: xhr.responseText });
+    };
+
+    xhr.onerror = () => {
+      callback(new Error(`Network request failed for url ${url}`));
+    };
+
+    xhr.send(requestBody || null);
   }
 };