@budibase/server 1.3.21-alpha.1 → 1.3.21-alpha.2

package/dist/api/controllers/plugin/index.js

@@ -12,22 +12,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processPlugin = exports.storePlugin = exports.destroy = exports.fetch = exports.create = exports.upload = exports.getPlugins = void 0;
-const constants_1 = require("../../../constants");
-const fileSystem_1 = require("../../../utilities/fileSystem");
+exports.processUploadedPlugin = exports.destroy = exports.fetch = exports.create = exports.upload = exports.getPlugins = void 0;
 const uploaders_1 = require("./uploaders");
 const tenancy_1 = require("@budibase/backend-core/tenancy");
 const plugins_1 = require("@budibase/backend-core/plugins");
-const utils_1 = require("../../../db/utils");
-const objectStore_1 = require("@budibase/backend-core/objectStore");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../../../environment"));
 const websocket_1 = require("../../../websocket");
 const backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
 function getPlugins(type) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, tenancy_1.getGlobalDB)();
-        const response = yield db.allDocs((0, utils_1.getPluginParams)(null, {
+        const response = yield db.allDocs(backend_core_1.db.getPluginParams(null, {
             include_docs: true,
         }));
         const plugins = response.rows.map((row) => row.doc);
@@ -49,7 +46,7 @@ function upload(ctx) {
             let docs = [];
             // can do single or multiple plugins
             for (let plugin of plugins) {
-                const doc = yield processPlugin(plugin, types_1.PluginSource.FILE);
+                const doc = yield processUploadedPlugin(plugin, types_1.PluginSource.FILE);
                 docs.push(doc);
             }
             ctx.body = {
@@ -96,17 +93,18 @@ function create(ctx) {
             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 storePlugin(metadata, directory, source);
+            const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
+            websocket_1.ClientAppSocket.emit("plugins-update", { name, hash: doc.hash });
             ctx.body = {
                 message: "Plugin uploaded successfully",
                 plugins: [doc],
             };
+            ctx.body = { plugin: doc };
         }
         catch (err) {
             const errMsg = (err === null || err === void 0 ? void 0 : err.message) ? err === null || err === void 0 ? void 0 : err.message : err;
             ctx.throw(400, `Failed to import plugin: ${errMsg}`);
         }
-        ctx.status = 200;
     });
 }
 exports.create = create;
@@ -118,74 +116,18 @@ function fetch(ctx) {
 exports.fetch = fetch;
 function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, tenancy_1.getGlobalDB)();
         const { pluginId } = ctx.params;
         try {
-            const plugin = yield db.get(pluginId);
-            const bucketPath = `${plugin.name}/`;
-            yield (0, objectStore_1.deleteFolder)(constants_1.ObjectStoreBuckets.PLUGINS, bucketPath);
-            yield db.remove(pluginId, plugin._rev);
-            yield backend_core_1.events.plugin.deleted(plugin);
+            yield pro_1.plugins.deletePlugin(pluginId);
+            ctx.body = { message: `Plugin ${ctx.params.pluginId} deleted.` };
         }
         catch (err) {
-            const errMsg = (err === null || err === void 0 ? void 0 : err.message) ? err === null || err === void 0 ? void 0 : err.message : err;
-            ctx.throw(400, `Failed to delete plugin: ${errMsg}`);
+            ctx.throw(400, err.message);
         }
-        ctx.message = `Plugin ${ctx.params.pluginId} deleted.`;
-        ctx.status = 200;
     });
 }
 exports.destroy = destroy;
-function storePlugin(metadata, directory, source) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, tenancy_1.getGlobalDB)();
-        const version = metadata.package.version, name = metadata.package.name, description = metadata.package.description, hash = metadata.schema.hash;
-        // first open the tarball into tmp directory
-        const bucketPath = `${name}/`;
-        const files = yield (0, objectStore_1.uploadDirectory)(constants_1.ObjectStoreBuckets.PLUGINS, directory, bucketPath);
-        const jsFile = files.find((file) => file.name.endsWith(".js"));
-        if (!jsFile) {
-            throw new Error(`Plugin missing .js file.`);
-        }
-        // validate the JS for a datasource
-        if (metadata.schema.type === types_1.PluginType.DATASOURCE) {
-            const js = (0, fileSystem_1.loadJSFile)(directory, jsFile.name);
-            // TODO: this isn't safe - but we need full node environment
-            // in future we should do this in a thread for safety
-            try {
-                eval(js);
-            }
-            catch (err) {
-                const message = (err === null || err === void 0 ? void 0 : err.message) ? err.message : JSON.stringify(err);
-                throw new Error(`JS invalid: ${message}`);
-            }
-        }
-        const jsFileName = jsFile.name;
-        const pluginId = (0, utils_1.generatePluginID)(name);
-        // overwrite existing docs entirely if they exist
-        let rev;
-        try {
-            const existing = yield db.get(pluginId);
-            rev = existing._rev;
-        }
-        catch (err) {
-            rev = undefined;
-        }
-        let doc = Object.assign(Object.assign({ _id: pluginId, _rev: rev }, metadata), { name,
-            version,
-            hash,
-            description, jsUrl: `${bucketPath}${jsFileName}` });
-        if (source) {
-            doc = Object.assign(Object.assign({}, doc), { source });
-        }
-        const response = yield db.put(doc);
-        yield backend_core_1.events.plugin.imported(doc);
-        websocket_1.ClientAppSocket.emit("plugin-update", { name, hash });
-        return Object.assign(Object.assign({}, doc), { _rev: response.rev });
-    });
-}
-exports.storePlugin = storePlugin;
-function processPlugin(plugin, source) {
+function processUploadedPlugin(plugin, source) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { metadata, directory } = yield (0, uploaders_1.fileUpload)(plugin);
@@ -194,7 +136,9 @@ function processPlugin(plugin, source) {
         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");
         }
-        return yield storePlugin(metadata, directory, source);
+        const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
+        websocket_1.ClientAppSocket.emit("plugins-update", { name, hash: doc.hash });
+        return doc;
     });
 }
-exports.processPlugin = processPlugin;
+exports.processUploadedPlugin = processUploadedPlugin;

package/dist/api/controllers/screen.js

@@ -8,26 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getScreenParams, generateScreenID, getPluginParams, DocumentType, } = require("../../db/utils");
-const { AccessController } = require("@budibase/backend-core/roles");
-const { getAppDB } = require("@budibase/backend-core/context");
-const { events } = require("@budibase/backend-core");
-const { getGlobalDB } = require("@budibase/backend-core/tenancy");
-const { updateAppPackage } = require("./application");
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+const application_1 = require("./application");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    const screens = (yield db.allDocs(getScreenParams(null, {
+    const db = backend_core_1.context.getAppDB();
+    const screens = (yield db.allDocs((0, utils_1.getScreenParams)(null, {
         include_docs: true,
-    }))).rows.map(element => element.doc);
-    ctx.body = yield new AccessController().checkScreensAccess(screens, ctx.user.role._id);
+    }))).rows.map((el) => el.doc);
+    ctx.body = yield new backend_core_1.roles.AccessController().checkScreensAccess(screens, ctx.user.role._id);
 });
 exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = backend_core_1.context.getAppDB();
     let screen = ctx.request.body;
     let eventFn;
     if (!screen._id) {
-        screen._id = generateScreenID();
-        eventFn = events.screen.created;
+        screen._id = (0, utils_1.generateScreenID)();
+        eventFn = backend_core_1.events.screen.created;
     }
     const response = yield db.put(screen);
     // Find any custom components being used
@@ -35,21 +33,21 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     let pluginAdded = false;
     findPlugins(screen.props, pluginNames);
     if (pluginNames.length) {
-        const globalDB = getGlobalDB();
-        const pluginsResponse = yield globalDB.allDocs(getPluginParams(null, {
+        const globalDB = backend_core_1.tenancy.getGlobalDB();
+        const pluginsResponse = yield globalDB.allDocs(backend_core_1.db.getPluginParams(null, {
             include_docs: true,
         }));
         const requiredPlugins = pluginsResponse.rows
-            .map(row => row.doc)
-            .filter(plugin => {
+            .map((row) => row.doc)
+            .filter((plugin) => {
             return (plugin.schema.type === "component" &&
                 pluginNames.includes(`plugin/${plugin.name}`));
         });
         // Update the app metadata
-        const application = yield db.get(DocumentType.APP_METADATA);
+        const application = yield db.get(utils_1.DocumentType.APP_METADATA);
         let usedPlugins = application.usedPlugins || [];
-        requiredPlugins.forEach(plugin => {
-            if (!usedPlugins.find(x => x._id === plugin._id)) {
+        requiredPlugins.forEach((plugin) => {
+            if (!usedPlugins.find((x) => x._id === plugin._id)) {
                 pluginAdded = true;
                 usedPlugins.push({
                     _id: plugin._id,
@@ -61,7 +59,7 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             }
         });
         if (pluginAdded) {
-            yield updateAppPackage({ usedPlugins }, ctx.appId);
+            yield (0, application_1.updateAppPackage)({ usedPlugins }, ctx.appId);
         }
     }
     if (eventFn) {
@@ -71,11 +69,11 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = Object.assign(Object.assign({}, screen), { _id: response.id, _rev: response.rev, pluginAdded });
 });
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = backend_core_1.context.getAppDB();
     const id = ctx.params.screenId;
     const screen = yield db.get(id);
     yield db.remove(id, ctx.params.screenRev);
-    yield events.screen.deleted(screen);
+    yield backend_core_1.events.screen.deleted(screen);
     ctx.body = {
         message: "Screen deleted successfully",
     };

package/dist/db/utils.js

@@ -7,7 +7,7 @@ const AppStatus = {
     ALL: "all",
     DEPLOYED: "published",
 };
-const DocumentType = 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", AUTOMATION_METADATA: "meta_au", PLUGIN: "plg" });
+const DocumentType = 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", AUTOMATION_METADATA: "meta_au" });
 const InternalTables = {
     USER_METADATA: "ta_users",
 };
@@ -286,9 +286,3 @@ exports.getMultiIDParams = ids => {
         include_docs: true,
     };
 };
-/**
- * Gets parameters for retrieving automations, this is a utility function for the getDocParams function.
- */
-exports.getPluginParams = (pluginId = null, otherProps = {}) => {
-    return getDocParams(DocumentType.PLUGIN, pluginId, otherProps);
-};

package/dist/package.json

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