3 files changed, 56 insertions, 0 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 965053cf5f8..1ca099733e9 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -1740,6 +1740,15 @@
   :weight: 1
   :idempotent: true
   :tags: []
+- :name: package_cleanup:packages_npm_cleanup_stale_metadata_cache
+  :worker_name: Packages::Npm::CleanupStaleMetadataCacheWorker
+  :feature_category: :package_registry
+  :has_external_dependencies: false
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: package_repositories:packages_debian_generate_distribution
   :worker_name: Packages::Debian::GenerateDistributionWorker
   :feature_category: :package_registry
diff --git a/app/workers/packages/cleanup_package_registry_worker.rb b/app/workers/packages/cleanup_package_registry_worker.rb
index 5f14102b5a1..5b2d8bacd62 100644
--- a/app/workers/packages/cleanup_package_registry_worker.rb
+++ b/app/workers/packages/cleanup_package_registry_worker.rb
@@ -13,6 +13,7 @@ module Packages
     def perform
       enqueue_package_file_cleanup_job if Packages::PackageFile.pending_destruction.exists?
       enqueue_cleanup_policy_jobs if Packages::Cleanup::Policy.runnable.exists?
+      enqueue_cleanup_stale_npm_metadata_cache_job if Packages::Npm::MetadataCache.pending_destruction.exists?
 
       log_counts
     end
@@ -27,6 +28,10 @@ module Packages
       Packages::Cleanup::ExecutePolicyWorker.perform_with_capacity
     end
 
+    def enqueue_cleanup_stale_npm_metadata_cache_job
+      Packages::Npm::CleanupStaleMetadataCacheWorker.perform_with_capacity
+    end
+
     def log_counts
       use_replica_if_available do
         pending_destruction_package_files_count = Packages::PackageFile.pending_destruction.count
diff --git a/app/workers/packages/npm/cleanup_stale_metadata_cache_worker.rb b/app/workers/packages/npm/cleanup_stale_metadata_cache_worker.rb
new file mode 100644
index 00000000000..158209c28fd
--- /dev/null
+++ b/app/workers/packages/npm/cleanup_stale_metadata_cache_worker.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Packages
+  module Npm
+    class CleanupStaleMetadataCacheWorker
+      include ApplicationWorker
+      include ::Packages::CleanupArtifactWorker
+
+      MAX_CAPACITY = 2
+
+      data_consistency :sticky
+
+      queue_namespace :package_cleanup
+      feature_category :package_registry
+
+      deduplicate :until_executed
+      idempotent!
+
+      def max_running_jobs
+        MAX_CAPACITY
+      end
+
+      private
+
+      def model
+        Packages::Npm::MetadataCache
+      end
+
+      def log_metadata(npm_metadata_cache)
+        log_extra_metadata_on_done(:npm_metadata_cache_id, npm_metadata_cache.id)
+      end
+
+      def log_cleanup_item(npm_metadata_cache)
+        logger.info(
+          structured_payload(
+            npm_metadata_cache_id: npm_metadata_cache.id
+          )
+        )
+      end
+    end
+  end
+end