@budibase/server 2.2.12-alpha.10 → 2.2.12-alpha.12

package/coverage/lcov-report/src/utilities/workerRequests.ts.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">42.85% </span>
+                <span class="strong">43.75% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>27/63</span>
+                <span class='fraction'>28/64</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">42.85% </span>
+                <span class="strong">43.75% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>27/63</span>
+                <span class='fraction'>28/64</span>
             </div>
         
             
@@ -241,9 +241,23 @@
 <a name='L176'></a><a href='#L176'>176</a>
 <a name='L177'></a><a href='#L177'>177</a>
 <a name='L178'></a><a href='#L178'>178</a>
-<a name='L179'></a><a href='#L179'>179</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">35x</span>
+<a name='L179'></a><a href='#L179'>179</a>
+<a name='L180'></a><a href='#L180'>180</a>
+<a name='L181'></a><a href='#L181'>181</a>
+<a name='L182'></a><a href='#L182'>182</a>
+<a name='L183'></a><a href='#L183'>183</a>
+<a name='L184'></a><a href='#L184'>184</a>
+<a name='L185'></a><a href='#L185'>185</a>
+<a name='L186'></a><a href='#L186'>186</a>
+<a name='L187'></a><a href='#L187'>187</a>
+<a name='L188'></a><a href='#L188'>188</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">35x</span>
 <span class="cline-any cline-yes">35x</span>
 <span class="cline-any cline-yes">35x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">35x</span>
 <span class="cline-any cline-yes">35x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -270,6 +284,10 @@
 <span class="cline-any cline-yes">29x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">29x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">29x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -422,7 +440,12 @@
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import fetch from "node-fetch"
 import env from "../environment"
 import { checkSlashesInUrl } from "./index"
-import { db as dbCore, constants, tenancy } from "@budibase/backend-core"
+import {
+  db as dbCore,
+  constants,
+  tenancy,
+  logging,
+} from "@budibase/backend-core"
 import { updateAppRole } from "./global"
 import { BBContext, User } from "@budibase/types"
 &nbsp;
@@ -448,6 +471,10 @@ export function <span class="cstat-no" title="statement not covered" >request<sp
   if (ctx &amp;&amp; ctx.headers) {
     request.headers = ctx.headers
   }
+&nbsp;
+  // add x-budibase-correlation-id header
+  logging.correlation.setHeader(request.headers)
+&nbsp;
   return request
 }
 &nbsp;
@@ -604,7 +631,7 @@ export async function <span class="cstat-no" title="statement not covered" ><spa
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jan 11 2023 15:47:54 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:49:31 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/watch.ts.html

@@ -181,7 +181,7 @@ export function <span class="cstat-no" title="statement not covered" ><span clas
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jan 11 2023 15:47:54 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:49:31 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/websocket.ts.html

@@ -148,7 +148,7 @@ export { ClientAppSocket }
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Wed Jan 11 2023 15:47:54 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:49:31 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -1,15 +1,15 @@
 TN:
 SF:src/app.ts
-FN:80,(anonymous_0)
-FN:47,(anonymous_5)
-FN:48,(anonymous_6)
-FN:49,(anonymous_7)
-FN:63,(anonymous_8)
-FN:80,(anonymous_9)
-FN:84,(anonymous_10)
-FN:90,(anonymous_11)
-FN:101,(anonymous_12)
-FN:105,(anonymous_13)
+FN:82,(anonymous_0)
+FN:49,(anonymous_5)
+FN:50,(anonymous_6)
+FN:51,(anonymous_7)
+FN:65,(anonymous_8)
+FN:82,(anonymous_9)
+FN:86,(anonymous_10)
+FN:92,(anonymous_11)
+FN:103,(anonymous_12)
+FN:107,(anonymous_13)
 FNF:10
 FNH:2
 FNDA:30,(anonymous_0)
@@ -42,23 +42,22 @@ DA:26,30
 DA:28,30
 DA:31,30
 DA:43,30
-DA:44,0
-DA:45,0
+DA:45,30
+DA:46,0
 DA:47,0
-DA:48,0
 DA:49,0
 DA:50,0
+DA:51,0
 DA:52,0
-DA:57,30
-DA:58,30
+DA:54,0
 DA:59,30
+DA:60,30
 DA:61,30
-DA:62,30
 DA:63,30
-DA:65,0
-DA:66,0
+DA:64,30
+DA:65,30
+DA:67,0
 DA:68,0
-DA:69,0
 DA:70,0
 DA:71,0
 DA:72,0
@@ -66,32 +65,34 @@ DA:73,0
 DA:74,0
 DA:75,0
 DA:76,0
-DA:80,30
-DA:81,30
-DA:84,30
-DA:85,0
+DA:77,0
+DA:78,0
+DA:82,30
+DA:83,30
+DA:86,30
 DA:87,0
-DA:90,30
-DA:93,0
-DA:94,0
+DA:89,0
+DA:92,30
+DA:95,0
 DA:96,0
-DA:97,0
 DA:98,0
-DA:101,30
-DA:102,0
-DA:105,30
-DA:106,0
-LF:59
-LH:31
+DA:99,0
+DA:100,0
+DA:103,30
+DA:104,0
+DA:107,30
+DA:108,0
+LF:60
+LH:32
 BRDA:5,0,0,0
-BRDA:43,1,0,0
-BRDA:65,2,0,0
-BRDA:75,3,0,0
-BRDA:80,4,0,30
-BRDA:80,4,1,0
-BRDA:93,5,0,0
-BRDA:93,6,0,0
-BRDA:93,6,1,0
+BRDA:45,1,0,0
+BRDA:67,2,0,0
+BRDA:77,3,0,0
+BRDA:82,4,0,30
+BRDA:82,4,1,0
+BRDA:95,5,0,0
+BRDA:95,6,0,0
+BRDA:95,6,1,0
 BRF:9
 BRH:1
 end_of_record
@@ -109,7 +110,7 @@ FN:101,(anonymous_8)
 FN:104,(anonymous_9)
 FNF:10
 FNH:9
-FNDA:7419,(anonymous_0)
+FNDA:7422,(anonymous_0)
 FNDA:1234,isTest
 FNDA:1238,isJest
 FNDA:479,isDev
@@ -144,7 +145,7 @@ DA:117,4400
 DA:119,6
 DA:122,4400
 DA:124,0
-DA:128,7419
+DA:128,7422
 LF:26
 LH:21
 BRDA:4,0,0,1234
@@ -3090,14 +3091,14 @@ FN:107,fetch
 FN:111,destroy
 FN:123,processUploadedPlugin
 FNF:14
-FNH:11
-FNDA:0,(anonymous_1)
+FNH:12
+FNDA:2,(anonymous_1)
 FNDA:54,(anonymous_2)
 FNDA:54,(anonymous_3)
 FNDA:54,(anonymous_4)
 FNDA:54,(anonymous_5)
 FNDA:0,(anonymous_6)
-FNDA:3,getPlugins
+FNDA:5,getPlugins
 FNDA:2,(anonymous_9)
 FNDA:0,(anonymous_10)
 FNDA:5,upload
@@ -3111,13 +3112,13 @@ DA:8,56
 DA:9,56
 DA:10,56
 DA:11,56
-DA:13,0
-DA:14,3
-DA:15,3
-DA:20,3
-DA:21,3
-DA:22,3
-DA:23,0
+DA:13,2
+DA:14,5
+DA:15,5
+DA:20,5
+DA:21,5
+DA:22,5
+DA:23,2
 DA:25,3
 DA:29,54
 DA:31,5
@@ -3173,8 +3174,8 @@ DA:135,5
 DA:136,4
 DA:137,4
 LF:67
-LH:62
-BRDA:22,0,0,0
+LH:64
+BRDA:22,0,0,2
 BRDA:22,0,1,3
 BRDA:31,1,0,0
 BRDA:31,1,1,5
@@ -3194,7 +3195,7 @@ BRDA:131,8,0,0
 BRDA:131,9,0,5
 BRDA:131,9,1,0
 BRF:19
-BRH:11
+BRH:12
 end_of_record
 TN:
 SF:src/api/controllers/plugin/npm.ts
@@ -13159,8 +13160,8 @@ DA:67,56
 DA:70,2
 DA:71,2
 DA:72,2
-DA:73,0
-DA:75,0
+DA:73,2
+DA:75,2
 DA:76,0
 DA:77,0
 DA:81,0
@@ -13180,12 +13181,12 @@ DA:105,0
 DA:110,1
 DA:113,56
 LF:49
-LH:36
+LH:38
 BRDA:61,0,0,56
 BRDA:62,1,0,56
 BRDA:62,1,1,56
 BRDA:62,1,2,56
-BRDA:72,2,0,0
+BRDA:72,2,0,2
 BRDA:81,3,0,0
 BRDA:93,4,0,95
 BRDA:96,5,0,0
@@ -13193,7 +13194,7 @@ BRDA:99,6,0,0
 BRDA:102,7,0,0
 BRDA:102,7,1,0
 BRF:11
-BRH:5
+BRH:6
 end_of_record
 TN:
 SF:src/integrations/microsoftSqlServer.ts
@@ -20289,29 +20290,29 @@ BRH:6
 end_of_record
 TN:
 SF:src/utilities/workerRequests.ts
-FN:8,(anonymous_1)
-FN:58,(anonymous_2)
-FN:87,(anonymous_3)
-FN:101,(anonymous_4)
-FN:112,(anonymous_5)
-FN:121,(anonymous_6)
-FN:130,(anonymous_7)
-FN:141,(anonymous_8)
-FN:152,(anonymous_9)
-FN:164,(anonymous_10)
-FN:172,(anonymous_11)
-FN:8,request
-FN:33,checkResponse
-FN:58,sendSmtpEmail
-FN:87,getGlobalSelf
-FN:101,removeAppFromUserRoles
-FN:112,allGlobalUsers
-FN:121,saveGlobalUser
-FN:130,deleteGlobalUser
-FN:141,readGlobalUser
-FN:152,createAdminUser
-FN:164,getChecklist
-FN:172,generateApiKey
+FN:13,(anonymous_1)
+FN:67,(anonymous_2)
+FN:96,(anonymous_3)
+FN:110,(anonymous_4)
+FN:121,(anonymous_5)
+FN:130,(anonymous_6)
+FN:139,(anonymous_7)
+FN:150,(anonymous_8)
+FN:161,(anonymous_9)
+FN:173,(anonymous_10)
+FN:181,(anonymous_11)
+FN:13,request
+FN:42,checkResponse
+FN:67,sendSmtpEmail
+FN:96,getGlobalSelf
+FN:110,removeAppFromUserRoles
+FN:121,allGlobalUsers
+FN:130,saveGlobalUser
+FN:139,deleteGlobalUser
+FN:150,readGlobalUser
+FN:161,createAdminUser
+FN:173,getChecklist
+FN:181,generateApiKey
 FNF:23
 FNH:6
 FNDA:0,(anonymous_1)
@@ -20340,87 +20341,88 @@ FNDA:0,generateApiKey
 DA:1,35
 DA:2,35
 DA:3,35
-DA:4,35
-DA:5,35
-DA:8,0
-DA:9,29
-DA:10,29
-DA:12,29
-DA:13,1
-DA:14,1
-DA:15,1
-DA:18,29
+DA:9,35
+DA:10,35
+DA:13,0
+DA:14,29
+DA:15,29
+DA:17,29
+DA:18,1
 DA:19,1
 DA:20,1
-DA:25,28
-DA:27,29
-DA:28,2
-DA:30,29
-DA:38,29
-DA:40,0
-DA:41,0
-DA:43,0
-DA:45,0
-DA:48,0
+DA:23,29
+DA:24,1
+DA:25,1
+DA:30,28
+DA:32,29
+DA:33,2
+DA:37,29
+DA:39,29
+DA:47,29
 DA:49,0
-DA:51,0
-DA:54,29
-DA:58,1
-DA:68,1
-DA:84,1
-DA:87,0
-DA:88,0
-DA:89,0
-DA:94,0
-DA:95,0
+DA:50,0
+DA:52,0
+DA:54,0
+DA:57,0
+DA:58,0
+DA:60,0
+DA:63,29
+DA:67,1
+DA:77,1
+DA:93,1
 DA:96,0
+DA:97,0
 DA:98,0
-DA:101,28
-DA:102,28
-DA:103,28
-DA:109,28
-DA:112,0
-DA:113,0
-DA:118,0
+DA:103,0
+DA:104,0
+DA:105,0
+DA:107,0
+DA:110,28
+DA:111,28
+DA:112,28
+DA:118,28
 DA:121,0
 DA:122,0
 DA:127,0
 DA:130,0
 DA:131,0
-DA:138,0
-DA:141,0
-DA:142,0
-DA:149,0
-DA:152,0
-DA:157,0
+DA:136,0
+DA:139,0
+DA:140,0
+DA:147,0
+DA:150,0
+DA:151,0
+DA:158,0
 DA:161,0
-DA:164,0
-DA:165,0
-DA:169,0
-DA:172,0
+DA:166,0
+DA:170,0
 DA:173,0
-DA:177,0
-LF:63
-LH:27
-BRDA:9,0,0,29
-BRDA:12,1,0,1
-BRDA:14,2,0,1
-BRDA:18,3,0,1
-BRDA:18,3,1,28
-BRDA:18,4,0,29
-BRDA:18,4,1,1
-BRDA:21,5,0,1
-BRDA:21,5,1,0
-BRDA:27,6,0,2
-BRDA:27,7,0,29
-BRDA:27,7,1,28
-BRDA:36,8,0,29
-BRDA:38,9,0,0
-BRDA:46,10,0,0
-BRDA:46,10,1,0
-BRDA:48,11,0,0
-BRDA:48,11,1,0
-BRDA:95,12,0,0
+DA:174,0
+DA:178,0
+DA:181,0
+DA:182,0
+DA:186,0
+LF:64
+LH:28
+BRDA:14,0,0,29
+BRDA:17,1,0,1
+BRDA:19,2,0,1
+BRDA:23,3,0,1
+BRDA:23,3,1,28
+BRDA:23,4,0,29
+BRDA:23,4,1,1
+BRDA:26,5,0,1
+BRDA:26,5,1,0
+BRDA:32,6,0,2
+BRDA:32,7,0,29
+BRDA:32,7,1,28
+BRDA:45,8,0,29
+BRDA:47,9,0,0
+BRDA:55,10,0,0
+BRDA:55,10,1,0
+BRDA:57,11,0,0
+BRDA:57,11,1,0
+BRDA:104,12,0,0
 BRF:19
 BRH:12
 end_of_record

package/dist/app.js

@@ -69,6 +69,7 @@ app.use((0, koa_body_1.default)({
     enableTypes: ["json", "form", "text"],
     parsedMethods: ["POST", "PUT", "PATCH", "DELETE"],
 }));
+app.use(backend_core_1.middleware.logging);
 if (environment_1.default.isProd()) {
     environment_1.default._set("NODE_ENV", "production");
     Sentry.init();

package/dist/integrations/index.js

@@ -32,8 +32,8 @@ 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 = require("../environment");
-const { cloneDeep } = require("lodash");
+const environment_1 = __importDefault(require("../environment"));
+const lodash_1 = require("lodash");
 const DEFINITIONS = {
     [types_1.SourceName.POSTGRES]: postgres_1.default.schema,
     [types_1.SourceName.DYNAMODB]: dynamodb_1.default.schema,
@@ -79,7 +79,7 @@ if (process.arch &&
 function getDefinitions() {
     return __awaiter(this, void 0, void 0, function* () {
         const pluginSchemas = {};
-        if (environment.SELF_HOSTED) {
+        if (environment_1.default.SELF_HOSTED) {
             const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
             // extract the actual schema from each custom
             for (let plugin of plugins) {
@@ -90,7 +90,7 @@ function getDefinitions() {
                 }
             }
         }
-        return Object.assign(Object.assign({}, cloneDeep(DEFINITIONS)), pluginSchemas);
+        return Object.assign(Object.assign({}, (0, lodash_1.cloneDeep)(DEFINITIONS)), pluginSchemas);
     });
 }
 exports.getDefinitions = getDefinitions;
@@ -99,7 +99,7 @@ function getIntegration(integration) {
         if (INTEGRATIONS[integration]) {
             return INTEGRATIONS[integration];
         }
-        if (environment.SELF_HOSTED) {
+        if (environment_1.default.SELF_HOSTED) {
             const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
             for (let plugin of plugins) {
                 if (plugin.name === integration) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.12-alpha.9",
+    "version": "2.2.12-alpha.11",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.2.12-alpha.9",
-        "@budibase/client": "2.2.12-alpha.9",
-        "@budibase/pro": "2.2.12-alpha.8",
-        "@budibase/string-templates": "2.2.12-alpha.9",
-        "@budibase/types": "2.2.12-alpha.9",
+        "@budibase/backend-core": "2.2.12-alpha.11",
+        "@budibase/client": "2.2.12-alpha.11",
+        "@budibase/pro": "2.2.12-alpha.11",
+        "@budibase/string-templates": "2.2.12-alpha.11",
+        "@budibase/types": "2.2.12-alpha.11",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",