@budibase/server 0.9.188 → 0.9.190-alpha.2

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.187",
+    "version": "0.9.190-alpha.1",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -14,7 +14,7 @@
         "test": "jest --coverage --maxWorkers=2",
         "test:watch": "jest --watch",
         "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
-        "build:docker": "yarn run predocker && docker build . -t app-service",
+        "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
         "run:docker": "node dist/index.js",
         "dev:stack:up": "node scripts/dev/manage.js up",
         "dev:stack:down": "node scripts/dev/manage.js down",
@@ -68,9 +68,11 @@
     "author": "Budibase",
     "license": "GPL-3.0",
     "dependencies": {
-        "@budibase/auth": "^0.9.187",
-        "@budibase/client": "^0.9.187",
-        "@budibase/string-templates": "^0.9.187",
+        "@budibase/auth": "^0.9.190-alpha.1",
+        "@budibase/client": "^0.9.190-alpha.1",
+        "@budibase/string-templates": "^0.9.190-alpha.1",
+        "@bull-board/api": "^3.7.0",
+        "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
@@ -80,7 +82,6 @@
         "aws-sdk": "^2.767.0",
         "bcryptjs": "2.4.3",
         "bull": "^3.22.4",
-        "bull-board": "^2.0.1",
         "chmodr": "1.2.0",
         "csvtojson": "2.0.10",
         "dotenv": "8.2.0",
@@ -120,6 +121,7 @@
         "uuid": "3.3.2",
         "validate.js": "0.13.1",
         "vm2": "^3.9.3",
+        "worker-farm": "^1.7.0",
         "yargs": "13.2.4",
         "zlib": "1.0.5"
     },
@@ -133,12 +135,12 @@
         "@types/koa": "^2.13.3",
         "@types/koa-router": "^7.4.2",
         "@types/node": "^15.12.4",
+        "@types/oracledb": "^5.2.1",
         "@typescript-eslint/parser": "4.28.0",
         "babel-jest": "^27.0.2",
         "copyfiles": "^2.4.1",
         "docker-compose": "^0.23.6",
         "eslint": "^6.8.0",
-        "express": "^4.17.1",
         "jest": "^27.0.5",
         "nodemon": "^2.0.4",
         "prettier": "^2.3.1",
@@ -149,5 +151,8 @@
         "typescript": "^4.3.5",
         "update-dotenv": "^1.1.1"
     },
+    "optionalDependencies": {
+        "oracledb": "^5.3.0"
+    },
     "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }

package/dist/tests/utilities/TestConfiguration.js

@@ -289,7 +289,8 @@ class TestConfiguration {
     createDatasource(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicDatasource();
-            this.datasource = yield this._req(config, null, controllers.datasource.save);
+            const response = yield this._req(config, null, controllers.datasource.save);
+            this.datasource = response.datasource;
             return this.datasource;
         });
     }

package/dist/{automations/thread.js → threads/automation.js}

@@ -8,17 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const actions = require("./actions");
-const automationUtils = require("./automationUtils");
+// when thread starts, make sure it is recorded
+const env = require("../environment");
+env.setInThread();
+const actions = require("../automations/actions");
+const automationUtils = require("../automations/automationUtils");
 const AutomationEmitter = require("../events/AutomationEmitter");
 const { processObject } = require("@budibase/string-templates");
 const { DEFAULT_TENANT_ID } = require("@budibase/auth").constants;
 const CouchDB = require("../db");
 const { DocumentTypes, isDevAppID } = require("../db/utils");
 const { doInTenant } = require("@budibase/auth/tenancy");
-const env = require("../environment");
 const usage = require("../utilities/usageQuota");
+const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
+const CRON_STEP_ID = triggerDefs.CRON.stepId;
 const STOPPED_STATUS = { success: false, status: "STOPPED" };
 /**
  * The automation orchestrator is a class responsible for executing automations.
@@ -31,6 +35,8 @@ class Orchestrator {
         this._chainCount = this._metadata ? this._metadata.automationChainCount : 0;
         this._appId = triggerOutput.appId;
         this._app = null;
+        const triggerStepId = automation.definition.trigger.stepId;
+        triggerOutput = this.cleanupTriggerOutputs(triggerStepId, triggerOutput);
         // remove from context
         delete triggerOutput.appId;
         delete triggerOutput.metadata;
@@ -42,10 +48,15 @@ class Orchestrator {
         this._emitter = new AutomationEmitter(this._chainCount + 1);
         this.executionOutput = { trigger: {}, steps: [] };
         // setup the execution output
-        const triggerStepId = automation.definition.trigger.stepId;
         const triggerId = automation.definition.trigger.id;
         this.updateExecutionOutput(triggerId, triggerStepId, null, triggerOutput);
     }
+    cleanupTriggerOutputs(stepId, triggerOutput) {
+        if (stepId === CRON_STEP_ID) {
+            triggerOutput.timestamp = Date.now();
+        }
+        return triggerOutput;
+    }
     getStepFunctionality(stepId) {
         return __awaiter(this, void 0, void 0, function* () {
             let step = yield actions.getAction(stepId);
@@ -122,7 +133,14 @@ class Orchestrator {
         });
     }
 }
-module.exports = (job) => __awaiter(void 0, void 0, void 0, function* () {
-    const automationOrchestrator = new Orchestrator(job.data.automation, job.data.event);
-    return automationOrchestrator.execute();
-});
+module.exports = (input, callback) => {
+    const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event);
+    automationOrchestrator
+        .execute()
+        .then(response => {
+        callback(null, response);
+    })
+        .catch(err => {
+        callback(err);
+    });
+};

package/dist/threads/index.js

@@ -0,0 +1,64 @@
+"use strict";
+const workerFarm = require("worker-farm");
+const env = require("../environment");
+const ThreadType = {
+    QUERY: "query",
+    AUTOMATION: "automation",
+};
+function typeToFile(type) {
+    let filename = null;
+    switch (type) {
+        case ThreadType.QUERY:
+            filename = "./query";
+            break;
+        case ThreadType.AUTOMATION:
+            filename = "./automation";
+            break;
+        default:
+            throw "Unknown thread type";
+    }
+    return require.resolve(filename);
+}
+class Thread {
+    constructor(type, opts = { timeoutMs: null, count: 1 }) {
+        this.type = type;
+        this.count = opts.count ? opts.count : 1;
+        this.disableThreading =
+            env.isTest() ||
+                env.DISABLE_THREADING ||
+                this.count === 0 ||
+                env.isInThread();
+        if (!this.disableThreading) {
+            const workerOpts = {
+                autoStart: true,
+                maxConcurrentWorkers: this.count,
+            };
+            if (opts.timeoutMs) {
+                workerOpts.maxCallTime = opts.timeoutMs;
+            }
+            this.workers = workerFarm(workerOpts, typeToFile(type));
+        }
+    }
+    run(data) {
+        return new Promise((resolve, reject) => {
+            let fncToCall;
+            // if in test then don't use threading
+            if (this.disableThreading) {
+                fncToCall = require(typeToFile(this.type));
+            }
+            else {
+                fncToCall = this.workers;
+            }
+            fncToCall(data, (err, response) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(response);
+                }
+            });
+        });
+    }
+}
+module.exports.Thread = Thread;
+module.exports.ThreadType = ThreadType;

package/dist/threads/query.js

@@ -0,0 +1,64 @@
+"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());
+    });
+};
+// when thread starts, make sure it is recorded
+const env = require("../environment");
+env.setInThread();
+const ScriptRunner = require("../utilities/scriptRunner");
+const { integrations } = require("../integrations");
+function formatResponse(resp) {
+    if (typeof resp === "string") {
+        try {
+            resp = JSON.parse(resp);
+        }
+        catch (err) {
+            resp = { response: resp };
+        }
+    }
+    return resp;
+}
+function runAndTransform(datasource, queryVerb, query, transformer) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const Integration = integrations[datasource.source];
+        if (!Integration) {
+            throw "Integration type does not exist.";
+        }
+        const integration = new Integration(datasource.config);
+        let rows = formatResponse(yield integration[queryVerb](query));
+        // transform as required
+        if (transformer) {
+            const runner = new ScriptRunner(transformer, { data: rows });
+            rows = runner.execute();
+        }
+        // needs to an array for next step
+        if (!Array.isArray(rows)) {
+            rows = [rows];
+        }
+        // map into JSON if just raw primitive here
+        if (rows.find(row => typeof row !== "object")) {
+            rows = rows.map(value => ({ value }));
+        }
+        // get all the potential fields in the schema
+        let keys = rows.flatMap(Object.keys);
+        if (integration.end) {
+            integration.end();
+        }
+        return { rows, keys };
+    });
+}
+module.exports = (input, callback) => {
+    runAndTransform(input.datasource, input.queryVerb, input.query, input.transformer)
+        .then(response => {
+        callback(null, response);
+    })
+        .catch(err => {
+        callback(err);
+    });
+};