More refactoring.

packages/backend-core/src/context/mainContext.ts

@@ -266,9 +266,9 @@ export const getProdAppId = () => {
   return conversions.getProdAppID(appId)
 }
 
-export function doInEnvironmentContext(
+export function doInEnvironmentContext<T>(
   values: Record<string, string>,
-  task: any
+  task: () => T
 ) {
   if (!values) {
     throw new Error("Must supply environment variables.")

packages/backend-core/src/utils/Duration.ts

@@ -15,23 +15,27 @@ const conversion: Record<DurationType, number> = {
 }
 
 export class Duration {
+  constructor(public ms: number) {}
+
+  to(type: DurationType) {
+    return this.ms / conversion[type]
+  }
+
+  toMs() {
+    return this.ms
+  }
+
+  toSeconds() {
+    return this.to(DurationType.SECONDS)
+  }
+
   static convert(from: DurationType, to: DurationType, duration: number) {
     const milliseconds = duration * conversion[from]
     return milliseconds / conversion[to]
   }
 
   static from(from: DurationType, duration: number) {
-    return {
+    return new Duration(duration * conversion[from])
-      to: (to: DurationType) => {
-        return Duration.convert(from, to, duration)
-      },
-      toMs: () => {
-        return Duration.convert(from, DurationType.MILLISECONDS, duration)
-      },
-      toSeconds: () => {
-        return Duration.convert(from, DurationType.SECONDS, duration)
-      },
-    }
   }
 
   static fromSeconds(duration: number) {

packages/backend-core/src/utils/index.ts

@@ -2,3 +2,4 @@ export * from "./hashing"
 export * from "./utils"
 export * from "./stringUtils"
 export * from "./Duration"
+export * from "./time"

packages/backend-core/src/utils/time.ts

@@ -0,0 +1,7 @@
+import { Duration } from "./Duration"
+
+export async function time<T>(f: () => Promise<T>): Promise<[T, Duration]> {
+  const start = performance.now()
+  const result = await f()
+  return [result, Duration.fromMilliseconds(performance.now() - start)]
+}

packages/server/src/automations/triggers.ts

@@ -182,11 +182,12 @@ export async function externalTrigger(
     // values are likely to be submitted as strings, so we shall convert to correct type
     const coercedFields: any = {}
     const fields = automation.definition.trigger.inputs.fields
-    for (let key of Object.keys(fields || {})) {
+    for (const key of Object.keys(fields || {})) {
       coercedFields[key] = coerce(params.fields[key], fields[key])
     }
     params.fields = coercedFields
   }
+
   // row actions and webhooks flatten the fields down
   else if (
     sdk.automations.isRowAction(automation) ||
@@ -198,6 +199,7 @@ export async function externalTrigger(
       fields: {},
     }
   }
+
   const data: AutomationData = { automation, event: params }
 
   const shouldTrigger = await checkTriggerFilters(automation, {

packages/server/src/automations/utils.ts

@@ -10,7 +10,6 @@ import {
   Automation,
   AutomationActionStepId,
   AutomationJob,
-  AutomationResults,
   AutomationStepDefinition,
   AutomationTriggerDefinition,
   AutomationTriggerStepId,
@@ -19,6 +18,7 @@ import {
 import { automationsEnabled } from "../features"
 import { helpers, REBOOT_CRON } from "@budibase/shared-core"
 import tracer from "dd-trace"
+import { JobId } from "bull"
 
 const CRON_STEP_ID = automations.triggers.definitions.CRON.stepId
 let Runner: Thread
@@ -156,11 +156,11 @@ export async function disableAllCrons(appId: any) {
   return { count: results.length / 2 }
 }
 
-export async function disableCronById(jobId: number | string) {
+export async function disableCronById(jobId: JobId) {
-  const repeatJobs = await automationQueue.getRepeatableJobs()
+  const jobs = await automationQueue.getRepeatableJobs()
-  for (let repeatJob of repeatJobs) {
+  for (const job of jobs) {
-    if (repeatJob.id === jobId) {
+    if (job.id === jobId) {
-      await automationQueue.removeRepeatableByKey(repeatJob.key)
+      await automationQueue.removeRepeatableByKey(job.key)
     }
   }
   console.log(`jobId=${jobId} disabled`)
@@ -249,31 +249,3 @@ export async function enableCronTrigger(appId: any, automation: Automation) {
 export async function cleanupAutomations(appId: any) {
   await disableAllCrons(appId)
 }
-
-/**
- * Checks if the supplied automation is of a recurring type.
- * @param automation The automation to check.
- * @return if it is recurring (cron).
- */
-export function isRecurring(automation: Automation) {
-  return (
-    automation.definition.trigger.stepId ===
-    automations.triggers.definitions.CRON.stepId
-  )
-}
-
-export function isErrorInOutput(output: AutomationResults) {
-  let first = true,
-    error = false
-  for (let step of output.steps) {
-    // skip the trigger, its always successful if automation ran
-    if (first) {
-      first = false
-      continue
-    }
-    if (!step.outputs?.success) {
-      error = true
-    }
-  }
-  return error
-}

packages/server/src/threads/automation.ts

@@ -1,10 +1,6 @@
 import { default as threadUtils } from "./utils"
 import { Job } from "bull"
-import {
+import { disableCronById } from "../automations/utils"
-  disableCronById,
-  isErrorInOutput,
-  isRecurring,
-} from "../automations/utils"
 import * as actions from "../automations/actions"
 import * as automationUtils from "../automations/automationUtils"
 import { dataFilters, helpers } from "@budibase/shared-core"
@@ -25,7 +21,6 @@ import {
   BranchSearchFilters,
   BranchStep,
   LoopStep,
-  UserBindings,
   ContextEmitter,
   LoopStepType,
   AutomationTriggerResult,
@@ -36,14 +31,13 @@ import {
 } from "@budibase/types"
 import { AutomationContext } from "../definitions/automations"
 import { WorkerCallback } from "./definitions"
-import { context, logging, configs } from "@budibase/backend-core"
+import { context, logging, configs, utils } from "@budibase/backend-core"
 import {
   findHBSBlocks,
   processObject,
   processStringSync,
 } from "@budibase/string-templates"
 import { cloneDeep } from "lodash/fp"
-import { performance } from "perf_hooks"
 import * as sdkUtils from "../sdk/utils"
 import env from "../environment"
 import tracer from "dd-trace"
@@ -53,21 +47,25 @@ threadUtils.threadSetup()
 const CRON_STEP_ID = automations.triggers.definitions.CRON.stepId
 const STOPPED_STATUS = { success: true, status: AutomationStatus.STOPPED }
 
-function matchesLoopFailureCondition(loopStep: LoopStep, currentItem: any) {
+function matchesLoopFailureCondition(step: LoopStep, currentItem: any) {
-  if (!loopStep.inputs.failure) {
+  const { failure } = step.inputs
+  if (!failure) {
     return false
   }
 
   if (isPlainObject(currentItem)) {
-    return Object.values(currentItem).some(e => e === loopStep.inputs.failure)
+    return Object.values(currentItem).some(e => e === failure)
   }
 
-  return currentItem === loopStep.inputs.failure
+  return currentItem === failure
 }
 
-function getLoopIterable(loopStep: LoopStep): any[] {
+// Returns an array of the things to loop over for a given LoopStep.  This
-  const option = loopStep.inputs.option
+// function handles the various ways that a LoopStep can be configured, parsing
-  let input: any = loopStep.inputs.binding
+// the input and returning an array of items to loop over.
+function getLoopIterable(step: LoopStep): any[] {
+  const option = step.inputs.option
+  let input = step.inputs.binding
 
   if (option === LoopStepType.ARRAY && typeof input === "string") {
     input = JSON.parse(input)
@@ -84,26 +82,83 @@ function getLoopIterable(loopStep: LoopStep): any[] {
   return Array.isArray(input) ? input : [input]
 }
 
-async function branchMatches(ctx: AutomationContext, branch: Branch) {
+function getLoopMaxIterations(loopStep: LoopStep): number {
-  const toFilter: Record<string, any> = {}
+  const loopMaxIterations =
+    typeof loopStep.inputs.iterations === "string"
+      ? parseInt(loopStep.inputs.iterations)
+      : loopStep.inputs.iterations
+  return Math.min(
+    loopMaxIterations || env.AUTOMATION_MAX_ITERATIONS,
+    env.AUTOMATION_MAX_ITERATIONS
+  )
+}
 
-  const recurseSearchFilters = (
+function stepSuccess(
-    filters: BranchSearchFilters
+  step: Readonly<AutomationStep>,
-  ): BranchSearchFilters => {
+  outputs: Readonly<Record<string, any>>,
+  inputs?: Readonly<Record<string, any>>
+): AutomationStepResult {
+  return {
+    id: step.id,
+    stepId: step.stepId,
+    inputs: inputs || step.inputs,
+    outputs: {
+      success: true,
+      ...outputs,
+    },
+  }
+}
+
+function stepFailure(
+  step: Readonly<AutomationStep>,
+  outputs: Readonly<Record<string, any>>,
+  inputs?: Readonly<Record<string, any>>
+): AutomationStepResult {
+  return {
+    id: step.id,
+    stepId: step.stepId,
+    inputs: inputs || step.inputs,
+    outputs: {
+      success: false,
+      ...outputs,
+    },
+  }
+}
+
+function stepStopped(step: AutomationStep): AutomationStepResult {
+  return {
+    id: step.id,
+    stepId: step.stepId,
+    inputs: step.inputs,
+    outputs: STOPPED_STATUS,
+  }
+}
+
+async function branchMatches(
+  ctx: AutomationContext,
+  branch: Readonly<Branch>
+): Promise<boolean> {
+  const toFilter: Record<string, any> = {}
+  const preparedCtx = prepareContext(ctx)
+
+  // Because we allow bindings on both the left and right of each condition in
+  // automation branches, we can't pass the BranchSearchFilters directly to
+  // dataFilters.runQuery as-is. We first need to walk the filter tree and
+  // evaluate all of the bindings.
+  const evaluateBindings = (fs: Readonly<BranchSearchFilters>) => {
+    const filters = cloneDeep(fs)
     for (const filter of Object.values(filters)) {
       if (!filter) {
         continue
       }
 
       if (isLogicalFilter(filter)) {
-        filter.conditions = filter.conditions.map(condition =>
+        filter.conditions = filter.conditions.map(evaluateBindings)
-          recurseSearchFilters(condition)
-        )
       } else {
         for (const [field, value] of Object.entries(filter)) {
-          toFilter[field] = processStringSync(field, prepareContext(ctx))
+          toFilter[field] = processStringSync(field, preparedCtx)
           if (typeof value === "string" && findHBSBlocks(value).length > 0) {
-            filter[field] = processStringSync(value, prepareContext(ctx))
+            filter[field] = processStringSync(value, preparedCtx)
           }
         }
       }
@@ -114,7 +169,7 @@ async function branchMatches(ctx: AutomationContext, branch: Branch) {
 
   const result = dataFilters.runQuery(
     [toFilter],
-    recurseSearchFilters(branch.condition)
+    evaluateBindings(branch.condition)
   )
   return result.length > 0
 }
@@ -130,7 +185,7 @@ function prepareContext(context: AutomationContext) {
   }
 }
 
-export async function enrichBaseContext(context: AutomationContext) {
+async function enrichBaseContext(context: AutomationContext) {
   context.env = await sdkUtils.getEnvironmentVariables()
 
   try {
@@ -141,167 +196,74 @@ export async function enrichBaseContext(context: AutomationContext) {
       company: config.company,
     }
   } catch (e) {
-    // if settings doc doesn't exist, make the settings blank
     context.settings = {}
   }
 }
 
-/**
+// Because the trigger appears twice in an AutomationResult, once as .trigger
- * The automation orchestrator is a class responsible for executing automations.
+// and again as .steps[0], this function makes sure that the two are kept in
- * It handles the context of the automation and makes sure each step gets the correct
+// sync when setting trigger output.
- * inputs and handles any outputs.
+function setTriggerOutput(result: AutomationResults, outputs: any) {
- */
+  result.trigger.outputs = {
-class Orchestrator {
+    ...result.trigger.outputs,
-  private chainCount: number
+    ...outputs,
-  private appId: string
+  }
-  private automation: Automation
+  result.steps[0] = result.trigger
-  private emitter: ContextEmitter
-  private job: AutomationJob
-  private stopped: boolean
-  private executionOutput: AutomationResults
-  private currentUser: UserBindings | undefined
-
-  constructor(job: AutomationJob) {
-    this.automation = job.data.automation
-
-    const triggerOutput = job.data.event
-    if (
-      this.automation.definition.trigger.stepId === CRON_STEP_ID &&
-      !triggerOutput.timestamp
-    ) {
-      triggerOutput.timestamp = Date.now()
 }
 
-    this.chainCount = triggerOutput.metadata?.automationChainCount || 0
+class Orchestrator {
-    this.appId = triggerOutput.appId as string
+  private readonly job: AutomationJob
-    this.job = job
+  private emitter: ContextEmitter
+  private stopped: boolean
 
-    // remove from context
+  constructor(job: Readonly<AutomationJob>) {
-    delete triggerOutput.appId
+    this.job = job
-    delete triggerOutput.metadata
+    this.stopped = false
 
     // create an emitter which has the chain count for this automation run in
     // it, so it can block excessive chaining if required
-    this.emitter = new AutomationEmitter(this.chainCount + 1)
+    const chainCount = job.data.event.metadata?.automationChainCount || 0
-
+    this.emitter = new AutomationEmitter(chainCount + 1)
-    const trigger: AutomationTriggerResult = {
-      id: this.automation.definition.trigger.id,
-      stepId: this.automation.definition.trigger.stepId,
-      outputs: triggerOutput,
   }
 
-    this.executionOutput = { trigger, steps: [trigger] }
+  get automation(): Automation {
-
+    return this.job.data.automation
-    // setup the execution output
-    this.stopped = false
-    this.currentUser = triggerOutput.user
   }
 
-  async getStepFunctionality(stepId: AutomationActionStepId) {
+  get appId(): string {
-    let step = await actions.getAction(stepId)
+    return this.job.data.event.appId!
-    if (step == null) {
-      throw `Cannot find automation step by name ${stepId}`
-    }
-    return step
   }
 
-  async getMetadata(): Promise<AutomationMetadata> {
+  private async getMetadata(): Promise<AutomationMetadata> {
-    const metadataId = generateAutomationMetadataID(this.automation._id!)
+    const id = generateAutomationMetadataID(this.automation._id!)
     const db = context.getAppDB()
-    let metadata: AutomationMetadata
+    const doc = await db.tryGet<AutomationMetadata>(id)
-    try {
+    return doc || { _id: id, errorCount: 0 }
-      metadata = await db.get(metadataId)
-    } catch (err) {
-      metadata = {
-        _id: metadataId,
-        errorCount: 0,
-      }
-    }
-    return metadata
   }
 
-  async stopCron(reason: string) {
+  async stopCron(reason: string, opts?: { result: AutomationResults }) {
-    if (!this.job.opts.repeat) {
+    if (!this.isCron()) {
-      return
+      throw new Error("Not a cron automation")
     }
-    logging.logWarn(
+
-      `CRON disabled reason=${reason} - ${this.appId}/${this.automation._id}`
+    const msg = `CRON disabled reason=${reason} - ${this.appId}/${this.automation._id}`
-    )
+    logging.logWarn(msg)
+
     await disableCronById(this.job.id)
-    this.executionOutput.trigger.outputs = {
+
-      ...this.executionOutput.trigger.outputs,
+    const { result } = opts || {}
+    if (result) {
+      setTriggerOutput(result, {
         success: false,
         status: AutomationStatus.STOPPED,
-    }
-    this.executionOutput.steps[0] = this.executionOutput.trigger
-    await storeLog(this.automation, this.executionOutput)
-  }
-
-  async checkIfShouldStop(metadata: AutomationMetadata): Promise<boolean> {
-    if (!metadata.errorCount || !this.job.opts.repeat) {
-      return false
-    }
-    if (metadata.errorCount >= MAX_AUTOMATION_RECURRING_ERRORS) {
-      await this.stopCron("errors")
-      return true
-    }
-    return false
-  }
-
-  async execute(): Promise<AutomationResults | undefined> {
-    return tracer.trace(
-      "Orchestrator.execute",
-      { resource: "automation" },
-      async span => {
-        span?.addTags({
-          appId: this.appId,
-          automationId: this.automation._id,
       })
-
+      await this.logResult(result)
-        let metadata: AutomationMetadata | undefined = undefined
-
-        // check if this is a recurring automation,
-        if (isProdAppID(this.appId) && isRecurring(this.automation)) {
-          span?.addTags({ recurring: true })
-          metadata = await this.getMetadata()
-          const shouldStop = await this.checkIfShouldStop(metadata)
-          if (shouldStop) {
-            span?.addTags({ shouldStop: true })
-            return
     }
   }
 
-        const ctx: AutomationContext = {
+  private async logResult(result: AutomationResults) {
-          trigger: this.executionOutput.trigger.outputs,
-          steps: [this.executionOutput.trigger.outputs],
-          stepsById: {},
-          stepsByName: {},
-          user: this.currentUser,
-        }
-        await enrichBaseContext(ctx)
-
-        const start = performance.now()
-
-        const stepOutputs = await this.executeSteps(
-          ctx,
-          this.automation.definition.steps
-        )
-
-        this.executionOutput.steps.push(...stepOutputs)
-
-        const end = performance.now()
-        const executionTime = end - start
-
-        console.info(
-          `Automation ID: ${this.automation._id} Execution time: ${executionTime} milliseconds`,
-          {
-            _logKey: "automation",
-            executionTime,
-          }
-        )
-
     try {
-          await storeLog(this.automation, this.executionOutput)
+      await storeLog(this.automation, result)
     } catch (e: any) {
       if (e.status === 413 && e.request?.data) {
         // if content is too large we shouldn't log it
@@ -310,12 +272,113 @@ class Orchestrator {
       }
       logging.logAlert("Error writing automation log", e)
     }
+  }
+
+  private async shouldStop(metadata: AutomationMetadata): Promise<boolean> {
+    if (!metadata.errorCount || !this.isCron()) {
+      return false
+    }
+    if (metadata.errorCount >= MAX_AUTOMATION_RECURRING_ERRORS) {
+      return true
+    }
+    return false
+  }
+
+  private isCron(): boolean {
+    return this.automation.definition.trigger.stepId === CRON_STEP_ID
+  }
+
+  private isProdApp(): boolean {
+    return isProdAppID(this.appId)
+  }
+
+  hasErrored(context: AutomationContext): boolean {
+    const [_trigger, ...steps] = context.steps
+    for (const step of steps) {
+      if (step.outputs?.success === false) {
+        return true
+      }
+    }
+    return false
+  }
+
+  async execute(): Promise<AutomationResults> {
+    return tracer.trace(
+      "Orchestrator.execute",
+      { resource: "automation" },
+      async span => {
+        span?.addTags({ appId: this.appId, automationId: this.automation._id })
+
+        const job = cloneDeep(this.job)
+        delete job.data.event.appId
+        delete job.data.event.metadata
+        if (!job.data.event.timestamp) {
+          job.data.event.timestamp = Date.now()
+        }
+
+        const trigger: AutomationTriggerResult = {
+          id: job.data.automation.definition.trigger.id,
+          stepId: job.data.automation.definition.trigger.stepId,
+          outputs: job.data.event,
+        }
+        const result: AutomationResults = { trigger, steps: [trigger] }
+
+        let metadata: AutomationMetadata | undefined = undefined
+
+        if (this.isProdApp() && this.isCron()) {
+          span?.addTags({ recurring: true })
+          metadata = await this.getMetadata()
+          if (await this.shouldStop(metadata)) {
+            await this.stopCron("errors")
+            span?.addTags({ shouldStop: true })
+            return result
+          }
+        }
+
+        const ctx: AutomationContext = {
+          trigger: trigger.outputs,
+          steps: [trigger.outputs],
+          stepsById: {},
+          stepsByName: {},
+          user: trigger.outputs.user,
+        }
+        await enrichBaseContext(ctx)
+
+        const timeout =
+          this.job.data.event.timeout || env.AUTOMATION_THREAD_TIMEOUT
+
+        try {
+          await helpers.withTimeout(timeout, async () => {
+            const [stepOutputs, executionTime] = await utils.time(() =>
+              this.executeSteps(ctx, job.data.automation.definition.steps)
+            )
+
+            result.steps.push(...stepOutputs)
+
+            console.info(
+              `Automation ID: ${
+                this.automation._id
+              } Execution time: ${executionTime.toMs()} milliseconds`,
+              {
+                _logKey: "automation",
+                executionTime,
+              }
+            )
+          })
+        } catch (e: any) {
+          if (e.errno === "ETIME") {
+            span?.addTags({ timedOut: true })
+            console.warn(`Automation execution timed out after ${timeout}ms`)
+          }
+        }
+
+        await this.logResult(result)
 
         if (
-          isProdAppID(this.appId) &&
+          this.isProdApp() &&
-          isRecurring(this.automation) &&
+          this.isCron() &&
           metadata &&
-          isErrorInOutput(this.executionOutput)
+          this.hasErrored(ctx)
         ) {
           metadata.errorCount ??= 0
           metadata.errorCount++
@@ -327,12 +390,12 @@ class Orchestrator {
             logging.logAlertWithInfo(
               "Failed to write automation metadata",
               db.name,
-              this.automation._id!,
+              job.data.automation._id!,
               err
             )
           }
         }
-        return this.executionOutput
+        return result
       }
     )
   }
@@ -341,155 +404,108 @@ class Orchestrator {
     ctx: AutomationContext,
     steps: AutomationStep[]
   ): Promise<AutomationStepResult[]> {
-    return tracer.trace(
+    return tracer.trace("Orchestrator.executeSteps", async () => {
-      "Orchestrator.executeSteps",
-      { resource: "automation" },
-      async span => {
       let stepIndex = 0
-        const timeout =
+      const results: AutomationStepResult[] = []
-          this.job.data.event.timeout || env.AUTOMATION_THREAD_TIMEOUT
+
-        const stepOutputs: AutomationStepResult[] = []
+      function addToContext(
+        step: AutomationStep,
+        result: AutomationStepResult
+      ) {
+        ctx.steps.push(result.outputs)
+        ctx.stepsById[step.id] = result.outputs
+        ctx.stepsByName[step.name || step.id] = result.outputs
+        results.push(result)
+      }
 
-        try {
-          await helpers.withTimeout(timeout, async () => {
       while (stepIndex < steps.length) {
         if (this.stopped) {
           break
         }
 
         const step = steps[stepIndex]
-              if (step.stepId === AutomationActionStepId.BRANCH) {
+        switch (step.stepId) {
-                const [result, ...childResults] = await this.executeBranchStep(
+          case AutomationActionStepId.BRANCH: {
-                  ctx,
+            results.push(...(await this.executeBranchStep(ctx, step)))
-                  step
-                )
-
-                stepOutputs.push(result)
-                stepOutputs.push(...childResults)
-
             stepIndex++
-              } else if (step.stepId === AutomationActionStepId.LOOP) {
+            break
+          }
+          case AutomationActionStepId.LOOP: {
             const stepToLoop = steps[stepIndex + 1]
-                const result = await this.executeLoopStep(ctx, step, stepToLoop)
+            addToContext(
-
+              stepToLoop,
-                ctx.steps.push(result.outputs)
+              await this.executeLoopStep(ctx, step, stepToLoop)
-                ctx.stepsById[stepToLoop.id] = result.outputs
-                ctx.stepsByName[stepToLoop.name || stepToLoop.id] =
-                  result.outputs
-
-                stepOutputs.push(result)
-                stepIndex += 2
-              } else {
-                const result = await this.executeStep(ctx, step)
-
-                ctx.steps.push(result.outputs)
-                ctx.stepsById[step.id] = result.outputs
-                ctx.stepsByName[step.name || step.id] = result.outputs
-
-                stepOutputs.push(result)
-                stepIndex++
-              }
-            }
-          })
-        } catch (error: any) {
-          if (error.errno === "ETIME") {
-            span?.addTags({ timedOut: true })
-            console.warn(`Automation execution timed out after ${timeout}ms`)
-          }
-        }
-
-        return stepOutputs
-      }
             )
+            // We increment by 2 here because the way loops work is that the
+            // step immediately following the loop step is what gets looped.
+            // So when we're done looping, to advance correctly we need to
+            // skip the step that was looped.
+            stepIndex += 2
+            break
+          }
+          default: {
+            addToContext(step, await this.executeStep(ctx, step))
+            stepIndex++
+            break
+          }
+        }
+      }
+
+      return results
+    })
   }
 
   private async executeLoopStep(
     ctx: AutomationContext,
-    loopStep: LoopStep,
+    step: LoopStep,
     stepToLoop: AutomationStep
   ): Promise<AutomationStepResult> {
-    await processObject(loopStep.inputs, prepareContext(ctx))
+    await processObject(step.inputs, prepareContext(ctx))
-
-    const result = {
-      id: loopStep.id,
-      stepId: loopStep.stepId,
-      inputs: loopStep.inputs,
-    }
-
-    const loopMaxIterations =
-      typeof loopStep.inputs.iterations === "string"
-        ? parseInt(loopStep.inputs.iterations)
-        : loopStep.inputs.iterations
-    const maxIterations = Math.min(
-      loopMaxIterations || env.AUTOMATION_MAX_ITERATIONS,
-      env.AUTOMATION_MAX_ITERATIONS
-    )
 
+    const maxIterations = getLoopMaxIterations(step)
     const items: Record<string, any>[] = []
     let iterations = 0
     let iterable: any[] = []
     try {
-      iterable = getLoopIterable(loopStep)
+      iterable = getLoopIterable(step)
     } catch (err) {
-      return {
+      return stepFailure(stepToLoop, {
-        ...result,
-        outputs: {
-          success: false,
         status: AutomationStepStatus.INCORRECT_TYPE,
-        },
+      })
-      }
     }
 
     for (; iterations < iterable.length; iterations++) {
       const currentItem = iterable[iterations]
 
       if (iterations === maxIterations) {
-        return {
+        return stepFailure(stepToLoop, {
-          ...result,
-          outputs: {
-            success: false,
-            iterations,
-            items,
           status: AutomationStepStatus.MAX_ITERATIONS,
-          },
+          iterations,
-        }
+        })
       }
 
-      if (matchesLoopFailureCondition(loopStep, currentItem)) {
+      if (matchesLoopFailureCondition(step, currentItem)) {
-        return {
+        return stepFailure(stepToLoop, {
-          ...result,
-          outputs: {
-            success: false,
-            iterations,
-            items,
           status: AutomationStepStatus.FAILURE_CONDITION,
-          },
+        })
-        }
       }
 
       ctx.loop = { currentItem }
-      const loopedStepResult = await this.executeStep(ctx, stepToLoop)
+      const result = await this.executeStep(ctx, stepToLoop)
+      items.push(result.outputs)
       ctx.loop = undefined
-      items.push(loopedStepResult.outputs)
     }
 
-    return {
+    const status =
-      ...result,
+      iterations === 0 ? AutomationStatus.NO_CONDITION_MET : undefined
-      outputs: {
+    return stepSuccess(stepToLoop, { status, iterations, items })
-        success: true,
-        status:
-          iterations === 0 ? AutomationStepStatus.NO_ITERATIONS : undefined,
-        iterations,
-        items,
-      },
-    }
   }
 
   private async executeBranchStep(
     ctx: AutomationContext,
-    branchStep: BranchStep
+    step: BranchStep
   ): Promise<AutomationStepResult[]> {
-    const { branches, children } = branchStep.inputs
+    const { branches, children } = step.inputs
 
     for (const branch of branches) {
       if (await branchMatches(ctx, branch)) {
@@ -497,11 +513,11 @@ class Orchestrator {
 
         return [
           {
-            id: branchStep.id,
+            id: step.id,
-            stepId: branchStep.stepId,
+            stepId: step.stepId,
-            inputs: branchStep.inputs,
+            inputs: step.inputs,
-            success: true,
             outputs: {
+              success: true,
               branchName: branch.name,
               status: `${branch.name} branch taken`,
               branchId: `${branch.id}`,
@@ -515,25 +531,20 @@ class Orchestrator {
     this.stopped = true
     return [
       {
-        id: branchStep.id,
+        id: step.id,
-        stepId: branchStep.stepId,
+        stepId: step.stepId,
-        inputs: branchStep.inputs,
+        inputs: step.inputs,
-        success: false,
+        outputs: { success: false, status: AutomationStatus.NO_CONDITION_MET },
-        outputs: { status: AutomationStatus.NO_CONDITION_MET },
       },
     ]
   }
 
   private async executeStep(
     ctx: AutomationContext,
-    step: AutomationStep
+    step: Readonly<AutomationStep>
   ): Promise<AutomationStepResult> {
-    return tracer.trace(
+    return tracer.trace("Orchestrator.executeStep", async span => {
-      "Orchestrator.execute.step",
+      span.addTags({
-      { resource: "automation" },
-      async span => {
-        span?.addTags({
-          resource: "automation",
         step: {
           stepId: step.stepId,
           id: step.id,
@@ -546,21 +557,21 @@ class Orchestrator {
       })
 
       if (this.stopped) {
-          return {
+        span.addTags({ stopped: true })
-            id: step.id,
+        return stepStopped(step)
-            stepId: step.stepId,
+      }
-            inputs: step.inputs,
+
-            outputs: STOPPED_STATUS,
+      const fn = await actions.getAction(step.stepId)
-          }
+      if (fn == null) {
+        throw new Error(`Cannot find automation step by name ${step.stepId}`)
       }
 
-        const stepFn = await this.getStepFunctionality(step.stepId)
       const inputs = automationUtils.cleanInputValues(
         await processObject(cloneDeep(step.inputs), prepareContext(ctx)),
         step.schema.inputs.properties
       )
 
-        const outputs = await stepFn({
+      const outputs = await fn({
         inputs,
         appId: this.appId,
         emitter: this.emitter,
@@ -576,14 +587,8 @@ class Orchestrator {
         ;(outputs as any).status = AutomationStatus.STOPPED
       }
 
-        return {
+      return stepSuccess(step, outputs, inputs)
-          id: step.id,
+    })
-          stepId: step.stepId,
-          inputs,
-          outputs,
-        }
-      }
-    )
   }
 }
 
@@ -604,10 +609,9 @@ export function execute(job: Job<AutomationData>, callback: WorkerCallback) {
     task: async () => {
       const envVars = await sdkUtils.getEnvironmentVariables()
       await context.doInEnvironmentContext(envVars, async () => {
-        const automationOrchestrator = new Orchestrator(job)
+        const orchestrator = new Orchestrator(job)
         try {
-          const response = await automationOrchestrator.execute()
+          callback(null, await orchestrator.execute())
-          callback(null, response)
         } catch (err) {
           callback(err)
         }
@@ -624,24 +628,14 @@ export async function executeInThread(
     throw new Error("Unable to execute, event doesn't contain app ID.")
   }
 
-  const timeoutPromise = new Promise((_resolve, reject) => {
+  return await context.doInAppContext(appId, async () => {
-    setTimeout(() => {
-      reject(new Error("Timeout exceeded"))
-    }, job.data.event.timeout || env.AUTOMATION_THREAD_TIMEOUT)
-  })
-
-  return (await context.doInAppContext(appId, async () => {
     await context.ensureSnippetContext()
     const envVars = await sdkUtils.getEnvironmentVariables()
-    // put into automation thread for whole context
     return await context.doInEnvironmentContext(envVars, async () => {
-      const automationOrchestrator = new Orchestrator(job)
+      const orchestrator = new Orchestrator(job)
-      return await Promise.race([
+      return orchestrator.execute()
-        automationOrchestrator.execute(),
+    })
-        timeoutPromise,
-      ])
   })
-  })) as AutomationResults
 }
 
 export const removeStalled = async (job: Job) => {
@@ -650,7 +644,7 @@ export const removeStalled = async (job: Job) => {
     throw new Error("Unable to execute, event doesn't contain app ID.")
   }
   await context.doInAppContext(appId, async () => {
-    const automationOrchestrator = new Orchestrator(job)
+    const orchestrator = new Orchestrator(job)
-    await automationOrchestrator.stopCron("stalled")
+    await orchestrator.stopCron("stalled")
   })
 }

packages/types/src/documents/app/automation/automation.ts

@@ -192,13 +192,20 @@ export enum AutomationStoppedReason {
   TRIGGER_FILTER_NOT_MET = "Automation did not run. Filter conditions in trigger were not met.",
 }
 
+export interface AutomationStepResultOutputs {
+  success: boolean
+  [key: string]: any
+}
+
+export interface AutomationStepResultInputs {
+  [key: string]: any
+}
+
 export interface AutomationStepResult {
   id: string
   stepId: AutomationActionStepId
-  inputs: Record<string, any>
+  inputs: AutomationStepResultInputs
-  outputs: Record<string, any>
+  outputs: AutomationStepResultOutputs
-  success?: boolean
-  message?: string
 }
 
 export interface AutomationTriggerResult {