mailcatcher-ng 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c31256fbd4bdc76749770fe321db1351839f23fd01d1ef2ab6f21382da774b
-  data.tar.gz: 7f77c22a8dd2e3b7cea54c6ec415af7f408ad39588e48772cffaec625dd8fd15
+  metadata.gz: 6539793c4e31686b97ba0502cc4c48c47c49ace16230fea4cf2f2cb8d06704c7
+  data.tar.gz: d74ed846c8205f2b37b9b433b618424929d12515a928d23b4a481fe03a5993d1
 SHA512:
-  metadata.gz: 3e47f2938af045fd8da6b1e7eacb1a0552a5076bd5415c1079db271335271fc1299c3c47e3dfc78b9eaf1383699f339c1b7f674ff3169bdf65f270666c819255
-  data.tar.gz: c49f21a836aae6a35f84568997ddc29f4c619b3cebead68421a882b4ab3ff5ae4685f39e7a69a0473840d83831f88b55b01b4cbe0af5399981f04663319e65f5
+  metadata.gz: fd19f4d57d9710adc6c60a21aeeefbfb2623e57d6725463f5bd01b3ce5e5fcb93360d1543301bc9655b64fc814994d036e3c8cf8de3940643f69ccf1f4063297
+  data.tar.gz: 7aed22f4e9a54ca7e239f7401d95931cfce90f309d2beae5d28049aa939b4903bb2d256aac8ff694c3740bf62835d6bf2c5f90d8c9b53fd3f855a2b282e6860e

data/lib/mail_catcher/mail.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "eventmachine"
+require "fileutils"
 require "json"
 require "mail"
 require "sqlite3"
@@ -8,9 +9,10 @@ require "sqlite3"
 module MailCatcher::Mail extend self
   def db
     @__db ||= begin
-      SQLite3::Database.new(":memory:", :type_translation => true).tap do |db|
+      db_path = determine_db_path
+      SQLite3::Database.new(db_path, :type_translation => true).tap do |db|
         db.execute(<<-SQL)
-          CREATE TABLE message (
+          CREATE TABLE IF NOT EXISTS message (
             id INTEGER PRIMARY KEY ASC,
             sender TEXT,
             recipients TEXT,
@@ -22,7 +24,7 @@ module MailCatcher::Mail extend self
           )
         SQL
         db.execute(<<-SQL)
-          CREATE TABLE message_part (
+          CREATE TABLE IF NOT EXISTS message_part (
             id INTEGER PRIMARY KEY ASC,
             message_id INTEGER NOT NULL,
             cid TEXT,
@@ -37,7 +39,7 @@ module MailCatcher::Mail extend self
           )
         SQL
         db.execute(<<-SQL)
-          CREATE TABLE smtp_transcript (
+          CREATE TABLE IF NOT EXISTS smtp_transcript (
             id INTEGER PRIMARY KEY ASC,
             message_id INTEGER,
             session_id TEXT NOT NULL,
@@ -55,13 +57,25 @@ module MailCatcher::Mail extend self
             FOREIGN KEY (message_id) REFERENCES message (id) ON DELETE CASCADE
           )
         SQL
-        db.execute("CREATE INDEX idx_smtp_transcript_message_id ON smtp_transcript(message_id)")
-        db.execute("CREATE INDEX idx_smtp_transcript_session_id ON smtp_transcript(session_id)")
+        db.execute("CREATE INDEX IF NOT EXISTS idx_smtp_transcript_message_id ON smtp_transcript(message_id)")
+        db.execute("CREATE INDEX IF NOT EXISTS idx_smtp_transcript_session_id ON smtp_transcript(session_id)")
         db.execute("PRAGMA foreign_keys = ON")
       end
     end
   end
 
+  def determine_db_path
+    if MailCatcher.options && MailCatcher.options[:persistence]
+      # Use a persistent SQLite file in the user's home directory
+      db_dir = File.expand_path('~/.mailcatcher')
+      FileUtils.mkdir_p(db_dir) unless Dir.exist?(db_dir)
+      File.join(db_dir, 'mailcatcher.db')
+    else
+      # Use in-memory database
+      ':memory:'
+    end
+  end
+
   def add_message(message)
     @add_message_query ||= db.prepare("INSERT INTO message (sender, recipients, subject, source, type, size, created_at) VALUES (?, ?, ?, ?, ?, ?, datetime('now'))")
 
@@ -311,7 +325,10 @@ module MailCatcher::Mail extend self
 
   def delete!
     @delete_all_messages_query ||= db.prepare "DELETE FROM message"
+    @delete_all_transcripts_query ||= db.prepare "DELETE FROM smtp_transcript"
+
     @delete_all_messages_query.execute
+    @delete_all_transcripts_query.execute
 
     EventMachine.next_tick do
       MailCatcher::Bus.push(type: "clear")
@@ -438,7 +455,7 @@ module MailCatcher::Mail extend self
 
   def message_transcript(message_id)
     @message_transcript_query ||= db.prepare(<<-SQL)
-      SELECT id, session_id, client_ip, client_port,
+      SELECT id, message_id, session_id, client_ip, client_port,
              server_ip, server_port, tls_enabled, tls_protocol,
              tls_cipher, connection_started_at, connection_ended_at,
              entries, created_at
@@ -470,6 +487,24 @@ module MailCatcher::Mail extend self
     end
   end
 
+  def all_transcript_entries
+    @all_transcript_entries_query ||= db.prepare(<<-SQL)
+      SELECT id, message_id, session_id, client_ip, client_port,
+             server_ip, server_port, tls_enabled, tls_protocol,
+             tls_cipher, connection_started_at, connection_ended_at,
+             entries, created_at
+      FROM smtp_transcript
+      ORDER BY created_at DESC
+    SQL
+
+    @all_transcript_entries_query.execute.map do |row|
+      result = Hash[@all_transcript_entries_query.columns.zip(row)]
+      result['entries'] = JSON.parse(result['entries']) if result['entries']
+      result['tls_enabled'] = result['tls_enabled'] == 1
+      result
+    end
+  end
+
   private
 
   def parse_authentication_results(auth_header)

data/lib/mail_catcher/smtp.rb

@@ -18,6 +18,7 @@ class MailCatcher::Smtp < EventMachine::Protocols::SmtpServer
     @session_id = SecureRandom.uuid
     @connection_started_at = Time.now
     @data_started = false
+    @last_message_id = nil
     super
   end
 
@@ -58,8 +59,9 @@ class MailCatcher::Smtp < EventMachine::Protocols::SmtpServer
     @connection_ended_at = Time.now
     log_transcript('connection', 'server', "Connection closed")
 
-    # Save transcript even if no message was completed
-    save_transcript(nil) if @transcript_entries.any?
+    # Save transcript with the last message if available, otherwise without message_id
+    # This ensures "Connection closed" is included in the transcript
+    save_transcript(@last_message_id) if @transcript_entries.any?
 
     super
   end
@@ -205,6 +207,7 @@ class MailCatcher::Smtp < EventMachine::Protocols::SmtpServer
 
     begin
       message_id = MailCatcher::Mail.add_message current_message
+      @last_message_id = message_id
     rescue => e
       $stderr.puts "Error in add_message: #{e.message}"
       $stderr.puts e.backtrace.join("\n")
@@ -213,16 +216,15 @@ class MailCatcher::Smtp < EventMachine::Protocols::SmtpServer
 
     MailCatcher::Mail.delete_older_messages!
 
-    # Save transcript linked to message
-    save_transcript(message_id)
+    # Don't save transcript here - save it when connection closes (in unbind)
+    # This ensures "Connection closed" entry is included
 
     true
   rescue => exception
     log_transcript('error', 'server', "Exception: #{exception.class} - #{exception.message}")
     MailCatcher.log_exception("Error receiving message", @current_message, exception)
 
-    # Save transcript even on error
-    save_transcript(nil)
+    # Don't save transcript here - save it when connection closes (in unbind)
 
     false
   ensure

data/lib/mail_catcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MailCatcher
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/lib/mail_catcher/web/application.rb

@@ -101,9 +101,39 @@ module MailCatcher
           @fqdn = fqdn
         end
 
+        # Fetch all SMTP transcripts and flatten entries for display
+        transcripts = Mail.all_transcript_entries
+        @log_entries = transcripts.flat_map do |transcript|
+          transcript['entries'].map do |entry|
+            entry.merge({
+              'session_id' => transcript['session_id'],
+              'client_ip' => transcript['client_ip'],
+              'server_port' => transcript['server_port'],
+              'tls_enabled' => transcript['tls_enabled']
+            })
+          end
+        end.sort_by { |e| e['timestamp'] }
+
         erb :server_info
       end
 
+      get "/logs.json" do
+        content_type :json
+        transcripts = Mail.all_transcript_entries
+        log_entries = transcripts.flat_map do |transcript|
+          transcript['entries'].map do |entry|
+            entry.merge({
+              'session_id' => transcript['session_id'],
+              'client_ip' => transcript['client_ip'],
+              'server_port' => transcript['server_port'],
+              'tls_enabled' => transcript['tls_enabled']
+            })
+          end
+        end.sort_by { |e| e['timestamp'] }
+
+        JSON.generate(entries: log_entries)
+      end
+
       delete "/" do
         if MailCatcher.quittable?
           MailCatcher.quit!

data/lib/mail_catcher.rb

@@ -85,6 +85,7 @@ module MailCatcher
     http_port: '1080',
     http_path: '/',
     messages_limit: nil,
+    persistence: false,
     verbose: false,
     daemon: !windows?,
     browse: false,
@@ -157,6 +158,10 @@ module MailCatcher
           options[:messages_limit] = count
         end
 
+        parser.on('--persistence', 'Store messages in a persistent SQLite database file') do
+          options[:persistence] = true
+        end
+
         parser.on('--http-path PATH', String, 'Add a prefix to all HTTP paths') do |path|
           clean_path = Rack::Utils.clean_path_info("/#{path}")
 

data/public/assets/mailcatcher.css

@@ -324,6 +324,37 @@ main {
   text-align: center;
 }
 
+#messages th.sortable {
+  cursor: pointer;
+  user-select: none;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  transition: background-color 0.2s, color 0.2s;
+}
+
+#messages th.sortable:hover {
+  background-color: #f0f0f0;
+  color: #3f3f3f;
+}
+
+#messages th.sortable .sort-icon {
+  width: 14px;
+  height: 14px;
+  flex-shrink: 0;
+  opacity: 0.4;
+  transition: opacity 0.2s;
+}
+
+#messages th.sortable:hover .sort-icon {
+  opacity: 0.6;
+}
+
+#messages th.sortable.active .sort-icon {
+  opacity: 1;
+  color: #2196F3;
+}
+
 #messages tbody {
   overflow-y: auto;
   flex: 1;