Merge pull request #18 from PandaTechAM/development

removing ipv4 prioritization

Author: HaikAsatryan

src/Communicator/Communicator.csproj

@@ -8,7 +8,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>2.2.1</Version>
+        <Version>2.2.2</Version>
         <PackageId>Pandatech.Communicator</PackageId>
         <Title>SMS and Email Communication helper</Title>
         <PackageTags>pandatech;communicator;messaging;email;smtp;mailkit;mimekit;sms;twilio;dexatel;notifications;transactional;dotnet;net9;minimal-api;dependency-injection</PackageTags>

src/Communicator/Services/Implementations/EmailService.cs

@@ -1,6 +1,4 @@
-using System.Net;
-using System.Net.Sockets;
-using Communicator.Helpers;
+using Communicator.Helpers;
 using Communicator.Models;
 using Communicator.Options;
 using Communicator.Services.Interfaces;
@@ -79,69 +77,13 @@ private static SmtpClient CreateClient(EmailConfiguration config)
 
    private static async Task ConnectAndAuthAsync(SmtpClient client, EmailConfiguration config, CancellationToken ct)
    {
-      var options = ResolveSocketOptions(config.SmtpPort);
-      client.Timeout = config.TimeoutMs;
+      var socketOptions = ResolveSocketOptions(config.SmtpPort);
+      await client.ConnectAsync(config.SmtpServer, config.SmtpPort, socketOptions, ct);
 
-      var addresses = await Dns.GetHostAddressesAsync(config.SmtpServer, ct);
-
-      var ordered = addresses
-                    .OrderByDescending(a => a.AddressFamily == AddressFamily.InterNetwork) // IPv4 first
-                    .ToArray();
-
-      Exception? last = null;
-
-      foreach (var ip in ordered)
+      if (!string.IsNullOrWhiteSpace(config.SmtpUsername))
       {
-         NetworkStream? stream = null;
-
-         try
-         {
-            using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct);
-            cts.CancelAfter(config.TimeoutMs);
-
-            var socket = new Socket(ip.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-            await socket.ConnectAsync(new IPEndPoint(ip, config.SmtpPort), cts.Token);
-
-            stream = new NetworkStream(socket, ownsSocket: true);
-
-            await client.ConnectAsync(stream, config.SmtpServer, config.SmtpPort, options, cts.Token);
-
-            stream = null; // MailKit now owns the connection
-
-            await client.AuthenticateAsync(config.SmtpUsername, config.SmtpPassword, cts.Token);
-            return;
-         }
-         catch (Exception ex)
-         {
-            last = ex;
-
-            try
-            {
-               if (stream is not null)
-               {
-                  await stream.DisposeAsync();
-               }
-            }
-            catch
-            {
-               // ignored
-            }
-
-            try
-            {
-               if (client.IsConnected)
-               {
-                  await client.DisconnectAsync(true, CancellationToken.None);
-               }
-            }
-            catch
-            {
-               // ignored
-            }
-         }
+         await client.AuthenticateAsync(config.SmtpUsername, config.SmtpPassword, ct);
       }
-
-      throw last ?? new TimeoutException("SMTP connect failed.");
    }
 
    private static SecureSocketOptions ResolveSocketOptions(int port)