bullmq 1.68.3 → 1.68.4

package/dist/bullmq.d.ts

@@ -932,7 +932,7 @@ export declare class Queue<DataType = any, ResultType = any, NameType extends st
      * grace period.
      *
      * @param grace - The grace period
-     * @param The - Max number of jobs to clean
+     * @param limit - Max number of jobs to clean
      * @param {string} [type=completed] - The type of job to clean
      * Possible values are completed, wait, active, paused, delayed, failed. Defaults to completed.
      * @returns Id jobs from the deleted records

package/dist/cjs/classes/queue.d.ts

@@ -154,7 +154,7 @@ export declare class Queue<DataType = any, ResultType = any, NameType extends st
      * grace period.
      *
      * @param grace - The grace period
-     * @param The - Max number of jobs to clean
+     * @param limit - Max number of jobs to clean
      * @param {string} [type=completed] - The type of job to clean
      * Possible values are completed, wait, active, paused, delayed, failed. Defaults to completed.
      * @returns Id jobs from the deleted records

package/dist/cjs/classes/queue.js

@@ -170,7 +170,7 @@ class Queue extends queue_getters_1.QueueGetters {
      * grace period.
      *
      * @param grace - The grace period
-     * @param The - Max number of jobs to clean
+     * @param limit - Max number of jobs to clean
      * @param {string} [type=completed] - The type of job to clean
      * Possible values are completed, wait, active, paused, delayed, failed. Defaults to completed.
      * @returns Id jobs from the deleted records

package/dist/cjs/commands/cleanJobsInSet-2.lua

@@ -34,29 +34,56 @@ if limit > 0 then
   rangeEnd = -1
 end
 
+-- Includes
+--- @include "includes/batches"
+--- @include "includes/removeJob"
+
 local jobs = rcall(command, KEYS[1], rangeStart, rangeEnd)
 local deleted = {}
 local deletedCount = 0
 local jobTS
-for _, job in ipairs(jobs) do
-  if limit > 0 and deletedCount >= limit then
-    break
+if ARGV[4] == "active" then
+  for _, job in ipairs(jobs) do
+    if limit > 0 and deletedCount >= limit then
+      break
+    end
+  
+    local jobKey = ARGV[1] .. job
+    if (rcall("EXISTS", jobKey .. ":lock") == 0) then
+      jobTS = rcall("HGET", jobKey, "timestamp")
+      if (not jobTS or jobTS < ARGV[2]) then
+        rcall("LREM", KEYS[1], 0, job)
+        removeJob(job, true, ARGV[1])
+        deletedCount = deletedCount + 1
+        table.insert(deleted, job)
+      end
+    end
   end
-
-  local jobKey = ARGV[1] .. job
-  if (rcall("EXISTS", jobKey .. ":lock") == 0) then
+else
+  for _, job in ipairs(jobs) do
+    if limit > 0 and deletedCount >= limit then
+      break
+    end
+  
+    local jobKey = ARGV[1] .. job
     jobTS = rcall("HGET", jobKey, "timestamp")
     if (not jobTS or jobTS < ARGV[2]) then
       if isList then
         rcall("LREM", KEYS[1], 0, job)
-      else
-        rcall("ZREM", KEYS[1], job)
       end
-      rcall("DEL", jobKey, jobKey .. ":logs")
+      removeJob(job, true, ARGV[1])
       deletedCount = deletedCount + 1
       table.insert(deleted, job)
     end
   end
+
+  if not isList then
+    if(#deleted > 0) then
+      for from, to in batches(#deleted, 7000) do
+        rcall("ZREM", KEYS[1], unpack(deleted, from, to))
+      end
+    end
+  end
 end
 
 rcall("XADD", KEYS[2], "*", "event", "cleaned", "count", deletedCount)

package/dist/cjs/commands/includes/getZSetItems.lua

@@ -0,0 +1,8 @@
+
+--[[
+  Function to get ZSet items.
+]]
+
+local function getZSetItems(keyName, max)
+  return rcall('ZRANGE', keyName, 0, max - 1)
+end

package/dist/cjs/commands/includes/removeJob.lua

@@ -0,0 +1,13 @@
+--[[
+  Function to remove job.
+]]
+
+-- Includes
+--- @include "removeParentDependencyKey"
+
+local function removeJob(key, hard, baseKey)
+  local jobKey = baseKey .. key
+  removeParentDependencyKey(jobKey, hard, baseKey)
+  rcall("DEL", jobKey, jobKey .. ':logs',
+    jobKey .. ':dependencies', jobKey .. ':processed')
+end

package/dist/cjs/commands/includes/removeJobs.lua

@@ -1,5 +1,5 @@
 --[[
-  Functions remove jobs.
+  Functions to remove jobs.
 ]]
 
 -- Includes
@@ -9,18 +9,12 @@ local function getListItems(keyName, max)
   return rcall('LRANGE', keyName, 0, max - 1)
 end
 
-local function getZSetItems(keyName, max)
-  return rcall('ZRANGE', keyName, 0, max - 1)
-end
-
---- @include "removeParentDependencyKey"
+--- @include "getZSetItems"
+--- @include "removeJob"
 
 local function removeJobs(keys, hard, baseKey, max)
   for i, key in ipairs(keys) do
-    local jobKey = baseKey .. key
-    removeParentDependencyKey(jobKey, hard, baseKey)
-    rcall("DEL", jobKey, jobKey .. ':logs',
-      jobKey .. ':dependencies', jobKey .. ':processed')
+    removeJob(key, hard, baseKey)
   end
   return max - #keys
 end

package/dist/cjs/commands/retryJobs-4.lua

@@ -20,10 +20,7 @@ local rcall = redis.call;
 
 -- Includes
 --- @include "includes/batches"
-
-local function getZSetItems(keyName, max)
-  return rcall('ZRANGE', keyName, 0, max - 1)
-end
+--- @include "includes/getZSetItems"
 
 local jobs = getZSetItems(KEYS[3], maxCount)
 

package/dist/esm/classes/queue.d.ts

@@ -154,7 +154,7 @@ export declare class Queue<DataType = any, ResultType = any, NameType extends st
      * grace period.
      *
      * @param grace - The grace period
-     * @param The - Max number of jobs to clean
+     * @param limit - Max number of jobs to clean
      * @param {string} [type=completed] - The type of job to clean
      * Possible values are completed, wait, active, paused, delayed, failed. Defaults to completed.
      * @returns Id jobs from the deleted records

package/dist/esm/classes/queue.js

@@ -167,7 +167,7 @@ export class Queue extends QueueGetters {
      * grace period.
      *
      * @param grace - The grace period
-     * @param The - Max number of jobs to clean
+     * @param limit - Max number of jobs to clean
      * @param {string} [type=completed] - The type of job to clean
      * Possible values are completed, wait, active, paused, delayed, failed. Defaults to completed.
      * @returns Id jobs from the deleted records

package/dist/esm/commands/cleanJobsInSet-2.lua

@@ -34,29 +34,56 @@ if limit > 0 then
   rangeEnd = -1
 end
 
+-- Includes
+--- @include "includes/batches"
+--- @include "includes/removeJob"
+
 local jobs = rcall(command, KEYS[1], rangeStart, rangeEnd)
 local deleted = {}
 local deletedCount = 0
 local jobTS
-for _, job in ipairs(jobs) do
-  if limit > 0 and deletedCount >= limit then
-    break
+if ARGV[4] == "active" then
+  for _, job in ipairs(jobs) do
+    if limit > 0 and deletedCount >= limit then
+      break
+    end
+  
+    local jobKey = ARGV[1] .. job
+    if (rcall("EXISTS", jobKey .. ":lock") == 0) then
+      jobTS = rcall("HGET", jobKey, "timestamp")
+      if (not jobTS or jobTS < ARGV[2]) then
+        rcall("LREM", KEYS[1], 0, job)
+        removeJob(job, true, ARGV[1])
+        deletedCount = deletedCount + 1
+        table.insert(deleted, job)
+      end
+    end
   end
-
-  local jobKey = ARGV[1] .. job
-  if (rcall("EXISTS", jobKey .. ":lock") == 0) then
+else
+  for _, job in ipairs(jobs) do
+    if limit > 0 and deletedCount >= limit then
+      break
+    end
+  
+    local jobKey = ARGV[1] .. job
     jobTS = rcall("HGET", jobKey, "timestamp")
     if (not jobTS or jobTS < ARGV[2]) then
       if isList then
         rcall("LREM", KEYS[1], 0, job)
-      else
-        rcall("ZREM", KEYS[1], job)
       end
-      rcall("DEL", jobKey, jobKey .. ":logs")
+      removeJob(job, true, ARGV[1])
       deletedCount = deletedCount + 1
       table.insert(deleted, job)
     end
   end
+
+  if not isList then
+    if(#deleted > 0) then
+      for from, to in batches(#deleted, 7000) do
+        rcall("ZREM", KEYS[1], unpack(deleted, from, to))
+      end
+    end
+  end
 end
 
 rcall("XADD", KEYS[2], "*", "event", "cleaned", "count", deletedCount)

package/dist/esm/commands/includes/getZSetItems.lua

@@ -0,0 +1,8 @@
+
+--[[
+  Function to get ZSet items.
+]]
+
+local function getZSetItems(keyName, max)
+  return rcall('ZRANGE', keyName, 0, max - 1)
+end

package/dist/esm/commands/includes/removeJob.lua

@@ -0,0 +1,13 @@
+--[[
+  Function to remove job.
+]]
+
+-- Includes
+--- @include "removeParentDependencyKey"
+
+local function removeJob(key, hard, baseKey)
+  local jobKey = baseKey .. key
+  removeParentDependencyKey(jobKey, hard, baseKey)
+  rcall("DEL", jobKey, jobKey .. ':logs',
+    jobKey .. ':dependencies', jobKey .. ':processed')
+end

package/dist/esm/commands/includes/removeJobs.lua

@@ -1,5 +1,5 @@
 --[[
-  Functions remove jobs.
+  Functions to remove jobs.
 ]]
 
 -- Includes
@@ -9,18 +9,12 @@ local function getListItems(keyName, max)
   return rcall('LRANGE', keyName, 0, max - 1)
 end
 
-local function getZSetItems(keyName, max)
-  return rcall('ZRANGE', keyName, 0, max - 1)
-end
-
---- @include "removeParentDependencyKey"
+--- @include "getZSetItems"
+--- @include "removeJob"
 
 local function removeJobs(keys, hard, baseKey, max)
   for i, key in ipairs(keys) do
-    local jobKey = baseKey .. key
-    removeParentDependencyKey(jobKey, hard, baseKey)
-    rcall("DEL", jobKey, jobKey .. ':logs',
-      jobKey .. ':dependencies', jobKey .. ':processed')
+    removeJob(key, hard, baseKey)
   end
   return max - #keys
 end

package/dist/esm/commands/retryJobs-4.lua

@@ -20,10 +20,7 @@ local rcall = redis.call;
 
 -- Includes
 --- @include "includes/batches"
-
-local function getZSetItems(keyName, max)
-  return rcall('ZRANGE', keyName, 0, max - 1)
-end
+--- @include "includes/getZSetItems"
 
 local jobs = getZSetItems(KEYS[3], maxCount)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bullmq",
-  "version": "1.68.3",
+  "version": "1.68.4",
   "description": "Queue for messages and jobs based on Redis",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",