Remove remote JS debugging (Android)#41078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
huntie wants to merge 1 commit into from
Closed

Remove remote JS debugging (Android) #41078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ...e/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,14 +41,6 @@ public boolean isDeviceDebugEnabled() {
return false;
}

@Override
public boolean isRemoteJSDebugEnabled() {
return false;
}

@Override
public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {}

@Override
public boolean isStartSamplingProfilerOnInit() {
return false;
Expand Down
22 changes: 0 additions & 22 deletions ...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,12 +57,10 @@
import com.facebook.react.bridge.JSExceptionHandler;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
import com.facebook.react.bridge.ProxyJavaScriptExecutor;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactCxxErrorHandler;
Expand DownExpand Up@@ -297,11 +295,6 @@ public static ReactInstanceManagerBuilder builder() {

private ReactInstanceDevHelper createDevHelperInterface() {
return new ReactInstanceDevHelper() {
@Override
public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
}

@Override
public void onJSBundleLoadedFromServer() {
ReactInstanceManager.this.onJSBundleLoadedFromServer();
Expand DownExpand Up@@ -448,14 +441,9 @@ public void onPackagerStatusFetched(final boolean packagerIsRunning) {
if (packagerIsRunning) {
mDevSupportManager.handleReloadJS();
} else if (mDevSupportManager.hasUpToDateJSBundleInCache()
&& !devSettings.isRemoteJSDebugEnabled()
&& !mUseFallbackBundle) {
// If there is a up-to-date bundle downloaded from server,
// with remote JS debugging disabled, always use that.
onJSBundleLoadedFromServer();
} else {
// If dev server is down, disable the remote JS debugging.
devSettings.setRemoteJSDebugEnabled(false);
recreateReactContextInBackgroundFromBundleLoader();
}
});
Expand DownExpand Up@@ -1023,16 +1011,6 @@ public String getJsExecutorName() {
return mJavaScriptExecutorFactory.toString();
}

@ThreadConfined(UI)
private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
FLog.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
recreateReactContextInBackground(
new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
JSBundleLoader.createRemoteDebuggerBundleLoader(
mDevSupportManager.getJSBundleURLForRemoteDebugging(),
mDevSupportManager.getSourceUrl()));
}

@ThreadConfined(UI)
private void onJSBundleLoadedFromServer() {
FLog.d(ReactConstants.TAG, "ReactInstanceManager.onJSBundleLoadedFromServer()");
Expand Down
15 changes: 0 additions & 15 deletions ...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,21 +92,6 @@ public String loadScript(JSBundleLoaderDelegate delegate) {
};
}

/**
* This loader is used when proxy debugging is enabled. In that case there is no point in fetching
* the bundle from device as remote executor will have to do it anyway.
*/
public static JSBundleLoader createRemoteDebuggerBundleLoader(
final String proxySourceURL, final String realSourceURL) {
return new JSBundleLoader() {
@Override
public String loadScript(JSBundleLoaderDelegate delegate) {
delegate.setSourceURLs(realSourceURL, proxySourceURL);
return realSourceURL;
}
};
}

/** Loads the script, returning the URL of the source it loaded. */
public abstract String loadScript(JSBundleLoaderDelegate delegate);
}
71 changes: 5 additions & 66 deletions ...ive/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,12 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.ReactMarker;
import com.facebook.react.bridge.ReactMarkerConstants;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.SurfaceDelegateFactory;
import com.facebook.react.common.futures.SimpleSettableFuture;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
Expand All@@ -33,9 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

/**
* Interface for accessing and interacting with development features. Following features
Expand DownExpand Up@@ -136,54 +131,6 @@ public void onError(String url, Throwable cause) {
});
}

private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
final SimpleSettableFuture<Boolean> future) {
return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
@Override
public void onSuccess() {
future.set(true);
hideDevLoadingView();
}

@Override
public void onFailure(final Throwable cause) {
hideDevLoadingView();
FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
future.setException(
new IOException(
getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
cause));
}
};
}

private void reloadJSInProxyMode() {
// When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
// anyway
getDevServerHelper().launchJSDevtools();

JavaJSExecutor.Factory factory =
new JavaJSExecutor.Factory() {
@Override
public JavaJSExecutor create() throws Exception {
WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
executor.connect(
getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
// TODO(t9349129) Don't use timeout
try {
future.get(90, TimeUnit.SECONDS);
return executor;
} catch (ExecutionException e) {
throw (Exception) e.getCause();
} catch (InterruptedException | TimeoutException e) {
throw new RuntimeException(e);
}
}
};
getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
}

@Override
public void handleReloadJS() {

Expand All@@ -196,19 +143,11 @@ public void handleReloadJS() {
// dismiss redbox if exists
hideRedboxDialog();

if (getDevSettings().isRemoteJSDebugEnabled()) {
PrinterHolder.getPrinter()
.logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
showDevLoadingViewForRemoteJSEnabled();
reloadJSInProxyMode();
} else {
PrinterHolder.getPrinter()
.logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
String bundleURL =
getDevServerHelper()
.getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
reloadJSFromServer(bundleURL);
}
PrinterHolder.getPrinter()
.logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
String bundleURL =
getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
reloadJSFromServer(bundleURL);
}

/** Starts of stops the sampling profiler */
Expand Down
11 changes: 0 additions & 11 deletions ...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@ class DevInternalSettings
private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
private static final String PREFS_HOT_MODULE_REPLACEMENT_KEY = "hot_module_replacement";
private static final String PREFS_REMOTE_JS_DEBUG_KEY = "remote_js_debug";
private static final String PREFS_START_SAMPLING_PROFILER_ON_INIT =
"start_sampling_profiler_on_init";

Expand DownExpand Up@@ -85,16 +84,6 @@ public boolean isDeviceDebugEnabled() {
return ReactBuildConfig.DEBUG;
}

@Override
public boolean isRemoteJSDebugEnabled() {
return mPreferences.getBoolean(PREFS_REMOTE_JS_DEBUG_KEY, false);
}

@Override
public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {
mPreferences.edit().putBoolean(PREFS_REMOTE_JS_DEBUG_KEY, remoteJSDebugEnabled).apply();
}

@Override
public boolean isStartSamplingProfilerOnInit() {
return mPreferences.getBoolean(PREFS_START_SAMPLING_PROFILER_ON_INIT, false);
Expand Down
65 changes: 0 additions & 65 deletions ...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
Expand DownExpand Up@@ -56,8 +55,6 @@
* </ul>
*/
public class DevServerHelper {
public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";

private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;

private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
Expand DownExpand Up@@ -237,13 +234,6 @@ protected Void doInBackground(Void... params) {
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}

public String getWebsocketProxyURL() {
return String.format(
Locale.US,
"ws://%s/debugger-proxy?role=client",
mPackagerConnectionSettings.getDebugServerHost());
}

private String getInspectorDeviceUrl() {
return String.format(
Locale.US,
Expand All@@ -261,28 +251,6 @@ public void downloadBundleFromURL(
mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo);
}

public void downloadBundleFromURL(
DevBundleDownloadListener callback,
File outputFile,
String bundleURL,
BundleDownloader.BundleInfo bundleInfo,
Request.Builder requestBuilder) {
mBundleDownloader.downloadBundleFromURL(
callback, outputFile, bundleURL, bundleInfo, requestBuilder);
}

/** @return the host to use when connecting to the bundle server from the host itself. */
private String getHostForJSProxy() {
// Use custom port if configured. Note that host stays "localhost".
String host = Assertions.assertNotNull(mPackagerConnectionSettings.getDebugServerHost());
int portOffset = host.lastIndexOf(':');
if (portOffset > -1) {
return "localhost" + host.substring(portOffset);
} else {
return AndroidInfoHelpers.DEVICE_LOCALHOST;
}
}

/** @return whether we should enable dev mode when requesting JS bundles. */
private boolean getDevMode() {
return mSettings.isJSDevModeEnabled();
Expand DownExpand Up@@ -345,32 +313,6 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {
}
}

private String createLaunchJSDevtoolsCommandUrl() {
return String.format(
Locale.US,
"http://%s/launch-js-devtools",
mPackagerConnectionSettings.getDebugServerHost());
}

public void launchJSDevtools() {
Request request = new Request.Builder().url(createLaunchJSDevtoolsCommandUrl()).build();
mClient
.newCall(request)
.enqueue(
new Callback() {
@Override
public void onFailure(@NonNull Call call, @NonNull IOException e) {
// ignore HTTP call response, this is just to open a debugger page and there is no
// reason to report failures from here
}

@Override
public void onResponse(@NonNull Call call, @NonNull Response response) {
// ignore HTTP call response - see above
}
});
}

public String getSourceMapUrl(String mainModuleName) {
return createBundleURL(mainModuleName, BundleType.MAP);
}
Expand All@@ -379,13 +321,6 @@ public String getSourceUrl(String mainModuleName) {
return createBundleURL(mainModuleName, BundleType.BUNDLE);
}

public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
// The host we use when connecting to the JS bundle server from the emulator is not the
// same as the one needed to connect to the same server from the JavaScript proxy running on the
// host itself.
return createBundleURL(mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
}

/**
* This is a debug-only utility to allow fetching a file via packager. It's made synchronous for
* simplicity, but should only be used if it's absolutely necessary.
Expand Down
32 changes: 0 additions & 32 deletions ...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,12 +154,6 @@ public DevSupportManagerBase(
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (getReloadAppAction(context).equals(action)) {
if (intent.getBooleanExtra(DevServerHelper.RELOAD_APP_EXTRA_JS_PROXY, false)) {
mDevSettings.setRemoteJSDebugEnabled(true);
mDevServerHelper.launchJSDevtools();
} else {
mDevSettings.setRemoteJSDebugEnabled(false);
}
handleReloadJS();
}
}
Expand DownExpand Up@@ -367,13 +361,6 @@ public void onOptionSelected() {

if (mDevSettings.isDeviceDebugEnabled()) {
// On-device JS debugging (CDP). Render action to open debugger frontend.

// Reset the old debugger setting so no one gets stuck.
// TODO: Remove in a few weeks.
if (mDevSettings.isRemoteJSDebugEnabled()) {
mDevSettings.setRemoteJSDebugEnabled(false);
handleReloadJS();
}
options.put(
mApplicationContext.getString(R.string.catalyst_debug_open),
() ->
Expand DownExpand Up@@ -595,12 +582,6 @@ public String getSourceUrl() {
return mDevServerHelper.getSourceUrl(Assertions.assertNotNull(mJSAppBundleName));
}

@Override
public String getJSBundleURLForRemoteDebugging() {
return mDevServerHelper.getJSBundleURLForRemoteDebugging(
Assertions.assertNotNull(mJSAppBundleName));
}

@Override
public String getDownloadedJSBundleFile() {
return mJSBundleDownloadedFile.getAbsolutePath();
Expand DownExpand Up@@ -966,19 +947,6 @@ public void setHotModuleReplacementEnabled(final boolean isHotModuleReplacementE
});
}

@Override
public void setRemoteJSDebugEnabled(final boolean isRemoteJSDebugEnabled) {
if (!mIsDevSupportEnabled) {
return;
}

UiThreadUtil.runOnUiThread(
() -> {
mDevSettings.setRemoteJSDebugEnabled(isRemoteJSDebugEnabled);
handleReloadJS();
});
}

@Override
public void setFpsDebugEnabled(final boolean isFpsDebugEnabled) {
if (!mIsDevSupportEnabled) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove remote JS debugging (Android)#41078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Remove remote JS debugging (Android)
#41078
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
...e/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,14 +41,6 @@ public boolean isDeviceDebugEnabled() {
 return false;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return false;
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {}

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return false;
Expand Down

22 changes: 0 additions & 22 deletions
...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,12 +57,10 @@
import com.facebook.react.bridge.JSExceptionHandler;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
import com.facebook.react.bridge.ProxyJavaScriptExecutor;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactCxxErrorHandler;
Expand DownExpand Up@@ -297,11 +295,6 @@ public static ReactInstanceManagerBuilder builder() {

 private ReactInstanceDevHelper createDevHelperInterface() {
 return new ReactInstanceDevHelper() {
 @Override
 public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
 }

 @Override
 public void onJSBundleLoadedFromServer() {
 ReactInstanceManager.this.onJSBundleLoadedFromServer();
Expand DownExpand Up@@ -448,14 +441,9 @@ public void onPackagerStatusFetched(final boolean packagerIsRunning) {
 if (packagerIsRunning) {
 mDevSupportManager.handleReloadJS();
 } else if (mDevSupportManager.hasUpToDateJSBundleInCache()
 && !devSettings.isRemoteJSDebugEnabled()
 && !mUseFallbackBundle) {
 // If there is a up-to-date bundle downloaded from server,
 // with remote JS debugging disabled, always use that.
 onJSBundleLoadedFromServer();
 } else {
 // If dev server is down, disable the remote JS debugging.
 devSettings.setRemoteJSDebugEnabled(false);
 recreateReactContextInBackgroundFromBundleLoader();
 }
 });
Expand DownExpand Up@@ -1023,16 +1011,6 @@ public String getJsExecutorName() {
 return mJavaScriptExecutorFactory.toString();
 }

 @ThreadConfined(UI)
 private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
 recreateReactContextInBackground(
 new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
 JSBundleLoader.createRemoteDebuggerBundleLoader(
 mDevSupportManager.getJSBundleURLForRemoteDebugging(),
 mDevSupportManager.getSourceUrl()));
 }

 @ThreadConfined(UI)
 private void onJSBundleLoadedFromServer() {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onJSBundleLoadedFromServer()");
Expand Down

15 changes: 0 additions & 15 deletions
...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,21 +92,6 @@ public String loadScript(JSBundleLoaderDelegate delegate) {
 };
 }

 /**
 * This loader is used when proxy debugging is enabled. In that case there is no point in fetching
 * the bundle from device as remote executor will have to do it anyway.
 */
 public static JSBundleLoader createRemoteDebuggerBundleLoader(
 final String proxySourceURL, final String realSourceURL) {
 return new JSBundleLoader() {
 @Override
 public String loadScript(JSBundleLoaderDelegate delegate) {
 delegate.setSourceURLs(realSourceURL, proxySourceURL);
 return realSourceURL;
 }
 };
 }

 /** Loads the script, returning the URL of the source it loaded. */
 public abstract String loadScript(JSBundleLoaderDelegate delegate);
}

71 changes: 5 additions & 66 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,12 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.ReactMarker;
import com.facebook.react.bridge.ReactMarkerConstants;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.SurfaceDelegateFactory;
import com.facebook.react.common.futures.SimpleSettableFuture;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
Expand All@@ -33,9 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

/**
 * Interface for accessing and interacting with development features. Following features
Expand DownExpand Up@@ -136,54 +131,6 @@ public void onError(String url, Throwable cause) {
 });
 }

 private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
 final SimpleSettableFuture<Boolean> future) {
 return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
 @Override
 public void onSuccess() {
 future.set(true);
 hideDevLoadingView();
 }

 @Override
 public void onFailure(final Throwable cause) {
 hideDevLoadingView();
 FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
 future.setException(
 new IOException(
 getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
 cause));
 }
 };
 }

 private void reloadJSInProxyMode() {
 // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
 // anyway
 getDevServerHelper().launchJSDevtools();

 JavaJSExecutor.Factory factory =
 new JavaJSExecutor.Factory() {
 @Override
 public JavaJSExecutor create() throws Exception {
 WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
 SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
 executor.connect(
 getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
 // TODO(t9349129) Don't use timeout
 try {
 future.get(90, TimeUnit.SECONDS);
 return executor;
 } catch (ExecutionException e) {
 throw (Exception) e.getCause();
 } catch (InterruptedException | TimeoutException e) {
 throw new RuntimeException(e);
 }
 }
 };
 getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
 }

 @Override
 public void handleReloadJS() {

Expand All@@ -196,19 +143,11 @@ public void handleReloadJS() {
 // dismiss redbox if exists
 hideRedboxDialog();

 if (getDevSettings().isRemoteJSDebugEnabled()) {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
 showDevLoadingViewForRemoteJSEnabled();
 reloadJSInProxyMode();
 } else {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper()
 .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }

 /** Starts of stops the sampling profiler */
Expand Down

11 changes: 0 additions & 11 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@ class DevInternalSettings
 private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
 private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
 private static final String PREFS_HOT_MODULE_REPLACEMENT_KEY = "hot_module_replacement";
 private static final String PREFS_REMOTE_JS_DEBUG_KEY = "remote_js_debug";
 private static final String PREFS_START_SAMPLING_PROFILER_ON_INIT =
 "start_sampling_profiler_on_init";

Expand DownExpand Up@@ -85,16 +84,6 @@ public boolean isDeviceDebugEnabled() {
 return ReactBuildConfig.DEBUG;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return mPreferences.getBoolean(PREFS_REMOTE_JS_DEBUG_KEY, false);
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {
 mPreferences.edit().putBoolean(PREFS_REMOTE_JS_DEBUG_KEY, remoteJSDebugEnabled).apply();
 }

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return mPreferences.getBoolean(PREFS_START_SAMPLING_PROFILER_ON_INIT, false);
Expand Down

65 changes: 0 additions & 65 deletions
...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
Expand DownExpand Up@@ -56,8 +55,6 @@
 * </ul>
 */
public class DevServerHelper {
 public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";

 private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;

 private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
Expand DownExpand Up@@ -237,13 +234,6 @@ protected Void doInBackground(Void... params) {
 }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 }

 public String getWebsocketProxyURL() {
 return String.format(
 Locale.US,
 "ws://%s/debugger-proxy?role=client",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 private String getInspectorDeviceUrl() {
 return String.format(
 Locale.US,
Expand All@@ -261,28 +251,6 @@ public void downloadBundleFromURL(
 mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo);
 }

 public void downloadBundleFromURL(
 DevBundleDownloadListener callback,
 File outputFile,
 String bundleURL,
 BundleDownloader.BundleInfo bundleInfo,
 Request.Builder requestBuilder) {
 mBundleDownloader.downloadBundleFromURL(
 callback, outputFile, bundleURL, bundleInfo, requestBuilder);
 }

 /** @return the host to use when connecting to the bundle server from the host itself. */
 private String getHostForJSProxy() {
 // Use custom port if configured. Note that host stays "localhost".
 String host = Assertions.assertNotNull(mPackagerConnectionSettings.getDebugServerHost());
 int portOffset = host.lastIndexOf(':');
 if (portOffset > -1) {
 return "localhost" + host.substring(portOffset);
 } else {
 return AndroidInfoHelpers.DEVICE_LOCALHOST;
 }
 }

 /** @return whether we should enable dev mode when requesting JS bundles. */
 private boolean getDevMode() {
 return mSettings.isJSDevModeEnabled();
Expand DownExpand Up@@ -345,32 +313,6 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {
 }
 }

 private String createLaunchJSDevtoolsCommandUrl() {
 return String.format(
 Locale.US,
 "http://%s/launch-js-devtools",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 public void launchJSDevtools() {
 Request request = new Request.Builder().url(createLaunchJSDevtoolsCommandUrl()).build();
 mClient
 .newCall(request)
 .enqueue(
 new Callback() {
 @Override
 public void onFailure(@NonNull Call call, @NonNull IOException e) {
 // ignore HTTP call response, this is just to open a debugger page and there is no
 // reason to report failures from here
 }

 @Override
 public void onResponse(@NonNull Call call, @NonNull Response response) {
 // ignore HTTP call response - see above
 }
 });
 }

 public String getSourceMapUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.MAP);
 }
Expand All@@ -379,13 +321,6 @@ public String getSourceUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.BUNDLE);
 }

 public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
 // The host we use when connecting to the JS bundle server from the emulator is not the
 // same as the one needed to connect to the same server from the JavaScript proxy running on the
 // host itself.
 return createBundleURL(mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
 }

 /**
 * This is a debug-only utility to allow fetching a file via packager. It's made synchronous for
 * simplicity, but should only be used if it's absolutely necessary.
Expand Down

32 changes: 0 additions & 32 deletions
...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,12 +154,6 @@ public DevSupportManagerBase(
 public void onReceive(Context context, Intent intent) {
 String action = intent.getAction();
 if (getReloadAppAction(context).equals(action)) {
 if (intent.getBooleanExtra(DevServerHelper.RELOAD_APP_EXTRA_JS_PROXY, false)) {
 mDevSettings.setRemoteJSDebugEnabled(true);
 mDevServerHelper.launchJSDevtools();
 } else {
 mDevSettings.setRemoteJSDebugEnabled(false);
 }
 handleReloadJS();
 }
 }
Expand DownExpand Up@@ -367,13 +361,6 @@ public void onOptionSelected() {

 if (mDevSettings.isDeviceDebugEnabled()) {
 // On-device JS debugging (CDP). Render action to open debugger frontend.

 // Reset the old debugger setting so no one gets stuck.
 // TODO: Remove in a few weeks.
 if (mDevSettings.isRemoteJSDebugEnabled()) {
 mDevSettings.setRemoteJSDebugEnabled(false);
 handleReloadJS();
 }
 options.put(
 mApplicationContext.getString(R.string.catalyst_debug_open),
 () ->
Expand DownExpand Up@@ -595,12 +582,6 @@ public String getSourceUrl() {
 return mDevServerHelper.getSourceUrl(Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getJSBundleURLForRemoteDebugging() {
 return mDevServerHelper.getJSBundleURLForRemoteDebugging(
 Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getDownloadedJSBundleFile() {
 return mJSBundleDownloadedFile.getAbsolutePath();
Expand DownExpand Up@@ -966,19 +947,6 @@ public void setHotModuleReplacementEnabled(final boolean isHotModuleReplacementE
 });
 }

 @Override
 public void setRemoteJSDebugEnabled(final boolean isRemoteJSDebugEnabled) {
 if (!mIsDevSupportEnabled) {
 return;
 }

 UiThreadUtil.runOnUiThread(
 () -> {
 mDevSettings.setRemoteJSDebugEnabled(isRemoteJSDebugEnabled);
 handleReloadJS();
 });
 }

 @Override
 public void setFpsDebugEnabled(final boolean isFpsDebugEnabled) {
 if (!mIsDevSupportEnabled) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove remote JS debugging (Android)#41078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Remove remote JS debugging (Android)
#41078
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
...e/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,14 +41,6 @@ public boolean isDeviceDebugEnabled() {
 return false;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return false;
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {}

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return false;
Expand Down

22 changes: 0 additions & 22 deletions
...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,12 +57,10 @@
import com.facebook.react.bridge.JSExceptionHandler;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
import com.facebook.react.bridge.ProxyJavaScriptExecutor;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactCxxErrorHandler;
Expand DownExpand Up@@ -297,11 +295,6 @@ public static ReactInstanceManagerBuilder builder() {

 private ReactInstanceDevHelper createDevHelperInterface() {
 return new ReactInstanceDevHelper() {
 @Override
 public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
 }

 @Override
 public void onJSBundleLoadedFromServer() {
 ReactInstanceManager.this.onJSBundleLoadedFromServer();
Expand DownExpand Up@@ -448,14 +441,9 @@ public void onPackagerStatusFetched(final boolean packagerIsRunning) {
 if (packagerIsRunning) {
 mDevSupportManager.handleReloadJS();
 } else if (mDevSupportManager.hasUpToDateJSBundleInCache()
 && !devSettings.isRemoteJSDebugEnabled()
 && !mUseFallbackBundle) {
 // If there is a up-to-date bundle downloaded from server,
 // with remote JS debugging disabled, always use that.
 onJSBundleLoadedFromServer();
 } else {
 // If dev server is down, disable the remote JS debugging.
 devSettings.setRemoteJSDebugEnabled(false);
 recreateReactContextInBackgroundFromBundleLoader();
 }
 });
Expand DownExpand Up@@ -1023,16 +1011,6 @@ public String getJsExecutorName() {
 return mJavaScriptExecutorFactory.toString();
 }

 @ThreadConfined(UI)
 private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
 recreateReactContextInBackground(
 new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
 JSBundleLoader.createRemoteDebuggerBundleLoader(
 mDevSupportManager.getJSBundleURLForRemoteDebugging(),
 mDevSupportManager.getSourceUrl()));
 }

 @ThreadConfined(UI)
 private void onJSBundleLoadedFromServer() {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onJSBundleLoadedFromServer()");
Expand Down

15 changes: 0 additions & 15 deletions
...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,21 +92,6 @@ public String loadScript(JSBundleLoaderDelegate delegate) {
 };
 }

 /**
 * This loader is used when proxy debugging is enabled. In that case there is no point in fetching
 * the bundle from device as remote executor will have to do it anyway.
 */
 public static JSBundleLoader createRemoteDebuggerBundleLoader(
 final String proxySourceURL, final String realSourceURL) {
 return new JSBundleLoader() {
 @Override
 public String loadScript(JSBundleLoaderDelegate delegate) {
 delegate.setSourceURLs(realSourceURL, proxySourceURL);
 return realSourceURL;
 }
 };
 }

 /** Loads the script, returning the URL of the source it loaded. */
 public abstract String loadScript(JSBundleLoaderDelegate delegate);
}

71 changes: 5 additions & 66 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,12 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.ReactMarker;
import com.facebook.react.bridge.ReactMarkerConstants;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.SurfaceDelegateFactory;
import com.facebook.react.common.futures.SimpleSettableFuture;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
Expand All@@ -33,9 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

/**
 * Interface for accessing and interacting with development features. Following features
Expand DownExpand Up@@ -136,54 +131,6 @@ public void onError(String url, Throwable cause) {
 });
 }

 private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
 final SimpleSettableFuture<Boolean> future) {
 return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
 @Override
 public void onSuccess() {
 future.set(true);
 hideDevLoadingView();
 }

 @Override
 public void onFailure(final Throwable cause) {
 hideDevLoadingView();
 FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
 future.setException(
 new IOException(
 getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
 cause));
 }
 };
 }

 private void reloadJSInProxyMode() {
 // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
 // anyway
 getDevServerHelper().launchJSDevtools();

 JavaJSExecutor.Factory factory =
 new JavaJSExecutor.Factory() {
 @Override
 public JavaJSExecutor create() throws Exception {
 WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
 SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
 executor.connect(
 getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
 // TODO(t9349129) Don't use timeout
 try {
 future.get(90, TimeUnit.SECONDS);
 return executor;
 } catch (ExecutionException e) {
 throw (Exception) e.getCause();
 } catch (InterruptedException | TimeoutException e) {
 throw new RuntimeException(e);
 }
 }
 };
 getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
 }

 @Override
 public void handleReloadJS() {

Expand All@@ -196,19 +143,11 @@ public void handleReloadJS() {
 // dismiss redbox if exists
 hideRedboxDialog();

 if (getDevSettings().isRemoteJSDebugEnabled()) {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
 showDevLoadingViewForRemoteJSEnabled();
 reloadJSInProxyMode();
 } else {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper()
 .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }

 /** Starts of stops the sampling profiler */
Expand Down

11 changes: 0 additions & 11 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@ class DevInternalSettings
 private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
 private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
 private static final String PREFS_HOT_MODULE_REPLACEMENT_KEY = "hot_module_replacement";
 private static final String PREFS_REMOTE_JS_DEBUG_KEY = "remote_js_debug";
 private static final String PREFS_START_SAMPLING_PROFILER_ON_INIT =
 "start_sampling_profiler_on_init";

Expand DownExpand Up@@ -85,16 +84,6 @@ public boolean isDeviceDebugEnabled() {
 return ReactBuildConfig.DEBUG;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return mPreferences.getBoolean(PREFS_REMOTE_JS_DEBUG_KEY, false);
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {
 mPreferences.edit().putBoolean(PREFS_REMOTE_JS_DEBUG_KEY, remoteJSDebugEnabled).apply();
 }

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return mPreferences.getBoolean(PREFS_START_SAMPLING_PROFILER_ON_INIT, false);
Expand Down

65 changes: 0 additions & 65 deletions
...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
Expand DownExpand Up@@ -56,8 +55,6 @@
 * </ul>
 */
public class DevServerHelper {
 public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";

 private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;

 private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
Expand DownExpand Up@@ -237,13 +234,6 @@ protected Void doInBackground(Void... params) {
 }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 }

 public String getWebsocketProxyURL() {
 return String.format(
 Locale.US,
 "ws://%s/debugger-proxy?role=client",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 private String getInspectorDeviceUrl() {
 return String.format(
 Locale.US,
Expand All@@ -261,28 +251,6 @@ public void downloadBundleFromURL(
 mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo);
 }

 public void downloadBundleFromURL(
 DevBundleDownloadListener callback,
 File outputFile,
 String bundleURL,
 BundleDownloader.BundleInfo bundleInfo,
 Request.Builder requestBuilder) {
 mBundleDownloader.downloadBundleFromURL(
 callback, outputFile, bundleURL, bundleInfo, requestBuilder);
 }

 /** @return the host to use when connecting to the bundle server from the host itself. */
 private String getHostForJSProxy() {
 // Use custom port if configured. Note that host stays "localhost".
 String host = Assertions.assertNotNull(mPackagerConnectionSettings.getDebugServerHost());
 int portOffset = host.lastIndexOf(':');
 if (portOffset > -1) {
 return "localhost" + host.substring(portOffset);
 } else {
 return AndroidInfoHelpers.DEVICE_LOCALHOST;
 }
 }

 /** @return whether we should enable dev mode when requesting JS bundles. */
 private boolean getDevMode() {
 return mSettings.isJSDevModeEnabled();
Expand DownExpand Up@@ -345,32 +313,6 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {
 }
 }

 private String createLaunchJSDevtoolsCommandUrl() {
 return String.format(
 Locale.US,
 "http://%s/launch-js-devtools",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 public void launchJSDevtools() {
 Request request = new Request.Builder().url(createLaunchJSDevtoolsCommandUrl()).build();
 mClient
 .newCall(request)
 .enqueue(
 new Callback() {
 @Override
 public void onFailure(@NonNull Call call, @NonNull IOException e) {
 // ignore HTTP call response, this is just to open a debugger page and there is no
 // reason to report failures from here
 }

 @Override
 public void onResponse(@NonNull Call call, @NonNull Response response) {
 // ignore HTTP call response - see above
 }
 });
 }

 public String getSourceMapUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.MAP);
 }
Expand All@@ -379,13 +321,6 @@ public String getSourceUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.BUNDLE);
 }

 public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
 // The host we use when connecting to the JS bundle server from the emulator is not the
 // same as the one needed to connect to the same server from the JavaScript proxy running on the
 // host itself.
 return createBundleURL(mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
 }

 /**
 * This is a debug-only utility to allow fetching a file via packager. It's made synchronous for
 * simplicity, but should only be used if it's absolutely necessary.
Expand Down

32 changes: 0 additions & 32 deletions
...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,12 +154,6 @@ public DevSupportManagerBase(
 public void onReceive(Context context, Intent intent) {
 String action = intent.getAction();
 if (getReloadAppAction(context).equals(action)) {
 if (intent.getBooleanExtra(DevServerHelper.RELOAD_APP_EXTRA_JS_PROXY, false)) {
 mDevSettings.setRemoteJSDebugEnabled(true);
 mDevServerHelper.launchJSDevtools();
 } else {
 mDevSettings.setRemoteJSDebugEnabled(false);
 }
 handleReloadJS();
 }
 }
Expand DownExpand Up@@ -367,13 +361,6 @@ public void onOptionSelected() {

 if (mDevSettings.isDeviceDebugEnabled()) {
 // On-device JS debugging (CDP). Render action to open debugger frontend.

 // Reset the old debugger setting so no one gets stuck.
 // TODO: Remove in a few weeks.
 if (mDevSettings.isRemoteJSDebugEnabled()) {
 mDevSettings.setRemoteJSDebugEnabled(false);
 handleReloadJS();
 }
 options.put(
 mApplicationContext.getString(R.string.catalyst_debug_open),
 () ->
Expand DownExpand Up@@ -595,12 +582,6 @@ public String getSourceUrl() {
 return mDevServerHelper.getSourceUrl(Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getJSBundleURLForRemoteDebugging() {
 return mDevServerHelper.getJSBundleURLForRemoteDebugging(
 Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getDownloadedJSBundleFile() {
 return mJSBundleDownloadedFile.getAbsolutePath();
Expand DownExpand Up@@ -966,19 +947,6 @@ public void setHotModuleReplacementEnabled(final boolean isHotModuleReplacementE
 });
 }

 @Override
 public void setRemoteJSDebugEnabled(final boolean isRemoteJSDebugEnabled) {
 if (!mIsDevSupportEnabled) {
 return;
 }

 UiThreadUtil.runOnUiThread(
 () -> {
 mDevSettings.setRemoteJSDebugEnabled(isRemoteJSDebugEnabled);
 handleReloadJS();
 });
 }

 @Override
 public void setFpsDebugEnabled(final boolean isFpsDebugEnabled) {
 if (!mIsDevSupportEnabled) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove remote JS debugging (Android)#41078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Remove remote JS debugging (Android)
#41078
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
...e/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,14 +41,6 @@ public boolean isDeviceDebugEnabled() {
 return false;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return false;
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {}

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return false;
Expand Down

22 changes: 0 additions & 22 deletions
...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,12 +57,10 @@
import com.facebook.react.bridge.JSExceptionHandler;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
import com.facebook.react.bridge.ProxyJavaScriptExecutor;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactCxxErrorHandler;
Expand DownExpand Up@@ -297,11 +295,6 @@ public static ReactInstanceManagerBuilder builder() {

 private ReactInstanceDevHelper createDevHelperInterface() {
 return new ReactInstanceDevHelper() {
 @Override
 public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
 }

 @Override
 public void onJSBundleLoadedFromServer() {
 ReactInstanceManager.this.onJSBundleLoadedFromServer();
Expand DownExpand Up@@ -448,14 +441,9 @@ public void onPackagerStatusFetched(final boolean packagerIsRunning) {
 if (packagerIsRunning) {
 mDevSupportManager.handleReloadJS();
 } else if (mDevSupportManager.hasUpToDateJSBundleInCache()
 && !devSettings.isRemoteJSDebugEnabled()
 && !mUseFallbackBundle) {
 // If there is a up-to-date bundle downloaded from server,
 // with remote JS debugging disabled, always use that.
 onJSBundleLoadedFromServer();
 } else {
 // If dev server is down, disable the remote JS debugging.
 devSettings.setRemoteJSDebugEnabled(false);
 recreateReactContextInBackgroundFromBundleLoader();
 }
 });
Expand DownExpand Up@@ -1023,16 +1011,6 @@ public String getJsExecutorName() {
 return mJavaScriptExecutorFactory.toString();
 }

 @ThreadConfined(UI)
 private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
 recreateReactContextInBackground(
 new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
 JSBundleLoader.createRemoteDebuggerBundleLoader(
 mDevSupportManager.getJSBundleURLForRemoteDebugging(),
 mDevSupportManager.getSourceUrl()));
 }

 @ThreadConfined(UI)
 private void onJSBundleLoadedFromServer() {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onJSBundleLoadedFromServer()");
Expand Down

15 changes: 0 additions & 15 deletions
...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,21 +92,6 @@ public String loadScript(JSBundleLoaderDelegate delegate) {
 };
 }

 /**
 * This loader is used when proxy debugging is enabled. In that case there is no point in fetching
 * the bundle from device as remote executor will have to do it anyway.
 */
 public static JSBundleLoader createRemoteDebuggerBundleLoader(
 final String proxySourceURL, final String realSourceURL) {
 return new JSBundleLoader() {
 @Override
 public String loadScript(JSBundleLoaderDelegate delegate) {
 delegate.setSourceURLs(realSourceURL, proxySourceURL);
 return realSourceURL;
 }
 };
 }

 /** Loads the script, returning the URL of the source it loaded. */
 public abstract String loadScript(JSBundleLoaderDelegate delegate);
}

71 changes: 5 additions & 66 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,12 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.ReactMarker;
import com.facebook.react.bridge.ReactMarkerConstants;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.SurfaceDelegateFactory;
import com.facebook.react.common.futures.SimpleSettableFuture;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
Expand All@@ -33,9 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

/**
 * Interface for accessing and interacting with development features. Following features
Expand DownExpand Up@@ -136,54 +131,6 @@ public void onError(String url, Throwable cause) {
 });
 }

 private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
 final SimpleSettableFuture<Boolean> future) {
 return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
 @Override
 public void onSuccess() {
 future.set(true);
 hideDevLoadingView();
 }

 @Override
 public void onFailure(final Throwable cause) {
 hideDevLoadingView();
 FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
 future.setException(
 new IOException(
 getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
 cause));
 }
 };
 }

 private void reloadJSInProxyMode() {
 // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
 // anyway
 getDevServerHelper().launchJSDevtools();

 JavaJSExecutor.Factory factory =
 new JavaJSExecutor.Factory() {
 @Override
 public JavaJSExecutor create() throws Exception {
 WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
 SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
 executor.connect(
 getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
 // TODO(t9349129) Don't use timeout
 try {
 future.get(90, TimeUnit.SECONDS);
 return executor;
 } catch (ExecutionException e) {
 throw (Exception) e.getCause();
 } catch (InterruptedException | TimeoutException e) {
 throw new RuntimeException(e);
 }
 }
 };
 getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
 }

 @Override
 public void handleReloadJS() {

Expand All@@ -196,19 +143,11 @@ public void handleReloadJS() {
 // dismiss redbox if exists
 hideRedboxDialog();

 if (getDevSettings().isRemoteJSDebugEnabled()) {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
 showDevLoadingViewForRemoteJSEnabled();
 reloadJSInProxyMode();
 } else {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper()
 .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }

 /** Starts of stops the sampling profiler */
Expand Down

11 changes: 0 additions & 11 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@ class DevInternalSettings
 private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
 private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
 private static final String PREFS_HOT_MODULE_REPLACEMENT_KEY = "hot_module_replacement";
 private static final String PREFS_REMOTE_JS_DEBUG_KEY = "remote_js_debug";
 private static final String PREFS_START_SAMPLING_PROFILER_ON_INIT =
 "start_sampling_profiler_on_init";

Expand DownExpand Up@@ -85,16 +84,6 @@ public boolean isDeviceDebugEnabled() {
 return ReactBuildConfig.DEBUG;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return mPreferences.getBoolean(PREFS_REMOTE_JS_DEBUG_KEY, false);
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {
 mPreferences.edit().putBoolean(PREFS_REMOTE_JS_DEBUG_KEY, remoteJSDebugEnabled).apply();
 }

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return mPreferences.getBoolean(PREFS_START_SAMPLING_PROFILER_ON_INIT, false);
Expand Down

65 changes: 0 additions & 65 deletions
...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
Expand DownExpand Up@@ -56,8 +55,6 @@
 * </ul>
 */
public class DevServerHelper {
 public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";

 private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;

 private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
Expand DownExpand Up@@ -237,13 +234,6 @@ protected Void doInBackground(Void... params) {
 }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 }

 public String getWebsocketProxyURL() {
 return String.format(
 Locale.US,
 "ws://%s/debugger-proxy?role=client",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 private String getInspectorDeviceUrl() {
 return String.format(
 Locale.US,
Expand All@@ -261,28 +251,6 @@ public void downloadBundleFromURL(
 mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo);
 }

 public void downloadBundleFromURL(
 DevBundleDownloadListener callback,
 File outputFile,
 String bundleURL,
 BundleDownloader.BundleInfo bundleInfo,
 Request.Builder requestBuilder) {
 mBundleDownloader.downloadBundleFromURL(
 callback, outputFile, bundleURL, bundleInfo, requestBuilder);
 }

 /** @return the host to use when connecting to the bundle server from the host itself. */
 private String getHostForJSProxy() {
 // Use custom port if configured. Note that host stays "localhost".
 String host = Assertions.assertNotNull(mPackagerConnectionSettings.getDebugServerHost());
 int portOffset = host.lastIndexOf(':');
 if (portOffset > -1) {
 return "localhost" + host.substring(portOffset);
 } else {
 return AndroidInfoHelpers.DEVICE_LOCALHOST;
 }
 }

 /** @return whether we should enable dev mode when requesting JS bundles. */
 private boolean getDevMode() {
 return mSettings.isJSDevModeEnabled();
Expand DownExpand Up@@ -345,32 +313,6 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {
 }
 }

 private String createLaunchJSDevtoolsCommandUrl() {
 return String.format(
 Locale.US,
 "http://%s/launch-js-devtools",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 public void launchJSDevtools() {
 Request request = new Request.Builder().url(createLaunchJSDevtoolsCommandUrl()).build();
 mClient
 .newCall(request)
 .enqueue(
 new Callback() {
 @Override
 public void onFailure(@NonNull Call call, @NonNull IOException e) {
 // ignore HTTP call response, this is just to open a debugger page and there is no
 // reason to report failures from here
 }

 @Override
 public void onResponse(@NonNull Call call, @NonNull Response response) {
 // ignore HTTP call response - see above
 }
 });
 }

 public String getSourceMapUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.MAP);
 }
Expand All@@ -379,13 +321,6 @@ public String getSourceUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.BUNDLE);
 }

 public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
 // The host we use when connecting to the JS bundle server from the emulator is not the
 // same as the one needed to connect to the same server from the JavaScript proxy running on the
 // host itself.
 return createBundleURL(mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
 }

 /**
 * This is a debug-only utility to allow fetching a file via packager. It's made synchronous for
 * simplicity, but should only be used if it's absolutely necessary.
Expand Down

32 changes: 0 additions & 32 deletions
...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,12 +154,6 @@ public DevSupportManagerBase(
 public void onReceive(Context context, Intent intent) {
 String action = intent.getAction();
 if (getReloadAppAction(context).equals(action)) {
 if (intent.getBooleanExtra(DevServerHelper.RELOAD_APP_EXTRA_JS_PROXY, false)) {
 mDevSettings.setRemoteJSDebugEnabled(true);
 mDevServerHelper.launchJSDevtools();
 } else {
 mDevSettings.setRemoteJSDebugEnabled(false);
 }
 handleReloadJS();
 }
 }
Expand DownExpand Up@@ -367,13 +361,6 @@ public void onOptionSelected() {

 if (mDevSettings.isDeviceDebugEnabled()) {
 // On-device JS debugging (CDP). Render action to open debugger frontend.

 // Reset the old debugger setting so no one gets stuck.
 // TODO: Remove in a few weeks.
 if (mDevSettings.isRemoteJSDebugEnabled()) {
 mDevSettings.setRemoteJSDebugEnabled(false);
 handleReloadJS();
 }
 options.put(
 mApplicationContext.getString(R.string.catalyst_debug_open),
 () ->
Expand DownExpand Up@@ -595,12 +582,6 @@ public String getSourceUrl() {
 return mDevServerHelper.getSourceUrl(Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getJSBundleURLForRemoteDebugging() {
 return mDevServerHelper.getJSBundleURLForRemoteDebugging(
 Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getDownloadedJSBundleFile() {
 return mJSBundleDownloadedFile.getAbsolutePath();
Expand DownExpand Up@@ -966,19 +947,6 @@ public void setHotModuleReplacementEnabled(final boolean isHotModuleReplacementE
 });
 }

 @Override
 public void setRemoteJSDebugEnabled(final boolean isRemoteJSDebugEnabled) {
 if (!mIsDevSupportEnabled) {
 return;
 }

 UiThreadUtil.runOnUiThread(
 () -> {
 mDevSettings.setRemoteJSDebugEnabled(isRemoteJSDebugEnabled);
 handleReloadJS();
 });
 }

 @Override
 public void setFpsDebugEnabled(final boolean isFpsDebugEnabled) {
 if (!mIsDevSupportEnabled) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove remote JS debugging (Android)#41078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Remove remote JS debugging (Android)
#41078
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
...e/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,14 +41,6 @@ public boolean isDeviceDebugEnabled() {
 return false;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return false;
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {}

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return false;
Expand Down

22 changes: 0 additions & 22 deletions
...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,12 +57,10 @@
import com.facebook.react.bridge.JSExceptionHandler;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
import com.facebook.react.bridge.ProxyJavaScriptExecutor;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactCxxErrorHandler;
Expand DownExpand Up@@ -297,11 +295,6 @@ public static ReactInstanceManagerBuilder builder() {

 private ReactInstanceDevHelper createDevHelperInterface() {
 return new ReactInstanceDevHelper() {
 @Override
 public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
 }

 @Override
 public void onJSBundleLoadedFromServer() {
 ReactInstanceManager.this.onJSBundleLoadedFromServer();
Expand DownExpand Up@@ -448,14 +441,9 @@ public void onPackagerStatusFetched(final boolean packagerIsRunning) {
 if (packagerIsRunning) {
 mDevSupportManager.handleReloadJS();
 } else if (mDevSupportManager.hasUpToDateJSBundleInCache()
 && !devSettings.isRemoteJSDebugEnabled()
 && !mUseFallbackBundle) {
 // If there is a up-to-date bundle downloaded from server,
 // with remote JS debugging disabled, always use that.
 onJSBundleLoadedFromServer();
 } else {
 // If dev server is down, disable the remote JS debugging.
 devSettings.setRemoteJSDebugEnabled(false);
 recreateReactContextInBackgroundFromBundleLoader();
 }
 });
Expand DownExpand Up@@ -1023,16 +1011,6 @@ public String getJsExecutorName() {
 return mJavaScriptExecutorFactory.toString();
 }

 @ThreadConfined(UI)
 private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
 recreateReactContextInBackground(
 new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
 JSBundleLoader.createRemoteDebuggerBundleLoader(
 mDevSupportManager.getJSBundleURLForRemoteDebugging(),
 mDevSupportManager.getSourceUrl()));
 }

 @ThreadConfined(UI)
 private void onJSBundleLoadedFromServer() {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onJSBundleLoadedFromServer()");
Expand Down

15 changes: 0 additions & 15 deletions
...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,21 +92,6 @@ public String loadScript(JSBundleLoaderDelegate delegate) {
 };
 }

 /**
 * This loader is used when proxy debugging is enabled. In that case there is no point in fetching
 * the bundle from device as remote executor will have to do it anyway.
 */
 public static JSBundleLoader createRemoteDebuggerBundleLoader(
 final String proxySourceURL, final String realSourceURL) {
 return new JSBundleLoader() {
 @Override
 public String loadScript(JSBundleLoaderDelegate delegate) {
 delegate.setSourceURLs(realSourceURL, proxySourceURL);
 return realSourceURL;
 }
 };
 }

 /** Loads the script, returning the URL of the source it loaded. */
 public abstract String loadScript(JSBundleLoaderDelegate delegate);
}

71 changes: 5 additions & 66 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,12 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.ReactMarker;
import com.facebook.react.bridge.ReactMarkerConstants;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.SurfaceDelegateFactory;
import com.facebook.react.common.futures.SimpleSettableFuture;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
Expand All@@ -33,9 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

/**
 * Interface for accessing and interacting with development features. Following features
Expand DownExpand Up@@ -136,54 +131,6 @@ public void onError(String url, Throwable cause) {
 });
 }

 private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
 final SimpleSettableFuture<Boolean> future) {
 return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
 @Override
 public void onSuccess() {
 future.set(true);
 hideDevLoadingView();
 }

 @Override
 public void onFailure(final Throwable cause) {
 hideDevLoadingView();
 FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
 future.setException(
 new IOException(
 getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
 cause));
 }
 };
 }

 private void reloadJSInProxyMode() {
 // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
 // anyway
 getDevServerHelper().launchJSDevtools();

 JavaJSExecutor.Factory factory =
 new JavaJSExecutor.Factory() {
 @Override
 public JavaJSExecutor create() throws Exception {
 WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
 SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
 executor.connect(
 getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
 // TODO(t9349129) Don't use timeout
 try {
 future.get(90, TimeUnit.SECONDS);
 return executor;
 } catch (ExecutionException e) {
 throw (Exception) e.getCause();
 } catch (InterruptedException | TimeoutException e) {
 throw new RuntimeException(e);
 }
 }
 };
 getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
 }

 @Override
 public void handleReloadJS() {

Expand All@@ -196,19 +143,11 @@ public void handleReloadJS() {
 // dismiss redbox if exists
 hideRedboxDialog();

 if (getDevSettings().isRemoteJSDebugEnabled()) {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
 showDevLoadingViewForRemoteJSEnabled();
 reloadJSInProxyMode();
 } else {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper()
 .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }

 /** Starts of stops the sampling profiler */
Expand Down

11 changes: 0 additions & 11 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@ class DevInternalSettings
 private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
 private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
 private static final String PREFS_HOT_MODULE_REPLACEMENT_KEY = "hot_module_replacement";
 private static final String PREFS_REMOTE_JS_DEBUG_KEY = "remote_js_debug";
 private static final String PREFS_START_SAMPLING_PROFILER_ON_INIT =
 "start_sampling_profiler_on_init";

Expand DownExpand Up@@ -85,16 +84,6 @@ public boolean isDeviceDebugEnabled() {
 return ReactBuildConfig.DEBUG;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return mPreferences.getBoolean(PREFS_REMOTE_JS_DEBUG_KEY, false);
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {
 mPreferences.edit().putBoolean(PREFS_REMOTE_JS_DEBUG_KEY, remoteJSDebugEnabled).apply();
 }

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return mPreferences.getBoolean(PREFS_START_SAMPLING_PROFILER_ON_INIT, false);
Expand Down

65 changes: 0 additions & 65 deletions
...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
Expand DownExpand Up@@ -56,8 +55,6 @@
 * </ul>
 */
public class DevServerHelper {
 public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";

 private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;

 private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
Expand DownExpand Up@@ -237,13 +234,6 @@ protected Void doInBackground(Void... params) {
 }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 }

 public String getWebsocketProxyURL() {
 return String.format(
 Locale.US,
 "ws://%s/debugger-proxy?role=client",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 private String getInspectorDeviceUrl() {
 return String.format(
 Locale.US,
Expand All@@ -261,28 +251,6 @@ public void downloadBundleFromURL(
 mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo);
 }

 public void downloadBundleFromURL(
 DevBundleDownloadListener callback,
 File outputFile,
 String bundleURL,
 BundleDownloader.BundleInfo bundleInfo,
 Request.Builder requestBuilder) {
 mBundleDownloader.downloadBundleFromURL(
 callback, outputFile, bundleURL, bundleInfo, requestBuilder);
 }

 /** @return the host to use when connecting to the bundle server from the host itself. */
 private String getHostForJSProxy() {
 // Use custom port if configured. Note that host stays "localhost".
 String host = Assertions.assertNotNull(mPackagerConnectionSettings.getDebugServerHost());
 int portOffset = host.lastIndexOf(':');
 if (portOffset > -1) {
 return "localhost" + host.substring(portOffset);
 } else {
 return AndroidInfoHelpers.DEVICE_LOCALHOST;
 }
 }

 /** @return whether we should enable dev mode when requesting JS bundles. */
 private boolean getDevMode() {
 return mSettings.isJSDevModeEnabled();
Expand DownExpand Up@@ -345,32 +313,6 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {
 }
 }

 private String createLaunchJSDevtoolsCommandUrl() {
 return String.format(
 Locale.US,
 "http://%s/launch-js-devtools",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 public void launchJSDevtools() {
 Request request = new Request.Builder().url(createLaunchJSDevtoolsCommandUrl()).build();
 mClient
 .newCall(request)
 .enqueue(
 new Callback() {
 @Override
 public void onFailure(@NonNull Call call, @NonNull IOException e) {
 // ignore HTTP call response, this is just to open a debugger page and there is no
 // reason to report failures from here
 }

 @Override
 public void onResponse(@NonNull Call call, @NonNull Response response) {
 // ignore HTTP call response - see above
 }
 });
 }

 public String getSourceMapUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.MAP);
 }
Expand All@@ -379,13 +321,6 @@ public String getSourceUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.BUNDLE);
 }

 public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
 // The host we use when connecting to the JS bundle server from the emulator is not the
 // same as the one needed to connect to the same server from the JavaScript proxy running on the
 // host itself.
 return createBundleURL(mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
 }

 /**
 * This is a debug-only utility to allow fetching a file via packager. It's made synchronous for
 * simplicity, but should only be used if it's absolutely necessary.
Expand Down

32 changes: 0 additions & 32 deletions
...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,12 +154,6 @@ public DevSupportManagerBase(
 public void onReceive(Context context, Intent intent) {
 String action = intent.getAction();
 if (getReloadAppAction(context).equals(action)) {
 if (intent.getBooleanExtra(DevServerHelper.RELOAD_APP_EXTRA_JS_PROXY, false)) {
 mDevSettings.setRemoteJSDebugEnabled(true);
 mDevServerHelper.launchJSDevtools();
 } else {
 mDevSettings.setRemoteJSDebugEnabled(false);
 }
 handleReloadJS();
 }
 }
Expand DownExpand Up@@ -367,13 +361,6 @@ public void onOptionSelected() {

 if (mDevSettings.isDeviceDebugEnabled()) {
 // On-device JS debugging (CDP). Render action to open debugger frontend.

 // Reset the old debugger setting so no one gets stuck.
 // TODO: Remove in a few weeks.
 if (mDevSettings.isRemoteJSDebugEnabled()) {
 mDevSettings.setRemoteJSDebugEnabled(false);
 handleReloadJS();
 }
 options.put(
 mApplicationContext.getString(R.string.catalyst_debug_open),
 () ->
Expand DownExpand Up@@ -595,12 +582,6 @@ public String getSourceUrl() {
 return mDevServerHelper.getSourceUrl(Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getJSBundleURLForRemoteDebugging() {
 return mDevServerHelper.getJSBundleURLForRemoteDebugging(
 Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getDownloadedJSBundleFile() {
 return mJSBundleDownloadedFile.getAbsolutePath();
Expand DownExpand Up@@ -966,19 +947,6 @@ public void setHotModuleReplacementEnabled(final boolean isHotModuleReplacementE
 });
 }

 @Override
 public void setRemoteJSDebugEnabled(final boolean isRemoteJSDebugEnabled) {
 if (!mIsDevSupportEnabled) {
 return;
 }

 UiThreadUtil.runOnUiThread(
 () -> {
 mDevSettings.setRemoteJSDebugEnabled(isRemoteJSDebugEnabled);
 handleReloadJS();
 });
 }

 @Override
 public void setFpsDebugEnabled(final boolean isFpsDebugEnabled) {
 if (!mIsDevSupportEnabled) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove remote JS debugging (Android)#41078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Remove remote JS debugging (Android)
#41078
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
...e/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,14 +41,6 @@ public boolean isDeviceDebugEnabled() {
 return false;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return false;
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {}

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return false;
Expand Down

22 changes: 0 additions & 22 deletions
...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,12 +57,10 @@
import com.facebook.react.bridge.JSExceptionHandler;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
import com.facebook.react.bridge.ProxyJavaScriptExecutor;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactCxxErrorHandler;
Expand DownExpand Up@@ -297,11 +295,6 @@ public static ReactInstanceManagerBuilder builder() {

 private ReactInstanceDevHelper createDevHelperInterface() {
 return new ReactInstanceDevHelper() {
 @Override
 public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
 }

 @Override
 public void onJSBundleLoadedFromServer() {
 ReactInstanceManager.this.onJSBundleLoadedFromServer();
Expand DownExpand Up@@ -448,14 +441,9 @@ public void onPackagerStatusFetched(final boolean packagerIsRunning) {
 if (packagerIsRunning) {
 mDevSupportManager.handleReloadJS();
 } else if (mDevSupportManager.hasUpToDateJSBundleInCache()
 && !devSettings.isRemoteJSDebugEnabled()
 && !mUseFallbackBundle) {
 // If there is a up-to-date bundle downloaded from server,
 // with remote JS debugging disabled, always use that.
 onJSBundleLoadedFromServer();
 } else {
 // If dev server is down, disable the remote JS debugging.
 devSettings.setRemoteJSDebugEnabled(false);
 recreateReactContextInBackgroundFromBundleLoader();
 }
 });
Expand DownExpand Up@@ -1023,16 +1011,6 @@ public String getJsExecutorName() {
 return mJavaScriptExecutorFactory.toString();
 }

 @ThreadConfined(UI)
 private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
 recreateReactContextInBackground(
 new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
 JSBundleLoader.createRemoteDebuggerBundleLoader(
 mDevSupportManager.getJSBundleURLForRemoteDebugging(),
 mDevSupportManager.getSourceUrl()));
 }

 @ThreadConfined(UI)
 private void onJSBundleLoadedFromServer() {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onJSBundleLoadedFromServer()");
Expand Down

15 changes: 0 additions & 15 deletions
...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,21 +92,6 @@ public String loadScript(JSBundleLoaderDelegate delegate) {
 };
 }

 /**
 * This loader is used when proxy debugging is enabled. In that case there is no point in fetching
 * the bundle from device as remote executor will have to do it anyway.
 */
 public static JSBundleLoader createRemoteDebuggerBundleLoader(
 final String proxySourceURL, final String realSourceURL) {
 return new JSBundleLoader() {
 @Override
 public String loadScript(JSBundleLoaderDelegate delegate) {
 delegate.setSourceURLs(realSourceURL, proxySourceURL);
 return realSourceURL;
 }
 };
 }

 /** Loads the script, returning the URL of the source it loaded. */
 public abstract String loadScript(JSBundleLoaderDelegate delegate);
}

71 changes: 5 additions & 66 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,12 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.ReactMarker;
import com.facebook.react.bridge.ReactMarkerConstants;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.SurfaceDelegateFactory;
import com.facebook.react.common.futures.SimpleSettableFuture;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
Expand All@@ -33,9 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

/**
 * Interface for accessing and interacting with development features. Following features
Expand DownExpand Up@@ -136,54 +131,6 @@ public void onError(String url, Throwable cause) {
 });
 }

 private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
 final SimpleSettableFuture<Boolean> future) {
 return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
 @Override
 public void onSuccess() {
 future.set(true);
 hideDevLoadingView();
 }

 @Override
 public void onFailure(final Throwable cause) {
 hideDevLoadingView();
 FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
 future.setException(
 new IOException(
 getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
 cause));
 }
 };
 }

 private void reloadJSInProxyMode() {
 // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
 // anyway
 getDevServerHelper().launchJSDevtools();

 JavaJSExecutor.Factory factory =
 new JavaJSExecutor.Factory() {
 @Override
 public JavaJSExecutor create() throws Exception {
 WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
 SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
 executor.connect(
 getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
 // TODO(t9349129) Don't use timeout
 try {
 future.get(90, TimeUnit.SECONDS);
 return executor;
 } catch (ExecutionException e) {
 throw (Exception) e.getCause();
 } catch (InterruptedException | TimeoutException e) {
 throw new RuntimeException(e);
 }
 }
 };
 getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
 }

 @Override
 public void handleReloadJS() {

Expand All@@ -196,19 +143,11 @@ public void handleReloadJS() {
 // dismiss redbox if exists
 hideRedboxDialog();

 if (getDevSettings().isRemoteJSDebugEnabled()) {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
 showDevLoadingViewForRemoteJSEnabled();
 reloadJSInProxyMode();
 } else {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper()
 .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }

 /** Starts of stops the sampling profiler */
Expand Down

11 changes: 0 additions & 11 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@ class DevInternalSettings
 private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
 private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
 private static final String PREFS_HOT_MODULE_REPLACEMENT_KEY = "hot_module_replacement";
 private static final String PREFS_REMOTE_JS_DEBUG_KEY = "remote_js_debug";
 private static final String PREFS_START_SAMPLING_PROFILER_ON_INIT =
 "start_sampling_profiler_on_init";

Expand DownExpand Up@@ -85,16 +84,6 @@ public boolean isDeviceDebugEnabled() {
 return ReactBuildConfig.DEBUG;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return mPreferences.getBoolean(PREFS_REMOTE_JS_DEBUG_KEY, false);
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {
 mPreferences.edit().putBoolean(PREFS_REMOTE_JS_DEBUG_KEY, remoteJSDebugEnabled).apply();
 }

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return mPreferences.getBoolean(PREFS_START_SAMPLING_PROFILER_ON_INIT, false);
Expand Down

65 changes: 0 additions & 65 deletions
...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
Expand DownExpand Up@@ -56,8 +55,6 @@
 * </ul>
 */
public class DevServerHelper {
 public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";

 private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;

 private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
Expand DownExpand Up@@ -237,13 +234,6 @@ protected Void doInBackground(Void... params) {
 }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 }

 public String getWebsocketProxyURL() {
 return String.format(
 Locale.US,
 "ws://%s/debugger-proxy?role=client",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 private String getInspectorDeviceUrl() {
 return String.format(
 Locale.US,
Expand All@@ -261,28 +251,6 @@ public void downloadBundleFromURL(
 mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo);
 }

 public void downloadBundleFromURL(
 DevBundleDownloadListener callback,
 File outputFile,
 String bundleURL,
 BundleDownloader.BundleInfo bundleInfo,
 Request.Builder requestBuilder) {
 mBundleDownloader.downloadBundleFromURL(
 callback, outputFile, bundleURL, bundleInfo, requestBuilder);
 }

 /** @return the host to use when connecting to the bundle server from the host itself. */
 private String getHostForJSProxy() {
 // Use custom port if configured. Note that host stays "localhost".
 String host = Assertions.assertNotNull(mPackagerConnectionSettings.getDebugServerHost());
 int portOffset = host.lastIndexOf(':');
 if (portOffset > -1) {
 return "localhost" + host.substring(portOffset);
 } else {
 return AndroidInfoHelpers.DEVICE_LOCALHOST;
 }
 }

 /** @return whether we should enable dev mode when requesting JS bundles. */
 private boolean getDevMode() {
 return mSettings.isJSDevModeEnabled();
Expand DownExpand Up@@ -345,32 +313,6 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {
 }
 }

 private String createLaunchJSDevtoolsCommandUrl() {
 return String.format(
 Locale.US,
 "http://%s/launch-js-devtools",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 public void launchJSDevtools() {
 Request request = new Request.Builder().url(createLaunchJSDevtoolsCommandUrl()).build();
 mClient
 .newCall(request)
 .enqueue(
 new Callback() {
 @Override
 public void onFailure(@NonNull Call call, @NonNull IOException e) {
 // ignore HTTP call response, this is just to open a debugger page and there is no
 // reason to report failures from here
 }

 @Override
 public void onResponse(@NonNull Call call, @NonNull Response response) {
 // ignore HTTP call response - see above
 }
 });
 }

 public String getSourceMapUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.MAP);
 }
Expand All@@ -379,13 +321,6 @@ public String getSourceUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.BUNDLE);
 }

 public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
 // The host we use when connecting to the JS bundle server from the emulator is not the
 // same as the one needed to connect to the same server from the JavaScript proxy running on the
 // host itself.
 return createBundleURL(mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
 }

 /**
 * This is a debug-only utility to allow fetching a file via packager. It's made synchronous for
 * simplicity, but should only be used if it's absolutely necessary.
Expand Down

32 changes: 0 additions & 32 deletions
...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,12 +154,6 @@ public DevSupportManagerBase(
 public void onReceive(Context context, Intent intent) {
 String action = intent.getAction();
 if (getReloadAppAction(context).equals(action)) {
 if (intent.getBooleanExtra(DevServerHelper.RELOAD_APP_EXTRA_JS_PROXY, false)) {
 mDevSettings.setRemoteJSDebugEnabled(true);
 mDevServerHelper.launchJSDevtools();
 } else {
 mDevSettings.setRemoteJSDebugEnabled(false);
 }
 handleReloadJS();
 }
 }
Expand DownExpand Up@@ -367,13 +361,6 @@ public void onOptionSelected() {

 if (mDevSettings.isDeviceDebugEnabled()) {
 // On-device JS debugging (CDP). Render action to open debugger frontend.

 // Reset the old debugger setting so no one gets stuck.
 // TODO: Remove in a few weeks.
 if (mDevSettings.isRemoteJSDebugEnabled()) {
 mDevSettings.setRemoteJSDebugEnabled(false);
 handleReloadJS();
 }
 options.put(
 mApplicationContext.getString(R.string.catalyst_debug_open),
 () ->
Expand DownExpand Up@@ -595,12 +582,6 @@ public String getSourceUrl() {
 return mDevServerHelper.getSourceUrl(Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getJSBundleURLForRemoteDebugging() {
 return mDevServerHelper.getJSBundleURLForRemoteDebugging(
 Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getDownloadedJSBundleFile() {
 return mJSBundleDownloadedFile.getAbsolutePath();
Expand DownExpand Up@@ -966,19 +947,6 @@ public void setHotModuleReplacementEnabled(final boolean isHotModuleReplacementE
 });
 }

 @Override
 public void setRemoteJSDebugEnabled(final boolean isRemoteJSDebugEnabled) {
 if (!mIsDevSupportEnabled) {
 return;
 }

 UiThreadUtil.runOnUiThread(
 () -> {
 mDevSettings.setRemoteJSDebugEnabled(isRemoteJSDebugEnabled);
 handleReloadJS();
 });
 }

 @Override
 public void setFpsDebugEnabled(final boolean isFpsDebugEnabled) {
 if (!mIsDevSupportEnabled) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove remote JS debugging (Android)#41078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Remove remote JS debugging (Android)
#41078
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
...e/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,14 +41,6 @@ public boolean isDeviceDebugEnabled() {
 return false;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return false;
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {}

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return false;
Expand Down

22 changes: 0 additions & 22 deletions
...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,12 +57,10 @@
import com.facebook.react.bridge.JSExceptionHandler;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
import com.facebook.react.bridge.ProxyJavaScriptExecutor;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactCxxErrorHandler;
Expand DownExpand Up@@ -297,11 +295,6 @@ public static ReactInstanceManagerBuilder builder() {

 private ReactInstanceDevHelper createDevHelperInterface() {
 return new ReactInstanceDevHelper() {
 @Override
 public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
 }

 @Override
 public void onJSBundleLoadedFromServer() {
 ReactInstanceManager.this.onJSBundleLoadedFromServer();
Expand DownExpand Up@@ -448,14 +441,9 @@ public void onPackagerStatusFetched(final boolean packagerIsRunning) {
 if (packagerIsRunning) {
 mDevSupportManager.handleReloadJS();
 } else if (mDevSupportManager.hasUpToDateJSBundleInCache()
 && !devSettings.isRemoteJSDebugEnabled()
 && !mUseFallbackBundle) {
 // If there is a up-to-date bundle downloaded from server,
 // with remote JS debugging disabled, always use that.
 onJSBundleLoadedFromServer();
 } else {
 // If dev server is down, disable the remote JS debugging.
 devSettings.setRemoteJSDebugEnabled(false);
 recreateReactContextInBackgroundFromBundleLoader();
 }
 });
Expand DownExpand Up@@ -1023,16 +1011,6 @@ public String getJsExecutorName() {
 return mJavaScriptExecutorFactory.toString();
 }

 @ThreadConfined(UI)
 private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
 recreateReactContextInBackground(
 new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
 JSBundleLoader.createRemoteDebuggerBundleLoader(
 mDevSupportManager.getJSBundleURLForRemoteDebugging(),
 mDevSupportManager.getSourceUrl()));
 }

 @ThreadConfined(UI)
 private void onJSBundleLoadedFromServer() {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onJSBundleLoadedFromServer()");
Expand Down

15 changes: 0 additions & 15 deletions
...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,21 +92,6 @@ public String loadScript(JSBundleLoaderDelegate delegate) {
 };
 }

 /**
 * This loader is used when proxy debugging is enabled. In that case there is no point in fetching
 * the bundle from device as remote executor will have to do it anyway.
 */
 public static JSBundleLoader createRemoteDebuggerBundleLoader(
 final String proxySourceURL, final String realSourceURL) {
 return new JSBundleLoader() {
 @Override
 public String loadScript(JSBundleLoaderDelegate delegate) {
 delegate.setSourceURLs(realSourceURL, proxySourceURL);
 return realSourceURL;
 }
 };
 }

 /** Loads the script, returning the URL of the source it loaded. */
 public abstract String loadScript(JSBundleLoaderDelegate delegate);
}

71 changes: 5 additions & 66 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,12 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.ReactMarker;
import com.facebook.react.bridge.ReactMarkerConstants;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.SurfaceDelegateFactory;
import com.facebook.react.common.futures.SimpleSettableFuture;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
Expand All@@ -33,9 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

/**
 * Interface for accessing and interacting with development features. Following features
Expand DownExpand Up@@ -136,54 +131,6 @@ public void onError(String url, Throwable cause) {
 });
 }

 private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
 final SimpleSettableFuture<Boolean> future) {
 return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
 @Override
 public void onSuccess() {
 future.set(true);
 hideDevLoadingView();
 }

 @Override
 public void onFailure(final Throwable cause) {
 hideDevLoadingView();
 FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
 future.setException(
 new IOException(
 getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
 cause));
 }
 };
 }

 private void reloadJSInProxyMode() {
 // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
 // anyway
 getDevServerHelper().launchJSDevtools();

 JavaJSExecutor.Factory factory =
 new JavaJSExecutor.Factory() {
 @Override
 public JavaJSExecutor create() throws Exception {
 WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
 SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
 executor.connect(
 getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
 // TODO(t9349129) Don't use timeout
 try {
 future.get(90, TimeUnit.SECONDS);
 return executor;
 } catch (ExecutionException e) {
 throw (Exception) e.getCause();
 } catch (InterruptedException | TimeoutException e) {
 throw new RuntimeException(e);
 }
 }
 };
 getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
 }

 @Override
 public void handleReloadJS() {

Expand All@@ -196,19 +143,11 @@ public void handleReloadJS() {
 // dismiss redbox if exists
 hideRedboxDialog();

 if (getDevSettings().isRemoteJSDebugEnabled()) {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
 showDevLoadingViewForRemoteJSEnabled();
 reloadJSInProxyMode();
 } else {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper()
 .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }

 /** Starts of stops the sampling profiler */
Expand Down

11 changes: 0 additions & 11 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@ class DevInternalSettings
 private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
 private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
 private static final String PREFS_HOT_MODULE_REPLACEMENT_KEY = "hot_module_replacement";
 private static final String PREFS_REMOTE_JS_DEBUG_KEY = "remote_js_debug";
 private static final String PREFS_START_SAMPLING_PROFILER_ON_INIT =
 "start_sampling_profiler_on_init";

Expand DownExpand Up@@ -85,16 +84,6 @@ public boolean isDeviceDebugEnabled() {
 return ReactBuildConfig.DEBUG;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return mPreferences.getBoolean(PREFS_REMOTE_JS_DEBUG_KEY, false);
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {
 mPreferences.edit().putBoolean(PREFS_REMOTE_JS_DEBUG_KEY, remoteJSDebugEnabled).apply();
 }

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return mPreferences.getBoolean(PREFS_START_SAMPLING_PROFILER_ON_INIT, false);
Expand Down

65 changes: 0 additions & 65 deletions
...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
Expand DownExpand Up@@ -56,8 +55,6 @@
 * </ul>
 */
public class DevServerHelper {
 public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";

 private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;

 private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
Expand DownExpand Up@@ -237,13 +234,6 @@ protected Void doInBackground(Void... params) {
 }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 }

 public String getWebsocketProxyURL() {
 return String.format(
 Locale.US,
 "ws://%s/debugger-proxy?role=client",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 private String getInspectorDeviceUrl() {
 return String.format(
 Locale.US,
Expand All@@ -261,28 +251,6 @@ public void downloadBundleFromURL(
 mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo);
 }

 public void downloadBundleFromURL(
 DevBundleDownloadListener callback,
 File outputFile,
 String bundleURL,
 BundleDownloader.BundleInfo bundleInfo,
 Request.Builder requestBuilder) {
 mBundleDownloader.downloadBundleFromURL(
 callback, outputFile, bundleURL, bundleInfo, requestBuilder);
 }

 /** @return the host to use when connecting to the bundle server from the host itself. */
 private String getHostForJSProxy() {
 // Use custom port if configured. Note that host stays "localhost".
 String host = Assertions.assertNotNull(mPackagerConnectionSettings.getDebugServerHost());
 int portOffset = host.lastIndexOf(':');
 if (portOffset > -1) {
 return "localhost" + host.substring(portOffset);
 } else {
 return AndroidInfoHelpers.DEVICE_LOCALHOST;
 }
 }

 /** @return whether we should enable dev mode when requesting JS bundles. */
 private boolean getDevMode() {
 return mSettings.isJSDevModeEnabled();
Expand DownExpand Up@@ -345,32 +313,6 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {
 }
 }

 private String createLaunchJSDevtoolsCommandUrl() {
 return String.format(
 Locale.US,
 "http://%s/launch-js-devtools",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 public void launchJSDevtools() {
 Request request = new Request.Builder().url(createLaunchJSDevtoolsCommandUrl()).build();
 mClient
 .newCall(request)
 .enqueue(
 new Callback() {
 @Override
 public void onFailure(@NonNull Call call, @NonNull IOException e) {
 // ignore HTTP call response, this is just to open a debugger page and there is no
 // reason to report failures from here
 }

 @Override
 public void onResponse(@NonNull Call call, @NonNull Response response) {
 // ignore HTTP call response - see above
 }
 });
 }

 public String getSourceMapUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.MAP);
 }
Expand All@@ -379,13 +321,6 @@ public String getSourceUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.BUNDLE);
 }

 public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
 // The host we use when connecting to the JS bundle server from the emulator is not the
 // same as the one needed to connect to the same server from the JavaScript proxy running on the
 // host itself.
 return createBundleURL(mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
 }

 /**
 * This is a debug-only utility to allow fetching a file via packager. It's made synchronous for
 * simplicity, but should only be used if it's absolutely necessary.
Expand Down

32 changes: 0 additions & 32 deletions
...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,12 +154,6 @@ public DevSupportManagerBase(
 public void onReceive(Context context, Intent intent) {
 String action = intent.getAction();
 if (getReloadAppAction(context).equals(action)) {
 if (intent.getBooleanExtra(DevServerHelper.RELOAD_APP_EXTRA_JS_PROXY, false)) {
 mDevSettings.setRemoteJSDebugEnabled(true);
 mDevServerHelper.launchJSDevtools();
 } else {
 mDevSettings.setRemoteJSDebugEnabled(false);
 }
 handleReloadJS();
 }
 }
Expand DownExpand Up@@ -367,13 +361,6 @@ public void onOptionSelected() {

 if (mDevSettings.isDeviceDebugEnabled()) {
 // On-device JS debugging (CDP). Render action to open debugger frontend.

 // Reset the old debugger setting so no one gets stuck.
 // TODO: Remove in a few weeks.
 if (mDevSettings.isRemoteJSDebugEnabled()) {
 mDevSettings.setRemoteJSDebugEnabled(false);
 handleReloadJS();
 }
 options.put(
 mApplicationContext.getString(R.string.catalyst_debug_open),
 () ->
Expand DownExpand Up@@ -595,12 +582,6 @@ public String getSourceUrl() {
 return mDevServerHelper.getSourceUrl(Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getJSBundleURLForRemoteDebugging() {
 return mDevServerHelper.getJSBundleURLForRemoteDebugging(
 Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getDownloadedJSBundleFile() {
 return mJSBundleDownloadedFile.getAbsolutePath();
Expand DownExpand Up@@ -966,19 +947,6 @@ public void setHotModuleReplacementEnabled(final boolean isHotModuleReplacementE
 });
 }

 @Override
 public void setRemoteJSDebugEnabled(final boolean isRemoteJSDebugEnabled) {
 if (!mIsDevSupportEnabled) {
 return;
 }

 UiThreadUtil.runOnUiThread(
 () -> {
 mDevSettings.setRemoteJSDebugEnabled(isRemoteJSDebugEnabled);
 handleReloadJS();
 });
 }

 @Override
 public void setFpsDebugEnabled(final boolean isFpsDebugEnabled) {
 if (!mIsDevSupportEnabled) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove remote JS debugging (Android)#41078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Remove remote JS debugging (Android)
#41078
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 0 additions & 8 deletions
...e/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,14 +41,6 @@ public boolean isDeviceDebugEnabled() {
 return false;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return false;
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {}

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return false;
Expand Down

22 changes: 0 additions & 22 deletions
...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,12 +57,10 @@
import com.facebook.react.bridge.JSExceptionHandler;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.NativeModuleRegistry;
import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
import com.facebook.react.bridge.ProxyJavaScriptExecutor;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactCxxErrorHandler;
Expand DownExpand Up@@ -297,11 +295,6 @@ public static ReactInstanceManagerBuilder builder() {

 private ReactInstanceDevHelper createDevHelperInterface() {
 return new ReactInstanceDevHelper() {
 @Override
 public void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 ReactInstanceManager.this.onReloadWithJSDebugger(jsExecutorFactory);
 }

 @Override
 public void onJSBundleLoadedFromServer() {
 ReactInstanceManager.this.onJSBundleLoadedFromServer();
Expand DownExpand Up@@ -448,14 +441,9 @@ public void onPackagerStatusFetched(final boolean packagerIsRunning) {
 if (packagerIsRunning) {
 mDevSupportManager.handleReloadJS();
 } else if (mDevSupportManager.hasUpToDateJSBundleInCache()
 && !devSettings.isRemoteJSDebugEnabled()
 && !mUseFallbackBundle) {
 // If there is a up-to-date bundle downloaded from server,
 // with remote JS debugging disabled, always use that.
 onJSBundleLoadedFromServer();
 } else {
 // If dev server is down, disable the remote JS debugging.
 devSettings.setRemoteJSDebugEnabled(false);
 recreateReactContextInBackgroundFromBundleLoader();
 }
 });
Expand DownExpand Up@@ -1023,16 +1011,6 @@ public String getJsExecutorName() {
 return mJavaScriptExecutorFactory.toString();
 }

 @ThreadConfined(UI)
 private void onReloadWithJSDebugger(JavaJSExecutor.Factory jsExecutorFactory) {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onReloadWithJSDebugger()");
 recreateReactContextInBackground(
 new ProxyJavaScriptExecutor.Factory(jsExecutorFactory),
 JSBundleLoader.createRemoteDebuggerBundleLoader(
 mDevSupportManager.getJSBundleURLForRemoteDebugging(),
 mDevSupportManager.getSourceUrl()));
 }

 @ThreadConfined(UI)
 private void onJSBundleLoadedFromServer() {
 FLog.d(ReactConstants.TAG, "ReactInstanceManager.onJSBundleLoadedFromServer()");
Expand Down

15 changes: 0 additions & 15 deletions
...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,21 +92,6 @@ public String loadScript(JSBundleLoaderDelegate delegate) {
 };
 }

 /**
 * This loader is used when proxy debugging is enabled. In that case there is no point in fetching
 * the bundle from device as remote executor will have to do it anyway.
 */
 public static JSBundleLoader createRemoteDebuggerBundleLoader(
 final String proxySourceURL, final String realSourceURL) {
 return new JSBundleLoader() {
 @Override
 public String loadScript(JSBundleLoaderDelegate delegate) {
 delegate.setSourceURLs(realSourceURL, proxySourceURL);
 return realSourceURL;
 }
 };
 }

 /** Loads the script, returning the URL of the source it loaded. */
 public abstract String loadScript(JSBundleLoaderDelegate delegate);
}

71 changes: 5 additions & 66 deletions
...ive/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,14 +16,12 @@
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.CatalystInstance;
import com.facebook.react.bridge.JSBundleLoader;
import com.facebook.react.bridge.JavaJSExecutor;
import com.facebook.react.bridge.JavaScriptExecutorFactory;
import com.facebook.react.bridge.ReactMarker;
import com.facebook.react.bridge.ReactMarkerConstants;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.common.SurfaceDelegateFactory;
import com.facebook.react.common.futures.SimpleSettableFuture;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
import com.facebook.react.devsupport.interfaces.DevOptionHandler;
Expand All@@ -33,9 +31,6 @@
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

/**
 * Interface for accessing and interacting with development features. Following features
Expand DownExpand Up@@ -136,54 +131,6 @@ public void onError(String url, Throwable cause) {
 });
 }

 private WebsocketJavaScriptExecutor.JSExecutorConnectCallback getExecutorConnectCallback(
 final SimpleSettableFuture<Boolean> future) {
 return new WebsocketJavaScriptExecutor.JSExecutorConnectCallback() {
 @Override
 public void onSuccess() {
 future.set(true);
 hideDevLoadingView();
 }

 @Override
 public void onFailure(final Throwable cause) {
 hideDevLoadingView();
 FLog.e(ReactConstants.TAG, "Failed to connect to debugger!", cause);
 future.setException(
 new IOException(
 getApplicationContext().getString(com.facebook.react.R.string.catalyst_debug_error),
 cause));
 }
 };
 }

 private void reloadJSInProxyMode() {
 // When using js proxy, there is no need to fetch JS bundle as proxy executor will do that
 // anyway
 getDevServerHelper().launchJSDevtools();

 JavaJSExecutor.Factory factory =
 new JavaJSExecutor.Factory() {
 @Override
 public JavaJSExecutor create() throws Exception {
 WebsocketJavaScriptExecutor executor = new WebsocketJavaScriptExecutor();
 SimpleSettableFuture<Boolean> future = new SimpleSettableFuture<>();
 executor.connect(
 getDevServerHelper().getWebsocketProxyURL(), getExecutorConnectCallback(future));
 // TODO(t9349129) Don't use timeout
 try {
 future.get(90, TimeUnit.SECONDS);
 return executor;
 } catch (ExecutionException e) {
 throw (Exception) e.getCause();
 } catch (InterruptedException | TimeoutException e) {
 throw new RuntimeException(e);
 }
 }
 };
 getReactInstanceDevHelper().onReloadWithJSDebugger(factory);
 }

 @Override
 public void handleReloadJS() {

Expand All@@ -196,19 +143,11 @@ public void handleReloadJS() {
 // dismiss redbox if exists
 hideRedboxDialog();

 if (getDevSettings().isRemoteJSDebugEnabled()) {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Proxy");
 showDevLoadingViewForRemoteJSEnabled();
 reloadJSInProxyMode();
 } else {
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper()
 .getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }
 PrinterHolder.getPrinter()
 .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
 String bundleURL =
 getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
 reloadJSFromServer(bundleURL);
 }

 /** Starts of stops the sampling profiler */
Expand Down

11 changes: 0 additions & 11 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@ class DevInternalSettings
 private static final String PREFS_ANIMATIONS_DEBUG_KEY = "animations_debug";
 private static final String PREFS_INSPECTOR_DEBUG_KEY = "inspector_debug";
 private static final String PREFS_HOT_MODULE_REPLACEMENT_KEY = "hot_module_replacement";
 private static final String PREFS_REMOTE_JS_DEBUG_KEY = "remote_js_debug";
 private static final String PREFS_START_SAMPLING_PROFILER_ON_INIT =
 "start_sampling_profiler_on_init";

Expand DownExpand Up@@ -85,16 +84,6 @@ public boolean isDeviceDebugEnabled() {
 return ReactBuildConfig.DEBUG;
 }

 @Override
 public boolean isRemoteJSDebugEnabled() {
 return mPreferences.getBoolean(PREFS_REMOTE_JS_DEBUG_KEY, false);
 }

 @Override
 public void setRemoteJSDebugEnabled(boolean remoteJSDebugEnabled) {
 mPreferences.edit().putBoolean(PREFS_REMOTE_JS_DEBUG_KEY, remoteJSDebugEnabled).apply();
 }

 @Override
 public boolean isStartSamplingProfilerOnInit() {
 return mPreferences.getBoolean(PREFS_START_SAMPLING_PROFILER_ON_INIT, false);
Expand Down

65 changes: 0 additions & 65 deletions
...eact-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
Expand DownExpand Up@@ -56,8 +55,6 @@
 * </ul>
 */
public class DevServerHelper {
 public static final String RELOAD_APP_EXTRA_JS_PROXY = "jsproxy";

 private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;

 private static final String DEBUGGER_MSG_DISABLE = "{ \"id\":1,\"method\":\"Debugger.disable\" }";
Expand DownExpand Up@@ -237,13 +234,6 @@ protected Void doInBackground(Void... params) {
 }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 }

 public String getWebsocketProxyURL() {
 return String.format(
 Locale.US,
 "ws://%s/debugger-proxy?role=client",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 private String getInspectorDeviceUrl() {
 return String.format(
 Locale.US,
Expand All@@ -261,28 +251,6 @@ public void downloadBundleFromURL(
 mBundleDownloader.downloadBundleFromURL(callback, outputFile, bundleURL, bundleInfo);
 }

 public void downloadBundleFromURL(
 DevBundleDownloadListener callback,
 File outputFile,
 String bundleURL,
 BundleDownloader.BundleInfo bundleInfo,
 Request.Builder requestBuilder) {
 mBundleDownloader.downloadBundleFromURL(
 callback, outputFile, bundleURL, bundleInfo, requestBuilder);
 }

 /** @return the host to use when connecting to the bundle server from the host itself. */
 private String getHostForJSProxy() {
 // Use custom port if configured. Note that host stays "localhost".
 String host = Assertions.assertNotNull(mPackagerConnectionSettings.getDebugServerHost());
 int portOffset = host.lastIndexOf(':');
 if (portOffset > -1) {
 return "localhost" + host.substring(portOffset);
 } else {
 return AndroidInfoHelpers.DEVICE_LOCALHOST;
 }
 }

 /** @return whether we should enable dev mode when requesting JS bundles. */
 private boolean getDevMode() {
 return mSettings.isJSDevModeEnabled();
Expand DownExpand Up@@ -345,32 +313,6 @@ public void isPackagerRunning(final PackagerStatusCallback callback) {
 }
 }

 private String createLaunchJSDevtoolsCommandUrl() {
 return String.format(
 Locale.US,
 "http://%s/launch-js-devtools",
 mPackagerConnectionSettings.getDebugServerHost());
 }

 public void launchJSDevtools() {
 Request request = new Request.Builder().url(createLaunchJSDevtoolsCommandUrl()).build();
 mClient
 .newCall(request)
 .enqueue(
 new Callback() {
 @Override
 public void onFailure(@NonNull Call call, @NonNull IOException e) {
 // ignore HTTP call response, this is just to open a debugger page and there is no
 // reason to report failures from here
 }

 @Override
 public void onResponse(@NonNull Call call, @NonNull Response response) {
 // ignore HTTP call response - see above
 }
 });
 }

 public String getSourceMapUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.MAP);
 }
Expand All@@ -379,13 +321,6 @@ public String getSourceUrl(String mainModuleName) {
 return createBundleURL(mainModuleName, BundleType.BUNDLE);
 }

 public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
 // The host we use when connecting to the JS bundle server from the emulator is not the
 // same as the one needed to connect to the same server from the JavaScript proxy running on the
 // host itself.
 return createBundleURL(mainModuleName, BundleType.BUNDLE, getHostForJSProxy());
 }

 /**
 * This is a debug-only utility to allow fetching a file via packager. It's made synchronous for
 * simplicity, but should only be used if it's absolutely necessary.
Expand Down

32 changes: 0 additions & 32 deletions
...ative/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,12 +154,6 @@ public DevSupportManagerBase(
 public void onReceive(Context context, Intent intent) {
 String action = intent.getAction();
 if (getReloadAppAction(context).equals(action)) {
 if (intent.getBooleanExtra(DevServerHelper.RELOAD_APP_EXTRA_JS_PROXY, false)) {
 mDevSettings.setRemoteJSDebugEnabled(true);
 mDevServerHelper.launchJSDevtools();
 } else {
 mDevSettings.setRemoteJSDebugEnabled(false);
 }
 handleReloadJS();
 }
 }
Expand DownExpand Up@@ -367,13 +361,6 @@ public void onOptionSelected() {

 if (mDevSettings.isDeviceDebugEnabled()) {
 // On-device JS debugging (CDP). Render action to open debugger frontend.

 // Reset the old debugger setting so no one gets stuck.
 // TODO: Remove in a few weeks.
 if (mDevSettings.isRemoteJSDebugEnabled()) {
 mDevSettings.setRemoteJSDebugEnabled(false);
 handleReloadJS();
 }
 options.put(
 mApplicationContext.getString(R.string.catalyst_debug_open),
 () ->
Expand DownExpand Up@@ -595,12 +582,6 @@ public String getSourceUrl() {
 return mDevServerHelper.getSourceUrl(Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getJSBundleURLForRemoteDebugging() {
 return mDevServerHelper.getJSBundleURLForRemoteDebugging(
 Assertions.assertNotNull(mJSAppBundleName));
 }

 @Override
 public String getDownloadedJSBundleFile() {
 return mJSBundleDownloadedFile.getAbsolutePath();
Expand DownExpand Up@@ -966,19 +947,6 @@ public void setHotModuleReplacementEnabled(final boolean isHotModuleReplacementE
 });
 }

 @Override
 public void setRemoteJSDebugEnabled(final boolean isRemoteJSDebugEnabled) {
 if (!mIsDevSupportEnabled) {
 return;
 }

 UiThreadUtil.runOnUiThread(
 () -> {
 mDevSettings.setRemoteJSDebugEnabled(isRemoteJSDebugEnabled);
 handleReloadJS();
 });
 }

 @Override
 public void setFpsDebugEnabled(final boolean isFpsDebugEnabled) {
 if (!mIsDevSupportEnabled) {
Expand Down
Loading