@budibase/server 2.5.9 → 2.5.10-alpha.1

package/dist/api/routes/{cloud.js → ops.js}

@@ -26,14 +26,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.errorValidator = exports.logsValidator = void 0;
 const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/cloud"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
+const controller = __importStar(require("../controllers/ops"));
 const backend_core_1 = require("@budibase/backend-core");
+const joi_1 = __importDefault(require("joi"));
+function logsValidator() {
+    return backend_core_1.middleware.joiValidator.body(joi_1.default.object({
+        message: joi_1.default.string().required(),
+        data: joi_1.default.object(),
+    }));
+}
+exports.logsValidator = logsValidator;
+function errorValidator() {
+    return backend_core_1.middleware.joiValidator.body(joi_1.default.object({
+        message: joi_1.default.string().required(),
+    }));
+}
+exports.errorValidator = errorValidator;
 const router = new router_1.default();
 router
-    .get("/api/cloud/export", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.exportApps)
-    // has to be public, only run if apps don't exist
-    .post("/api/cloud/import", controller.importApps)
-    .get("/api/cloud/import/complete", controller.hasBeenImported);
+    .post("/api/ops/log", logsValidator(), controller.log)
+    .post("/api/ops/error", errorValidator(), controller.error)
+    .post("/api/ops/alert", errorValidator(), controller.alert);
 exports.default = router;

package/dist/api/routes/user.js

@@ -38,7 +38,6 @@ router
     .put("/api/users/metadata", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.updateMetadata)
     .post("/api/users/metadata/self", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.updateSelfMetadata)
     .delete("/api/users/metadata/:id", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.destroyMetadata)
-    .post("/api/users/metadata/sync/:id", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.syncUser)
     .post("/api/users/flags", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.setFlag)
     .get("/api/users/flags", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.READ), controller.getFlags);
 exports.default = router;

package/dist/app.js

@@ -38,18 +38,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 if (process.env.DD_APM_ENABLED) {
     require("./ddApm");
 }
-if (process.env.ELASTIC_APM_ENABLED) {
-    require("./elasticApm");
-}
 // need to load environment first
 const environment_1 = __importDefault(require("./environment"));
-// enable APM if configured
-if (process.env.ELASTIC_APM_ENABLED) {
-    const apm = require("elastic-apm-node").start({
-        serviceName: process.env.SERVICE,
-        environment: process.env.BUDIBASE_ENVIRONMENT,
-    });
-}
 const db = __importStar(require("./db"));
 db.init();
 const koa_1 = __importDefault(require("koa"));
@@ -59,8 +49,8 @@ const api = __importStar(require("./api"));
 const automations = __importStar(require("./automations"));
 const threads_1 = require("./threads");
 const redis = __importStar(require("./utilities/redis"));
+const websockets_1 = require("./websockets");
 const backend_core_1 = require("@budibase/backend-core");
-const websocket_1 = require("./websocket");
 const startup_1 = require("./startup");
 const Sentry = require("@sentry/node");
 const destroyable = require("server-destroy");
@@ -80,7 +70,8 @@ app.use((0, koa_body_1.default)({
     enableTypes: ["json", "form", "text"],
     parsedMethods: ["POST", "PUT", "PATCH", "DELETE"],
 }));
-app.use(backend_core_1.middleware.logging);
+app.use(backend_core_1.middleware.correlation);
+app.use(backend_core_1.middleware.pino);
 app.use(userAgent);
 if (environment_1.default.isProd()) {
     environment_1.default._set("NODE_ENV", "production");
@@ -96,7 +87,7 @@ if (environment_1.default.isProd()) {
 }
 const server = http_1.default.createServer(app.callback());
 destroyable(server);
-(0, websocket_1.initialise)(server);
+(0, websockets_1.initialise)(app, server);
 let shuttingDown = false, errCode = 0;
 server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     // already in process

package/dist/automations/actions.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAction = exports.ACTION_DEFINITIONS = void 0;
+exports.getAction = exports.getActionDefinitions = exports.BUILTIN_ACTION_DEFINITIONS = void 0;
 const sendSmtpEmail = __importStar(require("./steps/sendSmtpEmail"));
 const createRow = __importStar(require("./steps/createRow"));
 const updateRow = __importStar(require("./steps/updateRow"));
@@ -53,6 +53,9 @@ const delay = __importStar(require("./steps/delay"));
 const queryRow = __importStar(require("./steps/queryRows"));
 const loop = __importStar(require("./steps/loop"));
 const environment_1 = __importDefault(require("../environment"));
+const types_1 = require("@budibase/types");
+const sdk_1 = __importDefault(require("../sdk"));
+const fileSystem_1 = require("../utilities/fileSystem");
 const ACTION_IMPLS = {
     SEND_EMAIL_SMTP: sendSmtpEmail.run,
     CREATE_ROW: createRow.run,
@@ -71,7 +74,7 @@ const ACTION_IMPLS = {
     zapier: zapier.run,
     integromat: integromat.run,
 };
-exports.ACTION_DEFINITIONS = {
+exports.BUILTIN_ACTION_DEFINITIONS = {
     SEND_EMAIL_SMTP: sendSmtpEmail.definition,
     CREATE_ROW: createRow.definition,
     UPDATE_ROW: updateRow.definition,
@@ -98,13 +101,36 @@ if (environment_1.default.SELF_HOSTED) {
     // @ts-ignore
     ACTION_IMPLS["EXECUTE_BASH"] = bash.run;
     // @ts-ignore
-    exports.ACTION_DEFINITIONS["EXECUTE_BASH"] = bash.definition;
+    exports.BUILTIN_ACTION_DEFINITIONS["EXECUTE_BASH"] = bash.definition;
 }
+function getActionDefinitions() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const actionDefinitions = exports.BUILTIN_ACTION_DEFINITIONS;
+        if (environment_1.default.SELF_HOSTED) {
+            const plugins = yield sdk_1.default.plugins.fetch(types_1.PluginType.AUTOMATION);
+            for (let plugin of plugins) {
+                const schema = plugin.schema.schema;
+                actionDefinitions[schema.stepId] = Object.assign(Object.assign({}, schema), { custom: true });
+            }
+        }
+        return actionDefinitions;
+    });
+}
+exports.getActionDefinitions = getActionDefinitions;
 /* istanbul ignore next */
-function getAction(actionName) {
+function getAction(stepId) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (ACTION_IMPLS[actionName] != null) {
-            return ACTION_IMPLS[actionName];
+        if (ACTION_IMPLS[stepId] != null) {
+            return ACTION_IMPLS[stepId];
+        }
+        // must be a plugin
+        if (environment_1.default.SELF_HOSTED) {
+            const plugins = yield sdk_1.default.plugins.fetch(types_1.PluginType.AUTOMATION);
+            const found = plugins.find(plugin => plugin.schema.schema.stepId === stepId);
+            if (!found) {
+                throw new Error(`Unable to find action implementation for "${stepId}"`);
+            }
+            return (yield (0, fileSystem_1.getAutomationPlugin)(found)).action;
         }
     });
 }

package/dist/automations/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQueues = exports.init = exports.ACTION_DEFINITIONS = exports.TRIGGER_DEFINITIONS = exports.shutdown = exports.automationQueue = void 0;
+exports.getQueues = exports.init = exports.getActionDefinitions = exports.BUILTIN_ACTION_DEFINITIONS = exports.TRIGGER_DEFINITIONS = exports.shutdown = exports.automationQueue = void 0;
 const utils_1 = require("./utils");
 const bullboard_1 = require("./bullboard");
 const triggers_1 = require("./triggers");
@@ -20,7 +20,8 @@ Object.defineProperty(exports, "shutdown", { enumerable: true, get: function ()
 var triggers_2 = require("./triggers");
 Object.defineProperty(exports, "TRIGGER_DEFINITIONS", { enumerable: true, get: function () { return triggers_2.TRIGGER_DEFINITIONS; } });
 var actions_1 = require("./actions");
-Object.defineProperty(exports, "ACTION_DEFINITIONS", { enumerable: true, get: function () { return actions_1.ACTION_DEFINITIONS; } });
+Object.defineProperty(exports, "BUILTIN_ACTION_DEFINITIONS", { enumerable: true, get: function () { return actions_1.BUILTIN_ACTION_DEFINITIONS; } });
+Object.defineProperty(exports, "getActionDefinitions", { enumerable: true, get: function () { return actions_1.getActionDefinitions; } });
 /**
  * This module is built purely to kick off the worker farm and manage the inputs/outputs
  */

package/dist/automations/steps/bash.js

@@ -46,7 +46,7 @@ exports.definition = {
     tagline: "Execute a bash command",
     icon: "JourneyEvent",
     description: "Run a bash script",
-    type: "ACTION",
+    type: types_1.AutomationStepType.ACTION,
     internal: true,
     stepId: types_1.AutomationActionStepId.EXECUTE_BASH,
     inputs: {},
@@ -54,8 +54,8 @@ exports.definition = {
         inputs: {
             properties: {
                 code: {
-                    type: "string",
-                    customType: "code",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.CODE,
                     title: "Code",
                 },
             },
@@ -64,16 +64,16 @@ exports.definition = {
         outputs: {
             properties: {
                 stdout: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "Standard output of your bash command or script",
                 },
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the command was successful",
                 },
             },
+            required: ["stdout"],
         },
-        required: ["stdout"],
     },
 };
 function run({ inputs, context }) {

package/dist/automations/steps/createRow.js

@@ -19,7 +19,7 @@ exports.definition = {
     tagline: "Create a {{inputs.enriched.table.name}} row",
     icon: "TableRowAddBottom",
     description: "Add a row to your database",
-    type: "ACTION",
+    type: types_1.AutomationStepType.ACTION,
     internal: true,
     stepId: types_1.AutomationActionStepId.CREATE_ROW,
     inputs: {},
@@ -27,14 +27,14 @@ exports.definition = {
         inputs: {
             properties: {
                 row: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     properties: {
                         tableId: {
-                            type: "string",
-                            customType: "table",
+                            type: types_1.AutomationIOType.STRING,
+                            customType: types_1.AutomationCustomIOType.TABLE,
                         },
                     },
-                    customType: "row",
+                    customType: types_1.AutomationCustomIOType.ROW,
                     title: "Table",
                     required: ["tableId"],
                 },
@@ -44,24 +44,24 @@ exports.definition = {
         outputs: {
             properties: {
                 row: {
-                    type: "object",
-                    customType: "row",
+                    type: types_1.AutomationIOType.OBJECT,
+                    customType: types_1.AutomationCustomIOType.ROW,
                     description: "The new row",
                 },
                 response: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     description: "The response from the table",
                 },
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the row creation was successful",
                 },
                 id: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "The identifier of the new row",
                 },
                 revision: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "The revision of the new row",
                 },
             },

package/dist/automations/steps/delay.js

@@ -24,7 +24,7 @@ exports.definition = {
         inputs: {
             properties: {
                 time: {
-                    type: "number",
+                    type: types_1.AutomationIOType.NUMBER,
                     title: "Delay in milliseconds",
                 },
             },
@@ -33,14 +33,14 @@ exports.definition = {
         outputs: {
             properties: {
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the delay was successful",
                 },
             },
             required: ["success"],
         },
     },
-    type: "LOGIC",
+    type: types_1.AutomationStepType.LOGIC,
 };
 function run({ inputs }) {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/automations/steps/deleteRow.js

@@ -19,7 +19,7 @@ exports.definition = {
     icon: "TableRowRemoveCenter",
     name: "Delete Row",
     tagline: "Delete a {{inputs.enriched.table.name}} row",
-    type: "ACTION",
+    type: types_1.AutomationStepType.ACTION,
     stepId: types_1.AutomationActionStepId.DELETE_ROW,
     internal: true,
     inputs: {},
@@ -27,12 +27,12 @@ exports.definition = {
         inputs: {
             properties: {
                 tableId: {
-                    type: "string",
-                    customType: "table",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.TABLE,
                     title: "Table",
                 },
                 id: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Row ID",
                 },
             },
@@ -41,16 +41,16 @@ exports.definition = {
         outputs: {
             properties: {
                 row: {
-                    type: "object",
-                    customType: "row",
+                    type: types_1.AutomationIOType.OBJECT,
+                    customType: types_1.AutomationCustomIOType.ROW,
                     description: "The deleted row",
                 },
                 response: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     description: "The response from the table",
                 },
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the deletion was successful",
                 },
             },

package/dist/automations/steps/discord.js

@@ -24,26 +24,26 @@ exports.definition = {
     description: "Send a message to a Discord server",
     icon: "ri-discord-line",
     stepId: types_1.AutomationActionStepId.discord,
-    type: "ACTION",
+    type: types_1.AutomationStepType.ACTION,
     internal: false,
     inputs: {},
     schema: {
         inputs: {
             properties: {
                 url: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Discord Webhook URL",
                 },
                 username: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Bot Name",
                 },
                 avatar_url: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Bot Avatar URL",
                 },
                 content: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Message",
                 },
             },
@@ -52,15 +52,15 @@ exports.definition = {
         outputs: {
             properties: {
                 httpStatus: {
-                    type: "number",
+                    type: types_1.AutomationIOType.NUMBER,
                     description: "The HTTP status code of the request",
                 },
                 response: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "The response from the Discord Webhook",
                 },
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the message sent successfully",
                 },
             },

package/dist/automations/steps/executeQuery.js

@@ -53,7 +53,7 @@ exports.definition = {
     tagline: "Execute Data Connector",
     icon: "Data",
     description: "Execute a query in an external data connector",
-    type: "ACTION",
+    type: types_1.AutomationStepType.ACTION,
     stepId: types_1.AutomationActionStepId.EXECUTE_QUERY,
     internal: true,
     inputs: {},
@@ -61,14 +61,14 @@ exports.definition = {
         inputs: {
             properties: {
                 query: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     properties: {
                         queryId: {
-                            type: "string",
-                            customType: "query",
+                            type: types_1.AutomationIOType.STRING,
+                            customType: types_1.AutomationCustomIOType.QUERY,
                         },
                     },
-                    customType: "queryParams",
+                    customType: types_1.AutomationCustomIOType.QUERY_PARAMS,
                     title: "Parameters",
                     required: ["queryId"],
                 },
@@ -78,20 +78,20 @@ exports.definition = {
         outputs: {
             properties: {
                 response: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     description: "The response from the datasource execution",
                 },
                 info: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     description: "Some query types may return extra data, like headers from a REST query",
                 },
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the action was successful",
                 },
             },
+            required: ["response", "success"],
         },
-        required: ["response", "success"],
     },
 };
 function run({ inputs, appId, emitter }) {

package/dist/automations/steps/executeScript.js

@@ -42,7 +42,7 @@ exports.definition = {
     tagline: "Execute JavaScript Code",
     icon: "Code",
     description: "Run a piece of JavaScript code in your automation",
-    type: "ACTION",
+    type: types_1.AutomationStepType.ACTION,
     internal: true,
     stepId: types_1.AutomationActionStepId.EXECUTE_SCRIPT,
     inputs: {},
@@ -50,8 +50,8 @@ exports.definition = {
         inputs: {
             properties: {
                 code: {
-                    type: "string",
-                    customType: "code",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.CODE,
                     title: "Code",
                 },
             },
@@ -60,16 +60,16 @@ exports.definition = {
         outputs: {
             properties: {
                 value: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "The result of the return statement",
                 },
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the action was successful",
                 },
             },
+            required: ["success"],
         },
-        required: ["success"],
     },
 };
 function run({ inputs, appId, context, emitter, }) {

package/dist/automations/steps/filter.js

@@ -28,7 +28,7 @@ exports.definition = {
     tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}",
     icon: "Branch2",
     description: "Conditionally halt automations which do not meet certain conditions",
-    type: "LOGIC",
+    type: types_1.AutomationStepType.LOGIC,
     internal: true,
     stepId: types_1.AutomationActionStepId.FILTER,
     inputs: {
@@ -38,17 +38,17 @@ exports.definition = {
         inputs: {
             properties: {
                 field: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Reference Value",
                 },
                 condition: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Condition",
                     enum: Object.values(exports.FilterConditions),
                     pretty: Object.values(exports.PrettyFilterConditions),
                 },
                 value: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Comparison Value",
                 },
             },
@@ -57,11 +57,11 @@ exports.definition = {
         outputs: {
             properties: {
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the action was successful",
                 },
                 result: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the logic block passed",
                 },
             },

package/dist/automations/steps/integromat.js

@@ -22,34 +22,34 @@ exports.definition = {
     description: "Performs a webhook call to Integromat and gets the response (if configured)",
     icon: "ri-shut-down-line",
     stepId: types_1.AutomationActionStepId.integromat,
-    type: "ACTION",
+    type: types_1.AutomationStepType.ACTION,
     internal: false,
     inputs: {},
     schema: {
         inputs: {
             properties: {
                 url: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Webhook URL",
                 },
                 value1: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Input Value 1",
                 },
                 value2: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Input Value 2",
                 },
                 value3: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Input Value 3",
                 },
                 value4: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Input Value 4",
                 },
                 value5: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Input Value 5",
                 },
             },
@@ -58,15 +58,15 @@ exports.definition = {
         outputs: {
             properties: {
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether call was successful",
                 },
                 httpStatus: {
-                    type: "number",
+                    type: types_1.AutomationIOType.NUMBER,
                     description: "The HTTP status code returned",
                 },
                 response: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     description: "The webhook response - this can have properties",
                 },
             },

package/dist/automations/steps/loop.js

@@ -14,19 +14,19 @@ exports.definition = {
         inputs: {
             properties: {
                 option: {
-                    customType: "loopOption",
+                    customType: types_1.AutomationCustomIOType.LOOP_OPTION,
                     title: "Input type",
                 },
                 binding: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Binding / Value",
                 },
                 iterations: {
-                    type: "number",
+                    type: types_1.AutomationIOType.NUMBER,
                     title: "Max loop iterations",
                 },
                 failure: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Failure Condition",
                 },
             },
@@ -35,20 +35,20 @@ exports.definition = {
         outputs: {
             properties: {
                 items: {
-                    customType: "item",
+                    customType: types_1.AutomationCustomIOType.ITEM,
                     description: "The item currently being executed",
                 },
                 success: {
-                    type: "boolean",
+                    type: types_1.AutomationIOType.BOOLEAN,
                     description: "Whether the message loop was successfully",
                 },
                 iterations: {
-                    type: "number",
-                    descriptions: "The amount of times the block ran",
+                    type: types_1.AutomationIOType.NUMBER,
+                    description: "The amount of times the block ran",
                 },
             },
             required: ["success", "items", "iterations"],
         },
     },
-    type: "LOGIC",
+    type: types_1.AutomationStepType.LOGIC,
 };