rebase

Author: pavelsavara

src/Microsoft.Diagnostics.WebSocketServer/WebSocketServerImpl.cs

@@ -172,24 +172,24 @@ private static void ParseWebSocketURL(string endPoint, out Uri uri)
             uriToParse = endPoint;
         }
 
-        string[] supportedSchemes = new string[] { "ws", "wss", "http", "https" };
 
         if (!string.IsNullOrEmpty(uriToParse) && Uri.TryCreate(uriToParse, UriKind.Absolute, out uri))
         {
-            bool supported = false;
-            foreach (string scheme in supportedSchemes)
+            if (uri.Scheme == "ws")
             {
-                if (string.Equals(uri.Scheme, scheme, StringComparison.InvariantCultureIgnoreCase))
-                {
-                    supported = true;
-                    break;
-                }
+                uri = new UriBuilder(uri) { Scheme = "http" }.Uri;
+                return;
             }
-            if (!supported)
+            if (uri.Scheme == "wss")
             {
-                throw new ArgumentException(string.Format("Unsupported Uri schema, \"{0}\"", uri.Scheme));
+                uri = new UriBuilder(uri) { Scheme = "https" }.Uri;
+                return;
             }
-            return;
+            if (uri.Scheme == "http" || uri.Scheme == "https")
+            {
+                return;
+            }
+            throw new ArgumentException(string.Format("Unsupported Uri schema, \"{0}\"", uri.Scheme));
         }
         else
         {

src/Tools/dotnet-dsrouter/Program.cs

@@ -267,7 +267,8 @@ private static Command AndroidRouterCommand()
             new("--web-socket", "-ws")
             {
                 Description = "The router WebSocket address using format ws://[host]:[port]/[path] or wss://[host]:[port]/[path]. " +
-                                "Launch app with WasmExtraConfig property specifying diagnostic_options with a server connect_url"
+                                "Launch app with WasmExtraConfig property specifying diagnostic_options with a server connect_url",
+                DefaultValueFactory = _ => "ws://127.0.0.1:8088/diagnostics"
             };
 
         private static readonly Option<int> RuntimeTimeoutOption =