Sending mails works
This commit is contained in:
17
Massmailer.Shared/Events/MailSentEvent.cs
Normal file
17
Massmailer.Shared/Events/MailSentEvent.cs
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Massmailer.Shared.Events
|
||||||
|
{
|
||||||
|
public class MailSentEvent
|
||||||
|
{
|
||||||
|
public MailSentEvent(string recipient, DateTime timestamp)
|
||||||
|
{
|
||||||
|
this.Recipient = recipient;
|
||||||
|
this.Timestamp = timestamp;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Recipient { get; private set; }
|
||||||
|
|
||||||
|
public DateTime Timestamp { get; private set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,4 @@
|
|||||||
using System;
|
using System.Threading.Tasks;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Massmailer.Shared
|
namespace Massmailer.Shared
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
using MailKit.Net.Smtp;
|
using MailKit.Net.Smtp;
|
||||||
|
using Massmailer.Shared.Events;
|
||||||
using Massmailer.Shared.Model;
|
using Massmailer.Shared.Model;
|
||||||
using MimeKit;
|
using MimeKit;
|
||||||
|
using PubSub;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Massmailer.Shared.Logic
|
namespace Massmailer.Shared.Logic
|
||||||
@@ -9,36 +13,99 @@ namespace Massmailer.Shared.Logic
|
|||||||
public class Mailer : IMailer
|
public class Mailer : IMailer
|
||||||
{
|
{
|
||||||
private readonly SmtpSettings smtpSettings;
|
private readonly SmtpSettings smtpSettings;
|
||||||
|
private readonly SmtpClient smtpClient;
|
||||||
|
private readonly Hub hub;
|
||||||
|
private readonly int minWaitTime = 0;
|
||||||
|
private DateTime lastMailSent = DateTime.MinValue;
|
||||||
|
|
||||||
public Mailer(SmtpSettings smtpSettings)
|
public Mailer(SmtpSettings smtpSettings, Hub hub)
|
||||||
{
|
{
|
||||||
this.smtpSettings = smtpSettings;
|
this.smtpSettings = smtpSettings;
|
||||||
|
this.smtpClient = new SmtpClient();
|
||||||
|
this.smtpClient.ServerCertificateValidationCallback = (s, c, h, e) => true;
|
||||||
|
this.hub = hub;
|
||||||
|
|
||||||
|
// Calculate wait time in seconds
|
||||||
|
this.minWaitTime = (int)Math.Ceiling(60d / this.smtpSettings.MaxSendRate);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task SendMailAsync(string email, string subject, string body)
|
public MimeMessage CreateMessage(string recipient, string subject, string body)
|
||||||
|
{
|
||||||
|
var message = new MimeMessage();
|
||||||
|
message.From.Add(new MailboxAddress(this.smtpSettings.SenderName, this.smtpSettings.SenderEmail));
|
||||||
|
message.To.Add(new MailboxAddress(recipient, recipient));
|
||||||
|
message.Subject = subject;
|
||||||
|
message.Body = new TextPart("html") { Text = body };
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<MimeMessage> CreateMessages(List<string> recipients, string subject, string body)
|
||||||
|
{
|
||||||
|
var result = new List<MimeMessage>();
|
||||||
|
foreach (var recipient in recipients)
|
||||||
|
{
|
||||||
|
result.Add(this.CreateMessage(recipient, subject, body));
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SendMailsAsync(List<string> recipients, string subject, string body)
|
||||||
|
{
|
||||||
|
var messages = this.CreateMessages(recipients, subject, body);
|
||||||
|
await this.SendMailsAsync(messages);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task SendMailsAsync(List<MimeMessage> messages)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var message = new MimeMessage();
|
await this.smtpClient.ConnectAsync(this.smtpSettings.Server, this.smtpSettings.Port, this.smtpSettings.UseSsl);
|
||||||
message.From.Add(new MailboxAddress(this.smtpSettings.SenderName, this.smtpSettings.SenderEmail));
|
await this.smtpClient.AuthenticateAsync(this.smtpSettings.Username, this.smtpSettings.Password);
|
||||||
message.To.Add(new MailboxAddress(email, email));
|
|
||||||
message.Subject = subject;
|
|
||||||
message.Body = new TextPart("html") { Text = body };
|
|
||||||
|
|
||||||
using (var client = new SmtpClient())
|
foreach (var message in messages)
|
||||||
{
|
{
|
||||||
client.ServerCertificateValidationCallback = (s, c, h, e) => true;
|
await this.CheckForWaitTime();
|
||||||
|
await this.smtpClient.SendAsync(message);
|
||||||
await client.ConnectAsync(this.smtpSettings.Server, this.smtpSettings.Port, this.smtpSettings.UseSsl);
|
this.lastMailSent = DateTime.Now;
|
||||||
await client.AuthenticateAsync(this.smtpSettings.Username, this.smtpSettings.Password);
|
this.hub.Publish<MailSentEvent>(new MailSentEvent(message.To[0].ToString(), this.lastMailSent));
|
||||||
await client.SendAsync(message);
|
|
||||||
await client.DisconnectAsync(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await this.smtpClient.DisconnectAsync(true);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
throw new InvalidOperationException(ex.Message);
|
throw new InvalidOperationException("Something went wrong while sending many mails", ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task SendMailAsync(string recipient, string subject, string body)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var message = this.CreateMessage(recipient, subject, body);
|
||||||
|
await this.SendMailsAsync(new List<MimeMessage> { message });
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Something went wrong while sending a mail", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task CheckForWaitTime()
|
||||||
|
{
|
||||||
|
await Task.Run(() =>
|
||||||
|
{
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
if (this.lastMailSent.AddSeconds(this.minWaitTime) < DateTime.Now)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
Thread.Sleep(100);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MailKit" Version="2.10.1" />
|
<PackageReference Include="MailKit" Version="2.10.1" />
|
||||||
|
<PackageReference Include="PubSub" Version="4.0.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
13
Massmailer.Shared/Model/MassmailProject.cs
Normal file
13
Massmailer.Shared/Model/MassmailProject.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace Massmailer.Shared.Model
|
||||||
|
{
|
||||||
|
public class MassmailProject
|
||||||
|
{
|
||||||
|
public List<MassmailRecipient> Recipient { get; set; }
|
||||||
|
|
||||||
|
public string Subject { get; set; }
|
||||||
|
|
||||||
|
public string Body { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
13
Massmailer.Shared/Model/MassmailRecipient.cs
Normal file
13
Massmailer.Shared/Model/MassmailRecipient.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Massmailer.Shared.Model
|
||||||
|
{
|
||||||
|
public class MassmailRecipient
|
||||||
|
{
|
||||||
|
public string Recipient { get; set; }
|
||||||
|
|
||||||
|
public bool IsSent { get; set; }
|
||||||
|
|
||||||
|
public DateTime SentDate { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,5 +21,7 @@ namespace Massmailer.Shared.Model
|
|||||||
public string Password { get; set; }
|
public string Password { get; set; }
|
||||||
|
|
||||||
public bool UseSsl { get; set; }
|
public bool UseSsl { get; set; }
|
||||||
|
|
||||||
|
public int MaxSendRate { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:local="clr-namespace:Massmailer.UI"
|
xmlns:local="clr-namespace:Massmailer.UI"
|
||||||
StartupUri="MainWindow.xaml">
|
StartupUri="Views\MainView.xaml">
|
||||||
<Application.Resources>
|
<Application.Resources>
|
||||||
|
|
||||||
</Application.Resources>
|
</Application.Resources>
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Navigation;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace Massmailer.UI
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for MainWindow.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class MainWindow : Window
|
|
||||||
{
|
|
||||||
public MainWindow()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,6 +6,10 @@
|
|||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="PubSub" Version="4.0.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Massmailer.Shared\Massmailer.Shared.csproj" />
|
<ProjectReference Include="..\Massmailer.Shared\Massmailer.Shared.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<Window x:Class="Massmailer.UI.MainWindow"
|
<Window x:Class="Massmailer.UI.MainView"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
@@ -7,6 +7,6 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="MainWindow" Height="450" Width="800">
|
Title="MainWindow" Height="450" Width="800">
|
||||||
<Grid>
|
<Grid>
|
||||||
|
<Button x:Name="BtnSend" Click="Button_Click" Content="Send"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
71
Massmailer.UI/Views/MainView.xaml.cs
Normal file
71
Massmailer.UI/Views/MainView.xaml.cs
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
using Massmailer.Shared.Events;
|
||||||
|
using Massmailer.Shared.Logic;
|
||||||
|
using Massmailer.Shared.Model;
|
||||||
|
using PubSub;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Data;
|
||||||
|
using System.Windows.Documents;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using System.Windows.Navigation;
|
||||||
|
using System.Windows.Shapes;
|
||||||
|
|
||||||
|
namespace Massmailer.UI
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Interaction logic for MainWindow.xaml
|
||||||
|
/// </summary>
|
||||||
|
public partial class MainView : Window
|
||||||
|
{
|
||||||
|
private readonly Hub hub = new Hub();
|
||||||
|
|
||||||
|
public MainView()
|
||||||
|
{
|
||||||
|
this.InitializeComponent();
|
||||||
|
this.hub.Subscribe<MailSentEvent>(this.MailSentEventHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void Button_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var smtpSettings = new SmtpSettings
|
||||||
|
{
|
||||||
|
Server = "localhost",
|
||||||
|
Port = 25,
|
||||||
|
Username = "test@test.local",
|
||||||
|
Password = "asdf33asdf",
|
||||||
|
UseSsl = false,
|
||||||
|
SenderEmail = "test@test.local",
|
||||||
|
SenderName = "Massmailer Test",
|
||||||
|
MaxSendRate = 60
|
||||||
|
};
|
||||||
|
var mailer = new Mailer(smtpSettings, this.hub);
|
||||||
|
var recipients = new List<string>
|
||||||
|
{
|
||||||
|
"1@test.local",
|
||||||
|
"2@test.local",
|
||||||
|
"3@test.local",
|
||||||
|
"4@test.local",
|
||||||
|
"5@test.local",
|
||||||
|
"6@test.local",
|
||||||
|
"7@test.local",
|
||||||
|
"8@test.local",
|
||||||
|
"9@test.local",
|
||||||
|
"10@test.local"
|
||||||
|
};
|
||||||
|
|
||||||
|
await mailer.SendMailsAsync(recipients, "Hello World Subject", "Hello World Body");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void MailSentEventHandler(MailSentEvent mailSentEvent)
|
||||||
|
{
|
||||||
|
this.BtnSend.Content = $"mail sent: {mailSentEvent.Recipient} at {mailSentEvent.Timestamp}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user