@budibase/worker 2.2.12-alpha.11 → 2.2.12-alpha.12

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">47.36% </span>
+                <span class="strong">45% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>9/19</span>
+                <span class='fraction'>9/20</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">47.36% </span>
+                <span class="strong">45% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>9/19</span>
+                <span class='fraction'>9/20</span>
             </div>
         
             
@@ -95,7 +95,11 @@
 <a name='L30'></a><a href='#L30'>30</a>
 <a name='L31'></a><a href='#L31'>31</a>
 <a name='L32'></a><a href='#L32'>32</a>
-<a name='L33'></a><a href='#L33'>33</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">18x</span>
+<a name='L33'></a><a href='#L33'>33</a>
+<a name='L34'></a><a href='#L34'>34</a>
+<a name='L35'></a><a href='#L35'>35</a>
+<a name='L36'></a><a href='#L36'>36</a>
+<a name='L37'></a><a href='#L37'>37</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-yes">18x</span>
@@ -114,6 +118,10 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -128,7 +136,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import fetch from "node-fetch"
-import { constants, tenancy } from "@budibase/backend-core"
+import { constants, tenancy, logging } from "@budibase/backend-core"
 import { checkSlashesInUrl } from "../utilities"
 import env from "../environment"
 &nbsp;
@@ -146,6 +154,10 @@ async function makeAppRequest(url: string, method: string, body: any) {
 <span class="cstat-no" title="statement not covered" >    request.body = JSON.stringify(body)</span>
   }
 <span class="cstat-no" title="statement not covered" >  request.method = method</span>
+&nbsp;
+  // add x-budibase-correlation-id header
+<span class="cstat-no" title="statement not covered" >  logging.correlation.setHeader(request.headers)</span>
+&nbsp;
 <span class="cstat-no" title="statement not covered" >  return fetch(checkSlashesInUrl(env.APPS_URL + url), request)</span>
 }
 &nbsp;
@@ -166,7 +178,7 @@ export async function syncUserInApps(userId: string) {
             <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 18:26:00 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:48:10 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -835,7 +835,7 @@ export async function verifyConfig(config: any) {
             <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 18:26:00 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:48:10 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -85,7 +85,7 @@ export function readStaticFile(path: string) {
             <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 18:26:00 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:48:10 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/utilities/index.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80.12% </span>
+                <span class="strong">79.62% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>129/161</span>
+                <span class='fraction'>129/162</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">81.13% </span>
+                <span class="strong">80.62% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>129/159</span>
+                <span class='fraction'>129/160</span>
             </div>
         
             
@@ -61,7 +61,7 @@
             </div>
         </template>
     </div>
-    <div class='status-line high'></div>
+    <div class='status-line medium'></div>
     <div class="pad1">
 <table class="coverage-summary">
 <thead>
@@ -80,17 +80,17 @@
 </thead>
 <tbody><tr>
 	<td class="file low" data-value="appService.ts"><a href="appService.ts.html">appService.ts</a></td>
-	<td data-value="47.36" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 47%"></div><div class="cover-empty" style="width: 53%"></div></div>
+	<td data-value="45" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 45%"></div><div class="cover-empty" style="width: 55%"></div></div>
 	</td>
-	<td data-value="47.36" class="pct low">47.36%</td>
-	<td data-value="19" class="abs low">9/19</td>
+	<td data-value="45" class="pct low">45%</td>
+	<td data-value="20" class="abs low">9/20</td>
 	<td data-value="33.33" class="pct low">33.33%</td>
 	<td data-value="6" class="abs low">2/6</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="2" class="abs high">2/2</td>
-	<td data-value="47.36" class="pct low">47.36%</td>
-	<td data-value="19" class="abs low">9/19</td>
+	<td data-value="45" class="pct low">45%</td>
+	<td data-value="20" class="abs low">9/20</td>
 	</tr>
 
 <tr>
@@ -191,7 +191,7 @@
             <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 18:26:00 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:48:10 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -97,7 +97,7 @@ export function checkSlashesInUrl(url: string) {
             <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 18:26:00 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:48:10 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -409,7 +409,7 @@ export async function checkInviteCode(
             <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 18:26:00 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:48:10 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -217,7 +217,7 @@ export async function getSettingsTemplateContext(
             <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 18:26:00 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:48:10 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -118,7 +118,7 @@ export async function checkAnyUserExists() {
             <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 18:26:00 GMT+0000 (Coordinated Universal Time)
+                at Wed Jan 11 2023 20:48:10 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -63,16 +63,16 @@ BRH:14
 end_of_record
 TN:
 SF:src/index.ts
-FN:85,(anonymous_0)
-FN:52,(anonymous_5)
-FN:53,(anonymous_6)
-FN:54,(anonymous_7)
-FN:67,(anonymous_8)
-FN:80,(anonymous_9)
-FN:85,(anonymous_10)
-FN:90,(anonymous_11)
-FN:96,(anonymous_12)
-FN:100,(anonymous_13)
+FN:86,(anonymous_0)
+FN:53,(anonymous_5)
+FN:54,(anonymous_6)
+FN:55,(anonymous_7)
+FN:68,(anonymous_8)
+FN:81,(anonymous_9)
+FN:86,(anonymous_10)
+FN:91,(anonymous_11)
+FN:97,(anonymous_12)
+FN:101,(anonymous_13)
 FNF:10
 FNH:2
 FNDA:18,(anonymous_0)
@@ -107,51 +107,52 @@ DA:34,18
 DA:37,18
 DA:38,18
 DA:39,18
-DA:42,18
+DA:40,18
 DA:43,18
-DA:46,18
-DA:49,18
-DA:50,0
-DA:52,0
+DA:44,18
+DA:47,18
+DA:50,18
+DA:51,0
 DA:53,0
 DA:54,0
 DA:55,0
-DA:57,0
-DA:62,18
+DA:56,0
+DA:58,0
 DA:63,18
-DA:65,18
+DA:64,18
 DA:66,18
 DA:67,18
-DA:68,0
+DA:68,18
 DA:69,0
-DA:71,0
+DA:70,0
 DA:72,0
 DA:73,0
 DA:74,0
 DA:75,0
 DA:76,0
-DA:80,18
-DA:81,0
+DA:77,0
+DA:81,18
 DA:82,0
-DA:85,18
+DA:83,0
 DA:86,18
 DA:87,18
-DA:90,18
-DA:91,0
+DA:88,18
+DA:91,18
 DA:92,0
 DA:93,0
-DA:96,18
-DA:97,0
-DA:100,18
-DA:101,0
-LF:59
-LH:37
+DA:94,0
+DA:97,18
+DA:98,0
+DA:101,18
+DA:102,0
+LF:60
+LH:38
 BRDA:5,0,0,0
-BRDA:49,1,0,0
-BRDA:68,2,0,0
-BRDA:75,3,0,0
-BRDA:85,4,0,18
-BRDA:85,4,1,0
+BRDA:50,1,0,0
+BRDA:69,2,0,0
+BRDA:76,3,0,0
+BRDA:86,4,0,18
+BRDA:86,4,1,0
 BRF:6
 BRH:1
 end_of_record
@@ -3759,7 +3760,7 @@ BRH:0
 end_of_record
 TN:
 SF:src/utilities/appService.ts
-FN:23,(anonymous_0)
+FN:27,(anonymous_0)
 FN:6,makeAppRequest
 FNF:2
 FNH:2
@@ -3779,19 +3780,20 @@ DA:15,0
 DA:16,0
 DA:17,0
 DA:19,0
-DA:20,0
-DA:23,101
-DA:24,101
-DA:29,101
-DA:30,0
-LF:19
+DA:22,0
+DA:24,0
+DA:27,101
+DA:28,101
+DA:33,101
+DA:34,0
+LF:20
 LH:9
 BRDA:7,0,0,101
 BRDA:12,1,0,0
 BRDA:15,2,0,0
-BRDA:29,3,0,0
-BRDA:29,4,0,101
-BRDA:29,4,1,0
+BRDA:33,3,0,0
+BRDA:33,4,0,101
+BRDA:33,4,1,0
 BRF:6
 BRH:2
 end_of_record

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.11",
+  "version": "2.2.12-alpha.12",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.2.12-alpha.11",
-    "@budibase/pro": "2.2.12-alpha.10",
-    "@budibase/string-templates": "2.2.12-alpha.11",
-    "@budibase/types": "2.2.12-alpha.11",
+    "@budibase/backend-core": "2.2.12-alpha.12",
+    "@budibase/pro": "2.2.12-alpha.11",
+    "@budibase/string-templates": "2.2.12-alpha.12",
+    "@budibase/types": "2.2.12-alpha.12",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -97,5 +97,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "d370d2a28c8d9ae402187fa2ffd57a3de450f0ed"
+  "gitHead": "a27941213bf85eb5cd8a78a8796a360a9f289307"
 }

package/src/index.ts

@@ -14,7 +14,7 @@ import { Event } from "@sentry/types/dist/event"
 import Application from "koa"
 import { bootstrap } from "global-agent"
 import * as db from "./db"
-import { auth, logging, events } from "@budibase/backend-core"
+import { auth, logging, events, middleware } from "@budibase/backend-core"
 db.init()
 import Koa from "koa"
 import koaBody from "koa-body"
@@ -36,6 +36,7 @@ app.keys = ["secret", "key"]
 // set up top level koa middleware
 app.use(koaBody({ multipart: true }))
 app.use(koaSession(app))
+app.use(middleware.logging)
 app.use(logger(logging.pinoSettings()))
 
 // authentication

package/src/utilities/appService.ts

@@ -1,5 +1,5 @@
 import fetch from "node-fetch"
-import { constants, tenancy } from "@budibase/backend-core"
+import { constants, tenancy, logging } from "@budibase/backend-core"
 import { checkSlashesInUrl } from "../utilities"
 import env from "../environment"
 
@@ -17,6 +17,10 @@ async function makeAppRequest(url: string, method: string, body: any) {
     request.body = JSON.stringify(body)
   }
   request.method = method
+
+  // add x-budibase-correlation-id header
+  logging.correlation.setHeader(request.headers)
+
   return fetch(checkSlashesInUrl(env.APPS_URL + url), request)
 }