@tachybase/plugin-print-template 1.3.23 → 1.3.25

package/dist/externalVersion.js

@@ -1,5 +1,5 @@
 module.exports = {
-  "@tachybase/client": "1.3.23",
-  "@tego/server": "1.3.43",
+  "@tachybase/client": "1.3.25",
+  "@tego/server": "1.3.52",
   "koa-bodyparser": "4.4.1"
 };

package/dist/node_modules/bullmq/dist/cjs/classes/queue.js

@@ -537,9 +537,11 @@ class Queue extends queue_getters_1.QueueGetters {
             const timestamp = Date.now() - grace;
             let deletedCount = 0;
             const deletedJobsIds = [];
+            // Normalize 'waiting' to 'wait' for consistency with internal Redis keys
+            const normalizedType = type === 'waiting' ? 'wait' : type;
             while (deletedCount < maxCount) {
-                const jobsIds = await this.scripts.cleanJobsInSet(type, timestamp, maxCountPerCall);
-                this.emit('cleaned', jobsIds, type);
+                const jobsIds = await this.scripts.cleanJobsInSet(normalizedType, timestamp, maxCountPerCall);
+                this.emit('cleaned', jobsIds, normalizedType);
                 deletedCount += jobsIds.length;
                 deletedJobsIds.push(...jobsIds);
                 if (jobsIds.length < maxCountPerCall) {

package/dist/node_modules/bullmq/dist/cjs/classes/scripts.js

@@ -14,6 +14,7 @@ const pack = packer.pack;
 const enums_1 = require("../enums");
 const utils_1 = require("../utils");
 const version_1 = require("../version");
+const errors_1 = require("./errors");
 class Scripts {
     constructor(queue) {
         this.queue = queue;
@@ -694,7 +695,6 @@ class Scripts {
             `${jobId}:dependencies`,
             `${jobId}:unsuccessful`,
             'stalled',
-            'failed',
             'events',
         ].map(name => {
             return this.queue.toKey(name);
@@ -1115,8 +1115,8 @@ class Scripts {
                 return new Error(`The parent job ${parentKey} cannot be replaced. ${command}`);
             case enums_1.ErrorCode.JobBelongsToJobScheduler:
                 return new Error(`Job ${jobId} belongs to a job scheduler and cannot be removed directly. ${command}`);
-            case enums_1.ErrorCode.JobFailedChildren:
-                return new Error(`Job ${jobId} has failed children. ${command}`);
+            case enums_1.ErrorCode.JobHasFailedChildren:
+                return new errors_1.UnrecoverableError(`Cannot complete job ${jobId} because it has at least one failed child. ${command}`);
             default:
                 return new Error(`Unknown code ${code} error for ${jobId}. ${command}`);
         }

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

@@ -225,8 +225,7 @@ class Worker extends queue_base_1.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)
@@ -234,13 +233,12 @@ class Worker extends queue_base_1.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;
                 }
@@ -248,7 +246,7 @@ class Worker extends queue_base_1.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
@@ -271,7 +269,6 @@ class Worker extends queue_base_1.QueueBase {
                 await this.waitForRateLimit();
             }
         }
-        return asyncFifoQueue.waitAll();
     }
     /**
      * Returns a promise that resolves to the next job in queue.
@@ -464,7 +461,7 @@ class Worker extends queue_base_1.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 });
                 }
@@ -576,7 +573,9 @@ class Worker extends queue_base_1.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/cjs/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/cjs/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/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