@budibase/server 2.4.44-alpha.5 → 2.4.44-alpha.7

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.c2604f7a.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.8cb2f57a.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.d013cac9.css">
 </head>
 

package/dist/api/controllers/ops.js

@@ -0,0 +1,40 @@
+"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.error = exports.alert = exports.log = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+function log(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const body = ctx.request.body;
+        console.trace(body.message, body.data);
+        console.debug(body.message, body.data);
+        console.info(body.message, body.data);
+        console.warn(body.message, body.data);
+        console.error(body.message, body.data);
+        ctx.status = 204;
+    });
+}
+exports.log = log;
+function alert(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const body = ctx.request.body;
+        backend_core_1.logging.logAlert(body.message, new Error(body.message));
+        ctx.status = 204;
+    });
+}
+exports.alert = alert;
+function error(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const body = ctx.request.body;
+        throw new Error(body.message);
+    });
+}
+exports.error = error;

package/dist/api/routes/index.js

@@ -31,6 +31,7 @@ const dev_1 = __importDefault(require("./dev"));
 const cloud_1 = __importDefault(require("./cloud"));
 const migrations_1 = __importDefault(require("./migrations"));
 const plugin_1 = __importDefault(require("./plugin"));
+const ops_1 = __importDefault(require("./ops"));
 const pro_1 = require("@budibase/pro");
 var static_1 = require("./static");
 Object.defineProperty(exports, "staticRoutes", { enumerable: true, get: function () { return __importDefault(static_1).default; } });
@@ -67,6 +68,7 @@ exports.mainRoutes = [
     row_1.default,
     migrations_1.default,
     plugin_1.default,
+    ops_1.default,
     scheduleRoutes,
     environmentVariableRoutes,
     // these need to be handled last as they still use /api/:tableId

package/dist/api/routes/ops.js

@@ -0,0 +1,52 @@
+"use strict";
+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.errorValidator = exports.logsValidator = void 0;
+const router_1 = __importDefault(require("@koa/router"));
+const controller = __importStar(require("../controllers/ops"));
+const backend_core_1 = require("@budibase/backend-core");
+const joi_1 = __importDefault(require("joi"));
+function logsValidator() {
+    return backend_core_1.middleware.joiValidator.body(joi_1.default.object({
+        message: joi_1.default.string().required(),
+        data: joi_1.default.object(),
+    }));
+}
+exports.logsValidator = logsValidator;
+function errorValidator() {
+    return backend_core_1.middleware.joiValidator.body(joi_1.default.object({
+        message: joi_1.default.string().required(),
+    }));
+}
+exports.errorValidator = errorValidator;
+const router = new router_1.default();
+router
+    .post("/api/ops/log", logsValidator(), controller.log)
+    .post("/api/ops/error", errorValidator(), controller.error)
+    .post("/api/ops/alert", errorValidator(), controller.alert);
+exports.default = router;

package/dist/app.js

@@ -38,18 +38,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 if (process.env.DD_APM_ENABLED) {
     require("./ddApm");
 }
-if (process.env.ELASTIC_APM_ENABLED) {
-    require("./elasticApm");
-}
 // need to load environment first
 const environment_1 = __importDefault(require("./environment"));
-// enable APM if configured
-if (process.env.ELASTIC_APM_ENABLED) {
-    const apm = require("elastic-apm-node").start({
-        serviceName: process.env.SERVICE,
-        environment: process.env.BUDIBASE_ENVIRONMENT,
-    });
-}
 const db = __importStar(require("./db"));
 db.init();
 const koa_1 = __importDefault(require("koa"));
@@ -80,7 +70,8 @@ app.use((0, koa_body_1.default)({
     enableTypes: ["json", "form", "text"],
     parsedMethods: ["POST", "PUT", "PATCH", "DELETE"],
 }));
-app.use(backend_core_1.middleware.logging);
+app.use(backend_core_1.middleware.correlation);
+app.use(backend_core_1.middleware.pino);
 app.use(userAgent);
 if (environment_1.default.isProd()) {
     environment_1.default._set("NODE_ENV", "production");

package/dist/environment.js

@@ -54,7 +54,6 @@ 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/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(`[Tenant: ${tenantId}] Syncing app count: ${appCount}`);
+    console.log(`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,8 +27,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
         rowCount += rows.length;
     });
     // sync row count
-    const tenantId = backend_core_1.tenancy.getTenantId();
-    console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
+    console.log(`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.4.44-alpha.4",
+    "version": "2.4.44-alpha.6",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -44,12 +44,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.4.44-alpha.4",
-        "@budibase/client": "2.4.44-alpha.4",
-        "@budibase/pro": "2.4.44-alpha.4",
-        "@budibase/shared-core": "2.4.44-alpha.4",
-        "@budibase/string-templates": "2.4.44-alpha.4",
-        "@budibase/types": "2.4.44-alpha.4",
+        "@budibase/backend-core": "2.4.44-alpha.6",
+        "@budibase/client": "2.4.44-alpha.6",
+        "@budibase/pro": "2.4.44-alpha.6",
+        "@budibase/shared-core": "2.4.44-alpha.6",
+        "@budibase/string-templates": "2.4.44-alpha.6",
+        "@budibase/types": "2.4.44-alpha.6",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -85,7 +85,6 @@
         "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",
@@ -99,7 +98,6 @@
         "node-fetch": "2.6.7",
         "open": "8.4.0",
         "pg": "8.5.1",
-        "pino-pretty": "5.1.3",
         "posthog-node": "1.3.0",
         "pouchdb": "7.3.0",
         "pouchdb-adapter-memory": "7.2.2",

package/dist/startup.js

@@ -50,11 +50,9 @@ const bullboard = __importStar(require("./automations/bullboard"));
 const pro = __importStar(require("@budibase/pro"));
 const api = __importStar(require("./api"));
 const sdk_1 = __importDefault(require("./sdk"));
-const pino = require("koa-pino-logger");
 let STARTUP_RAN = false;
 function initRoutes(app) {
     return __awaiter(this, void 0, void 0, function* () {
-        app.use(pino(backend_core_1.logging.pinoSettings()));
         if (!environment_1.default.isTest()) {
             const plugin = yield bullboard.init();
             app.use(plugin);