@budibase/server 1.0.190-alpha.0 → 1.0.191

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -307,7 +307,7 @@ exports.getUniqueRows = async appIds => {
             <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 Tue May 31 2022 12:20:10 GMT+0000 (Coordinated Universal Time)
+                at Tue May 31 2022 13:57:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <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 Tue May 31 2022 12:20:10 GMT+0000 (Coordinated Universal Time)
+                at Tue May 31 2022 13:57:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <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 Tue May 31 2022 12:20:10 GMT+0000 (Coordinated Universal Time)
+                at Tue May 31 2022 13:57:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -487,7 +487,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <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 Tue May 31 2022 12:20:10 GMT+0000 (Coordinated Universal Time)
+                at Tue May 31 2022 13:57:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -1,9 +1,9 @@
 TN:
 SF:src/api/index.js
-FN:18,(anonymous_0)
-FN:19,(anonymous_1)
-FN:34,(anonymous_2)
-FN:61,(anonymous_3)
+FN:19,(anonymous_0)
+FN:20,(anonymous_1)
+FN:35,(anonymous_2)
+FN:62,(anonymous_3)
 FNF:4
 FNH:4
 FNDA:1,(anonymous_0)
@@ -20,36 +20,38 @@ DA:11,24
 DA:12,24
 DA:13,24
 DA:14,24
-DA:16,24
-DA:18,24
+DA:15,24
+DA:17,24
 DA:19,24
-DA:21,24
-DA:35,188
-DA:39,188
-DA:61,24
-DA:62,186
+DA:20,24
+DA:22,24
+DA:36,188
+DA:40,188
+DA:62,24
 DA:63,186
-DA:65,39
+DA:64,186
 DA:66,39
 DA:67,39
-DA:73,39
-DA:74,0
+DA:68,39
+DA:74,39
 DA:75,0
-DA:81,24
-DA:82,624
+DA:76,0
+DA:82,24
 DA:83,624
-DA:86,24
+DA:84,624
 DA:87,24
-DA:90,24
+DA:88,24
 DA:91,24
-DA:93,24
-LF:33
-LH:31
-BRDA:65,0,0,39
-BRDA:65,0,1,0
-BRDA:65,0,2,0
-BRDA:73,1,0,0
-BRDA:73,1,1,39
+DA:92,24
+DA:94,24
+DA:95,24
+LF:35
+LH:33
+BRDA:66,0,0,39
+BRDA:66,0,1,0
+BRDA:66,0,2,0
+BRDA:74,1,0,0
+BRDA:74,1,1,39
 BRF:5
 BRH:2
 end_of_record
@@ -1372,36 +1374,36 @@ BRH:0
 end_of_record
 TN:
 SF:src/api/controllers/templates.js
-FN:9,(anonymous_0)
+FN:8,(anonymous_0)
 FNF:1
 FNH:1
 FNDA:1,(anonymous_0)
 DA:1,24
 DA:2,24
-DA:3,24
-DA:7,24
-DA:9,24
-DA:10,1
+DA:6,24
+DA:8,24
+DA:9,1
+DA:11,1
 DA:12,1
 DA:13,1
 DA:14,1
-DA:15,1
-DA:16,0
-DA:19,0
+DA:15,0
+DA:18,0
+DA:21,1
 DA:22,1
 DA:23,1
-DA:24,1
-DA:26,0
-LF:16
-LH:13
-BRDA:15,0,0,0
-BRDA:15,0,1,1
-BRDA:22,1,0,1
-BRDA:22,1,1,0
-BRDA:22,2,0,1
-BRDA:22,2,1,1
-BRF:6
-BRH:4
+DA:25,0
+LF:15
+LH:12
+BRDA:9,0,0,1
+BRDA:14,1,0,0
+BRDA:14,1,1,1
+BRDA:21,2,0,1
+BRDA:21,2,1,0
+BRDA:21,3,0,1
+BRDA:21,3,1,1
+BRF:7
+BRH:5
 end_of_record
 TN:
 SF:src/api/controllers/user.js
@@ -3354,10 +3356,8 @@ LF:11
 LH:11
 BRDA:9,0,0,0
 BRDA:9,0,1,2
-BRDA:9,1,0,2
-BRDA:9,1,1,0
-BRF:4
-BRH:2
+BRF:2
+BRH:1
 end_of_record
 TN:
 SF:src/api/controllers/view/index.js
@@ -4339,11 +4339,13 @@ SF:src/automations/bullboard.js
 FN:18,cleanup
 FN:24,(anonymous_1)
 FN:29,(anonymous_2)
-FNF:3
-FNH:0
+FN:48,(anonymous_3)
+FNF:4
+FNH:1
 FNDA:0,cleanup
 FNDA:0,(anonymous_1)
 FNDA:0,(anonymous_2)
+FNDA:1,(anonymous_3)
 DA:1,40
 DA:2,40
 DA:3,40
@@ -4372,27 +4374,36 @@ DA:40,0
 DA:44,0
 DA:45,0
 DA:48,40
-LF:28
-LH:15
+DA:49,1
+DA:50,1
+DA:51,1
+DA:52,1
+DA:56,40
+LF:33
+LH:20
 BRDA:5,0,0,40
 BRDA:5,0,1,0
 BRDA:13,1,0,40
 BRDA:13,1,1,40
 BRDA:26,2,0,0
 BRDA:26,2,1,0
-BRF:6
-BRH:3
+BRDA:49,3,0,1
+BRDA:49,3,1,0
+BRF:8
+BRH:4
 end_of_record
 TN:
 SF:src/automations/index.js
 FN:7,(anonymous_0)
 FN:9,(anonymous_1)
 FN:14,(anonymous_2)
-FNF:3
-FNH:2
+FN:18,(anonymous_3)
+FNF:4
+FNH:3
 FNDA:28,(anonymous_0)
 FNDA:8,(anonymous_1)
 FNDA:0,(anonymous_2)
+FNDA:1,(anonymous_3)
 DA:1,25
 DA:2,25
 DA:7,25
@@ -4400,9 +4411,11 @@ DA:9,28
 DA:10,8
 DA:14,25
 DA:15,0
-DA:17,25
-LF:8
-LH:7
+DA:18,25
+DA:19,1
+DA:22,25
+LF:10
+LH:9
 BRF:0
 BRH:0
 end_of_record
@@ -4770,8 +4783,8 @@ BRH:12
 end_of_record
 TN:
 SF:src/automations/steps/queryRows.js
-FN:75,getTable
-FN:85,(anonymous_1)
+FN:74,getTable
+FN:84,(anonymous_1)
 FNF:2
 FNH:2
 FNDA:1,getTable
@@ -4784,35 +4797,35 @@ DA:5,41
 DA:7,41
 DA:12,41
 DA:17,41
-DA:76,1
+DA:75,1
+DA:80,1
 DA:81,1
-DA:82,1
-DA:85,41
+DA:84,41
+DA:85,1
 DA:86,1
 DA:87,1
 DA:88,1
 DA:89,1
 DA:90,1
-DA:91,1
-DA:94,1
+DA:93,1
+DA:105,1
 DA:106,1
 DA:107,1
-DA:108,1
-DA:113,0
+DA:112,0
 LF:23
 LH:22
-BRDA:89,0,0,1
-BRDA:89,0,1,0
-BRDA:89,1,0,1
-BRDA:89,1,1,1
-BRDA:89,1,2,1
-BRDA:89,1,3,1
-BRDA:92,2,0,0
-BRDA:92,2,1,1
-BRDA:102,3,0,1
-BRDA:102,3,1,0
-BRDA:109,4,0,1
-BRDA:109,4,1,0
+BRDA:88,0,0,1
+BRDA:88,0,1,0
+BRDA:88,1,0,1
+BRDA:88,1,1,1
+BRDA:88,1,2,1
+BRDA:88,1,3,1
+BRDA:91,2,0,0
+BRDA:91,2,1,1
+BRDA:101,3,0,1
+BRDA:101,3,1,0
+BRDA:108,4,0,1
+BRDA:108,4,1,0
 BRF:12
 BRH:8
 end_of_record
@@ -4832,15 +4845,12 @@ DA:54,0
 DA:56,0
 DA:57,0
 DA:58,0
-DA:59,0
-DA:64,0
-LF:12
+DA:63,0
+LF:11
 LH:4
 BRDA:53,0,0,0
 BRDA:53,0,1,0
-BRDA:56,1,0,0
-BRDA:56,1,1,0
-BRF:4
+BRF:2
 BRH:0
 end_of_record
 TN:
@@ -5247,7 +5257,7 @@ FNDA:0,(anonymous_5)
 FNDA:264,(anonymous_6)
 FNDA:3,(anonymous_7)
 FNDA:193,(anonymous_8)
-FNDA:3,(anonymous_9)
+FNDA:2,(anonymous_9)
 FNDA:225,(anonymous_10)
 FNDA:20,(anonymous_11)
 FNDA:9,(anonymous_12)
@@ -5322,10 +5332,10 @@ DA:180,3
 DA:188,54
 DA:189,193
 DA:195,54
-DA:196,3
-DA:197,3
+DA:196,2
+DA:197,2
 DA:198,1
-DA:200,2
+DA:200,1
 DA:206,54
 DA:207,225
 DA:214,54
@@ -5395,9 +5405,9 @@ BRDA:172,11,1,71
 BRDA:179,12,0,0
 BRDA:179,13,0,0
 BRDA:197,14,0,1
-BRDA:197,14,1,2
-BRDA:197,15,0,3
-BRDA:197,15,1,3
+BRDA:197,14,1,1
+BRDA:197,15,0,2
+BRDA:197,15,1,2
 BRDA:206,16,0,0
 BRDA:206,17,0,0
 BRDA:246,18,0,0
@@ -6151,7 +6161,7 @@ SF:src/middleware/builder.js
 FN:24,checkDevAppLocks
 FN:44,updateAppUpdatedAt
 FN:51,(anonymous_2)
-FN:65,(anonymous_3)
+FN:62,(anonymous_3)
 FNF:4
 FNH:4
 FNDA:1,checkDevAppLocks
@@ -6179,29 +6189,23 @@ DA:49,0
 DA:51,1
 DA:52,1
 DA:53,1
+DA:54,1
 DA:55,1
-DA:57,1
+DA:56,1
 DA:58,1
-DA:59,1
-DA:61,1
-DA:65,25
-DA:66,181
-DA:68,181
-DA:69,5
-DA:71,176
+DA:62,25
+DA:63,181
+DA:65,181
+DA:66,5
+DA:68,176
+DA:69,176
+DA:70,176
 DA:72,176
-DA:74,176
-DA:75,176
-DA:76,176
-DA:77,0
-DA:80,176
-DA:81,176
-DA:83,176
-DA:84,175
-DA:87,1
-DA:89,1
-LF:42
-LH:37
+DA:73,175
+DA:76,1
+DA:78,1
+LF:36
+LH:32
 BRDA:28,0,0,0
 BRDA:28,0,1,1
 BRDA:28,1,0,1
@@ -6216,22 +6220,16 @@ BRDA:48,5,0,0
 BRDA:48,5,1,1
 BRDA:48,6,0,1
 BRDA:48,6,1,1
-BRDA:68,7,0,5
-BRDA:68,7,1,176
-BRDA:75,8,0,175
-BRDA:75,8,1,1
-BRDA:76,9,0,0
-BRDA:76,9,1,176
-BRDA:80,10,0,175
-BRDA:80,10,1,1
-BRDA:81,11,0,1
-BRDA:81,11,1,175
-BRDA:83,12,0,175
-BRDA:83,12,1,1
-BRDA:83,13,0,176
-BRDA:83,13,1,109
-BRF:28
-BRH:22
+BRDA:65,7,0,5
+BRDA:65,7,1,176
+BRDA:70,8,0,1
+BRDA:70,8,1,175
+BRDA:72,9,0,175
+BRDA:72,9,1,1
+BRDA:72,10,0,176
+BRDA:72,10,1,109
+BRF:22
+BRH:17
 end_of_record
 TN:
 SF:src/middleware/currentapp.js
@@ -7064,13 +7062,22 @@ BRH:10
 end_of_record
 TN:
 SF:src/utilities/budibaseDir.js
-FNF:0
+FN:6,(anonymous_0)
+FNF:1
 FNH:0
+FNDA:0,(anonymous_0)
 DA:1,42
+DA:2,42
 DA:3,42
-LF:2
-LH:2
-BRF:0
+DA:4,42
+DA:6,42
+DA:7,0
+DA:10,42
+LF:7
+LH:6
+BRDA:7,0,0,0
+BRDA:7,0,1,0
+BRF:2
 BRH:0
 end_of_record
 TN:
@@ -7766,21 +7773,23 @@ FN:32,(anonymous_1)
 FN:48,(anonymous_2)
 FN:49,(anonymous_3)
 FN:70,(anonymous_4)
-FN:82,(anonymous_5)
-FN:90,(anonymous_6)
-FN:95,(anonymous_7)
+FN:81,(anonymous_5)
+FN:89,(anonymous_6)
+FN:97,(anonymous_7)
 FN:102,(anonymous_8)
-FNF:9
-FNH:6
+FN:109,(anonymous_9)
+FNF:10
+FNH:7
 FNDA:8,newJob
 FNDA:40,(anonymous_1)
 FNDA:28,(anonymous_2)
 FNDA:11,(anonymous_3)
 FNDA:8,(anonymous_4)
-FNDA:0,(anonymous_5)
-FNDA:205,(anonymous_6)
-FNDA:0,(anonymous_7)
+FNDA:1,(anonymous_5)
+FNDA:0,(anonymous_6)
+FNDA:205,(anonymous_7)
 FNDA:0,(anonymous_8)
+FNDA:0,(anonymous_9)
 DA:1,40
 DA:13,8
 DA:33,40
@@ -7798,12 +7807,13 @@ DA:71,8
 DA:72,0
 DA:74,8
 DA:75,8
-DA:84,0
-DA:91,205
-DA:103,0
-DA:107,40
-LF:21
-LH:18
+DA:82,1
+DA:91,0
+DA:98,205
+DA:110,0
+DA:114,40
+LF:22
+LH:19
 BRDA:32,0,0,0
 BRDA:50,1,0,3
 BRDA:50,1,1,8

package/dist/api/controllers/templates.js

@@ -10,12 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const fetch = require("node-fetch");
 const { downloadTemplate } = require("../../utilities/fileSystem");
-const env = require("../../environment");
 // development flag, can be used to test against templates exported locally
 const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com";
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let type = env.TEMPLATE_REPOSITORY;
+        const { type = "app" } = ctx.query;
         let response, error = false;
         try {
             response = yield fetch(`https://${DEFAULT_TEMPLATES_BUCKET}/manifest.json`);

package/dist/api/controllers/view/exporters.js

@@ -6,7 +6,7 @@ exports.csv = function (headers, rows) {
             .map(header => {
             let val = row[header];
             val =
-                typeof val === "object" && !(val instanceof Date)
+                typeof val === "object"
                     ? `"${JSON.stringify(val).replace(/"/g, "'")}"`
                     : `"${val}"`;
             return val.trim();

package/dist/api/index.js

@@ -18,6 +18,7 @@ const { mainRoutes, staticRoutes, publicRoutes } = require("./routes");
 const pkg = require("../../package.json");
 const env = require("../environment");
 const { middleware: pro } = require("@budibase/pro");
+const { shutdown } = require("./routes/public");
 const router = new Router();
 router.get("/health", ctx => (ctx.status = 200));
 router.get("/version", ctx => (ctx.body = pkg.version));
@@ -83,4 +84,5 @@ router.use(publicRoutes.allowedMethods());
 // WARNING - static routes will catch everything else after them this must be last
 router.use(staticRoutes.routes());
 router.use(staticRoutes.allowedMethods());
-module.exports = router;
+module.exports.router = router;
+module.exports.shutdown = shutdown;

package/dist/api/routes/public/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.shutdown = void 0;
 const applications_1 = __importDefault(require("./applications"));
 const queries_1 = __importDefault(require("./queries"));
 const tables_1 = __importDefault(require("./tables"));
@@ -27,6 +28,7 @@ function getApiLimitPerSecond() {
     }
     return parseInt(environment_1.default.API_REQ_LIMIT_PER_SEC);
 }
+let rateLimitStore = null;
 if (!environment_1.default.isTest()) {
     const REDIS_OPTS = getRedisOptions();
     let options;
@@ -46,8 +48,9 @@ if (!environment_1.default.isTest()) {
             database: 1,
         };
     }
+    rateLimitStore = new Stores.Redis(options);
     RateLimit.defaultOptions({
-        store: new Stores.Redis(options),
+        store: rateLimitStore,
     });
 }
 // rate limiting, allows for 2 requests per second
@@ -111,3 +114,10 @@ applyRoutes(queries_1.default, PermissionTypes.QUERY, "queryId");
 // needs to be applied last for routing purposes, don't override other endpoints
 applyRoutes(rows_1.default, PermissionTypes.TABLE, "tableId", "rowId");
 exports.default = publicRouter;
+const shutdown = () => {
+    if (rateLimitStore) {
+        rateLimitStore.client.disconnect();
+        rateLimitStore = null;
+    }
+};
+exports.shutdown = shutdown;

package/dist/app.js

@@ -49,6 +49,8 @@ const automations = require("./automations/index");
 const Sentry = require("@sentry/node");
 const fileSystem = require("./utilities/fileSystem");
 const bullboard = require("./automations/bullboard");
+const { logAlert } = require("@budibase/backend-core/logging");
+const { Thread } = require("./threads");
 const redis_1 = __importDefault(require("./utilities/redis"));
 const migrations = __importStar(require("./migrations"));
 const app = new Koa();
@@ -74,7 +76,7 @@ if (!env.isTest()) {
 app.context.eventEmitter = eventEmitter;
 app.context.auth = {};
 // api routes
-app.use(api.routes());
+app.use(api.router.routes());
 if (env.isProd()) {
     env._set("NODE_ENV", "production");
     Sentry.init();
@@ -89,11 +91,23 @@ if (env.isProd()) {
 }
 const server = http.createServer(app.callback());
 destroyable(server);
+let shuttingDown = false, errCode = 0;
 server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
-    if (env.NODE_ENV !== "jest") {
+    // already in process
+    if (shuttingDown) {
+        return;
+    }
+    shuttingDown = true;
+    if (!env.isTest()) {
         console.log("Server Closed");
     }
+    yield automations.shutdown();
     yield redis_1.default.shutdown();
+    yield Thread.shutdown();
+    api.shutdown();
+    if (!env.isTest()) {
+        process.exit(errCode);
+    }
 }));
 module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(`Budibase running on ${JSON.stringify(server.address())}`);
@@ -108,7 +122,13 @@ const shutdown = () => {
     server.destroy();
 };
 process.on("uncaughtException", err => {
-    console.error(err);
+    // @ts-ignore
+    // don't worry about this error, comes from zlib isn't important
+    if (err && err["code"] === "ERR_INVALID_CHAR") {
+        return;
+    }
+    errCode = -1;
+    logAlert("Uncaught exception.", err);
     shutdown();
 });
 process.on("SIGTERM", () => {
@@ -118,7 +138,7 @@ process.on("SIGTERM", () => {
 // not recommended in a clustered environment
 if (!env.HTTP_MIGRATIONS) {
     migrations.migrate().catch(err => {
-        console.error("Error performing migrations. Exiting.\n", err);
+        logAlert("Error performing migrations. Exiting.", err);
         shutdown();
     });
 }

package/dist/automations/bullboard.js

@@ -51,4 +51,11 @@ exports.init = () => {
     serverAdapter.setBasePath(PATH_PREFIX);
     return serverAdapter.registerPlugin();
 };
+exports.shutdown = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (automationQueue) {
+        clearInterval(cleanupInternal);
+        yield automationQueue.close();
+        automationQueue = null;
+    }
+});
 exports.queue = automationQueue;