mailcatcher-ng 1.4.0 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6539793c4e31686b97ba0502cc4c48c47c49ace16230fea4cf2f2cb8d06704c7
-  data.tar.gz: d74ed846c8205f2b37b9b433b618424929d12515a928d23b4a481fe03a5993d1
+  metadata.gz: 2238cc35e17eb1bca222b4adf177bd093f9eacf291f5b179c3c1db7cc6ccfc53
+  data.tar.gz: 6d7487a8ef8f6488afa6f83e850c2c3f928424cd870ed313c15849c849873672
 SHA512:
-  metadata.gz: fd19f4d57d9710adc6c60a21aeeefbfb2623e57d6725463f5bd01b3ce5e5fcb93360d1543301bc9655b64fc814994d036e3c8cf8de3940643f69ccf1f4063297
-  data.tar.gz: 7aed22f4e9a54ca7e239f7401d95931cfce90f309d2beae5d28049aa939b4903bb2d256aac8ff694c3740bf62835d6bf2c5f90d8c9b53fd3f855a2b282e6860e
+  metadata.gz: f784c55cf0eb84d166a48ba99e36e60b3fd4028facf5e2b30fa92c3c6f17814f71434fb6e5be2f68a82c4c3f3b93c7cc2c617c5100a8515ba0e9d2a3331e3272
+  data.tar.gz: 776268ce8b6c14dcb67c5387e03611015c1dab6afc8527ef6a1bd67d42bd510d634eec220df5363625de4536f576e26fd53605140a00a2aaddac2e4190c1fe55

data/lib/mail_catcher/mail.rb

@@ -57,8 +57,24 @@ module MailCatcher::Mail extend self
             FOREIGN KEY (message_id) REFERENCES message (id) ON DELETE CASCADE
           )
         SQL
+        db.execute(<<-SQL)
+          CREATE TABLE IF NOT EXISTS websocket_connection (
+            id INTEGER PRIMARY KEY ASC,
+            session_id TEXT NOT NULL,
+            client_ip TEXT,
+            opened_at DATETIME,
+            closed_at DATETIME,
+            last_ping_at DATETIME,
+            last_pong_at DATETIME,
+            ping_count INTEGER DEFAULT 0,
+            pong_count INTEGER DEFAULT 0,
+            created_at DATETIME DEFAULT CURRENT_DATETIME,
+            updated_at DATETIME DEFAULT CURRENT_DATETIME
+          )
+        SQL
         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("CREATE INDEX IF NOT EXISTS idx_websocket_connection_session_id ON websocket_connection(session_id)")
         db.execute("PRAGMA foreign_keys = ON")
       end
     end
@@ -505,6 +521,42 @@ module MailCatcher::Mail extend self
     end
   end
 
+  def create_websocket_connection(session_id, client_ip)
+    @create_ws_connection_query ||= db.prepare(<<-SQL)
+      INSERT INTO websocket_connection (session_id, client_ip, opened_at, created_at, updated_at)
+      VALUES (?, ?, datetime('now'), datetime('now'), datetime('now'))
+    SQL
+    @create_ws_connection_query.execute(session_id, client_ip)
+    db.last_insert_row_id
+  end
+
+  def close_websocket_connection(session_id)
+    @close_ws_connection_query ||= db.prepare(<<-SQL)
+      UPDATE websocket_connection
+      SET closed_at = datetime('now'), updated_at = datetime('now')
+      WHERE session_id = ? AND closed_at IS NULL
+    SQL
+    @close_ws_connection_query.execute(session_id)
+  end
+
+  def record_websocket_ping(session_id)
+    @record_ping_query ||= db.prepare(<<-SQL)
+      UPDATE websocket_connection
+      SET last_ping_at = datetime('now'), ping_count = ping_count + 1, updated_at = datetime('now')
+      WHERE session_id = ? AND closed_at IS NULL
+    SQL
+    @record_ping_query.execute(session_id)
+  end
+
+  def record_websocket_pong(session_id)
+    @record_pong_query ||= db.prepare(<<-SQL)
+      UPDATE websocket_connection
+      SET last_pong_at = datetime('now'), pong_count = pong_count + 1, updated_at = datetime('now')
+      WHERE session_id = ? AND closed_at IS NULL
+    SQL
+    @record_pong_query.execute(session_id)
+  end
+
   private
 
   def parse_authentication_results(auth_header)

data/lib/mail_catcher/version.rb

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

data/lib/mail_catcher/web/application.rb

@@ -73,6 +73,13 @@ module MailCatcher
         erb :websocket_test
       end
 
+      get "/version.json" do
+        content_type :json
+        JSON.generate({
+          version: MailCatcher::VERSION
+        })
+      end
+
       get "/server-info" do
         @version = MailCatcher::VERSION
         @smtp_ip = MailCatcher.options[:smtp_ip]
@@ -146,11 +153,16 @@ module MailCatcher
       get "/messages" do
         if request.websocket?
           bus_subscription = nil
+          ping_timer = nil
+          session_id = SecureRandom.uuid
+          client_ip = request.ip
 
           ws = Faye::WebSocket.new(request.env)
 
           ws.on(:open) do |_|
-            $stderr.puts "[WebSocket] Connection opened"
+            $stderr.puts "[WebSocket] Connection opened (session: #{session_id}, ip: #{client_ip})"
+            MailCatcher::Mail.create_websocket_connection(session_id, client_ip)
+
             bus_subscription = MailCatcher::Bus.subscribe do |message|
               begin
                 $stderr.puts "[WebSocket] Sending message: #{message.inspect}"
@@ -160,15 +172,41 @@ module MailCatcher
                 MailCatcher.log_exception("Error sending message through websocket", message, exception)
               end
             end
+
+            # Send initial ping and set up periodic ping timer (every 30 seconds)
+            ping_interval = 30
+            ping_timer = EventMachine.add_periodic_timer(ping_interval) do
+              begin
+                $stderr.puts "[WebSocket] Sending ping (session: #{session_id})"
+                MailCatcher::Mail.record_websocket_ping(session_id)
+                ws.send(JSON.generate({ type: "ping" }))
+              rescue => exception
+                $stderr.puts "[WebSocket] Error sending ping: #{exception.message}"
+              end
+            end
+          end
+
+          ws.on(:message) do |event|
+            begin
+              data = JSON.parse(event.data)
+              if data["type"] == "pong"
+                $stderr.puts "[WebSocket] Received pong (session: #{session_id})"
+                MailCatcher::Mail.record_websocket_pong(session_id)
+              end
+            rescue => exception
+              $stderr.puts "[WebSocket] Error processing message: #{exception.message}"
+            end
           end
 
           ws.on(:close) do |_|
-            $stderr.puts "[WebSocket] Connection closed"
+            $stderr.puts "[WebSocket] Connection closed (session: #{session_id})"
+            EventMachine.cancel_timer(ping_timer) if ping_timer
             MailCatcher::Bus.unsubscribe(bus_subscription) if bus_subscription
+            MailCatcher::Mail.close_websocket_connection(session_id)
           end
 
           ws.on(:error) do |event|
-            $stderr.puts "[WebSocket] WebSocket error: #{event}"
+            $stderr.puts "[WebSocket] WebSocket error: #{event} (session: #{session_id})"
           end
 
           ws.rack_response

data/lib/mail_catcher.rb

@@ -110,7 +110,7 @@ module MailCatcher
         parser.banner = 'Usage: mailcatcher [options]'
         parser.version = VERSION
         parser.separator ''
-        parser.separator "MailCatcher v#{VERSION}"
+        parser.separator "MailCatcher NG v#{VERSION}"
         parser.separator ''
 
         parser.on('--ip IP', 'Set the ip address of both servers') do |ip|
@@ -347,15 +347,15 @@ module MailCatcher
 
     # Configure the STARTTLS Smtp class
     Smtp.class_variable_set(:@@parms, {
-      starttls: :required,
-      starttls_options: ssl_options
-    })
+                              starttls: :required,
+                              starttls_options: ssl_options
+                            })
 
     # Configure the Direct TLS SmtpTls class
     SmtpTls.class_variable_set(:@@parms, {
-      starttls: :required,
-      starttls_options: ssl_options
-    })
+                                 starttls: :required,
+                                 starttls_options: ssl_options
+                               })
 
     @ssl_options = ssl_options
   end

data/public/assets/atom-one-light.min.css

@@ -1 +1 @@
-pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{color:#383a42;background:#fafafa}.hljs-comment,.hljs-quote{color:#a0a1a7;font-style:italic}.hljs-doctag,.hljs-formula,.hljs-keyword{color:#a626a4}.hljs-deletion,.hljs-name,.hljs-section,.hljs-selector-tag,.hljs-subst{color:#e45649}.hljs-literal{color:#0184bb}.hljs-addition,.hljs-attribute,.hljs-meta .hljs-string,.hljs-regexp,.hljs-string{color:#50a14f}.hljs-attr,.hljs-number,.hljs-selector-attr,.hljs-selector-class,.hljs-selector-pseudo,.hljs-template-variable,.hljs-type,.hljs-variable{color:#986801}.hljs-bullet,.hljs-link,.hljs-meta,.hljs-selector-id,.hljs-symbol,.hljs-title{color:#4078f2}.hljs-built_in,.hljs-class .hljs-title,.hljs-title.class_{color:#c18401}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.hljs-link{text-decoration:underline}
+pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{color:#383a42;background:#fafafa}.hljs-comment,.hljs-quote{color:#a0a1a7;font-style:italic}.hljs-doctag,.hljs-formula,.hljs-keyword{color:#a626a4}.hljs-deletion,.hljs-name,.hljs-section,.hljs-selector-tag,.hljs-subst{color:#e45649}.hljs-literal{color:#0184bb}.hljs-addition,.hljs-attribute,.hljs-meta .hljs-string,.hljs-regexp,.hljs-string{color:#50a14f}.hljs-attr,.hljs-number,.hljs-selector-attr,.hljs-selector-class,.hljs-selector-pseudo,.hljs-template-variable,.hljs-type,.hljs-variable{color:#986801}.hljs-bullet,.hljs-link,.hljs-meta,.hljs-selector-id,.hljs-symbol,.hljs-title{color:#4078f2}.hljs-built_in,.hljs-class .hljs-title,.hljs-title.class_{color:#c18401}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.hljs-link{text-decoration:underline}

data/public/assets/favcount.js

@@ -0,0 +1,102 @@
+/*
+ * favcount.js v1.5.0
+ * http://chrishunt.co/favcount
+ * Dynamically updates the favicon with a number.
+ *
+ * Copyright 2013, Chris Hunt
+ * Released under the MIT license
+ */
+
+(function(){
+  function Favcount(icon) {
+    this.icon = icon;
+    this.opacity = 0.4;
+    this.canvas = document.createElement('canvas');
+    this.font = "Helvetica, Arial, sans-serif";
+  }
+
+  Favcount.prototype.set = function(count) {
+    var self = this,
+        img  = document.createElement('img');
+
+    if (self.canvas.getContext) {
+      img.crossOrigin = "anonymous";
+
+      img.onload = function() {
+        drawCanvas(self.canvas, self.opacity, self.font, img, normalize(count));
+      };
+
+      img.src = this.icon;
+    }
+  };
+
+  function normalize(count) {
+    count = Math.round(count);
+
+    if (isNaN(count) || count < 1) {
+      return '';
+    } else if (count < 10) {
+      return ' ' + count;
+    } else if (count > 99) {
+      return '99';
+    } else {
+      return count;
+    }
+  }
+
+  function drawCanvas(canvas, opacity, font, img, count) {
+    var head = document.getElementsByTagName('head')[0],
+        favicon = document.createElement('link'),
+        multiplier, fontSize, context, xOffset, yOffset, border, shadow;
+
+    favicon.rel = 'icon';
+
+    // Scale canvas elements based on favicon size
+    multiplier = img.width / 16;
+    fontSize   = multiplier * 11;
+    xOffset    = multiplier;
+    yOffset    = multiplier * 11;
+    border     = multiplier;
+    shadow     = multiplier * 2;
+
+    canvas.height = canvas.width = img.width;
+    context = canvas.getContext('2d');
+    context.font = 'bold ' + fontSize + 'px ' + font;
+
+    // Draw faded favicon background
+    if (count) { context.globalAlpha = opacity; }
+    context.drawImage(img, 0, 0);
+    context.globalAlpha = 1.0;
+
+    // Draw white drop shadow
+    context.shadowColor = '#FFF';
+    context.shadowBlur = shadow;
+    context.shadowOffsetX = 0;
+    context.shadowOffsetY = 0;
+
+    // Draw white border
+    context.fillStyle = '#FFF';
+    context.fillText(count, xOffset, yOffset);
+    context.fillText(count, xOffset + border, yOffset);
+    context.fillText(count, xOffset, yOffset + border);
+    context.fillText(count, xOffset + border, yOffset + border);
+
+    // Draw black count
+    context.fillStyle = '#000';
+    context.fillText(count,
+      xOffset + (border / 2.0),
+      yOffset + (border / 2.0)
+    );
+
+    // Replace favicon with new favicon
+    favicon.href = canvas.toDataURL('image/png');
+    head.removeChild(document.querySelector('link[rel=icon]'));
+    head.appendChild(favicon);
+  }
+
+  this.Favcount = Favcount;
+}).call(this);
+
+(function(){
+  Favcount.VERSION = '1.5.0';
+}).call(this);