@budibase/server 1.0.123 → 1.0.125

package/dist/migrations/functions/usageQuotas/syncPublishedApps.js

@@ -0,0 +1,26 @@
+"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.run = void 0;
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const db_1 = require("@budibase/backend-core/db");
+const pro_1 = require("@budibase/pro");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    // get app count
+    const opts = { dev: false };
+    const prodApps = yield (0, db_1.getAllApps)(opts);
+    const prodAppCount = prodApps ? prodApps.length : 0;
+    // sync app count
+    const tenantId = (0, tenancy_1.getTenantId)();
+    console.log(`[Tenant: ${tenantId}] Syncing published app count: ${prodAppCount}`);
+    yield pro_1.quotas.setUsage(prodAppCount, pro_1.StaticQuotaName.PUBLISHED_APPS, pro_1.QuotaUsageType.STATIC);
+});
+exports.run = run;

package/dist/migrations/functions/usageQuotas/syncRows.js

@@ -12,22 +12,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const tenancy_1 = require("@budibase/backend-core/tenancy");
 const db_1 = require("@budibase/backend-core/db");
-const usageQuota_1 = require("../../../utilities/usageQuota");
 const rows_1 = require("../../../utilities/usageQuota/rows");
+const pro_1 = require("@budibase/pro");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = tenancy_1.getGlobalDB();
     // get all rows in all apps
     // @ts-ignore
-    const allApps = yield db_1.getAllApps({ all: true });
+    const allApps = yield (0, db_1.getAllApps)({ all: true });
     // @ts-ignore
     const appIds = allApps ? allApps.map((app) => app.appId) : [];
-    const rows = yield rows_1.getUniqueRows(appIds);
+    const rows = yield (0, rows_1.getUniqueRows)(appIds);
     const rowCount = rows ? rows.length : 0;
     // sync row count
-    const tenantId = tenancy_1.getTenantId();
+    const tenantId = (0, tenancy_1.getTenantId)();
     console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
-    const usageDoc = yield usageQuota_1.getUsageQuotaDoc(db);
-    usageDoc.usageQuota.rows = rowCount;
-    yield db.put(usageDoc);
+    yield pro_1.quotas.setUsage(rowCount, pro_1.StaticQuotaName.ROWS, pro_1.QuotaUsageType.STATIC);
 });
 exports.run = run;

package/dist/migrations/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -34,6 +38,8 @@ const { MIGRATION_TYPES, runMigrations, } = require("@budibase/backend-core/migr
 const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
 const quota1 = __importStar(require("./functions/quotas1"));
 const appUrls = __importStar(require("./functions/appUrls"));
+const developerQuota = __importStar(require("./functions/developerQuota"));
+const publishedAppsQuota = __importStar(require("./functions/publishedAppsQuota"));
 exports.MIGRATIONS = [
     {
         type: MIGRATION_TYPES.GLOBAL,
@@ -51,6 +57,16 @@ exports.MIGRATIONS = [
         opts: { all: true },
         fn: appUrls.run,
     },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "developer_quota",
+        fn: developerQuota.run,
+    },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "published_apps_quota",
+        fn: publishedAppsQuota.run,
+    },
 ];
 const migrate = (options) => __awaiter(void 0, void 0, void 0, function* () {
     yield runMigrations(exports.MIGRATIONS, options);

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.122",
+    "version": "1.0.124",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -9,7 +9,7 @@
         "url": "https://github.com/Budibase/budibase.git"
     },
     "scripts": {
-        "build": "rimraf dist/ && tsc && mv dist/src/* dist/ && rmdir dist/src/ && yarn postbuild",
+        "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
         "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
         "test": "jest --coverage --maxWorkers=2",
         "test:watch": "jest --watch",
@@ -68,16 +68,19 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.122",
-        "@budibase/client": "^1.0.122",
-        "@budibase/string-templates": "^1.0.122",
+        "@budibase/backend-core": "^1.0.124",
+        "@budibase/client": "^1.0.124",
+        "@budibase/pro": "1.0.124-alpha.0",
+        "@budibase/string-templates": "^1.0.124",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
         "@google-cloud/firestore": "^5.0.2",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
-        "@sentry/node": "^6.0.0",
+        "@sentry/node": "6.17.7",
+        "@types/global-agent": "^2.1.1",
+        "@types/koa__router": "^8.0.11",
         "airtable": "0.10.1",
         "arangojs": "7.2.0",
         "aws-sdk": "^2.767.0",
@@ -91,6 +94,7 @@
         "fix-path": "3.0.0",
         "form-data": "^4.0.0",
         "fs-extra": "8.1.0",
+        "global-agent": "^3.0.0",
         "google-auth-library": "^7.11.0",
         "google-spreadsheet": "^3.2.0",
         "jimp": "0.16.1",
@@ -143,18 +147,20 @@
         "@types/apidoc": "^0.50.0",
         "@types/bull": "^3.15.1",
         "@types/google-spreadsheet": "^3.1.5",
-        "@types/jest": "^26.0.23",
+        "@types/jest": "^27.4.1",
         "@types/koa": "^2.13.3",
         "@types/koa-router": "^7.4.2",
         "@types/lodash": "4.14.180",
         "@types/node": "^15.12.4",
         "@types/oracledb": "^5.2.1",
         "@types/redis": "^4.0.11",
+        "@typescript-eslint/parser": "5.12.0",
         "apidoc": "^0.50.2",
         "babel-jest": "^27.0.2",
         "copyfiles": "^2.4.1",
         "docker-compose": "^0.23.6",
         "eslint": "^6.8.0",
+        "ioredis-mock": "^7.2.0",
         "is-wsl": "^2.2.0",
         "jest": "^27.0.5",
         "jest-openapi": "^0.14.2",
@@ -168,7 +174,7 @@
         "swagger-jsdoc": "^6.1.0",
         "ts-jest": "^27.0.3",
         "ts-node": "^10.0.0",
-        "typescript": "^4.3.5",
+        "typescript": "^4.5.5",
         "update-dotenv": "^1.1.1"
     },
     "optionalDependencies": {

package/dist/threads/automation.js

@@ -18,9 +18,13 @@ const { DocumentTypes } = require("../db/utils");
 const { doInTenant } = require("@budibase/backend-core/tenancy");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
+const { AutomationErrors } = require("../constants");
 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 { cloneDeep } = require("lodash/fp");
+const env = require("../environment");
 /**
  * The automation orchestrator is a class responsible for executing automations.
  * It handles the context of the automation and makes sure each step gets the correct
@@ -81,44 +85,162 @@ class Orchestrator {
         }
         this.executionOutput.steps.push(stepObj);
     }
+    updateContextAndOutput(loopStepNumber, step, output, result) {
+        this.executionOutput.steps.splice(loopStepNumber, 0, {
+            id: step.id,
+            stepId: step.stepId,
+            outputs: Object.assign(Object.assign({}, output), { success: result.success, status: result.status }),
+            inputs: step.inputs,
+        });
+        this._context.steps.splice(loopStepNumber, 0, Object.assign(Object.assign({}, output), { success: result.success, status: result.status }));
+    }
     execute() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let automation = this._automation;
             const app = yield this.getApp();
             let stopped = false;
+            let loopStep;
+            let stepCount = 0;
+            let loopStepNumber;
+            let loopSteps = [];
             for (let step of automation.definition.steps) {
-                // execution stopped, record state for that
-                if (stopped) {
-                    this.updateExecutionOutput(step.id, step.stepId, {}, STOPPED_STATUS);
+                stepCount++;
+                let input;
+                if (step.stepId === LOOP_STEP_ID) {
+                    loopStep = step;
+                    loopStepNumber = stepCount;
                     continue;
                 }
-                let stepFn = yield this.getStepFunctionality(step.stepId);
-                step.inputs = yield processObject(step.inputs, this._context);
-                step.inputs = automationUtils.cleanInputValues(step.inputs, step.schema.inputs);
-                // appId is always passed
-                try {
-                    let tenantId = app.tenantId || DEFAULT_TENANT_ID;
-                    const outputs = yield doInTenant(tenantId, () => {
-                        return stepFn({
-                            inputs: step.inputs,
-                            appId: this._appId,
-                            emitter: this._emitter,
-                            context: this._context,
-                        });
-                    });
-                    this._context.steps.push(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) {
-                        stopped = true;
-                        this.updateExecutionOutput(step.id, step.stepId, step.inputs, Object.assign(Object.assign({}, outputs), STOPPED_STATUS));
+                if (loopStep) {
+                    input = yield processObject(loopStep.inputs, this._context);
+                }
+                let iterations = loopStep ? input.binding.length : 1;
+                let iterationCount = 0;
+                for (let index = 0; index < iterations; index++) {
+                    let originalStepInput = cloneDeep(step.inputs);
+                    // Handle if the user has set a max iteration count or if it reaches the max limit set by us
+                    if (loopStep) {
+                        // lets first of all handle the input
+                        // if the input is array then use it, if it is a string then split it on every new line
+                        let newInput = yield processObject(loopStep.inputs, cloneDeep(this._context));
+                        newInput = automationUtils.cleanInputValues(newInput, loopStep.schema.inputs);
+                        this._context.steps[loopStepNumber] = {
+                            currentItem: newInput.binding[index],
+                        };
+                        let tempOutput = { items: loopSteps, iterations: iterationCount };
+                        if ((loopStep.inputs.option === "Array" &&
+                            !Array.isArray(newInput.binding)) ||
+                            (loopStep.inputs.option === "String" &&
+                                typeof newInput.binding !== "string")) {
+                            this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
+                                status: AutomationErrors.INCORRECT_TYPE,
+                                success: false,
+                            });
+                            loopSteps = null;
+                            loopStep = null;
+                            break;
+                        }
+                        // The "Loop" binding in the front end is "fake", so replace it here so the context can understand it
+                        // Pretty hacky because we need to account for the row object
+                        for (let [key, value] of Object.entries(originalStepInput)) {
+                            if (typeof value === "object") {
+                                for (let [innerKey, innerValue] of Object.entries(originalStepInput[key])) {
+                                    if (typeof innerValue === "string") {
+                                        originalStepInput[key][innerKey] =
+                                            automationUtils.substituteLoopStep(innerValue, `steps.${loopStepNumber}`);
+                                    }
+                                }
+                            }
+                            else {
+                                if (typeof value === "string") {
+                                    originalStepInput[key] = automationUtils.substituteLoopStep(value, `steps.${loopStepNumber}`);
+                                }
+                            }
+                        }
+                        if (index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
+                            index === loopStep.inputs.iterations) {
+                            this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
+                                status: AutomationErrors.MAX_ITERATIONS,
+                                success: true,
+                            });
+                            loopSteps = null;
+                            loopStep = null;
+                            break;
+                        }
+                        if (((_a = this._context.steps[loopStepNumber]) === null || _a === void 0 ? void 0 : _a.currentItem) ===
+                            loopStep.inputs.failure) {
+                            this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
+                                status: AutomationErrors.FAILURE_CONDITION,
+                                success: false,
+                            });
+                            loopSteps = null;
+                            loopStep = null;
+                            break;
+                        }
+                    }
+                    // execution stopped, record state for that
+                    if (stopped) {
+                        this.updateExecutionOutput(step.id, step.stepId, {}, STOPPED_STATUS);
                         continue;
                     }
-                    this.updateExecutionOutput(step.id, step.stepId, step.inputs, outputs);
+                    // If it's a loop step, we need to manually add the bindings to the context
+                    let stepFn = yield this.getStepFunctionality(step.stepId);
+                    let inputs = yield processObject(originalStepInput, this._context);
+                    inputs = automationUtils.cleanInputValues(inputs, step.schema.inputs);
+                    try {
+                        // appId is always passed
+                        let tenantId = app.tenantId || DEFAULT_TENANT_ID;
+                        const outputs = yield doInTenant(tenantId, () => {
+                            return stepFn({
+                                inputs: inputs,
+                                appId: this._appId,
+                                emitter: this._emitter,
+                                context: this._context,
+                            });
+                        });
+                        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) {
+                            stopped = true;
+                            this.updateExecutionOutput(step.id, step.stepId, step.inputs, Object.assign(Object.assign({}, outputs), STOPPED_STATUS));
+                            continue;
+                        }
+                        if (loopStep && loopSteps) {
+                            loopSteps.push(outputs);
+                        }
+                        else {
+                            this.updateExecutionOutput(step.id, step.stepId, step.inputs, outputs);
+                        }
+                    }
+                    catch (err) {
+                        console.error(`Automation error - ${step.stepId} - ${err}`);
+                        return err;
+                    }
+                    if (loopStep) {
+                        iterationCount++;
+                        if (index === iterations - 1) {
+                            loopStep = null;
+                            this._context.steps.splice(loopStepNumber, 1);
+                            break;
+                        }
+                    }
                 }
-                catch (err) {
-                    console.error(`Automation error - ${step.stepId} - ${err}`);
-                    return err;
+                if (loopSteps && loopSteps.length) {
+                    let tempOutput = {
+                        success: true,
+                        items: loopSteps,
+                        iterations: iterationCount,
+                    };
+                    this.executionOutput.steps.splice(loopStepNumber + 1, 0, {
+                        id: step.id,
+                        stepId: step.stepId,
+                        outputs: tempOutput,
+                        inputs: step.inputs,
+                    });
+                    this._context.steps.splice(loopStepNumber, 0, tempOutput);
+                    loopSteps = null;
                 }
             }
             return this.executionOutput;

package/dist/threads/index.js

@@ -1,17 +1,45 @@
 "use strict";
-const workerFarm = require("worker-farm");
-const env = require("../environment");
-const ThreadType = {
+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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Thread = exports.ThreadType = void 0;
+const worker_farm_1 = __importDefault(require("worker-farm"));
+const env = __importStar(require("../environment"));
+exports.ThreadType = {
     QUERY: "query",
     AUTOMATION: "automation",
 };
 function typeToFile(type) {
     let filename = null;
     switch (type) {
-        case ThreadType.QUERY:
+        case exports.ThreadType.QUERY:
             filename = "./query";
             break;
-        case ThreadType.AUTOMATION:
+        case exports.ThreadType.AUTOMATION:
             filename = "./automation";
             break;
         default:
@@ -37,11 +65,10 @@ class Thread {
                 this.timeoutMs = opts.timeoutMs;
                 workerOpts.maxCallTime = opts.timeoutMs;
             }
-            this.workers = workerFarm(workerOpts, typeToFile(type));
+            this.workers = (0, worker_farm_1.default)(workerOpts, typeToFile(type));
         }
     }
     run(data) {
-        const timeoutMs = this.timeoutMs;
         return new Promise((resolve, reject) => {
             let fncToCall;
             // if in test then don't use threading
@@ -53,7 +80,7 @@ class Thread {
             }
             fncToCall(data, (err, response) => {
                 if (err && err.type === "TimeoutError") {
-                    reject(new Error(`Query response time exceeded ${timeoutMs}ms timeout.`));
+                    reject(new Error(`Query response time exceeded ${this.timeoutMs}ms timeout.`));
                 }
                 else if (err) {
                     reject(err);
@@ -65,5 +92,4 @@ class Thread {
         });
     }
 }
-module.exports.Thread = Thread;
-module.exports.ThreadType = ThreadType;
+exports.Thread = Thread;

package/dist/threads/utils.js

@@ -68,6 +68,7 @@ exports.formatResponse = resp => {
 exports.hasExtraData = response => {
     return (typeof response === "object" &&
         !Array.isArray(response) &&
+        response &&
         response.data != null &&
         response.info != null);
 };