@budibase/server 2.0.34-alpha.0 → 2.0.34-alpha.10

package/dist/automations/utils.js

@@ -1,27 +1,4 @@
 "use strict";
-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 __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) {
@@ -38,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isErrorInOutput = exports.isRecurring = exports.cleanupAutomations = exports.checkForWebhooks = exports.enableCronTrigger = exports.isRebootTrigger = exports.isCronTrigger = exports.clearMetadata = exports.disableCronById = exports.disableAllCrons = exports.removeDeprecated = exports.updateTestHistory = exports.processEvent = void 0;
 const threads_1 = require("../threads");
 const triggerInfo_1 = require("./triggerInfo");
-const webhooks = __importStar(require("../api/controllers/webhook"));
 const bullboard_1 = require("./bullboard");
 const newid_1 = __importDefault(require("../db/newid"));
 const utilities_1 = require("../utilities");
@@ -49,6 +25,8 @@ const fp_1 = require("lodash/fp");
 const context_1 = require("@budibase/backend-core/context");
 const backend_core_1 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
+const types_1 = require("@budibase/types");
+const sdk_1 = __importDefault(require("../sdk"));
 const REBOOT_CRON = "@reboot";
 const WH_STEP_ID = triggerInfo_1.definitions.WEBHOOK.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
@@ -217,16 +195,12 @@ function checkForWebhooks({ oldAuto, newAuto }) {
                 let db = (0, context_1.getAppDB)();
                 // need to get the webhook to get the rev
                 const webhook = yield db.get(oldTrigger.webhookId);
-                const ctx = {
-                    appId,
-                    params: { id: webhook._id, rev: webhook._rev },
-                };
                 // might be updating - reset the inputs to remove the URLs
                 if (newTrigger) {
                     delete newTrigger.webhookId;
                     newTrigger.inputs = {};
                 }
-                yield webhooks.destroy(ctx);
+                yield sdk_1.default.automations.webhook.destroy(webhook._id, webhook._rev);
             }
             catch (err) {
                 // don't worry about not being able to delete, if it doesn't exist all good
@@ -235,14 +209,8 @@ function checkForWebhooks({ oldAuto, newAuto }) {
         // need to create webhook
         if ((!isWebhookTrigger(oldAuto) || triggerChanged) &&
             isWebhookTrigger(newAuto)) {
-            const ctx = {
-                appId,
-                request: {
-                    body: new webhooks.Webhook("Automation webhook", constants_1.WebhookType.AUTOMATION, newAuto._id),
-                },
-            };
-            yield webhooks.save(ctx);
-            const id = ctx.body.webhook._id;
+            const webhook = yield sdk_1.default.automations.webhook.save(sdk_1.default.automations.webhook.newDoc("Automation webhook", types_1.WebhookActionType.AUTOMATION, newAuto._id));
+            const id = webhook._id;
             newTrigger.webhookId = id;
             // the app ID has to be development for this endpoint
             // it can only be used when building the app

package/dist/constants/index.js

@@ -176,9 +176,6 @@ exports.BuildSchemaErrors = {
     NO_KEY: "no_key",
     INVALID_COLUMN: "invalid_column",
 };
-exports.WebhookType = {
-    AUTOMATION: "automation",
-};
 exports.AutomationErrors = {
     INCORRECT_TYPE: "INCORRECT_TYPE",
     MAX_ITERATIONS: "MAX_ITERATIONS_REACHED",

package/dist/migrations/index.js

@@ -98,7 +98,8 @@ const migrateWithLock = (options) => __awaiter(void 0, void 0, void 0, function*
     yield backend_core_1.locks.doWithLock({
         type: types_1.LockType.TRY_ONCE,
         name: types_1.LockName.MIGRATIONS,
-        ttl: 1000 * 60 * 15, // auto expire the migration lock after 15 minutes
+        ttl: 1000 * 60 * 15,
+        systemLock: true,
     }, () => __awaiter(void 0, void 0, void 0, function* () {
         yield backend_core_1.migrations.runMigrations(exports.MIGRATIONS, options);
     }));

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.0.33",
+    "version": "2.0.34-alpha.9",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^2.0.33",
-        "@budibase/client": "^2.0.33",
-        "@budibase/pro": "2.0.33",
-        "@budibase/string-templates": "^2.0.33",
-        "@budibase/types": "^2.0.33",
+        "@budibase/backend-core": "2.0.34-alpha.9",
+        "@budibase/client": "2.0.34-alpha.9",
+        "@budibase/pro": "2.0.34-alpha.9",
+        "@budibase/string-templates": "2.0.34-alpha.9",
+        "@budibase/types": "2.0.34-alpha.9",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

package/dist/sdk/app/automations/index.js

@@ -0,0 +1,29 @@
+"use strict";
+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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const webhook = __importStar(require("./webhook"));
+exports.default = {
+    webhook,
+};

package/dist/sdk/app/automations/webhook.js

@@ -0,0 +1,54 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.destroy = exports.save = exports.newDoc = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../../../db/utils");
+function isWebhookID(id) {
+    return id.startsWith(backend_core_1.db.DocumentType.WEBHOOK);
+}
+function newDoc(name, type, target) {
+    return {
+        live: true,
+        name,
+        action: {
+            type,
+            target,
+        },
+    };
+}
+exports.newDoc = newDoc;
+function save(webhook) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.context.getAppDB();
+        // check that the webhook exists
+        if (webhook._id && isWebhookID(webhook._id)) {
+            yield db.get(webhook._id);
+        }
+        else {
+            webhook._id = (0, utils_1.generateWebhookID)();
+        }
+        const response = yield db.put(webhook);
+        webhook._rev = response.rev;
+        return webhook;
+    });
+}
+exports.save = save;
+function destroy(id, rev) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.context.getAppDB();
+        if (!id || !isWebhookID(id)) {
+            throw new Error("Provided webhook ID is not valid.");
+        }
+        return yield db.remove(id, rev);
+    });
+}
+exports.destroy = destroy;

package/dist/sdk/app/backups/imports.js

@@ -23,6 +23,7 @@ const constants_2 = require("../../../constants");
 const path_1 = require("path");
 const fs_1 = __importDefault(require("fs"));
 const __1 = __importDefault(require("../../"));
+const types_1 = require("@budibase/types");
 const uuid = require("uuid/v4");
 const tar = require("tar");
 function updateAttachmentColumns(prodAppId, db) {
@@ -76,6 +77,28 @@ function updateAttachmentColumns(prodAppId, db) {
         }
     });
 }
+function updateAutomations(prodAppId, db) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const automations = (yield db.allDocs((0, utils_1.getAutomationParams)(null, {
+            include_docs: true,
+        }))).rows.map(row => row.doc);
+        const devAppId = backend_core_1.db.getDevAppID(prodAppId);
+        let toSave = [];
+        for (let automation of automations) {
+            const oldDevAppId = automation.appId, oldProdAppId = backend_core_1.db.getProdAppID(automation.appId);
+            if (automation.definition.trigger.stepId === types_1.AutomationTriggerStepId.WEBHOOK) {
+                const old = automation.definition.trigger.inputs;
+                automation.definition.trigger.inputs = {
+                    schemaUrl: old.schemaUrl.replace(oldDevAppId, devAppId),
+                    triggerUrl: old.triggerUrl.replace(oldProdAppId, prodAppId),
+                };
+            }
+            automation.appId = devAppId;
+            toSave.push(automation);
+        }
+        yield db.bulkDocs(toSave);
+    });
+}
 /**
  * This function manages temporary template files which are stored by Koa.
  * @param {Object} template The template object retrieved from the Koa context object.
@@ -83,6 +106,9 @@ function updateAttachmentColumns(prodAppId, db) {
  */
 function getTemplateStream(template) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (template.file && template.file.type !== "text/plain") {
+            throw new Error("Cannot import a non-text based file.");
+        }
         if (template.file) {
             return fs_1.default.createReadStream(template.file.path);
         }
@@ -114,10 +140,11 @@ function getListOfAppsInMulti(tmpPath) {
 }
 exports.getListOfAppsInMulti = getListOfAppsInMulti;
 function importApp(appId, db, template) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         let prodAppId = backend_core_1.db.getProdAppID(appId);
         let dbStream;
-        const isTar = template.file && template.file.type === "application/gzip";
+        const isTar = template.file && ((_b = (_a = template === null || template === void 0 ? void 0 : template.file) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.endsWith("gzip"));
         const isDirectory = template.file && fs_1.default.lstatSync(template.file.path).isDirectory();
         if (template.file && (isTar || isDirectory)) {
             const tmpPath = isTar ? untarFile(template.file) : template.file.path;
@@ -156,6 +183,7 @@ function importApp(appId, db, template) {
             throw "Error loading database dump from template.";
         }
         yield updateAttachmentColumns(prodAppId, db);
+        yield updateAutomations(prodAppId, db);
         return ok;
     });
 }

package/dist/sdk/index.js

@@ -5,9 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const backups_1 = __importDefault(require("./app/backups"));
 const tables_1 = __importDefault(require("./app/tables"));
+const automations_1 = __importDefault(require("./app/automations"));
 const sdk = {
     backups: backups_1.default,
     tables: tables_1.default,
+    automations: automations_1.default,
 };
 // default export for TS
 exports.default = sdk;

package/dist/startup.js

@@ -0,0 +1,152 @@
+"use strict";
+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 __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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startup = void 0;
+const env = __importStar(require("./environment"));
+const redis_1 = __importDefault(require("./utilities/redis"));
+const workerRequests_1 = require("./utilities/workerRequests");
+const backend_core_1 = require("@budibase/backend-core");
+const fs_1 = __importDefault(require("fs"));
+const watch_1 = require("./watch");
+const automations_1 = __importDefault(require("./automations"));
+const fileSystem_1 = __importDefault(require("./utilities/fileSystem"));
+const events_1 = __importDefault(require("./events"));
+const migrations = __importStar(require("./migrations"));
+const bullboard_1 = __importDefault(require("./automations/bullboard"));
+const pro = __importStar(require("@budibase/pro"));
+const api_1 = __importDefault(require("./api"));
+const sdk_1 = __importDefault(require("./sdk"));
+const pino = require("koa-pino-logger");
+let STARTUP_RAN = false;
+function initRoutes(app) {
+    return __awaiter(this, void 0, void 0, function* () {
+        app.use(pino((0, backend_core_1.pinoSettings)()));
+        if (!env.isTest()) {
+            const plugin = yield bullboard_1.default.init();
+            app.use(plugin);
+        }
+        app.context.eventEmitter = events_1.default;
+        app.context.auth = {};
+        // api routes
+        app.use(api_1.default.router.routes());
+    });
+}
+function initPro() {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield pro.init({
+            backups: {
+                processing: {
+                    exportAppFn: sdk_1.default.backups.exportApp,
+                    importAppFn: sdk_1.default.backups.importApp,
+                    statsFn: sdk_1.default.backups.calculateBackupStats,
+                },
+            },
+        });
+    });
+}
+function shutdown(server) {
+    server.close();
+    server.destroy();
+}
+function startup(app, server) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (STARTUP_RAN) {
+            return;
+        }
+        STARTUP_RAN = true;
+        if (server) {
+            console.log(`Budibase running on ${JSON.stringify(server.address())}`);
+            env._set("PORT", server.address().port);
+        }
+        events_1.default.emitPort(env.PORT);
+        fileSystem_1.default.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) {
+                backend_core_1.logging.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) {
+                    backend_core_1.logging.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_1.default.existsSync(env.PLUGINS_DIR)) {
+            (0, watch_1.watch)();
+        }
+        // check for version updates
+        yield backend_core_1.installation.checkInstallVersion();
+        // get the references to the queue promises, don't await as
+        // they will never end, unless the processing stops
+        let queuePromises = [];
+        queuePromises.push(automations_1.default.init());
+        queuePromises.push(initPro());
+        if (app) {
+            // bring routes online as final step once everything ready
+            yield initRoutes(app);
+        }
+    });
+}
+exports.startup = startup;

package/dist/tests/utilities/TestConfiguration.js

@@ -25,6 +25,7 @@ const context = require("@budibase/backend-core/context");
 const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db");
 const { encrypt } = require("@budibase/backend-core/encryption");
 const { DocumentType, generateUserMetadataID } = require("../../db/utils");
+const { startup } = require("../../startup");
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
 const FIRSTNAME = "Barbara";
@@ -38,6 +39,10 @@ class TestConfiguration {
             this.server = require("../../app");
             // we need the request for logging in, involves cookies, hard to fake
             this.request = supertest(this.server);
+            this.started = true;
+        }
+        else {
+            this.started = false;
         }
         this.appId = null;
         this.allApps = [];
@@ -87,6 +92,9 @@ class TestConfiguration {
     // use a new id as the name to avoid name collisions
     init(appName = newid()) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.started) {
+                yield startup();
+            }
             this.user = yield this.globalUser();
             this.globalUserId = this.user._id;
             this.userMetadataId = generateUserMetadataID(this.globalUserId);