Skip to content

Commit

Permalink
#70 fix null source folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@danzuep
danzuep committed Jul 30, 2024
1 parent ae5ecea commit e7cacc0
Show file tree
Hide file tree
Showing 10 changed files with 122 additions and 73 deletions.
133 changes: 87 additions & 46 deletions samples/WorkerServiceExample/Worker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace ExampleNamespace;

public class Worker : BackgroundService
{
private const string _processed = "Processed";
private readonly IImapReceiver _imapReceiver;
private readonly IServiceScope _serviceScope;
private readonly ILoggerFactory _loggerFactory;
Expand All @@ -34,7 +35,6 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken =
//await SendAttachmentAsync(500);
//await ReceiveAsync(cancellationToken);
//await QueryAsync(cancellationToken);
//await MonitorAsync(cancellationToken);
//await DeleteSeenAsync(cancellationTokenSource);
//await NotReentrantAsync(cancellationToken);
//await DownloadAllAttachmentsAsync(cancellationToken);
Expand All @@ -46,6 +46,8 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken =
//await AddFlagsToNewestMessageSummaryAsync(cancellationToken);
//await GetMailFolderCacheAsync();
//await CreateFolderAndMoveTopOneAsync();
//await MonitorAsync(cancellationToken);
await MonitorMoveAsync(cancellationToken);
}

private static ImapReceiver CreateExchangeOAuth2ImapClientExample(SaslMechanismOAuth2 oauth2)
Expand Down Expand Up @@ -134,17 +136,17 @@ private async Task MoveTopOneToFolderAsync(IMailFolderClient mailFolderClient, s
_logger.LogInformation($"Moved {_imapReceiver} mime message {messageSummary.UniqueId} to {destinationFolderFullName} folder as #{uniqueId}.");
}

private async Task CreateFolderAndMoveTopOneAsync(string mailFolderFullName = "Processed", CancellationToken cancellationToken = default)
private async Task CreateFolderAndMoveTopOneAsync(string mailFolderFullName = _processed, CancellationToken cancellationToken = default)
{
//var mailFolderNames = await _imapReceiver.GetMailFolderNamesAsync(cancellationToken);
using var mailFolderClient = _serviceScope.ServiceProvider.GetRequiredService<IMailFolderClient>();
var baseFolder = await mailFolderClient.GetFolderAsync(["INBOX"]);
var baseFolder = await mailFolderClient.GetFolderAsync();
var mailFolder = await baseFolder.GetOrCreateSubfolderAsync(mailFolderFullName, cancellationToken);
//var mailFolder = await mailFolderClient.GetOrCreateFolderAsync(mailFolderFullName, cancellationToken);
await MoveTopOneToFolderAsync(mailFolderClient, mailFolderFullName, cancellationToken);
}

private async Task GetMailFolderCacheAsync(string mailFolderFullName = "Processed", CancellationToken cancellationToken = default)
private async Task GetMailFolderCacheAsync(string mailFolderFullName = _processed, CancellationToken cancellationToken = default)
{
using var mailFolderClient = _serviceScope.ServiceProvider.GetRequiredService<IMailFolderClient>();
var mailFolderCache = _serviceScope.ServiceProvider.GetRequiredService<IMailFolderCache>();
Expand Down Expand Up @@ -178,41 +180,6 @@ private async Task DeleteSeenAsync(CancellationTokenSource cancellationTokenSour
_logger.LogInformation($"Deleted {messagesDeleted} messages from {_imapReceiver} {filteredMessages.Count} Seen messages.");
}

private async Task NotReentrantAsync(CancellationToken cancellationToken = default)
{
using var cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
var sendTask = DelayedSendAsync(500, cancellationToken);
var newestEmail = await GetNewestMessageSummaryAsync();
await _imapReceiver.MonitorFolder.SetMessageSummaryItems()
.SetIgnoreExistingMailOnConnect()
.OnMessageArrival(OnArrivalAsync)
.IdleAsync(cancellationTokenSource.Token);
await sendTask;
_logger.LogInformation($"{_imapReceiver} NotReentrant test complete.");

async Task OnArrivalAsync(IMessageSummary messageSummary)
{
try
{
if (messageSummary.UniqueId.Id > newestEmail?.UniqueId.Id)
{
var mimeMessage = await messageSummary.GetMimeMessageAsync(cancellationToken);
//var mimeMessage = await _imapReceiver.ReadMail.GetMimeMessageAsync(messageSummary.UniqueId);
await messageSummary.AddFlagsAsync(MessageFlags.Seen);
_logger.LogDebug($"{_imapReceiver} message #{messageSummary.UniqueId} message downloaded, Seen flag added.");
_logger.LogInformation($"{_imapReceiver} message #{messageSummary.UniqueId} arrival processed, {mimeMessage.MessageId}.");
cancellationTokenSource.Cancel();
}
else
_logger.LogInformation($"{_imapReceiver} message #{messageSummary.UniqueId} arrived.");
}
catch (Exception ex)
{
_logger.LogError(ex, $"{_imapReceiver} message #{messageSummary.UniqueId} failed. {ex.Message}");
}
}
}

private async Task ForwardFirstEmailAsync(CancellationToken cancellationToken = default)
{
var extras = MessageSummaryItems.Headers | MessageSummaryItems.Flags | MessageSummaryItems.Size;
Expand Down Expand Up @@ -459,24 +426,98 @@ private async Task SendAttachmentAsync(int millisecondsDelay, string filePath =
await Task.Delay(millisecondsDelay, cancellationToken);
}

private async Task DelayedSendAsync(int millisecondsDelay, CancellationToken cancellationToken = default)
private async Task DelayedSendAsync(int millisecondsDelay, ISmtpSender? smtpSender = null, CancellationToken cancellationToken = default)
{
using var smtpSender = _serviceScope.ServiceProvider.GetRequiredService<ISmtpSender>();
var temporarySender = smtpSender == null;
smtpSender ??= _serviceScope.ServiceProvider.GetRequiredService<ISmtpSender>();
await Task.Delay(millisecondsDelay, cancellationToken);
bool isSent = await CreateTemplate(smtpSender).TrySendAsync(cancellationToken);
_logger.LogInformation($"Email {(isSent ? "sent" : "failed to send")}.");
smtpSender.Enqueue(CreateTemplate(smtpSender).MimeMessage);
//bool isSent = await CreateTemplate(smtpSender).TrySendAsync(cancellationToken);
//_logger.LogInformation($"Email {(isSent ? "sent" : "failed to send")}.");
if (temporarySender) smtpSender.Dispose();
}

private async Task NotReentrantAsync(CancellationToken cancellationToken = default)
{
using var cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
using var smtpSender = _serviceScope.ServiceProvider.GetRequiredService<ISmtpSender>();
var sendTask = DelayedSendAsync(500, smtpSender, cancellationToken);
var newestEmail = await GetNewestMessageSummaryAsync();
await _imapReceiver.MonitorFolder.SetMessageSummaryItems()
.SetIgnoreExistingMailOnConnect()
.OnMessageArrival(OnArrivalAsync)
.IdleAsync(cancellationTokenSource.Token);
await sendTask;
_logger.LogInformation($"{_imapReceiver} NotReentrant test complete.");

async Task OnArrivalAsync(IMessageSummary messageSummary)
{
try
{
if (messageSummary.UniqueId.Id > newestEmail?.UniqueId.Id)
{
var mimeMessage = await messageSummary.GetMimeMessageAsync(cancellationToken);
//var mimeMessage = await _imapReceiver.ReadMail.GetMimeMessageAsync(messageSummary.UniqueId);
await messageSummary.AddFlagsAsync(MessageFlags.Seen, silent: true, cancellationToken);
_logger.LogDebug($"{_imapReceiver} message #{messageSummary.UniqueId} message downloaded, Seen flag added.");
_logger.LogInformation($"{_imapReceiver} message #{messageSummary.UniqueId} arrival processed, {mimeMessage.MessageId}.");
cancellationTokenSource.Cancel();
}
else
_logger.LogInformation($"{_imapReceiver} message #{messageSummary.UniqueId} arrived.");
}
catch (Exception ex)
{
_logger.LogError(ex, $"{_imapReceiver} message #{messageSummary.UniqueId} failed. {ex.Message}");
}
}
}

private async Task MonitorMoveAsync(CancellationToken cancellationToken = default)
{
using var cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
using var smtpSender = _serviceScope.ServiceProvider.GetRequiredService<ISmtpSender>();
using var mailFolderClient = _serviceScope.ServiceProvider.GetRequiredService<IMailFolderClient>();
int delayMs = 1000;
var sendTasks = new List<Task>();
for (int waitCount = 1; waitCount <= 2; waitCount++)
{
var sendTask = DelayedSendAsync(waitCount * delayMs, smtpSender, cancellationToken);
sendTasks.Add(sendTask);
}
await _imapReceiver.MonitorFolder
.SetMessageSummaryItems()
.SetIgnoreExistingMailOnConnect()
.OnMessageArrival(ProcessMessageAsync)
.IdleAsync(cancellationToken);
await Task.WhenAll(sendTasks);
_logger.LogInformation($"{_imapReceiver} Monitor & Move test complete.");

async Task ProcessMessageAsync(IMessageSummary messageSummary)
{
var mailFolder = await mailFolderClient.GetOrCreateFolderAsync(_processed, cancellationToken);
var uniqueId = await mailFolderClient.MoveToAsync(messageSummary.UniqueId, mailFolder, cancellationToken);
if (uniqueId == null)
_logger.LogInformation($"{_imapReceiver} message #{messageSummary.UniqueId} not moved to [{_processed}], UniqueId is null.");
else
_logger.LogDebug($"{_imapReceiver} message #{messageSummary.UniqueId} moved to [{_processed}] {uniqueId}.");
}
}

private async Task MonitorAsync(CancellationToken cancellationToken = default)
{
var sendTask = DelayedSendAsync(1000, cancellationToken);
using var smtpSender = _serviceScope.ServiceProvider.GetRequiredService<ISmtpSender>();
var sendTask = DelayedSendAsync(500, smtpSender, cancellationToken);
void ProcessMessage(IMessageSummary messageSummary) =>
_logger.LogInformation($"{_imapReceiver} message #{messageSummary.UniqueId} processed.");
await _imapReceiver.MonitorFolder
.SetMessageSummaryItems()
.SetIgnoreExistingMailOnConnect()
.OnMessageArrival((m) => Console.WriteLine(m.UniqueId))
.OnMessageDeparture((m) => Console.WriteLine(m.UniqueId))
.OnMessageArrival(ProcessMessage)
.OnMessageDeparture(ProcessMessage)
.IdleAsync(cancellationToken);
await sendTask;
_logger.LogInformation($"{_imapReceiver} Monitoring complete.");
}

public override void Dispose()
Expand Down
2 changes: 1 addition & 1 deletion source/MailKitSimplified.Generic/MailKitSimplified.Generic.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.29" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion source/MailKitSimplified.Receiver/Abstractions/IMailFolderClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public interface IMailFolderClient : IAsyncDisposable, IDisposable
/// <param name="folderNames">Folder names to search for.</param>
/// <param name="cancellationToken">Cancellation token.</param>
/// <returns>Mail folder with a matching name.</returns>
Task<IMailFolder> GetFolderAsync(IEnumerable<string> folderNames, CancellationToken cancellationToken = default);
Task<IMailFolder> GetFolderAsync(IEnumerable<string> folderNames = null, CancellationToken cancellationToken = default);

/// <summary>
/// Get or create a mail folder in the user namespace.
Expand Down
7 changes: 4 additions & 3 deletions source/MailKitSimplified.Receiver/MailKitSimplified.Receiver.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.3" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="MailKit" Version="4.6.0" />
<PackageReference Update="MimeKit" Version="4.6.0" />
<PackageReference Update="MailKit" Version="4.7.1.1" />
<PackageReference Update="MimeKit" Version="4.7.1" />
<PackageReference Update="System.IO.Abstractions" Version="21.0.29" />
</ItemGroup>

</Project>
Loading

0 comments on commit e7cacc0

Please sign in to comment.