@tachybase/plugin-adapter-bullmq 1.3.17 → 1.3.18

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

@@ -0,0 +1,106 @@
+--[[
+  Moves job from active to waiting children set.
+
+  Input:
+    KEYS[1] active key
+    KEYS[2] wait-children key
+    KEYS[3] job key
+    KEYS[4] job dependencies key
+    KEYS[5] job unsuccessful key
+    KEYS[6] stalled key
+    KEYS[7] failed key
+    KEYS[8] events key
+
+    ARGV[1] token
+    ARGV[2] child key
+    ARGV[3] timestamp
+    ARGV[4] jobId
+    ARGV[5] prefix
+
+  Output:
+    0 - OK
+    1 - There are not pending dependencies.
+   -1 - Missing job.
+   -2 - Missing lock
+   -3 - Job not in active set
+]]
+local rcall = redis.call
+local activeKey = KEYS[1]
+local waitingChildrenKey = KEYS[2]
+local jobKey = KEYS[3]
+local jobDependenciesKey = KEYS[4]
+local jobUnsuccessfulKey = KEYS[5]
+local stalledKey = KEYS[6]
+local failedKey = KEYS[7]
+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 numRemovedElements = rcall("LREM", activeKey, -1, jobId)
+
+  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 rawParentData = jobAttributes[1]
+    local rawOpts = jobAttributes[3]
+    local opts = cjson.decode(rawOpts)
+
+    moveChildFromDependenciesIfNeeded(rawParentData, jobKey, failedReason, timestamp)
+
+    removeJobsOnFail(ARGV[5], failedKey, jobId, opts, timestamp)
+
+    return 0
+  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)
+      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)
+      end
+  
+      return 1
+    end    
+  end
+end
+
+return -1

package/dist/node_modules/bullmq/dist/cjs/commands/removeJob-2.lua

@@ -1,13 +1,14 @@
 --[[
-    Remove a job from all the queues it may be in as well as all its data.
+    Remove a job from all the statuses it may be in as well as all its data.
     In order to be able to remove a job, it cannot be active.
 
     Input:
-      KEYS[1] queue prefix
-      KEYS[2] meta key
+      KEYS[1] jobKey
+      KEYS[2] repeat key
 
       ARGV[1] jobId
       ARGV[2] remove children
+      ARGV[3] queue prefix
 
     Events:
       'removed'
@@ -16,77 +17,28 @@
 local rcall = redis.call
 
 -- Includes
---- @include "includes/destructureJobKey"
---- @include "includes/getOrSetMaxEvents"
+--- @include "includes/isJobSchedulerJob"
 --- @include "includes/isLocked"
---- @include "includes/removeDeduplicationKey"
---- @include "includes/removeJobFromAnyState"
---- @include "includes/removeJobKeys"
---- @include "includes/removeParentDependencyKey"
+--- @include "includes/removeJobWithChildren"
 
-local function removeJob(prefix, jobId, parentKey, removeChildren)
-    local jobKey = prefix .. jobId;
-
-    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
-        -- if some job is locked we must exit with and error.
-        -- local countProcessed = rcall("HLEN", jobKey .. ":processed")
-        local processed = rcall("HGETALL", jobKey .. ":processed")
-
-        if (#processed > 0) then
-            for i = 1, #processed, 2 do
-                local childJobId = getJobIdFromKey(processed[i])
-                local childJobPrefix = getJobKeyPrefix(processed[i], childJobId)
-                removeJob(childJobPrefix, childJobId, jobKey, removeChildren)
-            end
-        end
-
-        local dependencies = rcall("SMEMBERS", jobKey .. ":dependencies")
-        if (#dependencies > 0) then
-            for i, childJobKey in ipairs(dependencies) do
-                -- We need to get the jobId for this job.
-                local childJobId = getJobIdFromKey(childJobKey)
-                local childJobPrefix = getJobKeyPrefix(childJobKey, childJobId)
-                removeJob(childJobPrefix, childJobId, jobKey, removeChildren)
-            end
-        end
-
-        local failed = rcall("HGETALL", jobKey .. ":failed")
-
-        if (#failed > 0) then
-            for i = 1, #failed, 2 do
-                local childJobId = getJobIdFromKey(failed[i])
-                local childJobPrefix = getJobKeyPrefix(failed[i], childJobId)
-                removeJob(childJobPrefix, childJobId, jobKey, removeChildren)
-            end
-        end
-    end
-
-    local prev = removeJobFromAnyState(prefix, jobId)
-
-    removeDeduplicationKey(prefix, jobKey)
-    if removeJobKeys(jobKey) > 0 then
-        local maxEvents = getOrSetMaxEvents(KEYS[2])
-        rcall("XADD", prefix .. "events", "MAXLEN", "~", maxEvents, "*", "event", "removed", "jobId", jobId, "prev",
-            prev)
-    end
-end
-
-local prefix = KEYS[1]
 local jobId = ARGV[1]
 local shouldRemoveChildren = ARGV[2]
-local jobKey = prefix .. jobId
+local prefix = ARGV[3]
+local jobKey = KEYS[1]
+local repeatKey = KEYS[2]
 
--- Check if the job belongs to a job scheduler and it is in delayed state.
-if rcall("ZSCORE", prefix .. "delayed", jobId) and rcall("HGET", jobKey, "rjk") then
-    return -8 -- Return error code as the job is part of a job scheduler and is in delayed state.
+if isJobSchedulerJob(jobId, jobKey, repeatKey) then
+    return -8
 end
 
 if not isLocked(prefix, jobId, shouldRemoveChildren) then
-    removeJob(prefix, jobId, nil, shouldRemoveChildren)
+    local options = {
+        removeChildren = shouldRemoveChildren == "1",
+        ignoreProcessed = false,
+        ignoreLocked = false
+    }
+
+    removeJobWithChildren(prefix, jobId, nil, options)
     return 1
 end
 return 0

package/dist/node_modules/bullmq/dist/cjs/commands/removeJobScheduler-3.lua

@@ -1,6 +1,6 @@
 
 --[[
-  Removes a repeatable job
+  Removes a job scheduler and its next scheduled job.
   Input:
     KEYS[1] job schedulers key
     KEYS[2] delayed jobs key

package/dist/node_modules/bullmq/dist/cjs/commands/removeUnprocessedChildren-2.lua

@@ -0,0 +1,31 @@
+--[[
+    Remove a job from all the statuses it may be in as well as all its data.
+    In order to be able to remove a job, it cannot be active.
+
+    Input:
+      KEYS[1] jobKey
+      KEYS[2] meta key
+      
+      ARGV[1] prefix
+      ARGV[2] jobId
+
+    Events:
+      'removed' for every children removed
+]]
+
+-- Includes
+--- @include "includes/removeJobWithChildren"
+
+local prefix = ARGV[1]
+local jobId = ARGV[2]
+
+local jobKey = KEYS[1]
+local metaKey = KEYS[2]
+
+local options = {
+  removeChildren = "1",
+  ignoreProcessed = true,
+  ignoreLocked = true
+}
+
+removeJobChildren(prefix, jobKey, options) 

package/dist/node_modules/bullmq/dist/cjs/commands/retryJob-11.lua

@@ -19,6 +19,7 @@
       ARGV[3]  pushCmd
       ARGV[4]  jobId
       ARGV[5]  token
+      ARGV[6]  optional job fields to update
 
     Events:
       'waiting'
@@ -36,9 +37,10 @@ local rcall = redis.call
 --- @include "includes/addJobWithPriority"
 --- @include "includes/getOrSetMaxEvents"
 --- @include "includes/getTargetQueueList"
+--- @include "includes/isQueuePausedOrMaxed"
 --- @include "includes/promoteDelayedJobs"
 --- @include "includes/removeLock"
---- @include "includes/isQueuePausedOrMaxed"
+--- @include "includes/updateJobFields"
 
 local target, isPausedOrMaxed = getTargetQueueList(KEYS[5], KEYS[1], KEYS[2], KEYS[3])
 local markerKey = KEYS[10]
@@ -47,16 +49,20 @@ local markerKey = KEYS[10]
 -- test example: when there are delayed jobs between retries
 promoteDelayedJobs(KEYS[7], markerKey, target, KEYS[8], KEYS[6], ARGV[1], ARGV[2], KEYS[9], isPausedOrMaxed)
 
-if rcall("EXISTS", KEYS[4]) == 1 then
-  local errorCode = removeLock(KEYS[4], KEYS[11], ARGV[5], ARGV[4]) 
+local jobKey = KEYS[4]
+
+if rcall("EXISTS", jobKey) == 1 then
+  local errorCode = removeLock(jobKey, KEYS[11], ARGV[5], ARGV[4]) 
   if errorCode < 0 then
     return errorCode
   end
 
+  updateJobFields(jobKey, ARGV[6])
+
   local numRemovedElements = rcall("LREM", KEYS[1], -1, ARGV[4])
   if (numRemovedElements < 1) then return -3 end
 
-  local priority = tonumber(rcall("HGET", KEYS[4], "priority")) or 0
+  local priority = tonumber(rcall("HGET", jobKey, "priority")) or 0
 
   --need to re-evaluate after removing job from active
   isPausedOrMaxed = isQueuePausedOrMaxed(KEYS[5], KEYS[1])
@@ -68,7 +74,7 @@ if rcall("EXISTS", KEYS[4]) == 1 then
     addJobWithPriority(markerKey, KEYS[8], priority, ARGV[4], KEYS[9], isPausedOrMaxed)
   end
 
-  rcall("HINCRBY", KEYS[4], "atm", 1)
+  rcall("HINCRBY", jobKey, "atm", 1)
 
   local maxEvents = getOrSetMaxEvents(KEYS[5])
 

package/dist/node_modules/bullmq/dist/cjs/commands/updateJobScheduler-12.lua

@@ -0,0 +1,90 @@
+--[[
+  Updates a job scheduler and adds next delayed job
+
+  Input:
+    KEYS[1]  'repeat' key
+    KEYS[2]  'delayed'
+    KEYS[3]  'wait' key
+    KEYS[4]  'paused' key
+    KEYS[5]  'meta'
+    KEYS[6]  'prioritized' key
+    KEYS[7]  'marker',
+    KEYS[8]  'id'
+    KEYS[9]  events stream key
+    KEYS[10] 'pc' priority counter
+    KEYS[11] producer key
+    KEYS[12] 'active' key
+
+    ARGV[1] next milliseconds
+    ARGV[2] jobs scheduler id
+    ARGV[3] Json stringified delayed data
+    ARGV[4] msgpacked delayed opts
+    ARGV[5] timestamp
+    ARGV[6] prefix key
+    ARGV[7] producer id
+
+    Output:
+      next delayed job id  - OK
+]]
+local rcall = redis.call
+local repeatKey = KEYS[1]
+local delayedKey = KEYS[2]
+local waitKey = KEYS[3]
+local pausedKey = KEYS[4]
+local metaKey = KEYS[5]
+local prioritizedKey = KEYS[6]
+local nextMillis = ARGV[1]
+local jobSchedulerId = ARGV[2]
+local timestamp = ARGV[5]
+local prefixKey = ARGV[6]
+local producerId = ARGV[7]
+
+-- Includes
+--- @include "includes/addJobFromScheduler"
+--- @include "includes/getOrSetMaxEvents"
+
+local schedulerKey = repeatKey .. ":" .. jobSchedulerId
+local nextDelayedJobId = "repeat:" .. jobSchedulerId .. ":" .. nextMillis
+local nextDelayedJobKey = schedulerKey .. ":" .. nextMillis
+
+-- Validate that scheduler exists.
+local prevMillis = rcall("ZSCORE", repeatKey, jobSchedulerId)
+if prevMillis then
+    local currentDelayedJobId = "repeat:" .. jobSchedulerId .. ":" .. prevMillis
+
+    if producerId == currentDelayedJobId then
+        local eventsKey = KEYS[9]
+        local maxEvents = getOrSetMaxEvents(metaKey)
+
+        if rcall("EXISTS", nextDelayedJobKey) ~= 1 then
+            local schedulerAttributes = rcall("HMGET", schedulerKey, "name", "data")
+
+            rcall("ZADD", repeatKey, nextMillis, jobSchedulerId)
+            rcall("HINCRBY", schedulerKey, "ic", 1)
+
+            rcall("INCR", KEYS[8])
+
+            -- TODO: remove this workaround in next breaking change,
+            -- all job-schedulers must save job data
+            local templateData = schedulerAttributes[2] or ARGV[3]
+
+            if templateData and templateData ~= '{}' then
+                rcall("HSET", schedulerKey, "data", templateData)
+            end
+
+            addJobFromScheduler(nextDelayedJobKey, nextDelayedJobId, ARGV[4], waitKey, pausedKey, 
+                KEYS[12], metaKey, prioritizedKey, KEYS[10], delayedKey, KEYS[7], eventsKey, 
+                schedulerAttributes[1], maxEvents, ARGV[5], templateData or '{}', jobSchedulerId)
+
+            -- TODO: remove this workaround in next breaking change
+            if KEYS[11] ~= "" then
+                rcall("HSET", KEYS[11], "nrjid", nextDelayedJobId)
+            end
+
+            return nextDelayedJobId .. "" -- convert to string
+        else
+            rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event",
+                "duplicated", "jobId", nextDelayedJobId)
+        end
+    end
+end

package/dist/node_modules/bullmq/dist/cjs/commands/updateRepeatableJobMillis-1.lua

@@ -17,7 +17,7 @@ local nextMillis = ARGV[1]
 local customKey = ARGV[2]
 local legacyCustomKey = ARGV[3]
 
-if rcall("ZSCORE", repeatKey, customKey) ~= false then
+if rcall("ZSCORE", repeatKey, customKey) then
     rcall("ZADD", repeatKey, nextMillis, customKey)
     return customKey
 elseif rcall("ZSCORE", repeatKey, legacyCustomKey) ~= false then

package/dist/node_modules/bullmq/dist/cjs/enums/child-command.js

@@ -6,5 +6,7 @@ var ChildCommand;
     ChildCommand[ChildCommand["Init"] = 0] = "Init";
     ChildCommand[ChildCommand["Start"] = 1] = "Start";
     ChildCommand[ChildCommand["Stop"] = 2] = "Stop";
+    ChildCommand[ChildCommand["GetChildrenValuesResponse"] = 3] = "GetChildrenValuesResponse";
+    ChildCommand[ChildCommand["GetIgnoredChildrenFailuresResponse"] = 4] = "GetIgnoredChildrenFailuresResponse";
 })(ChildCommand = exports.ChildCommand || (exports.ChildCommand = {}));
 //# sourceMappingURL=child-command.js.map

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

@@ -6,10 +6,11 @@ var ErrorCode;
     ErrorCode[ErrorCode["JobNotExist"] = -1] = "JobNotExist";
     ErrorCode[ErrorCode["JobLockNotExist"] = -2] = "JobLockNotExist";
     ErrorCode[ErrorCode["JobNotInState"] = -3] = "JobNotInState";
-    ErrorCode[ErrorCode["JobPendingDependencies"] = -4] = "JobPendingDependencies";
+    ErrorCode[ErrorCode["JobPendingChildren"] = -4] = "JobPendingChildren";
     ErrorCode[ErrorCode["ParentJobNotExist"] = -5] = "ParentJobNotExist";
     ErrorCode[ErrorCode["JobLockMismatch"] = -6] = "JobLockMismatch";
     ErrorCode[ErrorCode["ParentJobCannotBeReplaced"] = -7] = "ParentJobCannotBeReplaced";
     ErrorCode[ErrorCode["JobBelongsToJobScheduler"] = -8] = "JobBelongsToJobScheduler";
+    ErrorCode[ErrorCode["JobFailedChildren"] = -9] = "JobFailedChildren";
 })(ErrorCode = exports.ErrorCode || (exports.ErrorCode = {}));
 //# sourceMappingURL=error-code.js.map

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

@@ -10,7 +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["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