@budibase/server 0.9.184 → 0.9.185-alpha.11

package/dist/integrations/utils.js

@@ -1,11 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyExistingPropsOver = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = void 0;
+exports.finaliseExternalTables = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertSqlType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = exports.SqlClients = void 0;
 const datasource_1 = require("../definitions/datasource");
 const { DocumentTypes, SEPARATOR } = require("../db/utils");
-const { FieldTypes } = require("../constants");
+const { FieldTypes, BuildSchemaErrors } = require("../constants");
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`;
 const ROW_ID_REGEX = /^\[.*]$/g;
+const SQL_TYPE_MAP = {
+    text: FieldTypes.LONGFORM,
+    varchar: FieldTypes.STRING,
+    integer: FieldTypes.NUMBER,
+    bigint: FieldTypes.NUMBER,
+    decimal: FieldTypes.NUMBER,
+    smallint: FieldTypes.NUMBER,
+    real: FieldTypes.NUMBER,
+    "double precision": FieldTypes.NUMBER,
+    timestamp: FieldTypes.DATETIME,
+    time: FieldTypes.DATETIME,
+    boolean: FieldTypes.BOOLEAN,
+    json: FieldTypes.JSON,
+    date: FieldTypes.DATETIME,
+    blob: FieldTypes.LONGFORM,
+    enum: FieldTypes.STRING,
+    float: FieldTypes.NUMBER,
+    int: FieldTypes.NUMBER,
+    numeric: FieldTypes.NUMBER,
+    mediumint: FieldTypes.NUMBER,
+    dec: FieldTypes.NUMBER,
+    double: FieldTypes.NUMBER,
+    fixed: FieldTypes.NUMBER,
+    datetime: FieldTypes.DATETIME,
+    tinyint: FieldTypes.BOOLEAN,
+};
+var SqlClients;
+(function (SqlClients) {
+    SqlClients["MS_SQL"] = "mssql";
+    SqlClients["POSTGRES"] = "pg";
+    SqlClients["MY_SQL"] = "mysql";
+})(SqlClients = exports.SqlClients || (exports.SqlClients = {}));
 function isExternalTable(tableId) {
     return tableId.includes(DocumentTypes.DATASOURCE);
 }
@@ -66,15 +98,15 @@ function breakRowIdField(_id) {
     }
 }
 exports.breakRowIdField = breakRowIdField;
-function convertType(type, map) {
-    for (let [external, internal] of Object.entries(map)) {
+function convertSqlType(type) {
+    for (let [external, internal] of Object.entries(SQL_TYPE_MAP)) {
         if (type.toLowerCase().includes(external)) {
             return internal;
         }
     }
     return FieldTypes.STRING;
 }
-exports.convertType = convertType;
+exports.convertSqlType = convertSqlType;
 function getSqlQuery(query) {
     if (typeof query === "string") {
         return { sql: query };
@@ -101,10 +133,10 @@ function isIsoDateString(str) {
 }
 exports.isIsoDateString = isIsoDateString;
 // add the existing relationships from the entities if they exist, to prevent them from being overridden
-function copyExistingPropsOver(tableName, tables, entities) {
+function copyExistingPropsOver(tableName, table, entities) {
     if (entities && entities[tableName]) {
         if (entities[tableName].primaryDisplay) {
-            tables[tableName].primaryDisplay = entities[tableName].primaryDisplay;
+            table.primaryDisplay = entities[tableName].primaryDisplay;
         }
         const existingTableSchema = entities[tableName].schema;
         for (let key in existingTableSchema) {
@@ -112,9 +144,24 @@ function copyExistingPropsOver(tableName, tables, entities) {
                 continue;
             }
             if (existingTableSchema[key].type === "link") {
-                tables[tableName].schema[key] = existingTableSchema[key];
+                table.schema[key] = existingTableSchema[key];
             }
         }
     }
+    return table;
 }
-exports.copyExistingPropsOver = copyExistingPropsOver;
+function finaliseExternalTables(tables, entities) {
+    const finalTables = {};
+    const errors = {};
+    for (let [name, table] of Object.entries(tables)) {
+        // make sure every table has a key
+        if (table.primary == null || table.primary.length === 0) {
+            errors[name] = BuildSchemaErrors.NO_KEY;
+            continue;
+        }
+        // make sure all previous props have been added back
+        finalTables[name] = copyExistingPropsOver(name, table, entities);
+    }
+    return { tables: finalTables, errors };
+}
+exports.finaliseExternalTables = finaliseExternalTables;

package/dist/middleware/authorized.js

@@ -18,7 +18,8 @@ function hasResource(ctx) {
 module.exports =
     (permType, permLevel = null) => (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         // webhooks don't need authentication, each webhook unique
-        if (isWebhookEndpoint(ctx)) {
+        // also internal requests (between services) don't need authorized
+        if (isWebhookEndpoint(ctx) || ctx.internal) {
             return next();
         }
         if (!ctx.user) {

package/dist/middleware/builder.js

@@ -13,6 +13,7 @@ const { doesUserHaveLock, updateLock, checkDebounce, setDebounce, } = require(".
 const CouchDB = require("../db");
 const { DocumentTypes } = require("../db/utils");
 const { PermissionTypes } = require("@budibase/auth/permissions");
+const { app: appCache } = require("@budibase/auth/cache");
 const DEBOUNCE_TIME_SEC = 30;
 /************************************************** *
  * This middleware has been broken out of the       *
@@ -51,7 +52,9 @@ function updateAppUpdatedAt(ctx) {
         const db = new CouchDB(appId);
         const metadata = yield db.get(DocumentTypes.APP_METADATA);
         metadata.updatedAt = new Date().toISOString();
-        yield db.put(metadata);
+        const response = yield db.put(metadata);
+        metadata._rev = response.rev;
+        yield appCache.invalidateAppMetadata(appId, metadata);
         // set a new debounce record with a short TTL
         yield setDebounce(appId, DEBOUNCE_TIME_SEC);
     });

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.183",
+    "version": "0.9.185-alpha.10",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,9 +68,11 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.183",
-        "@budibase/client": "^0.9.183",
-        "@budibase/string-templates": "^0.9.183",
+        "@budibase/auth": "^0.9.185-alpha.10",
+        "@budibase/client": "^0.9.185-alpha.10",
+        "@budibase/string-templates": "^0.9.185-alpha.10",
+        "@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"
     },
@@ -138,7 +140,6 @@
         "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",

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,8 +8,8 @@ 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");
+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;
@@ -18,7 +18,9 @@ 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 +33,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 +46,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 +131,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,58 @@
+"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;
+        if (!env.isTest()) {
+            const workerOpts = {
+                autoStart: true,
+                maxConcurrentWorkers: opts.count ? opts.count : 1,
+            };
+            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 (env.isTest()) {
+                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,61 @@
+"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());
+    });
+};
+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);
+    });
+};