@stamhoofd/backend-middleware 2.118.1 → 2.120.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/CORSMiddleware.d.ts +3 -0
- package/dist/CORSMiddleware.d.ts.map +1 -0
- package/dist/{src/CORSMiddleware.js → CORSMiddleware.js} +1 -4
- package/dist/CORSMiddleware.js.map +1 -0
- package/dist/{src/LogMiddleware.d.ts → LogMiddleware.d.ts} +1 -1
- package/dist/LogMiddleware.d.ts.map +1 -0
- package/dist/{src/LogMiddleware.js → LogMiddleware.js} +23 -27
- package/dist/LogMiddleware.js.map +1 -0
- package/dist/{src/VersionMiddleware.d.ts → VersionMiddleware.d.ts} +1 -1
- package/dist/VersionMiddleware.d.ts.map +1 -0
- package/dist/{src/VersionMiddleware.js → VersionMiddleware.js} +11 -16
- package/dist/VersionMiddleware.js.map +1 -0
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -6
- package/dist/index.js.map +1 -1
- package/package.json +7 -5
- package/src/CORSMiddleware.ts +1 -1
- package/src/LogMiddleware.ts +3 -3
- package/src/VersionMiddleware.ts +3 -3
- package/src/index.ts +3 -0
- package/dist/src/CORSMiddleware.d.ts +0 -3
- package/dist/src/CORSMiddleware.d.ts.map +0 -1
- package/dist/src/CORSMiddleware.js.map +0 -1
- package/dist/src/LogMiddleware.d.ts.map +0 -1
- package/dist/src/LogMiddleware.js.map +0 -1
- package/dist/src/VersionMiddleware.d.ts.map +0 -1
- package/dist/src/VersionMiddleware.js.map +0 -1
- package/dist/tsconfig.tsbuildinfo +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CORSMiddleware.d.ts","sourceRoot":"","sources":["../src/CORSMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAE1F,eAAO,MAAM,cAAc,EAAE,kBAyB5B,CAAC"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CORSMiddleware = void 0;
|
|
4
|
-
exports.CORSMiddleware = {
|
|
1
|
+
export const CORSMiddleware = {
|
|
5
2
|
handleResponse(request, response) {
|
|
6
3
|
response.headers['Access-Control-Allow-Origin'] = request.headers.origin ?? '*';
|
|
7
4
|
response.headers['Access-Control-Allow-Methods'] = 'POST, GET, OPTIONS, PATCH, PUT, DELETE';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CORSMiddleware.js","sourceRoot":"","sources":["../src/CORSMiddleware.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
1
|
+
import type { Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
2
2
|
import { StyledText } from '@simonbackx/simple-logging';
|
|
3
3
|
export declare function requestPrefix(request: Request, ...classes: string[]): (StyledText | string)[];
|
|
4
4
|
export declare const LogMiddleware: ResponseMiddleware & RequestMiddleware;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LogMiddleware.d.ts","sourceRoot":"","sources":["../src/LogMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAE7G,OAAO,EAAU,UAAU,EAAE,MAAM,4BAA4B,CAAC;AA8FhE,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,EAAE,CAS7F;AAUD,eAAO,MAAM,aAAa,EAAE,kBAAkB,GAAG,iBAmEhD,CAAC"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.LogMiddleware = void 0;
|
|
4
|
-
exports.requestPrefix = requestPrefix;
|
|
5
|
-
const simple_errors_1 = require("@simonbackx/simple-errors");
|
|
6
|
-
const simple_logging_1 = require("@simonbackx/simple-logging");
|
|
1
|
+
import { isSimpleError, isSimpleErrors } from '@simonbackx/simple-errors';
|
|
2
|
+
import { logger, StyledText } from '@simonbackx/simple-logging';
|
|
7
3
|
let requestCounter = 0;
|
|
8
4
|
function removePII(object) {
|
|
9
5
|
if (object === null || object === undefined) {
|
|
@@ -36,7 +32,7 @@ function logRequestDetails(request) {
|
|
|
36
32
|
if (json && json.clientSecret) {
|
|
37
33
|
json.clientSecret = '*******';
|
|
38
34
|
}
|
|
39
|
-
|
|
35
|
+
logger.error(...requestPrefix(request, 'query'), 'Request query was ', json);
|
|
40
36
|
}
|
|
41
37
|
request.body.then((body) => {
|
|
42
38
|
if (!body) {
|
|
@@ -44,42 +40,42 @@ function logRequestDetails(request) {
|
|
|
44
40
|
}
|
|
45
41
|
try {
|
|
46
42
|
const json = JSON.parse(body);
|
|
47
|
-
if (Array.isArray(json) || Object.keys(json).length) {
|
|
43
|
+
if (typeof json === 'object' && json !== null && (Array.isArray(json) || Object.keys(json).length)) {
|
|
48
44
|
removePII(json);
|
|
49
|
-
|
|
45
|
+
logger.error(...requestPrefix(request, 'body'), 'Request body was ', json);
|
|
50
46
|
}
|
|
51
47
|
}
|
|
52
48
|
catch (e) {
|
|
53
49
|
if (typeof body === 'string') {
|
|
54
|
-
|
|
50
|
+
logger.error(...requestPrefix(request, 'body'), 'Request body was invalid JSON ', body);
|
|
55
51
|
}
|
|
56
52
|
else {
|
|
57
53
|
// Don't log
|
|
58
|
-
|
|
54
|
+
logger.error(...requestPrefix(request, 'body'), 'Request body was of type ' + typeof body, body);
|
|
59
55
|
}
|
|
60
56
|
}
|
|
61
57
|
}).catch(console.error);
|
|
62
58
|
}
|
|
63
59
|
function requestOneLiner(request) {
|
|
64
60
|
return [
|
|
65
|
-
new
|
|
61
|
+
new StyledText(request.method).addClass('request', 'method', request.method.toLowerCase()),
|
|
66
62
|
' ',
|
|
67
|
-
new
|
|
63
|
+
new StyledText(request.url).addClass('request', 'url'),
|
|
68
64
|
' (',
|
|
69
|
-
new
|
|
65
|
+
new StyledText(request.getIP()).addClass('request', 'ip'),
|
|
70
66
|
'@',
|
|
71
|
-
new
|
|
67
|
+
new StyledText(request.host).addClass('request', 'host'),
|
|
72
68
|
')',
|
|
73
69
|
];
|
|
74
70
|
}
|
|
75
|
-
function requestPrefix(request, ...classes) {
|
|
71
|
+
export function requestPrefix(request, ...classes) {
|
|
76
72
|
if (request._uniqueIndex === undefined) {
|
|
77
73
|
return [
|
|
78
|
-
new
|
|
74
|
+
new StyledText(`[UNKNOWN REQUEST] `).addClass('request', 'tag', ...classes),
|
|
79
75
|
];
|
|
80
76
|
}
|
|
81
77
|
return [
|
|
82
|
-
new
|
|
78
|
+
new StyledText(`[R${request._uniqueIndex.toString().padStart(4, '0')}] `).addClass('request', 'tag', ...classes),
|
|
83
79
|
];
|
|
84
80
|
}
|
|
85
81
|
function assignIndex(request) {
|
|
@@ -89,16 +85,16 @@ function assignIndex(request) {
|
|
|
89
85
|
request._uniqueIndex = ++requestCounter;
|
|
90
86
|
request._startTime = process.hrtime();
|
|
91
87
|
}
|
|
92
|
-
|
|
88
|
+
export const LogMiddleware = {
|
|
93
89
|
handleRequest(request) {
|
|
94
90
|
assignIndex(request);
|
|
95
91
|
},
|
|
96
92
|
wrapRun(run, request) {
|
|
97
93
|
assignIndex(request);
|
|
98
94
|
if (request.method !== 'OPTIONS' || STAMHOOFD.environment === 'development') {
|
|
99
|
-
|
|
95
|
+
logger.log(...requestPrefix(request, 'first'), ...requestOneLiner(request));
|
|
100
96
|
}
|
|
101
|
-
return
|
|
97
|
+
return logger.setContext({
|
|
102
98
|
prefixes: requestPrefix(request, 'output'),
|
|
103
99
|
tags: ['request', 'request-output'],
|
|
104
100
|
}, run);
|
|
@@ -109,21 +105,21 @@ exports.LogMiddleware = {
|
|
|
109
105
|
const timeInMs = Math.round((endTime[0] - startTime[0]) * 1000 + (endTime[1] - startTime[1]) / 1000000);
|
|
110
106
|
const prefix = !error ? [] : requestPrefix(request, 'error');
|
|
111
107
|
if (request.method !== 'OPTIONS') {
|
|
112
|
-
|
|
108
|
+
logger.log(...prefix, new StyledText('HTTP ' + response.status).addClass('request', 'status-code'), ' - Finished in ' + timeInMs + 'ms');
|
|
113
109
|
}
|
|
114
110
|
if (error) {
|
|
115
|
-
if (
|
|
111
|
+
if (isSimpleError(error) || isSimpleErrors(error)) {
|
|
116
112
|
if (!error.hasCode('expired_access_token') && !error.hasCode('unknown_domain') && !error.hasCode('unknown_webshop')) {
|
|
117
|
-
|
|
118
|
-
|
|
113
|
+
logger.error(...prefix, 'Request with error in response:');
|
|
114
|
+
logger.error(new StyledText(error).addClass('request', 'error'));
|
|
119
115
|
if (!error.hasCode('too_big_attachments')) {
|
|
120
116
|
logRequestDetails(request);
|
|
121
117
|
}
|
|
122
118
|
}
|
|
123
119
|
}
|
|
124
120
|
else {
|
|
125
|
-
|
|
126
|
-
|
|
121
|
+
logger.error(...prefix, 'Request with internal error:');
|
|
122
|
+
logger.error(...prefix, new StyledText(error).addClass('request', 'error'));
|
|
127
123
|
logRequestDetails(request);
|
|
128
124
|
}
|
|
129
125
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LogMiddleware.js","sourceRoot":"","sources":["../src/LogMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAChE,IAAI,cAAc,GAAG,CAAC,CAAC;AAEvB,SAAS,SAAS,CAAC,MAAe;IAC9B,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO;IACX,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC7B,gBAAgB;QAChB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACpC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACvB,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,cAAc,EAAE,CAAC;gBAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;YAC5B,CAAC;QACL,CAAC;QACD,OAAO;IACX,CAAC;IAED,aAAa;IACb,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACxB,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YACxB,SAAS,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;QACD,OAAO;IACX,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAgB;IACvC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,IAAI,GAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QACvC,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC9B,CAAC;QAED,IAAI,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAClC,CAAC;QACD,MAAM,CAAC,KAAK,CACR,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,oBAAoB,EACpB,IAAI,CACP,CAAC;IACN,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACvB,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO;QACX,CAAC;QACD,IAAI,CAAC;YACD,MAAM,IAAI,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjG,SAAS,CAAC,IAAI,CAAC,CAAC;gBAEhB,MAAM,CAAC,KAAK,CACR,GAAG,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EACjC,mBAAmB,EACnB,IAAI,CACP,CAAC;YACN,CAAC;QACL,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACP,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC3B,MAAM,CAAC,KAAK,CACR,GAAG,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EACjC,gCAAgC,EAChC,IAAI,CACP,CAAC;YACN,CAAC;iBACI,CAAC;gBACF,YAAY;gBACZ,MAAM,CAAC,KAAK,CACR,GAAG,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,EACjC,2BAA2B,GAAG,OAAO,IAAI,EACzC,IAAI,CACP,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,eAAe,CAAC,OAAgB;IACrC,OAAO;QACH,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC1F,GAAG;QACH,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC;QACtD,IAAI;QACJ,IAAI,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;QACzD,GAAG;QACH,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QACxD,GAAG;KACN,CAAC;AACN,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,GAAG,OAAiB;IAChE,IAAK,OAAe,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO;YACH,IAAI,UAAU,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;SAC9E,CAAC;IACN,CAAC;IACD,OAAO;QACH,IAAI,UAAU,CAAC,KAAO,OAAe,CAAC,YAAuB,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;KACxI,CAAC;AACN,CAAC;AAED,SAAS,WAAW,CAAC,OAAgB;IACjC,IAAK,OAAe,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,CAAC,mBAAmB;IAC/B,CAAC;IACA,OAAe,CAAC,YAAY,GAAG,EAAE,cAAc,CAAC;IAChD,OAAe,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAA2C;IACjE,aAAa,CAAC,OAAgB;QAC1B,WAAW,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,CAAI,GAAqB,EAAE,OAAgB;QAC9C,WAAW,CAAC,OAAO,CAAC,CAAC;QAErB,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,SAAS,CAAC,WAAW,KAAK,aAAa,EAAE,CAAC;YAC1E,MAAM,CAAC,GAAG,CACN,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,GAAG,eAAe,CAAC,OAAO,CAAC,CAC9B,CAAC;QACN,CAAC;QAED,OAAO,MAAM,CAAC,UAAU,CAAC;YACrB,QAAQ,EAAE,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC;YAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC;SACtC,EAAE,GAAG,CAAC,CAAC;IACZ,CAAC;IAED,cAAc,CAAC,OAAgB,EAAE,QAAkB,EAAE,KAAa;QAC9D,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QACjC,MAAM,SAAS,GAAI,OAAe,CAAC,UAAU,IAAI,OAAO,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;QAExG,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE7D,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,CACN,GAAG,MAAM,EACT,IAAI,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,EAC5E,iBAAiB,GAAG,QAAQ,GAAG,IAAI,CACtC,CAAC;QACN,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBAClH,MAAM,CAAC,KAAK,CACR,GAAG,MAAM,EACT,iCAAiC,CACpC,CAAC;oBACF,MAAM,CAAC,KAAK,CACR,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CACrD,CAAC;oBAEF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC;wBACxC,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBAC/B,CAAC;gBACL,CAAC;YACL,CAAC;iBACI,CAAC;gBACF,MAAM,CAAC,KAAK,CACR,GAAG,MAAM,EACT,8BAA8B,CACjC,CAAC;gBAEF,MAAM,CAAC,KAAK,CACR,GAAG,MAAM,EACT,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CACrD,CAAC;gBAEF,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC;IACL,CAAC;CACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
1
|
+
import type { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
2
2
|
export declare class VersionMiddleware implements RequestMiddleware, ResponseMiddleware {
|
|
3
3
|
minimumVersion: number | undefined;
|
|
4
4
|
latestVersions: {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VersionMiddleware.d.ts","sourceRoot":"","sources":["../src/VersionMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAM7G,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;CA0BtD"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const simple_errors_1 = require("@simonbackx/simple-errors");
|
|
6
|
-
const structures_1 = require("@stamhoofd/structures");
|
|
7
|
-
const os_1 = tslib_1.__importDefault(require("os"));
|
|
1
|
+
import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
|
|
2
|
+
import { Version } from '@stamhoofd/structures';
|
|
3
|
+
import os from 'os';
|
|
8
4
|
let savedHost = '';
|
|
9
|
-
class VersionMiddleware {
|
|
5
|
+
export class VersionMiddleware {
|
|
10
6
|
minimumVersion;
|
|
11
7
|
latestVersions;
|
|
12
8
|
constructor(options) {
|
|
@@ -23,7 +19,7 @@ class VersionMiddleware {
|
|
|
23
19
|
version = request.getVersion();
|
|
24
20
|
}
|
|
25
21
|
catch (e) {
|
|
26
|
-
if ((
|
|
22
|
+
if ((isSimpleError(e) || isSimpleErrors(e)) && e.hasCode('missing_version')) {
|
|
27
23
|
// Allow missing version on /openid/ path
|
|
28
24
|
if (STAMHOOFD.environment === 'development' || STAMHOOFD.environment === 'test' || request.url.startsWith('/openid/')) {
|
|
29
25
|
request.version = this.latestVersions.web;
|
|
@@ -43,19 +39,19 @@ class VersionMiddleware {
|
|
|
43
39
|
if (version < this.minimumVersion) {
|
|
44
40
|
// WARNING: update caddy config for on demand certificates, because we don't want to throw errors over there!
|
|
45
41
|
if (platform === 'web' || platform === undefined) {
|
|
46
|
-
throw new
|
|
42
|
+
throw new SimpleError({
|
|
47
43
|
code: 'client_update_required',
|
|
48
44
|
statusCode: 400,
|
|
49
45
|
message: 'Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.',
|
|
50
|
-
human: $t(`
|
|
46
|
+
human: $t(`%G8`),
|
|
51
47
|
});
|
|
52
48
|
}
|
|
53
49
|
else {
|
|
54
|
-
throw new
|
|
50
|
+
throw new SimpleError({
|
|
55
51
|
code: 'client_update_required',
|
|
56
52
|
statusCode: 400,
|
|
57
53
|
message: 'Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!',
|
|
58
|
-
human: $t(`
|
|
54
|
+
human: $t(`%G9`),
|
|
59
55
|
});
|
|
60
56
|
}
|
|
61
57
|
}
|
|
@@ -72,17 +68,16 @@ class VersionMiddleware {
|
|
|
72
68
|
response.headers['X-Platform-Latest-Version'] = this.latestVersions.web;
|
|
73
69
|
}
|
|
74
70
|
try {
|
|
75
|
-
response.headers['X-Version'] = Math.min(
|
|
71
|
+
response.headers['X-Version'] = Math.min(Version, request.getVersion());
|
|
76
72
|
}
|
|
77
73
|
catch (e) {
|
|
78
74
|
// No version provided or invalid version
|
|
79
75
|
}
|
|
80
|
-
const host = savedHost ||
|
|
76
|
+
const host = savedHost || os.hostname();
|
|
81
77
|
savedHost = host;
|
|
82
78
|
if (host && !host.includes('.')) {
|
|
83
79
|
response.headers['X-Server'] = host;
|
|
84
80
|
}
|
|
85
81
|
}
|
|
86
82
|
}
|
|
87
|
-
exports.VersionMiddleware = VersionMiddleware;
|
|
88
83
|
//# sourceMappingURL=VersionMiddleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VersionMiddleware.js","sourceRoot":"","sources":["../src/VersionMiddleware.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
1
|
+
export * from './LogMiddleware.js';
|
|
2
|
+
export * from './CORSMiddleware.js';
|
|
3
|
+
export * from './VersionMiddleware.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
tslib_1.__exportStar(require("./src/LogMiddleware"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./src/CORSMiddleware"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./src/VersionMiddleware"), exports);
|
|
1
|
+
export * from './LogMiddleware.js';
|
|
2
|
+
export * from './CORSMiddleware.js';
|
|
3
|
+
export * from './VersionMiddleware.js';
|
|
7
4
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stamhoofd/backend-middleware",
|
|
3
|
-
"version": "2.
|
|
4
|
-
"
|
|
3
|
+
"version": "2.120.0",
|
|
4
|
+
"type": "module",
|
|
5
5
|
"types": "./dist/index.d.ts",
|
|
6
|
+
"main": "./dist/index.js",
|
|
6
7
|
"license": "UNLICENCED",
|
|
7
8
|
"sideEffects": false,
|
|
8
9
|
"files": [
|
|
@@ -10,15 +11,16 @@
|
|
|
10
11
|
"dist"
|
|
11
12
|
],
|
|
12
13
|
"scripts": {
|
|
13
|
-
"build": "tsc
|
|
14
|
+
"build": "tsc --build tsconfig.build.json",
|
|
15
|
+
"lint": "eslint"
|
|
14
16
|
},
|
|
15
17
|
"dependencies": {
|
|
16
|
-
"@simonbackx/simple-endpoints": "1.
|
|
18
|
+
"@simonbackx/simple-endpoints": "1.21.0",
|
|
17
19
|
"@simonbackx/simple-errors": "^1.5",
|
|
18
20
|
"@simonbackx/simple-logging": "^1.0.1"
|
|
19
21
|
},
|
|
20
22
|
"publishConfig": {
|
|
21
23
|
"access": "public"
|
|
22
24
|
},
|
|
23
|
-
"gitHead": "
|
|
25
|
+
"gitHead": "f38f79c15ce16b0c8c14743ff3eb61feda5a18d4"
|
|
24
26
|
}
|
package/src/CORSMiddleware.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Request, Response, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
1
|
+
import type { Request, Response, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
2
2
|
|
|
3
3
|
export const CORSMiddleware: ResponseMiddleware = {
|
|
4
4
|
handleResponse(request: Request, response: Response) {
|
package/src/LogMiddleware.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
1
|
+
import type { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
2
2
|
import { isSimpleError, isSimpleErrors } from '@simonbackx/simple-errors';
|
|
3
3
|
import { logger, StyledText } from '@simonbackx/simple-logging';
|
|
4
4
|
let requestCounter = 0;
|
|
@@ -50,8 +50,8 @@ function logRequestDetails(request: Request) {
|
|
|
50
50
|
return;
|
|
51
51
|
}
|
|
52
52
|
try {
|
|
53
|
-
const json = JSON.parse(body);
|
|
54
|
-
if (Array.isArray(json) || Object.keys(json).length) {
|
|
53
|
+
const json: unknown = JSON.parse(body);
|
|
54
|
+
if (typeof json === 'object' && json !== null && (Array.isArray(json) || Object.keys(json).length)) {
|
|
55
55
|
removePII(json);
|
|
56
56
|
|
|
57
57
|
logger.error(
|
package/src/VersionMiddleware.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
1
|
+
import type { Response, Request, RequestMiddleware, ResponseMiddleware } from '@simonbackx/simple-endpoints';
|
|
2
2
|
import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
|
|
3
3
|
import { Version } from '@stamhoofd/structures';
|
|
4
4
|
import os from 'os';
|
|
@@ -52,7 +52,7 @@ export class VersionMiddleware implements RequestMiddleware, ResponseMiddleware
|
|
|
52
52
|
code: 'client_update_required',
|
|
53
53
|
statusCode: 400,
|
|
54
54
|
message: 'Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.',
|
|
55
|
-
human: $t(`
|
|
55
|
+
human: $t(`%G8`),
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
58
|
else {
|
|
@@ -60,7 +60,7 @@ export class VersionMiddleware implements RequestMiddleware, ResponseMiddleware
|
|
|
60
60
|
code: 'client_update_required',
|
|
61
61
|
statusCode: 400,
|
|
62
62
|
message: 'Er is een noodzakelijke update beschikbaar. Update de app en probeer opnieuw!',
|
|
63
|
-
human: $t(`
|
|
63
|
+
human: $t(`%G9`),
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
}
|
package/src/index.ts
ADDED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"LogMiddleware.d.ts","sourceRoot":"","sources":["../../src/LogMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAExG,OAAO,EAAU,UAAU,EAAE,MAAM,4BAA4B,CAAC;AA8FhE,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,EAAE,CAS7F;AAUD,eAAO,MAAM,aAAa,EAAE,kBAAkB,GAAG,iBAmEhD,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"LogMiddleware.js","sourceRoot":"","sources":["../../src/LogMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"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;AAMxG,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;CA0BtD"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"VersionMiddleware.js","sourceRoot":"","sources":["../../src/VersionMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"root":["../src/corsmiddleware.ts","../src/logmiddleware.ts","../src/versionmiddleware.ts","../index.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.8.3"}
|