@tachybase/plugin-adapter-bullmq 1.3.16 → 1.3.18

package/dist/node_modules/bullmq/dist/cjs/scripts/moveToActive-11.js

@@ -29,6 +29,7 @@ const content = `--[[
     opts - token - lock token
     opts - lockDuration
     opts - limiter
+    opts - name - worker name
 ]]
 local rcall = redis.call
 local waitKey = KEYS[1]
@@ -45,7 +46,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end
@@ -88,7 +89,7 @@ end
 --[[
   Function to move job from prioritized state to active.
 ]]
-local function moveJobFromPriorityToActive(priorityKey, activeKey, priorityCounterKey)
+local function moveJobFromPrioritizedToActive(priorityKey, activeKey, priorityCounterKey)
   local prioritizedJob = rcall("ZPOPMIN", priorityKey)
   if #prioritizedJob > 0 then
     rcall("LPUSH", activeKey, prioritizedJob[1])
@@ -140,6 +141,8 @@ local function prepareJobForProcessing(keyPrefix, rateLimiterKey, eventStreamKey
   rcall("HMSET", jobKey, "processedOn", processedOn, unpack(optionalValues))
   rcall("HINCRBY", jobKey, "ats", 1)
   addBaseMarkerIfNeeded(markerKey, false)
+  -- rate limit delay must be 0 in this case to prevent adding more delay
+  -- when job that is moved to active needs to be processed
   return {rcall("HGETALL", jobKey), jobId, 0, 0} -- get job data
 end
 --[[
@@ -161,10 +164,16 @@ end
   Function to add job considering priority.
 ]]
 -- Includes
+--[[
+  Function to get priority score.
+]]
+local function getPriorityScore(priority, priorityCounterKey)
+  local prioCounter = rcall("INCR", priorityCounterKey)
+  return priority * 0x100000000 + prioCounter % 0x100000000
+end
 local function addJobWithPriority(markerKey, prioritizedKey, priority, jobId, priorityCounterKey,
   isPausedOrMaxed)
-  local prioCounter = rcall("INCR", priorityCounterKey)
-  local score = priority * 0x100000000 + prioCounter % 0x100000000
+  local score = getPriorityScore(priority, priorityCounterKey)
   rcall("ZADD", prioritizedKey, score, jobId)
   addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed)
 end
@@ -180,16 +189,17 @@ local function promoteDelayedJobs(delayedKey, markerKey, targetKey, prioritizedK
                 tonumber(rcall("HGET", jobKey, "priority")) or 0
             if priority == 0 then
                 -- LIFO or FIFO
-                addJobInTargetList(targetKey, markerKey, "LPUSH", isPaused, jobId)
+                rcall("LPUSH", targetKey, jobId)
             else
-                addJobWithPriority(markerKey, prioritizedKey, priority,
-                  jobId, priorityCounterKey, isPaused)
+                local score = getPriorityScore(priority, priorityCounterKey)
+                rcall("ZADD", prioritizedKey, score, jobId)
             end
             -- Emit waiting event
             rcall("XADD", eventStreamKey, "*", "event", "waiting", "jobId",
                   jobId, "prev", "delayed")
             rcall("HSET", jobKey, "delay", 0)
         end
+        addBaseMarkerIfNeeded(markerKey, isPaused)
     end
 end
 local target, isPausedOrMaxed = getTargetQueueList(KEYS[9], activeKey, waitKey, KEYS[8])
@@ -214,7 +224,7 @@ if jobId then
     return prepareJobForProcessing(ARGV[1], rateLimiterKey, eventStreamKey, jobId, ARGV[2],
                                    maxJobs, markerKey, opts)
 else
-    jobId = moveJobFromPriorityToActive(KEYS[3], activeKey, KEYS[10])
+    jobId = moveJobFromPrioritizedToActive(KEYS[3], activeKey, KEYS[10])
     if jobId then
         return prepareJobForProcessing(ARGV[1], rateLimiterKey, eventStreamKey, jobId, ARGV[2],
                                        maxJobs, markerKey, opts)

package/dist/node_modules/bullmq/dist/cjs/scripts/moveToDelayed-8.js

@@ -39,7 +39,7 @@ local function getNextDelayedTimestamp(delayedKey)
   local result = rcall("ZRANGE", delayedKey, 0, 0, "WITHSCORES")
   if #result then
     local nextTimestamp = tonumber(result[2])
-    if nextTimestamp ~= nil then 
+    if nextTimestamp ~= nil then
       return nextTimestamp / 0x1000
     end
   end
@@ -80,12 +80,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
 local function removeLock(jobKey, stalledKey, token, jobId)
   if token ~= "0" then
@@ -110,12 +110,12 @@ end
   Function to update a bunch of fields in a job.
 ]]
 local function updateJobFields(jobKey, msgpackedFields)
-    if msgpackedFields and #msgpackedFields > 0 then
-        local fieldsToUpdate = cmsgpack.unpack(msgpackedFields)
-        if fieldsToUpdate then
-            redis.call("HMSET", jobKey, unpack(fieldsToUpdate))
-        end
+  if msgpackedFields and #msgpackedFields > 0 then
+    local fieldsToUpdate = cmsgpack.unpack(msgpackedFields)
+    if fieldsToUpdate then
+      rcall("HMSET", jobKey, unpack(fieldsToUpdate))
     end
+  end
 end
 local jobKey = KEYS[5]
 local metaKey = KEYS[7]