@budibase/server 1.2.26 → 1.2.28

package/dist/api/controllers/analytics.js

@@ -9,8 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEnabled = void 0;
+exports.ping = exports.isEnabled = void 0;
 const backend_core_1 = require("@budibase/backend-core");
+const types_1 = require("@budibase/types");
+const utils_1 = require("../../db/utils");
+const backend_core_2 = require("@budibase/backend-core");
 const isEnabled = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const enabled = yield backend_core_1.events.analytics.enabled();
     ctx.body = {
@@ -18,3 +21,26 @@ const isEnabled = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     };
 });
 exports.isEnabled = isEnabled;
+const ping = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const body = ctx.request.body;
+    switch (body.source) {
+        case types_1.PingSource.APP: {
+            const db = backend_core_2.context.getAppDB({ skip_setup: true });
+            const appInfo = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+            let appId = backend_core_2.context.getAppId();
+            if ((0, utils_1.isDevAppID)(appId)) {
+                yield backend_core_1.events.serve.servedAppPreview(appInfo, body.timezone);
+            }
+            else {
+                yield backend_core_1.events.serve.servedApp(appInfo, body.timezone);
+            }
+            break;
+        }
+        case types_1.PingSource.BUILDER: {
+            yield backend_core_1.events.serve.servedBuilder(body.timezone);
+            break;
+        }
+    }
+    ctx.status = 200;
+});
+exports.ping = ping;

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

@@ -21,11 +21,10 @@ const env = require("../../../environment");
 const { clientLibraryPath } = require("../../../utilities");
 const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
-const { DocumentTypes, isDevAppID } = require("../../../db/utils");
+const { DocumentTypes } = require("../../../db/utils");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
 const { setCookie, clearCookie } = require("@budibase/backend-core/utils");
 const AWS = require("aws-sdk");
-const backend_core_1 = require("@budibase/backend-core");
 const fs = require("fs");
 const { downloadTarballDirect, } = require("../../../utilities/fileSystem/utilities");
 function prepareUpload({ s3Key, bucket, metadata, file }) {
@@ -74,9 +73,6 @@ const serveBuilder = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const builderPath = resolve(TOP_LEVEL_PATH, "builder");
         yield send(ctx, ctx.file, { root: builderPath });
-        if (ctx.file === "index.html") {
-            yield backend_core_1.events.serve.servedBuilder();
-        }
     });
 };
 exports.serveBuilder = serveBuilder;
@@ -124,12 +120,6 @@ const serveApp = function (ctx) {
             // just return the app info for jest to assert on
             ctx.body = appInfo;
         }
-        if (isDevAppID(appInfo.appId)) {
-            yield backend_core_1.events.serve.servedAppPreview(appInfo);
-        }
-        else {
-            yield backend_core_1.events.serve.servedApp(appInfo);
-        }
     });
 };
 exports.serveApp = serveApp;

package/dist/api/routes/analytics.js

@@ -3,4 +3,5 @@ const Router = require("@koa/router");
 const controller = require("../controllers/analytics");
 const router = Router();
 router.get("/api/bbtel", controller.isEnabled);
+router.post("/api/bbtel/ping", controller.ping);
 module.exports = router;

package/dist/package.json

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

package/dist/tests/utilities/TestConfiguration.js

@@ -24,6 +24,7 @@ const newid = require("../../db/newid");
 const context = require("@budibase/backend-core/context");
 const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db");
 const { encrypt } = require("@budibase/backend-core/encryption");
+const { DocumentTypes } = require("../../db/utils");
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
 const FIRSTNAME = "Barbara";
@@ -47,6 +48,9 @@ class TestConfiguration {
     getApp() {
         return this.app;
     }
+    getProdApp() {
+        return this.prodApp;
+    }
     getAppId() {
         return this.appId;
     }
@@ -97,18 +101,11 @@ class TestConfiguration {
         cleanup(this.allApps.map(app => app.appId));
     }
     // UTILS
-    _req(body, params, controlFunc, opts = { prodApp: false }) {
+    _req(body, params, controlFunc) {
         return __awaiter(this, void 0, void 0, function* () {
             // create a fake request ctx
             const request = {};
-            // set the app id
-            let appId;
-            if (opts.prodApp) {
-                appId = this.prodAppId;
-            }
-            else {
-                appId = this.appId;
-            }
+            const appId = this.appId;
             request.appId = appId;
             // fake cookies, we don't need them
             request.cookies = { set: () => { }, get: () => { } };
@@ -300,8 +297,8 @@ class TestConfiguration {
             const prodAppId = this.getAppId().replace("_dev", "");
             this.prodAppId = prodAppId;
             return context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
-                const appPackage = yield this._req(null, { appId: prodAppId }, controllers.app.fetchAppPackage, { prodApp: true });
-                return appPackage.application;
+                const db = context.getProdAppDB();
+                return yield db.get(DocumentTypes.APP_METADATA);
             }));
         });
     }