- diagnosticTracing reduce noise

- rename loaderConfig

Author: pavelsavara

src/native/corehost/browserhost/loader/host-builder.ts

@@ -4,7 +4,7 @@
 import type { DotnetHostBuilder, LoaderConfig, RuntimeAPI, LoadBootResourceCallback, DotnetModuleConfig } from "./types";
 
 import { Module, dotnetApi } from "./cross-module";
-import { getLoaderConfig, mergeLoaderConfig, validateLoaderConfig } from "./config";
+import { loaderConfig, mergeLoaderConfig, validateLoaderConfig } from "./config";
 import { createRuntime } from "./run";
 import { exit } from "./exit";
 import { setLoadBootResourceCallback } from "./assets";
@@ -134,8 +134,7 @@ export class HostBuilder implements DotnetHostBuilder {
                 await this.create();
             }
             validateLoaderConfig();
-            const config = getLoaderConfig();
-            return this.dotnetApi!.runMain(config.mainAssemblyName, applicationArguments);
+            return this.dotnetApi!.runMain(loaderConfig.mainAssemblyName, applicationArguments);
         } catch (err) {
             exit(1, err);
             throw err;
@@ -148,8 +147,7 @@ export class HostBuilder implements DotnetHostBuilder {
                 await this.create();
             }
             validateLoaderConfig();
-            const config = getLoaderConfig();
-            return this.dotnetApi!.runMainAndExit(config.mainAssemblyName, applicationArguments);
+            return this.dotnetApi!.runMainAndExit(loaderConfig.mainAssemblyName, applicationArguments);
         } catch (err) {
             exit(1, err);
             throw err;

src/native/corehost/browserhost/loader/logging.ts

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+import { loaderConfig } from "./config";
+
 export function check(condition: unknown, message: string): asserts condition {
     if (!condition) {
         throw new Error(`dotnetAssert failed: ${message}`);
@@ -22,6 +24,9 @@ export function fastCheck(condition: unknown, messageFactory: (() => string)): a
 const prefix = "DOTNET: ";
 
 export function debug(msg: string | (() => string), ...data: any) {
+    if (!loaderConfig.diagnosticTracing) {
+        return;
+    }
     if (typeof msg === "function") {
         msg = msg();
     }

src/native/libs/System.Native.Browser/diagnostics/console-proxy.ts

@@ -11,8 +11,8 @@ const methods = ["log", "debug", "info", "warn", "error", "trace"];
 let originalConsoleMethods: { [key: string]: any } = {};
 
 export function installLoggingProxy() {
-    const config = dotnetApi.getConfig() as LoaderConfigInternal;
-    if (ENVIRONMENT_IS_WEB && config.forwardConsole && typeof globalThis.WebSocket != "undefined") {
+    const loaderConfig = dotnetApi.getConfig() as LoaderConfigInternal;
+    if (ENVIRONMENT_IS_WEB && loaderConfig.forwardConsole && typeof globalThis.WebSocket != "undefined") {
         setupProxyConsole(globalThis.console, globalThis.location.origin);
     }
 }

src/native/libs/System.Native.Browser/diagnostics/exit.ts

@@ -7,13 +7,13 @@ import { ENVIRONMENT_IS_NODE, ENVIRONMENT_IS_WEB } from "./per-module";
 import { teardownProxyConsole } from "./console-proxy";
 import { symbolicateStackTrace } from "./symbolicate";
 
-let config: LoaderConfigInternal = null as any;
+let loaderConfig: LoaderConfigInternal = null as any;
 export function registerExit() {
     if (!dotnetApi || !dotnetApi.getConfig || !dotnetLoaderExports) {
         return;
     }
-    config = dotnetApi.getConfig() as LoaderConfigInternal;
-    if (!config) {
+    loaderConfig = dotnetApi.getConfig() as LoaderConfigInternal;
+    if (!loaderConfig) {
         return;
     }
     installUnhandledErrorHandler();
@@ -22,21 +22,21 @@ export function registerExit() {
 }
 
 function onExit(exitCode: number, reason: any, silent: boolean): boolean {
-    if (!config) {
+    if (!loaderConfig) {
         return true;
     }
     uninstallUnhandledErrorHandler();
-    if (config.logExitCode) {
+    if (loaderConfig.logExitCode) {
         if (!silent) {
             logExitReason(exitCode, reason);
         }
         logExitCode(exitCode);
     }
-    if (ENVIRONMENT_IS_WEB && config.appendElementOnExit) {
+    if (ENVIRONMENT_IS_WEB && loaderConfig.appendElementOnExit) {
         appendElementOnExit(exitCode);
     }
 
-    if (ENVIRONMENT_IS_NODE && config.asyncFlushOnExit && exitCode === 0) {
+    if (ENVIRONMENT_IS_NODE && loaderConfig.asyncFlushOnExit && exitCode === 0) {
         // this would NOT call Node's exit() immediately, it's a hanging promise
         (async function flush() {
             try {
@@ -78,10 +78,10 @@ function isExitStatus(reason: any): boolean {
 }
 
 function logExitCode(exitCode: number): void {
-    const message = config.logExitCode
+    const message = loaderConfig.logExitCode
         ? "WASM EXIT " + exitCode
         : undefined;
-    if (config.forwardConsole) {
+    if (loaderConfig.forwardConsole) {
         teardownProxyConsole(message);
     } else if (message) {
         // eslint-disable-next-line no-console
@@ -101,7 +101,7 @@ function appendElementOnExit(exitCode: number): void {
 
 function installUnhandledErrorHandler() {
     // it seems that emscripten already does the right thing for NodeJs and that there is no good solution for V8 shell.
-    if (ENVIRONMENT_IS_WEB && config.exitOnUnhandledError) {
+    if (ENVIRONMENT_IS_WEB && loaderConfig.exitOnUnhandledError) {
         globalThis.addEventListener("unhandledrejection", unhandledRejectionHandler);
         globalThis.addEventListener("error", errorHandler);
     }