bullmq 5.47.1 → 5.47.2

package/dist/esm/commands/includes/{moveParentToFailedIfNeeded.lua → moveChildFromDependenciesIfNeeded.lua}

@@ -8,7 +8,9 @@
 --- @include "removeDeduplicationKeyIfNeeded"
 --- @include "removeJobsOnFail"
 
-local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
+local moveParentToFailedIfNeeded
+local moveChildFromDependenciesIfNeeded
+moveParentToFailedIfNeeded = function (parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
   if rcall("EXISTS", parentKey) == 1 then
     local parentWaitingChildrenKey = parentQueueKey .. ":waiting-children"
     local parentDelayedKey = parentQueueKey .. ":delayed"
@@ -40,34 +42,7 @@ local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, j
 
       removeDeduplicationKeyIfNeeded(parentQueueKey .. ":", jobAttributes[2])
 
-      if jobAttributes[1] then
-        local parentData = cjson.decode(jobAttributes[1])
-        local grandParentKey = parentData['queueKey'] .. ':' .. parentData['id']
-        local grandParentUnsuccesssful = grandParentKey .. ":unsuccessful"
-        rcall("ZADD", grandParentUnsuccesssful, timestamp, parentKey)
-        if parentData['fpof'] then
-          moveParentToFailedIfNeeded(
-            parentData['queueKey'],
-            parentData['queueKey'] .. ':' .. parentData['id'],
-            parentData['id'],
-            parentKey,
-            timestamp
-          )
-        elseif parentData['cpof'] then
-          moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
-        elseif parentData['idof'] or parentData['rdof'] then
-          local grandParentKey = parentData['queueKey'] .. ':' .. parentData['id']
-          local grandParentDependenciesSet = grandParentKey .. ":dependencies"
-          if rcall("SREM", grandParentDependenciesSet, parentKey) == 1 then
-            moveParentToWaitIfNeeded(parentData['queueKey'], grandParentDependenciesSet,
-              grandParentKey, parentData['id'], timestamp)
-            if parentData['idof'] then
-              local grandParentFailedSet = grandParentKey .. ":failed"
-              rcall("HSET", grandParentFailedSet, parentKey, failedReason)
-            end
-          end
-        end
-      end
+      moveChildFromDependenciesIfNeeded(jobAttributes[1], parentKey, failedReason, timestamp)
 
       local parentRawOpts = jobAttributes[3]
       local parentOpts = cjson.decode(parentRawOpts)
@@ -83,3 +58,39 @@ local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, j
     end
   end
 end
+
+moveChildFromDependenciesIfNeeded = function (rawParentData, childKey, failedReason, timestamp)
+  if rawParentData then
+    local parentData = cjson.decode(rawParentData)
+    local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
+    local parentDependenciesChildrenKey = parentKey .. ":dependencies"
+    if parentData['fpof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        local parentUnsuccesssfulChildrenKey = parentKey .. ":unsuccessful"
+        rcall("ZADD", parentUnsuccesssfulChildrenKey, timestamp, childKey)
+        moveParentToFailedIfNeeded(
+          parentData['queueKey'],
+          parentKey,
+          parentData['id'],
+          childKey,
+          timestamp
+        )
+      end
+    elseif parentData['cpof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        local parentFailedChildrenKey = parentKey .. ":failed"
+        rcall("HSET", parentFailedChildrenKey, childKey, failedReason)
+        moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
+      end
+    elseif parentData['idof'] or parentData['rdof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        moveParentToWaitIfNeeded(parentData['queueKey'], parentDependenciesChildrenKey,
+          parentKey, parentData['id'], timestamp)
+        if parentData['idof'] then
+          local parentFailedChildrenKey = parentKey .. ":failed"
+          rcall("HSET", parentFailedChildrenKey, childKey, failedReason)
+        end
+      end
+    end
+  end
+end

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

@@ -3,8 +3,8 @@
 ]]
 --- @include "moveParentToWait"
 local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey, parentKey, parentId, timestamp)
-    local hasPendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
-    if hasPendingDependencies then
+    local doNotHavePendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
+    if doNotHavePendingDependencies then
         moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end

package/dist/esm/commands/moveStalledJobsToWait-9.lua

@@ -26,7 +26,7 @@ local rcall = redis.call
 --- @include "includes/addJobInTargetList"
 --- @include "includes/batches"
 --- @include "includes/getTargetQueueList"
---- @include "includes/moveParentToFailedIfNeeded"
+--- @include "includes/moveChildFromDependenciesIfNeeded"
 --- @include "includes/moveParentToWaitIfNeeded"
 --- @include "includes/moveParentToWait"
 --- @include "includes/removeDeduplicationKeyIfNeeded"
@@ -93,36 +93,7 @@ if (#stalling > 0) then
                         rcall("XADD", eventStreamKey, "*", "event", "failed", "jobId", jobId, 'prev', 'active',
                             'failedReason', failedReason)
 
-                        if rawParentData then
-                            if opts['fpof'] or opts['cpof'] then
-                                local parentData = cjson.decode(rawParentData)
-                                -- TODO: need to remove this job from dependencies set in next breaking change
-                                -- no for now as it would imply a breaking change
-                                local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
-                                local unsuccesssfulSet = parentKey .. ":unsuccessful"
-                                rcall("ZADD", unsuccesssfulSet, timestamp, jobKey)
-
-                                if opts['fpof'] then
-                                    moveParentToFailedIfNeeded(parentData['queueKey'],
-                                        parentData['queueKey'] .. ':' .. parentData['id'], parentData['id'], jobKey,
-                                        timestamp)
-                                elseif opts['cpof'] then
-                                    moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
-                                end
-                            elseif opts['idof'] or opts['rdof'] then
-                                local parentData = cjson.decode(rawParentData)
-                                local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
-                                local dependenciesSet = parentKey .. ":dependencies"
-                                if rcall("SREM", dependenciesSet, jobKey) == 1 then
-                                    moveParentToWaitIfNeeded(parentData['queueKey'], dependenciesSet, parentKey,
-                                        parentData['id'], timestamp)
-                                    if opts['idof'] then
-                                        local failedSet = parentKey .. ":failed"
-                                        rcall("HSET", failedSet, jobKey, failedReason)
-                                    end
-                                end
-                            end
-                        end
+                        moveChildFromDependenciesIfNeeded(rawParentData, jobKey, failedReason, timestamp)
 
                         removeJobsOnFail(queueKeyPrefix, failedKey, jobId, opts, timestamp)
 

package/dist/esm/commands/moveToFinished-14.lua

@@ -64,7 +64,7 @@ local rcall = redis.call
 --- @include "includes/getRateLimitTTL"
 --- @include "includes/getTargetQueueList"
 --- @include "includes/moveJobFromPriorityToActive"
---- @include "includes/moveParentToFailedIfNeeded"
+--- @include "includes/moveChildFromDependenciesIfNeeded"
 --- @include "includes/moveParentToWait"
 --- @include "includes/moveParentToWaitIfNeeded"
 --- @include "includes/prepareJobForProcessing"
@@ -109,7 +109,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- Make sure job exists
     local parentKey = jobAttributes[1] or ""
     local parentId = ""
     local parentQueueKey = ""
-    if jobAttributes[2] then
+    if jobAttributes[2] then -- TODO: need to revisit this logic if it's still needed
         local jsonDecodedParent = cjson.decode(jobAttributes[2])
         parentId = jsonDecodedParent['id']
         parentQueueKey = jsonDecodedParent['queueKey']
@@ -152,27 +152,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- Make sure job exists
                     timestamp)
             end
         else
-            if opts['fpof'] or opts['cpof'] then
-                local unsuccesssfulSet = parentKey .. ":unsuccessful"
-                rcall("ZADD", unsuccesssfulSet, timestamp, jobIdKey)
-
-                if opts['fpof'] then
-                    moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
-                elseif opts['cpof'] then
-                    local failedSet = parentKey .. ":failed"
-                    rcall("HSET", failedSet, jobIdKey, ARGV[4])
-                    moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
-                end
-            elseif opts['idof'] or opts['rdof'] then
-                local dependenciesSet = parentKey .. ":dependencies"
-                if rcall("SREM", dependenciesSet, jobIdKey) == 1 then
-                    moveParentToWaitIfNeeded(parentQueueKey, dependenciesSet, parentKey, parentId, timestamp)
-                    if opts['idof'] then
-                        local failedSet = parentKey .. ":failed"
-                        rcall("HSET", failedSet, jobIdKey, ARGV[4])
-                    end
-                end
-            end
+            moveChildFromDependenciesIfNeeded(jobAttributes[2], jobIdKey, ARGV[4], timestamp)
         end
     end
 

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

@@ -36,7 +36,7 @@ local timestamp = ARGV[3]
 local jobId = ARGV[4]
 
 --- Includes
---- @include "includes/moveParentToFailedIfNeeded"
+--- @include "includes/moveChildFromDependenciesIfNeeded"
 --- @include "includes/moveParentToWait"
 --- @include "includes/moveParentToWaitIfNeeded"
 --- @include "includes/removeDeduplicationKeyIfNeeded"
@@ -75,37 +75,7 @@ if rcall("EXISTS", jobKey) == 1 then
     local rawOpts = jobAttributes[3]
     local opts = cjson.decode(rawOpts)
 
-    if rawParentData ~= false then
-      if opts['fpof'] or opts['cpof'] then
-        local parentData = cjson.decode(rawParentData)
-        local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
-        local parentUnsuccesssful = parentKey .. ":unsuccessful"
-        rcall("ZADD", parentUnsuccesssful, timestamp, jobKey)                        
-        if opts['fpof'] then
-          moveParentToFailedIfNeeded(
-              parentData['queueKey'],
-              parentData['queueKey'] .. ':' .. parentData['id'],
-              parentData['id'],
-              jobKey,
-              timestamp
-          )
-        elseif opts['cpof'] then
-          moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
-        end
-      elseif opts['idof'] or opts['rdof'] then
-        local parentData = cjson.decode(rawParentData)
-        local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
-        local dependenciesSet = parentKey .. ":dependencies"
-        if rcall("SREM", dependenciesSet, jobKey) == 1 then
-          moveParentToWaitIfNeeded(parentData['queueKey'], dependenciesSet,
-                                    parentKey, parentData['id'], timestamp)
-          if opts['idof'] then
-            local failedSet = parentKey .. ":failed"
-            rcall("HSET", failedSet, jobKey, failedReason)
-          end
-        end
-      end
-    end
+    moveChildFromDependenciesIfNeeded(rawParentData, jobKey, failedReason, timestamp)
 
     removeJobsOnFail(ARGV[5], failedKey, jobId, opts, timestamp)
 

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

@@ -270,8 +270,8 @@ local function moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end
 local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey, parentKey, parentId, timestamp)
-    local hasPendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
-    if hasPendingDependencies then
+    local doNotHavePendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
+    if doNotHavePendingDependencies then
         moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end

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

@@ -226,8 +226,8 @@ local function moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end
 local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey, parentKey, parentId, timestamp)
-    local hasPendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
-    if hasPendingDependencies then
+    local doNotHavePendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
+    if doNotHavePendingDependencies then
         moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end

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

@@ -263,8 +263,8 @@ local function moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end
 local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey, parentKey, parentId, timestamp)
-    local hasPendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
-    if hasPendingDependencies then
+    local doNotHavePendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
+    if doNotHavePendingDependencies then
         moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end

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

@@ -236,8 +236,8 @@ local function moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end
 local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey, parentKey, parentId, timestamp)
-    local hasPendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
-    if hasPendingDependencies then
+    local doNotHavePendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
+    if doNotHavePendingDependencies then
         moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end

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

@@ -175,8 +175,8 @@ local function moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end
 local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey, parentKey, parentId, timestamp)
-    local hasPendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
-    if hasPendingDependencies then
+    local doNotHavePendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
+    if doNotHavePendingDependencies then
         moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end
@@ -362,7 +362,9 @@ local function removeJobsOnFail(queueKeyPrefix, failedKey, jobId, opts, timestam
     end
   end 
 end
-local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
+local moveParentToFailedIfNeeded
+local moveChildFromDependenciesIfNeeded
+moveParentToFailedIfNeeded = function (parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
   if rcall("EXISTS", parentKey) == 1 then
     local parentWaitingChildrenKey = parentQueueKey .. ":waiting-children"
     local parentDelayedKey = parentQueueKey .. ":delayed"
@@ -390,34 +392,7 @@ local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, j
         failedReason, "prev", prevState)
       local jobAttributes = rcall("HMGET", parentKey, "parent", "deid", "opts")
       removeDeduplicationKeyIfNeeded(parentQueueKey .. ":", jobAttributes[2])
-      if jobAttributes[1] then
-        local parentData = cjson.decode(jobAttributes[1])
-        local grandParentKey = parentData['queueKey'] .. ':' .. parentData['id']
-        local grandParentUnsuccesssful = grandParentKey .. ":unsuccessful"
-        rcall("ZADD", grandParentUnsuccesssful, timestamp, parentKey)
-        if parentData['fpof'] then
-          moveParentToFailedIfNeeded(
-            parentData['queueKey'],
-            parentData['queueKey'] .. ':' .. parentData['id'],
-            parentData['id'],
-            parentKey,
-            timestamp
-          )
-        elseif parentData['cpof'] then
-          moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
-        elseif parentData['idof'] or parentData['rdof'] then
-          local grandParentKey = parentData['queueKey'] .. ':' .. parentData['id']
-          local grandParentDependenciesSet = grandParentKey .. ":dependencies"
-          if rcall("SREM", grandParentDependenciesSet, parentKey) == 1 then
-            moveParentToWaitIfNeeded(parentData['queueKey'], grandParentDependenciesSet,
-              grandParentKey, parentData['id'], timestamp)
-            if parentData['idof'] then
-              local grandParentFailedSet = grandParentKey .. ":failed"
-              rcall("HSET", grandParentFailedSet, parentKey, failedReason)
-            end
-          end
-        end
-      end
+      moveChildFromDependenciesIfNeeded(jobAttributes[1], parentKey, failedReason, timestamp)
       local parentRawOpts = jobAttributes[3]
       local parentOpts = cjson.decode(parentRawOpts)
       removeJobsOnFail(parentQueuePrefix, parentFailedKey, parentId, parentOpts, timestamp)
@@ -430,6 +405,41 @@ local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, j
     end
   end
 end
+moveChildFromDependenciesIfNeeded = function (rawParentData, childKey, failedReason, timestamp)
+  if rawParentData then
+    local parentData = cjson.decode(rawParentData)
+    local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
+    local parentDependenciesChildrenKey = parentKey .. ":dependencies"
+    if parentData['fpof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        local parentUnsuccesssfulChildrenKey = parentKey .. ":unsuccessful"
+        rcall("ZADD", parentUnsuccesssfulChildrenKey, timestamp, childKey)
+        moveParentToFailedIfNeeded(
+          parentData['queueKey'],
+          parentKey,
+          parentData['id'],
+          childKey,
+          timestamp
+        )
+      end
+    elseif parentData['cpof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        local parentFailedChildrenKey = parentKey .. ":failed"
+        rcall("HSET", parentFailedChildrenKey, childKey, failedReason)
+        moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
+      end
+    elseif parentData['idof'] or parentData['rdof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        moveParentToWaitIfNeeded(parentData['queueKey'], parentDependenciesChildrenKey,
+          parentKey, parentData['id'], timestamp)
+        if parentData['idof'] then
+          local parentFailedChildrenKey = parentKey .. ":failed"
+          rcall("HSET", parentFailedChildrenKey, childKey, failedReason)
+        end
+      end
+    end
+  end
+end
 --[[
   Function to trim events, default 10000.
 ]]
@@ -504,35 +514,7 @@ if (#stalling > 0) then
                         rcall("HMSET", jobKey, "failedReason", failedReason, "finishedOn", timestamp)
                         rcall("XADD", eventStreamKey, "*", "event", "failed", "jobId", jobId, 'prev', 'active',
                             'failedReason', failedReason)
-                        if rawParentData then
-                            if opts['fpof'] or opts['cpof'] then
-                                local parentData = cjson.decode(rawParentData)
-                                -- TODO: need to remove this job from dependencies set in next breaking change
-                                -- no for now as it would imply a breaking change
-                                local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
-                                local unsuccesssfulSet = parentKey .. ":unsuccessful"
-                                rcall("ZADD", unsuccesssfulSet, timestamp, jobKey)
-                                if opts['fpof'] then
-                                    moveParentToFailedIfNeeded(parentData['queueKey'],
-                                        parentData['queueKey'] .. ':' .. parentData['id'], parentData['id'], jobKey,
-                                        timestamp)
-                                elseif opts['cpof'] then
-                                    moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
-                                end
-                            elseif opts['idof'] or opts['rdof'] then
-                                local parentData = cjson.decode(rawParentData)
-                                local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
-                                local dependenciesSet = parentKey .. ":dependencies"
-                                if rcall("SREM", dependenciesSet, jobKey) == 1 then
-                                    moveParentToWaitIfNeeded(parentData['queueKey'], dependenciesSet, parentKey,
-                                        parentData['id'], timestamp)
-                                    if opts['idof'] then
-                                        local failedSet = parentKey .. ":failed"
-                                        rcall("HSET", failedSet, jobKey, failedReason)
-                                    end
-                                end
-                            end
-                        end
+                        moveChildFromDependenciesIfNeeded(rawParentData, jobKey, failedReason, timestamp)
                         removeJobsOnFail(queueKeyPrefix, failedKey, jobId, opts, timestamp)
                         table.insert(failed, jobId)
                     else

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

@@ -1 +1 @@
-{"version":3,"file":"moveStalledJobsToWait-9.js","sourceRoot":"","sources":["../../../src/scripts/moveStalledJobsToWait-9.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+iBf,CAAC;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,uBAAuB;IAC7B,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}
+{"version":3,"file":"moveStalledJobsToWait-9.js","sourceRoot":"","sources":["../../../src/scripts/moveStalledJobsToWait-9.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6hBf,CAAC;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,uBAAuB;IAC7B,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAC"}

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

@@ -271,8 +271,8 @@ local function moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end
 local function moveParentToWaitIfNeeded(parentQueueKey, parentDependenciesKey, parentKey, parentId, timestamp)
-    local hasPendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
-    if hasPendingDependencies then
+    local doNotHavePendingDependencies = rcall("SCARD", parentDependenciesKey) == 0
+    if doNotHavePendingDependencies then
         moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
     end
 end
@@ -458,7 +458,9 @@ local function removeJobsOnFail(queueKeyPrefix, failedKey, jobId, opts, timestam
     end
   end 
 end
-local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
+local moveParentToFailedIfNeeded
+local moveChildFromDependenciesIfNeeded
+moveParentToFailedIfNeeded = function (parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
   if rcall("EXISTS", parentKey) == 1 then
     local parentWaitingChildrenKey = parentQueueKey .. ":waiting-children"
     local parentDelayedKey = parentQueueKey .. ":delayed"
@@ -486,34 +488,7 @@ local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, j
         failedReason, "prev", prevState)
       local jobAttributes = rcall("HMGET", parentKey, "parent", "deid", "opts")
       removeDeduplicationKeyIfNeeded(parentQueueKey .. ":", jobAttributes[2])
-      if jobAttributes[1] then
-        local parentData = cjson.decode(jobAttributes[1])
-        local grandParentKey = parentData['queueKey'] .. ':' .. parentData['id']
-        local grandParentUnsuccesssful = grandParentKey .. ":unsuccessful"
-        rcall("ZADD", grandParentUnsuccesssful, timestamp, parentKey)
-        if parentData['fpof'] then
-          moveParentToFailedIfNeeded(
-            parentData['queueKey'],
-            parentData['queueKey'] .. ':' .. parentData['id'],
-            parentData['id'],
-            parentKey,
-            timestamp
-          )
-        elseif parentData['cpof'] then
-          moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
-        elseif parentData['idof'] or parentData['rdof'] then
-          local grandParentKey = parentData['queueKey'] .. ':' .. parentData['id']
-          local grandParentDependenciesSet = grandParentKey .. ":dependencies"
-          if rcall("SREM", grandParentDependenciesSet, parentKey) == 1 then
-            moveParentToWaitIfNeeded(parentData['queueKey'], grandParentDependenciesSet,
-              grandParentKey, parentData['id'], timestamp)
-            if parentData['idof'] then
-              local grandParentFailedSet = grandParentKey .. ":failed"
-              rcall("HSET", grandParentFailedSet, parentKey, failedReason)
-            end
-          end
-        end
-      end
+      moveChildFromDependenciesIfNeeded(jobAttributes[1], parentKey, failedReason, timestamp)
       local parentRawOpts = jobAttributes[3]
       local parentOpts = cjson.decode(parentRawOpts)
       removeJobsOnFail(parentQueuePrefix, parentFailedKey, parentId, parentOpts, timestamp)
@@ -526,6 +501,41 @@ local function moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, j
     end
   end
 end
+moveChildFromDependenciesIfNeeded = function (rawParentData, childKey, failedReason, timestamp)
+  if rawParentData then
+    local parentData = cjson.decode(rawParentData)
+    local parentKey = parentData['queueKey'] .. ':' .. parentData['id']
+    local parentDependenciesChildrenKey = parentKey .. ":dependencies"
+    if parentData['fpof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        local parentUnsuccesssfulChildrenKey = parentKey .. ":unsuccessful"
+        rcall("ZADD", parentUnsuccesssfulChildrenKey, timestamp, childKey)
+        moveParentToFailedIfNeeded(
+          parentData['queueKey'],
+          parentKey,
+          parentData['id'],
+          childKey,
+          timestamp
+        )
+      end
+    elseif parentData['cpof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        local parentFailedChildrenKey = parentKey .. ":failed"
+        rcall("HSET", parentFailedChildrenKey, childKey, failedReason)
+        moveParentToWait(parentData['queueKey'], parentKey, parentData['id'], timestamp)
+      end
+    elseif parentData['idof'] or parentData['rdof'] then
+      if rcall("SREM", parentDependenciesChildrenKey, childKey) == 1 then
+        moveParentToWaitIfNeeded(parentData['queueKey'], parentDependenciesChildrenKey,
+          parentKey, parentData['id'], timestamp)
+        if parentData['idof'] then
+          local parentFailedChildrenKey = parentKey .. ":failed"
+          rcall("HSET", parentFailedChildrenKey, childKey, failedReason)
+        end
+      end
+    end
+  end
+end
 --[[
   Function to move job from wait state to active.
   Input:
@@ -682,7 +692,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- Make sure job exists
     local parentKey = jobAttributes[1] or ""
     local parentId = ""
     local parentQueueKey = ""
-    if jobAttributes[2] then
+    if jobAttributes[2] then -- TODO: need to revisit this logic if it's still needed
         local jsonDecodedParent = cjson.decode(jobAttributes[2])
         parentId = jsonDecodedParent['id']
         parentQueueKey = jsonDecodedParent['queueKey']
@@ -717,26 +727,7 @@ if rcall("EXISTS", jobIdKey) == 1 then -- Make sure job exists
                     timestamp)
             end
         else
-            if opts['fpof'] or opts['cpof'] then
-                local unsuccesssfulSet = parentKey .. ":unsuccessful"
-                rcall("ZADD", unsuccesssfulSet, timestamp, jobIdKey)
-                if opts['fpof'] then
-                    moveParentToFailedIfNeeded(parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
-                elseif opts['cpof'] then
-                    local failedSet = parentKey .. ":failed"
-                    rcall("HSET", failedSet, jobIdKey, ARGV[4])
-                    moveParentToWait(parentQueueKey, parentKey, parentId, timestamp)
-                end
-            elseif opts['idof'] or opts['rdof'] then
-                local dependenciesSet = parentKey .. ":dependencies"
-                if rcall("SREM", dependenciesSet, jobIdKey) == 1 then
-                    moveParentToWaitIfNeeded(parentQueueKey, dependenciesSet, parentKey, parentId, timestamp)
-                    if opts['idof'] then
-                        local failedSet = parentKey .. ":failed"
-                        rcall("HSET", failedSet, jobIdKey, ARGV[4])
-                    end
-                end
-            end
+            moveChildFromDependenciesIfNeeded(jobAttributes[2], jobIdKey, ARGV[4], timestamp)
         end
     end
     local attemptsMade = rcall("HINCRBY", jobIdKey, "atm", 1)

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAu0Bf,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8zBf,CAAC;AACF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,gBAAgB;IACtB,OAAO;IACP,IAAI,EAAE,EAAE;CACT,CAAC"}