@budibase/server 2.5.6-alpha.2 → 2.5.6-alpha.20

package/dist/automations/triggerInfo/rowUpdated.js

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

package/dist/automations/triggerInfo/webhook.js

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

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 (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
+            const plugins = yield sdk_1.default.plugins.fetch(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 (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
+            const plugins = yield sdk_1.default.plugins.fetch(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/migrations/functions/syncQuotas.js

@@ -37,6 +37,7 @@ const usageQuotas_1 = require("./usageQuotas");
 const syncApps = __importStar(require("./usageQuotas/syncApps"));
 const syncRows = __importStar(require("./usageQuotas/syncRows"));
 const syncPlugins = __importStar(require("./usageQuotas/syncPlugins"));
+const syncUsers = __importStar(require("./usageQuotas/syncUsers"));
 /**
  * Synchronise quotas to the state of the db.
  */
@@ -45,6 +46,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
         yield syncApps.run();
         yield syncRows.run();
         yield syncPlugins.run();
+        yield syncUsers.run();
     }));
 });
 exports.run = run;

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

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

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

@@ -0,0 +1,21 @@
+"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 backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
+const types_1 = require("@budibase/types");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    const userCount = yield backend_core_1.users.getUserCount();
+    console.log(`Syncing user count: ${userCount}`);
+    yield pro_1.quotas.setUsage(userCount, types_1.StaticQuotaName.USERS, 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.1",
+    "version": "2.5.6-alpha.19",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -45,12 +45,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.5.6-alpha.1",
-        "@budibase/client": "2.5.6-alpha.1",
-        "@budibase/pro": "2.5.6-alpha.1",
-        "@budibase/shared-core": "2.5.6-alpha.1",
-        "@budibase/string-templates": "2.5.6-alpha.1",
-        "@budibase/types": "2.5.6-alpha.1",
+        "@budibase/backend-core": "2.5.6-alpha.19",
+        "@budibase/client": "2.5.6-alpha.19",
+        "@budibase/pro": "2.5.6-alpha.19",
+        "@budibase/shared-core": "2.5.6-alpha.19",
+        "@budibase/string-templates": "2.5.6-alpha.19",
+        "@budibase/types": "2.5.6-alpha.19",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -65,6 +65,7 @@
         "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",
@@ -108,14 +109,14 @@
         "redis": "4",
         "server-destroy": "1.0.1",
         "snowflake-promise": "^4.5.0",
-        "socket.io": "^4.5.1",
+        "socket.io": "4.6.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.17",
         "worker-farm": "1.7.0",
         "xml2js": "0.5.0",
         "yargs": "13.2.4"

package/dist/sdk/app/backups/exports.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.streamExportApp = exports.exportMultipleApps = exports.exportApp = exports.exportDB = void 0;
+exports.streamExportApp = exports.exportApp = exports.exportDB = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const budibaseDir_1 = require("../../../utilities/budibaseDir");
 const fileSystem_1 = require("../../../utilities/fileSystem");
@@ -135,40 +135,6 @@ function exportApp(appId, config) {
     });
 }
 exports.exportApp = exportApp;
-/**
- * Export all apps + global DB (if supplied) to a single tarball, this includes
- * the attachments for each app as well.
- * @param {object[]} appMetadata The IDs and names of apps to export.
- * @param {string} globalDbContents The contents of the global DB to export as well.
- * @return {string} The path to the tarball.
- */
-function exportMultipleApps(appMetadata, globalDbContents) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tmpPath = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), uuid());
-        fs_1.default.mkdirSync(tmpPath);
-        let exportPromises = [];
-        // export each app to a directory, then move it into the complete export
-        const exportAndMove = (appId, appName) => __awaiter(this, void 0, void 0, function* () {
-            const path = yield exportApp(appId);
-            yield fs_1.default.promises.rename(path, (0, path_1.join)(tmpPath, appName));
-        });
-        for (let metadata of appMetadata) {
-            exportPromises.push(exportAndMove(metadata.appId, metadata.name));
-        }
-        // wait for all exports to finish
-        yield Promise.all(exportPromises);
-        // add the global DB contents
-        if (globalDbContents) {
-            fs_1.default.writeFileSync((0, path_1.join)(tmpPath, constants_2.GLOBAL_DB_EXPORT_FILE), globalDbContents);
-        }
-        const appNames = appMetadata.map(metadata => metadata.name);
-        const tarPath = tarFilesToTmp(tmpPath, [...appNames, constants_2.GLOBAL_DB_EXPORT_FILE]);
-        // clear up the tmp path now tarball generated
-        fs_1.default.rmSync(tmpPath, { recursive: true, force: true });
-        return tarPath;
-    });
-}
-exports.exportMultipleApps = exportMultipleApps;
 /**
  * Streams a backup of the database state for an app
  * @param {string} appId The ID of the app which is to be backed up.

package/dist/sdk/index.js

@@ -11,6 +11,7 @@ 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,
@@ -20,6 +21,7 @@ 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;

package/dist/{api/routes/cloud.js → sdk/plugins/index.js}

@@ -22,18 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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 });
-const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/cloud"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
-router
-    .get("/api/cloud/export", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.exportApps)
-    // has to be public, only run if apps don't exist
-    .post("/api/cloud/import", controller.importApps)
-    .get("/api/cloud/import/complete", controller.hasBeenImported);
-exports.default = router;
+const plugins = __importStar(require("./plugins"));
+exports.default = Object.assign({}, plugins);

package/dist/sdk/plugins/plugins.js

@@ -0,0 +1,53 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processUploaded = exports.fetch = void 0;
+const types_1 = require("@budibase/types");
+const backend_core_1 = require("@budibase/backend-core");
+const file_1 = require("../../api/controllers/plugin/file");
+const environment_1 = __importDefault(require("../../environment"));
+const websockets_1 = require("../../websockets");
+const pro_1 = require("@budibase/pro");
+function fetch(type) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.tenancy.getGlobalDB();
+        const response = yield db.allDocs(backend_core_1.db.getPluginParams(null, {
+            include_docs: true,
+        }));
+        let plugins = response.rows.map((row) => row.doc);
+        plugins = backend_core_1.objectStore.enrichPluginURLs(plugins);
+        if (type) {
+            return plugins.filter((plugin) => { var _a; return ((_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.type) === type; });
+        }
+        else {
+            return plugins;
+        }
+    });
+}
+exports.fetch = fetch;
+function processUploaded(plugin, source) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const { metadata, directory } = yield (0, file_1.fileUpload)(plugin);
+        backend_core_1.plugins.validate(metadata === null || metadata === void 0 ? void 0 : metadata.schema);
+        // Only allow components in cloud
+        if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
+            throw new Error("Only component plugins are supported outside of self-host");
+        }
+        const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
+        websockets_1.clientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash });
+        return doc;
+    });
+}
+exports.processUploaded = processUploaded;

package/dist/threads/automation.js

@@ -52,8 +52,8 @@ const string_templates_1 = require("@budibase/string-templates");
 const fp_1 = require("lodash/fp");
 const sdkUtils = __importStar(require("../sdk/utils"));
 const environment_1 = __importDefault(require("../environment"));
-const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
-const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
+const FILTER_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.FILTER.stepId;
+const LOOP_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
 function getLoopIterations(loopStep, input) {