@budibase/server 2.6.16 → 2.6.18

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.a40dcadd.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.69c5c1ea.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.86c992bf.css">
 </head>
 

package/dist/automations/triggers.js

@@ -135,7 +135,8 @@ function externalTrigger(automation, params, { getResponses } = {}) {
         const data = { automation, event: params };
         if (getResponses) {
             data.event = Object.assign(Object.assign({}, data.event), { appId: backend_core_1.context.getAppId(), automation });
-            return utils.processEvent({ data });
+            const job = { data };
+            return utils.processEvent(job);
         }
         else {
             return bullboard_1.automationQueue.add(data, JOB_OPTS);

package/dist/automations/utils.js

@@ -29,28 +29,33 @@ const REBOOT_CRON = "@reboot";
 const WH_STEP_ID = triggerInfo_1.definitions.WEBHOOK.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const Runner = new threads_1.Thread(threads_1.ThreadType.AUTOMATION);
-const jobMessage = (job, message) => {
-    return `app=${job.data.event.appId} automation=${job.data.automation._id} jobId=${job.id} trigger=${job.data.automation.definition.trigger.event} : ${message}`;
-};
+function loggingArgs(job) {
+    return {
+        jobId: job.id,
+        trigger: job.data.automation.definition.trigger.event,
+    };
+}
 function processEvent(job) {
     return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const automationId = job.data.automation._id;
-            console.log(jobMessage(job, "running"));
-            // need to actually await these so that an error can be captured properly
-            return yield backend_core_1.context.doInContext(job.data.event.appId, () => __awaiter(this, void 0, void 0, function* () {
+        const appId = job.data.event.appId;
+        const automationId = job.data.automation._id;
+        const task = () => __awaiter(this, void 0, void 0, function* () {
+            try {
+                // need to actually await these so that an error can be captured properly
+                console.log("automation running", loggingArgs(job));
                 const runFn = () => Runner.run(job);
-                return pro_1.quotas.addAutomation(runFn, {
+                const result = yield pro_1.quotas.addAutomation(runFn, {
                     automationId,
                 });
-            }));
-        }
-        catch (err) {
-            const errJson = JSON.stringify(err);
-            console.error(jobMessage(job, `was unable to run - ${errJson}`));
-            console.trace(err);
-            return { err };
-        }
+                console.log("automation completed", loggingArgs(job));
+                return result;
+            }
+            catch (err) {
+                console.error(`automation was unable to run`, err, loggingArgs(job));
+                return { err };
+            }
+        });
+        return yield backend_core_1.context.doInAutomationContext({ appId, automationId, task });
     });
 }
 exports.processEvent = processEvent;

package/dist/threads/automation.js

@@ -76,7 +76,8 @@ function getLoopIterations(loopStep, input) {
  */
 class Orchestrator {
     constructor(job) {
-        let automation = job.data.automation, triggerOutput = job.data.event;
+        let automation = job.data.automation;
+        let triggerOutput = job.data.event;
         const metadata = triggerOutput.metadata;
         this._chainCount = metadata ? metadata.automationChainCount : 0;
         this._appId = triggerOutput.appId;

package/dist/threads/index.js

@@ -84,11 +84,11 @@ class Thread {
             this.count === 0 ||
             environment_1.default.isInThread());
     }
-    run(data) {
+    run(job) {
         const timeout = this.timeoutMs;
         return new Promise((resolve, reject) => {
             function fire(worker) {
-                worker.execute(data, (err, response) => {
+                worker.execute(job, (err, response) => {
                     if (err && err.type === "TimeoutError") {
                         reject(new Error(`Query response time exceeded ${timeout}ms timeout.`));
                     }