bullmq 5.10.3 → 5.11.0

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

@@ -263,6 +263,18 @@ local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey,
         end
     end
 end
+--[[
+  Function to remove debounce key if needed.
+]]
+local function removeDebounceKeyIfNeeded(prefixKey, debounceId)
+  if debounceId then
+    local debounceKey = prefixKey .. "de:" .. debounceId
+    local pttl = rcall("PTTL", debounceKey)
+    if pttl == 0 or pttl == -1 then
+      rcall("DEL", debounceKey)
+    end
+  end
+end
 local function moveParentFromWaitingChildrenToFailed( parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
   if rcall("ZREM", parentQueueKey .. ":waiting-children", parentId) == 1 then
     rcall("ZADD", parentQueueKey .. ":failed", timestamp, parentId)
@@ -270,9 +282,10 @@ local function moveParentFromWaitingChildrenToFailed( parentQueueKey, parentKey,
     rcall("HMSET", parentKey, "failedReason", failedReason, "finishedOn", timestamp)
     rcall("XADD", parentQueueKey .. ":events", "*", "event", "failed", "jobId", parentId, "failedReason",
       failedReason, "prev", "waiting-children")
-    local rawParentData = rcall("HGET", parentKey, "parent")
-    if rawParentData ~= false then
-      local parentData = cjson.decode(rawParentData)
+    local jobAttributes = rcall("HMGET", parentKey, "parent", "deid")
+    removeDebounceKeyIfNeeded(parentQueueKey, jobAttributes[2])
+    if jobAttributes[1] then
+      local parentData = cjson.decode(jobAttributes[1])
       if parentData['fpof'] then
         moveParentFromWaitingChildrenToFailed(
           parentData['queueKey'],
@@ -373,6 +386,16 @@ end
   Function to remove job.
 ]]
 -- Includes
+--[[
+  Function to remove debounce key.
+]]
+local function removeDebounceKey(prefixKey, jobKey)
+  local debounceId = rcall("HGET", jobKey, "deid")
+  if debounceId then
+    local debounceKey = prefixKey .. "de:" .. debounceId
+    rcall("DEL", debounceKey)
+  end
+end
 --[[
   Check if this job has a parent. If so we will just remove it from
   the parent child list, but if it is the last child we should move the parent to "wait/paused"
@@ -398,7 +421,7 @@ local function moveParentToWait(parentPrefix, parentId, emitEvent)
     rcall("XADD", parentEventStream, "*", "event", "waiting", "jobId", parentId, "prev", "waiting-children")
   end
 end
-local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
+local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey, debounceId)
   if parentKey then
     local parentDependenciesKey = parentKey .. ":dependencies"
     local result = rcall("SREM", parentDependenciesKey, jobKey)
@@ -411,8 +434,11 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
         if numRemovedElements == 1 then
           if hard then -- remove parent in same queue
             if parentPrefix == baseKey then
-              removeParentDependencyKey(parentKey, hard, nil, baseKey)
+              removeParentDependencyKey(parentKey, hard, nil, baseKey, nil)
               removeJobKeys(parentKey)
+              if debounceId then
+                rcall("DEL", parentPrefix .. "de:" .. debounceId)
+              end
             else
               moveParentToWait(parentPrefix, parentId)
             end
@@ -424,7 +450,8 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
       return true
     end
   else
-    local missedParentKey = rcall("HGET", jobKey, "parentKey")
+    local parentAttributes = rcall("HMGET", jobKey, "parentKey", "deid")
+    local missedParentKey = parentAttributes[1]
     if( (type(missedParentKey) == "string") and missedParentKey ~= ""
       and (rcall("EXISTS", missedParentKey) == 1)) then
       local parentDependenciesKey = missedParentKey .. ":dependencies"
@@ -438,8 +465,11 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
           if numRemovedElements == 1 then
             if hard then
               if parentPrefix == baseKey then
-                removeParentDependencyKey(missedParentKey, hard, nil, baseKey)
+                removeParentDependencyKey(missedParentKey, hard, nil, baseKey, nil)
                 removeJobKeys(missedParentKey)
+                if parentAttributes[2] then
+                  rcall("DEL", parentPrefix .. "de:" .. parentAttributes[2])
+                end
               else
                 moveParentToWait(parentPrefix, parentId)
               end
@@ -454,16 +484,20 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
   end
   return false
 end
-local function removeJob(jobId, hard, baseKey)
+local function removeJob(jobId, hard, baseKey, shouldRemoveDebounceKey)
   local jobKey = baseKey .. jobId
   removeParentDependencyKey(jobKey, hard, nil, baseKey)
+  if shouldRemoveDebounceKey then
+    removeDebounceKey(baseKey, jobKey)
+  end
   removeJobKeys(jobKey)
 end
-local function removeJobsByMaxAge(timestamp, maxAge, targetSet, prefix)
+local function removeJobsByMaxAge(timestamp, maxAge, targetSet, prefix,
+  shouldRemoveDebounceKey)
   local start = timestamp - maxAge * 1000
   local jobIds = rcall("ZREVRANGEBYSCORE", targetSet, start, "-inf")
   for i, jobId in ipairs(jobIds) do
-    removeJob(jobId, false, prefix)
+    removeJob(jobId, false, prefix, false --[[remove debounce key]])
   end
   rcall("ZREMRANGEBYSCORE", targetSet, "-inf", start)
 end
@@ -475,7 +509,7 @@ local function removeJobsByMaxCount(maxCount, targetSet, prefix)
   local start = maxCount
   local jobIds = rcall("ZREVRANGE", targetSet, start, -1)
   for i, jobId in ipairs(jobIds) do
-    removeJob(jobId, false, prefix)
+    removeJob(jobId, false, prefix, false --[[remove debounce key]])
   end
   rcall("ZREMRANGEBYRANK", targetSet, 0, -(maxCount + 1))
 end
@@ -546,12 +580,12 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
     if rcall("SCARD", jobIdKey .. ":dependencies") ~= 0 then -- // Make sure it does not have pending dependencies
         return -4
     end
-    local parentReferences = rcall("HMGET", jobIdKey, "parentKey", "parent")
-    local parentKey = parentReferences[1] or ""
+    local jobAttributes = rcall("HMGET", jobIdKey, "parentKey", "parent", "deid")
+    local parentKey = jobAttributes[1] or ""
     local parentId = ""
     local parentQueueKey = ""
-    if parentReferences[2] ~= false then
-        local jsonDecodedParent = cjson.decode(parentReferences[2])
+    if jobAttributes[2] ~= false then
+        local jsonDecodedParent = cjson.decode(jobAttributes[2])
         parentId = jsonDecodedParent['id']
         parentQueueKey = jsonDecodedParent['queueKey']
     end
@@ -564,6 +598,8 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
     local metaKey = KEYS[9]
     -- Trim events before emiting them to avoid trimming events emitted in this script
     trimEvents(metaKey, eventStreamKey)
+    local prefix = ARGV[7]
+    removeDebounceKeyIfNeeded(prefix, jobAttributes[3])
     -- If job has a parent we need to
     -- 1) remove this job id from parents dependencies
     -- 2) move the job Id to parent "processed" set
@@ -608,7 +644,6 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
         rcall("HMSET", jobIdKey, ARGV[3], ARGV[4], "finishedOn", timestamp)
         -- "returnvalue" / "failedReason" and "finishedOn"
         -- Remove old jobs?
-        local prefix = ARGV[7]
         if maxAge ~= nil then
             removeJobsByMaxAge(timestamp, maxAge, targetSet, prefix)
         end
@@ -621,7 +656,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
             -- TODO: when a child is removed when finished, result or failure in parent
             -- must not be deleted, those value references should be deleted when the parent
             -- is deleted
-            removeParentDependencyKey(jobIdKey, false, parentKey)
+            removeParentDependencyKey(jobIdKey, false, parentKey, jobAttributes[3])
         end
     end
     rcall("XADD", eventStreamKey, "*", "event", ARGV[5], "jobId", jobId, ARGV[3],
@@ -641,7 +676,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
     if (ARGV[6] == "1") then
         local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[2], KEYS[1], KEYS[8])
         -- Check if there are delayed jobs that can be promoted
-        promoteDelayedJobs(KEYS[7], KEYS[14], target, KEYS[3], eventStreamKey, ARGV[7],
+        promoteDelayedJobs(KEYS[7], KEYS[14], target, KEYS[3], eventStreamKey, prefix,
                            timestamp, KEYS[10], isPausedOrMaxed)
         local maxJobs = tonumber(opts['limiter'] and opts['limiter']['max'])
         -- Check if we are rate limited first.
@@ -659,19 +694,19 @@ if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
                 if jobId == "0:0" then
                     jobId = moveJobFromPriorityToActive(KEYS[3], KEYS[2],
                                                         KEYS[10])
-                    return prepareJobForProcessing(ARGV[7], KEYS[6], eventStreamKey, jobId,
+                    return prepareJobForProcessing(prefix, KEYS[6], eventStreamKey, jobId,
                                                    timestamp, maxJobs,
                                                    opts)
                 end
             else
-                return prepareJobForProcessing(ARGV[7], KEYS[6], eventStreamKey, jobId,
+                return prepareJobForProcessing(prefix, KEYS[6], eventStreamKey, jobId,
                                                timestamp, maxJobs,
                                                opts)
             end
         else
             jobId = moveJobFromPriorityToActive(KEYS[3], KEYS[2], KEYS[10])
             if jobId then
-                return prepareJobForProcessing(ARGV[7], KEYS[6], eventStreamKey, jobId,
+                return prepareJobForProcessing(prefix, KEYS[6], eventStreamKey, jobId,
                                                timestamp, maxJobs,
                                                opts)
             end

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

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

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

@@ -24,6 +24,16 @@ local rcall = redis.call
   Function to remove job.
 ]]
 -- Includes
+--[[
+  Function to remove debounce key.
+]]
+local function removeDebounceKey(prefixKey, jobKey)
+  local debounceId = rcall("HGET", jobKey, "deid")
+  if debounceId then
+    local debounceKey = prefixKey .. "de:" .. debounceId
+    rcall("DEL", debounceKey)
+  end
+end
 --[[
   Function to remove job keys.
 ]]
@@ -92,7 +102,7 @@ local function moveParentToWait(parentPrefix, parentId, emitEvent)
     rcall("XADD", parentEventStream, "*", "event", "waiting", "jobId", parentId, "prev", "waiting-children")
   end
 end
-local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
+local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey, debounceId)
   if parentKey then
     local parentDependenciesKey = parentKey .. ":dependencies"
     local result = rcall("SREM", parentDependenciesKey, jobKey)
@@ -105,8 +115,11 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
         if numRemovedElements == 1 then
           if hard then -- remove parent in same queue
             if parentPrefix == baseKey then
-              removeParentDependencyKey(parentKey, hard, nil, baseKey)
+              removeParentDependencyKey(parentKey, hard, nil, baseKey, nil)
               removeJobKeys(parentKey)
+              if debounceId then
+                rcall("DEL", parentPrefix .. "de:" .. debounceId)
+              end
             else
               moveParentToWait(parentPrefix, parentId)
             end
@@ -118,7 +131,8 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
       return true
     end
   else
-    local missedParentKey = rcall("HGET", jobKey, "parentKey")
+    local parentAttributes = rcall("HMGET", jobKey, "parentKey", "deid")
+    local missedParentKey = parentAttributes[1]
     if( (type(missedParentKey) == "string") and missedParentKey ~= ""
       and (rcall("EXISTS", missedParentKey) == 1)) then
       local parentDependenciesKey = missedParentKey .. ":dependencies"
@@ -132,8 +146,11 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
           if numRemovedElements == 1 then
             if hard then
               if parentPrefix == baseKey then
-                removeParentDependencyKey(missedParentKey, hard, nil, baseKey)
+                removeParentDependencyKey(missedParentKey, hard, nil, baseKey, nil)
                 removeJobKeys(missedParentKey)
+                if parentAttributes[2] then
+                  rcall("DEL", parentPrefix .. "de:" .. parentAttributes[2])
+                end
               else
                 moveParentToWait(parentPrefix, parentId)
               end
@@ -148,14 +165,17 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
   end
   return false
 end
-local function removeJob(jobId, hard, baseKey)
+local function removeJob(jobId, hard, baseKey, shouldRemoveDebounceKey)
   local jobKey = baseKey .. jobId
   removeParentDependencyKey(jobKey, hard, nil, baseKey)
+  if shouldRemoveDebounceKey then
+    removeDebounceKey(baseKey, jobKey)
+  end
   removeJobKeys(jobKey)
 end
 local function removeJobs(keys, hard, baseKey, max)
   for i, key in ipairs(keys) do
-    removeJob(key, hard, baseKey)
+    removeJob(key, hard, baseKey, true --[[remove debounce key]])
   end
   return max - #keys
 end

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

@@ -1 +1 @@
-{"version":3,"file":"obliterate-2.js","sourceRoot":"","sources":["../../../src/scripts/obliterate-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+Rf,CAAC;AACF,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,YAAY;IAClB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"obliterate-2.js","sourceRoot":"","sources":["../../../src/scripts/obliterate-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmTf,CAAC;AACF,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,IAAI,EAAE,YAAY;IAClB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

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

@@ -83,7 +83,7 @@ local function moveParentToWait(parentPrefix, parentId, emitEvent)
     rcall("XADD", parentEventStream, "*", "event", "waiting", "jobId", parentId, "prev", "waiting-children")
   end
 end
-local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
+local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey, debounceId)
   if parentKey then
     local parentDependenciesKey = parentKey .. ":dependencies"
     local result = rcall("SREM", parentDependenciesKey, jobKey)
@@ -96,8 +96,11 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
         if numRemovedElements == 1 then
           if hard then -- remove parent in same queue
             if parentPrefix == baseKey then
-              removeParentDependencyKey(parentKey, hard, nil, baseKey)
+              removeParentDependencyKey(parentKey, hard, nil, baseKey, nil)
               removeJobKeys(parentKey)
+              if debounceId then
+                rcall("DEL", parentPrefix .. "de:" .. debounceId)
+              end
             else
               moveParentToWait(parentPrefix, parentId)
             end
@@ -109,7 +112,8 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
       return true
     end
   else
-    local missedParentKey = rcall("HGET", jobKey, "parentKey")
+    local parentAttributes = rcall("HMGET", jobKey, "parentKey", "deid")
+    local missedParentKey = parentAttributes[1]
     if( (type(missedParentKey) == "string") and missedParentKey ~= ""
       and (rcall("EXISTS", missedParentKey) == 1)) then
       local parentDependenciesKey = missedParentKey .. ":dependencies"
@@ -123,8 +127,11 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
           if numRemovedElements == 1 then
             if hard then
               if parentPrefix == baseKey then
-                removeParentDependencyKey(missedParentKey, hard, nil, baseKey)
+                removeParentDependencyKey(missedParentKey, hard, nil, baseKey, nil)
                 removeJobKeys(missedParentKey)
+                if parentAttributes[2] then
+                  rcall("DEL", parentPrefix .. "de:" .. parentAttributes[2])
+                end
               else
                 moveParentToWait(parentPrefix, parentId)
               end
@@ -141,7 +148,7 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
 end
 if rcall("EXISTS", jobKey) ~= 1 then return -1 end
 if rcall("EXISTS", parentKey) ~= 1 then return -5 end
-if removeParentDependencyKey(jobKey, false, parentKey, KEYS[1]) then
+if removeParentDependencyKey(jobKey, false, parentKey, KEYS[1], nil) then
   rcall("HDEL", jobKey, "parentKey", "parent")
   return 0
 else

package/dist/esm/scripts/removeChildDependency-1.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeChildDependency-1.js","sourceRoot":"","sources":["../../../src/scripts/removeChildDependency-1.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoJZ,CAAC;AACL,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,uBAAuB;IAC7B,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"removeChildDependency-1.js","sourceRoot":"","sources":["../../../src/scripts/removeChildDependency-1.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA2JZ,CAAC;AACL,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,uBAAuB;IAC7B,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

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

@@ -62,6 +62,16 @@ local function isLocked( prefix, jobId, removeChildren)
   end
   return true
 end
+--[[
+  Function to remove debounce key.
+]]
+local function removeDebounceKey(prefixKey, jobKey)
+  local debounceId = rcall("HGET", jobKey, "deid")
+  if debounceId then
+    local debounceKey = prefixKey .. "de:" .. debounceId
+    rcall("DEL", debounceKey)
+  end
+end
 --[[
   Function to remove from any state.
   returns:
@@ -152,7 +162,7 @@ local function moveParentToWait(parentPrefix, parentId, emitEvent)
     rcall("XADD", parentEventStream, "*", "event", "waiting", "jobId", parentId, "prev", "waiting-children")
   end
 end
-local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
+local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey, debounceId)
   if parentKey then
     local parentDependenciesKey = parentKey .. ":dependencies"
     local result = rcall("SREM", parentDependenciesKey, jobKey)
@@ -165,8 +175,11 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
         if numRemovedElements == 1 then
           if hard then -- remove parent in same queue
             if parentPrefix == baseKey then
-              removeParentDependencyKey(parentKey, hard, nil, baseKey)
+              removeParentDependencyKey(parentKey, hard, nil, baseKey, nil)
               removeJobKeys(parentKey)
+              if debounceId then
+                rcall("DEL", parentPrefix .. "de:" .. debounceId)
+              end
             else
               moveParentToWait(parentPrefix, parentId)
             end
@@ -178,7 +191,8 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
       return true
     end
   else
-    local missedParentKey = rcall("HGET", jobKey, "parentKey")
+    local parentAttributes = rcall("HMGET", jobKey, "parentKey", "deid")
+    local missedParentKey = parentAttributes[1]
     if( (type(missedParentKey) == "string") and missedParentKey ~= ""
       and (rcall("EXISTS", missedParentKey) == 1)) then
       local parentDependenciesKey = missedParentKey .. ":dependencies"
@@ -192,8 +206,11 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
           if numRemovedElements == 1 then
             if hard then
               if parentPrefix == baseKey then
-                removeParentDependencyKey(missedParentKey, hard, nil, baseKey)
+                removeParentDependencyKey(missedParentKey, hard, nil, baseKey, nil)
                 removeJobKeys(missedParentKey)
+                if parentAttributes[2] then
+                  rcall("DEL", parentPrefix .. "de:" .. parentAttributes[2])
+                end
               else
                 moveParentToWait(parentPrefix, parentId)
               end
@@ -210,7 +227,7 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
 end
 local function removeJob( prefix, jobId, parentKey, removeChildren)
     local jobKey = prefix .. jobId;
-    removeParentDependencyKey(jobKey, false, parentKey)
+    removeParentDependencyKey(jobKey, false, parentKey, nil)
     if removeChildren == "1" then
         -- Check if this job has children
         -- If so, we are going to try to remove the children recursively in deep first way because
@@ -243,6 +260,7 @@ local function removeJob( prefix, jobId, parentKey, removeChildren)
         end
     end
     local prev = removeJobFromAnyState(prefix, jobId)
+    removeDebounceKey(prefix, jobKey)
     if removeJobKeys(jobKey) > 0 then
         local maxEvents = getOrSetMaxEvents(KEYS[2])
         rcall("XADD", prefix .. "events", "MAXLEN", "~", maxEvents, "*", "event", "removed",

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

@@ -1 +1 @@
-{"version":3,"file":"removeJob-2.js","sourceRoot":"","sources":["../../../src/scripts/removeJob-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiQf,CAAC;AACF,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,WAAW;IACjB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"removeJob-2.js","sourceRoot":"","sources":["../../../src/scripts/removeJob-2.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmRf,CAAC;AACF,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,WAAW;IACjB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

package/dist/esm/scripts/{removeRepeatable-2.js → removeRepeatable-3.js}

@@ -3,6 +3,7 @@ const content = `--[[
   Input:
     KEYS[1] repeat jobs key
     KEYS[2] delayed jobs key
+    KEYS[3] events key
     ARGV[1] old repeat job id
     ARGV[2] options concat
     ARGV[3] repeat job key
@@ -29,7 +30,7 @@ if millis then
   local repeatJobId = ARGV[1] .. millis
   if(rcall("ZREM", KEYS[2], repeatJobId) == 1) then
     removeJobKeys(ARGV[4] .. repeatJobId)
-    rcall("XADD", ARGV[4] .. "events", "*", "event", "removed", "jobId", repeatJobId, "prev", "delayed");
+    rcall("XADD", KEYS[3], "*", "event", "removed", "jobId", repeatJobId, "prev", "delayed");
   end
 end
 if(rcall("ZREM", KEYS[1], ARGV[2]) == 1) then
@@ -42,10 +43,11 @@ if millis then
   local repeatJobId = "repeat:" .. ARGV[3] .. ":" .. millis
   if(rcall("ZREM", KEYS[2], repeatJobId) == 1) then
     removeJobKeys(ARGV[4] .. repeatJobId)
-    rcall("XADD", ARGV[4] .. "events", "*", "event", "removed", "jobId", repeatJobId, "prev", "delayed");
+    rcall("XADD", KEYS[3], "*", "event", "removed", "jobId", repeatJobId, "prev", "delayed")
   end
 end
 if(rcall("ZREM", KEYS[1], ARGV[3]) == 1) then
+  rcall("DEL", KEYS[1] .. ":" .. ARGV[3])
   return 0
 end
 return 1
@@ -53,6 +55,6 @@ return 1
 export const removeRepeatable = {
     name: 'removeRepeatable',
     content,
-    keys: 2,
+    keys: 3,
 };
-//# sourceMappingURL=removeRepeatable-2.js.map
+//# sourceMappingURL=removeRepeatable-3.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"removeRepeatable-3.js","sourceRoot":"","sources":["../../../src/scripts/removeRepeatable-3.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqDf,CAAC;AACF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,kBAAkB;IACxB,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}