Updates version to v4.0.0 (#1875)

* Updates version to v4.0.0

* Fix v4 schema references

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix Edge Beta and IPv6 support

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Fix IPv6 proxy address formatting

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Normalize wildcard proxy addresses

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Preserve explicit API ports

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Normalize bracketed IPv6 addresses

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: waldekmastykarz

DevProxy.Abstractions.Tests/Proxy/SystemProxyAddressTests.cs

@@ -15,6 +15,9 @@ public class SystemProxyAddressTests
     [InlineData("   ")]
     [InlineData("0.0.0.0")]
     [InlineData("::")]
+    [InlineData("::0")]
+    [InlineData("0:0:0:0:0:0:0:0")]
+    [InlineData("[::]")]
     public void ResolveHost_WildcardOrEmpty_CollapsesToLoopback(string? ipAddress) =>
         Assert.Equal("127.0.0.1", SystemProxyAddress.ResolveHost(ipAddress));
 
@@ -33,6 +36,27 @@ public void ToHostPort_ComposesNormalizedHostAndPort() =>
     public void ToHostPort_ExplicitAddress() =>
         Assert.Equal("10.0.0.5:9090", SystemProxyAddress.ToHostPort("10.0.0.5", 9090));
 
+    [Fact]
+    public void ToHostPort_ExplicitIpv6Address_UsesBrackets() =>
+        Assert.Equal("[::1]:9090", SystemProxyAddress.ToHostPort("::1", 9090));
+
+    [Fact]
+    public void ToHttpAuthority_Ipv6Address_UsesBrackets() =>
+        Assert.Equal("http://[::1]:9090", SystemProxyAddress.ToHttpAuthority("::1", 9090));
+
+    [Fact]
+    public void ToHttpAuthority_DefaultHttpPort_IsPreserved() =>
+        Assert.Equal("http://127.0.0.1:80", SystemProxyAddress.ToHttpAuthority("127.0.0.1", 80));
+
+    [Theory]
+    [InlineData("0.0.0.0")]
+    [InlineData("::")]
+    [InlineData("::0")]
+    [InlineData("0:0:0:0:0:0:0:0")]
+    [InlineData("[::]")]
+    public void ToHttpAuthority_WildcardAddress_UsesLoopback(string ipAddress) =>
+        Assert.Equal("http://127.0.0.1:9090", SystemProxyAddress.ToHttpAuthority(ipAddress, 9090));
+
     [Fact]
     public void ToHostPort_NullAddress_UsesLoopback() =>
         Assert.Equal("127.0.0.1:8080", SystemProxyAddress.ToHostPort(null, 8080));

DevProxy.Abstractions/Proxy/SystemProxyAddress.cs

@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
 
 namespace DevProxy.Abstractions.Proxy;
 
@@ -33,12 +35,35 @@ public static string ResolveHost(string? ipAddress)
             return "127.0.0.1";
         }
 
-        return ipAddress is "0.0.0.0" or "::" ? "127.0.0.1" : ipAddress;
+        var host = ipAddress;
+        if (host.Length > 1 && host[0] == '[' && host[^1] == ']')
+        {
+            host = host[1..^1];
+        }
+
+        if (IPAddress.TryParse(host, out var address) &&
+            (address.Equals(IPAddress.Any) || address.Equals(IPAddress.IPv6Any)))
+        {
+            return "127.0.0.1";
+        }
+
+        return host;
     }
 
+    public static string ToHttpAuthority(string? ipAddress, int port) =>
+        $"{Uri.UriSchemeHttp}://{ToHostPort(ipAddress, port)}";
+
     /// <summary>
     /// The <c>host:port</c> value used for the Windows <c>ProxyServer</c> registry setting.
     /// </summary>
-    public static string ToHostPort(string? ipAddress, int port) =>
-        $"{ResolveHost(ipAddress)}:{port.ToString(CultureInfo.InvariantCulture)}";
+    public static string ToHostPort(string? ipAddress, int port)
+    {
+        var host = ResolveHost(ipAddress);
+        if (IPAddress.TryParse(host, out var address) && address.AddressFamily == AddressFamily.InterNetworkV6)
+        {
+            host = $"[{host}]";
+        }
+
+        return $"{host}:{port.ToString(CultureInfo.InvariantCulture)}";
+    }
 }

DevProxy.Plugins/Inspection/DevToolsPlugin.cs

@@ -861,7 +861,7 @@ private string GetBrowserPath()
                 PreferredBrowser.Chrome => "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
                 PreferredBrowser.Edge => "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
                 PreferredBrowser.EdgeDev => "/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Dev",
-                PreferredBrowser.EdgeBeta => "/Applications/Microsoft Edge Dev.app/Contents/MacOS/Microsoft Edge Beta",
+                PreferredBrowser.EdgeBeta => "/Applications/Microsoft Edge Beta.app/Contents/MacOS/Microsoft Edge Beta",
                 _ => throw new NotSupportedException($"{Configuration.PreferredBrowser} is an unsupported browser. Please change your PreferredBrowser setting for {Name}.")
             };
         }

DevProxy.Plugins/Mocking/MockStdioResponsePlugin.cs

@@ -32,7 +32,7 @@ public sealed class MockStdioResponseConfiguration
     public bool NoMocks { get; set; }
 
     [JsonPropertyName("$schema")]
-    public string Schema { get; set; } = "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v2.1.0/mockstdioresponseplugin.mocksfile.schema.json";
+    public string Schema { get; set; } = "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v4.0.0/mockstdioresponseplugin.mocksfile.schema.json";
 }
 
 public class MockStdioResponsePlugin(

DevProxy.Tests/ConsoleHotkeyHandlerTests.cs

@@ -15,11 +15,11 @@ namespace DevProxy.Tests;
 public sealed class ConsoleHotkeyHandlerTests
 {
     private static (ConsoleHotkeyHandler handler, FakeProxyStateController controller, RecordingConsole console)
-        CreateHandler(OutputFormat output = OutputFormat.Text)
+        CreateHandler(OutputFormat output = OutputFormat.Text, string ipAddress = "127.0.0.1")
     {
         var controller = new FakeProxyStateController();
         var console = new RecordingConsole();
-        var configuration = new FakeProxyConfiguration { Output = output };
+        var configuration = new FakeProxyConfiguration { Output = output, IPAddress = ipAddress };
         var handler = new ConsoleHotkeyHandler(controller, configuration, console);
         return (handler, controller, console);
     }
@@ -125,6 +125,26 @@ public void PrintApiInstructions_WritesAllApiCommands()
         Assert.Contains("/proxy/stopProxy", joined, StringComparison.Ordinal);
     }
 
+    [Fact]
+    public void PrintApiInstructions_FormatsIpv6Address()
+    {
+        var (handler, _, console) = CreateHandler(OutputFormat.Json, "::1");
+
+        handler.PrintApiInstructions();
+
+        Assert.Contains(console.Lines, line => line.Contains("http://[::1]:8897/proxy", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void PrintApiInstructions_NormalizesIpv6WildcardAddress()
+    {
+        var (handler, _, console) = CreateHandler(OutputFormat.Json, "::");
+
+        handler.PrintApiInstructions();
+
+        Assert.Contains(console.Lines, line => line.Contains("http://127.0.0.1:8897/proxy", StringComparison.Ordinal));
+    }
+
     [Fact]
     public void PrintBanner_TextMode_PrintsHotkeys()
     {

DevProxy/Commands/ApiCommand.cs

@@ -43,7 +43,7 @@ private void PrintApiInfo(OutputFormat outputFormat)
     {
         var ipAddress = _proxyConfiguration.IPAddress;
         var apiPort = _proxyConfiguration.ApiPort;
-        var baseUrl = $"http://{ipAddress}:{apiPort}";
+        var baseUrl = SystemProxyAddress.ToHttpAuthority(ipAddress, apiPort);
 
         var endpoints = new[]
         {

DevProxy/Commands/DevProxyCommand.cs

@@ -243,7 +243,7 @@ public DevProxyCommand(
         IProxyConfiguration proxyConfiguration,
         IServiceProvider serviceProvider,
         UpdateNotification updateNotification,
-        ILogger<DevProxyCommand> logger) : base($"Start Dev Proxy\n\nAPI:\n  Dev Proxy exposes a REST API for runtime management.\n  OpenAPI spec: http://{proxyConfiguration.IPAddress ?? "127.0.0.1"}:{proxyConfiguration.ApiPort}/swagger\n  Use --api-port to configure (default: {proxyConfiguration.ApiPort}).\n  Run 'devproxy api show' for more information.")
+        ILogger<DevProxyCommand> logger) : base($"Start Dev Proxy\n\nAPI:\n  Dev Proxy exposes a REST API for runtime management.\n  OpenAPI spec: {SystemProxyAddress.ToHttpAuthority(proxyConfiguration.IPAddress, proxyConfiguration.ApiPort)}/swagger\n  Use --api-port to configure (default: {proxyConfiguration.ApiPort}).\n  Run 'devproxy api show' for more information.")
     {
         _serviceProvider = serviceProvider;
         _plugins = plugins;
@@ -313,7 +313,10 @@ private async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken c
             _app.Lifetime.ApplicationStarted.Register(() =>
             {
                 var serverAddresses = _app.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>();
-                var address = serverAddresses?.Addresses.FirstOrDefault() ?? $"http://{_proxyConfiguration.IPAddress}:{_proxyConfiguration.ApiPort}";
+                var serverAddress = serverAddresses?.Addresses.FirstOrDefault();
+                var address = Uri.TryCreate(serverAddress, UriKind.Absolute, out var serverUri) ?
+                    SystemProxyAddress.ToHttpAuthority(serverUri.DnsSafeHost, serverUri.Port) :
+                    SystemProxyAddress.ToHttpAuthority(_proxyConfiguration.IPAddress, _proxyConfiguration.ApiPort);
                 _logger.LogInformation("Dev Proxy API listening on {Address}...", address);
 
                 // Persist the daemon state so the parent process's readiness check,

DevProxy/Proxy/ConsoleHotkeyHandler.cs

@@ -54,7 +54,7 @@ public void PrintHotkeys()
 
     public void PrintApiInstructions()
     {
-        var baseUrl = $"http://{configuration.IPAddress}:{configuration.ApiPort}/proxy";
+        var baseUrl = SystemProxyAddress.ToHttpAuthority(configuration.IPAddress, configuration.ApiPort) + "/proxy";
         var timestamp = DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture);
         console.WriteLine("");
         console.WriteLine($"{{\"type\":\"log\",\"level\":\"info\",\"message\":\"Issue web request: curl -X POST {baseUrl}/mockRequest\",\"category\":\"ProxyEngine\",\"timestamp\":\"{timestamp}\"}}");

DevProxy/config-templates/devproxyrc.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v3.3.0/rc.schema.json",
+  "$schema": "https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v4.0.0/rc.schema.json",
   "plugins": [
   ],
   "urlsToWatch": [

DevProxy/config-templates/devproxyrc.yaml

@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v3.3.0/rc.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/dotnet/dev-proxy/main/schemas/v4.0.0/rc.schema.json
 plugins:
   -
 urlsToWatch: