bullmq 5.41.6 → 5.41.8

package/dist/esm/commands/getStateV2-8.lua

@@ -23,35 +23,35 @@
 ]]
 local rcall = redis.call
 
-if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[1], ARGV[1]) then
   return "completed"
 end
 
-if rcall("ZSCORE", KEYS[2], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[2], ARGV[1]) then
   return "failed"
 end
 
-if rcall("ZSCORE", KEYS[3], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[3], ARGV[1]) then
   return "delayed"
 end
 
-if rcall("ZSCORE", KEYS[8], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[8], ARGV[1]) then
   return "prioritized"
 end
 
-if rcall("LPOS", KEYS[4] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[4] , ARGV[1]) then
   return "active"
 end
 
-if rcall("LPOS", KEYS[5] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[5] , ARGV[1]) then
   return "waiting"
 end
 
-if rcall("LPOS", KEYS[6] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[6] , ARGV[1]) then
   return "waiting"
 end
 
-if rcall("ZSCORE", KEYS[7] , ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[7] , ARGV[1]) then
   return "waiting-children"
 end
 

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

@@ -31,7 +31,7 @@ local function cleanSet(
         local jobKey = jobKeyPrefix .. job
         -- Extract a Job Scheduler Id from jobId ("repeat:job-scheduler-id:millis") 
         -- and check if it is in the scheduled jobs
-        if not isJobSchedulerJob(job, jobKey, jobSchedulersKey) then
+        if not (jobSchedulersKey and isJobSchedulerJob(job, jobKey, jobSchedulersKey)) then
             if isFinished then
                 removeJob(job, true, jobKeyPrefix, true --[[remove debounce key]] )
                 deletedCount = deletedCount + 1

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

@@ -6,7 +6,7 @@ local function isJobSchedulerJob(jobId, jobKey, jobSchedulersKey)
   local repeatJobKey = rcall("HGET", jobKey, "rjk")
   if repeatJobKey  then
     local prevMillis = rcall("ZSCORE", jobSchedulersKey, repeatJobKey)
-    if prevMillis ~= false then
+    if prevMillis then
       local currentDelayedJobId = "repeat:" .. repeatJobKey .. ":" .. prevMillis
       return jobId == currentDelayedJobId
     end

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

@@ -7,7 +7,7 @@
 
 local function trimEvents(metaKey, eventStreamKey)
   local maxEvents = getOrSetMaxEvents(metaKey)
-  if maxEvents ~= false then
+  if maxEvents then
     rcall("XTRIM", eventStreamKey, "MAXLEN", "~", maxEvents)
   else
     rcall("XTRIM", eventStreamKey, "MAXLEN", "~", 10000)

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

@@ -12,7 +12,7 @@ local function updateExistingJobsParent(parentKey, parent, parentData,
                                         parentDependenciesKey, completedKey,
                                         jobIdKey, jobId, timestamp)
     if parentKey ~= nil then
-        if rcall("ZSCORE", completedKey, jobId) ~= false then
+        if rcall("ZSCORE", completedKey, jobId) then
             local returnvalue = rcall("HGET", jobIdKey, "returnvalue")
             updateParentDepsIfNeeded(parentKey, parent['queueKey'],
                                      parentDependenciesKey, parent['id'],

package/dist/esm/commands/isFinished-3.lua

@@ -23,7 +23,7 @@ if rcall("EXISTS", KEYS[3]) ~= 1 then
   return -1
 end
 
-if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[1], ARGV[1]) then
   if ARGV[2] == "1" then
     local returnValue = rcall("HGET", KEYS[3], "returnvalue")
 
@@ -32,7 +32,7 @@ if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
   return 1
 end
 
-if rcall("ZSCORE", KEYS[2], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[2], ARGV[1]) then
   if ARGV[2] == "1" then
     local failedReason = rcall("HGET", KEYS[3], "failedReason")
 

package/dist/esm/commands/updateRepeatableJobMillis-1.lua

@@ -17,7 +17,7 @@ local nextMillis = ARGV[1]
 local customKey = ARGV[2]
 local legacyCustomKey = ARGV[3]
 
-if rcall("ZSCORE", repeatKey, customKey) ~= false then
+if rcall("ZSCORE", repeatKey, customKey) then
     rcall("ZADD", repeatKey, nextMillis, customKey)
     return customKey
 elseif rcall("ZSCORE", repeatKey, legacyCustomKey) ~= false then

package/dist/esm/interfaces/job-json.d.ts

@@ -32,6 +32,7 @@ export interface JobJsonRaw {
     attemptsMade?: string;
     finishedOn?: string;
     processedOn?: string;
+    priority: string;
     timestamp: string;
     failedReason: string;
     stacktrace: string[];

package/dist/esm/scripts/addDelayedJob-6.js

@@ -281,7 +281,7 @@ local function updateExistingJobsParent(parentKey, parent, parentData,
                                         parentDependenciesKey, completedKey,
                                         jobIdKey, jobId, timestamp)
     if parentKey ~= nil then
-        if rcall("ZSCORE", completedKey, jobId) ~= false then
+        if rcall("ZSCORE", completedKey, jobId) then
             local returnvalue = rcall("HGET", jobIdKey, "returnvalue")
             updateParentDepsIfNeeded(parentKey, parent['queueKey'],
                                      parentDependenciesKey, parent['id'],

package/dist/esm/scripts/addJobScheduler-10.js

@@ -141,26 +141,6 @@ end
   Function to check for the meta.paused key to decide if we are paused or not
   (since an empty list and !EXISTS are not really the same).
 ]]
-local function getTargetQueueList(queueMetaKey, activeKey, waitKey, pausedKey)
-  local queueAttributes = rcall("HMGET", queueMetaKey, "paused", "concurrency")
-  if queueAttributes[1] then
-    return pausedKey, true
-  else
-    if queueAttributes[2] then
-      local activeCount = rcall("LLEN", activeKey)
-      if activeCount >= tonumber(queueAttributes[2]) then
-        return waitKey, true
-      else
-        return waitKey, false
-      end
-    end
-  end
-  return waitKey, false
-end
---[[
-  Function to check for the meta.paused key to decide if we are paused or not
-  (since an empty list and !EXISTS are not really the same).
-]]
 local function isQueuePaused(queueMetaKey)
   return rcall("HEXISTS", queueMetaKey, "paused") == 1
 end
@@ -209,6 +189,26 @@ end
 local getJobKeyPrefix = function (jobKey, jobId)
   return string.sub(jobKey, 0, #jobKey - #jobId)
 end
+--[[
+  Function to check for the meta.paused key to decide if we are paused or not
+  (since an empty list and !EXISTS are not really the same).
+]]
+local function getTargetQueueList(queueMetaKey, activeKey, waitKey, pausedKey)
+  local queueAttributes = rcall("HMGET", queueMetaKey, "paused", "concurrency")
+  if queueAttributes[1] then
+    return pausedKey, true
+  else
+    if queueAttributes[2] then
+      local activeCount = rcall("LLEN", activeKey)
+      if activeCount >= tonumber(queueAttributes[2]) then
+        return waitKey, true
+      else
+        return waitKey, false
+      end
+    end
+  end
+  return waitKey, false
+end
 local function moveParentToWait(parentPrefix, parentId, emitEvent)
   local parentTarget, isPausedOrMaxed = getTargetQueueList(parentPrefix .. "meta", parentPrefix .. "active",
     parentPrefix .. "wait", parentPrefix .. "paused")

package/dist/esm/scripts/addParentJob-4.js

@@ -237,7 +237,7 @@ local function updateExistingJobsParent(parentKey, parent, parentData,
                                         parentDependenciesKey, completedKey,
                                         jobIdKey, jobId, timestamp)
     if parentKey ~= nil then
-        if rcall("ZSCORE", completedKey, jobId) ~= false then
+        if rcall("ZSCORE", completedKey, jobId) then
             local returnvalue = rcall("HGET", jobIdKey, "returnvalue")
             updateParentDepsIfNeeded(parentKey, parent['queueKey'],
                                      parentDependenciesKey, parent['id'],

package/dist/esm/scripts/addPrioritizedJob-8.js

@@ -274,7 +274,7 @@ local function updateExistingJobsParent(parentKey, parent, parentData,
                                         parentDependenciesKey, completedKey,
                                         jobIdKey, jobId, timestamp)
     if parentKey ~= nil then
-        if rcall("ZSCORE", completedKey, jobId) ~= false then
+        if rcall("ZSCORE", completedKey, jobId) then
             local returnvalue = rcall("HGET", jobIdKey, "returnvalue")
             updateParentDepsIfNeeded(parentKey, parent['queueKey'],
                                      parentDependenciesKey, parent['id'],

package/dist/esm/scripts/addRepeatableJob-2.js

@@ -204,10 +204,10 @@ end
 -- If we are overriding a repeatable job we must delete the delayed job for
 -- the next iteration.
 local prevMillis = rcall("ZSCORE", repeatKey, customKey)
-if prevMillis ~= false then
+if prevMillis then
   local delayedJobId =  "repeat:" .. customKey .. ":" .. prevMillis
   local nextDelayedJobId =  repeatKey .. ":" .. customKey .. ":" .. nextMillis
-  if rcall("ZSCORE", delayedKey, delayedJobId) ~= false
+  if rcall("ZSCORE", delayedKey, delayedJobId)
    and rcall("EXISTS", nextDelayedJobId) ~= 1 then
     removeJob(delayedJobId, true, prefixKey, true --[[remove debounce key]])
     rcall("ZREM", delayedKey, delayedJobId)

package/dist/esm/scripts/addStandardJob-8.js

@@ -247,7 +247,7 @@ local function updateExistingJobsParent(parentKey, parent, parentData,
                                         parentDependenciesKey, completedKey,
                                         jobIdKey, jobId, timestamp)
     if parentKey ~= nil then
-        if rcall("ZSCORE", completedKey, jobId) ~= false then
+        if rcall("ZSCORE", completedKey, jobId) then
             local returnvalue = rcall("HGET", jobIdKey, "returnvalue")
             updateParentDepsIfNeeded(parentKey, parent['queueKey'],
                                      parentDependenciesKey, parent['id'],

package/dist/esm/scripts/cleanJobsInSet-3.js

@@ -3,13 +3,14 @@ const content = `--[[
   Input:
     KEYS[1]  set key,
     KEYS[2]  events stream key
-    KEYS[3]  job schedulers key
+    KEYS[3]  repeat key
     ARGV[1]  jobKey prefix
     ARGV[2]  timestamp
     ARGV[3]  limit the number of jobs to be removed. 0 is unlimited
     ARGV[4]  set name, can be any of 'wait', 'active', 'paused', 'delayed', 'completed', or 'failed'
 ]]
 local rcall = redis.call
+local repeatKey = KEYS[3]
 local rangeStart = 0
 local rangeEnd = -1
 local limit = tonumber(ARGV[3])
@@ -52,7 +53,7 @@ local function isJobSchedulerJob(jobId, jobKey, jobSchedulersKey)
   local repeatJobKey = rcall("HGET", jobKey, "rjk")
   if repeatJobKey  then
     local prevMillis = rcall("ZSCORE", jobSchedulersKey, repeatJobKey)
-    if prevMillis ~= false then
+    if prevMillis then
       local currentDelayedJobId = "repeat:" .. repeatJobKey .. ":" .. prevMillis
       return jobId == currentDelayedJobId
     end
@@ -302,7 +303,7 @@ local function cleanSet(
         local jobKey = jobKeyPrefix .. job
         -- Extract a Job Scheduler Id from jobId ("repeat:job-scheduler-id:millis") 
         -- and check if it is in the scheduled jobs
-        if not isJobSchedulerJob(job, jobKey, jobSchedulersKey) then
+        if not (jobSchedulersKey and isJobSchedulerJob(job, jobKey, jobSchedulersKey)) then
             if isFinished then
                 removeJob(job, true, jobKeyPrefix, true --[[remove debounce key]] )
                 deletedCount = deletedCount + 1
@@ -328,20 +329,21 @@ end
 local result
 if ARGV[4] == "active" then
   result = cleanList(KEYS[1], ARGV[1], rangeStart, rangeEnd, ARGV[2], false --[[ hasFinished ]],
-                      KEYS[3])
+                      repeatKey)
 elseif ARGV[4] == "delayed" then
   rangeEnd = "+inf"
   result = cleanSet(KEYS[1], ARGV[1], rangeEnd, ARGV[2], limit,
-                    {"processedOn", "timestamp"}, false  --[[ hasFinished ]], KEYS[3])
+                    {"processedOn", "timestamp"}, false  --[[ hasFinished ]], repeatKey)
 elseif ARGV[4] == "prioritized" then
   rangeEnd = "+inf"
   result = cleanSet(KEYS[1], ARGV[1], rangeEnd, ARGV[2], limit,
-                    {"timestamp"}, false  --[[ hasFinished ]])
+                    {"timestamp"}, false  --[[ hasFinished ]], repeatKey)
 elseif ARGV[4] == "wait" or ARGV[4] == "paused" then
   result = cleanList(KEYS[1], ARGV[1], rangeStart, rangeEnd, ARGV[2], true --[[ hasFinished ]],
-                      KEYS[3])
+                      repeatKey)
 else
   rangeEnd = ARGV[2]
+  -- No need to pass repeat key as in that moment job won't be related to a job scheduler
   result = cleanSet(KEYS[1], ARGV[1], rangeEnd, ARGV[2], limit,
                     {"finishedOn"}, true  --[[ hasFinished ]])
 end

package/dist/esm/scripts/cleanJobsInSet-3.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanJobsInSet-3.js","sourceRoot":"","sources":["../../../src/scripts/cleanJobsInSet-3.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Vf,CAAC;AACF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,gBAAgB;IACtB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"cleanJobsInSet-3.js","sourceRoot":"","sources":["../../../src/scripts/cleanJobsInSet-3.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+Vf,CAAC;AACF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,gBAAgB;IACtB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

package/dist/esm/scripts/getState-8.js

@@ -21,16 +21,16 @@ const content = `--[[
     'unknown'
 ]]
 local rcall = redis.call
-if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[1], ARGV[1]) then
   return "completed"
 end
-if rcall("ZSCORE", KEYS[2], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[2], ARGV[1]) then
   return "failed"
 end
-if rcall("ZSCORE", KEYS[3], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[3], ARGV[1]) then
   return "delayed"
 end
-if rcall("ZSCORE", KEYS[8], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[8], ARGV[1]) then
   return "prioritized"
 end
 -- Includes
@@ -57,7 +57,7 @@ local paused_items = rcall("LRANGE", KEYS[6] , 0, -1)
 if checkItemInList(paused_items, ARGV[1]) ~= nil then
   return "waiting"
 end
-if rcall("ZSCORE", KEYS[7], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[7], ARGV[1]) then
   return "waiting-children"
 end
 return "unknown"

package/dist/esm/scripts/getStateV2-8.js

@@ -20,28 +20,28 @@ const content = `--[[
     'unknown'
 ]]
 local rcall = redis.call
-if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[1], ARGV[1]) then
   return "completed"
 end
-if rcall("ZSCORE", KEYS[2], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[2], ARGV[1]) then
   return "failed"
 end
-if rcall("ZSCORE", KEYS[3], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[3], ARGV[1]) then
   return "delayed"
 end
-if rcall("ZSCORE", KEYS[8], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[8], ARGV[1]) then
   return "prioritized"
 end
-if rcall("LPOS", KEYS[4] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[4] , ARGV[1]) then
   return "active"
 end
-if rcall("LPOS", KEYS[5] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[5] , ARGV[1]) then
   return "waiting"
 end
-if rcall("LPOS", KEYS[6] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[6] , ARGV[1]) then
   return "waiting"
 end
-if rcall("ZSCORE", KEYS[7] , ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[7] , ARGV[1]) then
   return "waiting-children"
 end
 return "unknown"

package/dist/esm/scripts/isFinished-3.js

@@ -19,14 +19,14 @@ if rcall("EXISTS", KEYS[3]) ~= 1 then
   end  
   return -1
 end
-if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[1], ARGV[1]) then
   if ARGV[2] == "1" then
     local returnValue = rcall("HGET", KEYS[3], "returnvalue")
     return {1,returnValue}
   end
   return 1
 end
-if rcall("ZSCORE", KEYS[2], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[2], ARGV[1]) then
   if ARGV[2] == "1" then
     local failedReason = rcall("HGET", KEYS[3], "failedReason")
     return {2,failedReason}

package/dist/esm/scripts/moveStalledJobsToWait-9.js

@@ -454,7 +454,7 @@ local function getOrSetMaxEvents(metaKey)
 end
 local function trimEvents(metaKey, eventStreamKey)
   local maxEvents = getOrSetMaxEvents(metaKey)
-  if maxEvents ~= false then
+  if maxEvents then
     rcall("XTRIM", eventStreamKey, "MAXLEN", "~", maxEvents)
   else
     rcall("XTRIM", eventStreamKey, "MAXLEN", "~", 10000)

package/dist/esm/scripts/moveToFinished-14.js

@@ -637,7 +637,7 @@ local function getOrSetMaxEvents(metaKey)
 end
 local function trimEvents(metaKey, eventStreamKey)
   local maxEvents = getOrSetMaxEvents(metaKey)
-  if maxEvents ~= false then
+  if maxEvents then
     rcall("XTRIM", eventStreamKey, "MAXLEN", "~", maxEvents)
   else
     rcall("XTRIM", eventStreamKey, "MAXLEN", "~", 10000)

package/dist/esm/scripts/removeJob-3.js

@@ -41,7 +41,7 @@ local function isJobSchedulerJob(jobId, jobKey, jobSchedulersKey)
   local repeatJobKey = rcall("HGET", jobKey, "rjk")
   if repeatJobKey  then
     local prevMillis = rcall("ZSCORE", jobSchedulersKey, repeatJobKey)
-    if prevMillis ~= false then
+    if prevMillis then
       local currentDelayedJobId = "repeat:" .. repeatJobKey .. ":" .. prevMillis
       return jobId == currentDelayedJobId
     end

package/dist/esm/scripts/updateRepeatableJobMillis-1.js

@@ -13,7 +13,7 @@ local repeatKey = KEYS[1]
 local nextMillis = ARGV[1]
 local customKey = ARGV[2]
 local legacyCustomKey = ARGV[3]
-if rcall("ZSCORE", repeatKey, customKey) ~= false then
+if rcall("ZSCORE", repeatKey, customKey) then
     rcall("ZADD", repeatKey, nextMillis, customKey)
     return customKey
 elseif rcall("ZSCORE", repeatKey, legacyCustomKey) ~= false then