@tachybase/plugin-adapter-bullmq 1.3.17 → 1.3.18

package/dist/node_modules/bullmq/dist/esm/scripts/drain-5.js

@@ -8,6 +8,7 @@ const content = `--[[
     KEYS[4] 'prioritized'
     KEYS[5] 'jobschedulers' (repeat)
     ARGV[1]  queue key prefix
+    ARGV[2]  should clean delayed jobs
 ]]
 local rcall = redis.call
 local queueBaseKey = ARGV[1]
@@ -15,6 +16,18 @@ local queueBaseKey = ARGV[1]
   Functions to remove jobs.
 ]]
 -- Includes
+--[[
+  Function to filter out jobs to ignore from a table.
+]]
+local function filterOutJobsToIgnore(jobs, jobsToIgnore)
+  local filteredJobs = {}
+  for i = 1, #jobs do
+    if not jobsToIgnore[jobs[i]] then
+      table.insert(filteredJobs, jobs[i])
+    end
+  end
+  return filteredJobs
+end
 --[[
   Functions to remove jobs.
 ]]
@@ -24,21 +37,26 @@ local queueBaseKey = ARGV[1]
 ]]
 -- Includes
 --[[
-  Function to remove deduplication key.
+  Function to remove deduplication key if needed
+  when a job is being removed.
 ]]
-local function removeDeduplicationKey(prefixKey, jobKey)
+local function removeDeduplicationKeyIfNeededOnRemoval(prefixKey,
+  jobKey, jobId)
   local deduplicationId = rcall("HGET", jobKey, "deid")
   if deduplicationId then
     local deduplicationKey = prefixKey .. "de:" .. deduplicationId
-    rcall("DEL", deduplicationKey)
+    local currentJobId = rcall('GET', deduplicationKey)
+    if currentJobId and currentJobId == jobId then
+      return rcall("DEL", deduplicationKey)
+    end
   end
 end
 --[[
   Function to remove job keys.
 ]]
 local function removeJobKeys(jobKey)
-  return rcall("DEL", jobKey, jobKey .. ':logs',
-    jobKey .. ':dependencies', jobKey .. ':processed', jobKey .. ':failed')
+  return rcall("DEL", jobKey, jobKey .. ':logs', jobKey .. ':dependencies',
+    jobKey .. ':processed', jobKey .. ':failed', jobKey .. ':unsuccessful')
 end
 --[[
   Check if this job has a parent. If so we will just remove it from
@@ -92,7 +110,7 @@ local function getTargetQueueList(queueMetaKey, activeKey, waitKey, pausedKey)
   end
   return waitKey, false
 end
-local function moveParentToWait(parentPrefix, parentId, emitEvent)
+local function _moveParentToWait(parentPrefix, parentId, emitEvent)
   local parentTarget, isPausedOrMaxed = getTargetQueueList(parentPrefix .. "meta", parentPrefix .. "active",
     parentPrefix .. "wait", parentPrefix .. "paused")
   addJobInTargetList(parentTarget, parentPrefix .. "marker", "RPUSH", isPausedOrMaxed, parentId)
@@ -120,10 +138,10 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey, debou
                 rcall("DEL", parentPrefix .. "de:" .. debounceId)
               end
             else
-              moveParentToWait(parentPrefix, parentId)
+              _moveParentToWait(parentPrefix, parentId)
             end
           else
-            moveParentToWait(parentPrefix, parentId, true)
+            _moveParentToWait(parentPrefix, parentId, true)
           end
         end
       end
@@ -151,10 +169,10 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey, debou
                   rcall("DEL", parentPrefix .. "de:" .. parentAttributes[2])
                 end
               else
-                moveParentToWait(parentPrefix, parentId)
+                _moveParentToWait(parentPrefix, parentId)
               end
             else
-              moveParentToWait(parentPrefix, parentId, true)
+              _moveParentToWait(parentPrefix, parentId, true)
             end
           end
         end
@@ -168,7 +186,7 @@ local function removeJob(jobId, hard, baseKey, shouldRemoveDeduplicationKey)
   local jobKey = baseKey .. jobId
   removeParentDependencyKey(jobKey, hard, nil, baseKey)
   if shouldRemoveDeduplicationKey then
-    removeDeduplicationKey(baseKey, jobKey)
+    removeDeduplicationKeyIfNeededOnRemoval(baseKey, jobKey, jobId)
   end
   removeJobKeys(jobKey)
 end
@@ -181,8 +199,11 @@ end
 local function getListItems(keyName, max)
   return rcall('LRANGE', keyName, 0, max - 1)
 end
-local function removeListJobs(keyName, hard, baseKey, max)
+local function removeListJobs(keyName, hard, baseKey, max, jobsToIgnore)
   local jobs = getListItems(keyName, max)
+  if jobsToIgnore then
+    jobs = filterOutJobsToIgnore(jobs, jobsToIgnore)
+  end
   local count = removeJobs(jobs, hard, baseKey, max)
   rcall("LTRIM", keyName, #jobs, -1)
   return count
@@ -212,15 +233,8 @@ local function getZSetItems(keyName, max)
 end
 local function removeZSetJobs(keyName, hard, baseKey, max, jobsToIgnore)
   local jobs = getZSetItems(keyName, max)
-  -- filter out jobs to ignore
   if jobsToIgnore then
-    local filteredJobs = {}
-    for i = 1, #jobs do
-      if not jobsToIgnore[jobs[i]] then
-        table.insert(filteredJobs, jobs[i])
-      end
-    end
-    jobs = filteredJobs
+    jobs = filterOutJobsToIgnore(jobs, jobsToIgnore)
   end
   local count = removeJobs(jobs, hard, baseKey, max)
   if(#jobs > 0) then
@@ -230,22 +244,22 @@ local function removeZSetJobs(keyName, hard, baseKey, max, jobsToIgnore)
   end
   return count
 end
-removeListJobs(KEYS[1], true, queueBaseKey, 0) -- wait
-removeListJobs(KEYS[2], true, queueBaseKey, 0) -- paused
-if KEYS[3] ~= "" then
-    -- We must not remove delayed jobs if they are associated to a job scheduler.
-    local scheduledJobs = {}
-    local jobSchedulers = rcall("ZRANGE", KEYS[5], 0, -1, "WITHSCORES")
-    -- For every job scheduler, get the current delayed job id.
-    for i = 1, #jobSchedulers, 2 do
-        local jobSchedulerId = jobSchedulers[i]
-        local jobSchedulerMillis = jobSchedulers[i + 1]
-        local delayedJobId = "repeat:" .. jobSchedulerId .. ":" .. jobSchedulerMillis
-        scheduledJobs[delayedJobId] = true
-    end
-    removeZSetJobs(KEYS[3], true, queueBaseKey, 0, scheduledJobs) -- delayed
+-- We must not remove delayed jobs if they are associated to a job scheduler.
+local scheduledJobs = {}
+local jobSchedulers = rcall("ZRANGE", KEYS[5], 0, -1, "WITHSCORES")
+-- For every job scheduler, get the current delayed job id.
+for i = 1, #jobSchedulers, 2 do
+    local jobSchedulerId = jobSchedulers[i]
+    local jobSchedulerMillis = jobSchedulers[i + 1]
+    local delayedJobId = "repeat:" .. jobSchedulerId .. ":" .. jobSchedulerMillis
+    scheduledJobs[delayedJobId] = true
+end
+removeListJobs(KEYS[1], true, queueBaseKey, 0, scheduledJobs) -- wait
+removeListJobs(KEYS[2], true, queueBaseKey, 0, scheduledJobs) -- paused
+if ARGV[2] == "1" then
+  removeZSetJobs(KEYS[3], true, queueBaseKey, 0, scheduledJobs) -- delayed
 end
-removeZSetJobs(KEYS[4], true, queueBaseKey, 0) -- prioritized
+removeZSetJobs(KEYS[4], true, queueBaseKey, 0, scheduledJobs) -- prioritized
 `;
 export const drain = {
     name: 'drain',

package/dist/node_modules/bullmq/dist/esm/scripts/getDependencyCounts-4.d.ts

@@ -0,0 +1,5 @@
+export declare const getDependencyCounts: {
+    name: string;
+    content: string;
+    keys: number;
+};

package/dist/node_modules/bullmq/dist/esm/scripts/getDependencyCounts-4.js

@@ -0,0 +1,34 @@
+const content = `--[[
+  Get counts per child states
+    Input:
+      KEYS[1]    processed key
+      KEYS[2]    unprocessed key
+      KEYS[3]    ignored key
+      KEYS[4]    failed key
+      ARGV[1...] types
+]]
+local rcall = redis.call;
+local processedKey = KEYS[1]
+local unprocessedKey = KEYS[2]
+local ignoredKey = KEYS[3]
+local failedKey = KEYS[4]
+local results = {}
+for i = 1, #ARGV do
+  if ARGV[i] == "processed" then
+    results[#results+1] = rcall("HLEN", processedKey)
+  elseif ARGV[i] == "unprocessed" then
+    results[#results+1] = rcall("SCARD", unprocessedKey)
+  elseif ARGV[i] == "ignored" then
+    results[#results+1] = rcall("HLEN", ignoredKey)
+  else
+    results[#results+1] = rcall("ZCARD", failedKey)
+  end
+end
+return results
+`;
+export const getDependencyCounts = {
+    name: 'getDependencyCounts',
+    content,
+    keys: 4,
+};
+//# sourceMappingURL=getDependencyCounts-4.js.map

package/dist/node_modules/bullmq/dist/esm/scripts/getState-8.js

@@ -21,16 +21,16 @@ const content = `--[[
     'unknown'
 ]]
 local rcall = redis.call
-if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[1], ARGV[1]) then
   return "completed"
 end
-if rcall("ZSCORE", KEYS[2], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[2], ARGV[1]) then
   return "failed"
 end
-if rcall("ZSCORE", KEYS[3], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[3], ARGV[1]) then
   return "delayed"
 end
-if rcall("ZSCORE", KEYS[8], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[8], ARGV[1]) then
   return "prioritized"
 end
 -- Includes
@@ -57,7 +57,7 @@ local paused_items = rcall("LRANGE", KEYS[6] , 0, -1)
 if checkItemInList(paused_items, ARGV[1]) ~= nil then
   return "waiting"
 end
-if rcall("ZSCORE", KEYS[7], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[7], ARGV[1]) then
   return "waiting-children"
 end
 return "unknown"

package/dist/node_modules/bullmq/dist/esm/scripts/getStateV2-8.js

@@ -20,28 +20,28 @@ const content = `--[[
     'unknown'
 ]]
 local rcall = redis.call
-if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[1], ARGV[1]) then
   return "completed"
 end
-if rcall("ZSCORE", KEYS[2], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[2], ARGV[1]) then
   return "failed"
 end
-if rcall("ZSCORE", KEYS[3], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[3], ARGV[1]) then
   return "delayed"
 end
-if rcall("ZSCORE", KEYS[8], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[8], ARGV[1]) then
   return "prioritized"
 end
-if rcall("LPOS", KEYS[4] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[4] , ARGV[1]) then
   return "active"
 end
-if rcall("LPOS", KEYS[5] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[5] , ARGV[1]) then
   return "waiting"
 end
-if rcall("LPOS", KEYS[6] , ARGV[1]) ~= false then
+if rcall("LPOS", KEYS[6] , ARGV[1]) then
   return "waiting"
 end
-if rcall("ZSCORE", KEYS[7] , ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[7] , ARGV[1]) then
   return "waiting-children"
 end
 return "unknown"

package/dist/node_modules/bullmq/dist/esm/scripts/index.d.ts

@@ -1,10 +1,10 @@
 export * from './addDelayedJob-6';
-export * from './addJobScheduler-2';
+export * from './addJobScheduler-11';
 export * from './addLog-2';
-export * from './addParentJob-4';
-export * from './addPrioritizedJob-8';
+export * from './addParentJob-5';
+export * from './addPrioritizedJob-9';
 export * from './addRepeatableJob-2';
-export * from './addStandardJob-8';
+export * from './addStandardJob-9';
 export * from './changeDelay-4';
 export * from './changePriority-7';
 export * from './cleanJobsInSet-3';
@@ -13,6 +13,7 @@ export * from './extendLock-2';
 export * from './extendLocks-1';
 export * from './getCounts-1';
 export * from './getCountsPerPriority-4';
+export * from './getDependencyCounts-4';
 export * from './getJobScheduler-1';
 export * from './getRanges-1';
 export * from './getRateLimitTtl-1';
@@ -21,13 +22,13 @@ export * from './getStateV2-8';
 export * from './isFinished-3';
 export * from './isJobInList-1';
 export * from './isMaxed-2';
-export * from './moveJobFromActiveToWait-10';
+export * from './moveJobFromActiveToWait-9';
 export * from './moveJobsToWait-8';
-export * from './moveStalledJobsToWait-9';
+export * from './moveStalledJobsToWait-8';
 export * from './moveToActive-11';
 export * from './moveToDelayed-8';
 export * from './moveToFinished-14';
-export * from './moveToWaitingChildren-5';
+export * from './moveToWaitingChildren-8';
 export * from './obliterate-2';
 export * from './paginate-1';
 export * from './pause-7';
@@ -37,9 +38,11 @@ export * from './removeChildDependency-1';
 export * from './removeJob-2';
 export * from './removeJobScheduler-3';
 export * from './removeRepeatable-3';
+export * from './removeUnprocessedChildren-2';
 export * from './reprocessJob-8';
 export * from './retryJob-11';
 export * from './saveStacktrace-1';
 export * from './updateData-1';
+export * from './updateJobScheduler-12';
 export * from './updateProgress-3';
 export * from './updateRepeatableJobMillis-1';

package/dist/node_modules/bullmq/dist/esm/scripts/index.js

@@ -1,10 +1,10 @@
 export * from './addDelayedJob-6';
-export * from './addJobScheduler-2';
+export * from './addJobScheduler-11';
 export * from './addLog-2';
-export * from './addParentJob-4';
-export * from './addPrioritizedJob-8';
+export * from './addParentJob-5';
+export * from './addPrioritizedJob-9';
 export * from './addRepeatableJob-2';
-export * from './addStandardJob-8';
+export * from './addStandardJob-9';
 export * from './changeDelay-4';
 export * from './changePriority-7';
 export * from './cleanJobsInSet-3';
@@ -13,6 +13,7 @@ export * from './extendLock-2';
 export * from './extendLocks-1';
 export * from './getCounts-1';
 export * from './getCountsPerPriority-4';
+export * from './getDependencyCounts-4';
 export * from './getJobScheduler-1';
 export * from './getRanges-1';
 export * from './getRateLimitTtl-1';
@@ -21,13 +22,13 @@ export * from './getStateV2-8';
 export * from './isFinished-3';
 export * from './isJobInList-1';
 export * from './isMaxed-2';
-export * from './moveJobFromActiveToWait-10';
+export * from './moveJobFromActiveToWait-9';
 export * from './moveJobsToWait-8';
-export * from './moveStalledJobsToWait-9';
+export * from './moveStalledJobsToWait-8';
 export * from './moveToActive-11';
 export * from './moveToDelayed-8';
 export * from './moveToFinished-14';
-export * from './moveToWaitingChildren-5';
+export * from './moveToWaitingChildren-8';
 export * from './obliterate-2';
 export * from './paginate-1';
 export * from './pause-7';
@@ -37,10 +38,12 @@ export * from './removeChildDependency-1';
 export * from './removeJob-2';
 export * from './removeJobScheduler-3';
 export * from './removeRepeatable-3';
+export * from './removeUnprocessedChildren-2';
 export * from './reprocessJob-8';
 export * from './retryJob-11';
 export * from './saveStacktrace-1';
 export * from './updateData-1';
+export * from './updateJobScheduler-12';
 export * from './updateProgress-3';
 export * from './updateRepeatableJobMillis-1';
 //# sourceMappingURL=index.js.map

package/dist/node_modules/bullmq/dist/esm/scripts/isFinished-3.js

@@ -19,14 +19,14 @@ if rcall("EXISTS", KEYS[3]) ~= 1 then
   end  
   return -1
 end
-if rcall("ZSCORE", KEYS[1], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[1], ARGV[1]) then
   if ARGV[2] == "1" then
     local returnValue = rcall("HGET", KEYS[3], "returnvalue")
     return {1,returnValue}
   end
   return 1
 end
-if rcall("ZSCORE", KEYS[2], ARGV[1]) ~= false then
+if rcall("ZSCORE", KEYS[2], ARGV[1]) then
   if ARGV[2] == "1" then
     local failedReason = rcall("HGET", KEYS[3], "failedReason")
     return {2,failedReason}

package/dist/node_modules/bullmq/dist/esm/scripts/{moveJobFromActiveToWait-10.js → moveJobFromActiveToWait-9.js}

@@ -4,13 +4,12 @@ const content = `--[[
     KEYS[1]  active key
     KEYS[2]  wait key
     KEYS[3]  stalled key
-    KEYS[4]  job lock key
-    KEYS[5]  paused key
-    KEYS[6]  meta key
-    KEYS[7]  limiter key
-    KEYS[8]  prioritized key
-    KEYS[9]  marker key
-    KEYS[10] event key
+    KEYS[4]  paused key
+    KEYS[5]  meta key
+    KEYS[6]  limiter key
+    KEYS[7]  prioritized key
+    KEYS[8]  marker key
+    KEYS[9] event key
     ARGV[1] job id
     ARGV[2] lock token
     ARGV[3] job id key
@@ -46,12 +45,12 @@ end
   Function to get max events value or set by default 10000.
 ]]
 local function getOrSetMaxEvents(metaKey)
-    local maxEvents = rcall("HGET", metaKey, "opts.maxLenEvents")
-    if not maxEvents then
-        maxEvents = 10000
-        rcall("HSET", metaKey, "opts.maxLenEvents", maxEvents)
-    end
-    return maxEvents
+  local maxEvents = rcall("HGET", metaKey, "opts.maxLenEvents")
+  if not maxEvents then
+    maxEvents = 10000
+    rcall("HSET", metaKey, "opts.maxLenEvents", maxEvents)
+  end
+  return maxEvents
 end
 --[[
   Function to check for the meta.paused key to decide if we are paused or not
@@ -73,35 +72,56 @@ local function getTargetQueueList(queueMetaKey, activeKey, waitKey, pausedKey)
   end
   return waitKey, false
 end
-local jobId = ARGV[1]
-local token = ARGV[2]
-local lockKey = KEYS[4]
-local lockToken = rcall("GET", lockKey)
-local pttl = rcall("PTTL", KEYS[7])
-if lockToken == token then
-  local metaKey = KEYS[6]
-  local removed = rcall("LREM", KEYS[1], 1, jobId)
-  if removed > 0 then
-    local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[1], KEYS[2], KEYS[5])
-    rcall("SREM", KEYS[3], jobId)
-    local priority = tonumber(rcall("HGET", ARGV[3], "priority")) or 0
-    if priority > 0 then
-      pushBackJobWithPriority(KEYS[8], priority, jobId)
+local function removeLock(jobKey, stalledKey, token, jobId)
+  if token ~= "0" then
+    local lockKey = jobKey .. ':lock'
+    local lockToken = rcall("GET", lockKey)
+    if lockToken == token then
+      rcall("DEL", lockKey)
+      rcall("SREM", stalledKey, jobId)
     else
-      addJobInTargetList(target, KEYS[9], "RPUSH", isPausedOrMaxed, jobId)
+      if lockToken then
+        -- Lock exists but token does not match
+        return -6
+      else
+        -- Lock is missing completely
+        return -2
+      end
     end
-    rcall("DEL", lockKey)
-    local maxEvents = getOrSetMaxEvents(metaKey)
-    -- Emit waiting event
-    rcall("XADD", KEYS[10], "MAXLEN", "~", maxEvents, "*", "event", "waiting",
-      "jobId", jobId)
   end
+  return 0
+end
+local jobId = ARGV[1]
+local token = ARGV[2]
+local jobKey = ARGV[3]
+local errorCode = removeLock(jobKey, KEYS[3], token, jobId)
+if errorCode < 0 then
+  return errorCode
+end
+local metaKey = KEYS[5]
+local removed = rcall("LREM", KEYS[1], 1, jobId)
+if removed > 0 then
+  local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[1], KEYS[2], KEYS[4])
+  local priority = tonumber(rcall("HGET", ARGV[3], "priority")) or 0
+  if priority > 0 then
+    pushBackJobWithPriority(KEYS[7], priority, jobId)
+  else
+    addJobInTargetList(target, KEYS[8], "RPUSH", isPausedOrMaxed, jobId)
+  end
+  local maxEvents = getOrSetMaxEvents(metaKey)
+  -- Emit waiting event
+  rcall("XADD", KEYS[9], "MAXLEN", "~", maxEvents, "*", "event", "waiting",
+    "jobId", jobId, "prev", "active")
 end
-return pttl
-`;
+local pttl = rcall("PTTL", KEYS[6])
+if pttl > 0 then
+  return pttl
+else
+  return 0
+end`;
 export const moveJobFromActiveToWait = {
     name: 'moveJobFromActiveToWait',
     content,
-    keys: 10,
+    keys: 9,
 };
-//# sourceMappingURL=moveJobFromActiveToWait-10.js.map
+//# sourceMappingURL=moveJobFromActiveToWait-9.js.map

package/dist/node_modules/bullmq/dist/esm/scripts/moveJobsToWait-8.js

@@ -49,12 +49,12 @@ end
   Function to get max events value or set by default 10000.
 ]]
 local function getOrSetMaxEvents(metaKey)
-    local maxEvents = rcall("HGET", metaKey, "opts.maxLenEvents")
-    if not maxEvents then
-        maxEvents = 10000
-        rcall("HSET", metaKey, "opts.maxLenEvents", maxEvents)
-    end
-    return maxEvents
+  local maxEvents = rcall("HGET", metaKey, "opts.maxLenEvents")
+  if not maxEvents then
+    maxEvents = 10000
+    rcall("HSET", metaKey, "opts.maxLenEvents", maxEvents)
+  end
+  return maxEvents
 end
 --[[
   Function to check for the meta.paused key to decide if we are paused or not