@budibase/server 1.3.13 → 1.3.15

package/dist/automations/triggers.js

@@ -19,23 +19,28 @@ const { checkTestFlag } = require("../utilities/redis");
 const utils = require("./utils");
 const env = require("../environment");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
+const { getAllApps } = require("@budibase/backend-core/db");
 const TRIGGER_DEFINITIONS = definitions;
 const JOB_OPTS = {
     removeOnComplete: true,
     removeOnFail: true,
 };
+function getAllAutomations() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = getAppDB();
+        let automations = yield db.allDocs(getAutomationParams(null, { include_docs: true }));
+        return automations.rows.map(row => row.doc);
+    });
+}
 function queueRelevantRowAutomations(event, eventType) {
     return __awaiter(this, void 0, void 0, function* () {
         if (event.appId == null) {
             throw `No appId specified for ${eventType} - check event emitters.`;
         }
         doInAppContext(event.appId, () => __awaiter(this, void 0, void 0, function* () {
-            const db = getAppDB();
-            let automations = yield db.allDocs(getAutomationParams(null, { include_docs: true }));
+            let automations = yield getAllAutomations();
             // filter down to the correct event type
-            automations = automations.rows
-                .map(automation => automation.doc)
-                .filter(automation => {
+            automations = automations.filter(automation => {
                 const trigger = automation.definition.trigger;
                 return trigger && trigger.event === eventType;
             });
@@ -109,4 +114,33 @@ exports.externalTrigger = function (automation, params, { getResponses } = {}) {
         }
     });
 };
+exports.rebootTrigger = () => __awaiter(void 0, void 0, void 0, function* () {
+    // reboot cron option is only available on the main thread at
+    // startup and only usable in self host
+    if (env.isInThread() || !env.SELF_HOSTED) {
+        return;
+    }
+    // iterate through all production apps, find the reboot crons
+    // and trigger events for them
+    const appIds = yield getAllApps({ dev: false, idsOnly: true });
+    for (let prodAppId of appIds) {
+        yield doInAppContext(prodAppId, () => __awaiter(void 0, void 0, void 0, function* () {
+            let automations = yield getAllAutomations();
+            let rebootEvents = [];
+            for (let automation of automations) {
+                if (utils.isRebootTrigger(automation)) {
+                    const job = {
+                        automation,
+                        event: {
+                            appId: prodAppId,
+                            timestamp: Date.now(),
+                        },
+                    };
+                    rebootEvents.push(queue.add(job, JOB_OPTS));
+                }
+            }
+            yield Promise.all(rebootEvents);
+        }));
+    }
+});
 exports.TRIGGER_DEFINITIONS = TRIGGER_DEFINITIONS;

package/dist/automations/utils.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.isErrorInOutput = exports.isRecurring = exports.cleanupAutomations = exports.checkForWebhooks = exports.enableCronTrigger = exports.clearMetadata = exports.disableCron = exports.disableAllCrons = exports.removeDeprecated = exports.updateTestHistory = exports.processEvent = void 0;
+exports.isErrorInOutput = exports.isRecurring = exports.cleanupAutomations = exports.checkForWebhooks = exports.enableCronTrigger = exports.isRebootTrigger = exports.isCronTrigger = exports.clearMetadata = exports.disableCron = 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"));
@@ -49,6 +49,7 @@ 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 REBOOT_CRON = "@reboot";
 const WH_STEP_ID = triggerInfo_1.definitions.WEBHOOK.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const Runner = new threads_1.Thread(threads_1.ThreadType.AUTOMATION);
@@ -139,6 +140,17 @@ function clearMetadata() {
     });
 }
 exports.clearMetadata = clearMetadata;
+function isCronTrigger(auto) {
+    return (auto &&
+        auto.definition.trigger &&
+        auto.definition.trigger.stepId === CRON_STEP_ID);
+}
+exports.isCronTrigger = isCronTrigger;
+function isRebootTrigger(auto) {
+    const trigger = auto ? auto.definition.trigger : null;
+    return isCronTrigger(auto) && (trigger === null || trigger === void 0 ? void 0 : trigger.inputs.cron) === REBOOT_CRON;
+}
+exports.isRebootTrigger = isRebootTrigger;
 /**
  * This function handles checking of any cron jobs that need to be enabled/updated.
  * @param {string} appId The ID of the app in which we are checking for webhooks
@@ -147,13 +159,10 @@ exports.clearMetadata = clearMetadata;
 function enableCronTrigger(appId, automation) {
     return __awaiter(this, void 0, void 0, function* () {
         const trigger = automation ? automation.definition.trigger : null;
-        function isCronTrigger(auto) {
-            return (auto &&
-                auto.definition.trigger &&
-                auto.definition.trigger.stepId === CRON_STEP_ID);
-        }
         // need to create cron job
-        if (isCronTrigger(automation) && (trigger === null || trigger === void 0 ? void 0 : trigger.inputs.cron)) {
+        if (isCronTrigger(automation) &&
+            !isRebootTrigger(automation) &&
+            (trigger === null || trigger === void 0 ? void 0 : trigger.inputs.cron)) {
             // make a job id rather than letting Bull decide, makes it easier to handle on way out
             const jobId = `${appId}_cron_${(0, newid_1.default)()}`;
             const job = yield bullboard_1.queue.add({

package/dist/environment.js

@@ -28,8 +28,8 @@ function parseIntSafe(number) {
 }
 let inThread = false;
 module.exports = {
-    // important
-    PORT: process.env.PORT || process.env.APP_PORT,
+    // important - prefer app port to generic port
+    PORT: process.env.APP_PORT || process.env.PORT,
     JWT_SECRET: process.env.JWT_SECRET,
     COUCH_DB_URL: process.env.COUCH_DB_URL,
     MINIO_URL: process.env.MINIO_URL,

package/dist/integrations/rest.js

@@ -8,10 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 });
 const types_1 = require("@budibase/types");
 const datasource_1 = require("../definitions/datasource");
 const lodash_1 = require("lodash");
+const querystring_1 = __importDefault(require("querystring"));
 const BodyTypes = {
     NONE: "none",
     FORM_DATA: "form",
@@ -70,6 +74,12 @@ var RestModule;
                 required: false,
                 default: {},
             },
+            legacyHttpParser: {
+                display: "Legacy HTTP Support",
+                type: types_1.DatasourceFieldType.BOOLEAN,
+                required: false,
+                default: false,
+            },
         },
         query: {
             create: {
@@ -189,7 +199,8 @@ var RestModule;
                     queryString = `${paginationString}&${queryString}`;
                 }
             }
-            const main = `${path}?${queryString}`;
+            // make sure the query string is fully encoded
+            const main = `${path}?${querystring_1.default.encode(querystring_1.default.decode(queryString))}`;
             let complete = main;
             if (this.config.url && !main.startsWith("http")) {
                 complete = !this.config.url ? main : `${this.config.url}/${main}`;
@@ -309,6 +320,10 @@ var RestModule;
                 }
                 let input = { method, headers: this.headers };
                 input = this.addBody(bodyType, requestBody, input, pagination, paginationValues);
+                if (this.config.legacyHttpParser) {
+                    // https://github.com/nodejs/node/issues/43798
+                    input.extraHttpOptions = { insecureHTTPParser: true };
+                }
                 this.startTimeMs = performance.now();
                 const url = this.getUrl(path, queryString, pagination, paginationValues);
                 const response = yield fetch(url, input);

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.3.12",
+    "version": "1.3.14",
     "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": "^1.3.12",
-        "@budibase/client": "^1.3.12",
-        "@budibase/pro": "1.3.12",
-        "@budibase/string-templates": "^1.3.12",
-        "@budibase/types": "^1.3.12",
+        "@budibase/backend-core": "^1.3.14",
+        "@budibase/client": "^1.3.14",
+        "@budibase/pro": "1.3.13",
+        "@budibase/string-templates": "^1.3.14",
+        "@budibase/types": "^1.3.14",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/automation.js

@@ -392,6 +392,9 @@ class Orchestrator {
 }
 function execute(input, callback) {
     const appId = input.data.event.appId;
+    if (!appId) {
+        throw new Error("Unable to execute, event doesn't contain app ID.");
+    }
     doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event, input.opts);
         try {
@@ -406,6 +409,9 @@ function execute(input, callback) {
 exports.execute = execute;
 const removeStalled = (input) => __awaiter(void 0, void 0, void 0, function* () {
     const appId = input.data.event.appId;
+    if (!appId) {
+        throw new Error("Unable to execute, event doesn't contain app ID.");
+    }
     yield doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event, input.opts);
         yield automationOrchestrator.stopCron("stalled");