Move JInspectorNetworkReporter, add missing SoLoader call (#53055)

Summary:
Pull Request resolved: #53055

Moves the C++ part of `InspectorNetworkReporter.kt` into the `react_devsupportjni` JNI library, and adds missing `SoLoader.loadLibrary` call.

Replaces D79568759 / #53036.

Changelog: [Internal]

Reviewed By: robhogan

Differential Revision: D79638331

fbshipit-source-id: 5df450ad80e4532d6ada1e4dab51a1de6418a4e0

Author: huntie

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/InspectorNetworkReporter.kt

@@ -8,6 +8,7 @@
 package com.facebook.react.modules.network
 
 import com.facebook.proguard.annotations.DoNotStripAny
+import com.facebook.soloader.SoLoader
 
 /**
  * [Experimental] An interface for reporting network events to the modern debugger server and Web
@@ -19,6 +20,10 @@ import com.facebook.proguard.annotations.DoNotStripAny
  */
 @DoNotStripAny
 internal object InspectorNetworkReporter {
+  init {
+    SoLoader.loadLibrary("react_devsupportjni")
+  }
+
   @JvmStatic external fun isDebuggingEnabled(): Boolean
 
   /**

packages/react-native/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt

@@ -19,6 +19,7 @@ target_include_directories(react_devsupportjni PUBLIC .)
 
 target_link_libraries(react_devsupportjni
         fbjni
-        jsinspector)
+        jsinspector
+        jsinspector_network)
 
 target_compile_reactnative_options(react_devsupportjni PRIVATE)

packages/react-native/ReactAndroid/src/main/jni/react/jni/InspectorNetworkReporter.cpp renamed to packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorNetworkReporter.cpp

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "InspectorNetworkReporter.h"
+#include "JInspectorNetworkReporter.h"
 
 #include <jsinspector-modern/network/NetworkReporter.h>
 
@@ -16,9 +16,8 @@
 #endif
 
 using namespace facebook::jni;
-using namespace facebook::react::jsinspector_modern;
 
-namespace facebook::react {
+namespace facebook::react::jsinspector_modern {
 
 namespace {
 
@@ -59,12 +58,12 @@ static std::unordered_map<int, std::string> responseBuffers;
 
 #endif
 
-/* static */ jboolean InspectorNetworkReporter::isDebuggingEnabled(
+/* static */ jboolean JInspectorNetworkReporter::isDebuggingEnabled(
     jni::alias_ref<jclass> /*unused*/) {
   return NetworkReporter::getInstance().isDebuggingEnabled();
 }
 
-/* static */ void InspectorNetworkReporter::reportRequestStart(
+/* static */ void JInspectorNetworkReporter::reportRequestStart(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jni::alias_ref<jstring> requestUrl,
@@ -82,15 +81,15 @@ static std::unordered_map<int, std::string> responseBuffers;
       std::to_string(requestId), requestInfo, encodedDataLength, std::nullopt);
 }
 
-/* static */ void InspectorNetworkReporter::reportConnectionTiming(
+/* static */ void JInspectorNetworkReporter::reportConnectionTiming(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jni::alias_ref<jni::JMap<jstring, jstring>> headers) {
   NetworkReporter::getInstance().reportConnectionTiming(
       std::to_string(requestId), convertJavaMapToHeaders(headers));
 }
 
-/* static */ void InspectorNetworkReporter::reportResponseStart(
+/* static */ void JInspectorNetworkReporter::reportResponseStart(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jni::alias_ref<jstring> requestUrl,
@@ -108,15 +107,15 @@ static std::unordered_map<int, std::string> responseBuffers;
       static_cast<std::int64_t>(encodedDataLength));
 }
 
-/* static */ void InspectorNetworkReporter::reportDataReceivedImpl(
+/* static */ void JInspectorNetworkReporter::reportDataReceivedImpl(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jint dataLength) {
   NetworkReporter::getInstance().reportDataReceived(
       std::to_string(requestId), dataLength, std::nullopt);
 }
 
-/* static */ void InspectorNetworkReporter::reportResponseEnd(
+/* static */ void JInspectorNetworkReporter::reportResponseEnd(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jlong encodedDataLength) {
@@ -134,15 +133,15 @@ static std::unordered_map<int, std::string> responseBuffers;
 #endif
 }
 
-/* static */ void InspectorNetworkReporter::reportRequestFailed(
+/* static */ void JInspectorNetworkReporter::reportRequestFailed(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jboolean cancelled) {
   NetworkReporter::getInstance().reportRequestFailed(
       std::to_string(requestId), cancelled);
 }
 
-/* static */ void InspectorNetworkReporter::maybeStoreResponseBodyImpl(
+/* static */ void JInspectorNetworkReporter::maybeStoreResponseBodyImpl(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jni::alias_ref<jstring> body,
@@ -160,7 +159,7 @@ static std::unordered_map<int, std::string> responseBuffers;
 }
 
 /* static */ void
-InspectorNetworkReporter::maybeStoreResponseBodyIncrementalImpl(
+JInspectorNetworkReporter::maybeStoreResponseBodyIncrementalImpl(
     jni::alias_ref<jclass> /*unused*/,
     jint requestId,
     jni::alias_ref<jstring> data) {
@@ -176,31 +175,33 @@ InspectorNetworkReporter::maybeStoreResponseBodyIncrementalImpl(
 #endif
 }
 
-/* static */ void InspectorNetworkReporter::registerNatives() {
+/* static */ void JInspectorNetworkReporter::registerNatives() {
   javaClassLocal()->registerNatives({
       makeNativeMethod(
-          "isDebuggingEnabled", InspectorNetworkReporter::isDebuggingEnabled),
+          "isDebuggingEnabled", JInspectorNetworkReporter::isDebuggingEnabled),
       makeNativeMethod(
-          "reportRequestStart", InspectorNetworkReporter::reportRequestStart),
+          "reportRequestStart", JInspectorNetworkReporter::reportRequestStart),
       makeNativeMethod(
-          "reportResponseStart", InspectorNetworkReporter::reportResponseStart),
+          "reportResponseStart",
+          JInspectorNetworkReporter::reportResponseStart),
       makeNativeMethod(
           "reportConnectionTiming",
-          InspectorNetworkReporter::reportConnectionTiming),
+          JInspectorNetworkReporter::reportConnectionTiming),
       makeNativeMethod(
           "reportDataReceivedImpl",
-          InspectorNetworkReporter::reportDataReceivedImpl),
+          JInspectorNetworkReporter::reportDataReceivedImpl),
       makeNativeMethod(
-          "reportResponseEnd", InspectorNetworkReporter::reportResponseEnd),
+          "reportResponseEnd", JInspectorNetworkReporter::reportResponseEnd),
       makeNativeMethod(
-          "reportRequestFailed", InspectorNetworkReporter::reportRequestFailed),
+          "reportRequestFailed",
+          JInspectorNetworkReporter::reportRequestFailed),
       makeNativeMethod(
           "maybeStoreResponseBodyImpl",
-          InspectorNetworkReporter::maybeStoreResponseBodyImpl),
+          JInspectorNetworkReporter::maybeStoreResponseBodyImpl),
       makeNativeMethod(
           "maybeStoreResponseBodyIncrementalImpl",
-          InspectorNetworkReporter::maybeStoreResponseBodyIncrementalImpl),
+          JInspectorNetworkReporter::maybeStoreResponseBodyIncrementalImpl),
   });
 }
 
-} // namespace facebook::react
+} // namespace facebook::react::jsinspector_modern

packages/react-native/ReactAndroid/src/main/jni/react/jni/InspectorNetworkReporter.h renamed to packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JInspectorNetworkReporter.h

@@ -9,10 +9,10 @@
 
 #include <fbjni/fbjni.h>
 
-namespace facebook::react {
+namespace facebook::react::jsinspector_modern {
 
-class InspectorNetworkReporter
-    : public jni::HybridClass<InspectorNetworkReporter> {
+class JInspectorNetworkReporter
+    : public jni::HybridClass<JInspectorNetworkReporter> {
  public:
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/modules/network/InspectorNetworkReporter;";
@@ -70,7 +70,7 @@ class InspectorNetworkReporter
   static void registerNatives();
 
  private:
-  InspectorNetworkReporter() = delete;
+  JInspectorNetworkReporter() = delete;
 };
 
-} // namespace facebook::react
+} // namespace facebook::react::jsinspector_modern

packages/react-native/ReactAndroid/src/main/jni/react/devsupport/OnLoad.cpp

@@ -8,6 +8,7 @@
 #include "JCxxInspectorPackagerConnection.h"
 #include "JCxxInspectorPackagerConnectionWebSocketDelegate.h"
 #include "JInspectorFlags.h"
+#include "JInspectorNetworkReporter.h"
 
 #include <fbjni/fbjni.h>
 
@@ -18,5 +19,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
     facebook::react::jsinspector_modern::
         JCxxInspectorPackagerConnectionWebSocketDelegate::registerNatives();
     facebook::react::jsinspector_modern::JInspectorFlags::registerNatives();
+    facebook::react::jsinspector_modern::JInspectorNetworkReporter::
+        registerNatives();
   });
 }

packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt

@@ -53,7 +53,6 @@ add_library(
         OBJECT
           CatalystInstanceImpl.cpp
           InspectorNetworkRequestListener.cpp
-          InspectorNetworkReporter.cpp
           JExecutor.cpp
           JInspector.cpp
           JMessageQueueThread.cpp
@@ -82,10 +81,8 @@ target_link_libraries(reactnativejni
         fbjni
         folly_runtime
         glog_init
-        jsinspector_network
         logger
         react_cxxreact
-        react_featureflags
         react_renderer_runtimescheduler
         reactnativejni_common
         runtimeexecutor

packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp

@@ -12,7 +12,6 @@
 
 #include "CatalystInstanceImpl.h"
 #include "CxxModuleWrapperBase.h"
-#include "InspectorNetworkReporter.h"
 #include "InspectorNetworkRequestListener.h"
 #include "JInspector.h"
 #include "JavaScriptExecutorHolder.h"
@@ -45,7 +44,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     JInspector::registerNatives();
     ReactInstanceManagerInspectorTarget::registerNatives();
     InspectorNetworkRequestListener::registerNatives();
-    InspectorNetworkReporter::registerNatives();
   });
 }