@budibase/server 2.0.33 → 2.0.34-alpha.1

package/dist/threads/automation.js

@@ -72,16 +72,12 @@ function getLoopIterations(loopStep, input) {
  * inputs and handles any outputs.
  */
 class Orchestrator {
-    constructor(automation, triggerOutput, opts) {
+    constructor(job) {
+        let automation = job.data.automation, triggerOutput = job.data.event;
         const metadata = triggerOutput.metadata;
         this._chainCount = metadata ? metadata.automationChainCount : 0;
         this._appId = triggerOutput.appId;
-        if (opts === null || opts === void 0 ? void 0 : opts.repeat) {
-            this._repeat = {
-                jobId: opts.repeat.jobId,
-                jobKey: opts.repeat.key,
-            };
-        }
+        this._job = job;
         const triggerStepId = automation.definition.trigger.stepId;
         triggerOutput = this.cleanupTriggerOutputs(triggerStepId, triggerOutput);
         // remove from context
@@ -131,15 +127,14 @@ class Orchestrator {
         });
     }
     stopCron(reason) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._repeat) {
+            if (!this._job.opts.repeat) {
                 return;
             }
             logWarn(`CRON disabled reason=${reason} - ${this._appId}/${this._automation._id}`);
             const automation = this._automation;
             const trigger = automation.definition.trigger;
-            yield (0, utils_2.disableCron)((_a = this._repeat) === null || _a === void 0 ? void 0 : _a.jobId, (_b = this._repeat) === null || _b === void 0 ? void 0 : _b.jobKey);
+            yield (0, utils_2.disableCronById)(this._job.id);
             this.updateExecutionOutput(trigger.id, trigger.stepId, {}, {
                 status: types_1.AutomationStatus.STOPPED_ERROR,
                 success: false,
@@ -149,7 +144,7 @@ class Orchestrator {
     }
     checkIfShouldStop(metadata) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!metadata.errorCount || !this._repeat) {
+            if (!metadata.errorCount || !this._job.opts.repeat) {
                 return false;
             }
             if (metadata.errorCount >= constants_1.MAX_AUTOMATION_RECURRING_ERRORS) {
@@ -404,13 +399,13 @@ class Orchestrator {
         });
     }
 }
-function execute(input, callback) {
-    const appId = input.data.event.appId;
+function execute(job, callback) {
+    const appId = job.data.event.appId;
     if (!appId) {
         throw new Error("Unable to execute, event doesn't contain app ID.");
     }
     doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
-        const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event, input.opts);
+        const automationOrchestrator = new Orchestrator(job);
         try {
             const response = yield automationOrchestrator.execute();
             callback(null, response);
@@ -421,13 +416,13 @@ function execute(input, callback) {
     }));
 }
 exports.execute = execute;
-const removeStalled = (input) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = input.data.event.appId;
+const removeStalled = (job) => __awaiter(void 0, void 0, void 0, function* () {
+    const appId = job.data.event.appId;
     if (!appId) {
         throw new Error("Unable to execute, event doesn't contain app ID.");
     }
     yield doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
-        const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event, input.opts);
+        const automationOrchestrator = new Orchestrator(job);
         yield automationOrchestrator.stopCron("stalled");
     }));
 });