bullmq 5.54.3 → 5.56.0

package/dist/cjs/commands/addDelayedJob-6.lua

@@ -89,8 +89,8 @@ else
     end
 end
 
-local deduplicationJobId = deduplicateJob(opts['de'], jobId, deduplicationKey,
-  eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId, delayedKey, deduplicationKey,
+  eventsKey, maxEvents, args[1])
 if deduplicationJobId then
   return deduplicationJobId
 end

package/dist/cjs/commands/{addParentJob-4.lua → addParentJob-5.lua}

@@ -7,8 +7,9 @@
     Input:
       KEYS[1] 'meta'
       KEYS[2] 'id'
-      KEYS[3] 'completed'
-      KEYS[4] events stream key
+      KEYS[3] 'delayed'
+      KEYS[4] 'completed'
+      KEYS[5] events stream key
 
       ARGV[1] msgpacked arguments array
             [1]  key prefix,
@@ -32,8 +33,8 @@
 local metaKey = KEYS[1]
 local idKey = KEYS[2]
 
-local completedKey = KEYS[3]
-local eventsKey = KEYS[4]
+local completedKey = KEYS[4]
+local eventsKey = KEYS[5]
 
 local jobId
 local jobIdKey
@@ -81,8 +82,8 @@ else
     end
 end
 
-local deduplicationJobId = deduplicateJob(opts['de'], jobId,
-  deduplicationKey, eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId, KEYS[3],
+  deduplicationKey, eventsKey, maxEvents, args[1])
 if deduplicationJobId then
   return deduplicationJobId
 end

package/dist/cjs/commands/{addPrioritizedJob-8.lua → addPrioritizedJob-9.lua}

@@ -9,10 +9,11 @@
       KEYS[2] 'meta'
       KEYS[3] 'id'
       KEYS[4] 'prioritized'
-      KEYS[5] 'completed'
-      KEYS[6] 'active'
-      KEYS[7] events stream key
-      KEYS[8] 'pc' priority counter
+      KEYS[5] 'delayed'
+      KEYS[6] 'completed'
+      KEYS[7] 'active'
+      KEYS[8] events stream key
+      KEYS[9] 'pc' priority counter
 
       ARGV[1] msgpacked arguments array
             [1]  key prefix,
@@ -37,10 +38,10 @@ local metaKey = KEYS[2]
 local idKey = KEYS[3]
 local priorityKey = KEYS[4]
 
-local completedKey = KEYS[5]
-local activeKey = KEYS[6]
-local eventsKey = KEYS[7]
-local priorityCounterKey = KEYS[8]
+local completedKey = KEYS[6]
+local activeKey = KEYS[7]
+local eventsKey = KEYS[8]
+local priorityCounterKey = KEYS[9]
 
 local jobId
 local jobIdKey
@@ -90,8 +91,8 @@ else
     end
 end
 
-local deduplicationJobId = deduplicateJob(opts['de'], jobId,
-  deduplicationKey, eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId, KEYS[5],
+  deduplicationKey, eventsKey, maxEvents, args[1])
 if deduplicationJobId then
   return deduplicationJobId
 end

package/dist/{esm/commands/addStandardJob-8.lua → cjs/commands/addStandardJob-9.lua}

@@ -20,9 +20,10 @@
       KEYS[3] 'meta'
       KEYS[4] 'id'
       KEYS[5] 'completed'
-      KEYS[6] 'active'
-      KEYS[7] events stream key
-      KEYS[8] marker key
+      KEYS[6] 'delayed'
+      KEYS[7] 'active'
+      KEYS[8] events stream key
+      KEYS[9] marker key
 
       ARGV[1] msgpacked arguments array
             [1]  key prefix,
@@ -43,7 +44,7 @@
         jobId  - OK
         -5     - Missing parent key
 ]]
-local eventsKey = KEYS[7]
+local eventsKey = KEYS[8]
 
 local jobId
 local jobIdKey
@@ -94,8 +95,8 @@ else
     end
 end
 
-local deduplicationJobId = deduplicateJob(opts['de'], jobId,
-  deduplicationKey, eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId, KEYS[6],
+  deduplicationKey, eventsKey, maxEvents, args[1])
 if deduplicationJobId then
   return deduplicationJobId
 end
@@ -104,11 +105,11 @@ end
 storeJob(eventsKey, jobIdKey, jobId, args[3], ARGV[2], opts, timestamp,
          parentKey, parentData, repeatJobKey)
 
-local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[6], KEYS[1], KEYS[2])
+local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[7], KEYS[1], KEYS[2])
 
 -- LIFO or FIFO
 local pushCmd = opts['lifo'] and 'RPUSH' or 'LPUSH'
-addJobInTargetList(target, KEYS[8], pushCmd, isPausedOrMaxed, jobId)
+addJobInTargetList(target, KEYS[9], pushCmd, isPausedOrMaxed, jobId)
 
 -- Emit waiting event
 rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "waiting",

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

@@ -1,7 +1,7 @@
 --[[
   Functions to collect metrics based on a current and previous count of jobs.
   Granualarity is fixed at 1 minute.
-]] 
+]]
 --- @include "batches"
 local function collectMetrics(metaKey, dataPointsList, maxDataPoints,
                                  timestamp)

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

@@ -1,23 +1,69 @@
 --[[
   Function to debounce a job.
-]] 
-local function deduplicateJob(deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
-  local deduplicationId = deduplicationOpts and deduplicationOpts['id']
-  if deduplicationId then
-      local ttl = deduplicationOpts['ttl']
-      local deduplicationKeyExists
-      if ttl then
-          deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'PX', ttl, 'NX')
-      else
-          deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'NX')
-      end
-      if deduplicationKeyExists then
-          local currentDebounceJobId = rcall('GET', deduplicationKey)
-          rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced", "jobId", currentDebounceJobId,
-              "debounceId", deduplicationId)
-          rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
-              currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
-          return currentDebounceJobId
-      end
-  end
+]]
+-- Includes
+--- @include "removeJobKeys"
+local function deduplicateJob(deduplicationOpts, jobId, delayedKey, deduplicationKey, eventsKey, maxEvents,
+    prefix)
+    local deduplicationId = deduplicationOpts and deduplicationOpts['id']
+    if deduplicationId then
+        local ttl = deduplicationOpts['ttl']
+        if deduplicationOpts['replace'] and ttl and ttl > 0 then
+            local currentDebounceJobId = rcall('GET', deduplicationKey)
+            if currentDebounceJobId then
+                if rcall("ZREM", delayedKey, currentDebounceJobId) > 0 then
+                    removeJobKeys(prefix .. currentDebounceJobId)
+                    rcall("XADD", eventsKey, "*", "event", "removed", "jobId", currentDebounceJobId,
+                        "prev", "delayed")
+
+                    if deduplicationOpts['extend'] then
+                        rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                    else
+                        rcall('SET', deduplicationKey, jobId, 'KEEPTTL')
+                    end
+
+                    rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                        jobId, "deduplicationId", deduplicationId, "deduplicatedJobId", currentDebounceJobId)
+                    return
+                else
+                    return currentDebounceJobId
+                end
+            else
+                rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                return
+            end
+        else
+            local ttl = deduplicationOpts['ttl']
+            local deduplicationKeyExists
+            if ttl then
+                if deduplicationOpts['extend'] then
+                    local currentDebounceJobId = rcall('GET', deduplicationKey)
+                    if currentDebounceJobId then
+                        rcall('SET', deduplicationKey, currentDebounceJobId, 'PX', ttl)
+                        rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced",
+                            "jobId", currentDebounceJobId, "debounceId", deduplicationId)
+                        rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                            currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
+                        return currentDebounceJobId
+                    else
+                        rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                        return
+                    end
+                else
+                    deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'PX', ttl, 'NX')
+                end
+            else
+                deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'NX')
+            end
+
+            if deduplicationKeyExists then
+                local currentDebounceJobId = rcall('GET', deduplicationKey)
+                rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced", "jobId",
+                    currentDebounceJobId, "debounceId", deduplicationId)
+                rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                    currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
+                return currentDebounceJobId
+            end
+        end
+    end
 end

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

@@ -7,7 +7,7 @@ local function storeJob(eventsKey, jobIdKey, jobId, name, data, opts, timestamp,
     local delay = opts['delay'] or 0
     local priority = opts['priority'] or 0
     local debounceId = opts['de'] and opts['de']['id']
-    
+
     local optionalValues = {}
     if parentKey ~= nil then
         table.insert(optionalValues, "parentKey")

package/dist/cjs/commands/moveJobFromActiveToWait-9.lua

@@ -51,7 +51,7 @@ if removed > 0 then
 
   -- Emit waiting event
   rcall("XADD", KEYS[9], "MAXLEN", "~", maxEvents, "*", "event", "waiting",
-    "jobId", jobId)
+    "jobId", jobId, "prev", "active")
 end
 
 local pttl = rcall("PTTL", KEYS[6])

package/dist/cjs/enums/parent-command.js

@@ -10,9 +10,10 @@ var ParentCommand;
     ParentCommand[ParentCommand["InitCompleted"] = 4] = "InitCompleted";
     ParentCommand[ParentCommand["Log"] = 5] = "Log";
     ParentCommand[ParentCommand["MoveToDelayed"] = 6] = "MoveToDelayed";
-    ParentCommand[ParentCommand["Progress"] = 7] = "Progress";
-    ParentCommand[ParentCommand["Update"] = 8] = "Update";
-    ParentCommand[ParentCommand["GetChildrenValues"] = 9] = "GetChildrenValues";
-    ParentCommand[ParentCommand["GetIgnoredChildrenFailures"] = 10] = "GetIgnoredChildrenFailures";
+    ParentCommand[ParentCommand["MoveToWait"] = 7] = "MoveToWait";
+    ParentCommand[ParentCommand["Progress"] = 8] = "Progress";
+    ParentCommand[ParentCommand["Update"] = 9] = "Update";
+    ParentCommand[ParentCommand["GetChildrenValues"] = 10] = "GetChildrenValues";
+    ParentCommand[ParentCommand["GetIgnoredChildrenFailures"] = 11] = "GetIgnoredChildrenFailures";
 })(ParentCommand = exports.ParentCommand || (exports.ParentCommand = {}));
 //# sourceMappingURL=parent-command.js.map

package/dist/cjs/enums/parent-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"parent-command.js","sourceRoot":"","sources":["../../../src/enums/parent-command.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAYX;AAZD,WAAY,aAAa;IACvB,2DAAS,CAAA;IACT,mDAAK,CAAA;IACL,qDAAM,CAAA;IACN,6DAAU,CAAA;IACV,mEAAa,CAAA;IACb,+CAAG,CAAA;IACH,mEAAa,CAAA;IACb,yDAAQ,CAAA;IACR,qDAAM,CAAA;IACN,2EAAiB,CAAA;IACjB,8FAA0B,CAAA;AAC5B,CAAC,EAZW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAYxB"}
+{"version":3,"file":"parent-command.js","sourceRoot":"","sources":["../../../src/enums/parent-command.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAaX;AAbD,WAAY,aAAa;IACvB,2DAAS,CAAA;IACT,mDAAK,CAAA;IACL,qDAAM,CAAA;IACN,6DAAU,CAAA;IACV,mEAAa,CAAA;IACb,+CAAG,CAAA;IACH,mEAAa,CAAA;IACb,6DAAU,CAAA;IACV,yDAAQ,CAAA;IACR,qDAAM,CAAA;IACN,4EAAiB,CAAA;IACjB,8FAA0B,CAAA;AAC5B,CAAC,EAbW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAaxB"}

package/dist/cjs/interfaces/index.js

@@ -6,7 +6,6 @@ tslib_1.__exportStar(require("./backoff-options"), exports);
 tslib_1.__exportStar(require("./base-job-options"), exports);
 tslib_1.__exportStar(require("./child-message"), exports);
 tslib_1.__exportStar(require("./connection"), exports);
-tslib_1.__exportStar(require("./debounce-options"), exports);
 tslib_1.__exportStar(require("./flow-job"), exports);
 tslib_1.__exportStar(require("./ioredis-events"), exports);
 tslib_1.__exportStar(require("./job-json"), exports);

package/dist/cjs/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,4DAAkC;AAClC,6DAAmC;AACnC,0DAAgC;AAChC,uDAA6B;AAC7B,6DAAmC;AACnC,qDAA2B;AAC3B,2DAAiC;AACjC,qDAA2B;AAC3B,+DAAqC;AACrC,sDAA4B;AAC5B,4DAAkC;AAClC,oDAA0B;AAC1B,wDAA8B;AAC9B,2DAAiC;AACjC,mDAAyB;AACzB,2DAAiC;AACjC,0DAAgC;AAChC,iEAAuC;AACvC,0DAAgC;AAChC,0DAAgC;AAChC,2DAAiC;AACjC,+DAAqC;AACrC,2DAAiC;AACjC,oEAA0C;AAC1C,0DAAgC;AAChC,8DAAoC;AACpC,2DAAiC;AACjC,sDAA4B;AAC5B,qDAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,4DAAkC;AAClC,6DAAmC;AACnC,0DAAgC;AAChC,uDAA6B;AAC7B,qDAA2B;AAC3B,2DAAiC;AACjC,qDAA2B;AAC3B,+DAAqC;AACrC,sDAA4B;AAC5B,4DAAkC;AAClC,oDAA0B;AAC1B,wDAA8B;AAC9B,2DAAiC;AACjC,mDAAyB;AACzB,2DAAiC;AACjC,0DAAgC;AAChC,iEAAuC;AACvC,0DAAgC;AAChC,0DAAgC;AAChC,2DAAiC;AACjC,+DAAqC;AACrC,2DAAiC;AACjC,oEAA0C;AAC1C,0DAAgC;AAChC,8DAAoC;AACpC,2DAAiC;AACjC,sDAA4B;AAC5B,qDAA2B"}

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

@@ -114,26 +114,75 @@ local function addDelayedJob(jobId, delayedKey, eventsKey, timestamp,
 end
 --[[
   Function to debounce a job.
-]] 
-local function deduplicateJob(deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
-  local deduplicationId = deduplicationOpts and deduplicationOpts['id']
-  if deduplicationId then
-      local ttl = deduplicationOpts['ttl']
-      local deduplicationKeyExists
-      if ttl then
-          deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'PX', ttl, 'NX')
-      else
-          deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'NX')
-      end
-      if deduplicationKeyExists then
-          local currentDebounceJobId = rcall('GET', deduplicationKey)
-          rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced", "jobId", currentDebounceJobId,
-              "debounceId", deduplicationId)
-          rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
-              currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
-          return currentDebounceJobId
-      end
-  end
+]]
+-- Includes
+--[[
+  Function to remove job keys.
+]]
+local function removeJobKeys(jobKey)
+  return rcall("DEL", jobKey, jobKey .. ':logs', jobKey .. ':dependencies',
+    jobKey .. ':processed', jobKey .. ':failed', jobKey .. ':unsuccessful')
+end
+local function deduplicateJob(deduplicationOpts, jobId, delayedKey, deduplicationKey, eventsKey, maxEvents,
+    prefix)
+    local deduplicationId = deduplicationOpts and deduplicationOpts['id']
+    if deduplicationId then
+        local ttl = deduplicationOpts['ttl']
+        if deduplicationOpts['replace'] and ttl and ttl > 0 then
+            local currentDebounceJobId = rcall('GET', deduplicationKey)
+            if currentDebounceJobId then
+                if rcall("ZREM", delayedKey, currentDebounceJobId) > 0 then
+                    removeJobKeys(prefix .. currentDebounceJobId)
+                    rcall("XADD", eventsKey, "*", "event", "removed", "jobId", currentDebounceJobId,
+                        "prev", "delayed")
+                    if deduplicationOpts['extend'] then
+                        rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                    else
+                        rcall('SET', deduplicationKey, jobId, 'KEEPTTL')
+                    end
+                    rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                        jobId, "deduplicationId", deduplicationId, "deduplicatedJobId", currentDebounceJobId)
+                    return
+                else
+                    return currentDebounceJobId
+                end
+            else
+                rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                return
+            end
+        else
+            local ttl = deduplicationOpts['ttl']
+            local deduplicationKeyExists
+            if ttl then
+                if deduplicationOpts['extend'] then
+                    local currentDebounceJobId = rcall('GET', deduplicationKey)
+                    if currentDebounceJobId then
+                        rcall('SET', deduplicationKey, currentDebounceJobId, 'PX', ttl)
+                        rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced",
+                            "jobId", currentDebounceJobId, "debounceId", deduplicationId)
+                        rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                            currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
+                        return currentDebounceJobId
+                    else
+                        rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                        return
+                    end
+                else
+                    deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'PX', ttl, 'NX')
+                end
+            else
+                deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'NX')
+            end
+            if deduplicationKeyExists then
+                local currentDebounceJobId = rcall('GET', deduplicationKey)
+                rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced", "jobId",
+                    currentDebounceJobId, "debounceId", deduplicationId)
+                rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                    currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
+                return currentDebounceJobId
+            end
+        end
+    end
 end
 --[[
   Function to get max events value or set by default 10000.
@@ -381,8 +430,8 @@ else
             maxEvents, timestamp)
     end
 end
-local deduplicationJobId = deduplicateJob(opts['de'], jobId, deduplicationKey,
-  eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId, delayedKey, deduplicationKey,
+  eventsKey, maxEvents, args[1])
 if deduplicationJobId then
   return deduplicationJobId
 end

package/dist/cjs/scripts/addDelayedJob-6.js.map

@@ -1 +1 @@
-{"version":3,"file":"addDelayedJob-6.js","sourceRoot":"","sources":["../../../src/scripts/addDelayedJob-6.ts"],"names":[],"mappings":";;;AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyYf,CAAC;AACW,QAAA,aAAa,GAAG;IAC3B,IAAI,EAAE,eAAe;IACrB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"addDelayedJob-6.js","sourceRoot":"","sources":["../../../src/scripts/addDelayedJob-6.ts"],"names":[],"mappings":";;;AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0bf,CAAC;AACW,QAAA,aAAa,GAAG;IAC3B,IAAI,EAAE,eAAe;IACrB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

package/dist/cjs/scripts/{addParentJob-4.js → addParentJob-5.js}

@@ -9,8 +9,9 @@ const content = `--[[
     Input:
       KEYS[1] 'meta'
       KEYS[2] 'id'
-      KEYS[3] 'completed'
-      KEYS[4] events stream key
+      KEYS[3] 'delayed'
+      KEYS[4] 'completed'
+      KEYS[5] events stream key
       ARGV[1] msgpacked arguments array
             [1]  key prefix,
             [2]  custom id (will not generate one automatically)
@@ -30,8 +31,8 @@ const content = `--[[
 ]]
 local metaKey = KEYS[1]
 local idKey = KEYS[2]
-local completedKey = KEYS[3]
-local eventsKey = KEYS[4]
+local completedKey = KEYS[4]
+local eventsKey = KEYS[5]
 local jobId
 local jobIdKey
 local rcall = redis.call
@@ -46,26 +47,75 @@ local parentData
 -- Includes
 --[[
   Function to debounce a job.
-]] 
-local function deduplicateJob(deduplicationOpts, jobId, deduplicationKey, eventsKey, maxEvents)
-  local deduplicationId = deduplicationOpts and deduplicationOpts['id']
-  if deduplicationId then
-      local ttl = deduplicationOpts['ttl']
-      local deduplicationKeyExists
-      if ttl then
-          deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'PX', ttl, 'NX')
-      else
-          deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'NX')
-      end
-      if deduplicationKeyExists then
-          local currentDebounceJobId = rcall('GET', deduplicationKey)
-          rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced", "jobId", currentDebounceJobId,
-              "debounceId", deduplicationId)
-          rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
-              currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
-          return currentDebounceJobId
-      end
-  end
+]]
+-- Includes
+--[[
+  Function to remove job keys.
+]]
+local function removeJobKeys(jobKey)
+  return rcall("DEL", jobKey, jobKey .. ':logs', jobKey .. ':dependencies',
+    jobKey .. ':processed', jobKey .. ':failed', jobKey .. ':unsuccessful')
+end
+local function deduplicateJob(deduplicationOpts, jobId, delayedKey, deduplicationKey, eventsKey, maxEvents,
+    prefix)
+    local deduplicationId = deduplicationOpts and deduplicationOpts['id']
+    if deduplicationId then
+        local ttl = deduplicationOpts['ttl']
+        if deduplicationOpts['replace'] and ttl and ttl > 0 then
+            local currentDebounceJobId = rcall('GET', deduplicationKey)
+            if currentDebounceJobId then
+                if rcall("ZREM", delayedKey, currentDebounceJobId) > 0 then
+                    removeJobKeys(prefix .. currentDebounceJobId)
+                    rcall("XADD", eventsKey, "*", "event", "removed", "jobId", currentDebounceJobId,
+                        "prev", "delayed")
+                    if deduplicationOpts['extend'] then
+                        rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                    else
+                        rcall('SET', deduplicationKey, jobId, 'KEEPTTL')
+                    end
+                    rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                        jobId, "deduplicationId", deduplicationId, "deduplicatedJobId", currentDebounceJobId)
+                    return
+                else
+                    return currentDebounceJobId
+                end
+            else
+                rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                return
+            end
+        else
+            local ttl = deduplicationOpts['ttl']
+            local deduplicationKeyExists
+            if ttl then
+                if deduplicationOpts['extend'] then
+                    local currentDebounceJobId = rcall('GET', deduplicationKey)
+                    if currentDebounceJobId then
+                        rcall('SET', deduplicationKey, currentDebounceJobId, 'PX', ttl)
+                        rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced",
+                            "jobId", currentDebounceJobId, "debounceId", deduplicationId)
+                        rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                            currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
+                        return currentDebounceJobId
+                    else
+                        rcall('SET', deduplicationKey, jobId, 'PX', ttl)
+                        return
+                    end
+                else
+                    deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'PX', ttl, 'NX')
+                end
+            else
+                deduplicationKeyExists = not rcall('SET', deduplicationKey, jobId, 'NX')
+            end
+            if deduplicationKeyExists then
+                local currentDebounceJobId = rcall('GET', deduplicationKey)
+                rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "debounced", "jobId",
+                    currentDebounceJobId, "debounceId", deduplicationId)
+                rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "deduplicated", "jobId",
+                    currentDebounceJobId, "deduplicationId", deduplicationId, "deduplicatedJobId", jobId)
+                return currentDebounceJobId
+            end
+        end
+    end
 end
 --[[
   Function to get max events value or set by default 10000.
@@ -336,8 +386,8 @@ else
             maxEvents, timestamp)
     end
 end
-local deduplicationJobId = deduplicateJob(opts['de'], jobId,
-  deduplicationKey, eventsKey, maxEvents)
+local deduplicationJobId = deduplicateJob(opts['de'], jobId, KEYS[3],
+  deduplicationKey, eventsKey, maxEvents, args[1])
 if deduplicationJobId then
   return deduplicationJobId
 end
@@ -357,6 +407,6 @@ return jobId .. "" -- convert to string
 exports.addParentJob = {
     name: 'addParentJob',
     content,
-    keys: 4,
+    keys: 5,
 };
-//# sourceMappingURL=addParentJob-4.js.map
+//# sourceMappingURL=addParentJob-5.js.map

package/dist/cjs/scripts/addParentJob-5.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addParentJob-5.js","sourceRoot":"","sources":["../../../src/scripts/addParentJob-5.ts"],"names":[],"mappings":";;;AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkZf,CAAC;AACW,QAAA,YAAY,GAAG;IAC1B,IAAI,EAAE,cAAc;IACpB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}