@tachybase/plugin-adapter-bullmq 1.3.24 → 1.4.0

package/dist/node_modules/bullmq/dist/cjs/commands/moveStalledJobsToWait-8.lua

@@ -25,6 +25,7 @@ local rcall = redis.call
 --- @include "includes/addJobInTargetList"
 --- @include "includes/batches"
 --- @include "includes/getTargetQueueList"
+--- @include "includes/moveJobToWait"
 --- @include "includes/trimEvents"
 
 local stalledKey = KEYS[1]
@@ -73,20 +74,11 @@ if (#stalling > 0) then
                     -- If this job has been stalled too many times, such as if it crashes the worker, then fail it.
                     local stalledCount = rcall("HINCRBY", jobKey, "stc", 1)
                     if stalledCount > maxStalledJobCount then
-                        local jobAttributes = rcall("HMGET", jobKey, "opts", "parent")
-                        local rawOpts = jobAttributes[1]
-                        local rawParentData = jobAttributes[2]
-                        local opts = cjson.decode(rawOpts)
-
                         local failedReason = "job stalled more than allowable limit"
                         rcall("HSET", jobKey, "defa", failedReason)
                     end
-                    local target, isPausedOrMaxed = getTargetQueueList(metaKey, activeKey, waitKey, pausedKey)
-
-                    -- Move the job back to the wait queue, to immediately be picked up by a waiting worker.
-                    addJobInTargetList(target, markerKey, "RPUSH", isPausedOrMaxed, jobId)
-
-                    rcall("XADD", eventStreamKey, "*", "event", "waiting", "jobId", jobId, 'prev', 'active')
+                    moveJobToWait(metaKey, activeKey, waitKey, pausedKey, markerKey, eventStreamKey, jobId,
+                        "RPUSH")
 
                     -- Emit the stalled event
                     rcall("XADD", eventStreamKey, "*", "event", "stalled", "jobId", jobId)

package/dist/node_modules/bullmq/dist/cjs/commands/{moveToWaitingChildren-8.lua → moveToWaitingChildren-7.lua}

@@ -8,8 +8,7 @@
     KEYS[4] job dependencies key
     KEYS[5] job unsuccessful key
     KEYS[6] stalled key
-    KEYS[7] failed key
-    KEYS[8] events key
+    KEYS[7] events key
 
     ARGV[1] token
     ARGV[2] child key
@@ -23,6 +22,7 @@
    -1 - Missing job.
    -2 - Missing lock
    -3 - Job not in active set
+   -9 - Job has failed children
 ]]
 local rcall = redis.call
 local activeKey = KEYS[1]
@@ -31,71 +31,60 @@ local jobKey = KEYS[3]
 local jobDependenciesKey = KEYS[4]
 local jobUnsuccessfulKey = KEYS[5]
 local stalledKey = KEYS[6]
-local failedKey = KEYS[7]
+local eventStreamKey = KEYS[7]
+local token = ARGV[1]
 local timestamp = ARGV[3]
 local jobId = ARGV[4]
 
 --- Includes
---- @include "includes/moveChildFromDependenciesIfNeeded"
---- @include "includes/removeDeduplicationKeyIfNeededOnFinalization"
---- @include "includes/removeJobsOnFail"
 --- @include "includes/removeLock"
 
-local function moveToWaitingChildren(activeKey, waitingChildrenKey, jobId,
-    timestamp)
-  local score = tonumber(timestamp)
+local function removeJobFromActive(activeKey, stalledKey, jobKey, jobId,
+    token)
+  local errorCode = removeLock(jobKey, stalledKey, token, jobId)
+  if errorCode < 0 then
+    return errorCode
+  end
 
   local numRemovedElements = rcall("LREM", activeKey, -1, jobId)
 
-  if(numRemovedElements < 1) then
+  if numRemovedElements < 1 then
     return -3
   end
 
-  rcall("ZADD", waitingChildrenKey, score, jobId)
-
   return 0
 end
 
-if rcall("EXISTS", jobKey) == 1 then
-  if rcall("ZCARD", jobUnsuccessfulKey) ~= 0 then
-    -- TODO: refactor this logic in an include later
-    local jobAttributes = rcall("HMGET", jobKey, "parent", "deid", "opts")
-
-    removeDeduplicationKeyIfNeededOnFinalization(ARGV[5], jobAttributes[2], jobId)
-  
-    local failedReason = "children are failed"
-    rcall("ZADD", failedKey, timestamp, jobId)
-    rcall("HSET", jobKey, "finishedOn", timestamp)
-    rcall("XADD", KEYS[8], "*", "event", "failed", "jobId", jobId, "failedReason",
-      failedReason, "prev", "active")
+local function moveToWaitingChildren(activeKey, waitingChildrenKey, stalledKey, eventStreamKey,
+    jobKey, jobId, timestamp, token)
+  local errorCode = removeJobFromActive(activeKey, stalledKey, jobKey, jobId, token)
+  if errorCode < 0 then
+    return errorCode
+  end
 
-    local rawParentData = jobAttributes[1]
-    local rawOpts = jobAttributes[3]
-    local opts = cjson.decode(rawOpts)
+  local score = tonumber(timestamp)
 
-    moveChildFromDependenciesIfNeeded(rawParentData, jobKey, failedReason, timestamp)
+  rcall("ZADD", waitingChildrenKey, score, jobId)
+  rcall("XADD", eventStreamKey, "*", "event", "waiting-children", "jobId", jobId, 'prev', 'active')
 
-    removeJobsOnFail(ARGV[5], failedKey, jobId, opts, timestamp)
+  return 0
+end
 
-    return 0
+if rcall("EXISTS", jobKey) == 1 then
+  if rcall("ZCARD", jobUnsuccessfulKey) ~= 0 then
+    return -9
   else
     if ARGV[2] ~= "" then
       if rcall("SISMEMBER", jobDependenciesKey, ARGV[2]) ~= 0 then
-        local errorCode = removeLock(jobKey, stalledKey, ARGV[1], jobId)
-        if errorCode < 0 then
-          return errorCode
-        end
-        return moveToWaitingChildren(activeKey, waitingChildrenKey, jobId, timestamp)
+        return moveToWaitingChildren(activeKey, waitingChildrenKey, stalledKey, eventStreamKey,
+          jobKey, jobId, timestamp, token)
       end
   
       return 1
     else
       if rcall("SCARD", jobDependenciesKey) ~= 0 then 
-        local errorCode = removeLock(jobKey, stalledKey, ARGV[1], jobId)
-        if errorCode < 0 then
-          return errorCode
-        end
-        return moveToWaitingChildren(activeKey, waitingChildrenKey, jobId, timestamp)
+        return moveToWaitingChildren(activeKey, waitingChildrenKey, stalledKey, eventStreamKey,
+          jobKey, jobId, timestamp, token)
       end
   
       return 1

package/dist/node_modules/bullmq/dist/cjs/enums/error-code.js

@@ -11,6 +11,6 @@ var ErrorCode;
     ErrorCode[ErrorCode["JobLockMismatch"] = -6] = "JobLockMismatch";
     ErrorCode[ErrorCode["ParentJobCannotBeReplaced"] = -7] = "ParentJobCannotBeReplaced";
     ErrorCode[ErrorCode["JobBelongsToJobScheduler"] = -8] = "JobBelongsToJobScheduler";
-    ErrorCode[ErrorCode["JobFailedChildren"] = -9] = "JobFailedChildren";
+    ErrorCode[ErrorCode["JobHasFailedChildren"] = -9] = "JobHasFailedChildren";
 })(ErrorCode = exports.ErrorCode || (exports.ErrorCode = {}));
 //# sourceMappingURL=error-code.js.map