Merge pull request #51 from Soomgo-Mobile/fabric-bridgeless

feat(Native): Support New Architecture (Bridge/Bridgeless)

Author: floydkim

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -50,15 +50,18 @@ public class CodePush implements ReactPackage {
  private static ReactInstanceHolder mReactInstanceHolder;
  private static CodePush mCurrentInstance;
 
- public CodePush(Context context) {
- this(context, false);
- }
-
  public static String getServiceUrl() {
  return mServerUrl;
  }
 
- public CodePush(Context context, boolean isDebugMode) {
+ public static synchronized CodePush getInstance(Context context, boolean isDebugMode) {
+ if (mCurrentInstance == null) {
+ mCurrentInstance = new CodePush(context, isDebugMode);
+ }
+ return mCurrentInstance;
+ }
+
+ private CodePush(Context context, boolean isDebugMode) {
  mContext = context.getApplicationContext();
 
  mUpdateManager = new CodePushUpdateManager(context.getFilesDir().getAbsolutePath());
@@ -88,27 +91,6 @@ public CodePush(Context context, boolean isDebugMode) {
  initializeUpdateAfterRestart();
  }
 
- public CodePush(Context context, boolean isDebugMode, String serverUrl) {
- this(context, isDebugMode);
- mServerUrl = serverUrl;
- }
-
- public CodePush(Context context, boolean isDebugMode, int publicKeyResourceDescriptor) {
- this(context, isDebugMode);
-
- mPublicKey = getPublicKeyByResourceDescriptor(publicKeyResourceDescriptor);
- }
-
- public CodePush(Context context, boolean isDebugMode, String serverUrl, Integer publicKeyResourceDescriptor) {
- this(context, isDebugMode);
-
- if (publicKeyResourceDescriptor != null) {
- mPublicKey = getPublicKeyByResourceDescriptor(publicKeyResourceDescriptor);
- }
-
- mServerUrl = serverUrl;
- }
-
  private String getPublicKeyByResourceDescriptor(int publicKeyResourceDescriptor){
  String publicKey;
  try {

android/app/src/main/java/com/microsoft/codepush/react/CodePushBuilder.java

@@ -5,11 +5,15 @@
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
-import android.provider.Settings;
 import android.view.View;
 
+import androidx.annotation.OptIn;
+
 import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactDelegate;
+import com.facebook.react.ReactHost;
 import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.JSBundleLoader;
@@ -20,20 +24,22 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.annotations.UnstableReactNativeAPI;
 import com.facebook.react.modules.core.ChoreographerCompat;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
+import com.facebook.react.runtime.ReactHostDelegate;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -120,15 +126,38 @@ private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBu
  latestJSBundleLoader = JSBundleLoader.createFileLoader(latestJSBundleFile);
  }
 
- Field bundleLoaderField = instanceManager.getClass().getDeclaredField("mBundleLoader");
- bundleLoaderField.setAccessible(true);
- bundleLoaderField.set(instanceManager, latestJSBundleLoader);
+ ReactHost reactHost = resolveReactHost();
+ if (reactHost == null) {
+ // Bridge, Old Architecture and RN < 0.74 (we support Bridgeless >= 0.74)
+ setJSBundleLoaderBridge(instanceManager, latestJSBundleLoader);
+ return;
+ }
+
+ // Bridgeless (RN >= 0.74)
+ setJSBundleLoaderBridgeless(reactHost, latestJSBundleLoader);
  } catch (Exception e) {
  CodePushUtils.log("Unable to set JSBundle - CodePush may not support this version of React Native");
  throw new IllegalAccessException("Could not setJSBundle");
  }
  }
 
+ private void setJSBundleLoaderBridge(ReactInstanceManager instanceManager, JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
+ 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);
+ assert reactHostDelegate != null;
+ Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+ jsBundleLoaderField.setAccessible(true);
+ jsBundleLoaderField.set(reactHostDelegate, latestJSBundleLoader);
+ }
+
  private void loadBundle() {
  clearLifecycleEventListener();
  try {
@@ -156,12 +185,22 @@ private void loadBundle() {
  @Override
  public void run() {
  try {
- // We don't need to resetReactRootViews anymore 
- // due the issue https://github.com/facebook/react-native/issues/14533
- // has been fixed in RN 0.46.0
- //resetReactRootViews(instanceManager);
+ // reload method introduced in RN 0.74 (https://github.com/reactwg/react-native-new-architecture/discussions/174)
+ // so, we need to check if reload method exists and call it
+ try {
+ ReactDelegate reactDelegate = resolveReactDelegate();
+ if (reactDelegate == null) {
+ throw new NoSuchMethodException("ReactDelegate doesn't have reload method in RN < 0.74");
+ }
+
+ resetReactRootViews(reactDelegate);
 
- instanceManager.recreateReactContextInBackground();
+ Method reloadMethod = reactDelegate.getClass().getMethod("reload");
+ reloadMethod.invoke(reactDelegate);
+ } catch (NoSuchMethodException e) {
+ // RN < 0.74 calls ReactInstanceManager.recreateReactContextInBackground() directly
+ instanceManager.recreateReactContextInBackground();
+ }
  mCodePush.initializeUpdateAfterRestart();
  } catch (Exception e) {
  // The recreation method threw an unknown exception
@@ -179,18 +218,19 @@ public void run() {
  }
  }
 
- // This workaround has been implemented in order to fix https://github.com/facebook/react-native/issues/14533
- // resetReactRootViews allows to call recreateReactContextInBackground without any exceptions
- // This fix also relates to https://github.com/microsoft/react-native-code-push/issues/878
- private void resetReactRootViews(ReactInstanceManager instanceManager) throws NoSuchFieldException, IllegalAccessException {
- Field mAttachedRootViewsField = instanceManager.getClass().getDeclaredField("mAttachedRootViews");
- mAttachedRootViewsField.setAccessible(true);
- List<ReactRootView> mAttachedRootViews = (List<ReactRootView>)mAttachedRootViewsField.get(instanceManager);
- for (ReactRootView reactRootView : mAttachedRootViews) {
- reactRootView.removeAllViews();
- reactRootView.setId(View.NO_ID);
+ // Fix freezing that occurs when reloading the app (RN >= 0.77.1 Old Architecture)
+ // - "Trying to add a root view with an explicit id (11) already set.
+ // React Native uses the id field to track react tags and will overwrite this field.
+ // If that is fine, explicitly overwrite the id field to View.NO_ID before calling addRootView."
+ private void resetReactRootViews(ReactDelegate reactDelegate) {
+ ReactActivity currentActivity = (ReactActivity) getCurrentActivity();
+ if (currentActivity != null) {
+ ReactRootView reactRootView = reactDelegate.getReactRootView();
+ if (reactRootView != null) {
+ reactRootView.removeAllViews();
+ reactRootView.setId(View.NO_ID);
+ }
  }
- mAttachedRootViewsField.set(instanceManager, mAttachedRootViews);
  }
 
  private void clearLifecycleEventListener() {
@@ -201,6 +241,36 @@ private void clearLifecycleEventListener() {
  }
  }
 
+ private ReactDelegate resolveReactDelegate() {
+ ReactActivity currentActivity = (ReactActivity) getCurrentActivity();
+ if (currentActivity == null) {
+ return null;
+ }
+
+ try {
+ Method getReactDelegateMethod = currentActivity.getClass().getMethod("getReactDelegate");
+ return (ReactDelegate) getReactDelegateMethod.invoke(currentActivity);
+ } catch (Exception e) {
+ // RN < 0.74 doesn't have getReactDelegate method
+ return null;
+ }
+ }
+
+ private ReactHost resolveReactHost() {
+ ReactDelegate reactDelegate = resolveReactDelegate();
+ if (reactDelegate == null) {
+ return null;
+ }
+
+ try {
+ Field reactHostField = reactDelegate.getClass().getDeclaredField("mReactHost");
+ reactHostField.setAccessible(true);
+ return (ReactHost) reactHostField.get(reactDelegate);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
  // Use reflection to find the ReactInstanceManager. See #556 for a proposal for a less brittle way to approach this.
  private ReactInstanceManager resolveInstanceManager() throws NoSuchFieldException, IllegalAccessException {
  ReactInstanceManager instanceManager = CodePush.getReactInstanceManager();
@@ -492,7 +562,7 @@ protected Void doInBackground(Void... params) {
  return null;
  }
  }
- 
+
  promise.resolve("");
  } catch(CodePushUnknownException e) {
  CodePushUtils.log(e);

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

@@ -5,6 +5,7 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUtils.h>
+#import <React/RCTReloadCommand.h>
 #else // back compatibility for RN version < 0.40
 #import "RCTAssert.h"
 #import "RCTBridgeModule.h"
@@ -540,7 +541,7 @@ - (void)loadBundle
  [super.bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
  }
 
- [super.bridge reload];
+ RCTTriggerReloadCommandListeners(@"CodePush reload");
  });
 }
 

ios/CodePush/CodePush.m

@@ -4,7 +4,7 @@ module.exports = {
  android: {
  packageImportPath: "import com.microsoft.codepush.react.CodePush;",
  packageInstance:
- "new CodePush(getApplicationContext(), BuildConfig.DEBUG)",
+ "CodePush.getInstance(getApplicationContext(), BuildConfig.DEBUG)",
  sourceDir: './android/app'
  }
  }