Refactor of IEditableMessage to IMessageBuilder.

Author: rnwood

Rnwood.Smtp4dev/API/DTO/Message.cs

@@ -1,4 +1,5 @@
 using MimeKit;
+using Rnwood.Smtp4dev.Model;
 using Rnwood.SmtpServer;
 using System;
 using System.Collections.Generic;
@@ -10,9 +11,9 @@ namespace Rnwood.Smtp4dev.Controllers.API.DTO
 {
  public class Message
  {
- private IMessage _message;
+ private ISmtp4devMessage _message;
 
- public Message(IMessage message)
+ internal Message(ISmtp4devMessage message)
  {
  _message = message;
 
@@ -37,5 +38,7 @@ public Message(IMessage message)
  public string[] To { get { return _message.To; } }
 
  public string Subject { get; private set; }
+
+ public Guid Id { get { return _message.Id; } }
  }
 }

Rnwood.Smtp4dev/API/MessageController.cs

@@ -13,11 +13,11 @@ namespace Rnwood.Smtp4dev.Controllers.API
  [Route("api/message")]
  public class MessagesController : Controller
  {
- private ISmtp4devServer _messageStore;
+ private IMessageStore _messageStore;
 
- public MessagesController(ISmtp4devServer messgeStore)
+ public MessagesController(IMessageStore messageStore)
  {
- _messageStore = messgeStore;
+ _messageStore = messageStore;
  }
 
  // GET: api/values
@@ -26,11 +26,5 @@ public IEnumerable<Message> Get()
  {
  return _messageStore.Messages.Select(m => new Message(m));
  }
-
- // DELETE api/values/5
- [HttpDelete("{id}")]
- public void Delete(Guid id)
- {
- }
  }
 }

Rnwood.Smtp4dev/API/MessagesHub.cs

@@ -9,14 +9,14 @@ namespace Rnwood.Smtp4dev.API
 {
  public class MessagesHub : Hub
  {
- public MessagesHub(ISmtp4devServer server)
+ public MessagesHub(IMessageStore messageStore)
  {
- server.MessagesChanged += (s, ea) => { Refresh(); };
+ messageStore.MessageAdded += (s, ea) => { MessageAdded(ea.Message); };
  }
 
- public void Refresh()
+ public void MessageAdded(ISmtp4devMessage message)
  {
- Clients.All.refresh();
+ Clients.All.messageAdded(message.Id);
  }
  }
 }

Rnwood.Smtp4dev/Model/IMessageStore.cs

@@ -0,0 +1,17 @@
+using Rnwood.SmtpServer;
+using System;
+using System.Collections.Generic;
+
+namespace Rnwood.Smtp4dev.Model
+{
+ public interface IMessageStore
+ {
+ IEnumerable<ISmtp4devMessage> Messages { get; }
+
+ event EventHandler<Smtp4devMessageEventArgs> MessageAdded;
+
+ void AddMessage(ISmtp4devMessage message);
+
+ ISmtp4devMessage CreateMessage(IConnection connection);
+ }
+}

Rnwood.Smtp4dev/Model/ISmtp4devServer.cs renamed to Rnwood.Smtp4dev/Model/ISmtp4devEngine.cs

@@ -6,12 +6,8 @@
 
 namespace Rnwood.Smtp4dev.Model
 {
- public interface ISmtp4devServer
+ public interface ISmtp4devEngine
  {
- event EventHandler<EventArgs> MessagesChanged;
-
- IEnumerable<IMessage> Messages { get; }
-
  void ApplySettings(Settings settings);
 
  bool IsRunning { get; }

Rnwood.Smtp4dev/Model/ISmtp4devMessage.cs

@@ -0,0 +1,13 @@
+using Rnwood.SmtpServer;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Rnwood.Smtp4dev.Model
+{
+ public interface ISmtp4devMessage : IMessage
+ {
+ Guid Id { get; }
+ }
+}

Rnwood.Smtp4dev/Model/MessageStore.cs

@@ -0,0 +1,53 @@
+using Rnwood.SmtpServer;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Rnwood.Smtp4dev.Model
+{
+ public class MessageStore : IMessageStore
+ {
+ public MessageStore(DirectoryInfo directory)
+ {
+ _directory = directory;
+
+ if (!_directory.Exists)
+ {
+ _directory.Create();
+ }
+ }
+
+ private DirectoryInfo _directory;
+
+ private ConcurrentQueue<ISmtp4devMessage> _messages = new ConcurrentQueue<ISmtp4devMessage>();
+
+ public IEnumerable<ISmtp4devMessage> Messages
+ {
+ get
+ {
+ return _messages.ToList();
+ }
+ }
+
+ public event EventHandler<Smtp4devMessageEventArgs> MessageAdded;
+
+ public void AddMessage(ISmtp4devMessage message)
+ {
+ _messages.Enqueue(message);
+ MessageAdded?.Invoke(this, new Smtp4devMessageEventArgs(message));
+ }
+
+ public ISmtp4devMessage CreateMessage(IConnection connection)
+ {
+ Guid id = Guid.NewGuid();
+
+ string fileName = Path.Combine(_directory.FullName, id.ToString() + ".msg");
+
+ return new Smtp4devMessage(connection.Session, id, new FileInfo(fileName));
+ }
+ }
+}

Rnwood.Smtp4dev/Model/ServiceExtensions.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -13,8 +14,13 @@ public static void UseSmtp4dev(this IServiceCollection services)
  SettingsStore settingsStore = new SettingsStore();
  services.AddInstance<ISettingsStore>(settingsStore);
 
- Smtp4devServer server = new Smtp4devServer(settingsStore);
- services.AddInstance<ISmtp4devServer>(server);
+ string messagesPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Smtp4dev", "Messages");
+
+ MessageStore messageStore = new MessageStore(new DirectoryInfo(messagesPath));
+ services.AddInstance<IMessageStore>(messageStore);
+
+ Smtp4devEngine server = new Smtp4devEngine(settingsStore, messageStore);
+ services.AddInstance<ISmtp4devEngine>(server);
  }
  }
 }

Rnwood.Smtp4dev/Model/Smtp4devServer.cs renamed to Rnwood.Smtp4dev/Model/Smtp4devEngine.cs

@@ -7,34 +7,19 @@
 
 namespace Rnwood.Smtp4dev.Model
 {
- public class Smtp4devServer : ISmtp4devServer
+ public class Smtp4devEngine : ISmtp4devEngine
  {
- private DefaultServer _server;
- private ObservableCollection<IMessage> _messages = new ObservableCollection<IMessage>();
+ private Server _server;
  private ISettingsStore _settingsStore;
+ private IMessageStore _messageStore;
 
- public Smtp4devServer(ISettingsStore settingsStore)
+ public Smtp4devEngine(ISettingsStore settingsStore, IMessageStore messageStore)
  {
  _settingsStore = settingsStore;
-
- _messages.CollectionChanged += (s, ea) =>
- {
- MessagesChanged?.Invoke(this, new EventArgs());
- };
-
+ _messageStore = messageStore;
  TryStart();
  }
 
- public IEnumerable<IMessage> Messages
- {
- get
- {
- return _messages.ToList();
- }
- }
-
- public event EventHandler<EventArgs> MessagesChanged;
-
  public Exception ServerError { get; set; }
 
  public bool IsRunning
@@ -62,8 +47,7 @@ public void TryStart()
 
  try
  {
- _server = new DefaultServer(settings.Port);
- _server.MessageReceived += MessageReceived;
+ _server = new Server(new Smtp4devServerBehaviour(settings, OnMessageReceived, connection => (IMessageBuilder)_messageStore.CreateMessage(connection)));
  _server.Start();
  }
  catch (Exception e)
@@ -77,9 +61,9 @@ private void Stop()
  _server.Stop(true);
  }
 
- private void MessageReceived(object sender, MessageEventArgs e)
+ private void OnMessageReceived(ISmtp4devMessage message)
  {
- _messages.Add(e.Message);
+ _messageStore.AddMessage(message);
  }
  }
 }

Rnwood.Smtp4dev/Model/Smtp4devMessage.cs

@@ -0,0 +1,19 @@
+using Rnwood.SmtpServer;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Rnwood.Smtp4dev.Model
+{
+ internal class Smtp4devMessage : FileMessage, ISmtp4devMessage
+ {
+ internal Smtp4devMessage(ISession session, Guid id, FileInfo file) : base(file, true)
+ {
+ Id = id;
+ }
+
+ public Guid Id { get; private set; }
+ }
+}