sidekiq-unique-jobs 6.0.25 → 7.1.33

data/lib/sidekiq_unique_jobs/web.rb

@@ -1,60 +1,110 @@
 # frozen_string_literal: true
 
-begin
-  require "delegate"
-  require "rack"
-  require "sidekiq/web"
-rescue LoadError
-  # client-only usage
-end
-
 require_relative "web/helpers"
 
 module SidekiqUniqueJobs
   # Utility module to help manage unique keys in redis.
   # Useful for deleting keys that for whatever reason wasn't deleted
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Web
-    def self.registered(app) # rubocop:disable Metrics/MethodLength
+    def self.registered(app) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       app.helpers do
         include Web::Helpers
       end
 
-      app.get "/unique_digests" do
-        @filter         = params[:filter] || "*"
+      app.get "/changelogs" do
+        @filter         = h(params[:filter] || "*")
+        @filter         = "*" if @filter == ""
+        @count          = h(params[:count] || 100).to_i
+        @current_cursor = h(params[:cursor])
+        @prev_cursor    = h(params[:prev_cursor])
+        @total_size, @next_cursor, @changelogs = changelog.page(
+          cursor: @current_cursor,
+          pattern: @filter,
+          page_size: @count,
+        )
+
+        erb(unique_template(:changelogs))
+      end
+
+      app.get "/changelogs/delete_all" do
+        changelog.clear
+        redirect_to :changelogs
+      end
+
+      app.get "/locks" do
+        @filter         = h(params[:filter] || "*")
+        @filter         = "*" if @filter == ""
+        @count          = h(params[:count] || 100).to_i
+        @current_cursor = h(params[:cursor])
+        @prev_cursor    = h(params[:prev_cursor])
+
+        @total_size, @next_cursor, @locks = digests.page(
+          cursor: @current_cursor,
+          pattern: @filter,
+          page_size: @count,
+        )
+
+        erb(unique_template(:locks))
+      end
+
+      app.get "/expiring_locks" do
+        @filter         = h(params[:filter] || "*")
         @filter         = "*" if @filter == ""
-        @count          = (params[:count] || 100).to_i
-        @current_cursor = params[:cursor]
-        @prev_cursor    = params[:prev_cursor]
-        @total_size, @next_cursor, @unique_digests =
-          SidekiqUniqueJobs::Digests.page(pattern: @filter, cursor: @current_cursor, page_size: @count)
+        @count          = h(params[:count] || 100).to_i
+        @current_cursor = h(params[:cursor])
+        @prev_cursor    = h(params[:prev_cursor])
+
+        @total_size, @next_cursor, @locks = expiring_digests.page(
+          cursor: @current_cursor,
+          pattern: @filter,
+          page_size: @count,
+        )
 
-        erb(unique_template(:unique_digests))
+        erb(unique_template(:locks))
       end
 
-      app.get "/unique_digests/delete_all" do
-        SidekiqUniqueJobs::Digests.delete_by_pattern("*", count: SidekiqUniqueJobs::Digests.count)
-        redirect_to :unique_digests
+      app.get "/locks/delete_all" do
+        digests.delete_by_pattern("*", count: digests.count)
+        expiring_digests.delete_by_pattern("*", count: digests.count)
+        redirect_to :locks
       end
 
-      app.get "/unique_digests/:digest" do
-        @digest = params[:digest]
-        @unique_keys = SidekiqUniqueJobs::Util.keys("#{@digest}*", 1000)
+      app.get "/locks/:digest" do
+        @digest = h(params[:digest])
+        @lock   = SidekiqUniqueJobs::Lock.new(@digest)
 
-        erb(unique_template(:unique_digest))
+        erb(unique_template(:lock))
       end
 
-      app.get "/unique_digests/:digest/delete" do
-        SidekiqUniqueJobs::Digests.delete_by_digest(params[:digest])
-        redirect_to :unique_digests
+      app.get "/locks/:digest/delete" do
+        digests.delete_by_digest(params[:digest])
+        expiring_digests.delete_by_digest(params[:digest])
+        redirect_to :locks
+      end
+
+      app.get "/locks/:digest/jobs/:job_id/delete" do
+        @digest = h(params[:digest])
+        @job_id = h(params[:job_id])
+        @lock   = SidekiqUniqueJobs::Lock.new(@digest)
+        @lock.unlock(@job_id)
+
+        redirect_to "locks/#{@lock.key}"
       end
     end
   end
 end
 
-if defined?(Sidekiq::Web)
-  Sidekiq::Web.register SidekiqUniqueJobs::Web
-  Sidekiq::Web.tabs["Unique Digests"] = "unique_digests"
-  # Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), 'locales')
+begin
+  require "delegate" unless defined?(DelegateClass)
+  require "sidekiq/web" unless defined?(Sidekiq::Web)
+
+  Sidekiq::Web.register(SidekiqUniqueJobs::Web)
+  Sidekiq::Web.tabs["Locks"]          = "locks"
+  Sidekiq::Web.tabs["Expiring Locks"] = "expiring_locks"
+  Sidekiq::Web.tabs["Changelogs"]     = "changelogs"
+  Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "locales")
+rescue NameError, LoadError => ex
+  SidekiqUniqueJobs.logger.error(ex)
 end

data/lib/sidekiq_unique_jobs.rb

@@ -1,25 +1,64 @@
 # frozen_string_literal: true
 
-require "forwardable"
+require "brpoplpush/redis_script"
+require "concurrent/future"
+require "concurrent/promises"
+require "concurrent/map"
 require "concurrent/mutable_struct"
+require "concurrent/timer_task"
+require "concurrent/executor/ruby_single_thread_executor"
+require "digest"
+require "digest/sha1"
+require "erb"
+require "forwardable"
+require "json"
+require "pathname"
+require "sidekiq"
 
+require "sidekiq_unique_jobs/deprecation"
+require "sidekiq_unique_jobs/reflections"
+require "sidekiq_unique_jobs/reflectable"
+require "sidekiq_unique_jobs/timer_task"
 require "sidekiq_unique_jobs/version"
 require "sidekiq_unique_jobs/version_check"
 require "sidekiq_unique_jobs/constants"
+require "sidekiq_unique_jobs/json"
 require "sidekiq_unique_jobs/logging"
+require "sidekiq_unique_jobs/logging/middleware_context"
+require "sidekiq_unique_jobs/timing"
 require "sidekiq_unique_jobs/sidekiq_worker_methods"
+require "sidekiq_unique_jobs/lock_type"
 require "sidekiq_unique_jobs/connection"
 require "sidekiq_unique_jobs/exceptions"
+require "sidekiq_unique_jobs/script"
+require "sidekiq_unique_jobs/script/caller"
+require "sidekiq_unique_jobs/normalizer"
 require "sidekiq_unique_jobs/job"
-require "sidekiq_unique_jobs/util"
-require "sidekiq_unique_jobs/digests"
+require "sidekiq_unique_jobs/redis"
+require "sidekiq_unique_jobs/redis/entity"
+require "sidekiq_unique_jobs/redis/hash"
+require "sidekiq_unique_jobs/redis/list"
+require "sidekiq_unique_jobs/redis/set"
+require "sidekiq_unique_jobs/redis/sorted_set"
+require "sidekiq_unique_jobs/redis/string"
+require "sidekiq_unique_jobs/batch_delete"
+require "sidekiq_unique_jobs/orphans/reaper"
+require "sidekiq_unique_jobs/orphans/observer"
+require "sidekiq_unique_jobs/orphans/manager"
+require "sidekiq_unique_jobs/orphans/reaper_resurrector"
 require "sidekiq_unique_jobs/cli"
 require "sidekiq_unique_jobs/core_ext"
-require "sidekiq_unique_jobs/timeout"
-require "sidekiq_unique_jobs/scripts"
-require "sidekiq_unique_jobs/unique_args"
+require "sidekiq_unique_jobs/lock_timeout"
+require "sidekiq_unique_jobs/lock_ttl"
+require "sidekiq_unique_jobs/lock_args"
+require "sidekiq_unique_jobs/lock_digest"
 require "sidekiq_unique_jobs/unlockable"
+require "sidekiq_unique_jobs/key"
 require "sidekiq_unique_jobs/locksmith"
+require "sidekiq_unique_jobs/options_with_fallback"
+require "sidekiq_unique_jobs/lock"
+require "sidekiq_unique_jobs/lock_config"
+require "sidekiq_unique_jobs/lock_info"
 require "sidekiq_unique_jobs/lock/base_lock"
 require "sidekiq_unique_jobs/lock/until_executed"
 require "sidekiq_unique_jobs/lock/until_executing"
@@ -27,9 +66,17 @@ require "sidekiq_unique_jobs/lock/until_expired"
 require "sidekiq_unique_jobs/lock/while_executing"
 require "sidekiq_unique_jobs/lock/while_executing_reject"
 require "sidekiq_unique_jobs/lock/until_and_while_executing"
-require "sidekiq_unique_jobs/options_with_fallback"
 require "sidekiq_unique_jobs/middleware"
+require "sidekiq_unique_jobs/middleware/client"
+require "sidekiq_unique_jobs/middleware/server"
 require "sidekiq_unique_jobs/sidekiq_unique_ext"
 require "sidekiq_unique_jobs/on_conflict"
+require "sidekiq_unique_jobs/changelog"
+require "sidekiq_unique_jobs/digests"
+require "sidekiq_unique_jobs/expiring_digests"
 
+require "sidekiq_unique_jobs/config"
 require "sidekiq_unique_jobs/sidekiq_unique_jobs"
+require "sidekiq_unique_jobs/update_version"
+require "sidekiq_unique_jobs/upgrade_locks"
+require "sidekiq_unique_jobs/server"

data/lib/tasks/changelog.rake

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
+# rubocop:disable Style/MutableConstant
+CHANGELOG_CMD = %w[
+  github_changelog_generator
+  --no-verbose
+  --user
+  mhenrixon
+  --project
+  sidekiq-unique-jobs
+  --token
+]
+ADD_CHANGELOG_CMD = "git add --all"
+COMMIT_CHANGELOG_CMD = "git commit -a -m 'Update changelog'"
+# rubocop:enable Style/MutableConstant
+
 desc "Generate a Changelog"
 task :changelog do
-  # rubocop:disable Style/MutableConstant
-  CHANGELOG_CMD ||= %w[
-    github_changelog_generator
-    -u
-    mhenrixon
-    -p
-    sidekiq-unique-jobs
-    --no-verbose
-    --token
-  ]
-  ADD_CHANGELOG_CMD      ||= "git add --all"
-  COMMIT_CHANGELOG_CMD   ||= "git commit -a -m 'Update changelog'"
-  # rubocop:enable Style/MutableConstant
-
-  sh("git checkout master")
-  sh(*CHANGELOG_CMD.push(ENV["CHANGELOG_GITHUB_TOKEN"]))
+  sh("git checkout main")
+  sh(*CHANGELOG_CMD.push(ENV.fetch("CHANGELOG_GITHUB_TOKEN", nil)))
   sh(ADD_CHANGELOG_CMD)
   sh(COMMIT_CHANGELOG_CMD)
 end