@budibase/server 2.5.6-alpha.9 → 2.5.7

package/dist/automations/triggerInfo/cron.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 cron: {
-                    type: types_1.AutomationIOType.STRING,
-                    customType: types_1.AutomationCustomIOType.CRON,
+                    type: "string",
+                    customType: "cron",
                     title: "Expression",
                 },
             },
@@ -24,12 +24,12 @@ exports.definition = {
         outputs: {
             properties: {
                 timestamp: {
-                    type: types_1.AutomationIOType.NUMBER,
+                    type: "number",
                     description: "Timestamp the cron was executed",
                 },
             },
             required: ["timestamp"],
         },
     },
-    type: types_1.AutomationStepType.TRIGGER,
+    type: "TRIGGER",
 };

package/dist/automations/triggerInfo/rowDeleted.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 tableId: {
-                    type: types_1.AutomationIOType.STRING,
-                    customType: types_1.AutomationCustomIOType.TABLE,
+                    type: "string",
+                    customType: "table",
                     title: "Table",
                 },
             },
@@ -24,13 +24,13 @@ exports.definition = {
         outputs: {
             properties: {
                 row: {
-                    type: types_1.AutomationIOType.OBJECT,
-                    customType: types_1.AutomationCustomIOType.ROW,
+                    type: "object",
+                    customType: "row",
                     description: "The row that was deleted",
                 },
             },
             required: ["row"],
         },
     },
-    type: types_1.AutomationStepType.TRIGGER,
+    type: "TRIGGER",
 };

package/dist/automations/triggerInfo/rowSaved.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 tableId: {
-                    type: types_1.AutomationIOType.STRING,
-                    customType: types_1.AutomationCustomIOType.TABLE,
+                    type: "string",
+                    customType: "table",
                     title: "Table",
                 },
             },
@@ -24,21 +24,21 @@ exports.definition = {
         outputs: {
             properties: {
                 row: {
-                    type: types_1.AutomationIOType.OBJECT,
-                    customType: types_1.AutomationCustomIOType.ROW,
+                    type: "object",
+                    customType: "row",
                     description: "The new row that was created",
                 },
                 id: {
-                    type: types_1.AutomationIOType.STRING,
+                    type: "string",
                     description: "Row ID - can be used for updating",
                 },
                 revision: {
-                    type: types_1.AutomationIOType.STRING,
+                    type: "string",
                     description: "Revision of row",
                 },
             },
             required: ["row", "id"],
         },
     },
-    type: types_1.AutomationStepType.TRIGGER,
+    type: "TRIGGER",
 };

package/dist/automations/triggerInfo/rowUpdated.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 tableId: {
-                    type: types_1.AutomationIOType.STRING,
-                    customType: types_1.AutomationCustomIOType.TABLE,
+                    type: "string",
+                    customType: "table",
                     title: "Table",
                 },
             },
@@ -24,21 +24,21 @@ exports.definition = {
         outputs: {
             properties: {
                 row: {
-                    type: types_1.AutomationIOType.OBJECT,
-                    customType: types_1.AutomationCustomIOType.ROW,
+                    type: "object",
+                    customType: "row",
                     description: "The row that was updated",
                 },
                 id: {
-                    type: types_1.AutomationIOType.STRING,
+                    type: "string",
                     description: "Row ID - can be used for updating",
                 },
                 revision: {
-                    type: types_1.AutomationIOType.STRING,
+                    type: "string",
                     description: "Revision of row",
                 },
             },
             required: ["row", "id"],
         },
     },
-    type: types_1.AutomationStepType.TRIGGER,
+    type: "TRIGGER",
 };

package/dist/automations/triggerInfo/webhook.js

@@ -14,13 +14,13 @@ exports.definition = {
         inputs: {
             properties: {
                 schemaUrl: {
-                    type: types_1.AutomationIOType.STRING,
-                    customType: types_1.AutomationCustomIOType.WEBHOOK_URL,
+                    type: "string",
+                    customType: "webhookUrl",
                     title: "Schema URL",
                 },
                 triggerUrl: {
-                    type: types_1.AutomationIOType.STRING,
-                    customType: types_1.AutomationCustomIOType.WEBHOOK_URL,
+                    type: "string",
+                    customType: "webhookUrl",
                     title: "Trigger URL",
                 },
             },
@@ -29,12 +29,12 @@ exports.definition = {
         outputs: {
             properties: {
                 body: {
-                    type: types_1.AutomationIOType.OBJECT,
+                    type: "object",
                     description: "Body of the request which hit the webhook",
                 },
             },
             required: ["body"],
         },
     },
-    type: types_1.AutomationStepType.TRIGGER,
+    type: "TRIGGER",
 };

package/dist/elasticApm.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const elastic_apm_node_1 = __importDefault(require("elastic-apm-node"));
+// enable APM if configured
+if (process.env.ELASTIC_APM_ENABLED) {
+    console.log("Starting elastic-apm-node");
+    elastic_apm_node_1.default.start({
+        serviceName: process.env.SERVICE,
+        environment: process.env.BUDIBASE_ENVIRONMENT,
+    });
+}

package/dist/environment.js

@@ -54,6 +54,7 @@ const environment = {
     // minor
     SALT_ROUNDS: process.env.SALT_ROUNDS,
     LOGGER: process.env.LOGGER,
+    LOG_LEVEL: process.env.LOG_LEVEL,
     ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
     AUTOMATION_MAX_ITERATIONS: parseIntSafe(process.env.AUTOMATION_MAX_ITERATIONS) || 200,
     SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,

package/dist/events/index.js

@@ -3,9 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
 const BudibaseEmitter_1 = __importDefault(require("./BudibaseEmitter"));
 const emitter = new BudibaseEmitter_1.default();
-var docUpdates_1 = require("./docUpdates");
-Object.defineProperty(exports, "init", { enumerable: true, get: function () { return docUpdates_1.init; } });
 exports.default = emitter;

package/dist/integrations/index.js

@@ -29,11 +29,11 @@ const firebase_1 = __importDefault(require("./firebase"));
 const redis_1 = __importDefault(require("./redis"));
 const snowflake_1 = __importDefault(require("./snowflake"));
 const oracle_1 = __importDefault(require("./oracle"));
+const plugin_1 = require("../api/controllers/plugin");
 const types_1 = require("@budibase/types");
 const fileSystem_1 = require("../utilities/fileSystem");
 const environment_1 = __importDefault(require("../environment"));
 const lodash_1 = require("lodash");
-const sdk_1 = __importDefault(require("../sdk"));
 const DEFINITIONS = {
     [types_1.SourceName.POSTGRES]: postgres_1.default.schema,
     [types_1.SourceName.DYNAMODB]: dynamodb_1.default.schema,
@@ -91,7 +91,7 @@ function getDefinitions() {
     return __awaiter(this, void 0, void 0, function* () {
         const pluginSchemas = {};
         if (environment_1.default.SELF_HOSTED) {
-            const plugins = yield sdk_1.default.plugins.fetch(types_1.PluginType.DATASOURCE);
+            const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
             // extract the actual schema from each custom
             for (let plugin of plugins) {
                 const sourceId = plugin.name;
@@ -111,7 +111,7 @@ function getIntegration(integration) {
             return INTEGRATIONS[integration];
         }
         if (environment_1.default.SELF_HOSTED) {
-            const plugins = yield sdk_1.default.plugins.fetch(types_1.PluginType.DATASOURCE);
+            const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
             for (let plugin of plugins) {
                 if (plugin.name === integration) {
                     // need to use commonJS require due to its dynamic runtime nature

package/dist/integrations/microsoftSqlServer.js

@@ -206,11 +206,8 @@ class SqlServerIntegration extends sql_1.default {
                     if (typeof name !== "string") {
                         continue;
                     }
-                    const hasDefault = def.COLUMN_DEFAULT;
-                    const isAuto = !!autoColumns.find(col => col === name);
-                    const required = !!requiredColumns.find(col => col === name);
-                    schema[name] = Object.assign(Object.assign({ autocolumn: isAuto, name: name, constraints: {
-                            presence: required && !isAuto && !hasDefault,
+                    schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find(col => col === name), name: name, constraints: {
+                            presence: requiredColumns.find(col => col === name),
                         } }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
                 }
                 tables[tableName] = {

package/dist/integrations/mysql.js

@@ -186,14 +186,12 @@ class MySQLIntegration extends sql_1.default {
                         if (column.Key === "PRI" && primaryKeys.indexOf(column.Key) === -1) {
                             primaryKeys.push(columnName);
                         }
-                        const hasDefault = column.Default != null;
+                        const constraints = {
+                            presence: column.Null !== "YES",
+                        };
                         const isAuto = typeof column.Extra === "string" &&
                             (column.Extra === "auto_increment" ||
                                 column.Extra.toLowerCase().includes("generated"));
-                        const required = column.Null !== "YES";
-                        const constraints = {
-                            presence: required && !isAuto && !hasDefault,
-                        };
                         schema[columnName] = Object.assign(Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type)), { externalType: column.Type });
                     }
                     if (!tables[tableName]) {

package/dist/integrations/postgres.js

@@ -227,15 +227,13 @@ class PostgresIntegration extends sql_1.default {
                     const identity = !!(column.identity_generation ||
                         column.identity_start ||
                         column.identity_increment);
-                    const hasDefault = column.column_default != null;
-                    const hasNextVal = typeof column.column_default === "string" &&
-                        column.column_default.startsWith("nextval");
-                    const isGenerated = column.is_generated && column.is_generated !== "NEVER";
-                    const isAuto = hasNextVal || identity || isGenerated;
-                    const required = column.is_nullable === "NO";
                     const constraints = {
-                        presence: required && !hasDefault && !isGenerated,
+                        presence: column.is_nullable === "NO",
                     };
+                    const hasDefault = typeof column.column_default === "string" &&
+                        column.column_default.startsWith("nextval");
+                    const isGenerated = column.is_generated && column.is_generated !== "NEVER";
+                    const isAuto = hasDefault || identity || isGenerated;
                     tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName, constraints }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
                 }
                 const final = (0, utils_1.finaliseExternalTables)(tables, entities);

package/dist/integrations/redis.js

@@ -38,12 +38,6 @@ const SCHEMA = {
             type: "password",
             required: false,
         },
-        db: {
-            type: "number",
-            required: false,
-            display: "DB",
-            default: 0,
-        },
     },
     query: {
         create: {
@@ -96,7 +90,6 @@ class RedisIntegration {
             port: this.config.port,
             username: this.config.username,
             password: this.config.password,
-            db: this.config.db,
         });
     }
     disconnect() {

package/dist/integrations/rest.js

@@ -166,10 +166,6 @@ class RestIntegration {
                     }
                     raw = rawXml;
                 }
-                else if (contentType.includes("application/pdf")) {
-                    data = yield response.arrayBuffer(); // Save PDF as ArrayBuffer
-                    raw = Buffer.from(data);
-                }
                 else {
                     data = yield response.text();
                     raw = data;

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

@@ -19,7 +19,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
     const appCount = devApps ? devApps.length : 0;
     // sync app count
     const tenantId = backend_core_1.tenancy.getTenantId();
-    console.log(`Syncing app count: ${appCount}`);
+    console.log(`[Tenant: ${tenantId}] Syncing app count: ${appCount}`);
     yield pro_1.quotas.setUsage(appCount, types_1.StaticQuotaName.APPS, types_1.QuotaUsageType.STATIC);
 });
 exports.run = run;

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

@@ -27,7 +27,8 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
         rowCount += rows.length;
     });
     // sync row count
-    console.log(`Syncing row count: ${rowCount}`);
+    const tenantId = backend_core_1.tenancy.getTenantId();
+    console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
     yield pro_1.quotas.setUsagePerApp(counts, types_1.StaticQuotaName.ROWS, types_1.QuotaUsageType.STATIC);
 });
 exports.run = run;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.5.6-alpha.6",
+    "version": "2.5.6",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -26,7 +26,6 @@
         "dev:stack:down": "node scripts/dev/manage.js down",
         "dev:stack:nuke": "node scripts/dev/manage.js nuke",
         "dev:builder": "yarn run dev:stack:up && nodemon",
-        "dev:built": "yarn run dev:stack:up && yarn run run:docker",
         "specs": "ts-node specs/generate.ts && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
         "initialise": "node scripts/initialise.js",
         "env:multi:enable": "node scripts/multiTenancy.js enable",
@@ -45,12 +44,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.5.6-alpha.6",
-        "@budibase/client": "2.5.6-alpha.6",
-        "@budibase/pro": "2.5.6-alpha.6",
-        "@budibase/shared-core": "2.5.6-alpha.6",
-        "@budibase/string-templates": "2.5.6-alpha.6",
-        "@budibase/types": "2.5.6-alpha.6",
+        "@budibase/backend-core": "^2.5.6",
+        "@budibase/client": "^2.5.6",
+        "@budibase/pro": "2.5.6",
+        "@budibase/shared-core": "^2.5.6",
+        "@budibase/string-templates": "^2.5.6",
+        "@budibase/types": "^2.5.6",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -65,7 +64,6 @@
         "bull": "4.10.1",
         "chmodr": "1.2.0",
         "chokidar": "3.5.3",
-        "cookies": "0.8.0",
         "csvtojson": "2.0.10",
         "curlconverter": "3.21.0",
         "dd-trace": "3.13.2",
@@ -87,6 +85,7 @@
         "koa-body": "4.2.0",
         "koa-compress": "4.0.1",
         "koa-connect": "2.1.0",
+        "koa-pino-logger": "3.0.0",
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
@@ -100,6 +99,7 @@
         "node-fetch": "2.6.7",
         "open": "8.4.0",
         "pg": "8.5.1",
+        "pino-pretty": "4.0.0",
         "posthog-node": "1.3.0",
         "pouchdb": "7.3.0",
         "pouchdb-adapter-memory": "7.2.2",
@@ -109,17 +109,18 @@
         "redis": "4",
         "server-destroy": "1.0.1",
         "snowflake-promise": "^4.5.0",
-        "socket.io": "4.6.1",
+        "socket.io": "^4.5.1",
         "svelte": "3.49.0",
         "swagger-parser": "10.0.3",
         "tar": "6.1.11",
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",
         "validate.js": "0.13.1",
-        "vm2": "3.9.16",
+        "vm2": "^3.9.15",
         "worker-farm": "1.7.0",
-        "xml2js": "0.5.0",
-        "yargs": "13.2.4"
+        "xml2js": "0.4.23",
+        "yargs": "13.2.4",
+        "zlib": "1.0.5"
     },
     "devDependencies": {
         "@babel/core": "7.17.4",
@@ -148,7 +149,7 @@
         "@types/tar": "6.1.3",
         "@typescript-eslint/parser": "5.45.0",
         "apidoc": "0.50.4",
-        "babel-jest": "29.5.0",
+        "babel-jest": "27.5.1",
         "copyfiles": "2.4.1",
         "docker-compose": "0.23.17",
         "eslint": "6.8.0",
@@ -156,7 +157,6 @@
         "is-wsl": "2.2.0",
         "jest": "29.5.0",
         "jest-openapi": "0.14.2",
-        "jest-runner": "29.5.0",
         "jest-serial-runner": "^1.2.1",
         "nodemon": "2.0.15",
         "openapi-types": "9.3.1",

package/dist/sdk/app/applications/sync.js

@@ -12,108 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.syncApp = exports.syncUsersToAllApps = void 0;
+exports.syncApp = void 0;
 const environment_1 = __importDefault(require("../../../environment"));
 const backend_core_1 = require("@budibase/backend-core");
-const pro_1 = require("@budibase/pro");
 const __1 = __importDefault(require("../../"));
-const global_1 = require("../../../utilities/global");
-const utils_1 = require("../../../db/utils");
-function syncUsersToApp(appId, users, groups) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!(yield backend_core_1.db.dbExists(appId))) {
-            return;
-        }
-        yield backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
-            const db = backend_core_1.context.getAppDB();
-            for (let user of users) {
-                let ctxUser = user;
-                let deletedUser = false;
-                const metadataId = (0, utils_1.generateUserMetadataID)(user._id);
-                if (user.deleted) {
-                    deletedUser = true;
-                }
-                // make sure role is correct
-                if (!deletedUser) {
-                    ctxUser = yield (0, global_1.processUser)(ctxUser, { appId, groups });
-                }
-                let roleId = ctxUser.roleId;
-                if (roleId === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
-                    roleId = undefined;
-                }
-                let metadata;
-                try {
-                    metadata = yield db.get(metadataId);
-                }
-                catch (err) {
-                    if (err.status !== 404) {
-                        throw err;
-                    }
-                    // no metadata and user is to be deleted, can skip
-                    // no role - user isn't in app anyway
-                    if (!roleId) {
-                        continue;
-                    }
-                    else if (!deletedUser) {
-                        // doesn't exist yet, creating it
-                        metadata = {
-                            tableId: utils_1.InternalTables.USER_METADATA,
-                        };
-                    }
-                }
-                // the user doesn't exist, or doesn't have a role anymore
-                // get rid of their metadata
-                if (deletedUser || !roleId) {
-                    yield db.remove(metadata);
-                    continue;
-                }
-                // assign the roleId for the metadata doc
-                if (roleId) {
-                    metadata.roleId = roleId;
-                }
-                let combined = __1.default.users.combineMetadataAndUser(ctxUser, metadata);
-                // if no combined returned, there are no updates to make
-                if (combined) {
-                    yield db.put(combined);
-                }
-            }
-        }));
-    });
-}
-function syncUsersToAllApps(userIds) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // list of users, if one has been deleted it will be undefined in array
-        const users = (yield (0, global_1.getGlobalUsers)(userIds, {
-            noProcessing: true,
-        }));
-        const groups = yield pro_1.sdk.groups.fetch();
-        const finalUsers = [];
-        for (let userId of userIds) {
-            const user = users.find(user => user._id === userId);
-            if (!user) {
-                finalUsers.push({ _id: userId, deleted: true });
-            }
-            else {
-                finalUsers.push(user);
-            }
-        }
-        const devAppIds = yield backend_core_1.db.getDevAppIDs();
-        let promises = [];
-        for (let devAppId of devAppIds) {
-            const prodAppId = backend_core_1.db.getProdAppID(devAppId);
-            for (let appId of [prodAppId, devAppId]) {
-                promises.push(syncUsersToApp(appId, finalUsers, groups));
-            }
-        }
-        const resp = yield Promise.allSettled(promises);
-        const failed = resp.filter(promise => promise.status === "rejected");
-        if (failed.length > 0) {
-            const reasons = failed.map(fail => fail.reason);
-            backend_core_1.logging.logAlert("Failed to sync users to apps", reasons);
-        }
-    });
-}
-exports.syncUsersToAllApps = syncUsersToAllApps;
 function syncApp(appId, opts) {
     return __awaiter(this, void 0, void 0, function* () {
         if (environment_1.default.DISABLE_AUTO_PROD_APP_SYNC) {
@@ -129,27 +31,31 @@ function syncApp(appId, opts) {
         // specific case, want to make sure setup is skipped
         const prodDb = backend_core_1.context.getProdAppDB({ skip_setup: true });
         const exists = yield prodDb.exists();
+        if (!exists) {
+            // the database doesn't exist. Don't replicate
+            return {
+                message: "App sync not required, app not deployed.",
+            };
+        }
+        const replication = new backend_core_1.db.Replication({
+            source: prodAppId,
+            target: appId,
+        });
         let error;
-        if (exists) {
-            const replication = new backend_core_1.db.Replication({
-                source: prodAppId,
-                target: appId,
-            });
-            try {
-                const replOpts = replication.appReplicateOpts();
-                if (opts === null || opts === void 0 ? void 0 : opts.automationOnly) {
-                    replOpts.filter = (doc) => doc._id.startsWith(backend_core_1.db.DocumentType.AUTOMATION);
-                }
-                yield replication.replicate(replOpts);
-            }
-            catch (err) {
-                error = err;
-            }
-            finally {
-                yield replication.close();
+        try {
+            const replOpts = replication.appReplicateOpts();
+            if (opts === null || opts === void 0 ? void 0 : opts.automationOnly) {
+                replOpts.filter = (doc) => doc._id.startsWith(backend_core_1.db.DocumentType.AUTOMATION);
             }
+            yield replication.replicate(replOpts);
+        }
+        catch (err) {
+            error = err;
+        }
+        finally {
+            yield replication.close();
         }
-        // sync the users - kept for safe keeping
+        // sync the users
         yield __1.default.users.syncGlobalUsers();
         if (error) {
             throw error;

package/dist/sdk/index.js

@@ -11,7 +11,6 @@ const datasources_1 = __importDefault(require("./app/datasources"));
 const queries_1 = __importDefault(require("./app/queries"));
 const rows_1 = __importDefault(require("./app/rows"));
 const users_1 = __importDefault(require("./users"));
-const plugins_1 = __importDefault(require("./plugins"));
 const sdk = {
     backups: backups_1.default,
     tables: tables_1.default,
@@ -21,7 +20,6 @@ const sdk = {
     users: users_1.default,
     datasources: datasources_1.default,
     queries: queries_1.default,
-    plugins: plugins_1.default,
 };
 // default export for TS
 exports.default = sdk;