@budibase/server 2.6.19-alpha.30 → 2.6.19-alpha.31

package/dist/index.js

@@ -3648,6 +3648,7 @@ var init_logger = __esm({
         }
         const mergingObject = {
           err: error2,
+          pid: process.pid,
           ...contextObject
         };
         if (objects.length) {
@@ -12063,6 +12064,7 @@ var init_environment3 = __esm({
       ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
       SELF_HOSTED: process.env.SELF_HOSTED,
       HTTP_MB_LIMIT: process.env.HTTP_MB_LIMIT,
+      FORKED_PROCESS_NAME: process.env.FORKED_PROCESS_NAME || "main",
       // old
       CLIENT_ID: process.env.CLIENT_ID,
       _set(key, value) {
@@ -24371,13 +24373,17 @@ var init_threads = __esm({
         this.count = opts.count ? opts.count : 1;
         this.disableThreading = this.shouldDisableThreading();
         if (!this.disableThreading) {
+          console.debug(
+            `[${environment_default2.FORKED_PROCESS_NAME}] initialising worker farm type=${type}`
+          );
           const workerOpts = {
             autoStart: true,
             maxConcurrentWorkers: this.count,
             workerOptions: {
               env: {
                 ...process.env,
-                FORKED_PROCESS: "1"
+                FORKED_PROCESS: "1",
+                FORKED_PROCESS_NAME: type
               }
             }
           };
@@ -24387,6 +24393,10 @@ var init_threads = __esm({
           }
           this.workers = (0, import_worker_farm.default)(workerOpts, typeToFile(type), ["execute"]);
           _Thread.workerRefs.push(this.workers);
+        } else {
+          console.debug(
+            `[${environment_default2.FORKED_PROCESS_NAME}] skipping worker farm type=${type}`
+          );
         }
       }
       shouldDisableThreading() {
@@ -24398,9 +24408,7 @@ var init_threads = __esm({
           function fire(worker) {
             worker.execute(job, (err, response2) => {
               if (err && err.type === "TimeoutError") {
-                reject(
-                  new Error(`Query response time exceeded ${timeout2}ms timeout.`)
-                );
+                reject(new Error(`Thread timeout exceeded ${timeout2}ms timeout.`));
               } else if (err) {
                 reject(err);
               } else {
@@ -24737,8 +24745,10 @@ function makeVariableKey(queryId, variable) {
 }
 function threadSetup() {
   if (environment_default2.isTest() || environment_default2.DISABLE_THREADING || !environment_default2.isInThread()) {
+    console.debug(`[${environment_default2.FORKED_PROCESS_NAME}] thread setup skipped`);
     return;
   }
+  console.debug(`[${environment_default2.FORKED_PROCESS_NAME}] thread setup running`);
   init10();
 }
 async function checkCacheForDynamicVariable(queryId, variable) {
@@ -37486,10 +37496,26 @@ var init_AutomationEmitter = __esm({
 });
 
 // src/automations/logging/index.ts
+function sanitiseResults(results) {
+  const message = `[removed] - max results size of ${MAX_LOG_SIZE_MB}MB exceeded`;
+  for (let step of results.steps) {
+    step.inputs = {
+      message
+    };
+    step.outputs = {
+      message,
+      success: step.outputs.success
+    };
+  }
+}
 async function storeLog2(automation, results) {
   if (environment_default2.DISABLE_AUTOMATION_LOGS) {
     return;
   }
+  const bytes = (0, import_object_sizeof.default)(results);
+  if (bytes / MB_IN_BYTES > MAX_LOG_SIZE_MB) {
+    sanitiseResults(results);
+  }
   await automations_exports.logs.storeLog(automation, results);
 }
 async function checkAppMetadata(apps2) {
@@ -37514,17 +37540,21 @@ async function checkAppMetadata(apps2) {
   }
   return apps2;
 }
+var import_object_sizeof, MAX_LOG_SIZE_MB, MB_IN_BYTES;
 var init_logging3 = __esm({
   "src/automations/logging/index.ts"() {
     init_environment3();
     init_src4();
     init_src2();
+    import_object_sizeof = __toESM(require("object-sizeof"));
+    MAX_LOG_SIZE_MB = 5;
+    MB_IN_BYTES = 1024 * 1024;
   }
 });
 
 // src/threads/automation.ts
-function getLoopIterations(loopStep, input) {
-  const binding = typecastForLooping(loopStep, input);
+function getLoopIterations(loopStep) {
+  let binding = loopStep.inputs.binding;
   if (!binding) {
     return 0;
   }
@@ -37585,7 +37615,6 @@ var init_automation4 = __esm({
       constructor(job) {
         let automation = job.data.automation;
         let triggerOutput = job.data.event;
-        let timeout2 = job.data.event.timeout;
         const metadata = triggerOutput.metadata;
         this._chainCount = metadata ? metadata.automationChainCount : 0;
         this._appId = triggerOutput.appId;
@@ -37719,7 +37748,7 @@ var init_automation4 = __esm({
         });
       }
       async execute() {
-        var _a2;
+        var _a2, _b2;
         this._context.env = await getEnvironmentVariables2();
         let automation = this._automation;
         let stopped = false;
@@ -37738,6 +37767,7 @@ var init_automation4 = __esm({
             return;
           }
         }
+        const start2 = performance.now();
         for (let step of automation.definition.steps) {
           if (timeoutFlag) {
             break;
@@ -37756,20 +37786,16 @@ var init_automation4 = __esm({
           }
           if (loopStep) {
             input = await (0, import_string_templates8.processObject)(loopStep.inputs, this._context);
-            iterations = getLoopIterations(loopStep, input);
+            iterations = getLoopIterations(loopStep);
           }
           for (let index2 = 0; index2 < iterations; index2++) {
             let originalStepInput = (0, import_fp8.cloneDeep)(step.inputs);
             if (loopStep && input.binding) {
-              let newInput = await (0, import_string_templates8.processObject)(
-                loopStep.inputs,
-                (0, import_fp8.cloneDeep)(this._context)
-              );
               let tempOutput = { items: loopSteps, iterations: iterationCount };
               try {
-                newInput.binding = typecastForLooping(
+                loopStep.inputs.binding = typecastForLooping(
                   loopStep,
-                  newInput
+                  loopStep.inputs
                 );
               } catch (err) {
                 this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
@@ -37782,7 +37808,7 @@ var init_automation4 = __esm({
               }
               let item = [];
               if (typeof loopStep.inputs.binding === "string" && loopStep.inputs.option === "String") {
-                item = stringSplit(newInput.binding);
+                item = stringSplit(loopStep.inputs.binding);
               } else if (Array.isArray(loopStep.inputs.binding)) {
                 item = loopStep.inputs.binding;
               }
@@ -37925,7 +37951,18 @@ var init_automation4 = __esm({
             loopSteps = [];
           }
         }
-        await storeLog2(this._automation, this.executionOutput);
+        const end2 = performance.now();
+        const executionTime = end2 - start2;
+        console.log(`Execution time: ${executionTime} milliseconds`);
+        try {
+          await storeLog2(this._automation, this.executionOutput);
+        } catch (e) {
+          if (e.status === 413 && ((_b2 = e.request) == null ? void 0 : _b2.data)) {
+            delete e.request.data;
+            e.request.data = { message: "removed due to large size" };
+          }
+          logging_exports.logAlert("Error writing automation log", e);
+        }
         if (isProdAppID2(this._appId) && isRecurring(automation) && metadata) {
           await this.updateMetadata(metadata);
         }