react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java

@@ -12,39 +12,10 @@ import androidx.annotation.Nullable;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.packagerconnection.RequestHandler;
-import java.lang.reflect.Constructor;
 import java.util.Map;
 
-/**
- * A simple factory that creates instances of {@link DevSupportManager} implementations. Uses
- * reflection to create DevSupportManagerImpl if it exists. This allows ProGuard to strip that class
- * and its dependencies in release builds. If the class isn't found, {@link
- * DisabledDevSupportManager} is returned instead.
- */
-public class DevSupportManagerFactory {
-
-  private static final String DEVSUPPORT_IMPL_PACKAGE = "com.facebook.react.devsupport";
-  private static final String DEVSUPPORT_IMPL_CLASS = "DevSupportManagerImpl";
-
-  public static DevSupportManager create(
-      Context applicationContext,
-      ReactInstanceDevHelper reactInstanceDevHelper,
-      @Nullable String packagerPathForJSBundleName,
-      boolean enableOnCreate,
-      int minNumShakes) {
-
-    return create(
-        applicationContext,
-        reactInstanceDevHelper,
-        packagerPathForJSBundleName,
-        enableOnCreate,
-        null,
-        null,
-        minNumShakes,
-        null);
-  }
-
-  public static DevSupportManager create(
+public interface DevSupportManagerFactory {
+  DevSupportManager create(
       Context applicationContext,
       ReactInstanceDevHelper reactInstanceManagerHelper,
       @Nullable String packagerPathForJSBundleName,
@@ -52,45 +23,5 @@ public class DevSupportManagerFactory {
       @Nullable RedBoxHandler redBoxHandler,
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
-      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers) {
-    if (!enableOnCreate) {
-      return new DisabledDevSupportManager();
-    }
-    try {
-      // ProGuard is surprisingly smart in this case and will keep a class if it detects a call to
-      // Class.forName() with a static string. So instead we generate a quasi-dynamic string to
-      // confuse it.
-      String className =
-          new StringBuilder(DEVSUPPORT_IMPL_PACKAGE)
-              .append(".")
-              .append(DEVSUPPORT_IMPL_CLASS)
-              .toString();
-      Class<?> devSupportManagerClass = Class.forName(className);
-      Constructor constructor =
-          devSupportManagerClass.getConstructor(
-              Context.class,
-              ReactInstanceDevHelper.class,
-              String.class,
-              boolean.class,
-              RedBoxHandler.class,
-              DevBundleDownloadListener.class,
-              int.class,
-              Map.class);
-      return (DevSupportManager)
-          constructor.newInstance(
-              applicationContext,
-              reactInstanceManagerHelper,
-              packagerPathForJSBundleName,
-              true,
-              redBoxHandler,
-              devBundleDownloadListener,
-              minNumShakes,
-              customPackagerCommandHandlers);
-    } catch (Exception e) {
-      throw new RuntimeException(
-          "Requested enabled DevSupportManager, but DevSupportManagerImpl class was not found"
-              + " or could not be created",
-          e);
-    }
-  }
+      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers);
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.devsupport;
+
+import com.facebook.common.logging.FLog;
+import com.facebook.react.common.ReactConstants;
+import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+/** Use this class to check if the JavaScript packager is running on the provided host. */
+public class PackagerStatusCheck {
+
+  private static final String PACKAGER_OK_STATUS = "packager-status:running";
+  private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;
+  private static final String PACKAGER_STATUS_URL_TEMPLATE = "http://%s/status";
+
+  private final OkHttpClient mClient;
+
+  public PackagerStatusCheck() {
+    mClient =
+        new OkHttpClient.Builder()
+            .connectTimeout(HTTP_CONNECT_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+            .readTimeout(0, TimeUnit.MILLISECONDS)
+            .writeTimeout(0, TimeUnit.MILLISECONDS)
+            .build();
+  }
+
+  public PackagerStatusCheck(OkHttpClient client) {
+    mClient = client;
+  }
+
+  public void run(String host, final PackagerStatusCallback callback) {
+    String statusURL = createPackagerStatusURL(host);
+    Request request = new Request.Builder().url(statusURL).build();
+
+    mClient
+        .newCall(request)
+        .enqueue(
+            new Callback() {
+              @Override
+              public void onFailure(Call call, IOException e) {
+                FLog.w(
+                    ReactConstants.TAG,
+                    "The packager does not seem to be running as we got an IOException requesting "
+                        + "its status: "
+                        + e.getMessage());
+                callback.onPackagerStatusFetched(false);
+              }
+
+              @Override
+              public void onResponse(Call call, Response response) throws IOException {
+                if (!response.isSuccessful()) {
+                  FLog.e(
+                      ReactConstants.TAG,
+                      "Got non-success http code from packager when requesting status: "
+                          + response.code());
+                  callback.onPackagerStatusFetched(false);
+                  return;
+                }
+                ResponseBody body = response.body();
+                if (body == null) {
+                  FLog.e(
+                      ReactConstants.TAG,
+                      "Got null body response from packager when requesting status");
+                  callback.onPackagerStatusFetched(false);
+                  return;
+                }
+                String bodyString =
+                    body.string(); // cannot call body.string() twice, stored it into variable.
+                // https://github.com/square/okhttp/issues/1240#issuecomment-68142603
+                if (!PACKAGER_OK_STATUS.equals(bodyString)) {
+                  FLog.e(
+                      ReactConstants.TAG,
+                      "Got unexpected response from packager when requesting status: "
+                          + bodyString);
+                  callback.onPackagerStatusFetched(false);
+                  return;
+                }
+                callback.onPackagerStatusFetched(true);
+              }
+            });
+  }
+
+  private static String createPackagerStatusURL(String host) {
+    return String.format(Locale.US, PACKAGER_STATUS_URL_TEMPLATE, host);
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java

@@ -14,7 +14,7 @@ import com.facebook.react.devsupport.interfaces.ErrorType;
 import com.facebook.react.devsupport.interfaces.StackFrame;
 
 /**
- * Interface used by {@link DevSupportManagerImpl} to allow interception on any redboxes during
+ * Interface used by {@link BridgeDevSupportManager} to allow interception on any redboxes during
  * development and handling the information from the redbox. The implementation should be passed by
  * setRedBoxHandler in ReactInstanceManager.
  */

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java

@@ -17,7 +17,7 @@ import java.io.File;
 
 /**
  * Interface for accessing and interacting with development features. In dev mode, use the
- * implementation {@link DevSupportManagerImpl}. In production mode, use the dummy implementation
+ * implementation {@link BridgeDevSupportManager}. In production mode, use the dummy implementation
  * {@link DisabledDevSupportManager}.
  */
 public interface DevSupportManager extends NativeModuleCallExceptionHandler {

package/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java

@@ -9,12 +9,16 @@ package com.facebook.react.fabric;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
+import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.RuntimeExecutor;
+import com.facebook.react.bridge.RuntimeScheduler;
 import com.facebook.react.bridge.queue.MessageQueueThread;
 import com.facebook.react.fabric.events.EventBeatManager;
+import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.uimanager.PixelUtil;
 
 @DoNotStrip
@@ -35,6 +39,7 @@ public class Binding {
 
   private native void installFabricUIManager(
       RuntimeExecutor runtimeExecutor,
+      RuntimeScheduler runtimeScheduler,
       Object uiManager,
       EventBeatManager eventBeatManager,
       MessageQueueThread jsMessageQueueThread,
@@ -76,8 +81,12 @@ public class Binding {
 
   public native void driveCxxAnimations();
 
+  public native ReadableNativeMap getInspectorDataForInstance(
+      EventEmitterWrapper eventEmitterWrapper);
+
   public void register(
       @NonNull RuntimeExecutor runtimeExecutor,
+      @Nullable RuntimeScheduler runtimeScheduler,
       @NonNull FabricUIManager fabricUIManager,
       @NonNull EventBeatManager eventBeatManager,
       @NonNull MessageQueueThread jsMessageQueueThread,
@@ -86,6 +95,7 @@ public class Binding {
     fabricUIManager.setBinding(this);
     installFabricUIManager(
         runtimeExecutor,
+        runtimeScheduler,
         fabricUIManager,
         eventBeatManager,
         jsMessageQueueThread,

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java

@@ -14,15 +14,15 @@ import java.util.Map;
 /**
  * Utility class for Fabric components, this will be removed
  *
- * <p>//TODO T31905686: remove this class when the component names are unified between JS - Android
- * - iOS - C++
+ * <p>TODO T97384889: remove this class when the component names are unified between JS - Android -
+ * iOS - C++
  */
 public class FabricComponents {
 
   private static @NonNull final Map<String, String> sComponentNames = new HashMap<>();
 
   static {
-    // TODO T31905686: unify component names between JS - Android - iOS - C++
+    // TODO T97384889: unify component names between JS - Android - iOS - C++
     sComponentNames.put("View", "RCTView");
     sComponentNames.put("Image", "RCTImageView");
     sComponentNames.put("ScrollView", "RCTScrollView");
@@ -40,6 +40,7 @@ public class FabricComponents {
     sComponentNames.put("Map", "RCTMap");
     sComponentNames.put("WebView", "RCTWebView");
     sComponentNames.put("Keyframes", "RCTKeyframes");
+    sComponentNames.put("ImpressionTrackingView", "RCTImpressionTrackingView");
   }
 
   /** @return the name of component in the Fabric environment */

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java

@@ -7,34 +7,15 @@
 
 package com.facebook.react.fabric;
 
-import static com.facebook.react.config.ReactFeatureFlags.enableExperimentalStaticViewConfigs;
-
 import androidx.annotation.NonNull;
-import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.queue.MessageQueueThread;
+import com.facebook.react.common.mapbuffer.ReadableMapBufferSoLoader;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventBeatManager;
-import com.facebook.react.fabric.events.EventEmitterWrapper;
-import com.facebook.react.fabric.events.FabricEventEmitter;
-import com.facebook.react.fabric.mounting.LayoutMetricsConversions;
-import com.facebook.react.fabric.mounting.MountItemDispatcher;
-import com.facebook.react.fabric.mounting.MountingManager;
-import com.facebook.react.fabric.mounting.SurfaceMountingManager;
-import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem;
-import com.facebook.react.fabric.mounting.mountitems.DispatchIntCommandMountItem;
-import com.facebook.react.fabric.mounting.mountitems.DispatchStringCommandMountItem;
-import com.facebook.react.fabric.mounting.mountitems.IntBufferBatchMountItem;
-import com.facebook.react.fabric.mounting.mountitems.MountItem;
-import com.facebook.react.fabric.mounting.mountitems.PreAllocateViewMountItem;
-import com.facebook.react.fabric.mounting.mountitems.SendAccessibilityEvent;
-import com.facebook.react.uimanager.StateWrapper;
-import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManagerRegistry;
-import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
-import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
 
 public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
@@ -63,9 +44,8 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.registerBinding");
     final Binding binding = new Binding();
-    // TODO T31905686: remove this call
-    if (ReactFeatureFlags.eagerInitializeFabricClasses) {
-      loadClasses();
+    if (ReactFeatureFlags.enableEagerInitializeMapBufferSoFile) {
+      ReadableMapBufferSoLoader.staticInit();
     }
     MessageQueueThread jsMessageQueueThread =
         mReactApplicationContext
@@ -75,6 +55,7 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
 
     binding.register(
         mReactApplicationContext.getCatalystInstance().getRuntimeExecutor(),
+        mReactApplicationContext.getCatalystInstance().getRuntimeScheduler(),
         uiManager,
         eventBeatManager,
         jsMessageQueueThread,
@@ -92,51 +73,9 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.createUIManager");
 
     FabricUIManager fabricUIManager;
-    if (enableExperimentalStaticViewConfigs) {
-      fabricUIManager =
-          new FabricUIManager(mReactApplicationContext, mViewManagerRegistry, eventBeatManager);
-    } else {
-      // TODO T83943316: Remove this code once StaticViewConfigs are enabled by default
-      UIManagerModule nativeModule =
-          Assertions.assertNotNull(mReactApplicationContext.getNativeModule(UIManagerModule.class));
-      EventDispatcher eventDispatcher = nativeModule.getEventDispatcher();
-      fabricUIManager =
-          new FabricUIManager(
-              mReactApplicationContext, mViewManagerRegistry, eventDispatcher, eventBeatManager);
-    }
+    fabricUIManager =
+        new FabricUIManager(mReactApplicationContext, mViewManagerRegistry, eventBeatManager);
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     return fabricUIManager;
   }
-
-  // TODO T31905686: eager load Fabric classes, this is temporary and it will be removed
-  // in the near future
-  private static void loadClasses() {
-    EventBeatManager.class.getClass();
-    EventEmitterWrapper.class.getClass();
-    FabricEventEmitter.class.getClass();
-    DispatchCommandMountItem.class.getClass();
-    DispatchIntCommandMountItem.class.getClass();
-    DispatchStringCommandMountItem.class.getClass();
-    IntBufferBatchMountItem.class.getClass();
-    MountItem.class.getClass();
-    PreAllocateViewMountItem.class.getClass();
-    SendAccessibilityEvent.class.getClass();
-    LayoutMetricsConversions.class.getClass();
-    MountingManager.class.getClass();
-    MountItemDispatcher.class.getClass();
-    SurfaceMountingManager.class.getClass();
-    Binding.class.getClass();
-    ComponentFactory.class.getClass();
-    CoreComponentsRegistry.class.getClass();
-    FabricComponents.class.getClass();
-    FabricSoLoader.class.getClass();
-    FabricUIManager.class.getClass();
-    GuardedFrameCallback.class.getClass();
-    StateWrapper.class.getClass();
-    StateWrapperImpl.class.getClass();
-    SurfaceHandler.class.getClass();
-    SurfaceHandlerBinding.class.getClass();
-    BatchEventDispatchedListener.class.getClass();
-    ReactNativeConfig.class.getClass();
-  }
 }