sidekiq 7.3.7 → 8.0.0.beta1

data/lib/sidekiq/web.rb

@@ -2,20 +2,11 @@
 
 require "erb"
 require "securerandom"
-
-require "sidekiq"
-require "sidekiq/api"
-require "sidekiq/paginator"
-require "sidekiq/web/helpers"
-
-require "sidekiq/web/router"
-require "sidekiq/web/action"
-require "sidekiq/web/application"
-require "sidekiq/web/csrf_protection"
-
-require "rack/content_length"
 require "rack/builder"
 require "rack/static"
+require "sidekiq"
+require "sidekiq/api"
+require "sidekiq/web/config"
 
 module Sidekiq
   class Web
@@ -32,176 +23,86 @@ module Sidekiq
       "Retries" => "retries",
       "Scheduled" => "scheduled",
       "Dead" => "morgue",
-      "Metrics" => "metrics"
+      "Metrics" => "metrics",
+      "Profiles" => "profiles"
     }
 
-    if Gem::Version.new(Rack::RELEASE) < Gem::Version.new("3")
-      CONTENT_LANGUAGE = "Content-Language"
-      CONTENT_SECURITY_POLICY = "Content-Security-Policy"
-      LOCATION = "Location"
-      X_CASCADE = "X-Cascade"
-      X_CONTENT_TYPE_OPTIONS = "X-Content-Type-Options"
-    else
-      CONTENT_LANGUAGE = "content-language"
-      CONTENT_SECURITY_POLICY = "content-security-policy"
-      LOCATION = "location"
-      X_CASCADE = "x-cascade"
-      X_CONTENT_TYPE_OPTIONS = "x-content-type-options"
-    end
+    @@config = Sidekiq::Web::Config.new
 
     class << self
-      # Forward compatibility with 8.0
       def configure
-        yield self
-      end
-
-      def settings
-        self
+        if block_given?
+          yield @@config
+        else
+          @@config
+        end
       end
 
-      def default_tabs
-        DEFAULT_TABS
+      def app_url=(url)
+        @@config.app_url = url
       end
 
-      def custom_tabs
-        @custom_tabs ||= {}
-      end
-      alias_method :tabs, :custom_tabs
+      def tabs = @@config.tabs
 
-      def custom_job_info_rows
-        @custom_job_info_rows ||= []
-      end
+      def locales = @@config.locales
 
-      def locales
-        @locales ||= LOCALES
-      end
+      def views = @@config.views
 
-      def views
-        @views ||= VIEWS
-      end
+      def custom_job_info_rows = @@config.custom_job_info_rows
 
-      def enable(*opts)
-        opts.each { |key| set(key, true) }
+      def redis_pool
+        @pool || Sidekiq.default_configuration.redis_pool
       end
 
-      def disable(*opts)
-        opts.each { |key| set(key, false) }
+      def redis_pool=(pool)
+        @pool = pool
       end
 
-      def middlewares
-        @middlewares ||= []
-      end
+      def middlewares = @@config.middlewares
 
-      def use(*args, &block)
-        middlewares << [args, block]
-      end
+      def use(*args, &block) = @@config.middlewares << [args, block]
 
-      def set(attribute, value)
-        send(:"#{attribute}=", value)
+      def register(*args, **kw, &block)
+        # TODO
+        puts "`Sidekiq::Web.register` is deprecated, use `Sidekiq::Web.configure {|cfg| cfg.register(...) }`"
+        @@config.register(*args, **kw, &block)
       end
-
-      attr_accessor :app_url, :redis_pool
-      attr_writer :locales, :views
-    end
-
-    def self.inherited(child)
-      child.app_url = app_url
-      child.redis_pool = redis_pool
-    end
-
-    def settings
-      self.class.settings
     end
 
-    def middlewares
-      @middlewares ||= self.class.middlewares
+    # Allow user to say
+    #   run Sidekiq::Web
+    # rather than:
+    #   run Sidekiq::Web.new
+    def self.call(env)
+      @inst ||= new
+      @inst.call(env)
     end
 
-    def use(*args, &block)
-      middlewares << [args, block]
+    # testing, internal use only
+    def self.reset!
+      @@config.reset!
+      @inst = nil
     end
 
     def call(env)
-      env[:csp_nonce] = SecureRandom.base64(16)
+      env[:web_config] = Sidekiq::Web.configure
+      env[:csp_nonce] = SecureRandom.hex(8)
+      env[:redis_pool] = self.class.redis_pool
       app.call(env)
     end
 
-    def self.call(env)
-      @app ||= new
-      @app.call(env)
-    end
-
     def app
-      @app ||= build
-    end
-
-    def enable(*opts)
-      opts.each { |key| set(key, true) }
-    end
-
-    def disable(*opts)
-      opts.each { |key| set(key, false) }
-    end
-
-    def set(attribute, value)
-      send(:"#{attribute}=", value)
-    end
-
-    # Register a class as a Sidekiq Web UI extension. The class should
-    # provide one or more tabs which map to an index route. Options:
-    #
-    # @param extension [Class] Class which contains the HTTP actions, required
-    # @param name [String] the name of the extension, used to namespace assets
-    # @param tab [String | Array] labels(s) of the UI tabs
-    # @param index [String | Array] index route(s) for each tab
-    # @param root_dir [String] directory location to find assets, locales and views, typically `web/` within the gemfile
-    # @param asset_paths [Array] one or more directories under {root}/assets/{name} to be publicly served, e.g. ["js", "css", "img"]
-    # @param cache_for [Integer] amount of time to cache assets, default one day
-    #
-    # TODO name, tab and index will be mandatory in 8.0
-    #
-    # Web extensions will have a root `web/` directory with `locales/`, `assets/`
-    # and `views/` subdirectories.
-    def self.register(extension, name: nil, tab: nil, index: nil, root_dir: nil, cache_for: 86400, asset_paths: nil)
-      tab = Array(tab)
-      index = Array(index)
-      tab.zip(index).each do |tab, index|
-        tabs[tab] = index
-      end
-      if root_dir
-        locdir = File.join(root_dir, "locales")
-        locales << locdir if File.directory?(locdir)
-
-        if asset_paths && name
-          # if you have {root}/assets/{name}/js/scripts.js
-          # and {root}/assets/{name}/css/styles.css
-          # you would pass in:
-          #   asset_paths: ["js", "css"]
-          # See script_tag and style_tag in web/helpers.rb
-          assdir = File.join(root_dir, "assets")
-          assurls = Array(asset_paths).map { |x| "/#{name}/#{x}" }
-          assetprops = {
-            urls: assurls,
-            root: assdir,
-            cascade: true
-          }
-          assetprops[:header_rules] = [[:all, {Rack::CACHE_CONTROL => "private, max-age=#{cache_for.to_i}"}]] if cache_for
-          middlewares << [[Rack::Static, assetprops], nil]
-        end
-      end
-
-      yield self if block_given?
-      extension.registered(WebApplication)
+      @app ||= build(@@config)
     end
 
     private
 
-    def build
-      klass = self.class
-      m = middlewares
+    def build(cfg)
+      cfg.freeze
+      m = cfg.middlewares
 
       rules = []
-      rules = [[:all, {Rack::CACHE_CONTROL => "private, max-age=86400"}]] unless ENV["SIDEKIQ_WEB_TESTING"]
+      rules = [[:all, {"cache-control" => "private, max-age=86400"}]] unless ENV["SIDEKIQ_WEB_TESTING"]
 
       ::Rack::Builder.new do
         use Rack::Static, urls: ["/stylesheets", "/images", "/javascripts"],
@@ -209,18 +110,12 @@ module Sidekiq
           cascade: true,
           header_rules: rules
         m.each { |middleware, block| use(*middleware, &block) }
-        use Sidekiq::Web::CsrfProtection unless $TESTING
-        run WebApplication.new(klass)
+        run Sidekiq::Web::Application.new(self.class)
       end
     end
   end
-
-  Sidekiq::WebApplication.helpers WebHelpers
-  Sidekiq::WebApplication.helpers Sidekiq::Paginator
-
-  Sidekiq::WebAction.class_eval <<-RUBY, Web::LAYOUT, -1 # standard:disable Style/EvalWithLocation
-    def _render
-      #{ERB.new(File.read(Web::LAYOUT)).src}
-    end
-  RUBY
 end
+
+require "sidekiq/web/router"
+require "sidekiq/web/action"
+require "sidekiq/web/application"

data/sidekiq.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.files = %w[sidekiq.gemspec README.md Changes.md LICENSE.txt] + `git ls-files | grep -E '^(bin|lib|web)'`.split("\n")
   gem.name = "sidekiq"
   gem.version = Sidekiq::VERSION
-  gem.required_ruby_version = ">= 2.7.0"
+  gem.required_ruby_version = ">= 3.2.0"
 
   gem.metadata = {
     "homepage_uri" => "https://sidekiq.org",
@@ -23,8 +23,10 @@ Gem::Specification.new do |gem|
     "rubygems_mfa_required" => "true"
   }
 
-  gem.add_dependency "redis-client", ">= 0.22.2"
-  gem.add_dependency "connection_pool", ">= 2.3.0"
-  gem.add_dependency "rack", ">= 2.2.4"
+  gem.add_dependency "redis-client", ">= 0.23.2"
+  gem.add_dependency "connection_pool", ">= 2.5.0"
+  gem.add_dependency "rack", ">= 3.1.0"
+  gem.add_dependency "json", ">= 2.9.0"
   gem.add_dependency "logger"
+  gem.add_dependency "base64"
 end

data/web/assets/javascripts/application.js

@@ -31,7 +31,7 @@ function addListeners() {
     node.addEventListener("click", addDataToggleListeners)
   })
 
-  addShiftClickListeners()
+  addShiftClickListeners();
   updateFuzzyTimes();
   updateNumbers();
   updateProgressBars();
@@ -69,11 +69,7 @@ function addDataToggleListeners(event) {
   var source = event.target || event.srcElement;
   var targName = source.getAttribute("data-toggle");
   var full = document.getElementById(targName);
-  if (full.style.display == "block") {
-    full.style.display = 'none';
-  } else {
-    full.style.display = 'block';
-  }
+  full.classList.toggle("is-open");
 }
 
 function addShiftClickListeners() {
@@ -130,11 +126,11 @@ function setLivePollFromUrl() {
 
 function updateLivePollButton() {
   if (localStorage.sidekiqLivePoll == "enabled") {
-    document.querySelectorAll('.live-poll-stop').forEach(box => { box.style.display = "inline-block" })
-    document.querySelectorAll('.live-poll-start').forEach(box => { box.style.display = "none" })
+    document.querySelectorAll('.live-poll-stop').forEach(box => { box.classList.add("active") })
+    document.querySelectorAll('.live-poll-start').forEach(box => { box.classList.remove("active") })
   } else {
-    document.querySelectorAll('.live-poll-start').forEach(box => { box.style.display = "inline-block" })
-    document.querySelectorAll('.live-poll-stop').forEach(box => { box.style.display = "none" })
+    document.querySelectorAll('.live-poll-start').forEach(box => { box.classList.add("active") })
+    document.querySelectorAll('.live-poll-stop').forEach(box => { box.classList.remove("active") })
   }
 }
 
@@ -169,9 +165,6 @@ function replacePage(text) {
   var page = doc.querySelector('#page')
   document.querySelector("#page").replaceWith(page)
 
-  var header_status = doc.querySelector('.status')
-  document.querySelector('.status').replaceWith(header_status)
-
   addListeners();
 }
 

data/web/assets/javascripts/base-charts.js

@@ -1,27 +1,33 @@
 if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
-  Chart.defaults.borderColor = "#333";
-  Chart.defaults.color = "#aaa";
+  Chart.defaults.borderColor = "oklch(22% 0.01 256)";
+  Chart.defaults.color = "oklch(65% 0.01 256)";
 }
 
 class Colors {
   constructor() {
     this.assignments = {};
-    this.success = "#006f68";
-    this.failure = "#af0014";
-    this.fallback = "#999";
-    this.primary = "#537bc4";
+    if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+      this.light = "65%";
+      this.chroma = "0.15";
+    } else {
+      this.light = "48%";
+      this.chroma = "0.2";
+    }
+    this.success = "oklch(" + this.light + " " + this.chroma + " 179)";
+    this.failure = "oklch(" + this.light + " " + this.chroma + " 29)";
+    this.fallback = "oklch(" + this.light + " 0.02 269)";
+    this.primary = "oklch(" + this.light + " " + this.chroma + " 269)";
     this.available = [
-      // Colors taken from https://www.chartjs.org/docs/latest/samples/utils.html
-      "#537bc4",
-      "#4dc9f6",
-      "#f67019",
-      "#f53794",
-      "#acc236",
-      "#166a8f",
-      "#00a950",
-      "#58595b",
-      "#8549ba",
-      "#991b1b",
+      "oklch(" + this.light + " " + this.chroma + " 256)",
+      "oklch(" + this.light + " " + this.chroma + " 196)",
+      "oklch(" + this.light + " " + this.chroma + " 46)",
+      "oklch(" + this.light + " " + this.chroma + " 316)",
+      "oklch(" + this.light + " " + this.chroma + " 106)",
+      "oklch(" + this.light + " " + this.chroma + " 226)",
+      "oklch(" + this.light + " " + this.chroma + " 136)",
+      "oklch(" + this.light + " 0.02 269)",
+      "oklch(" + this.light + " " + this.chroma + " 286)",
+      "oklch(" + this.light + " " + this.chroma + " 16)",
     ];
   }
 
@@ -90,12 +96,18 @@ class BaseChart {
     };
 
     if (this.options.marks) {
+      if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+        this.Borderlight = "30%";
+      } else {
+        this.Borderlight = "65%";
+      }
+
       this.options.marks.forEach(([bucket, label], i) => {
         chartOptions.plugins.annotation.annotations[`deploy-${i}`] = {
           type: "line",
           xMin: bucket,
           xMax: bucket,
-          borderColor: "rgba(220, 38, 38, 0.4)",
+          borderColor: "oklch(" + this.Borderlight + " 0.01 256)",
           borderWidth: 2,
         };
       });

data/web/assets/javascripts/dashboard-charts.js

@@ -83,6 +83,8 @@ class RealtimeChart extends DashboardChart {
     this.chart.data.datasets[1].data.push(failed);
     this.chart.update();
 
+    updateScreenReaderDashboardValues(processed, failed);
+
     updateStatsSummary(this.stats.sidekiq);
     updateRedisStats(this.stats.redis);
     updateFooterUTCTime(this.stats.server_utc_time);

data/web/assets/javascripts/dashboard.js

@@ -36,6 +36,12 @@ var ready = (callback) => {
   else document.addEventListener("DOMContentLoaded", callback);
 }
 
+var updateScreenReaderDashboardValues = function(processed, failed) {
+  let lastDashboardUpdateSpan = document.getElementById("sr-last-dashboard-update");
+  var updateText = document.getElementById("sr-last-dashboard-update-template").innerText;
+  lastDashboardUpdateSpan.innerText = updateText.replace("PROCESSED_COUNT", processed).replace("FAILED_COUNT", failed);
+}
+
 ready(() => {
   var sldr = document.getElementById('sldr');
   if (typeof localStorage.sidekiqTimeInterval !== 'undefined') {

data/web/assets/javascripts/metrics.js

@@ -39,7 +39,7 @@ class JobMetricsOverviewChart extends BaseChart {
   updateSwatch(kls, checked) {
     const el = this.swatches[kls];
     el.checked = checked;
-    el.style.color = this.colors.assignments[kls] || "";
+    el.style.accentColor = this.colors.assignments[kls] || "";
   }
 
   toggleKls(kls, visible) {