bullmq 5.40.1 → 5.40.3

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

@@ -0,0 +1,41 @@
+--[[
+  Function to store a job scheduler
+]]
+local function storeJobScheduler(schedulerId, schedulerKey, repeatKey, nextMillis, opts,
+  templateData, templateOpts)
+  rcall("ZADD", repeatKey, nextMillis, schedulerId)
+
+  local optionalValues = {}
+  if opts['tz'] then
+    table.insert(optionalValues, "tz")
+    table.insert(optionalValues, opts['tz'])
+  end
+
+  if opts['pattern'] then
+    table.insert(optionalValues, "pattern")
+    table.insert(optionalValues, opts['pattern'])
+  end
+
+  if opts['endDate'] then
+    table.insert(optionalValues, "endDate")
+    table.insert(optionalValues, opts['endDate'])
+  end
+
+  if opts['every'] then
+    table.insert(optionalValues, "every")
+    table.insert(optionalValues, opts['every'])
+  end
+
+  local jsonTemplateOpts = cjson.encode(templateOpts)
+  if jsonTemplateOpts and jsonTemplateOpts ~= '{}' then
+    table.insert(optionalValues, "opts")
+    table.insert(optionalValues, jsonTemplateOpts)
+  end
+
+  if templateData and templateData ~= '{}' then
+    table.insert(optionalValues, "data")
+    table.insert(optionalValues, templateData)
+  end
+
+  rcall("HMSET", schedulerKey, "name", opts['name'], unpack(optionalValues))
+end

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

@@ -63,7 +63,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end
@@ -145,7 +145,7 @@ end
 --[[
   Function to debounce a job.
 ]]
-local function deduplicateJob(prefixKey, deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
+local function deduplicateJob(deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
   local deduplicationId = deduplicationOpts and deduplicationOpts['id']
   if deduplicationId then
     local ttl = deduplicationOpts['ttl']
@@ -359,8 +359,8 @@ else
             maxEvents, timestamp)
     end
 end
-local deduplicationJobId = deduplicateJob(args[1], opts['de'],
-  jobId, deduplicationKey, eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId, deduplicationKey,
+  eventsKey, maxEvents)
 if deduplicationJobId then
   return deduplicationJobId
 end

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

@@ -177,51 +177,56 @@ local function removeJob(jobId, hard, baseKey, shouldRemoveDeduplicationKey)
   end
   removeJobKeys(jobKey)
 end
-local function storeRepeatableJob(schedulerId, repeatKey, nextMillis, rawOpts, templateData, templateOpts)
-    rcall("ZADD", repeatKey, nextMillis, schedulerId)
-    local opts = cmsgpack.unpack(rawOpts)
-    local optionalValues = {}
-    if opts['tz'] then
-        table.insert(optionalValues, "tz")
-        table.insert(optionalValues, opts['tz'])
-    end
-    if opts['pattern'] then
-        table.insert(optionalValues, "pattern")
-        table.insert(optionalValues, opts['pattern'])
-    end
-    if opts['endDate'] then
-        table.insert(optionalValues, "endDate")
-        table.insert(optionalValues, opts['endDate'])
-    end
-    if opts['every'] then
-        table.insert(optionalValues, "every")
-        table.insert(optionalValues, opts['every'])
-    end
-    local jsonTemplateOpts = cjson.encode(templateOpts)
-    if jsonTemplateOpts and jsonTemplateOpts ~= '{}' then
-        table.insert(optionalValues, "opts")
-        table.insert(optionalValues, jsonTemplateOpts)
-    end
-    if templateData and templateData ~= '{}' then
-        table.insert(optionalValues, "data")
-        table.insert(optionalValues, templateData)
-    end
-    rcall("HMSET", repeatKey .. ":" .. schedulerId, "name", opts['name'], unpack(optionalValues))
+--[[
+  Function to store a job scheduler
+]]
+local function storeJobScheduler(schedulerId, schedulerKey, repeatKey, nextMillis, opts,
+  templateData, templateOpts)
+  rcall("ZADD", repeatKey, nextMillis, schedulerId)
+  local optionalValues = {}
+  if opts['tz'] then
+    table.insert(optionalValues, "tz")
+    table.insert(optionalValues, opts['tz'])
+  end
+  if opts['pattern'] then
+    table.insert(optionalValues, "pattern")
+    table.insert(optionalValues, opts['pattern'])
+  end
+  if opts['endDate'] then
+    table.insert(optionalValues, "endDate")
+    table.insert(optionalValues, opts['endDate'])
+  end
+  if opts['every'] then
+    table.insert(optionalValues, "every")
+    table.insert(optionalValues, opts['every'])
+  end
+  local jsonTemplateOpts = cjson.encode(templateOpts)
+  if jsonTemplateOpts and jsonTemplateOpts ~= '{}' then
+    table.insert(optionalValues, "opts")
+    table.insert(optionalValues, jsonTemplateOpts)
+  end
+  if templateData and templateData ~= '{}' then
+    table.insert(optionalValues, "data")
+    table.insert(optionalValues, templateData)
+  end
+  rcall("HMSET", schedulerKey, "name", opts['name'], unpack(optionalValues))
 end
 -- If we are overriding a repeatable job we must delete the delayed job for
 -- the next iteration.
+local schedulerKey = repeatKey .. ":" .. jobSchedulerId
 local prevMillis = rcall("ZSCORE", repeatKey, jobSchedulerId)
 if prevMillis ~= false then
     local delayedJobId = "repeat:" .. jobSchedulerId .. ":" .. prevMillis
     local nextDelayedJobId = "repeat:" .. jobSchedulerId .. ":" .. nextMillis
-    local nextDelayedJobKey = repeatKey .. ":" .. jobSchedulerId .. ":" .. nextMillis
+    local nextDelayedJobKey = schedulerKey .. ":" .. nextMillis
     if rcall("ZSCORE", delayedKey, delayedJobId) ~= false and
         (rcall("EXISTS", nextDelayedJobKey) ~= 1 or delayedJobId == nextDelayedJobId) then
         removeJob(delayedJobId, true, prefixKey, true --[[remove debounce key]] )
         rcall("ZREM", delayedKey, delayedJobId)
     end
 end
-return storeRepeatableJob(jobSchedulerId, repeatKey, nextMillis, ARGV[2], ARGV[4], templateOpts)
+local schedulerOpts = cmsgpack.unpack(ARGV[2])
+return storeJobScheduler(jobSchedulerId, schedulerKey, repeatKey, nextMillis, schedulerOpts, ARGV[4], templateOpts)
 `;
 export const addJobScheduler = {
     name: 'addJobScheduler',

package/dist/esm/scripts/addJobScheduler-2.js.map

@@ -1 +1 @@
-{"version":3,"file":"addJobScheduler-2.js","sourceRoot":"","sources":["../../../src/scripts/addJobScheduler-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgOf,CAAC;AACF,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,IAAI,EAAE,iBAAiB;IACvB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"addJobScheduler-2.js","sourceRoot":"","sources":["../../../src/scripts/addJobScheduler-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqOf,CAAC;AACF,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,IAAI,EAAE,iBAAiB;IACvB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

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

@@ -44,7 +44,7 @@ local parentData
 --[[
   Function to debounce a job.
 ]]
-local function deduplicateJob(prefixKey, deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
+local function deduplicateJob(deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
   local deduplicationId = deduplicationOpts and deduplicationOpts['id']
   if deduplicationId then
     local ttl = deduplicationOpts['ttl']
@@ -105,7 +105,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end
@@ -311,8 +311,8 @@ else
             maxEvents, timestamp)
     end
 end
-local deduplicationJobId = deduplicateJob(args[1], opts['de'],
-  jobId, deduplicationKey, eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId,
+  deduplicationKey, eventsKey, maxEvents)
 if deduplicationJobId then
   return deduplicationJobId
 end

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

@@ -70,7 +70,7 @@ end
 --[[
   Function to debounce a job.
 ]]
-local function deduplicateJob(prefixKey, deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
+local function deduplicateJob(deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
   local deduplicationId = deduplicationOpts and deduplicationOpts['id']
   if deduplicationId then
     local ttl = deduplicationOpts['ttl']
@@ -161,7 +161,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end
@@ -318,8 +318,8 @@ else
             maxEvents, timestamp)
     end
 end
-local deduplicationJobId = deduplicateJob(args[1], opts['de'],
-  jobId, deduplicationKey, eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId,
+  deduplicationKey, eventsKey, maxEvents)
 if deduplicationJobId then
   return deduplicationJobId
 end

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

@@ -70,7 +70,7 @@ end
 --[[
   Function to debounce a job.
 ]]
-local function deduplicateJob(prefixKey, deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
+local function deduplicateJob(deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
   local deduplicationId = deduplicationOpts and deduplicationOpts['id']
   if deduplicationId then
     local ttl = deduplicationOpts['ttl']
@@ -151,7 +151,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end
@@ -322,8 +322,8 @@ else
             maxEvents, timestamp)
     end
 end
-local deduplicationJobId = deduplicateJob(args[1], opts['de'],
-  jobId, deduplicationKey, eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId,
+  deduplicationKey, eventsKey, maxEvents)
 if deduplicationJobId then
   return deduplicationJobId
 end

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

@@ -29,7 +29,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end

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

@@ -90,7 +90,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end

package/dist/esm/scripts/moveToActive-11.js

@@ -42,7 +42,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end

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

@@ -36,7 +36,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end

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

@@ -109,7 +109,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end

package/dist/esm/scripts/pause-7.js

@@ -25,7 +25,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end

package/dist/esm/scripts/updateJobScheduler-7.js

@@ -45,7 +45,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end