@tachybase/plugin-print-template 1.3.23 → 1.3.25

package/dist/node_modules/bullmq/dist/esm/classes/worker.js

@@ -222,8 +222,7 @@ export class Worker extends QueueBase {
         const jobsInProgress = new Set();
         this.startLockExtenderTimer(jobsInProgress);
         let tokenPostfix = 0;
-        while (!this.closing && !this.paused) {
-            let numTotal = asyncFifoQueue.numTotal();
+        while ((!this.closing && !this.paused) || asyncFifoQueue.numTotal() > 0) {
             /**
              * This inner loop tries to fetch jobs concurrently, but if we are waiting for a job
              * to arrive at the queue we should not try to fetch more jobs (as it would be pointless)
@@ -231,13 +230,12 @@ export class Worker extends QueueBase {
             while (!this.closing &&
                 !this.paused &&
                 !this.waiting &&
-                numTotal < this._concurrency &&
+                asyncFifoQueue.numTotal() < this._concurrency &&
                 !this.isRateLimited()) {
                 const token = `${this.id}:${tokenPostfix++}`;
                 const fetchedJob = this.retryIfFailed(() => this._getNextJob(client, bclient, token, { block: true }), this.opts.runRetryDelay);
                 asyncFifoQueue.add(fetchedJob);
-                numTotal = asyncFifoQueue.numTotal();
-                if (this.waiting && numTotal > 1) {
+                if (this.waiting && asyncFifoQueue.numTotal() > 1) {
                     // We are waiting for jobs but we have others that we could start processing already
                     break;
                 }
@@ -245,7 +243,7 @@ export class Worker extends QueueBase {
                 // to Redis in high concurrency scenarios.
                 const job = await fetchedJob;
                 // No more jobs waiting but we have others that could start processing already
-                if (!job && numTotal > 1) {
+                if (!job && asyncFifoQueue.numTotal() > 1) {
                     break;
                 }
                 // If there are potential jobs to be processed and blockUntil is set, we should exit to avoid waiting
@@ -268,7 +266,6 @@ export class Worker extends QueueBase {
                 await this.waitForRateLimit();
             }
         }
-        return asyncFifoQueue.waitAll();
     }
     /**
      * Returns a promise that resolves to the next job in queue.
@@ -461,7 +458,7 @@ export class Worker extends QueueBase {
             // Add next scheduled job if necessary.
             if (job.opts.repeat && !job.nextRepeatableJobId) {
                 // Use new job scheduler if possible
-                if (job.repeatJobKey) {
+                if (job.repeatJobKey && job.repeatJobKey.split(':').length < 5) {
                     const jobScheduler = await this.jobScheduler;
                     await jobScheduler.upsertJobScheduler(job.repeatJobKey, job.opts.repeat, job.name, job.data, job.opts, { override: false, producerId: job.id });
                 }
@@ -573,7 +570,9 @@ export class Worker extends QueueBase {
             });
             if (!this.paused) {
                 this.paused = true;
-                await (!doNotWaitActive && this.whenCurrentJobsFinished());
+                if (!doNotWaitActive) {
+                    await this.whenCurrentJobsFinished();
+                }
                 (_a = this.stalledCheckStopper) === null || _a === void 0 ? void 0 : _a.call(this);
                 this.emit('paused');
             }

package/dist/node_modules/bullmq/dist/esm/commands/includes/moveJobToWait.lua

@@ -0,0 +1,15 @@
+--[[
+  Function to move job to wait to be picked up by a waiting worker.
+]]
+
+-- Includes
+--- @include "addJobInTargetList"
+--- @include "getTargetQueueList"
+
+local function moveJobToWait(metaKey, activeKey, waitKey, pausedKey, markerKey, eventStreamKey,
+  jobId, pushCmd)
+  local target, isPausedOrMaxed = getTargetQueueList(metaKey, activeKey, waitKey, pausedKey)
+  addJobInTargetList(target, markerKey, pushCmd, isPausedOrMaxed, jobId)
+
+  rcall("XADD", eventStreamKey, "*", "event", "waiting", "jobId", jobId, 'prev', 'active')
+end

package/dist/node_modules/bullmq/dist/esm/commands/moveJobFromActiveToWait-9.lua

@@ -29,6 +29,10 @@ local jobId = ARGV[1]
 local token = ARGV[2]
 local jobKey = ARGV[3]
 
+if rcall("EXISTS", jobKey) == 0 then
+  return -1
+end
+
 local errorCode = removeLock(jobKey, KEYS[3], token, jobId)
 if errorCode < 0 then
   return errorCode
@@ -60,4 +64,4 @@ if pttl > 0 then
   return pttl
 else
   return 0
-end
+end

package/dist/node_modules/bullmq/dist/esm/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/esm/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/esm/enums/error-code.d.ts

@@ -7,5 +7,5 @@ export declare enum ErrorCode {
     JobLockMismatch = -6,
     ParentJobCannotBeReplaced = -7,
     JobBelongsToJobScheduler = -8,
-    JobFailedChildren = -9
+    JobHasFailedChildren = -9
 }

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

@@ -8,6 +8,6 @@ export 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 || (ErrorCode = {}));
 //# sourceMappingURL=error-code.js.map

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

@@ -28,7 +28,7 @@ export * from './moveStalledJobsToWait-8';
 export * from './moveToActive-11';
 export * from './moveToDelayed-8';
 export * from './moveToFinished-14';
-export * from './moveToWaitingChildren-8';
+export * from './moveToWaitingChildren-7';
 export * from './obliterate-2';
 export * from './paginate-1';
 export * from './pause-7';

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

@@ -28,7 +28,7 @@ export * from './moveStalledJobsToWait-8';
 export * from './moveToActive-11';
 export * from './moveToDelayed-8';
 export * from './moveToFinished-14';
-export * from './moveToWaitingChildren-8';
+export * from './moveToWaitingChildren-7';
 export * from './obliterate-2';
 export * from './paginate-1';
 export * from './pause-7';

package/dist/node_modules/bullmq/dist/esm/scripts/moveJobFromActiveToWait-9.js

@@ -94,6 +94,9 @@ end
 local jobId = ARGV[1]
 local token = ARGV[2]
 local jobKey = ARGV[3]
+if rcall("EXISTS", jobKey) == 0 then
+  return -1
+end
 local errorCode = removeLock(jobKey, KEYS[3], token, jobId)
 if errorCode < 0 then
   return errorCode
@@ -118,7 +121,8 @@ if pttl > 0 then
   return pttl
 else
   return 0
-end`;
+end
+`;
 export const moveJobFromActiveToWait = {
     name: 'moveJobFromActiveToWait',
     content,

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

@@ -70,6 +70,16 @@ local function getTargetQueueList(queueMetaKey, activeKey, waitKey, pausedKey)
   end
   return waitKey, false
 end
+--[[
+  Function to move job to wait to be picked up by a waiting worker.
+]]
+-- Includes
+local function moveJobToWait(metaKey, activeKey, waitKey, pausedKey, markerKey, eventStreamKey,
+  jobId, pushCmd)
+  local target, isPausedOrMaxed = getTargetQueueList(metaKey, activeKey, waitKey, pausedKey)
+  addJobInTargetList(target, markerKey, pushCmd, isPausedOrMaxed, jobId)
+  rcall("XADD", eventStreamKey, "*", "event", "waiting", "jobId", jobId, 'prev', 'active')
+end
 --[[
   Function to trim events, default 10000.
 ]]
@@ -132,17 +142,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)
                     table.insert(stalled, jobId)

package/dist/node_modules/bullmq/dist/esm/scripts/moveToWaitingChildren-7.js

@@ -0,0 +1,104 @@
+const content = `--[[
+  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] 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
+   -9 - Job has failed children
+]]
+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 eventStreamKey = KEYS[7]
+local token = ARGV[1]
+local timestamp = ARGV[3]
+local jobId = ARGV[4]
+--- Includes
+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
+      if lockToken then
+        -- Lock exists but token does not match
+        return -6
+      else
+        -- Lock is missing completely
+        return -2
+      end
+    end
+  end
+  return 0
+end
+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
+    return -3
+  end
+  return 0
+end
+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 score = tonumber(timestamp)
+  rcall("ZADD", waitingChildrenKey, score, jobId)
+  rcall("XADD", eventStreamKey, "*", "event", "waiting-children", "jobId", jobId, 'prev', 'active')
+  return 0
+end
+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
+        return moveToWaitingChildren(activeKey, waitingChildrenKey, stalledKey, eventStreamKey,
+          jobKey, jobId, timestamp, token)
+      end
+      return 1
+    else
+      if rcall("SCARD", jobDependenciesKey) ~= 0 then 
+        return moveToWaitingChildren(activeKey, waitingChildrenKey, stalledKey, eventStreamKey,
+          jobKey, jobId, timestamp, token)
+      end
+      return 1
+    end    
+  end
+end
+return -1
+`;
+export const moveToWaitingChildren = {
+    name: 'moveToWaitingChildren',
+    content,
+    keys: 7,
+};
+//# sourceMappingURL=moveToWaitingChildren-7.js.map