/api/ip GET now respect protocol settings

The API will no longer attempt to fetch both public IPs if only one is configured in settings.

Author: drittich

DnsTube.Service/Controllers/Api/DnsController.cs

@@ -1,8 +1,6 @@
-using System.Linq;
-using DnsTube.Core.Interfaces;
+using DnsTube.Core.Interfaces;
 
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.VisualBasic;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
@@ -12,10 +10,10 @@ namespace DnsTube.Service.Controllers.Api
 	[ApiController]
 	public class DnsController : ControllerBase
 	{
-		ILogger<SettingsController> _logger;
-		ILogService _logService;
-		ISettingsService _settingsService;
-		ICloudflareService _cloudflareService;
+		private readonly ILogger<SettingsController> _logger;
+		private readonly ILogService _logService;
+		private readonly ISettingsService _settingsService;
+		private readonly ICloudflareService _cloudflareService;
 
 		public DnsController(ILogger<SettingsController> logger, ILogService logService, ISettingsService settingsService, ICloudflareService cloudflareService)
 		{
@@ -48,7 +46,7 @@ public DnsController(ILogger<SettingsController> logger, ILogService logService,
 				Proxied = d.proxied,
 				ZoneName = d.zone_name
 			});
-			
+
 			return dnsEntries;
 		}
 

DnsTube.Service/Controllers/Api/HistoryController.cs

@@ -12,8 +12,8 @@ namespace DnsTube.Service.Controllers.Api
 	[ApiController]
 	public class HistoryController : ControllerBase
 	{
-		ILogger<HistoryController> _logger;
-		ILogService _logService;
+		private readonly ILogger<HistoryController> _logger;
+		private readonly ILogService _logService;
 
 		public HistoryController(ILogger<HistoryController> logger, ILogService logService)
 		{

DnsTube.Service/Controllers/Api/IpController.cs

@@ -14,22 +14,33 @@ public class IpController : ControllerBase
 		private readonly ILogger<IpController> _logger;
 		private readonly ILogService _logService;
 		private readonly IIpAddressService _ipAddressService;
+		private readonly ISettingsService _settingsService;
 
 		public record Ip(string? Ipv4, string? Ipv6);
 
-		public IpController(ILogger<IpController> logger, ILogService logService, IIpAddressService ipAddressService)
+		public IpController(ILogger<IpController> logger, ILogService logService, IIpAddressService ipAddressService, ISettingsService settingsService)
 		{
 			_logger = logger;
 			_logService = logService;
 			_ipAddressService = ipAddressService;
+			_settingsService = settingsService;
 		}
 
 		// GET: api/<IpController>
 		[HttpGet]
 		public async Task<Ip> Get()
 		{
-			var ipv4 = await _ipAddressService.GetPublicIpAddressAsync(IpSupport.IPv4);
-			var ipv6 = await _ipAddressService.GetPublicIpAddressAsync(IpSupport.IPv6);
+			var settings = await _settingsService.GetAsync(true);
+
+			string? ipv4 = null;
+			string? ipv6 = null;
+
+			if (settings.ProtocolSupport != IpSupport.IPv6)
+				ipv4 = await _ipAddressService.GetPublicIpAddressAsync(IpSupport.IPv4);
+
+			if (settings.ProtocolSupport != IpSupport.IPv4)
+				ipv6 = await _ipAddressService.GetPublicIpAddressAsync(IpSupport.IPv6);
+
 			return new Ip(Ipv4: ipv4, Ipv6: ipv6);
 		}
 	}

DnsTube.Service/Controllers/Api/SettingsController.cs

@@ -11,11 +11,11 @@ namespace DnsTube.Service.Controllers.Api
 	[ApiController]
 	public class SettingsController : ControllerBase
 	{
-		ILogger<SettingsController> _logger;
-		ILogService _logService;
-		ISettingsService _settingsService;
-		IDbService _dbService;
-		IIpAddressService _ipAddressService;
+		private readonly ILogger<SettingsController> _logger;
+		private readonly ILogService _logService;
+		private readonly ISettingsService _settingsService;
+		private readonly IDbService _dbService;
+		private readonly IIpAddressService _ipAddressService;
 
 		public SettingsController(ILogger<SettingsController> logger, ILogService logService, ISettingsService settingsService, IDbService dbService, IIpAddressService ipAddressService)
 		{

DnsTube.Service/Worker.cs

@@ -58,7 +58,7 @@ protected override async Task ExecuteAsync(CancellationToken serviceStoppingToke
 			var latestReleaseTag = await _githubService.GetLatestReleaseTagNameAsync();
 			if (!string.IsNullOrWhiteSpace(latestReleaseTag) && !Application.RELEASE_TAG.Contains("beta") && latestReleaseTag != Application.RELEASE_TAG)
 			{
-				var msg = $"There is a newer release available ({latestReleaseTag}). See https://github.com/drittich/DnsTube/releases/latest for more information.";
+				var msg = $"You are not running the latest stable release ({latestReleaseTag}). See https://github.com/drittich/DnsTube/releases/latest for more information.";
 				_logger.LogInformation(msg);
 				await _logService.WriteAsync(msg, LogLevel.Information);
 			}
@@ -119,10 +119,7 @@ await _serverSentEventsService.SendEventAsync(new ServerSentEvent
 					if (ipAddressChanged || isManualUpdate)
 					{
 						if (isManualUpdate)
-						{
-							await _logService.WriteAsync("Manual update requested", LogLevel.Information);
 							isManualUpdate = false;
-						}
 
 						var selectedDomainsValid = await _cloudflareService.ValidateSelectedDomainsAsync();
 						if (selectedDomainsValid)