mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Remove unnecessary ReactInstanceManagerInspectorTarget files (#54663)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54663 This file is from the legacy architecture and no longer needed as it's party of legacy DevX stack. Can safely be removed and cleaned up then. Changelog: [Internal] [Changed] - Reviewed By: cipolleschi Differential Revision: D87798709 fbshipit-source-id: 4332df01e04cad1d481cebd2f785e988e9ca96f9
This commit is contained in:
1 parent
27d00b738f
commit
8beb46dfdb
10 files changed
+9
-458
No files matched your search
@@ -648,7 +648,6 @@ public class com/facebook/react/bridge/CatalystInstanceImpl : com/facebook/react
|
||||
public class com/facebook/react/bridge/CatalystInstanceImpl$Builder {
|
||||
public fun <init> ()V
|
||||
public fun build ()Lcom/facebook/react/bridge/CatalystInstanceImpl;
|
||||
public fun setInspectorTarget (Lcom/facebook/react/bridge/ReactInstanceManagerInspectorTarget;)Lcom/facebook/react/bridge/CatalystInstanceImpl$Builder;
|
||||
public fun setJSBundleLoader (Lcom/facebook/react/bridge/JSBundleLoader;)Lcom/facebook/react/bridge/CatalystInstanceImpl$Builder;
|
||||
public fun setJSExceptionHandler (Lcom/facebook/react/bridge/JSExceptionHandler;)Lcom/facebook/react/bridge/CatalystInstanceImpl$Builder;
|
||||
public fun setJSExecutor (Lcom/facebook/react/bridge/JavaScriptExecutor;)Lcom/facebook/react/bridge/CatalystInstanceImpl$Builder;
|
||||
|
||||
+1
-88
@@ -60,7 +60,6 @@ import com.facebook.react.bridge.NativeModuleRegistry;
|
||||
import com.facebook.react.bridge.ReactApplicationContext;
|
||||
import com.facebook.react.bridge.ReactContext;
|
||||
import com.facebook.react.bridge.ReactCxxErrorHandler;
|
||||
import com.facebook.react.bridge.ReactInstanceManagerInspectorTarget;
|
||||
import com.facebook.react.bridge.ReactMarker;
|
||||
import com.facebook.react.bridge.ReactMarkerConstants;
|
||||
import com.facebook.react.bridge.ReactNoCrashSoftException;
|
||||
@@ -78,14 +77,10 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
|
||||
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
|
||||
import com.facebook.react.common.build.ReactBuildConfig;
|
||||
import com.facebook.react.devsupport.DevSupportManagerFactory;
|
||||
import com.facebook.react.devsupport.InspectorFlags;
|
||||
import com.facebook.react.devsupport.ReactInstanceDevHelper;
|
||||
import com.facebook.react.devsupport.inspector.InspectorNetworkHelper;
|
||||
import com.facebook.react.devsupport.inspector.InspectorNetworkRequestListener;
|
||||
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
|
||||
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
|
||||
import com.facebook.react.devsupport.interfaces.DevSupportManager;
|
||||
import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebuggerOverlayCommandListener;
|
||||
import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
|
||||
import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
|
||||
import com.facebook.react.devsupport.interfaces.RedBoxHandler;
|
||||
@@ -101,7 +96,6 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
|
||||
import com.facebook.react.modules.core.DeviceEventManagerModule;
|
||||
import com.facebook.react.modules.core.ReactChoreographer;
|
||||
import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
|
||||
import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
|
||||
import com.facebook.react.packagerconnection.RequestHandler;
|
||||
import com.facebook.react.uimanager.DisplayMetricsHolder;
|
||||
import com.facebook.react.uimanager.ReactRoot;
|
||||
@@ -113,7 +107,6 @@ import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
|
||||
import com.facebook.soloader.SoLoader;
|
||||
import com.facebook.systrace.Systrace;
|
||||
import com.facebook.systrace.SystraceMessage;
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -187,7 +180,6 @@ public class ReactInstanceManager {
|
||||
private final Context mApplicationContext;
|
||||
private @Nullable @ThreadConfined(UI) DefaultHardwareBackBtnHandler mDefaultBackButtonImpl;
|
||||
private @Nullable Activity mCurrentActivity;
|
||||
private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
|
||||
private final Collection<com.facebook.react.ReactInstanceEventListener>
|
||||
mReactInstanceEventListeners =
|
||||
Collections.synchronizedList(
|
||||
@@ -826,15 +818,6 @@ public class ReactInstanceManager {
|
||||
}
|
||||
}
|
||||
|
||||
// If the host has been invalidated, now that the current context/instance
|
||||
// has been destroyed, we can safely destroy the host's inspector target.
|
||||
if (mInstanceManagerInvalidated) {
|
||||
if (mInspectorTarget != null) {
|
||||
mInspectorTarget.close();
|
||||
mInspectorTarget = null;
|
||||
}
|
||||
}
|
||||
|
||||
mHasStartedCreatingInitialContext = false;
|
||||
if (!mKeepActivity) {
|
||||
mCurrentActivity = null;
|
||||
@@ -1458,8 +1441,7 @@ public class ReactInstanceManager {
|
||||
.setJSExecutor(jsExecutor)
|
||||
.setRegistry(nativeModuleRegistry)
|
||||
.setJSBundleLoader(jsBundleLoader)
|
||||
.setJSExceptionHandler(exceptionHandler)
|
||||
.setInspectorTarget(getOrCreateInspectorTarget());
|
||||
.setJSExceptionHandler(exceptionHandler);
|
||||
|
||||
ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START);
|
||||
// CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp
|
||||
@@ -1565,73 +1547,4 @@ public class ReactInstanceManager {
|
||||
nativeModuleRegistryBuilder.processPackage(reactPackage);
|
||||
SystraceMessage.endSection(TRACE_TAG_REACT).flush();
|
||||
}
|
||||
|
||||
private static class InspectorTargetDelegateImpl
|
||||
implements ReactInstanceManagerInspectorTarget.TargetDelegate {
|
||||
// This weak reference breaks the cycle between the C++ HostTarget and the
|
||||
// Java ReactInstanceManager, preventing memory leaks in apps that create
|
||||
// multiple ReactInstanceManagers over time.
|
||||
private WeakReference<ReactInstanceManager> mReactInstanceManagerWeak;
|
||||
|
||||
public InspectorTargetDelegateImpl(ReactInstanceManager inspectorTarget) {
|
||||
mReactInstanceManagerWeak = new WeakReference<ReactInstanceManager>(inspectorTarget);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, String> getMetadata() {
|
||||
ReactInstanceManager reactInstanceManager = mReactInstanceManagerWeak.get();
|
||||
|
||||
return AndroidInfoHelpers.getInspectorHostMetadata(
|
||||
reactInstanceManager != null ? reactInstanceManager.mApplicationContext : null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReload() {
|
||||
UiThreadUtil.runOnUiThread(
|
||||
() -> {
|
||||
ReactInstanceManager reactInstanceManager = mReactInstanceManagerWeak.get();
|
||||
if (reactInstanceManager != null) {
|
||||
reactInstanceManager.mDevSupportManager.handleReloadJS();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSetPausedInDebuggerMessage(@Nullable String message) {
|
||||
ReactInstanceManager reactInstanceManager = mReactInstanceManagerWeak.get();
|
||||
if (reactInstanceManager == null) {
|
||||
return;
|
||||
}
|
||||
if (message == null) {
|
||||
reactInstanceManager.mDevSupportManager.hidePausedInDebuggerOverlay();
|
||||
} else {
|
||||
reactInstanceManager.mDevSupportManager.showPausedInDebuggerOverlay(
|
||||
message,
|
||||
new PausedInDebuggerOverlayCommandListener() {
|
||||
@Override
|
||||
public void onResume() {
|
||||
UiThreadUtil.assertOnUiThread();
|
||||
if (reactInstanceManager.mInspectorTarget != null) {
|
||||
reactInstanceManager.mInspectorTarget.sendDebuggerResumeCommand();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadNetworkResource(String url, InspectorNetworkRequestListener listener) {
|
||||
InspectorNetworkHelper.loadNetworkResource(url, listener);
|
||||
}
|
||||
}
|
||||
|
||||
private @Nullable ReactInstanceManagerInspectorTarget getOrCreateInspectorTarget() {
|
||||
if (mInspectorTarget == null && InspectorFlags.getFuseboxEnabled()) {
|
||||
|
||||
mInspectorTarget =
|
||||
new ReactInstanceManagerInspectorTarget(new InspectorTargetDelegateImpl(this));
|
||||
}
|
||||
|
||||
return mInspectorTarget;
|
||||
}
|
||||
}
|
||||
+4
-26
@@ -7,7 +7,6 @@
|
||||
|
||||
package com.facebook.react.bridge;
|
||||
|
||||
import static com.facebook.infer.annotation.Assertions.assertCondition;
|
||||
import static com.facebook.infer.annotation.ThreadConfined.UI;
|
||||
import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
|
||||
|
||||
@@ -119,15 +118,12 @@ public class CatalystInstanceImpl implements CatalystInstance {
|
||||
|
||||
public native NativeMethodCallInvokerHolderImpl getNativeMethodCallInvokerHolder();
|
||||
|
||||
private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
|
||||
|
||||
private CatalystInstanceImpl(
|
||||
final ReactQueueConfigurationSpec reactQueueConfigurationSpec,
|
||||
final JavaScriptExecutor jsExecutor,
|
||||
final NativeModuleRegistry nativeModuleRegistry,
|
||||
final JSBundleLoader jsBundleLoader,
|
||||
JSExceptionHandler jSExceptionHandler,
|
||||
@Nullable ReactInstanceManagerInspectorTarget inspectorTarget) {
|
||||
JSExceptionHandler jSExceptionHandler) {
|
||||
FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
|
||||
Systrace.beginSection(TRACE_TAG_REACT, "createCatalystInstanceImpl");
|
||||
|
||||
@@ -142,7 +138,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
|
||||
mJSExceptionHandler = jSExceptionHandler;
|
||||
mNativeModulesQueueThread = mReactQueueConfiguration.getNativeModulesQueueThread();
|
||||
mTraceListener = new JSProfilerTraceListener(this);
|
||||
mInspectorTarget = inspectorTarget;
|
||||
Systrace.endSection(TRACE_TAG_REACT);
|
||||
|
||||
FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
|
||||
@@ -153,8 +148,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
|
||||
jsExecutor,
|
||||
mReactQueueConfiguration.getJSQueueThread(),
|
||||
mNativeModulesQueueThread,
|
||||
mNativeModuleRegistry.getJavaModules(this),
|
||||
mInspectorTarget);
|
||||
mNativeModuleRegistry.getJavaModules(this));
|
||||
FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
|
||||
Systrace.endSection(TRACE_TAG_REACT);
|
||||
|
||||
@@ -219,8 +213,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
|
||||
JavaScriptExecutor jsExecutor,
|
||||
MessageQueueThread jsQueue,
|
||||
MessageQueueThread moduleQueue,
|
||||
Collection<JavaModuleWrapper> javaModules,
|
||||
@Nullable ReactInstanceManagerInspectorTarget inspectorTarget);
|
||||
Collection<JavaModuleWrapper> javaModules);
|
||||
|
||||
@Override
|
||||
public void setSourceURLs(String deviceURL, String remoteURL) {
|
||||
@@ -351,13 +344,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mInspectorTarget != null) {
|
||||
assertCondition(
|
||||
mInspectorTarget.isValid(),
|
||||
"ReactInstanceManager inspector target destroyed before instance was unregistered");
|
||||
}
|
||||
unregisterFromInspector();
|
||||
|
||||
// TODO: tell all APIs to shut down
|
||||
ReactMarker.logMarker(ReactMarkerConstants.DESTROY_CATALYST_INSTANCE_START);
|
||||
mDestroyed = true;
|
||||
@@ -605,7 +591,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
|
||||
private @Nullable NativeModuleRegistry mRegistry;
|
||||
private @Nullable JavaScriptExecutor mJSExecutor;
|
||||
private @Nullable JSExceptionHandler mJSExceptionHandler;
|
||||
private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
|
||||
|
||||
public Builder setReactQueueConfigurationSpec(
|
||||
ReactQueueConfigurationSpec ReactQueueConfigurationSpec) {
|
||||
@@ -633,20 +618,13 @@ public class CatalystInstanceImpl implements CatalystInstance {
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder setInspectorTarget(
|
||||
@Nullable ReactInstanceManagerInspectorTarget inspectorTarget) {
|
||||
mInspectorTarget = inspectorTarget;
|
||||
return this;
|
||||
}
|
||||
|
||||
public CatalystInstanceImpl build() {
|
||||
return new CatalystInstanceImpl(
|
||||
Assertions.assertNotNull(mReactQueueConfigurationSpec),
|
||||
Assertions.assertNotNull(mJSExecutor),
|
||||
Assertions.assertNotNull(mRegistry),
|
||||
Assertions.assertNotNull(mJSBundleLoader),
|
||||
Assertions.assertNotNull(mJSExceptionHandler),
|
||||
mInspectorTarget);
|
||||
Assertions.assertNotNull(mJSExceptionHandler));
|
||||
}
|
||||
}
|
||||
}
|
||||
-78
@@ -1,78 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
@file:Suppress("DEPRECATION")
|
||||
|
||||
package com.facebook.react.bridge
|
||||
|
||||
import com.facebook.jni.HybridData
|
||||
import com.facebook.proguard.annotations.DoNotStripAny
|
||||
import com.facebook.react.common.annotations.internal.LegacyArchitecture
|
||||
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
|
||||
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
|
||||
import com.facebook.react.devsupport.inspector.InspectorNetworkRequestListener
|
||||
import java.util.concurrent.Executor
|
||||
|
||||
@DoNotStripAny
|
||||
@LegacyArchitecture
|
||||
@Deprecated(
|
||||
message = "This class is part of Legacy Architecture and will be removed in a future release",
|
||||
level = DeprecationLevel.WARNING,
|
||||
)
|
||||
internal class ReactInstanceManagerInspectorTarget(delegate: TargetDelegate) : AutoCloseable {
|
||||
|
||||
@DoNotStripAny
|
||||
public interface TargetDelegate {
|
||||
/** Android implementation for [HostTargetDelegate::getMetadata] */
|
||||
public fun getMetadata(): Map<String, String>
|
||||
|
||||
/** Android implementation for [HostTargetDelegate::onReload] */
|
||||
public fun onReload()
|
||||
|
||||
/** Android implementation for [HostTargetDelegate::onSetPausedInDebuggerMessage] */
|
||||
public fun onSetPausedInDebuggerMessage(message: String?)
|
||||
|
||||
/** Android implementation for [HostTargetDelegate::loadNetworkResource] */
|
||||
public fun loadNetworkResource(url: String, listener: InspectorNetworkRequestListener)
|
||||
}
|
||||
|
||||
@Suppress("NoHungarianNotation")
|
||||
private val mHybridData: HybridData =
|
||||
initHybrid(
|
||||
Executor { command ->
|
||||
if (UiThreadUtil.isOnUiThread()) {
|
||||
command.run()
|
||||
} else {
|
||||
UiThreadUtil.runOnUiThread(command)
|
||||
}
|
||||
},
|
||||
delegate,
|
||||
)
|
||||
|
||||
private external fun initHybrid(executor: Executor, delegate: TargetDelegate): HybridData
|
||||
|
||||
public external fun sendDebuggerResumeCommand()
|
||||
|
||||
public override fun close() {
|
||||
mHybridData.resetNative()
|
||||
}
|
||||
|
||||
@JvmName("isValid")
|
||||
internal fun isValid(): Boolean {
|
||||
return mHybridData.isValid
|
||||
}
|
||||
|
||||
private companion object {
|
||||
init {
|
||||
LegacyArchitectureLogger.assertLegacyArchitecture(
|
||||
"ReactInstanceManagerInspectorTarget",
|
||||
LegacyArchitectureLogLevel.WARNING,
|
||||
)
|
||||
ReactNativeJNISoLoader.staticInit()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -66,8 +66,7 @@ add_library(
|
||||
MethodInvoker.cpp
|
||||
ModuleRegistryBuilder.cpp
|
||||
OnLoad.cpp
|
||||
ReactInstanceManagerInspectorTarget.cpp
|
||||
SafeReleaseJniRef.cpp
|
||||
SafeReleaseJniRef.cpp
|
||||
)
|
||||
target_merge_so(reactnativejni)
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
*/
|
||||
|
||||
#include "CatalystInstanceImpl.h"
|
||||
#include "ReactInstanceManagerInspectorTarget.h"
|
||||
|
||||
#include <fstream>
|
||||
#include <memory>
|
||||
@@ -163,9 +162,7 @@ void CatalystInstanceImpl::initializeBridge(
|
||||
jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue,
|
||||
jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
|
||||
jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
|
||||
javaModules,
|
||||
jni::alias_ref<ReactInstanceManagerInspectorTarget::javaobject>
|
||||
inspectorTarget) {
|
||||
javaModules) {
|
||||
set_react_native_logfunc(&log);
|
||||
|
||||
// TODO mhorowitz: how to assert here?
|
||||
@@ -198,10 +195,7 @@ void CatalystInstanceImpl::initializeBridge(
|
||||
std::make_unique<InstanceCallbackImpl>(callback),
|
||||
jseh->getExecutorFactory(),
|
||||
std::make_unique<JMessageQueueThread>(jsQueue),
|
||||
moduleRegistry_,
|
||||
inspectorTarget != nullptr
|
||||
? inspectorTarget->cthis()->getInspectorTarget()
|
||||
: nullptr);
|
||||
moduleRegistry_);
|
||||
}
|
||||
|
||||
void CatalystInstanceImpl::extendNativeModules(
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
#include "JSLoader.h"
|
||||
#include "JavaModuleWrapper.h"
|
||||
#include "ModuleRegistryBuilder.h"
|
||||
#include "ReactInstanceManagerInspectorTarget.h"
|
||||
|
||||
#ifndef RCT_REMOVE_LEGACY_ARCH
|
||||
|
||||
@@ -59,8 +58,7 @@ class [[deprecated("This API will be removed along with the legacy architecture.
|
||||
JavaScriptExecutorHolder *jseh,
|
||||
jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue,
|
||||
jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
|
||||
jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
|
||||
jni::alias_ref<ReactInstanceManagerInspectorTarget::javaobject> inspectorTarget);
|
||||
jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules);
|
||||
|
||||
void extendNativeModules(jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules);
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
#include "CatalystInstanceImpl.h"
|
||||
#include "InspectorNetworkRequestListener.h"
|
||||
#include "JavaScriptExecutorHolder.h"
|
||||
#include "ReactInstanceManagerInspectorTarget.h"
|
||||
|
||||
#ifndef WITH_GLOGINIT
|
||||
#define WITH_GLOGINIT 1
|
||||
@@ -41,7 +40,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
||||
CatalystInstanceImpl::registerNatives();
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
ReactInstanceManagerInspectorTarget::registerNatives();
|
||||
InspectorNetworkRequestListener::registerNatives();
|
||||
});
|
||||
}
|
||||
|
||||
-175
@@ -1,175 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#include "ReactInstanceManagerInspectorTarget.h"
|
||||
#include "SafeReleaseJniRef.h"
|
||||
|
||||
#include <fbjni/NativeRunnable.h>
|
||||
#include <jsinspector-modern/InspectorFlags.h>
|
||||
|
||||
#include <optional>
|
||||
|
||||
using namespace facebook::jni;
|
||||
using namespace facebook::react::jsinspector_modern;
|
||||
|
||||
namespace facebook::react {
|
||||
|
||||
void ReactInstanceManagerInspectorTarget::TargetDelegate::onReload() const {
|
||||
auto method = javaClassStatic()->getMethod<void()>("onReload");
|
||||
method(self());
|
||||
}
|
||||
|
||||
void ReactInstanceManagerInspectorTarget::TargetDelegate::
|
||||
onSetPausedInDebuggerMessage(
|
||||
const OverlaySetPausedInDebuggerMessageRequest& request) const {
|
||||
auto method = javaClassStatic()->getMethod<void(local_ref<JString>)>(
|
||||
"onSetPausedInDebuggerMessage");
|
||||
method(self(), request.message ? make_jstring(*request.message) : nullptr);
|
||||
}
|
||||
|
||||
jni::local_ref<jni::JMap<jstring, jstring>>
|
||||
ReactInstanceManagerInspectorTarget::TargetDelegate::getMetadata() const {
|
||||
auto method = javaClassStatic()
|
||||
->getMethod<jni::local_ref<jni::JMap<jstring, jstring>>()>(
|
||||
"getMetadata");
|
||||
return method(self());
|
||||
}
|
||||
|
||||
void ReactInstanceManagerInspectorTarget::TargetDelegate::loadNetworkResource(
|
||||
const std::string& url,
|
||||
jni::local_ref<InspectorNetworkRequestListener::javaobject> listener)
|
||||
const {
|
||||
auto method =
|
||||
javaClassStatic()
|
||||
->getMethod<void(
|
||||
jni::local_ref<JString>,
|
||||
jni::local_ref<InspectorNetworkRequestListener::javaobject>)>(
|
||||
"loadNetworkResource");
|
||||
return method(self(), make_jstring(url), listener);
|
||||
}
|
||||
|
||||
ReactInstanceManagerInspectorTarget::ReactInstanceManagerInspectorTarget(
|
||||
jni::alias_ref<ReactInstanceManagerInspectorTarget::jhybridobject> /*jobj*/,
|
||||
jni::alias_ref<JExecutor::javaobject> javaExecutor,
|
||||
jni::alias_ref<ReactInstanceManagerInspectorTarget::TargetDelegate>
|
||||
delegate)
|
||||
: delegate_(make_global(delegate)),
|
||||
inspectorExecutor_([javaExecutor =
|
||||
// Use a SafeReleaseJniRef because this lambda may
|
||||
// be copied to arbitrary threads.
|
||||
SafeReleaseJniRef(make_global(javaExecutor))](
|
||||
auto callback) mutable {
|
||||
auto jrunnable = JNativeRunnable::newObjectCxxArgs(std::move(callback));
|
||||
javaExecutor->execute(jrunnable);
|
||||
}) {
|
||||
auto& inspectorFlags = InspectorFlags::getInstance();
|
||||
|
||||
if (inspectorFlags.getFuseboxEnabled()) {
|
||||
inspectorTarget_ = HostTarget::create(*this, inspectorExecutor_);
|
||||
|
||||
inspectorPageId_ = getInspectorInstance().addPage(
|
||||
"React Native Bridge",
|
||||
/* vm */ "",
|
||||
[inspectorTarget =
|
||||
inspectorTarget_](std::unique_ptr<IRemoteConnection> remote)
|
||||
-> std::unique_ptr<ILocalConnection> {
|
||||
return inspectorTarget->connect(std::move(remote));
|
||||
},
|
||||
{.nativePageReloads = true, .prefersFuseboxFrontend = true});
|
||||
}
|
||||
}
|
||||
|
||||
ReactInstanceManagerInspectorTarget::~ReactInstanceManagerInspectorTarget() {
|
||||
if (inspectorPageId_.has_value()) {
|
||||
// Remove the page (terminating all sessions) and destroy the target, both
|
||||
// on the inspector queue.
|
||||
inspectorExecutor_([inspectorPageId = *inspectorPageId_,
|
||||
inspectorTarget = std::move(inspectorTarget_)]() {
|
||||
getInspectorInstance().removePage(inspectorPageId);
|
||||
(void)inspectorTarget;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
jni::local_ref<ReactInstanceManagerInspectorTarget::jhybriddata>
|
||||
ReactInstanceManagerInspectorTarget::initHybrid(
|
||||
jni::alias_ref<jhybridobject> jobj,
|
||||
jni::alias_ref<JExecutor::javaobject> javaExecutor,
|
||||
jni::alias_ref<
|
||||
ReactInstanceManagerInspectorTarget::TargetDelegate::javaobject>
|
||||
delegate) {
|
||||
return makeCxxInstance(jobj, javaExecutor, delegate);
|
||||
}
|
||||
|
||||
void ReactInstanceManagerInspectorTarget::sendDebuggerResumeCommand() {
|
||||
if (inspectorTarget_) {
|
||||
inspectorTarget_->sendCommand(HostCommand::DebuggerResume);
|
||||
} else {
|
||||
jni::throwNewJavaException(
|
||||
"java/lang/IllegalStateException",
|
||||
"Cannot send command while the Fusebox backend is not enabled");
|
||||
}
|
||||
}
|
||||
|
||||
void ReactInstanceManagerInspectorTarget::registerNatives() {
|
||||
registerHybrid({
|
||||
makeNativeMethod(
|
||||
"initHybrid", ReactInstanceManagerInspectorTarget::initHybrid),
|
||||
makeNativeMethod(
|
||||
"sendDebuggerResumeCommand",
|
||||
ReactInstanceManagerInspectorTarget::sendDebuggerResumeCommand),
|
||||
});
|
||||
}
|
||||
|
||||
jsinspector_modern::HostTargetMetadata
|
||||
ReactInstanceManagerInspectorTarget::getMetadata() {
|
||||
auto getMethod = jni::JMap<jstring, jstring>::javaClassLocal()
|
||||
->getMethod<jobject(jobject)>("get");
|
||||
auto metadata = delegate_->getMetadata();
|
||||
|
||||
auto getStringOptional = [&](const std::string& key) {
|
||||
auto result = getMethod(metadata, make_jstring(key).get());
|
||||
return result ? std::optional<std::string>(result->toString())
|
||||
: std::nullopt;
|
||||
};
|
||||
|
||||
return {
|
||||
.appDisplayName = getStringOptional("appDisplayName"),
|
||||
.appIdentifier = getStringOptional("appIdentifier"),
|
||||
.deviceName = getStringOptional("deviceName"),
|
||||
.integrationName = "Android Bridge (ReactInstanceManagerInspectorTarget)",
|
||||
.platform = getStringOptional("platform"),
|
||||
.reactNativeVersion = getStringOptional("reactNativeVersion"),
|
||||
};
|
||||
}
|
||||
|
||||
void ReactInstanceManagerInspectorTarget::onReload(
|
||||
const PageReloadRequest& /*request*/) {
|
||||
delegate_->onReload();
|
||||
}
|
||||
|
||||
void ReactInstanceManagerInspectorTarget::onSetPausedInDebuggerMessage(
|
||||
const OverlaySetPausedInDebuggerMessageRequest& request) {
|
||||
delegate_->onSetPausedInDebuggerMessage(request);
|
||||
}
|
||||
|
||||
void ReactInstanceManagerInspectorTarget::loadNetworkResource(
|
||||
const jsinspector_modern::LoadNetworkResourceRequest& params,
|
||||
jsinspector_modern::ScopedExecutor<
|
||||
jsinspector_modern::NetworkRequestListener> executor) {
|
||||
// Construct InspectorNetworkRequestListener (hybrid class) from the C++ side
|
||||
// (holding the ScopedExecutor), pass to the delegate.
|
||||
auto listener = InspectorNetworkRequestListener::newObjectCxxArgs(executor);
|
||||
|
||||
delegate_->loadNetworkResource(params.url, listener);
|
||||
}
|
||||
|
||||
HostTarget* ReactInstanceManagerInspectorTarget::getInspectorTarget() {
|
||||
return inspectorTarget_.get();
|
||||
}
|
||||
|
||||
} // namespace facebook::react
|
||||
-75
@@ -1,75 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <fbjni/fbjni.h>
|
||||
#include <jsinspector-modern/HostTarget.h>
|
||||
#include <jsinspector-modern/NetworkIOAgent.h>
|
||||
#include <jsinspector-modern/ScopedExecutor.h>
|
||||
#include <react/jni/InspectorNetworkRequestListener.h>
|
||||
#include <react/jni/JExecutor.h>
|
||||
|
||||
namespace facebook::react {
|
||||
|
||||
class ReactInstanceManagerInspectorTarget : public jni::HybridClass<ReactInstanceManagerInspectorTarget>,
|
||||
public jsinspector_modern::HostTargetDelegate {
|
||||
private:
|
||||
struct TargetDelegate : public facebook::jni::JavaClass<TargetDelegate> {
|
||||
static constexpr auto kJavaDescriptor =
|
||||
"Lcom/facebook/react/bridge/ReactInstanceManagerInspectorTarget$TargetDelegate;";
|
||||
|
||||
jni::local_ref<jni::JMap<jstring, jstring>> getMetadata() const;
|
||||
void onReload() const;
|
||||
void onSetPausedInDebuggerMessage(const OverlaySetPausedInDebuggerMessageRequest &request) const;
|
||||
void loadNetworkResource(
|
||||
const std::string &url,
|
||||
jni::local_ref<InspectorNetworkRequestListener::javaobject> listener) const;
|
||||
};
|
||||
|
||||
public:
|
||||
static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/ReactInstanceManagerInspectorTarget;";
|
||||
|
||||
ReactInstanceManagerInspectorTarget(const ReactInstanceManagerInspectorTarget &) = delete;
|
||||
ReactInstanceManagerInspectorTarget &operator=(const ReactInstanceManagerInspectorTarget &) = delete;
|
||||
|
||||
~ReactInstanceManagerInspectorTarget() override;
|
||||
|
||||
static jni::local_ref<jhybriddata> initHybrid(
|
||||
jni::alias_ref<jhybridobject> jobj,
|
||||
jni::alias_ref<JExecutor::javaobject> javaExecutor,
|
||||
jni::alias_ref<ReactInstanceManagerInspectorTarget::TargetDelegate::javaobject> delegate);
|
||||
|
||||
void sendDebuggerResumeCommand();
|
||||
|
||||
static void registerNatives();
|
||||
|
||||
jsinspector_modern::HostTarget *getInspectorTarget();
|
||||
|
||||
// HostTargetDelegate methods
|
||||
jsinspector_modern::HostTargetMetadata getMetadata() override;
|
||||
void onReload(const PageReloadRequest &request) override;
|
||||
void onSetPausedInDebuggerMessage(const OverlaySetPausedInDebuggerMessageRequest & /*request*/) override;
|
||||
void loadNetworkResource(
|
||||
const jsinspector_modern::LoadNetworkResourceRequest ¶ms,
|
||||
jsinspector_modern::ScopedExecutor<jsinspector_modern::NetworkRequestListener> executor) override;
|
||||
|
||||
private:
|
||||
friend HybridBase;
|
||||
|
||||
ReactInstanceManagerInspectorTarget(
|
||||
jni::alias_ref<ReactInstanceManagerInspectorTarget::jhybridobject> jobj,
|
||||
jni::alias_ref<JExecutor::javaobject> javaExecutor,
|
||||
jni::alias_ref<ReactInstanceManagerInspectorTarget::TargetDelegate> delegate);
|
||||
|
||||
jni::global_ref<ReactInstanceManagerInspectorTarget::TargetDelegate> delegate_;
|
||||
jsinspector_modern::VoidExecutor inspectorExecutor_;
|
||||
std::shared_ptr<jsinspector_modern::HostTarget> inspectorTarget_;
|
||||
std::optional<int> inspectorPageId_;
|
||||
};
|
||||
|
||||
} // namespace facebook::react
|
||||
Reference in new issue
Block a user