[browser] Remove check for user agent when attaching debugger (#105559)

dotnet · Aug 9, 2024 · 7fa25e8 · 7fa25e8
1 parent e4bef7c
commit 7fa25e8
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/...opServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportTest.cs b/...opServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportTest.cs
@@ -238,7 +238,7 @@ public unsafe void CreateFunctionString()
         [Fact]
         public unsafe void CreateFunctionInternal()
         {
-            Func<bool> internals = Utils.CreateFunctionBool("return INTERNAL.mono_wasm_runtime_is_ready");
+            Func<bool> internals = Utils.CreateFunctionBool("return true");
             Assert.True(internals());
         }
 

diff --git a/src/mono/browser/runtime/lazyLoading.ts b/src/mono/browser/runtime/lazyLoading.ts
@@ -53,7 +53,7 @@ export async function loadLazyAssembly (assemblyNameToLoad: string): Promise<boo
 
     let pdbNameToLoad = assemblyNameWithoutExtension + ".pdb";
     let shouldLoadPdb = false;
-    if (loaderHelpers.config.debugLevel != 0 && loaderHelpers.isDebuggingSupported()) {
+    if (loaderHelpers.config.debugLevel != 0) {
         shouldLoadPdb = Object.prototype.hasOwnProperty.call(lazyAssemblies, pdbNameToLoad);
         if (loaderHelpers.config.resources!.fingerprinting) {
             const map = loaderHelpers.config.resources!.fingerprinting;

diff --git a/src/mono/browser/runtime/loader/assets.ts b/src/mono/browser/runtime/loader/assets.ts
@@ -350,7 +350,7 @@ export function prepareAssets () {
         }
 
 
-        if (config.debugLevel != 0 && loaderHelpers.isDebuggingSupported()) {
+        if (config.debugLevel != 0) {
             if (resources.corePdb) {
                 for (const name in resources.corePdb) {
                     addAsset({

diff --git a/src/mono/browser/runtime/loader/config.ts b/src/mono/browser/runtime/loader/config.ts
@@ -278,15 +278,6 @@ export async function mono_wasm_load_config (module: DotnetModuleInternal): Prom
     }
 }
 
-export function isDebuggingSupported (): boolean {
-    // Copied from blazor MonoDebugger.ts/attachDebuggerHotkey
-    if (!globalThis.navigator) {
-        return false;
-    }
-
-    return loaderHelpers.isChromium || loaderHelpers.isFirefox;
-}
-
 async function loadBootConfig (module: DotnetModuleInternal): Promise<void> {
     const defaultConfigSrc = loaderHelpers.locateFile(module.configSrc!);
 

diff --git a/src/mono/browser/runtime/loader/globals.ts b/src/mono/browser/runtime/loader/globals.ts
@@ -15,7 +15,7 @@ import { assertIsControllablePromise, createPromiseController, getPromiseControl
 import { mono_download_assets, resolve_single_asset_path, retrieve_asset_download } from "./assets";
 import { mono_log_error, set_thread_prefix, setup_proxy_console } from "./logging";
 import { invokeLibraryInitializers } from "./libraryInitializers";
-import { deep_merge_config, isDebuggingSupported } from "./config";
+import { deep_merge_config } from "./config";
 import { logDownloadStatsToConsole, purgeUnusedCacheEntriesAsync } from "./assetsCache";
 
 // if we are the first script loaded in the web worker, we are expected to become the sidecar
@@ -128,7 +128,6 @@ export function setLoaderGlobals (
 
         retrieve_asset_download,
         invokeLibraryInitializers,
-        isDebuggingSupported,
 
         // from wasm-feature-detect npm package
         exceptions,

diff --git a/src/mono/browser/runtime/startup.ts b/src/mono/browser/runtime/startup.ts
@@ -328,7 +328,9 @@ async function onRuntimeInitializedAsync (userOnRuntimeInitialized: () => void)
 
         runtimeList.registerRuntime(exportedRuntimeAPI);
 
-        if (!runtimeHelpers.mono_wasm_runtime_is_ready) mono_wasm_runtime_ready();
+        if (loaderHelpers.config.debugLevel !== 0 && !runtimeHelpers.mono_wasm_runtime_is_ready) {
+            mono_wasm_runtime_ready();
+        }
 
         if (loaderHelpers.config.debugLevel !== 0 && loaderHelpers.config.cacheBootResources) {
             loaderHelpers.logDownloadStatsToConsole();
@@ -600,9 +602,6 @@ export function mono_wasm_load_runtime (): void {
                 debugLevel = 0 + debugLevel;
             }
         }
-        if (!loaderHelpers.isDebuggingSupported() || !runtimeHelpers.config.resources!.pdb) {
-            debugLevel = 0;
-        }
         cwraps.mono_wasm_load_runtime(debugLevel);
         endMeasure(mark, MeasuredBlock.loadRuntime);
 

diff --git a/src/mono/browser/runtime/types/internal.ts b/src/mono/browser/runtime/types/internal.ts
@@ -172,7 +172,6 @@ export type LoaderHelpers = {
     invokeLibraryInitializers: (functionName: string, args: any[]) => Promise<void>,
     libraryInitializers?: { scriptName: string, exports: any }[];
 
-    isDebuggingSupported(): boolean,
     isChromium: boolean,
     isFirefox: boolean