(#39) Add hostname support to MPDConnectionService

Difegue · Sep 15, 2023 · d11811d · d11811d
1 parent 9f9ab0c
commit d11811d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/Sources/Stylophone.Common/Helpers/Miscellaneous.cs b/Sources/Stylophone.Common/Helpers/Miscellaneous.cs
@@ -2,6 +2,7 @@
 using SkiaSharp;
 using System;
 using System.IO;
+using System.Net;
 
 namespace Stylophone.Common.Helpers
 {
@@ -83,5 +84,25 @@ public static string EscapeFilename(string fileName)
             }
             return fileName.Replace(".", "002E");
         }
+
+        public static IPEndPoint GetIPEndPointFromHostName(string hostName, int port, bool throwIfMoreThanOneIP)
+        {
+            var addresses = System.Net.Dns.GetHostAddresses(hostName);
+            if (addresses.Length == 0)
+            {
+                throw new ArgumentException(
+                    "Unable to retrieve address from specified host name.",
+                    "hostName"
+                );
+            }
+            else if (throwIfMoreThanOneIP && addresses.Length > 1)
+            {
+                throw new ArgumentException(
+                    "There is more that one IP address to the specified host.",
+                    "hostName"
+                );
+            }
+            return new IPEndPoint(addresses[0], port); // Port gets validated here.
+        }
     }
 }
diff --git a/Sources/Stylophone.Common/Services/MPDConnectionService.cs b/Sources/Stylophone.Common/Services/MPDConnectionService.cs
@@ -11,6 +11,7 @@
 using Stylophone.Common.Interfaces;
 using MpcNET.Commands.Reflection;
 using Stylophone.Localization.Strings;
+using Stylophone.Common.Helpers;
 
 namespace Stylophone.Common.Services
 {
@@ -134,10 +135,16 @@ public void Disconnect()
         private async Task TryConnecting(CancellationToken token)
         {
             if (token.IsCancellationRequested) return;
-            if (!IPAddress.TryParse(_host, out var ipAddress)) 
-                throw new Exception("Invalid IP address");
 
-            _mpdEndpoint = new IPEndPoint(ipAddress, _port);
+            if (!IPAddress.TryParse(_host, out var ipAddress))
+            {
+                // Maybe it's a hostname? Try getting an IP from it nonetheless
+                _mpdEndpoint = Miscellaneous.GetIPEndPointFromHostName(_host, _port, false);
+            } 
+            else
+            {
+                _mpdEndpoint = new IPEndPoint(ipAddress, _port);
+            }
 
             _statusConnection = await GetConnectionInternalAsync(token);