@stamhoofd/backend-middleware 2.74.0 → 2.75.1

package/dist/src/CORSMiddleware.d.ts

@@ -1,3 +1,3 @@
-import { ResponseMiddleware } from "@simonbackx/simple-endpoints";
+import { ResponseMiddleware } from '@simonbackx/simple-endpoints';
 export declare const CORSMiddleware: ResponseMiddleware;
 //# sourceMappingURL=CORSMiddleware.d.ts.map

package/dist/src/CORSMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CORSMiddleware.d.ts","sourceRoot":"","sources":["../../src/CORSMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAE5F,eAAO,MAAM,cAAc,EAAE,kBAyB5B,CAAA"}
+{"version":3,"file":"CORSMiddleware.d.ts","sourceRoot":"","sources":["../../src/CORSMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAErF,eAAO,MAAM,cAAc,EAAE,kBAyB5B,CAAC"}

package/dist/src/CORSMiddleware.js

@@ -3,24 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CORSMiddleware = void 0;
 exports.CORSMiddleware = {
     handleResponse(request, response) {
-        response.headers["Access-Control-Allow-Origin"] = request.headers.origin ?? "*";
-        response.headers["Access-Control-Allow-Methods"] = "POST, GET, OPTIONS, PATCH, PUT, DELETE";
-        response.headers["Access-Control-Allow-Headers"] = request.headers["access-control-request-headers"] ?? "*";
-        response.headers["Access-Control-Max-Age"] = "86400"; // Cache 24h
-        if (request.method !== "OPTIONS") {
+        response.headers['Access-Control-Allow-Origin'] = request.headers.origin ?? '*';
+        response.headers['Access-Control-Allow-Methods'] = 'POST, GET, OPTIONS, PATCH, PUT, DELETE';
+        response.headers['Access-Control-Allow-Headers'] = request.headers['access-control-request-headers'] ?? '*';
+        response.headers['Access-Control-Max-Age'] = '86400'; // Cache 24h
+        if (request.method !== 'OPTIONS') {
             // Expose all headers
-            const exposeHeaders = Object.keys(response.headers).map(h => h.toLowerCase()).filter(h => !['content-length', 'cache-control', 'content-language', 'content-type', 'expires', 'last-modified', 'pragma'].includes(h)).join(", ");
+            const exposeHeaders = Object.keys(response.headers).map(h => h.toLowerCase()).filter(h => !['content-length', 'cache-control', 'content-language', 'content-type', 'expires', 'last-modified', 'pragma'].includes(h)).join(', ');
             if (exposeHeaders) {
-                response.headers["Access-Control-Expose-Headers"] = exposeHeaders;
+                response.headers['Access-Control-Expose-Headers'] = exposeHeaders;
             }
         }
         // Not needed
         // response.headers["Access-Control-Allow-Credentials"] = "true";
         // API is public
-        response.headers["Cross-Origin-Resource-Policy"] = "cross-origin";
-        if (request.headers.origin && !response.headers["Vary"]) {
-            response.headers["Vary"] = "Origin";
+        response.headers['Cross-Origin-Resource-Policy'] = 'cross-origin';
+        if (request.headers.origin && !response.headers['Vary']) {
+            response.headers['Vary'] = 'Origin';
         }
-    }
+    },
 };
 //# sourceMappingURL=CORSMiddleware.js.map

package/dist/src/CORSMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"CORSMiddleware.js","sourceRoot":"","sources":["../../src/CORSMiddleware.ts"],"names":[],"mappings":";;;AAEa,QAAA,cAAc,GAAuB;IAC9C,cAAc,CAAC,OAAgB,EAAE,QAAyB;QACtD,QAAQ,CAAC,OAAO,CAAC,6BAA6B,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAA;QAC/E,QAAQ,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,wCAAwC,CAAA;QAC3F,QAAQ,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,gCAAgC,CAAC,IAAI,GAAG,CAAC;QAC5G,QAAQ,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,OAAO,CAAC,CAAC,YAAY;QAElE,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/B,qBAAqB;YACrB,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjO,IAAI,aAAa,EAAE,CAAC;gBAChB,QAAQ,CAAC,OAAO,CAAC,+BAA+B,CAAC,GAAG,aAAa,CAAA;YACrE,CAAC;QACL,CAAC;QAED,aAAa;QACb,iEAAiE;QAEjE,gBAAgB;QAChB,QAAQ,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,cAAc,CAAA;QAEjE,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACtD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAA;QACvC,CAAC;IACL,CAAC;CACJ,CAAA"}
+{"version":3,"file":"CORSMiddleware.js","sourceRoot":"","sources":["../../src/CORSMiddleware.ts"],"names":[],"mappings":";;;AAEa,QAAA,cAAc,GAAuB;IAC9C,cAAc,CAAC,OAAgB,EAAE,QAAkB;QAC/C,QAAQ,CAAC,OAAO,CAAC,6BAA6B,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC;QAChF,QAAQ,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,wCAAwC,CAAC;QAC5F,QAAQ,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,gCAAgC,CAAC,IAAI,GAAG,CAAC;QAC5G,QAAQ,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,OAAO,CAAC,CAAC,YAAY;QAElE,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/B,qBAAqB;YACrB,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjO,IAAI,aAAa,EAAE,CAAC;gBAChB,QAAQ,CAAC,OAAO,CAAC,+BAA+B,CAAC,GAAG,aAAa,CAAC;YACtE,CAAC;QACL,CAAC;QAED,aAAa;QACb,iEAAiE;QAEjE,gBAAgB;QAChB,QAAQ,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,cAAc,CAAC;QAElE,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACtD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC;QACxC,CAAC;IACL,CAAC;CACJ,CAAC"}

package/dist/src/LogMiddleware.d.ts

@@ -1,3 +1,3 @@
-import { RequestMiddleware, ResponseMiddleware } from "@simonbackx/simple-endpoints";
+import { RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
 export declare const LogMiddleware: ResponseMiddleware & RequestMiddleware;
 //# sourceMappingURL=LogMiddleware.d.ts.map

package/dist/src/LogMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LogMiddleware.d.ts","sourceRoot":"","sources":["../../src/LogMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,iBAAiB,EAAC,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAgE9G,eAAO,MAAM,aAAa,EAAE,kBAAkB,GAAG,iBA8DhD,CAAA"}
+{"version":3,"file":"LogMiddleware.d.ts","sourceRoot":"","sources":["../../src/LogMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAoExG,eAAO,MAAM,aAAa,EAAE,kBAAkB,GAAG,iBA+DhD,CAAC"}

package/dist/src/LogMiddleware.js

@@ -10,7 +10,7 @@ function logRequestDetails(request) {
         if (json && json.password) {
             json.password = '*******';
         }
-        simple_logging_1.logger.error(...requestPrefix(request, 'query'), "Request query was ", json);
+        simple_logging_1.logger.error(...requestPrefix(request, 'query'), 'Request query was ', json);
     }
     request.body.then((body) => {
         if (!body) {
@@ -22,11 +22,11 @@ function logRequestDetails(request) {
                 if (json && json.password) {
                     json.password = '*******';
                 }
-                simple_logging_1.logger.error(...requestPrefix(request, 'body'), "Request body was ", json);
+                simple_logging_1.logger.error(...requestPrefix(request, 'body'), 'Request body was ', json);
             }
         }
         catch (e) {
-            simple_logging_1.logger.error(...requestPrefix(request, 'body'), "Request body was ", body);
+            simple_logging_1.logger.error(...requestPrefix(request, 'body'), 'Request body was ', body);
         }
     }).catch(console.error);
 }
@@ -39,20 +39,23 @@ function requestOneLiner(request) {
         new simple_logging_1.StyledText(request.getIP()).addClass('request', 'ip'),
         '@',
         new simple_logging_1.StyledText(request.host).addClass('request', 'host'),
-        ')'
+        ')',
     ];
 }
 function requestPrefix(request, ...classes) {
+    if (!request._uniqueIndex) {
+        return [];
+    }
     return [
-        new simple_logging_1.StyledText(`[R${request._uniqueIndex.toString().padStart(4, "0")}] `).addClass('request', 'tag', ...classes),
+        new simple_logging_1.StyledText(`[R${request._uniqueIndex.toString().padStart(4, '0')}] `).addClass('request', 'tag', ...classes),
     ];
 }
 exports.LogMiddleware = {
     handleRequest(request) {
         request._uniqueIndex = requestCounter++;
         request._startTime = process.hrtime();
-        if (request.method == "OPTIONS") {
-            if (STAMHOOFD.environment === "development") {
+        if (request.method == 'OPTIONS') {
+            if (STAMHOOFD.environment === 'development') {
                 simple_logging_1.logger.log(...requestPrefix(request), ...requestOneLiner(request));
             }
             return;
@@ -62,28 +65,28 @@ exports.LogMiddleware = {
     wrapRun(run, request) {
         return simple_logging_1.logger.setContext({
             prefixes: requestPrefix(request, 'output'),
-            tags: ['request', 'request-output']
+            tags: ['request', 'request-output'],
         }, run);
     },
     handleResponse(request, response, error) {
         const endTime = process.hrtime();
         const startTime = request._startTime ?? endTime;
         const timeInMs = Math.round((endTime[0] - startTime[0]) * 1000 + (endTime[1] - startTime[1]) / 1000000);
-        if (request.method !== "OPTIONS") {
-            simple_logging_1.logger.log(...requestPrefix(request, 'time'), response.status + " - Finished in " + timeInMs + "ms");
+        if (request.method !== 'OPTIONS') {
+            simple_logging_1.logger.log(...requestPrefix(request, 'time'), response.status + ' - Finished in ' + timeInMs + 'ms');
         }
         if (error) {
             if ((0, simple_errors_1.isSimpleError)(error) || (0, simple_errors_1.isSimpleErrors)(error)) {
-                if (!error.hasCode("expired_access_token") && !error.hasCode('unknown_domain') && !error.hasCode('unknown_webshop')) {
-                    simple_logging_1.logger.error(...requestPrefix(request, 'error'), "Request with error in response ", new simple_logging_1.StyledText(error).addClass('request', 'error'));
+                if (!error.hasCode('expired_access_token') && !error.hasCode('unknown_domain') && !error.hasCode('unknown_webshop')) {
+                    simple_logging_1.logger.error(...requestPrefix(request, 'error'), 'Request with error in response ', new simple_logging_1.StyledText(error).addClass('request', 'error'));
                     logRequestDetails(request);
                 }
             }
             else {
-                simple_logging_1.logger.error(...requestPrefix(request, 'error'), "Request with internal error ", new simple_logging_1.StyledText(error).addClass('request', 'error'));
+                simple_logging_1.logger.error(...requestPrefix(request, 'error'), 'Request with internal error ', new simple_logging_1.StyledText(error).addClass('request', 'error'));
                 logRequestDetails(request);
             }
         }
-    }
+    },
 };
 //# sourceMappingURL=LogMiddleware.js.map

package/dist/src/LogMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"LogMiddleware.js","sourceRoot":"","sources":["../../src/LogMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LogMiddleware.js","sourceRoot":"","sources":["../../src/LogMiddleware.ts"],"names":[],"mappings":"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"}

package/dist/src/VersionMiddleware.d.ts

@@ -1,4 +1,4 @@
-import { EncodedResponse, Request, RequestMiddleware, ResponseMiddleware } from "@simonbackx/simple-endpoints";
+import { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
 export declare class VersionMiddleware implements RequestMiddleware, ResponseMiddleware {
     minimumVersion: number | undefined;
     latestVersions: {
@@ -15,6 +15,6 @@ export declare class VersionMiddleware implements RequestMiddleware, ResponseMid
         minimumVersion?: number;
     });
     handleRequest(request: Request): void;
-    handleResponse(request: Request, response: EncodedResponse): void;
+    handleResponse(request: Request, response: Response): void;
 }
 //# sourceMappingURL=VersionMiddleware.d.ts.map

package/dist/src/VersionMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VersionMiddleware.d.ts","sourceRoot":"","sources":["../../src/VersionMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAI/G,qBAAa,iBAAkB,YAAW,iBAAiB,EAAE,kBAAkB;IAC3E,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,cAAc,EAAE;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,CAAA;gBAE/C,OAAO,EAAE;QAAC,cAAc,EAAE;YAAC,OAAO,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAC,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAC;IAK3G,aAAa,CAAC,OAAO,EAAE,OAAO;IAmD9B,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe;CAmB7D"}
+{"version":3,"file":"VersionMiddleware.d.ts","sourceRoot":"","sources":["../../src/VersionMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAIxG,qBAAa,iBAAkB,YAAW,iBAAiB,EAAE,kBAAkB;IAC3E,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;gBAElD,OAAO,EAAE;QAAE,cAAc,EAAE;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE;IAK/G,aAAa,CAAC,OAAO,EAAE,OAAO;IAqD9B,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;CAoBtD"}

package/dist/src/VersionMiddleware.js

@@ -14,7 +14,7 @@ class VersionMiddleware {
         if (!this.minimumVersion) {
             return;
         }
-        const platform = request.headers["x-platform"];
+        const platform = request.headers['x-platform'];
         let version;
         try {
             version = request.getVersion();
@@ -22,54 +22,54 @@ class VersionMiddleware {
         catch (e) {
             if (((0, simple_errors_1.isSimpleError)(e) || (0, simple_errors_1.isSimpleErrors)(e)) && e.hasCode('missing_version')) {
                 // Allow missing version on /openid/ path
-                if (STAMHOOFD.environment === 'development' || request.url.startsWith("/openid/")) {
+                if (STAMHOOFD.environment === 'development' || request.url.startsWith('/openid/')) {
                     request.version = this.latestVersions.web;
                     return;
                 }
             }
             throw e;
         }
-        /*if (request.getIP() === '') {
+        /* if (request.getIP() === '') {
             throw new SimpleError({
                 code: "blocked",
                 statusCode: 400,
                 message: "Temporary blocked",
                 human: "Jouw verbinding is tijdelijk geblokkeerd. Gelieve contact op te nemen met hallo@stamhoofd.be"
             })
-        }*/
+        } */
         if (version < this.minimumVersion) {
             // WARNING: update caddy config for on demand certificates, because we don't want to throw errors over there!
-            if (platform === "web" || platform === undefined) {
+            if (platform === 'web' || platform === undefined) {
                 throw new simple_errors_1.SimpleError({
-                    code: "client_update_required",
+                    code: 'client_update_required',
                     statusCode: 400,
-                    message: "Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.",
-                    human: "Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser."
+                    message: 'Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.',
+                    human: 'Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.',
                 });
             }
             else {
                 throw new simple_errors_1.SimpleError({
-                    code: "client_update_required",
+                    code: 'client_update_required',
                     statusCode: 400,
-                    message: "Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!",
-                    human: "Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!"
+                    message: 'Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!',
+                    human: 'Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!',
                 });
             }
         }
     }
     handleResponse(request, response) {
-        const platform = request.headers["x-platform"];
-        if (platform === "android") {
-            response.headers["X-Platform-Latest-Version"] = this.latestVersions.android;
+        const platform = request.headers['x-platform'];
+        if (platform === 'android') {
+            response.headers['X-Platform-Latest-Version'] = this.latestVersions.android;
         }
-        if (platform === "ios") {
-            response.headers["X-Platform-Latest-Version"] = this.latestVersions.ios;
+        if (platform === 'ios') {
+            response.headers['X-Platform-Latest-Version'] = this.latestVersions.ios;
         }
-        if (platform === "web") {
-            response.headers["X-Platform-Latest-Version"] = this.latestVersions.web;
+        if (platform === 'web') {
+            response.headers['X-Platform-Latest-Version'] = this.latestVersions.web;
         }
         try {
-            response.headers["X-Version"] = Math.min(structures_1.Version, request.getVersion());
+            response.headers['X-Version'] = Math.min(structures_1.Version, request.getVersion());
         }
         catch (e) {
             // No version provided or invalid version

package/dist/src/VersionMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"VersionMiddleware.js","sourceRoot":"","sources":["../../src/VersionMiddleware.ts"],"names":[],"mappings":";;;AACA,6DAAuF;AACvF,sDAAgD;AAEhD,MAAa,iBAAiB;IAC1B,cAAc,CAAoB;IAClC,cAAc,CAA6C;IAE3D,YAAY,OAA+F;QACvG,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;QAC5C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;IAChD,CAAC;IAED,aAAa,CAAC,OAAgB;QAC1B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,OAAM;QACV,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE/C,IAAI,OAAgB,CAAC;QAErB,IAAI,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAA;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,IAAA,6BAAa,EAAC,CAAC,CAAC,IAAI,IAAA,8BAAc,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC1E,yCAAyC;gBACzC,IAAI,SAAS,CAAC,WAAW,KAAK,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBAChF,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAA;oBACzC,OAAM;gBACV,CAAC;YACL,CAAC;YACD,MAAM,CAAC,CAAC;QACZ,CAAC;QAED;;;;;;;WAOG;QAEH,IAAI,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAChC,6GAA6G;YAC7G,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC/C,MAAM,IAAI,2BAAW,CAAC;oBAClB,IAAI,EAAE,wBAAwB;oBAC9B,UAAU,EAAE,GAAG;oBACf,OAAO,EAAE,8GAA8G;oBACvH,KAAK,EAAE,8GAA8G;iBACxH,CAAC,CAAA;YACN,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,2BAAW,CAAC;oBAClB,IAAI,EAAE,wBAAwB;oBAC9B,UAAU,EAAE,GAAG;oBACf,OAAO,EAAE,+EAA+E;oBACxF,KAAK,EAAE,+EAA+E;iBACzF,CAAC,CAAA;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAED,cAAc,CAAC,OAAgB,EAAE,QAAyB;QACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE/C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,QAAQ,CAAC,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAA;QAC/E,CAAC;QACD,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACrB,QAAQ,CAAC,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAA;QAC3E,CAAC;QACD,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACrB,QAAQ,CAAC,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAA;QAC3E,CAAC;QAED,IAAI,CAAC;YACD,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAO,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;QAC3E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,yCAAyC;QAC7C,CAAC;IACL,CAAC;CACJ;AA/ED,8CA+EC"}
+{"version":3,"file":"VersionMiddleware.js","sourceRoot":"","sources":["../../src/VersionMiddleware.ts"],"names":[],"mappings":";;;AACA,6DAAuF;AACvF,sDAAgD;AAEhD,MAAa,iBAAiB;IAC1B,cAAc,CAAqB;IACnC,cAAc,CAAgD;IAE9D,YAAY,OAAmG;QAC3G,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IACjD,CAAC;IAED,aAAa,CAAC,OAAgB;QAC1B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE/C,IAAI,OAAgB,CAAC;QAErB,IAAI,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;QACnC,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACP,IAAI,CAAC,IAAA,6BAAa,EAAC,CAAC,CAAC,IAAI,IAAA,8BAAc,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC1E,yCAAyC;gBACzC,IAAI,SAAS,CAAC,WAAW,KAAK,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBAChF,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;oBAC1C,OAAO;gBACX,CAAC;YACL,CAAC;YACD,MAAM,CAAC,CAAC;QACZ,CAAC;QAED;;;;;;;YAOI;QAEJ,IAAI,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAChC,6GAA6G;YAC7G,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC/C,MAAM,IAAI,2BAAW,CAAC;oBAClB,IAAI,EAAE,wBAAwB;oBAC9B,UAAU,EAAE,GAAG;oBACf,OAAO,EAAE,8GAA8G;oBACvH,KAAK,EAAE,8GAA8G;iBACxH,CAAC,CAAC;YACP,CAAC;iBACI,CAAC;gBACF,MAAM,IAAI,2BAAW,CAAC;oBAClB,IAAI,EAAE,wBAAwB;oBAC9B,UAAU,EAAE,GAAG;oBACf,OAAO,EAAE,+EAA+E;oBACxF,KAAK,EAAE,+EAA+E;iBACzF,CAAC,CAAC;YACP,CAAC;QACL,CAAC;IACL,CAAC;IAED,cAAc,CAAC,OAAgB,EAAE,QAAkB;QAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE/C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,QAAQ,CAAC,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;QAChF,CAAC;QACD,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACrB,QAAQ,CAAC,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;QAC5E,CAAC;QACD,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACrB,QAAQ,CAAC,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC;YACD,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAO,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACP,yCAAyC;QAC7C,CAAC;IACL,CAAC;CACJ;AAlFD,8CAkFC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend-middleware",
-    "version": "2.74.0",
+    "version": "2.75.1",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "license": "UNLICENCED",
@@ -13,12 +13,12 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@simonbackx/simple-endpoints": "1.15.0",
+        "@simonbackx/simple-endpoints": "1.19.0",
         "@simonbackx/simple-errors": "^1.4",
         "@simonbackx/simple-logging": "^1.0.1"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3a77692b8163f10c231785de2f720c423a909762"
+    "gitHead": "4c6a7f14c62e4832885325d02c5aaeeccf27568b"
 }

package/src/CORSMiddleware.ts

@@ -1,28 +1,28 @@
-import { EncodedResponse, Request, ResponseMiddleware } from "@simonbackx/simple-endpoints";
+import { Request, Response, ResponseMiddleware } from '@simonbackx/simple-endpoints';
 
 export const CORSMiddleware: ResponseMiddleware = {
-    handleResponse(request: Request, response: EncodedResponse) {
-        response.headers["Access-Control-Allow-Origin"] = request.headers.origin ?? "*"
-        response.headers["Access-Control-Allow-Methods"] = "POST, GET, OPTIONS, PATCH, PUT, DELETE"
-        response.headers["Access-Control-Allow-Headers"] = request.headers["access-control-request-headers"] ?? "*";
-        response.headers["Access-Control-Max-Age"] = "86400"; // Cache 24h
-        
-        if (request.method !== "OPTIONS") {
+    handleResponse(request: Request, response: Response) {
+        response.headers['Access-Control-Allow-Origin'] = request.headers.origin ?? '*';
+        response.headers['Access-Control-Allow-Methods'] = 'POST, GET, OPTIONS, PATCH, PUT, DELETE';
+        response.headers['Access-Control-Allow-Headers'] = request.headers['access-control-request-headers'] ?? '*';
+        response.headers['Access-Control-Max-Age'] = '86400'; // Cache 24h
+
+        if (request.method !== 'OPTIONS') {
             // Expose all headers
-            const exposeHeaders = Object.keys(response.headers).map(h => h.toLowerCase()).filter(h => !['content-length', 'cache-control', 'content-language', 'content-type', 'expires', 'last-modified', 'pragma'].includes(h)).join(", ");
+            const exposeHeaders = Object.keys(response.headers).map(h => h.toLowerCase()).filter(h => !['content-length', 'cache-control', 'content-language', 'content-type', 'expires', 'last-modified', 'pragma'].includes(h)).join(', ');
             if (exposeHeaders) {
-                response.headers["Access-Control-Expose-Headers"] = exposeHeaders
+                response.headers['Access-Control-Expose-Headers'] = exposeHeaders;
             }
         }
-        
+
         // Not needed
         // response.headers["Access-Control-Allow-Credentials"] = "true";
 
         // API is public
-        response.headers["Cross-Origin-Resource-Policy"] = "cross-origin"
+        response.headers['Cross-Origin-Resource-Policy'] = 'cross-origin';
 
-        if (request.headers.origin && !response.headers["Vary"]) {
-            response.headers["Vary"] = "Origin"
+        if (request.headers.origin && !response.headers['Vary']) {
+            response.headers['Vary'] = 'Origin';
         }
-    }
-}
+    },
+};

package/src/LogMiddleware.ts

@@ -1,127 +1,132 @@
-import { EncodedResponse, Request, RequestMiddleware,ResponseMiddleware } from "@simonbackx/simple-endpoints";
-import { isSimpleError, isSimpleErrors } from "@simonbackx/simple-errors";
-import { logger, StyledText } from "@simonbackx/simple-logging";
+import { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
+import { isSimpleError, isSimpleErrors } from '@simonbackx/simple-errors';
+import { logger, StyledText } from '@simonbackx/simple-logging';
 let requestCounter = 0;
 
 function logRequestDetails(request: Request) {
     if (Object.keys(request.query).length) {
-        const json: any = {...request.query}
+        const json: any = { ...request.query };
         if (json && json.password) {
-            json.password = '*******'
+            json.password = '*******';
         }
         logger.error(
             ...requestPrefix(request, 'query'),
-            "Request query was ",
-            json
-        )
+            'Request query was ',
+            json,
+        );
     }
 
     request.body.then((body) => {
         if (!body) {
-            return
+            return;
         }
         try {
-            const json = JSON.parse(body)
+            const json = JSON.parse(body);
             if (Array.isArray(json) || Object.keys(json).length) {
                 if (json && json.password) {
-                    json.password = '*******'
+                    json.password = '*******';
                 }
 
                 logger.error(
                     ...requestPrefix(request, 'body'),
-                    "Request body was ",
-                    json
-                )
+                    'Request body was ',
+                    json,
+                );
             }
-        } catch (e) {
+        }
+        catch (e) {
             logger.error(
                 ...requestPrefix(request, 'body'),
-                "Request body was ",
-                body
-            )
+                'Request body was ',
+                body,
+            );
         }
-    }).catch(console.error)
+    }).catch(console.error);
 }
 
-function requestOneLiner(request: Request): (StyledText | string)[]  {
+function requestOneLiner(request: Request): (StyledText | string)[] {
     return [
         new StyledText(request.method).addClass('request', 'method', request.method.toLowerCase()),
         ' ',
         new StyledText(request.url).addClass('request', 'url'),
         ' (',
-            new StyledText(request.getIP()).addClass('request', 'ip'),
-            '@',
-            new StyledText(request.host).addClass('request', 'host'),
-        ')'
-    ]
+        new StyledText(request.getIP()).addClass('request', 'ip'),
+        '@',
+        new StyledText(request.host).addClass('request', 'host'),
+        ')',
+    ];
 }
 
 function requestPrefix(request: Request, ...classes: string[]): (StyledText | string)[] {
+    if (!(request as any)._uniqueIndex) {
+        return [];
+    }
     return [
-        new StyledText(`[R${((request as any)._uniqueIndex as number).toString().padStart(4, "0")}] `).addClass('request', 'tag', ...classes),
-    ]
+        new StyledText(`[R${((request as any)._uniqueIndex as number).toString().padStart(4, '0')}] `).addClass('request', 'tag', ...classes),
+    ];
 }
 
 export const LogMiddleware: ResponseMiddleware & RequestMiddleware = {
     handleRequest(request: Request) {
-        (request as any)._uniqueIndex = requestCounter++
+        (request as any)._uniqueIndex = requestCounter++;
         (request as any)._startTime = process.hrtime();
 
-        if (request.method == "OPTIONS") {
-            if (STAMHOOFD.environment === "development") {
+        if (request.method == 'OPTIONS') {
+            if (STAMHOOFD.environment === 'development') {
                 logger.log(
                     ...requestPrefix(request),
-                    ...requestOneLiner(request)
-                )
+                    ...requestOneLiner(request),
+                );
             }
-            return
+            return;
         }
 
         logger.log(
             ...requestPrefix(request),
-            ...requestOneLiner(request)
-        )
+            ...requestOneLiner(request),
+        );
     },
 
     wrapRun<T>(run: () => Promise<T>, request: Request) {
         return logger.setContext({
             prefixes: requestPrefix(request, 'output'),
-            tags: ['request', 'request-output']
-        }, run)
+            tags: ['request', 'request-output'],
+        }, run);
     },
 
-    handleResponse(request: Request, response: EncodedResponse, error?: Error) {
+    handleResponse(request: Request, response: Response, error?: Error) {
         const endTime = process.hrtime();
         const startTime = (request as any)._startTime ?? endTime;
         const timeInMs = Math.round((endTime[0] - startTime[0]) * 1000 + (endTime[1] - startTime[1]) / 1000000);
 
-        if (request.method !== "OPTIONS") {
+        if (request.method !== 'OPTIONS') {
             logger.log(
                 ...requestPrefix(request, 'time'),
-                response.status + " - Finished in "+timeInMs+"ms"
-            )
+                response.status + ' - Finished in ' + timeInMs + 'ms',
+            );
         }
 
         if (error) {
             if (isSimpleError(error) || isSimpleErrors(error)) {
-                if (!error.hasCode("expired_access_token") && !error.hasCode('unknown_domain') && !error.hasCode('unknown_webshop')) {
+                if (!error.hasCode('expired_access_token') && !error.hasCode('unknown_domain') && !error.hasCode('unknown_webshop')) {
                     logger.error(
                         ...requestPrefix(request, 'error'),
-                        "Request with error in response ",
-                        new StyledText(error).addClass('request', 'error')
-                    )
+                        'Request with error in response ',
+                        new StyledText(error).addClass('request', 'error'),
+                    );
 
-                    logRequestDetails(request)
+                    logRequestDetails(request);
                 }
-            } else {
+            }
+            else {
                 logger.error(
                     ...requestPrefix(request, 'error'),
-                    "Request with internal error ",
-                    new StyledText(error).addClass('request', 'error')
-                )
+                    'Request with internal error ',
+                    new StyledText(error).addClass('request', 'error'),
+                );
 
-                logRequestDetails(request)
+                logRequestDetails(request);
             }
         }
-    }
-}
+    },
+};

package/src/VersionMiddleware.ts

@@ -1,83 +1,86 @@
-import { EncodedResponse, Request, RequestMiddleware, ResponseMiddleware } from "@simonbackx/simple-endpoints";
-import { isSimpleError, isSimpleErrors, SimpleError } from "@simonbackx/simple-errors";
-import { Version } from "@stamhoofd/structures";
+import { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
+import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
+import { Version } from '@stamhoofd/structures';
 
 export class VersionMiddleware implements RequestMiddleware, ResponseMiddleware {
-    minimumVersion: number | undefined
-    latestVersions: {android: number, ios: number, web: number}
+    minimumVersion: number | undefined;
+    latestVersions: { android: number; ios: number; web: number };
 
-    constructor(options: {latestVersions: {android: number, ios: number, web: number}, minimumVersion?: number}) {
-        this.minimumVersion = options.minimumVersion
-        this.latestVersions = options.latestVersions
+    constructor(options: { latestVersions: { android: number; ios: number; web: number }; minimumVersion?: number }) {
+        this.minimumVersion = options.minimumVersion;
+        this.latestVersions = options.latestVersions;
     }
 
     handleRequest(request: Request) {
         if (!this.minimumVersion) {
-            return
+            return;
         }
 
-        const platform = request.headers["x-platform"];
+        const platform = request.headers['x-platform'];
 
         let version!: number;
 
         try {
-            version = request.getVersion()
-        } catch (e) {
+            version = request.getVersion();
+        }
+        catch (e) {
             if ((isSimpleError(e) || isSimpleErrors(e)) && e.hasCode('missing_version')) {
                 // Allow missing version on /openid/ path
-                if (STAMHOOFD.environment === 'development' || request.url.startsWith("/openid/")) {
-                    request.version = this.latestVersions.web
-                    return
+                if (STAMHOOFD.environment === 'development' || request.url.startsWith('/openid/')) {
+                    request.version = this.latestVersions.web;
+                    return;
                 }
             }
             throw e;
         }
 
-        /*if (request.getIP() === '') {
+        /* if (request.getIP() === '') {
             throw new SimpleError({
                 code: "blocked",
                 statusCode: 400,
                 message: "Temporary blocked",
                 human: "Jouw verbinding is tijdelijk geblokkeerd. Gelieve contact op te nemen met hallo@stamhoofd.be"
             })
-        }*/
+        } */
 
         if (version < this.minimumVersion) {
             // WARNING: update caddy config for on demand certificates, because we don't want to throw errors over there!
-            if (platform === "web" || platform === undefined) {
+            if (platform === 'web' || platform === undefined) {
                 throw new SimpleError({
-                    code: "client_update_required",
+                    code: 'client_update_required',
                     statusCode: 400,
-                    message: "Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.",
-                    human: "Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser."
-                })
-            } else {
+                    message: 'Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.',
+                    human: 'Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.',
+                });
+            }
+            else {
                 throw new SimpleError({
-                    code: "client_update_required",
+                    code: 'client_update_required',
                     statusCode: 400,
-                    message: "Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!",
-                    human: "Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!"
-                })
+                    message: 'Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!',
+                    human: 'Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!',
+                });
             }
         }
     }
 
-    handleResponse(request: Request, response: EncodedResponse) {
-        const platform = request.headers["x-platform"];
+    handleResponse(request: Request, response: Response) {
+        const platform = request.headers['x-platform'];
 
-        if (platform === "android") {
-            response.headers["X-Platform-Latest-Version"] = this.latestVersions.android
+        if (platform === 'android') {
+            response.headers['X-Platform-Latest-Version'] = this.latestVersions.android;
         }
-        if (platform === "ios") {
-            response.headers["X-Platform-Latest-Version"] = this.latestVersions.ios
+        if (platform === 'ios') {
+            response.headers['X-Platform-Latest-Version'] = this.latestVersions.ios;
         }
-        if (platform === "web") {
-            response.headers["X-Platform-Latest-Version"] = this.latestVersions.web
+        if (platform === 'web') {
+            response.headers['X-Platform-Latest-Version'] = this.latestVersions.web;
         }
 
         try {
-            response.headers["X-Version"] = Math.min(Version, request.getVersion())
-        } catch (e) {
+            response.headers['X-Version'] = Math.min(Version, request.getVersion());
+        }
+        catch (e) {
             // No version provided or invalid version
         }
     }