pgbus 0.2.8 → 0.3.0

data/app/views/layouts/pgbus/application.html.erb

@@ -4,63 +4,19 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title><%= t("pgbus.layout.title") %></title>
-  <style>
-    /* Prevent white flash during navigation in dark mode.
-       Applied before Tailwind CDN loads so the background is correct immediately. */
-    html.dark { background-color: #030712; } /* gray-950 */
-    html.dark body { background-color: #030712; }
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
 
-    /* Responsive tables: stack rows as cards on small screens */
-    @media (max-width: 1023px) {
-      .pgbus-table thead { display: none; }
-      .pgbus-table tbody tr {
-        display: block;
-        margin-bottom: 0.75rem;
-        border-radius: 0.5rem;
-        padding: 0.75rem;
-        border: 1px solid #e5e7eb;
-      }
-      html.dark .pgbus-table tbody tr { border-color: #374151; }
-      .pgbus-table tbody td {
-        display: flex;
-        justify-content: space-between;
-        align-items: baseline;
-        padding: 0.25rem 0;
-        border: none;
-        text-align: right;
-      }
-      .pgbus-table tbody td::before {
-        content: attr(data-label);
-        font-weight: 600;
-        font-size: 0.75rem;
-        text-transform: uppercase;
-        color: #6b7280;
-        text-align: left;
-        margin-right: 1rem;
-        flex-shrink: 0;
-      }
-      html.dark .pgbus-table tbody td::before { color: #9ca3af; }
-      .pgbus-table tbody td[colspan] {
-        display: block;
-        text-align: center;
-      }
-      .pgbus-table tbody td[colspan]::before { display: none; }
-    }
-  </style>
-  <script src="https://cdn.tailwindcss.com"></script>
-  <script>
-    tailwind.config = { darkMode: 'class' };
-    // Restore dark mode preference
+  <%# Prevent white flash in dark mode — must run before stylesheet loads %>
+  <script nonce="<%= content_security_policy_nonce %>">
     if (localStorage.getItem('pgbus-dark') === 'true' ||
         (!localStorage.getItem('pgbus-dark') && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
       document.documentElement.classList.add('dark');
     }
-    // Dark mode toggle — must be in non-module script for onclick access
     function toggleDarkMode() {
       var isDark = document.documentElement.classList.toggle('dark');
       localStorage.setItem('pgbus-dark', isDark);
     }
-    // Mobile menu toggle
     function toggleMobileMenu() {
       var menu = document.getElementById('pgbus-mobile-menu');
       var openIcon = document.getElementById('pgbus-menu-open');
@@ -69,7 +25,6 @@
       openIcon.classList.toggle('hidden');
       closeIcon.classList.toggle('hidden');
     }
-    // Close locale dropdown when clicking outside
     document.addEventListener('click', function(e) {
       var switcher = document.getElementById('pgbus-locale-switcher');
       var menu = document.getElementById('pgbus-locale-menu');
@@ -78,103 +33,27 @@
       }
     });
   </script>
-  <script type="module">
-    import * as Turbo from "https://esm.sh/@hotwired/turbo@8";
-
-    // -- Custom confirm dialog (replaces browser confirm) --
-    Turbo.config.forms.confirm = (message, element) => {
-      const dialog = document.getElementById("pgbus-confirm-dialog");
-      const messageEl = document.getElementById("pgbus-confirm-message");
-      const titleEl = document.getElementById("pgbus-confirm-title");
-      const confirmBtn = document.getElementById("pgbus-confirm-btn");
-      const iconEl = document.getElementById("pgbus-confirm-icon");
-
-      // Detect action type from the element
-      const turboMethod = element.getAttribute("data-turbo-method");
-      const isDelete = turboMethod === "delete";
-
-      // Set title based on action
-      titleEl.textContent = isDelete ? "<%= t("pgbus.dialogs.delete_title", default: "Delete") %>" : "<%= t("pgbus.dialogs.confirm_title", default: "Are you sure?") %>";
-      messageEl.textContent = message;
-
-      // Style confirm button based on action severity
-      confirmBtn.className = "rounded-md px-4 py-2 text-sm font-medium text-white focus:outline-none focus:ring-2";
-      if (isDelete) {
-        confirmBtn.classList.add("bg-red-600", "hover:bg-red-500", "focus:ring-red-500");
-        confirmBtn.textContent = "<%= t("pgbus.dialogs.delete", default: "Delete") %>";
-        iconEl.className = "flex-shrink-0 flex items-center justify-center h-10 w-10 rounded-full bg-red-100 dark:bg-red-900/30";
-      } else {
-        confirmBtn.classList.add("bg-yellow-500", "hover:bg-yellow-400", "focus:ring-yellow-500");
-        confirmBtn.textContent = "<%= t("pgbus.dialogs.confirm", default: "Confirm") %>";
-        iconEl.className = "flex-shrink-0 flex items-center justify-center h-10 w-10 rounded-full bg-yellow-100 dark:bg-yellow-900/30";
-      }
 
-      dialog.showModal();
+  <%# Self-hosted assets — no external CDN dependencies %>
+  <%= tag.link rel: "stylesheet", href: frontend_static_path(:style, format: :css, locale: nil), nonce: content_security_policy_nonce %>
 
-      return new Promise((resolve) => {
-        dialog.addEventListener("close", () => {
-          resolve(dialog.returnValue === "confirm");
-        }, { once: true });
-      });
-    };
+  <%# Importmap for ES modules %>
+  <% importmaps = Pgbus::FrontendsController.js_modules.keys.index_with { |mod| frontend_module_path(mod, format: :js, locale: nil) } %>
+  <%= tag.script({ imports: importmaps }.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce) %>
+  <%= tag.script("", src: frontend_static_path(:apexcharts, format: :js, locale: nil), nonce: content_security_policy_nonce) %>
 
-    // -- Toast notifications --
-    function showToast(message, type = "success") {
-      const container = document.getElementById("pgbus-toast-container");
-      const toast = document.createElement("div");
-
-      const colors = {
-        success: "bg-green-50 dark:bg-green-900/30 text-green-800 dark:text-green-300 border-green-200 dark:border-green-800",
-        error: "bg-red-50 dark:bg-red-900/30 text-red-800 dark:text-red-300 border-red-200 dark:border-red-800",
-        info: "bg-blue-50 dark:bg-blue-900/30 text-blue-800 dark:text-blue-300 border-blue-200 dark:border-blue-800",
-      };
-
-      toast.className = `rounded-md border p-3 text-sm shadow-lg transition-all duration-300 ${colors[type] || colors.info}`;
-      toast.textContent = message;
-      container.appendChild(toast);
-
-      setTimeout(() => {
-        toast.style.opacity = "0";
-        toast.style.transform = "translateX(100%)";
-        setTimeout(() => toast.remove(), 300);
-      }, 5000);
-    }
-
-    // Render flash toasts from <template> tags.
-    // Must run on turbo:load as well — module scripts only execute once,
-    // but Turbo Drive replaces the body on navigation.
-    function renderFlashToasts() {
-      document.querySelectorAll("template[data-pgbus-toast]").forEach(tpl => {
-        showToast(tpl.content.textContent.trim(), tpl.dataset.pgbusToast);
-        tpl.remove();
-      });
-    }
-    renderFlashToasts();
-    document.addEventListener("turbo:load", renderFlashToasts);
-
-    <% if Pgbus.configuration.web_live_updates %>
-    const interval = <%= Pgbus.configuration.web_refresh_interval %>;
-    if (interval > 0) {
-      let timer;
-      function refreshFrames() {
-        if (document.hidden) return;
-        document.querySelectorAll("turbo-frame[data-auto-refresh]")
-          .forEach(frame => {
-            try {
-              if (!frame.src && frame.dataset.src) frame.src = frame.dataset.src;
-              if (frame.src) frame.reload();
-            } catch (_) { /* Turbo may abort in-flight fetches during navigation */ }
-          });
-      }
-      function start() { timer = setInterval(refreshFrames, interval); }
-      function stop() { clearInterval(timer); }
-      document.addEventListener("visibilitychange", () => document.hidden ? stop() : start());
-      start();
-    }
-    <% end %>
+  <script type="module" nonce="<%= content_security_policy_nonce %>">
+    import "application";
   </script>
 </head>
-<body class="h-full bg-gray-50 dark:bg-gray-950 transition-colors">
+<body class="h-full bg-gray-50 dark:bg-gray-950 transition-colors"
+      <% if Pgbus.configuration.web_live_updates %>data-pgbus-refresh-interval="<%= Pgbus.configuration.web_refresh_interval %>"<% end %>>
+  <%# i18n data for JS modules %>
+  <div id="pgbus-i18n" class="hidden"
+       data-delete-title="<%= t("pgbus.dialogs.delete_title", default: "Delete") %>"
+       data-confirm-title="<%= t("pgbus.dialogs.confirm_title", default: "Are you sure?") %>"
+       data-delete-label="<%= t("pgbus.dialogs.delete", default: "Delete") %>"
+       data-confirm-label="<%= t("pgbus.dialogs.confirm", default: "Confirm") %>"></div>
   <div class="min-h-full">
     <!-- Top nav -->
     <nav class="bg-gray-900 dark:bg-gray-950 border-b border-gray-800">

data/app/views/pgbus/insights/show.html.erb

@@ -93,91 +93,30 @@
   </table>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/apexcharts@4"></script>
-<script>
-(function() {
-  // IIFE prevents "redeclaration of let" when Turbo re-executes on navigation
-  var throughputChart, statusChart;
+<script type="module" nonce="<%= content_security_policy_nonce %>">
+  import { renderCharts, observeThemeChanges } from "charts";
 
-  function getThemeColors() {
-    var isDark = document.documentElement.classList.contains('dark');
-    return {
-      isDark: isDark,
-      text: isDark ? '#9ca3af' : '#6b7280',
-      grid: isDark ? '#374151' : '#e5e7eb',
-      tooltip: isDark ? 'dark' : 'light',
-      dataLabel: isDark ? '#fff' : '#000'
-    };
-  }
+  const i18n = {
+    seriesName: "<%= j(t("pgbus.insights.show.charts.series_name")) %>",
+    noData: "<%= j(t("pgbus.insights.show.charts.no_data")) %>",
+    failedToLoad: "<%= j(t("pgbus.insights.show.charts.failed_to_load")) %>",
+  };
 
-  function renderCharts(data) {
-    var t = getThemeColors();
+  let chartData = null;
 
-    if (throughputChart) throughputChart.destroy();
-    if (statusChart) statusChart.destroy();
+  observeThemeChanges(() => chartData, i18n);
 
-    var throughputData = data.throughput.map(function(p) {
-      return { x: new Date(p.time).getTime(), y: p.count };
-    });
-
-    throughputChart = new ApexCharts(document.querySelector('#throughput-chart'), {
-      series: [{ name: '<%= j(t("pgbus.insights.show.charts.series_name")) %>', data: throughputData }],
-      chart: { type: 'area', height: 280, toolbar: { show: false }, background: 'transparent', foreColor: t.text },
-      stroke: { curve: 'smooth', width: 2 },
-      fill: { type: 'gradient', gradient: { shadeIntensity: 1, opacityFrom: 0.4, opacityTo: 0.05, stops: [0, 100] } },
-      colors: ['#6366f1'],
-      xaxis: { type: 'datetime', labels: { style: { colors: t.text } } },
-      yaxis: { labels: { style: { colors: t.text } } },
-      grid: { borderColor: t.grid },
-      tooltip: { theme: t.tooltip },
-      dataLabels: { enabled: false }
-    });
-    throughputChart.render();
-
-    var statusLabels = Object.keys(data.status_counts);
-    var statusValues = Object.values(data.status_counts);
-    var statusColors = statusLabels.map(function(s) {
-      if (s === 'success') return '#10b981';
-      if (s === 'failed') return '#ef4444';
-      if (s === 'dead_lettered') return '#f97316';
-      return '#6b7280';
-    });
-
-    if (statusLabels.length > 0) {
-      statusChart = new ApexCharts(document.querySelector('#status-chart'), {
-        series: statusValues, labels: statusLabels,
-        chart: { type: 'donut', height: 280, background: 'transparent', foreColor: t.text },
-        colors: statusColors,
-        legend: { position: 'bottom', labels: { colors: t.text } },
-        plotOptions: { pie: { donut: { size: '60%' } } },
-        dataLabels: { style: { colors: [t.dataLabel] } },
-        tooltip: { theme: t.tooltip }
-      });
-      statusChart.render();
-    } else {
-      document.querySelector('#status-chart').innerHTML =
-        '<p class="text-center text-sm text-gray-400 dark:text-gray-500 pt-24"><%= j(t("pgbus.insights.show.charts.no_data")) %></p>';
-    }
-  }
-
-  var chartData = null;
-  fetch('<%= pgbus.api_insights_path(minutes: @minutes) %>')
-    .then(function(r) {
-      if (!r.ok) throw new Error('HTTP ' + r.status);
+  fetch("<%= pgbus.api_insights_path(minutes: @minutes) %>")
+    .then(r => {
+      if (!r.ok) throw new Error("HTTP " + r.status);
       return r.json();
     })
-    .then(function(data) { chartData = data; renderCharts(data); })
-    .catch(function(err) {
-      if (err.name === 'AbortError') return;
-      var msg = '<p class="text-center text-sm text-gray-400 dark:text-gray-500 pt-24"><%= j(t("pgbus.insights.show.charts.failed_to_load")) %></p>';
-      var el1 = document.querySelector('#throughput-chart');
-      var el2 = document.querySelector('#status-chart');
+    .then(data => { chartData = data; renderCharts(data, i18n); })
+    .catch(err => {
+      const msg = '<p class="text-center text-sm text-gray-400 dark:text-gray-500 pt-24">' + i18n.failedToLoad + "</p>";
+      const el1 = document.querySelector("#throughput-chart");
+      const el2 = document.querySelector("#status-chart");
       if (el1) el1.innerHTML = msg;
       if (el2) el2.innerHTML = msg;
     });
-
-  new MutationObserver(function() {
-    if (chartData) renderCharts(chartData);
-  }).observe(document.documentElement, { attributes: true, attributeFilter: ['class'] });
-})();
 </script>

data/config/routes.rb

@@ -60,4 +60,9 @@ Pgbus::Engine.routes.draw do
     get :stats, to: "stats#show"
     get :insights, to: "insights#show"
   end
+
+  scope :frontend, controller: :frontends, defaults: { version: Pgbus::VERSION.tr(".", "-") } do
+    get "modules/:version/:id", action: :module, as: :frontend_module, constraints: { format: "js" }
+    get "static/:version/:id", action: :static, as: :frontend_static
+  end
 end

data/lib/pgbus/process/worker.rb

@@ -12,11 +12,13 @@ module Pgbus
       def initialize(queues:, threads: 5, config: Pgbus.configuration,
                      single_active_consumer: false, consumer_priority: 0)
         @queues = Array(queues)
+        @wildcard = @queues.include?("*")
         @threads = threads
         @config = config
         @single_active_consumer = single_active_consumer
         @consumer_priority = consumer_priority
         @lifecycle = Lifecycle.new
+        @last_wildcard_resolve = nil
         @jobs_processed = Concurrent::AtomicFixnum.new(0)
         @jobs_failed = Concurrent::AtomicFixnum.new(0)
         @in_flight = Concurrent::AtomicFixnum.new(0)
@@ -53,6 +55,7 @@ module Pgbus
         loop do
           process_signals
           check_recycle
+          refresh_wildcard_queues
 
           break if @lifecycle.stopped?
           break if @lifecycle.draining? && @pool.queue_length.zero?
@@ -79,6 +82,8 @@ module Pgbus
         @pool.kill
       end
 
+      WILDCARD_REFRESH_INTERVAL = 30 # seconds
+
       private
 
       def claim_and_execute
@@ -125,7 +130,11 @@ module Pgbus
           fetch_multi(active_queues, qty)
         end
       rescue StandardError => e
-        Pgbus.logger.error { "[Pgbus] Error fetching messages: #{e.message}" }
+        if e.message.include?("does not exist") && e.message.include?("pgmq.q_")
+          evict_missing_queues(e)
+        else
+          Pgbus.logger.error { "[Pgbus] Error fetching messages: #{e.message}" }
+        end
         []
       end
 
@@ -184,9 +193,8 @@ module Pgbus
       end
 
       # Resolve "*" to all non-DLQ queues from pgmq.meta, stripping the prefix.
-      # Called once at startup. If no wildcard, this is a no-op.
       def resolve_wildcard_queues
-        return unless @queues.include?("*")
+        return unless @wildcard
 
         dlq_suffix = config.dead_letter_queue_suffix
         prefix = "#{config.queue_prefix}_"
@@ -201,12 +209,39 @@ module Pgbus
           Pgbus.logger.warn { "[Pgbus] Wildcard queue '*' resolved to no queues — falling back to default" }
           @queues = [config.default_queue]
         else
+          if @last_wildcard_resolve && resolved != @queues
+            Pgbus.logger.info { "[Pgbus] Wildcard queues changed: #{@queues.join(", ")} → #{resolved.join(", ")}" }
+          end
           @queues = resolved
-          Pgbus.logger.info { "[Pgbus] Wildcard queue '*' resolved to: #{@queues.join(", ")}" }
+          Pgbus.logger.info { "[Pgbus] Wildcard queue '*' resolved to: #{@queues.join(", ")}" } unless @last_wildcard_resolve
         end
+        @last_wildcard_resolve = monotonic_now
       rescue StandardError => e
         Pgbus.logger.error { "[Pgbus] Failed to resolve wildcard queues: #{e.message} — falling back to default" }
-        @queues = [config.default_queue]
+        @queues = [config.default_queue] unless @last_wildcard_resolve
+      end
+
+      # Periodically re-resolve wildcard queues to pick up new queues and
+      # drop deleted ones without requiring a worker restart.
+      def refresh_wildcard_queues
+        return unless @wildcard
+        return if @last_wildcard_resolve && (monotonic_now - @last_wildcard_resolve) < WILDCARD_REFRESH_INTERVAL
+
+        resolve_wildcard_queues
+      end
+
+      # When a "relation does not exist" error occurs, the queue was deleted.
+      # Extract the queue name from the error and remove it from the active list.
+      def evict_missing_queues(error)
+        prefix = "#{config.queue_prefix}_"
+        if error.message =~ /pgmq\.q_(\w+)/
+          physical_name = Regexp.last_match(1)
+          logical_name = physical_name.delete_prefix(prefix)
+          if @queues.delete(logical_name)
+            Pgbus.logger.warn { "[Pgbus] Evicted deleted queue '#{logical_name}' (#{physical_name}) from worker" }
+          end
+        end
+        Pgbus.logger.error { "[Pgbus] Queue table missing: #{error.message}" }
       end
 
       def check_recycle
@@ -287,6 +322,10 @@ module Pgbus
         restore_signals
         Pgbus.logger.info { "[Pgbus] Worker stopped. Processed: #{@jobs_processed.value}, Failed: #{@jobs_failed.value}" }
       end
+
+      def monotonic_now
+        ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+      end
     end
   end
 end

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -127,6 +127,7 @@ files:
 - app/controllers/pgbus/dashboard_controller.rb
 - app/controllers/pgbus/dead_letter_controller.rb
 - app/controllers/pgbus/events_controller.rb
+- app/controllers/pgbus/frontends_controller.rb
 - app/controllers/pgbus/insights_controller.rb
 - app/controllers/pgbus/jobs_controller.rb
 - app/controllers/pgbus/locale_controller.rb
@@ -135,6 +136,12 @@ files:
 - app/controllers/pgbus/processes_controller.rb
 - app/controllers/pgbus/queues_controller.rb
 - app/controllers/pgbus/recurring_tasks_controller.rb
+- app/frontend/pgbus/application.js
+- app/frontend/pgbus/modules/charts.js
+- app/frontend/pgbus/style.css
+- app/frontend/pgbus/tailwind.css
+- app/frontend/pgbus/vendor/apexcharts.js
+- app/frontend/pgbus/vendor/turbo.js
 - app/helpers/pgbus/application_helper.rb
 - app/models/pgbus/application_record.rb
 - app/models/pgbus/batch_entry.rb