@budibase/server 2.1.40-alpha.5 → 2.1.41

package/src/automations/{actions.ts → actions.js}

@@ -1,26 +1,22 @@
-import * as sendSmtpEmail from "./steps/sendSmtpEmail"
-import * as createRow from "./steps/createRow"
-import * as updateRow from "./steps/updateRow"
-import * as deleteRow from "./steps/deleteRow"
-import * as executeScript from "./steps/executeScript"
-import * as executeQuery from "./steps/executeQuery"
-import * as outgoingWebhook from "./steps/outgoingWebhook"
-import * as serverLog from "./steps/serverLog"
-import * as discord from "./steps/discord"
-import * as slack from "./steps/slack"
-import * as zapier from "./steps/zapier"
-import * as integromat from "./steps/integromat"
-import * as filter from "./steps/filter"
-import * as delay from "./steps/delay"
-import * as queryRow from "./steps/queryRows"
-import * as loop from "./steps/loop"
-import env from "../environment"
-import { AutomationStepSchema, AutomationStepInput } from "@budibase/types"
+const sendSmtpEmail = require("./steps/sendSmtpEmail")
+const createRow = require("./steps/createRow")
+const updateRow = require("./steps/updateRow")
+const deleteRow = require("./steps/deleteRow")
+const executeScript = require("./steps/executeScript")
+const executeQuery = require("./steps/executeQuery")
+const outgoingWebhook = require("./steps/outgoingWebhook")
+const serverLog = require("./steps/serverLog")
+const discord = require("./steps/discord")
+const slack = require("./steps/slack")
+const zapier = require("./steps/zapier")
+const integromat = require("./steps/integromat")
+let filter = require("./steps/filter")
+let delay = require("./steps/delay")
+let queryRow = require("./steps/queryRows")
+let loop = require("./steps/loop")
+const env = require("../environment")
 
-const ACTION_IMPLS: Record<
-  string,
-  (opts: AutomationStepInput) => Promise<any>
-> = {
+const ACTION_IMPLS = {
   SEND_EMAIL_SMTP: sendSmtpEmail.run,
   CREATE_ROW: createRow.run,
   UPDATE_ROW: updateRow.run,
@@ -32,13 +28,14 @@ const ACTION_IMPLS: Record<
   DELAY: delay.run,
   FILTER: filter.run,
   QUERY_ROWS: queryRow.run,
+  LOOP: loop.run,
   // these used to be lowercase step IDs, maintain for backwards compat
   discord: discord.run,
   slack: slack.run,
   zapier: zapier.run,
   integromat: integromat.run,
 }
-export const ACTION_DEFINITIONS: Record<string, AutomationStepSchema> = {
+const ACTION_DEFINITIONS = {
   SEND_EMAIL_SMTP: sendSmtpEmail.definition,
   CREATE_ROW: createRow.definition,
   UPDATE_ROW: updateRow.definition,
@@ -63,15 +60,15 @@ export const ACTION_DEFINITIONS: Record<string, AutomationStepSchema> = {
 // ran at all
 if (env.SELF_HOSTED) {
   const bash = require("./steps/bash")
-  // @ts-ignore
   ACTION_IMPLS["EXECUTE_BASH"] = bash.run
-  // @ts-ignore
   ACTION_DEFINITIONS["EXECUTE_BASH"] = bash.definition
 }
 
 /* istanbul ignore next */
-export async function getAction(actionName: string) {
+exports.getAction = async function (actionName) {
   if (ACTION_IMPLS[actionName] != null) {
     return ACTION_IMPLS[actionName]
   }
 }
+
+exports.ACTION_DEFINITIONS = ACTION_DEFINITIONS

package/src/automations/{automationUtils.ts → automationUtils.js}

@@ -1,10 +1,9 @@
-import {
+const {
   decodeJSBinding,
   isJSBinding,
   encodeJSBinding,
-} from "@budibase/string-templates"
-import sdk from "../sdk"
-import { Row } from "@budibase/types"
+} = require("@budibase/string-templates")
+const sdk = require("../sdk")
 
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
@@ -22,7 +21,7 @@ import { Row } from "@budibase/types"
  * @returns {object} The inputs object which has had all the various types supported by this function converted to their
  * primitive types.
  */
-export function cleanInputValues(inputs: Record<string, any>, schema: any) {
+exports.cleanInputValues = (inputs, schema) => {
   if (schema == null) {
     return inputs
   }
@@ -63,12 +62,12 @@ export function cleanInputValues(inputs: Record<string, any>, schema: any) {
  * @param {object} row The input row structure which requires clean-up after having been through template statements.
  * @returns {Promise<Object>} The cleaned up rows object, will should now have all the required primitive types.
  */
-export async function cleanUpRow(tableId: string, row: Row) {
+exports.cleanUpRow = async (tableId, row) => {
   let table = await sdk.tables.getTable(tableId)
-  return cleanInputValues(row, { properties: table.schema })
+  return exports.cleanInputValues(row, { properties: table.schema })
 }
 
-export function getError(err: any) {
+exports.getError = err => {
   if (err == null) {
     return "No error provided."
   }
@@ -81,13 +80,13 @@ export function getError(err: any) {
   return typeof err !== "string" ? err.toString() : err
 }
 
-export function substituteLoopStep(hbsString: string, substitute: string) {
+exports.substituteLoopStep = (hbsString, substitute) => {
   let checkForJS = isJSBinding(hbsString)
   let substitutedHbsString = ""
   let open = checkForJS ? `$("` : "{{"
   let closed = checkForJS ? `")` : "}}"
   if (checkForJS) {
-    hbsString = decodeJSBinding(hbsString) as string
+    hbsString = decodeJSBinding(hbsString)
   }
   let pointer = 0,
     openPointer = 0,
@@ -112,9 +111,9 @@ export function substituteLoopStep(hbsString: string, substitute: string) {
   return substitutedHbsString
 }
 
-export function stringSplit(value: string | string[]) {
-  if (value == null || Array.isArray(value)) {
-    return value || []
+exports.stringSplit = value => {
+  if (value == null) {
+    return []
   }
   if (value.split("\n").length > 1) {
     value = value.split("\n")

package/src/automations/bullboard.js

@@ -0,0 +1,39 @@
+const { createBullBoard } = require("@bull-board/api")
+const { BullAdapter } = require("@bull-board/api/bullAdapter")
+const { KoaAdapter } = require("@bull-board/koa")
+const { queue } = require("@budibase/backend-core")
+const automation = require("../threads/automation")
+const { backups } = require("@budibase/pro")
+
+let automationQueue = queue.createQueue(
+  queue.JobQueue.AUTOMATION,
+  automation.removeStalled
+)
+
+const PATH_PREFIX = "/bulladmin"
+
+exports.init = async () => {
+  // Set up queues for bull board admin
+  const backupQueue = await backups.getBackupQueue()
+  const queues = [automationQueue]
+  if (backupQueue) {
+    queues.push(backupQueue)
+  }
+  const adapters = []
+  const serverAdapter = new KoaAdapter()
+  for (let queue of queues) {
+    adapters.push(new BullAdapter(queue))
+  }
+  createBullBoard({
+    queues: adapters,
+    serverAdapter,
+  })
+  serverAdapter.setBasePath(PATH_PREFIX)
+  return serverAdapter.registerPlugin()
+}
+
+exports.shutdown = async () => {
+  await queue.shutdown()
+}
+
+exports.automationQueue = automationQueue

package/src/automations/index.js

@@ -0,0 +1,29 @@
+const { processEvent } = require("./utils")
+const { automationQueue, shutdown } = require("./bullboard")
+const { TRIGGER_DEFINITIONS, rebootTrigger } = require("./triggers")
+const { ACTION_DEFINITIONS } = require("./actions")
+
+/**
+ * This module is built purely to kick off the worker farm and manage the inputs/outputs
+ */
+exports.init = async function () {
+  // this promise will not complete
+  const promise = automationQueue.process(async job => {
+    await processEvent(job)
+  })
+  // on init we need to trigger any reboot automations
+  await rebootTrigger()
+  return promise
+}
+
+exports.getQueues = () => {
+  return [automationQueue]
+}
+
+exports.shutdown = () => {
+  return shutdown()
+}
+
+exports.automationQueue = automationQueue
+exports.TRIGGER_DEFINITIONS = TRIGGER_DEFINITIONS
+exports.ACTION_DEFINITIONS = ACTION_DEFINITIONS

package/src/automations/steps/{bash.ts → bash.js}

@@ -1,21 +1,16 @@
-import { execSync } from "child_process"
-import { processStringSync } from "@budibase/string-templates"
-import * as automationUtils from "../automationUtils"
-import environment from "../../environment"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const { execSync } = require("child_process")
+const { processStringSync } = require("@budibase/string-templates")
+const automationUtils = require("../automationUtils")
+const environment = require("../../environment")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Bash Scripting",
   tagline: "Execute a bash command",
   icon: "JourneyEvent",
   description: "Run a bash script",
   type: "ACTION",
   internal: true,
-  stepId: AutomationActionStepId.EXECUTE_BASH,
+  stepId: "EXECUTE_BASH",
   inputs: {},
   schema: {
     inputs: {
@@ -44,7 +39,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs, context }: AutomationStepInput) {
+exports.run = async function ({ inputs, context }) {
   if (inputs.code == null) {
     return {
       stdout: "Budibase bash automation failed: Invalid inputs",
@@ -60,7 +55,7 @@ export async function run({ inputs, context }: AutomationStepInput) {
       stdout = execSync(command, {
         timeout: environment.QUERY_THREAD_TIMEOUT || 500,
       }).toString()
-    } catch (err: any) {
+    } catch (err) {
       stdout = err.message
       success = false
     }

package/src/automations/steps/createRow.ts

@@ -1,20 +1,15 @@
 import { save } from "../../api/controllers/row"
 import { cleanUpRow, getError } from "../automationUtils"
 import { buildCtx } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
 
-export const definition: AutomationStepSchema = {
+export const definition = {
   name: "Create Row",
   tagline: "Create a {{inputs.enriched.table.name}} row",
   icon: "TableRowAddBottom",
   description: "Add a row to your database",
   type: "ACTION",
   internal: true,
-  stepId: AutomationActionStepId.CREATE_ROW,
+  stepId: "CREATE_ROW",
   inputs: {},
   schema: {
     inputs: {
@@ -63,7 +58,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs, appId, emitter }: AutomationStepInput) {
+export async function run({ inputs, appId, emitter }: any) {
   if (inputs.row == null || inputs.row.tableId == null) {
     return {
       success: false,

package/src/automations/steps/{delay.ts → delay.js}

@@ -1,16 +1,11 @@
-import { wait } from "../../utilities"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+let { wait } = require("../../utilities")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Delay",
   icon: "Clock",
   tagline: "Delay for {{inputs.time}} milliseconds",
   description: "Delay the automation until an amount of time has passed",
-  stepId: AutomationActionStepId.DELAY,
+  stepId: "DELAY",
   internal: true,
   inputs: {},
   schema: {
@@ -36,7 +31,7 @@ export const definition: AutomationStepSchema = {
   type: "LOGIC",
 }
 
-export async function run({ inputs }: AutomationStepInput) {
+exports.run = async function delay({ inputs }) {
   await wait(inputs.time)
   return {
     success: true,

package/src/automations/steps/deleteRow.ts

@@ -1,19 +1,14 @@
 import { destroy } from "../../api/controllers/row"
 import { buildCtx } from "./utils"
 import { getError } from "../automationUtils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
 
-export const definition: AutomationStepSchema = {
+export const definition = {
   description: "Delete a row from your database",
   icon: "TableRowRemoveCenter",
   name: "Delete Row",
   tagline: "Delete a {{inputs.enriched.table.name}} row",
   type: "ACTION",
-  stepId: AutomationActionStepId.DELETE_ROW,
+  stepId: "DELETE_ROW",
   internal: true,
   inputs: {},
   schema: {
@@ -52,7 +47,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs, appId, emitter }: AutomationStepInput) {
+export async function run({ inputs, appId, emitter }: any) {
   if (inputs.id == null) {
     return {
       success: false,

package/src/automations/steps/{discord.ts → discord.js}

@@ -1,20 +1,15 @@
-import fetch from "node-fetch"
-import { getFetchResponse } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const fetch = require("node-fetch")
+const { getFetchResponse } = require("./utils")
 
 const DEFAULT_USERNAME = "Budibase Automate"
 const DEFAULT_AVATAR_URL = "https://i.imgur.com/a1cmTKM.png"
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Discord Message",
   tagline: "Send a message to a Discord server",
   description: "Send a message to a Discord server",
   icon: "ri-discord-line",
-  stepId: AutomationActionStepId.discord,
+  stepId: "discord",
   type: "ACTION",
   internal: false,
   inputs: {},
@@ -59,7 +54,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs }: AutomationStepInput) {
+exports.run = async function ({ inputs }) {
   let { url, username, avatar_url, content } = inputs
   if (!username) {
     username = DEFAULT_USERNAME

package/src/automations/steps/{executeQuery.ts → executeQuery.js}

@@ -1,19 +1,14 @@
-import * as queryController from "../../api/controllers/query"
-import { buildCtx } from "./utils"
-import * as automationUtils from "../automationUtils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const queryController = require("../../api/controllers/query")
+const { buildCtx } = require("./utils")
+const automationUtils = require("../automationUtils")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "External Data Connector",
   tagline: "Execute Data Connector",
   icon: "Data",
   description: "Execute a query in an external data connector",
   type: "ACTION",
-  stepId: AutomationActionStepId.EXECUTE_QUERY,
+  stepId: "EXECUTE_QUERY",
   internal: true,
   inputs: {},
   schema: {
@@ -55,7 +50,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs, appId, emitter }: AutomationStepInput) {
+exports.run = async function ({ inputs, appId, emitter }) {
   if (inputs.query == null) {
     return {
       success: false,
@@ -67,7 +62,7 @@ export async function run({ inputs, appId, emitter }: AutomationStepInput) {
 
   const { queryId, ...rest } = inputs.query
 
-  const ctx: any = buildCtx(appId, emitter, {
+  const ctx = buildCtx(appId, emitter, {
     body: {
       parameters: rest,
     },

package/src/automations/steps/{executeScript.ts → executeScript.js}

@@ -1,20 +1,15 @@
-import * as scriptController from "../../api/controllers/script"
-import { buildCtx } from "./utils"
-import * as automationUtils from "../automationUtils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const scriptController = require("../../api/controllers/script")
+const { buildCtx } = require("./utils")
+const automationUtils = require("../automationUtils")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "JS Scripting",
   tagline: "Execute JavaScript Code",
   icon: "Code",
   description: "Run a piece of JavaScript code in your automation",
   type: "ACTION",
   internal: true,
-  stepId: AutomationActionStepId.EXECUTE_SCRIPT,
+  stepId: "EXECUTE_SCRIPT",
   inputs: {},
   schema: {
     inputs: {
@@ -43,12 +38,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({
-  inputs,
-  appId,
-  context,
-  emitter,
-}: AutomationStepInput) {
+exports.run = async function ({ inputs, appId, context, emitter }) {
   if (inputs.code == null) {
     return {
       success: false,
@@ -58,7 +48,7 @@ export async function run({
     }
   }
 
-  const ctx: any = buildCtx(appId, emitter, {
+  const ctx = buildCtx(appId, emitter, {
     body: {
       script: inputs.code,
       context,

package/src/automations/steps/{filter.ts → filter.js}

@@ -1,24 +1,21 @@
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
-
-export const FilterConditions = {
+const FilterConditions = {
   EQUAL: "EQUAL",
   NOT_EQUAL: "NOT_EQUAL",
   GREATER_THAN: "GREATER_THAN",
   LESS_THAN: "LESS_THAN",
 }
 
-export const PrettyFilterConditions = {
+const PrettyFilterConditions = {
   [FilterConditions.EQUAL]: "Equals",
   [FilterConditions.NOT_EQUAL]: "Not equals",
   [FilterConditions.GREATER_THAN]: "Greater than",
   [FilterConditions.LESS_THAN]: "Less than",
 }
 
-export const definition: AutomationStepSchema = {
+exports.FilterConditions = FilterConditions
+exports.PrettyFilterConditions = PrettyFilterConditions
+
+exports.definition = {
   name: "Condition",
   tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}",
   icon: "Branch2",
@@ -26,9 +23,9 @@ export const definition: AutomationStepSchema = {
     "Conditionally halt automations which do not meet certain conditions",
   type: "LOGIC",
   internal: true,
-  stepId: AutomationActionStepId.FILTER,
+  stepId: "FILTER",
   inputs: {
-    condition: FilterConditions.EQUAL,
+    condition: FilterConditions.EQUALS,
   },
   schema: {
     inputs: {
@@ -66,7 +63,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs }: AutomationStepInput) {
+exports.run = async function filter({ inputs }) {
   try {
     let { field, condition, value } = inputs
     // coerce types so that we can use them

package/src/automations/steps/{integromat.ts → integromat.js}

@@ -1,18 +1,13 @@
-import fetch from "node-fetch"
-import { getFetchResponse } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const fetch = require("node-fetch")
+const { getFetchResponse } = require("./utils")
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Integromat Integration",
   tagline: "Trigger an Integromat scenario",
   description:
     "Performs a webhook call to Integromat and gets the response (if configured)",
   icon: "ri-shut-down-line",
-  stepId: AutomationActionStepId.integromat,
+  stepId: "integromat",
   type: "ACTION",
   internal: false,
   inputs: {},
@@ -66,7 +61,7 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs }: AutomationStepInput) {
+exports.run = async function ({ inputs }) {
   const { url, value1, value2, value3, value4, value5 } = inputs
 
   const response = await fetch(url, {

package/src/automations/steps/{loop.ts → loop.js}

@@ -1,11 +1,9 @@
-import { AutomationActionStepId, AutomationStepSchema } from "@budibase/types"
-
-export const definition: AutomationStepSchema = {
+exports.definition = {
   name: "Looping",
   icon: "Reuse",
   tagline: "Loop the block",
   description: "Loop",
-  stepId: AutomationActionStepId.LOOP,
+  stepId: "LOOP",
   internal: true,
   inputs: {},
   schema: {

package/src/automations/steps/{outgoingWebhook.ts → outgoingWebhook.js}

@@ -1,18 +1,13 @@
-import fetch from "node-fetch"
-import { getFetchResponse } from "./utils"
-import * as automationUtils from "../automationUtils"
-import {
-  AutomationActionStepId,
-  AutomationStepSchema,
-  AutomationStepInput,
-} from "@budibase/types"
+const fetch = require("node-fetch")
+const { getFetchResponse } = require("./utils")
+const automationUtils = require("../automationUtils")
 
-enum RequestType {
-  POST = "POST",
-  GET = "GET",
-  PUT = "PUT",
-  DELETE = "DELETE",
-  PATCH = "PATCH",
+const RequestType = {
+  POST: "POST",
+  GET: "GET",
+  PUT: "PUT",
+  DELETE: "DELETE",
+  PATCH: "PATCH",
 }
 
 const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH]
@@ -21,7 +16,7 @@ const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH]
  * NOTE: this functionality is deprecated - it no longer should be used.
  */
 
-export const definition: AutomationStepSchema = {
+exports.definition = {
   deprecated: true,
   name: "Outgoing webhook",
   tagline: "Send a {{inputs.requestMethod}} request",
@@ -29,7 +24,7 @@ export const definition: AutomationStepSchema = {
   description: "Send a request of specified method to a URL",
   type: "ACTION",
   internal: true,
-  stepId: AutomationActionStepId.OUTGOING_WEBHOOK,
+  stepId: "OUTGOING_WEBHOOK",
   inputs: {
     requestMethod: "POST",
     url: "http://",
@@ -81,12 +76,12 @@ export const definition: AutomationStepSchema = {
   },
 }
 
-export async function run({ inputs }: AutomationStepInput) {
+exports.run = async function ({ inputs }) {
   let { requestMethod, url, requestBody, headers } = inputs
   if (!url.startsWith("http")) {
     url = `http://${url}`
   }
-  const request: any = {
+  const request = {
     method: requestMethod,
   }
   if (headers) {