@budibase/server 2.0.38 → 2.0.40-alpha.0

package/dist/api/controllers/table/internal.js

@@ -19,6 +19,9 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulkImport = exports.destroy = exports.save = void 0;
 const linkedRows_1 = require("../../../db/linkedRows");
@@ -32,6 +35,8 @@ const bulkFormula_1 = require("./bulkFormula");
 const pro_1 = require("@budibase/pro");
 const lodash_1 = require("lodash");
 const fp_1 = require("lodash/fp");
+const environment_2 = __importDefault(require("../../../environment"));
+const sdk_1 = __importDefault(require("../../../sdk"));
 function checkAutoColumns(table, oldTable) {
     if (!table.schema) {
         return table;
@@ -150,7 +155,9 @@ function destroy(ctx) {
             include_docs: true,
         }));
         yield db.bulkDocs(rows.rows.map((row) => (Object.assign(Object.assign({}, row.doc), { _deleted: true }))));
-        yield pro_1.quotas.removeRows(rows.rows.length);
+        yield pro_1.quotas.removeRows(rows.rows.length, {
+            tableId: ctx.params.tableId,
+        });
         // update linked rows
         yield (0, linkedRows_1.updateLinks)({
             eventType: linkedRows_1.EventType.TABLE_DELETE,
@@ -159,7 +166,7 @@ function destroy(ctx) {
         // don't remove the table itself until very end
         yield db.remove(tableToDelete);
         // remove table search index
-        if (!(0, environment_1.isTest)()) {
+        if (!(0, environment_1.isTest)() || environment_2.default.COUCH_DB_URL) {
             const currentIndexes = yield db.getIndexes();
             const existingIndex = currentIndexes.indexes.find((existing) => existing.name === `search:${ctx.params.tableId}`);
             if (existingIndex) {
@@ -178,7 +185,7 @@ function destroy(ctx) {
 exports.destroy = destroy;
 function bulkImport(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const table = yield (0, utils_2.getTable)(ctx.params.tableId);
+        const table = yield sdk_1.default.tables.getTable(ctx.params.tableId);
         const { dataImport } = ctx.request.body;
         yield (0, utils_2.handleDataImport)(ctx.user, table, dataImport);
         return table;

package/dist/api/controllers/table/utils.js

@@ -12,15 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableSaveFunctions = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.getTable = exports.getExternalTable = exports.getAllExternalTables = exports.getAllInternalTables = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
+exports.TableSaveFunctions = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
 const csvParser_1 = require("../../../utilities/csvParser");
 const utils_1 = require("../../../db/utils");
 const lodash_1 = require("lodash");
 const constants_1 = require("../../../constants");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const constants_2 = require("../../../constants");
-const utils_2 = require("../../../integrations/utils");
-const utils_3 = require("../view/utils");
+const utils_2 = require("../view/utils");
 const viewBuilder_1 = __importDefault(require("../view/viewBuilder"));
 const { getAppDB } = require("@budibase/backend-core/context");
 const fp_1 = require("lodash/fp");
@@ -130,7 +129,9 @@ function handleDataImport(user, table, dataImport) {
             }
             finalData.push(row);
         }
-        yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData));
+        yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
+            tableId: table._id,
+        });
         yield backend_core_1.events.rows.imported(table, "csv", finalData.length);
         return table;
     });
@@ -228,52 +229,9 @@ class TableSaveFunctions {
         return this.rows;
     }
 }
-function getAllInternalTables() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
-            include_docs: true,
-        }));
-        return internalTables.rows.map((tableDoc) => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: utils_1.BudibaseInternalDB._id })));
-    });
-}
-exports.getAllInternalTables = getAllInternalTables;
-function getAllExternalTables(datasourceId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        const datasource = yield db.get(datasourceId);
-        if (!datasource || !datasource.entities) {
-            throw "Datasource is not configured fully.";
-        }
-        return datasource.entities;
-    });
-}
-exports.getAllExternalTables = getAllExternalTables;
-function getExternalTable(datasourceId, tableName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const entities = yield getAllExternalTables(datasourceId);
-        return entities[tableName];
-    });
-}
-exports.getExternalTable = getExternalTable;
-function getTable(tableId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        if ((0, utils_2.isExternalTable)(tableId)) {
-            let { datasourceId, tableName } = (0, utils_2.breakExternalTableId)(tableId);
-            const datasource = yield db.get(datasourceId);
-            const table = yield getExternalTable(datasourceId, tableName);
-            return Object.assign(Object.assign({}, table), { sql: (0, utils_2.isSQL)(datasource) });
-        }
-        else {
-            return db.get(tableId);
-        }
-    });
-}
-exports.getTable = getTable;
 function checkForViewUpdates(table, rename, deletedColumns) {
     return __awaiter(this, void 0, void 0, function* () {
-        const views = yield (0, utils_3.getViews)();
+        const views = yield (0, utils_2.getViews)();
         const tableViews = views.filter(view => view.meta.tableId === table._id);
         // Check each table view to see if impacted by this table action
         for (let view of tableViews) {
@@ -329,7 +287,7 @@ function checkForViewUpdates(table, rename, deletedColumns) {
             // Update view if required
             if (needsUpdated) {
                 const newViewTemplate = (0, viewBuilder_1.default)(view.meta);
-                yield (0, utils_3.saveView)(null, view.name, newViewTemplate);
+                yield (0, utils_2.saveView)(null, view.name, newViewTemplate);
                 if (!newViewTemplate.meta.schema) {
                     newViewTemplate.meta.schema = table.schema;
                 }

package/dist/api/controllers/view/index.js

@@ -24,12 +24,12 @@ const { apiFileReturn } = require("../../../utilities/fileSystem");
 const exporters = require("./exporters");
 const { saveView, getView, getViews, deleteView } = require("./utils");
 const { fetchView } = require("../row");
-const { getTable } = require("../table/utils");
 const { FieldTypes } = require("../../../constants");
 const { getAppDB } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
 const { DocumentType } = require("../../../db/utils");
 const { cloneDeep, isEqual } = require("lodash");
+const sdk = require("../../../sdk");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = yield getViews();
 });
@@ -137,7 +137,7 @@ exports.exportView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     let rows = ctx.body;
     let schema = view && view.meta && view.meta.schema;
     const tableId = ctx.params.tableId || view.meta.tableId;
-    const table = yield getTable(tableId);
+    const table = yield sdk.tables.getTable(tableId);
     if (!schema) {
         schema = table.schema;
     }

package/dist/api/controllers/webhook.js

@@ -8,103 +8,102 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { generateWebhookID, getWebhookParams } = require("../../db/utils");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trigger = exports.buildSchema = exports.destroy = exports.save = exports.fetch = void 0;
+const utils_1 = require("../../db/utils");
+const triggers_1 = __importDefault(require("../../automations/triggers"));
+const backend_core_1 = require("@budibase/backend-core");
+const types_1 = require("@budibase/types");
+const sdk_1 = __importDefault(require("../../sdk"));
 const toJsonSchema = require("to-json-schema");
 const validate = require("jsonschema").validate;
-const { WebhookType } = require("../../constants");
-const triggers = require("../../automations/triggers");
-const { getProdAppID } = require("@budibase/backend-core/db");
-const { getAppDB, updateAppId } = require("@budibase/backend-core/context");
 const AUTOMATION_DESCRIPTION = "Generated from Webhook Schema";
-function Webhook(name, type, target) {
-    this.live = true;
-    this.name = name;
-    this.action = {
-        type,
-        target,
-    };
+function fetch(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.context.getAppDB();
+        const response = yield db.allDocs((0, utils_1.getWebhookParams)(null, {
+            include_docs: true,
+        }));
+        ctx.body = response.rows.map((row) => row.doc);
+    });
 }
-exports.Webhook = Webhook;
-exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    const response = yield db.allDocs(getWebhookParams(null, {
-        include_docs: true,
-    }));
-    ctx.body = response.rows.map(row => row.doc);
-});
-exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    const webhook = ctx.request.body;
-    webhook.appId = ctx.appId;
-    // check that the webhook exists
-    if (webhook._id) {
-        yield db.get(webhook._id);
-    }
-    else {
-        webhook._id = generateWebhookID();
-    }
-    const response = yield db.put(webhook);
-    webhook._rev = response.rev;
-    ctx.body = {
-        message: "Webhook created successfully",
-        webhook,
-    };
-});
-exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    ctx.body = yield db.remove(ctx.params.id, ctx.params.rev);
-});
-exports.buildSchema = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    yield updateAppId(ctx.params.instance);
-    const db = getAppDB();
-    const webhook = yield db.get(ctx.params.id);
-    webhook.bodySchema = toJsonSchema(ctx.request.body);
-    // update the automation outputs
-    if (webhook.action.type === WebhookType.AUTOMATION) {
-        let automation = yield db.get(webhook.action.target);
-        const autoOutputs = automation.definition.trigger.schema.outputs;
-        let properties = webhook.bodySchema.properties;
-        // reset webhook outputs
-        autoOutputs.properties = {
-            body: autoOutputs.properties.body,
+exports.fetch = fetch;
+function save(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const webhook = yield sdk_1.default.automations.webhook.save(ctx.request.body);
+        ctx.body = {
+            message: "Webhook created successfully",
+            webhook,
         };
-        for (let prop of Object.keys(properties)) {
-            autoOutputs.properties[prop] = {
-                type: properties[prop].type,
-                description: AUTOMATION_DESCRIPTION,
+    });
+}
+exports.save = save;
+function destroy(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        ctx.body = yield sdk_1.default.automations.webhook.destroy(ctx.params.id, ctx.params.rev);
+    });
+}
+exports.destroy = destroy;
+function buildSchema(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.context.updateAppId(ctx.params.instance);
+        const db = backend_core_1.context.getAppDB();
+        const webhook = (yield db.get(ctx.params.id));
+        webhook.bodySchema = toJsonSchema(ctx.request.body);
+        // update the automation outputs
+        if (webhook.action.type === types_1.WebhookActionType.AUTOMATION) {
+            let automation = (yield db.get(webhook.action.target));
+            const autoOutputs = automation.definition.trigger.schema.outputs;
+            let properties = webhook.bodySchema.properties;
+            // reset webhook outputs
+            autoOutputs.properties = {
+                body: autoOutputs.properties.body,
             };
+            for (let prop of Object.keys(properties)) {
+                autoOutputs.properties[prop] = {
+                    type: properties[prop].type,
+                    description: AUTOMATION_DESCRIPTION,
+                };
+            }
+            yield db.put(automation);
         }
-        yield db.put(automation);
-    }
-    ctx.body = yield db.put(webhook);
-});
-exports.trigger = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const prodAppId = getProdAppID(ctx.params.instance);
-    yield updateAppId(prodAppId);
-    try {
-        const db = getAppDB();
-        const webhook = yield db.get(ctx.params.id);
-        // validate against the schema
-        if (webhook.bodySchema) {
-            validate(ctx.request.body, webhook.bodySchema);
-        }
-        const target = yield db.get(webhook.action.target);
-        if (webhook.action.type === WebhookType.AUTOMATION) {
-            // trigger with both the pure request and then expand it
-            // incase the user has produced a schema to bind to
-            yield triggers.externalTrigger(target, Object.assign(Object.assign({ body: ctx.request.body }, ctx.request.body), { appId: prodAppId }));
-        }
-        ctx.status = 200;
-        ctx.body = {
-            message: "Webhook trigger fired successfully",
-        };
-    }
-    catch (err) {
-        if (err.status === 404) {
+        ctx.body = yield db.put(webhook);
+    });
+}
+exports.buildSchema = buildSchema;
+function trigger(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const prodAppId = backend_core_1.db.getProdAppID(ctx.params.instance);
+        yield backend_core_1.context.updateAppId(prodAppId);
+        try {
+            const db = backend_core_1.context.getAppDB();
+            const webhook = (yield db.get(ctx.params.id));
+            // validate against the schema
+            if (webhook.bodySchema) {
+                validate(ctx.request.body, webhook.bodySchema);
+            }
+            const target = yield db.get(webhook.action.target);
+            if (webhook.action.type === types_1.WebhookActionType.AUTOMATION) {
+                // trigger with both the pure request and then expand it
+                // incase the user has produced a schema to bind to
+                yield triggers_1.default.externalTrigger(target, Object.assign(Object.assign({ body: ctx.request.body }, ctx.request.body), { appId: prodAppId }));
+            }
             ctx.status = 200;
             ctx.body = {
-                message: "Application not deployed yet.",
+                message: "Webhook trigger fired successfully",
             };
         }
-    }
-});
+        catch (err) {
+            if (err.status === 404) {
+                ctx.status = 200;
+                ctx.body = {
+                    message: "Application not deployed yet.",
+                };
+            }
+        }
+    });
+}
+exports.trigger = trigger;

package/dist/api/routes/backup.js

@@ -1,8 +1,35 @@
 "use strict";
-const Router = require("@koa/router");
-const controller = require("../controllers/backup");
-const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/backend-core/permissions");
-const router = new Router();
-router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump);
-module.exports = router;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const router_1 = __importDefault(require("@koa/router"));
+const controller = __importStar(require("../controllers/backup"));
+const authorized_1 = __importDefault(require("../../middleware/authorized"));
+const permissions_1 = require("@budibase/backend-core/permissions");
+const router = new router_1.default();
+router.get("/api/backups/export", (0, authorized_1.default)(permissions_1.BUILDER), controller.exportAppDump);
+exports.default = router;

package/dist/api/routes/index.js

@@ -31,11 +31,16 @@ const dev_1 = __importDefault(require("./dev"));
 const cloud_1 = __importDefault(require("./cloud"));
 const migrations_1 = __importDefault(require("./migrations"));
 const plugin_1 = __importDefault(require("./plugin"));
+const pro_1 = require("@budibase/pro");
 var static_1 = require("./static");
 Object.defineProperty(exports, "staticRoutes", { enumerable: true, get: function () { return __importDefault(static_1).default; } });
 var public_1 = require("./public");
 Object.defineProperty(exports, "publicRoutes", { enumerable: true, get: function () { return __importDefault(public_1).default; } });
+const appBackupRoutes = pro_1.api.appBackups;
+const scheduleRoutes = pro_1.api.schedules;
 exports.mainRoutes = [
+    appBackupRoutes,
+    backup_1.default,
     auth_1.default,
     deploy_1.default,
     layout_1.default,
@@ -55,14 +60,14 @@ exports.mainRoutes = [
     permission_1.default,
     datasource_1.default,
     query_1.default,
-    backup_1.default,
     metadata_1.default,
     dev_1.default,
     cloud_1.default,
-    // these need to be handled last as they still use /api/:tableId
-    // this could be breaking as koa may recognise other routes as this
-    table_1.default,
     row_1.default,
     migrations_1.default,
     plugin_1.default,
+    scheduleRoutes,
+    // these need to be handled last as they still use /api/:tableId
+    // this could be breaking as koa may recognise other routes as this
+    table_1.default,
 ];

package/dist/api/routes/utils/validators.js

@@ -1,8 +1,8 @@
 "use strict";
 const { joiValidator } = require("@budibase/backend-core/auth");
 const { DataSourceOperation } = require("../../../constants");
-const { WebhookType } = require("../../../constants");
 const { BUILTIN_PERMISSION_IDS, PermissionLevels, } = require("@budibase/backend-core/permissions");
+const { WebhookActionType } = require("@budibase/types");
 const Joi = require("joi");
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("");
 const OPTIONAL_NUMBER = Joi.number().optional().allow(null);
@@ -113,7 +113,7 @@ exports.webhookValidator = () => {
         name: Joi.string().required(),
         bodySchema: Joi.object().optional(),
         action: Joi.object({
-            type: Joi.string().required().valid(WebhookType.AUTOMATION),
+            type: Joi.string().required().valid(WebhookActionType.AUTOMATION),
             target: Joi.string().required(),
         }).required(),
     }).unknown(true));

package/dist/api/routes/webhook.js

@@ -1,15 +1,43 @@
 "use strict";
-const Router = require("@koa/router");
-const controller = require("../controllers/webhook");
-const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/backend-core/permissions");
-const { webhookValidator } = require("./utils/validators");
-const router = new Router();
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const router_1 = __importDefault(require("@koa/router"));
+const controller = __importStar(require("../controllers/webhook"));
+const authorized_1 = __importDefault(require("../../middleware/authorized"));
+const backend_core_1 = require("@budibase/backend-core");
+const validators_1 = require("./utils/validators");
+const BUILDER = backend_core_1.permissions.BUILDER;
+const router = new router_1.default();
 router
-    .get("/api/webhooks", authorized(BUILDER), controller.fetch)
-    .put("/api/webhooks", authorized(BUILDER), webhookValidator(), controller.save)
-    .delete("/api/webhooks/:id/:rev", authorized(BUILDER), controller.destroy)
-    .post("/api/webhooks/schema/:instance/:id", authorized(BUILDER), controller.buildSchema)
+    .get("/api/webhooks", (0, authorized_1.default)(BUILDER), controller.fetch)
+    .put("/api/webhooks", (0, authorized_1.default)(BUILDER), (0, validators_1.webhookValidator)(), controller.save)
+    .delete("/api/webhooks/:id/:rev", (0, authorized_1.default)(BUILDER), controller.destroy)
+    .post("/api/webhooks/schema/:instance/:id", (0, authorized_1.default)(BUILDER), controller.buildSchema)
     // this shouldn't have authorisation, right now its always public
     .post("/api/webhooks/trigger/:instance/:id", controller.trigger);
-module.exports = router;
+exports.default = router;

package/dist/app.js

@@ -49,24 +49,16 @@ db_1.default.init();
 const Koa = require("koa");
 const destroyable = require("server-destroy");
 const koaBody = require("koa-body");
-const pino = require("koa-pino-logger");
 const http = require("http");
 const api = require("./api");
-const eventEmitter = require("./events");
 const automations = require("./automations/index");
 const Sentry = require("@sentry/node");
-const fileSystem = require("./utilities/fileSystem");
-const bullboard = require("./automations/bullboard");
 const { logAlert } = require("@budibase/backend-core/logging");
-const { pinoSettings } = require("@budibase/backend-core");
 const { Thread } = require("./threads");
-const fs = require("fs");
 const redis_1 = __importDefault(require("./utilities/redis"));
-const migrations = __importStar(require("./migrations"));
 const backend_core_1 = require("@budibase/backend-core");
-const workerRequests_1 = require("./utilities/workerRequests");
-const watch_1 = require("./watch");
 const websocket_1 = require("./websocket");
+const startup_1 = require("./startup");
 const app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -77,15 +69,6 @@ app.use(koaBody({
     enableTypes: ["json", "form", "text"],
     parsedMethods: ["POST", "PUT", "PATCH", "DELETE"],
 }));
-app.use(pino(pinoSettings()));
-if (!env.isTest()) {
-    const plugin = bullboard.init();
-    app.use(plugin);
-}
-app.context.eventEmitter = eventEmitter;
-app.context.auth = {};
-// api routes
-app.use(api.router.routes());
 if (env.isProd()) {
     env._set("NODE_ENV", "production");
     Sentry.init();
@@ -119,56 +102,7 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     }
 }));
 module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    console.log(`Budibase running on ${JSON.stringify(server.address())}`);
-    env._set("PORT", server.address().port);
-    eventEmitter.emitPort(env.PORT);
-    fileSystem.init();
-    yield redis_1.default.init();
-    // run migrations on startup if not done via http
-    // not recommended in a clustered environment
-    if (!env.HTTP_MIGRATIONS && !env.isTest()) {
-        try {
-            yield migrations.migrate();
-        }
-        catch (e) {
-            logAlert("Error performing migrations. Exiting.", e);
-            shutdown();
-        }
-    }
-    // check and create admin user if required
-    if (env.SELF_HOSTED &&
-        !env.MULTI_TENANCY &&
-        env.BB_ADMIN_USER_EMAIL &&
-        env.BB_ADMIN_USER_PASSWORD) {
-        const checklist = yield (0, workerRequests_1.getChecklist)();
-        if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
-            try {
-                const tenantId = backend_core_1.tenancy.getTenantId();
-                const user = yield (0, workerRequests_1.createAdminUser)(env.BB_ADMIN_USER_EMAIL, env.BB_ADMIN_USER_PASSWORD, tenantId);
-                // Need to set up an API key for automated integration tests
-                if (env.isTest()) {
-                    yield (0, workerRequests_1.generateApiKey)(user._id);
-                }
-                console.log("Admin account automatically created for", env.BB_ADMIN_USER_EMAIL);
-            }
-            catch (e) {
-                logAlert("Error creating initial admin user. Exiting.", e);
-                shutdown();
-            }
-        }
-    }
-    // monitor plugin directory if required
-    if (env.SELF_HOSTED &&
-        !env.MULTI_TENANCY &&
-        env.PLUGINS_DIR &&
-        fs.existsSync(env.PLUGINS_DIR)) {
-        (0, watch_1.watch)();
-    }
-    // check for version updates
-    yield backend_core_1.installation.checkInstallVersion();
-    // done last - this will never complete
-    yield automations.init();
+    yield (0, startup_1.startup)(app, server);
 }));
 const shutdown = () => {
     server.close();

package/dist/automations/automationUtils.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getTable } = require("../api/controllers/table/utils");
 const { decodeJSBinding, isJSBinding, encodeJSBinding, } = 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.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -67,7 +67,7 @@ exports.cleanInputValues = (inputs, schema) => {
  * @returns {Promise<Object>} The cleaned up rows object, will should now have all the required primitive types.
  */
 exports.cleanUpRow = (tableId, row) => __awaiter(void 0, void 0, void 0, function* () {
-    let table = yield getTable(tableId);
+    let table = yield sdk.tables.getTable(tableId);
     return exports.cleanInputValues(row, { properties: table.schema });
 });
 exports.getError = err => {