@budibase/server 0.9.138 → 0.9.140-alpha.2

package/dist/api/routes/tests/utilities/TestFunctions.js

@@ -97,3 +97,16 @@ exports.checkPermissionsEndpoint = ({ config, method, url, body, passRole, failR
 exports.getDB = config => {
     return new CouchDB(config.getAppId());
 };
+exports.testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0, function* () {
+    return yield config.request
+        .post(`/api/automations/${automation._id}/test`)
+        .send({
+        row: {
+            name: "Test",
+            description: "TEST",
+        },
+    })
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200);
+});

package/dist/app.js

@@ -82,8 +82,8 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
     env._set("PORT", server.address().port);
     eventEmitter.emitPort(env.PORT);
     fileSystem.init();
-    yield automations.init();
     yield redis.init();
+    yield automations.init();
 }));
 process.on("uncaughtException", err => {
     console.error(err);

package/dist/automations/actions.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const sendgridEmail = require("./steps/sendgridEmail");
 const sendSmtpEmail = require("./steps/sendSmtpEmail");
 const createRow = require("./steps/createRow");
 const updateRow = require("./steps/updateRow");
@@ -18,11 +17,14 @@ const bash = require("./steps/bash");
 const executeQuery = require("./steps/executeQuery");
 const outgoingWebhook = require("./steps/outgoingWebhook");
 const serverLog = require("./steps/serverLog");
-const env = require("../environment");
-const Sentry = require("@sentry/node");
-const { automationInit, getExternalAutomationStep, } = require("../utilities/fileSystem");
-const BUILTIN_ACTIONS = {
-    SEND_EMAIL: sendgridEmail.run,
+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");
+const ACTION_IMPLS = {
     SEND_EMAIL_SMTP: sendSmtpEmail.run,
     CREATE_ROW: createRow.run,
     UPDATE_ROW: updateRow.run,
@@ -32,9 +34,16 @@ const BUILTIN_ACTIONS = {
     EXECUTE_BASH: bash.run,
     EXECUTE_QUERY: executeQuery.run,
     SERVER_LOG: serverLog.run,
+    DELAY: delay.run,
+    FILTER: filter.run,
+    QUERY_ROWS: queryRow.run,
+    // these used to be lowercase step IDs, maintain for backwards compat
+    discord: discord.run,
+    slack: slack.run,
+    zapier: zapier.run,
+    integromat: integromat.run,
 };
-const BUILTIN_DEFINITIONS = {
-    SEND_EMAIL: sendgridEmail.definition,
+const ACTION_DEFINITIONS = {
     SEND_EMAIL_SMTP: sendSmtpEmail.definition,
     CREATE_ROW: createRow.definition,
     UPDATE_ROW: updateRow.definition,
@@ -44,47 +53,21 @@ const BUILTIN_DEFINITIONS = {
     EXECUTE_QUERY: executeQuery.definition,
     EXECUTE_BASH: bash.definition,
     SERVER_LOG: serverLog.definition,
+    DELAY: delay.definition,
+    FILTER: filter.definition,
+    QUERY_ROWS: queryRow.definition,
+    // these used to be lowercase step IDs, maintain for backwards compat
+    discord: discord.definition,
+    slack: slack.definition,
+    zapier: zapier.definition,
+    integromat: integromat.definition,
 };
-let MANIFEST = null;
 /* istanbul ignore next */
-function buildBundleName(pkgName, version) {
-    return `${pkgName}@${version}.min.js`;
-}
-/* istanbul ignore next */
-module.exports.getAction = function (actionName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (BUILTIN_ACTIONS[actionName] != null) {
-            return BUILTIN_ACTIONS[actionName];
-        }
-        // worker pools means that a worker may not have manifest
-        if (env.isProd() && MANIFEST == null) {
-            MANIFEST = yield module.exports.init();
-        }
-        // env setup to get async packages
-        if (!MANIFEST || !MANIFEST.packages || !MANIFEST.packages[actionName]) {
-            return null;
-        }
-        const pkg = MANIFEST.packages[actionName];
-        const bundleName = buildBundleName(pkg.stepId, pkg.version);
-        return getExternalAutomationStep(pkg.stepId, pkg.version, bundleName);
-    });
-};
-module.exports.init = function () {
+exports.getAction = function (actionName) {
     return __awaiter(this, void 0, void 0, function* () {
-        try {
-            MANIFEST = yield automationInit();
-            module.exports.DEFINITIONS =
-                MANIFEST && MANIFEST.packages
-                    ? Object.assign(MANIFEST.packages, BUILTIN_DEFINITIONS)
-                    : BUILTIN_DEFINITIONS;
-        }
-        catch (err) {
-            console.error(err);
-            Sentry.captureException(err);
+        if (ACTION_IMPLS[actionName] != null) {
+            return ACTION_IMPLS[actionName];
         }
-        return MANIFEST;
     });
 };
-// definitions will have downloaded ones added to it, while builtin won't
-module.exports.DEFINITIONS = BUILTIN_DEFINITIONS;
-module.exports.BUILTIN_DEFINITIONS = BUILTIN_DEFINITIONS;
+exports.ACTION_DEFINITIONS = ACTION_DEFINITIONS;

package/dist/automations/bullboard.js

@@ -1,13 +1,21 @@
 "use strict";
 const { createBullBoard } = require("bull-board");
 const { BullAdapter } = require("bull-board/bullAdapter");
-const { getQueues } = require("./triggers");
 const express = require("express");
+const env = require("../environment");
+const Queue = env.isTest()
+    ? require("../utilities/queue/inMemoryQueue")
+    : require("bull");
+const { JobQueues } = require("../constants");
+const { utils } = require("@budibase/auth/redis");
+const { opts, redisProtocolUrl } = utils.getRedisOptions();
+const redisConfig = redisProtocolUrl || { redis: opts };
+let automationQueue = new Queue(JobQueues.AUTOMATIONS, redisConfig);
 exports.pathPrefix = "/bulladmin";
 exports.init = () => {
     const expressApp = express();
     // Set up queues for bull board admin
-    const queues = getQueues();
+    const queues = [automationQueue];
     const adapters = [];
     for (let queue of queues) {
         adapters.push(new BullAdapter(queue));
@@ -16,3 +24,4 @@ exports.init = () => {
     expressApp.use(exports.pathPrefix, router);
     return expressApp;
 };
+exports.queue = automationQueue;

package/dist/automations/index.js

@@ -8,55 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const triggers = require("./triggers");
-const actions = require("./actions");
-const env = require("../environment");
-const workerFarm = require("worker-farm");
-const singleThread = require("./thread");
-const { getAPIKey, update, Properties } = require("../utilities/usageQuota");
-let workers = workerFarm(require.resolve("./thread"));
-function runWorker(job) {
-    return new Promise((resolve, reject) => {
-        workers(job, err => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve();
-            }
-        });
-    });
-}
-function updateQuota(automation) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const appId = automation.appId;
-        const apiObj = yield getAPIKey(appId);
-        // this will fail, causing automation to escape if limits reached
-        yield update(apiObj.apiKey, Properties.AUTOMATION, 1);
-        return apiObj.apiKey;
-    });
-}
+const { processEvent } = require("./utils");
+const { queue } = require("./bullboard");
 /**
  * This module is built purely to kick off the worker farm and manage the inputs/outputs
  */
-module.exports.init = function () {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield actions.init();
-        triggers.automationQueue.process((job) => __awaiter(this, void 0, void 0, function* () {
-            try {
-                if (env.USE_QUOTAS) {
-                    job.data.automation.apiKey = yield updateQuota(job.data.automation);
-                }
-                if (env.isProd()) {
-                    yield runWorker(job);
-                }
-                else {
-                    yield singleThread(job);
-                }
-            }
-            catch (err) {
-                console.error(`${job.data.automation.appId} automation ${job.data.automation._id} was unable to run - ${err}`);
-            }
-        }));
-    });
+exports.init = function () {
+    // this promise will not complete
+    return queue.process((job) => __awaiter(this, void 0, void 0, function* () {
+        yield processEvent(job);
+    }));
+};
+exports.getQueues = () => {
+    return [queue];
 };
+exports.queue = queue;

package/dist/automations/steps/bash.js

@@ -10,12 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { execSync } = require("child_process");
 const { processStringSync } = require("@budibase/string-templates");
-module.exports.definition = {
+exports.definition = {
     name: "Bash Scripting",
     tagline: "Execute a bash command",
-    icon: "ri-terminal-box-line",
+    icon: "JourneyEvent",
     description: "Run a bash script",
     type: "ACTION",
+    internal: true,
     stepId: "EXECUTE_BASH",
     inputs: {},
     schema: {
@@ -33,14 +34,18 @@ module.exports.definition = {
             properties: {
                 stdout: {
                     type: "string",
-                    description: "Standard output of your bash command or script.",
+                    description: "Standard output of your bash command or script",
+                },
+                success: {
+                    type: "boolean",
+                    description: "Whether the command was successful",
                 },
             },
         },
         required: ["stdout"],
     },
 };
-module.exports.run = function ({ inputs, context }) {
+exports.run = function ({ inputs, context }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (inputs.code == null) {
             return {
@@ -49,19 +54,20 @@ module.exports.run = function ({ inputs, context }) {
         }
         try {
             const command = processStringSync(inputs.code, context);
-            let stdout;
+            let stdout, success = true;
             try {
                 stdout = execSync(command, { timeout: 500 }).toString();
             }
             catch (err) {
                 stdout = err.message;
+                success = false;
             }
             return {
                 stdout,
+                success,
             };
         }
         catch (err) {
-            console.error(err);
             return {
                 success: false,
                 response: err,

package/dist/automations/steps/createRow.js

@@ -12,12 +12,13 @@ const rowController = require("../../api/controllers/row");
 const automationUtils = require("../automationUtils");
 const env = require("../../environment");
 const usage = require("../../utilities/usageQuota");
-module.exports.definition = {
+exports.definition = {
     name: "Create Row",
     tagline: "Create a {{inputs.enriched.table.name}} row",
-    icon: "ri-save-3-line",
+    icon: "TableRowAddBottom",
     description: "Add a row to your database",
     type: "ACTION",
+    internal: true,
     stepId: "CREATE_ROW",
     inputs: {},
     schema: {
@@ -51,7 +52,7 @@ module.exports.definition = {
                 },
                 success: {
                     type: "boolean",
-                    description: "Whether the action was successful",
+                    description: "Whether the row creation was successful",
                 },
                 id: {
                     type: "string",
@@ -66,7 +67,7 @@ module.exports.definition = {
         },
     },
 };
-module.exports.run = function ({ inputs, appId, apiKey, emitter }) {
+exports.run = function ({ inputs, appId, apiKey, emitter }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (inputs.row == null || inputs.row.tableId == null) {
             return {
@@ -102,7 +103,6 @@ module.exports.run = function ({ inputs, appId, apiKey, emitter }) {
             };
         }
         catch (err) {
-            console.error(err);
             return {
                 success: false,
                 response: err,

package/dist/automations/steps/delay.js

@@ -9,12 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 let { wait } = require("../../utilities");
-module.exports.definition = {
+exports.definition = {
     name: "Delay",
-    icon: "ri-time-line",
+    icon: "Clock",
     tagline: "Delay for {{inputs.time}} milliseconds",
     description: "Delay the automation until an amount of time has passed",
     stepId: "DELAY",
+    internal: true,
     inputs: {},
     schema: {
         inputs: {
@@ -26,11 +27,23 @@ module.exports.definition = {
             },
             required: ["time"],
         },
+        outputs: {
+            properties: {
+                success: {
+                    type: "boolean",
+                    description: "Whether the delay was successful",
+                },
+            },
+            required: ["success"],
+        },
     },
     type: "LOGIC",
 };
-module.exports.run = function delay({ inputs }) {
+exports.run = function delay({ inputs }) {
     return __awaiter(this, void 0, void 0, function* () {
         yield wait(inputs.time);
+        return {
+            success: true,
+        };
     });
 };

package/dist/automations/steps/deleteRow.js

@@ -11,13 +11,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const rowController = require("../../api/controllers/row");
 const env = require("../../environment");
 const usage = require("../../utilities/usageQuota");
-module.exports.definition = {
+exports.definition = {
     description: "Delete a row from your database",
-    icon: "ri-delete-bin-line",
+    icon: "TableRowRemoveCenter",
     name: "Delete Row",
     tagline: "Delete a {{inputs.enriched.table.name}} row",
     type: "ACTION",
     stepId: "DELETE_ROW",
+    internal: true,
     inputs: {},
     schema: {
         inputs: {
@@ -51,14 +52,14 @@ module.exports.definition = {
                 },
                 success: {
                     type: "boolean",
-                    description: "Whether the action was successful",
+                    description: "Whether the deletion was successful",
                 },
             },
             required: ["row", "success"],
         },
     },
 };
-module.exports.run = function ({ inputs, appId, apiKey, emitter }) {
+exports.run = function ({ inputs, appId, apiKey, emitter }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (inputs.id == null || inputs.revision == null) {
             return {
@@ -93,7 +94,6 @@ module.exports.run = function ({ inputs, appId, apiKey, emitter }) {
             };
         }
         catch (err) {
-            console.error(err);
             return {
                 success: false,
                 response: err,

package/dist/automations/steps/discord.js

@@ -0,0 +1,91 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const fetch = require("node-fetch");
+const { getFetchResponse } = require("./utils");
+const DEFAULT_USERNAME = "Budibase Automate";
+const DEFAULT_AVATAR_URL = "https://i.imgur.com/a1cmTKM.png";
+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: "discord",
+    type: "ACTION",
+    internal: false,
+    inputs: {},
+    schema: {
+        inputs: {
+            properties: {
+                url: {
+                    type: "string",
+                    title: "Discord Webhook URL",
+                },
+                username: {
+                    type: "string",
+                    title: "Bot Name",
+                },
+                avatar_url: {
+                    type: "string",
+                    title: "Bot Avatar URL",
+                },
+                content: {
+                    type: "string",
+                    title: "Message",
+                },
+            },
+            required: ["url", "content"],
+        },
+        outputs: {
+            properties: {
+                httpStatus: {
+                    type: "number",
+                    description: "The HTTP status code of the request",
+                },
+                response: {
+                    type: "string",
+                    description: "The response from the Discord Webhook",
+                },
+                success: {
+                    type: "boolean",
+                    description: "Whether the message sent successfully",
+                },
+            },
+        },
+    },
+};
+exports.run = function ({ inputs }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let { url, username, avatar_url, content } = inputs;
+        if (!username) {
+            username = DEFAULT_USERNAME;
+        }
+        if (!avatar_url) {
+            avatar_url = DEFAULT_AVATAR_URL;
+        }
+        const response = yield fetch(url, {
+            method: "post",
+            body: JSON.stringify({
+                username,
+                avatar_url,
+                content,
+            }),
+            headers: {
+                "Content-Type": "application/json",
+            },
+        });
+        const { status, message } = yield getFetchResponse(response);
+        return {
+            httpStatus: status,
+            success: status === 200,
+            response: message,
+        };
+    });
+};

package/dist/automations/steps/executeQuery.js

@@ -20,13 +20,15 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 const queryController = require("../../api/controllers/query");
-module.exports.definition = {
+const { buildCtx } = require("./utils");
+exports.definition = {
     name: "External Data Connector",
     tagline: "Execute Data Connector",
-    icon: "ri-database-2-line",
+    icon: "Data",
     description: "Execute a query in an external data connector",
     type: "ACTION",
     stepId: "EXECUTE_QUERY",
+    internal: true,
     inputs: {},
     schema: {
         inputs: {
@@ -61,7 +63,7 @@ module.exports.definition = {
         required: ["response", "success"],
     },
 };
-module.exports.run = function ({ inputs, appId, emitter }) {
+exports.run = function ({ inputs, appId, emitter }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (inputs.query == null) {
             return {
@@ -72,27 +74,22 @@ module.exports.run = function ({ inputs, appId, emitter }) {
             };
         }
         const _a = inputs.query, { queryId } = _a, rest = __rest(_a, ["queryId"]);
-        const ctx = {
+        const ctx = buildCtx(appId, emitter, {
+            body: {
+                parameters: rest,
+            },
             params: {
                 queryId,
             },
-            request: {
-                body: {
-                    parameters: rest,
-                },
-            },
-            appId,
-            eventEmitter: emitter,
-        };
-        yield queryController.execute(ctx);
+        });
         try {
+            yield queryController.execute(ctx);
             return {
                 response: ctx.body,
-                success: ctx.status === 200,
+                success: true,
             };
         }
         catch (err) {
-            console.error(err);
             return {
                 success: false,
                 response: err,

package/dist/automations/steps/executeScript.js

@@ -9,12 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const scriptController = require("../../api/controllers/script");
-module.exports.definition = {
+const { buildCtx } = require("./utils");
+exports.definition = {
     name: "JS Scripting",
     tagline: "Execute JavaScript Code",
-    icon: "ri-terminal-box-line",
+    icon: "Code",
     description: "Run a piece of JavaScript code in your automation",
     type: "ACTION",
+    internal: true,
     stepId: "EXECUTE_SCRIPT",
     inputs: {},
     schema: {
@@ -32,7 +34,7 @@ module.exports.definition = {
             properties: {
                 value: {
                     type: "string",
-                    description: "The result of the last statement of the executed script.",
+                    description: "The result of the return statement",
                 },
                 success: {
                     type: "boolean",
@@ -43,7 +45,7 @@ module.exports.definition = {
         required: ["success"],
     },
 };
-module.exports.run = function ({ inputs, appId, context, emitter }) {
+exports.run = function ({ inputs, appId, context, emitter }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (inputs.code == null) {
             return {
@@ -53,25 +55,20 @@ module.exports.run = function ({ inputs, appId, context, emitter }) {
                 },
             };
         }
-        const ctx = {
-            request: {
-                body: {
-                    script: inputs.code,
-                    context,
-                },
+        const ctx = buildCtx(appId, emitter, {
+            body: {
+                script: inputs.code,
+                context,
             },
-            user: { appId },
-            eventEmitter: emitter,
-        };
+        });
         try {
             yield scriptController.execute(ctx);
             return {
-                success: ctx.status === 200,
+                success: true,
                 value: ctx.body,
             };
         }
         catch (err) {
-            console.error(err);
             return {
                 success: false,
                 response: err,