@budibase/server 1.0.212-alpha.10 → 1.0.212-alpha.13

package/dist/api/controllers/application.js

@@ -33,7 +33,8 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 const user_1 = require("./user");
 const { app: appCache } = require("@budibase/backend-core/cache");
 const utils_2 = require("../../automations/utils");
-const { getAppDB, getProdAppDB, updateAppId, } = require("@budibase/backend-core/context");
+const logging_1 = require("../../automations/logging");
+const { getAppDB, getProdAppDB, updateAppId, doInAppContext, } = require("@budibase/backend-core/context");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
@@ -159,7 +160,7 @@ const fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             }
         }
     }
-    ctx.body = apps;
+    ctx.body = yield (0, logging_1.checkAppMetadata)(apps);
 });
 exports.fetch = fetch;
 const fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
@@ -486,19 +487,21 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.sync = sync;
 const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
-    const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
-    if (appPackage._rev !== application._rev) {
-        newAppPackage._rev = application._rev;
-    }
-    // the locked by property is attached by server but generated from
-    // Redis, shouldn't ever store it
-    delete newAppPackage.lockedBy;
-    yield db.put(newAppPackage);
-    // remove any cached metadata, so that it will be updated
-    yield appCache.invalidateAppMetadata(appId);
-    return newAppPackage;
+    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        const db = getAppDB();
+        const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+        const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
+        if (appPackage._rev !== application._rev) {
+            newAppPackage._rev = application._rev;
+        }
+        // the locked by property is attached by server but generated from
+        // Redis, shouldn't ever store it
+        delete newAppPackage.lockedBy;
+        yield db.put(newAppPackage);
+        // remove any cached metadata, so that it will be updated
+        yield appCache.invalidateAppMetadata(appId);
+        return newAppPackage;
+    }));
 });
 const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();

package/dist/api/controllers/automation.js

@@ -10,13 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const actions = require("../../automations/actions");
 const triggers = require("../../automations/triggers");
-const { getAutomationParams, generateAutomationID } = require("../../db/utils");
+const { getAutomationParams, generateAutomationID, DocumentTypes, } = require("../../db/utils");
 const { checkForWebhooks, updateTestHistory, removeDeprecated, } = require("../../automations/utils");
 const { deleteEntityMetadata } = require("../../utilities");
 const { MetadataTypes } = require("../../constants");
 const { setTestFlag, clearTestFlag } = require("../../utilities/redis");
-const { getAppDB } = require("@budibase/backend-core/context");
+const { getAppDB, getProdAppDB, doInAppContext, } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
+const { app } = require("@budibase/backend-core/cache");
+const { automations } = require("@budibase/pro");
 const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS);
 const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS);
 /*************************
@@ -162,6 +164,30 @@ exports.destroy = function (ctx) {
         yield events.automation.deleted(oldAutomation);
     });
 };
+exports.logSearch = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        ctx.body = yield automations.logs.logSearch(ctx.request.body);
+    });
+};
+exports.clearLogError = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { automationId, appId } = ctx.request.body;
+        yield doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+            const db = getProdAppDB();
+            const metadata = yield db.get(DocumentTypes.APP_METADATA);
+            if (!automationId) {
+                delete metadata.automationErrors;
+            }
+            else if (metadata.automationErrors &&
+                metadata.automationErrors[automationId]) {
+                delete metadata.automationErrors[automationId];
+            }
+            yield db.put(metadata);
+            yield app.invalidateAppMetadata(metadata.appId, metadata);
+            ctx.body = { message: `Error logs cleared.` };
+        }));
+    });
+};
 exports.getActionList = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.body = ACTION_DEFS;

package/dist/api/index.js

@@ -69,7 +69,10 @@ router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
             error,
         };
         ctx.log.error(err);
-        console.trace(err);
+        // unauthorised errors don't provide a useful trace
+        if (!env.isTest()) {
+            console.trace(err);
+        }
     }
 }));
 // authenticated routes

package/dist/api/routes/automation.js

@@ -15,6 +15,8 @@ router
     .get("/api/automations/:id", paramResource("id"), authorized(BUILDER), controller.find)
     .put("/api/automations", bodyResource("_id"), authorized(BUILDER), automationValidator(true), controller.update)
     .post("/api/automations", authorized(BUILDER), automationValidator(false), controller.create)
+    .post("/api/automations/logs/search", authorized(BUILDER), controller.logSearch)
+    .delete("/api/automations/logs", authorized(BUILDER), controller.clearLogError)
     .delete("/api/automations/:id/:rev", paramResource("id"), authorized(BUILDER), controller.destroy)
     .post("/api/automations/:id/trigger", appInfoMiddleware({ appType: AppType.PROD }), paramResource("id"), authorized(PermissionTypes.AUTOMATION, PermissionLevels.EXECUTE), controller.trigger)
     .post("/api/automations/:id/test", appInfoMiddleware({ appType: AppType.DEV }), paramResource("id"), authorized(PermissionTypes.AUTOMATION, PermissionLevels.EXECUTE), controller.test);

package/dist/automations/logging/index.js

@@ -0,0 +1,70 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkAppMetadata = exports.storeLog = void 0;
+const env = __importStar(require("../../environment"));
+const pro_1 = require("@budibase/pro");
+const backend_core_1 = require("@budibase/backend-core");
+function storeLog(automation, results) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // can disable this if un-needed in self-host, also only do this for prod apps
+        if (env.DISABLE_AUTOMATION_LOGS) {
+            return;
+        }
+        yield pro_1.automations.logs.storeLog(automation, results);
+    });
+}
+exports.storeLog = storeLog;
+function checkAppMetadata(apps) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const maxStartDate = yield pro_1.automations.logs.oldestLogDate();
+        for (let metadata of apps) {
+            if (!metadata.automationErrors) {
+                continue;
+            }
+            for (let [key, errors] of Object.entries(metadata.automationErrors)) {
+                const updated = [];
+                for (let error of errors) {
+                    const startDate = error.split(backend_core_1.db.SEPARATOR)[2];
+                    if (startDate > maxStartDate) {
+                        updated.push(error);
+                    }
+                }
+                metadata.automationErrors[key] = updated;
+            }
+        }
+        return apps;
+    });
+}
+exports.checkAppMetadata = checkAppMetadata;

package/dist/automations/steps/filter.js

@@ -56,46 +56,55 @@ exports.definition = {
         outputs: {
             properties: {
                 success: {
+                    type: "boolean",
+                    description: "Whether the action was successful",
+                },
+                result: {
                     type: "boolean",
                     description: "Whether the logic block passed",
                 },
             },
-            required: ["success"],
+            required: ["success", "result"],
         },
     },
 };
 exports.run = function filter({ inputs }) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { field, condition, value } = inputs;
-        // coerce types so that we can use them
-        if (!isNaN(value) && !isNaN(field)) {
-            value = parseFloat(value);
-            field = parseFloat(field);
-        }
-        else if (!isNaN(Date.parse(value)) && !isNaN(Date.parse(field))) {
-            value = Date.parse(value);
-            field = Date.parse(field);
-        }
-        let success = false;
-        if (typeof field !== "object" && typeof value !== "object") {
-            switch (condition) {
-                case FilterConditions.EQUAL:
-                    success = field === value;
-                    break;
-                case FilterConditions.NOT_EQUAL:
-                    success = field !== value;
-                    break;
-                case FilterConditions.GREATER_THAN:
-                    success = field > value;
-                    break;
-                case FilterConditions.LESS_THAN:
-                    success = field < value;
-                    break;
+        try {
+            let { field, condition, value } = inputs;
+            // coerce types so that we can use them
+            if (!isNaN(value) && !isNaN(field)) {
+                value = parseFloat(value);
+                field = parseFloat(field);
+            }
+            else if (!isNaN(Date.parse(value)) && !isNaN(Date.parse(field))) {
+                value = Date.parse(value);
+                field = Date.parse(field);
+            }
+            let result = false;
+            if (typeof field !== "object" && typeof value !== "object") {
+                switch (condition) {
+                    case FilterConditions.EQUAL:
+                        result = field === value;
+                        break;
+                    case FilterConditions.NOT_EQUAL:
+                        result = field !== value;
+                        break;
+                    case FilterConditions.GREATER_THAN:
+                        result = field > value;
+                        break;
+                    case FilterConditions.LESS_THAN:
+                        result = field < value;
+                        break;
+                }
+            }
+            else {
+                result = false;
             }
+            return { success: true, result };
         }
-        else {
-            success = false;
+        catch (err) {
+            return { success: false, result: false };
         }
-        return { success };
     });
 };

package/dist/db/linkedRows/index.js

@@ -56,6 +56,7 @@ function getLinksForRows(rows) {
         // have to get unique as the previous table query can
         // return duplicates, could be querying for both tables in a relation
         return getUniqueByProp(responses
+            .filter(el => el != null)
             // create a unique ID which we can use for getting only unique ones
             .map(el => (Object.assign(Object.assign({}, el), { unique: el.id + el.thisId + el.fieldName }))), "unique");
     });

package/dist/db/utils.js

@@ -1,39 +1,13 @@
 "use strict";
 const newid = require("./newid");
-const { DocumentTypes: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, } = require("@budibase/backend-core/db");
+const { DocumentTypes: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, getDevelopmentAppID, generateAppID, getQueryIndex, ViewNames, } = require("@budibase/backend-core/db");
 const UNICODE_MAX = "\ufff0";
 const AppStatus = {
     DEV: "development",
     ALL: "all",
     DEPLOYED: "published",
 };
-const DocumentTypes = {
-    APP: CoreDocTypes.APP,
-    DEV: CoreDocTypes.DEV,
-    APP_DEV: CoreDocTypes.APP_DEV,
-    APP_METADATA: CoreDocTypes.APP_METADATA,
-    ROLE: CoreDocTypes.ROLE,
-    TABLE: "ta",
-    ROW: "ro",
-    USER: "us",
-    AUTOMATION: "au",
-    LINK: "li",
-    WEBHOOK: "wh",
-    INSTANCE: "inst",
-    LAYOUT: "layout",
-    SCREEN: "screen",
-    DATASOURCE: "datasource",
-    DATASOURCE_PLUS: "datasource_plus",
-    QUERY: "query",
-    DEPLOYMENTS: "deployments",
-    METADATA: "metadata",
-    MEM_VIEW: "view",
-    USER_FLAG: "flag",
-};
-const ViewNames = {
-    LINK: "by_link",
-    ROUTING: "screen_routes",
-};
+const DocumentTypes = Object.assign(Object.assign({}, CoreDocTypes), { TABLE: "ta", ROW: "ro", USER: "us", AUTOMATION: "au", LINK: "li", WEBHOOK: "wh", INSTANCE: "inst", LAYOUT: "layout", SCREEN: "screen", DATASOURCE: "datasource", DATASOURCE_PLUS: "datasource_plus", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag" });
 const InternalTables = {
     USER_METADATA: "ta_users",
 };
@@ -67,9 +41,7 @@ exports.generateAppID = generateAppID;
 exports.generateDevAppID = getDevelopmentAppID;
 exports.generateRoleID = generateRoleID;
 exports.getRoleParams = getRoleParams;
-exports.getQueryIndex = viewName => {
-    return `database/${viewName}`;
-};
+exports.getQueryIndex = getQueryIndex;
 /**
  * If creating DB allDocs/query params with only a single top level ID this can be used, this
  * is usually the case as most of our docs are top level e.g. tables, automations, users and so on.

package/dist/environment.js

@@ -66,6 +66,7 @@ module.exports = {
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
     DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
+    DISABLE_AUTOMATION_LOGS: process.env.DISABLE_AUTOMATION_LOGS,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
     ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
     SELF_HOSTED: process.env.SELF_HOSTED,

package/dist/package.json

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

package/dist/threads/automation.js

@@ -19,10 +19,11 @@ const { doInTenant } = require("@budibase/backend-core/tenancy");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const { AutomationErrors, LoopStepTypes } = require("../constants");
+const { storeLog } = require("../automations/logging");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerDefs.CRON.stepId;
-const STOPPED_STATUS = { success: false, status: "STOPPED" };
+const STOPPED_STATUS = { success: true, status: "STOPPED" };
 const { cloneDeep } = require("lodash/fp");
 const env = require("../environment");
 function typecastForLooping(loopStep, input) {
@@ -248,7 +249,7 @@ class Orchestrator {
                         this._context.steps[stepCount] = outputs;
                         // if filter causes us to stop execution don't break the loop, set a var
                         // so that we can finish iterating through the steps and record that it stopped
-                        if (step.stepId === FILTER_STEP_ID && !outputs.success) {
+                        if (step.stepId === FILTER_STEP_ID && !outputs.result) {
                             stopped = true;
                             this.updateExecutionOutput(step.id, step.stepId, step.inputs, Object.assign(Object.assign({}, outputs), STOPPED_STATUS));
                             continue;
@@ -289,6 +290,8 @@ class Orchestrator {
                     loopSteps = null;
                 }
             }
+            // store the logs for the automation run
+            yield storeLog(this._automation, this.executionOutput);
             return this.executionOutput;
         });
     }

package/dist/threads/index.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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 };
 };
@@ -92,7 +101,7 @@ class Thread {
             });
         });
     }
-    static shutdown() {
+    static stopThreads() {
         return new Promise(resolve => {
             if (Thread.workerRefs.length === 0) {
                 resolve();
@@ -110,6 +119,11 @@ class Thread {
             Thread.workerRefs = [];
         });
     }
+    static shutdown() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield Thread.stopThreads();
+        });
+    }
 }
 exports.Thread = Thread;
 Thread.workerRefs = [];