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

package/dist/api/controllers/application.js

@@ -313,7 +313,7 @@ const appPostCreate = (ctx, app) => __awaiter(void 0, void 0, void 0, function*
     yield creationEvents(ctx.request, app);
     // app import & template creation
     if (ctx.request.body.useTemplate === "true") {
-        const rows = yield (0, rows_1.getUniqueRows)([app.appId]);
+        const { rows } = yield (0, rows_1.getUniqueRows)([app.appId]);
         const rowCount = rows ? rows.length : 0;
         if (rowCount) {
             try {
@@ -438,7 +438,7 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return result;
 });
 const preDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const rows = yield (0, rows_1.getUniqueRows)([ctx.params.appId]);
+    const { rows } = yield (0, rows_1.getUniqueRows)([ctx.params.appId]);
     ctx.rowCount = rows.length;
 });
 const postDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {

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

@@ -149,7 +149,9 @@ function preview(ctx) {
                     auth: Object.assign({}, authConfigCtx),
                 },
             });
-            const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn);
+            const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn, {
+                datasourceId: datasource._id,
+            });
             const schemaFields = {};
             if ((rows === null || rows === void 0 ? void 0 : rows.length) > 0) {
                 for (let key of [...new Set(keys)]) {
@@ -226,7 +228,9 @@ function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
                     auth: Object.assign({}, authConfigCtx),
                 },
             });
-            const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn);
+            const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn, {
+                datasourceId: datasource._id,
+            });
             if (opts && opts.rowsOnly) {
                 ctx.body = rows;
             }

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

@@ -44,7 +44,9 @@ function patch(ctx) {
             return (0, exports.save)(ctx);
         }
         try {
-            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx));
+            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
+                datasourceId: tableId,
+            });
             ctx.status = 200;
             ctx.eventEmitter &&
                 ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
@@ -66,7 +68,9 @@ const save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         return patch(ctx);
     }
     try {
-        const { row, table } = yield pro_1.quotas.addRow(() => pro_1.quotas.addQuery(() => pickApi(tableId).save(ctx)));
+        const { row, table } = yield pro_1.quotas.addRow(() => pro_1.quotas.addQuery(() => pickApi(tableId).save(ctx), {
+            datasourceId: tableId,
+        }));
         ctx.status = 200;
         ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row, table);
         ctx.message = `${table.name} saved successfully`;
@@ -81,7 +85,9 @@ function fetchView(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchView(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchView(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -93,7 +99,9 @@ function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetch(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetch(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -105,7 +113,9 @@ function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).find(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).find(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -120,7 +130,9 @@ function destroy(ctx) {
         const tableId = getTableId(ctx);
         let response, row;
         if (inputs.rows) {
-            let { rows } = yield pro_1.quotas.addQuery(() => pickApi(tableId).bulkDestroy(ctx));
+            let { rows } = yield pro_1.quotas.addQuery(() => pickApi(tableId).bulkDestroy(ctx), {
+                datasourceId: tableId,
+            });
             yield pro_1.quotas.removeRows(rows.length);
             response = rows;
             for (let row of rows) {
@@ -128,7 +140,9 @@ function destroy(ctx) {
             }
         }
         else {
-            let resp = yield pro_1.quotas.addQuery(() => pickApi(tableId).destroy(ctx));
+            let resp = yield pro_1.quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
+                datasourceId: tableId,
+            });
             yield pro_1.quotas.removeRow();
             response = resp.response;
             row = resp.row;
@@ -146,7 +160,9 @@ function search(ctx) {
         const tableId = getTableId(ctx);
         try {
             ctx.status = 200;
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).search(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).search(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -170,7 +186,9 @@ function fetchEnrichedRow(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
         try {
-            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchEnrichedRow(ctx));
+            ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).fetchEnrichedRow(ctx), {
+                datasourceId: tableId,
+            });
         }
         catch (err) {
             ctx.throw(400, err);
@@ -181,7 +199,9 @@ exports.fetchEnrichedRow = fetchEnrichedRow;
 const exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const tableId = getTableId(ctx);
     try {
-        ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).exportRows(ctx));
+        ctx.body = yield pro_1.quotas.addQuery(() => pickApi(tableId).exportRows(ctx), {
+            datasourceId: tableId,
+        });
     }
     catch (err) {
         ctx.throw(400, err);

package/dist/api/controllers/table/internal.js

@@ -142,7 +142,9 @@ function destroy(ctx) {
             include_docs: true,
         }));
         yield db.bulkDocs(rows.rows.map((row) => (Object.assign(Object.assign({}, row.doc), { _deleted: true }))));
-        yield pro_1.quotas.removeRows(rows.rows.length);
+        yield pro_1.quotas.removeRows(rows.rows.length, {
+            tableId: ctx.params.tableId,
+        });
         // update linked rows
         yield (0, linkedRows_1.updateLinks)({
             eventType: linkedRows_1.EventType.TABLE_DELETE,

package/dist/api/controllers/table/utils.js

@@ -130,7 +130,9 @@ function handleDataImport(user, table, dataImport) {
             }
             finalData.push(row);
         }
-        yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData));
+        yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
+            tableId: table._id,
+        });
         yield backend_core_1.events.rows.imported(table, "csv", finalData.length);
         return table;
     });

package/dist/automations/utils.js

@@ -59,12 +59,14 @@ const jobMessage = (job, message) => {
 function processEvent(job) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            const automationId = job.data.automation._id;
             console.log(jobMessage(job, "running"));
             // need to actually await these so that an error can be captured properly
-            const tenantId = backend_core_1.tenancy.getTenantIDFromAppID(job.data.event.appId);
-            return yield backend_core_1.tenancy.doInTenant(tenantId, () => __awaiter(this, void 0, void 0, function* () {
+            return yield backend_core_1.context.doInContext(job.data.event.appId, () => __awaiter(this, void 0, void 0, function* () {
                 const runFn = () => Runner.run(job);
-                return pro_1.quotas.addAutomation(runFn);
+                return pro_1.quotas.addAutomation(runFn, {
+                    automationId,
+                });
             }));
         }
         catch (err) {

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" });
+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", QUERY: "query", DEPLOYMENTS: "deployments", METADATA: "metadata", MEM_VIEW: "view", USER_FLAG: "flag", AUTOMATION_METADATA: "meta_au" });
 const InternalTables = {
     USER_METADATA: "ta_users",
 };

package/dist/migrations/functions/{quotas1.js → syncQuotas.js}

@@ -36,19 +36,15 @@ exports.run = void 0;
 const usageQuotas_1 = require("./usageQuotas");
 const syncApps = __importStar(require("./usageQuotas/syncApps"));
 const syncRows = __importStar(require("./usageQuotas/syncRows"));
+const syncPlugins = __importStar(require("./usageQuotas/syncPlugins"));
 /**
- * Date:
- * January 2022
- *
- * Description:
- * Synchronise the app and row quotas to the state of the db after it was
- * discovered that the quota resets were still in place and the row quotas
- * weren't being decremented correctly.
+ * Synchronise quotas to the state of the db.
  */
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
     yield (0, usageQuotas_1.runQuotaMigration)(() => __awaiter(void 0, void 0, void 0, function* () {
         yield syncApps.run();
         yield syncRows.run();
+        yield syncPlugins.run();
     }));
 });
 exports.run = run;

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

@@ -16,7 +16,6 @@ const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
     // get app count
-    // @ts-ignore
     const devApps = yield (0, db_1.getAllApps)({ dev: true });
     const appCount = devApps ? devApps.length : 0;
     // sync app count

package/dist/migrations/functions/{pluginCount.js → usageQuotas/syncPlugins.js}

@@ -14,9 +14,7 @@ const backend_core_1 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        yield backend_core_1.tenancy.doInTenant(backend_core_1.tenancy.DEFAULT_TENANT_ID, () => __awaiter(void 0, void 0, void 0, function* () {
-            yield pro_1.plugins.checkPluginQuotas();
-        }));
+        yield pro_1.plugins.checkPluginQuotas();
     }
     catch (err) {
         backend_core_1.logging.logAlert("Failed to update plugin quotas", err);

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

@@ -17,15 +17,19 @@ const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
     // get all rows in all apps
-    // @ts-ignore
     const allApps = yield (0, db_1.getAllApps)({ all: true });
-    // @ts-ignore
     const appIds = allApps ? allApps.map((app) => app.appId) : [];
-    const rows = yield (0, rows_1.getUniqueRows)(appIds);
-    const rowCount = rows ? rows.length : 0;
+    const { appRows } = yield (0, rows_1.getUniqueRows)(appIds);
+    // get the counts per app
+    const counts = {};
+    let rowCount = 0;
+    Object.entries(appRows).forEach(([appId, rows]) => {
+        counts[appId] = rows.length;
+        rowCount += rows.length;
+    });
     // sync row count
     const tenantId = (0, tenancy_1.getTenantId)();
     console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
-    yield pro_1.quotas.setUsage(rowCount, types_1.StaticQuotaName.ROWS, types_1.QuotaUsageType.STATIC);
+    yield pro_1.quotas.setUsagePerApp(counts, types_1.StaticQuotaName.ROWS, types_1.QuotaUsageType.STATIC);
 });
 exports.run = run;

package/dist/migrations/index.js

@@ -41,10 +41,9 @@ const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../environment"));
 // migration functions
 const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
-const quota1 = __importStar(require("./functions/quotas1"));
+const syncQuotas = __importStar(require("./functions/syncQuotas"));
 const appUrls = __importStar(require("./functions/appUrls"));
 const backfill = __importStar(require("./functions/backfill"));
-const pluginCount = __importStar(require("./functions/pluginCount"));
 /**
  * Populate the migration function and additional configuration from
  * the static migration definitions.
@@ -58,8 +57,8 @@ const buildMigrations = () => {
                 serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: userEmailViewCasing.run }));
                 break;
             }
-            case types_1.MigrationName.QUOTAS_1: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: quota1.run }));
+            case types_1.MigrationName.SYNC_QUOTAS: {
+                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: syncQuotas.run }));
                 break;
             }
             case types_1.MigrationName.APP_URLS: {
@@ -78,11 +77,6 @@ const buildMigrations = () => {
                 serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: backfill.installation.run, silent: !!environment_1.default.SELF_HOSTED, preventRetry: !!environment_1.default.SELF_HOSTED }));
                 break;
             }
-            case types_1.MigrationName.PLUGIN_COUNT: {
-                if (environment_1.default.SELF_HOSTED) {
-                    serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: pluginCount.run, silent: !!environment_1.default.SELF_HOSTED, preventRetry: false }));
-                }
-            }
         }
     }
     return serverMigrations;

package/dist/package.json

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