glasswork 1.3.0 → 1.4.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/CHANGELOG.md +16 -1
- package/dist/core/bootstrap.d.ts.map +1 -1
- package/dist/core/bootstrap.js +110 -25
- package/dist/core/bootstrap.js.map +1 -1
- package/dist/core/contract.d.ts +37 -0
- package/dist/core/contract.d.ts.map +1 -0
- package/dist/core/contract.js +19 -0
- package/dist/core/contract.js.map +1 -0
- package/dist/core/index.d.ts +1 -0
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +1 -0
- package/dist/core/index.js.map +1 -1
- package/dist/core/types.d.ts +12 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/email/email-service.d.ts +5 -2
- package/dist/email/email-service.d.ts.map +1 -1
- package/dist/email/email-service.js +8 -4
- package/dist/email/email-service.js.map +1 -1
- package/dist/email/index.d.ts +1 -1
- package/dist/email/index.d.ts.map +1 -1
- package/dist/email/index.js.map +1 -1
- package/dist/email/templated-email-service.d.ts.map +1 -1
- package/dist/email/templated-email-service.js +2 -1
- package/dist/email/templated-email-service.js.map +1 -1
- package/dist/email/types.d.ts +9 -4
- package/dist/email/types.d.ts.map +1 -1
- package/dist/email/webhooks/handler-factory.d.ts.map +1 -1
- package/dist/email/webhooks/handler-factory.js +7 -3
- package/dist/email/webhooks/handler-factory.js.map +1 -1
- package/dist/email/webhooks/notification-parser.d.ts +2 -1
- package/dist/email/webhooks/notification-parser.d.ts.map +1 -1
- package/dist/email/webhooks/notification-parser.js +1 -2
- package/dist/email/webhooks/notification-parser.js.map +1 -1
- package/dist/email/webhooks/signature-verification.d.ts.map +1 -1
- package/dist/email/webhooks/signature-verification.js +3 -3
- package/dist/email/webhooks/signature-verification.js.map +1 -1
- package/dist/email/webhooks/subscription-handler.d.ts +2 -0
- package/dist/email/webhooks/subscription-handler.d.ts.map +1 -1
- package/dist/email/webhooks/subscription-handler.js +5 -5
- package/dist/email/webhooks/subscription-handler.js.map +1 -1
- package/dist/email/webhooks/types.d.ts +2 -0
- package/dist/email/webhooks/types.d.ts.map +1 -1
- package/dist/http/error-handler.d.ts +3 -1
- package/dist/http/error-handler.d.ts.map +1 -1
- package/dist/http/error-handler.js +3 -4
- package/dist/http/error-handler.js.map +1 -1
- package/dist/http/index.d.ts +1 -0
- package/dist/http/index.d.ts.map +1 -1
- package/dist/http/index.js +1 -0
- package/dist/http/index.js.map +1 -1
- package/dist/http/route-context.d.ts.map +1 -1
- package/dist/http/route-context.js +7 -2
- package/dist/http/route-context.js.map +1 -1
- package/dist/http/route-helpers.d.ts.map +1 -1
- package/dist/http/route-helpers.js +1 -1
- package/dist/http/route-helpers.js.map +1 -1
- package/dist/http/route-openapi-context.d.ts +2 -0
- package/dist/http/route-openapi-context.d.ts.map +1 -1
- package/dist/http/route-openapi-context.js.map +1 -1
- package/dist/http/route-response.d.ts +2 -1
- package/dist/http/route-response.d.ts.map +1 -1
- package/dist/http/route-response.js +3 -4
- package/dist/http/route-response.js.map +1 -1
- package/dist/jobs/define-job.d.ts +10 -6
- package/dist/jobs/define-job.d.ts.map +1 -1
- package/dist/jobs/define-job.js +2 -0
- package/dist/jobs/define-job.js.map +1 -1
- package/dist/jobs/drivers/mock-driver.d.ts +3 -1
- package/dist/jobs/drivers/mock-driver.d.ts.map +1 -1
- package/dist/jobs/drivers/mock-driver.js +14 -30
- package/dist/jobs/drivers/mock-driver.js.map +1 -1
- package/dist/jobs/job-runner.d.ts +7 -0
- package/dist/jobs/job-runner.d.ts.map +1 -0
- package/dist/jobs/job-runner.js +38 -0
- package/dist/jobs/job-runner.js.map +1 -0
- package/dist/jobs/types.d.ts +15 -5
- package/dist/jobs/types.d.ts.map +1 -1
- package/dist/jobs/worker.d.ts.map +1 -1
- package/dist/jobs/worker.js +5 -11
- package/dist/jobs/worker.js.map +1 -1
- package/dist/list-query/client.d.ts +36 -0
- package/dist/list-query/client.d.ts.map +1 -0
- package/dist/list-query/client.js +74 -0
- package/dist/list-query/client.js.map +1 -0
- package/dist/list-query/parser.d.ts.map +1 -1
- package/dist/list-query/parser.js +8 -46
- package/dist/list-query/parser.js.map +1 -1
- package/dist/list-query/protocol.d.ts +14 -0
- package/dist/list-query/protocol.d.ts.map +1 -0
- package/dist/list-query/protocol.js +44 -0
- package/dist/list-query/protocol.js.map +1 -0
- package/dist/list-query/query-schema.d.ts.map +1 -1
- package/dist/list-query/query-schema.js +6 -5
- package/dist/list-query/query-schema.js.map +1 -1
- package/dist/list-query/types.d.ts +2 -5
- package/dist/list-query/types.d.ts.map +1 -1
- package/dist/middleware/rate-limit.d.ts.map +1 -1
- package/dist/middleware/rate-limit.js +1 -1
- package/dist/middleware/rate-limit.js.map +1 -1
- package/dist/observability/exception-tracking.d.ts +6 -1
- package/dist/observability/exception-tracking.d.ts.map +1 -1
- package/dist/observability/exception-tracking.js +29 -5
- package/dist/observability/exception-tracking.js.map +1 -1
- package/dist/observability/index.d.ts +1 -0
- package/dist/observability/index.d.ts.map +1 -1
- package/dist/observability/index.js +1 -0
- package/dist/observability/index.js.map +1 -1
- package/dist/observability/pino-logger.d.ts +3 -1
- package/dist/observability/pino-logger.d.ts.map +1 -1
- package/dist/observability/pino-logger.js +17 -11
- package/dist/observability/pino-logger.js.map +1 -1
- package/dist/observability/sanitizers.d.ts +14 -0
- package/dist/observability/sanitizers.d.ts.map +1 -0
- package/dist/observability/sanitizers.js +52 -0
- package/dist/observability/sanitizers.js.map +1 -0
- package/dist/openapi/drift.d.ts +6 -0
- package/dist/openapi/drift.d.ts.map +1 -0
- package/dist/openapi/drift.js +18 -0
- package/dist/openapi/drift.js.map +1 -0
- package/dist/openapi/openapi.d.ts +5 -0
- package/dist/openapi/openapi.d.ts.map +1 -1
- package/dist/openapi/openapi.js +5 -2
- package/dist/openapi/openapi.js.map +1 -1
- package/dist/uploads/guardduty.d.ts +20 -0
- package/dist/uploads/guardduty.d.ts.map +1 -0
- package/dist/uploads/guardduty.js +29 -0
- package/dist/uploads/guardduty.js.map +1 -0
- package/dist/uploads/index.d.ts +1 -1
- package/dist/uploads/index.d.ts.map +1 -1
- package/dist/uploads/index.js.map +1 -1
- package/dist/uploads/s3-key.d.ts +3 -0
- package/dist/uploads/s3-key.d.ts.map +1 -0
- package/dist/uploads/s3-key.js +5 -0
- package/dist/uploads/s3-key.js.map +1 -0
- package/dist/uploads/uploads.service.d.ts +27 -7
- package/dist/uploads/uploads.service.d.ts.map +1 -1
- package/dist/uploads/uploads.service.js +50 -14
- package/dist/uploads/uploads.service.js.map +1 -1
- package/package.json +11 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/list-query/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/list-query/parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/list-query/parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAGV,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACX,MAAM,YAAY,CAAC;AA8BpB;;;GAGG;AACH,wBAAgB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,UAAU,EAAE,CAKtE;AA2CD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,YAAY,EAAE,CA0B5E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,eAAe,GAAG,iBAAiB,CAcxE"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { FILTER_OPERATORS, LIST_QUERY_LIMITS, unescapeFilterValue } from './protocol.js';
|
|
1
2
|
/**
|
|
2
3
|
* Parse a field path string (e.g., 'organization.name') into a FieldPath array
|
|
3
4
|
*/
|
|
@@ -34,58 +35,19 @@ export function parseSorts(sortsString) {
|
|
|
34
35
|
}
|
|
35
36
|
return sortsString.split(',').map((s) => parseSort(s.trim()));
|
|
36
37
|
}
|
|
37
|
-
/**
|
|
38
|
-
* Sieve operator patterns (longest first to avoid partial matches)
|
|
39
|
-
* Order matters: check longer operators before shorter ones
|
|
40
|
-
*/
|
|
41
|
-
const OPERATOR_PATTERNS = [
|
|
42
|
-
'!@=|*',
|
|
43
|
-
'!_-=*',
|
|
44
|
-
'!@=|',
|
|
45
|
-
'!_-=',
|
|
46
|
-
'!_=*',
|
|
47
|
-
'!_=',
|
|
48
|
-
'!@=*',
|
|
49
|
-
'!@=',
|
|
50
|
-
'@=|*',
|
|
51
|
-
'_-=*',
|
|
52
|
-
'_-=',
|
|
53
|
-
'_=*',
|
|
54
|
-
'_=',
|
|
55
|
-
'@=|',
|
|
56
|
-
'@=*',
|
|
57
|
-
'@=',
|
|
58
|
-
'==*',
|
|
59
|
-
'!=*',
|
|
60
|
-
'>=',
|
|
61
|
-
'<=',
|
|
62
|
-
'==',
|
|
63
|
-
'!=',
|
|
64
|
-
'>',
|
|
65
|
-
'<',
|
|
66
|
-
];
|
|
67
38
|
/**
|
|
68
39
|
* Find the operator in a filter string
|
|
69
40
|
* Returns the operator and its index
|
|
70
41
|
*/
|
|
71
42
|
function findOperator(filterString) {
|
|
72
|
-
|
|
43
|
+
let match = null;
|
|
44
|
+
for (const operator of FILTER_OPERATORS) {
|
|
73
45
|
const index = filterString.indexOf(operator);
|
|
74
|
-
if (index > 0) {
|
|
75
|
-
|
|
46
|
+
if (index > 0 && (!match || index < match.index)) {
|
|
47
|
+
match = { operator, index };
|
|
76
48
|
}
|
|
77
49
|
}
|
|
78
|
-
return
|
|
79
|
-
}
|
|
80
|
-
/**
|
|
81
|
-
* Unescape a value string
|
|
82
|
-
* Handles: \, (comma), \| (pipe), \null (literal null string)
|
|
83
|
-
*/
|
|
84
|
-
function unescapeValue(value) {
|
|
85
|
-
return value
|
|
86
|
-
.replace(/\\,/g, ',')
|
|
87
|
-
.replace(/\\\|/g, '|')
|
|
88
|
-
.replace(/\\null/g, 'null');
|
|
50
|
+
return match;
|
|
89
51
|
}
|
|
90
52
|
/**
|
|
91
53
|
* Parse a filter string into a ParsedFilter
|
|
@@ -105,7 +67,7 @@ function parseFilter(filterString) {
|
|
|
105
67
|
throw new Error(`Invalid filter format: ${trimmed}. Missing field or value.`);
|
|
106
68
|
}
|
|
107
69
|
const fieldPath = parseFieldPath(fieldPathString);
|
|
108
|
-
const value =
|
|
70
|
+
const value = unescapeFilterValue(valueString);
|
|
109
71
|
return {
|
|
110
72
|
fieldPath,
|
|
111
73
|
operator,
|
|
@@ -153,7 +115,7 @@ export function parseQueryParams(raw) {
|
|
|
153
115
|
const sorts = parseSorts(raw.sorts);
|
|
154
116
|
const filters = parseFilters(raw.filters);
|
|
155
117
|
const page = raw.page && raw.page > 0 ? raw.page : 1;
|
|
156
|
-
const pageSize = raw.pageSize && raw.pageSize > 0 ? Math.min(raw.pageSize,
|
|
118
|
+
const pageSize = raw.pageSize && raw.pageSize > 0 ? Math.min(raw.pageSize, LIST_QUERY_LIMITS.pageSize) : 10;
|
|
157
119
|
const search = raw.search?.trim() || undefined;
|
|
158
120
|
return {
|
|
159
121
|
sorts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/list-query/parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/list-query/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/** Bounds shared by the HTTP schema and browser URL codec. */
|
|
2
|
+
export declare const LIST_QUERY_LIMITS: {
|
|
3
|
+
readonly page: 1000000;
|
|
4
|
+
readonly pageSize: 100;
|
|
5
|
+
readonly sorts: 100;
|
|
6
|
+
readonly filters: 1000;
|
|
7
|
+
readonly search: 255;
|
|
8
|
+
};
|
|
9
|
+
/** Longest operators first, so the parser cannot match only part of an operator. */
|
|
10
|
+
export declare const FILTER_OPERATORS: readonly ['!@=|*', '!_-=*', '!@=|', '!_-=', '!_=*', '!_=', '!@=*', '!@=', '@=|*', '_-=*', '_-=', '_=*', '_=', '@=|', '@=*', '@=', '==*', '!=*', '>=', '<=', '==', '!=', '>', '<'];
|
|
11
|
+
export type FilterOperator = (typeof FILTER_OPERATORS)[number];
|
|
12
|
+
export declare function escapeFilterValue(value: string | number | boolean): string;
|
|
13
|
+
export declare function unescapeFilterValue(value: string): string;
|
|
14
|
+
//# sourceMappingURL=protocol.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/list-query/protocol.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,eAAO,MAAM,iBAAiB;aAC5B,IAAI,EAAE,OAAS;aACf,QAAQ,EAAE,GAAG;aACb,KAAK,EAAE,GAAG;aACV,OAAO,EAAE,IAAK;aACd,MAAM,EAAE,GAAG;CACH,CAAC;AAEX,oFAAoF;AACpF,eAAO,MAAM,gBAAgB,YAC3B,OAAO,EACP,OAAO,EACP,MAAM,EACN,MAAM,EACN,MAAM,EACN,KAAK,EACL,MAAM,EACN,KAAK,EACL,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,KAAK,EACL,KAAK,EACL,IAAI,EACJ,KAAK,EACL,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,GAAG,CACK,CAAC;AACX,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAE1E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGzD"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/** Bounds shared by the HTTP schema and browser URL codec. */
|
|
2
|
+
export const LIST_QUERY_LIMITS = {
|
|
3
|
+
page: 1_000_000,
|
|
4
|
+
pageSize: 100,
|
|
5
|
+
sorts: 100,
|
|
6
|
+
filters: 1_000,
|
|
7
|
+
search: 255,
|
|
8
|
+
};
|
|
9
|
+
/** Longest operators first, so the parser cannot match only part of an operator. */
|
|
10
|
+
export const FILTER_OPERATORS = [
|
|
11
|
+
'!@=|*',
|
|
12
|
+
'!_-=*',
|
|
13
|
+
'!@=|',
|
|
14
|
+
'!_-=',
|
|
15
|
+
'!_=*',
|
|
16
|
+
'!_=',
|
|
17
|
+
'!@=*',
|
|
18
|
+
'!@=',
|
|
19
|
+
'@=|*',
|
|
20
|
+
'_-=*',
|
|
21
|
+
'_-=',
|
|
22
|
+
'_=*',
|
|
23
|
+
'_=',
|
|
24
|
+
'@=|',
|
|
25
|
+
'@=*',
|
|
26
|
+
'@=',
|
|
27
|
+
'==*',
|
|
28
|
+
'!=*',
|
|
29
|
+
'>=',
|
|
30
|
+
'<=',
|
|
31
|
+
'==',
|
|
32
|
+
'!=',
|
|
33
|
+
'>',
|
|
34
|
+
'<',
|
|
35
|
+
];
|
|
36
|
+
export function escapeFilterValue(value) {
|
|
37
|
+
return String(value).replace(/[\\,|]/g, '\\$&');
|
|
38
|
+
}
|
|
39
|
+
export function unescapeFilterValue(value) {
|
|
40
|
+
if (value === '\\null')
|
|
41
|
+
return 'null';
|
|
42
|
+
return value.replace(/\\([\\,|])/g, '$1');
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=protocol.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/list-query/protocol.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAC9D,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,GAAG;IACb,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,GAAG;CACH,CAAC;AAEX,oFAAoF;AACpF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,IAAI;IACJ,KAAK;IACL,KAAK;IACL,IAAI;IACJ,KAAK;IACL,KAAK;IACL,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,GAAG;IACH,GAAG;CACK,CAAC;AAGX,MAAM,UAAU,iBAAiB,CAAC,KAAgC;IAChE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,IAAI,KAAK,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC;IACtC,OAAO,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-schema.d.ts","sourceRoot":"","sources":["../../src/list-query/query-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,WAAW,EAUjB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"query-schema.d.ts","sourceRoot":"","sources":["../../src/list-query/query-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,WAAW,EAUjB,MAAM,SAAS,CAAC;AAmBjB,eAAO,MAAM,eAAe;;;;;;aAM1B,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,OAAO,eAAe,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { check, exactOptional, integer, maxLength, maxValue, minValue, pipe, regex, strictObject, string, transform, } from 'valibot';
|
|
2
|
+
import { LIST_QUERY_LIMITS } from './protocol.js';
|
|
2
3
|
/**
|
|
3
4
|
* Strict, bounded HTTP contract for list-query parameters.
|
|
4
5
|
* Field, operator, and value validation happens against the configured
|
|
@@ -6,10 +7,10 @@ import { check, exactOptional, integer, maxLength, maxValue, minValue, pipe, reg
|
|
|
6
7
|
*/
|
|
7
8
|
const positiveIntegerQuery = (maximum) => pipe(string(), regex(/^[1-9]\d*$/), check((value) => value.length <= 10, 'Expected at most 10 digits'), transform(Number), integer(), minValue(1), maxValue(maximum));
|
|
8
9
|
export const ListQuerySchema = strictObject({
|
|
9
|
-
sorts: exactOptional(pipe(string(), maxLength(
|
|
10
|
-
filters: exactOptional(pipe(string(), maxLength(
|
|
11
|
-
page: exactOptional(positiveIntegerQuery(
|
|
12
|
-
pageSize: exactOptional(positiveIntegerQuery(
|
|
13
|
-
search: exactOptional(pipe(string(), maxLength(
|
|
10
|
+
sorts: exactOptional(pipe(string(), maxLength(LIST_QUERY_LIMITS.sorts))),
|
|
11
|
+
filters: exactOptional(pipe(string(), maxLength(LIST_QUERY_LIMITS.filters))),
|
|
12
|
+
page: exactOptional(positiveIntegerQuery(LIST_QUERY_LIMITS.page)),
|
|
13
|
+
pageSize: exactOptional(positiveIntegerQuery(LIST_QUERY_LIMITS.pageSize)),
|
|
14
|
+
search: exactOptional(pipe(string(), maxLength(LIST_QUERY_LIMITS.search))),
|
|
14
15
|
});
|
|
15
16
|
//# sourceMappingURL=query-schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-schema.js","sourceRoot":"","sources":["../../src/list-query/query-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,aAAa,EAEb,OAAO,EACP,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,MAAM,EACN,SAAS,GACV,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"query-schema.js","sourceRoot":"","sources":["../../src/list-query/query-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,aAAa,EAEb,OAAO,EACP,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,MAAM,EACN,SAAS,GACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD;;;;GAIG;AACH,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,EAAE,CAC/C,IAAI,CACF,MAAM,EAAE,EACR,KAAK,CAAC,YAAY,CAAC,EACnB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,EAAE,4BAA4B,CAAC,EAClE,SAAS,CAAC,MAAM,CAAC,EACjB,OAAO,EAAE,EACT,QAAQ,CAAC,CAAC,CAAC,EACX,QAAQ,CAAC,OAAO,CAAC,CAClB,CAAC;AAEJ,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAC;IAC1C,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5E,IAAI,EAAE,aAAa,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACjE,QAAQ,EAAE,aAAa,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACzE,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;CAC3E,CAAC,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import type { FilterOperator } from './protocol.js';
|
|
1
2
|
import type { ListQueryParams } from './query-schema.js';
|
|
3
|
+
export type { FilterOperator } from './protocol.js';
|
|
2
4
|
/**
|
|
3
5
|
* Field path as an array of strings for nested fields
|
|
4
6
|
* Example: ['organization', 'name'] represents 'organization.name'
|
|
@@ -10,11 +12,6 @@ export type FieldPath = readonly string[];
|
|
|
10
12
|
* Example: 'name' or ['organization', 'name']
|
|
11
13
|
*/
|
|
12
14
|
export type SearchFieldInput = string | readonly string[];
|
|
13
|
-
/**
|
|
14
|
-
* Sieve filter operators
|
|
15
|
-
* Based on https://github.com/Biarity/Sieve
|
|
16
|
-
*/
|
|
17
|
-
export type FilterOperator = '==' | '!=' | '>' | '<' | '>=' | '<=' | '@=' | '_=' | '_-=' | '!@=' | '!_=' | '!_-=' | '@=|' | '!@=|' | '==*' | '!=*' | '@=*' | '_=*' | '_-=*' | '!@=*' | '!_=*' | '!_-=*' | '@=|*' | '!@=|*';
|
|
18
15
|
/**
|
|
19
16
|
* Sort direction
|
|
20
17
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/list-query/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/list-query/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,SAAS,MAAM,EAAE,CAAC;AAE1C;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;CACnC;AAED,+EAA+E;AAC/E,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB,CAC/B,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAElC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS,QAAQ,EAAE,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,CAAC;AAExC;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../src/middleware/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../src/middleware/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiFzD;;;GAGG;AACH,wBAAgB,4BAA4B,IAAI,IAAI,CAKnD;AAuFD;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,gBAAgB,GAAG,iBAAiB,CAuEtF"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { getClientIp } from '../utils/get-client-ip.js';
|
|
2
2
|
import { createLogger } from '../utils/logger.js';
|
|
3
|
-
const logger = createLogger('Glasswork:RateLimit');
|
|
4
3
|
/** Default cleanup interval for memory store (1 minute) */
|
|
5
4
|
const DEFAULT_CLEANUP_INTERVAL_MS = 60_000;
|
|
6
5
|
const memoryStores = new Set();
|
|
@@ -146,6 +145,7 @@ function isConditionalCheckFailed(error) {
|
|
|
146
145
|
* Create rate limiting middleware
|
|
147
146
|
*/
|
|
148
147
|
export function createRateLimitMiddleware(options) {
|
|
148
|
+
const logger = options.logger ?? createLogger('Glasswork:RateLimit');
|
|
149
149
|
const { storage, windowMs = 60000, maxRequests = 100, dynamodb, keyGenerator } = options;
|
|
150
150
|
if (!Number.isFinite(windowMs) || windowMs <= 0) {
|
|
151
151
|
throw new Error('Rate limit windowMs must be greater than zero');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../src/middleware/rate-limit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,
|
|
1
|
+
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../src/middleware/rate-limit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,2DAA2D;AAC3D,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAE3C,MAAM,YAAY,GAAG,IAAI,GAAG,EAAe,CAAC;AAC5C,IAAI,sBAAsB,GAAG,KAAK,CAAC;AAYnC;;;;;GAKG;AACH,MAAM,WAAW;IACP,KAAK,GAAG,IAAI,GAAG,EAAgD,CAAC;IAChE,YAAY,GAA0C,IAAI,CAAC;IAEnE,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,SAAiB,EAAE,WAAmB;QAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YAC7C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;QAChD,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1E,CAAC;QAED,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;IACzE,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,UAAU,GAAG,2BAA2B;QACnD,iDAAiD;QACjD,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;YACnC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC/C,IAAI,IAAI,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;oBACzB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC,EAAE,UAAU,CAAC,CAAC;QAEf,2EAA2E;QAC3E,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,CAAC;QAE5B,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,WAAW;QACT,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,UAAU,4BAA4B;IAC1C,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,KAAK,CAAC,WAAW,EAAE,CAAC;IACtB,CAAC;IACD,YAAY,CAAC,KAAK,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,oBAAoB;IAC3B,IAAI,sBAAsB;QAAE,OAAO;IACnC,sBAAsB,GAAG,IAAI,CAAC;IAC9B,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,OAAO,CAAC,EAAE,KAAK,UAAU,EAAE,CAAC;QACvE,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACxB,4BAA4B,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,aAAa;IACT,aAAa,CAAmB;IAChC,SAAS,CAAS;IAE1B,YAAY,SAAiB,EAAE,MAAe;QAC5C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,wEAAwE;QACxE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,MAAe;QACtC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QACpE,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;QAEzE,MAAM,YAAY,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAClE,OAAO,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,SAAS;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,SAAiB,EAAE,WAAmB;QAC/D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAEtC,IAAI,CAAC;YACH,4CAA4C;YAC5C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAC9B,IAAI,aAAa,CAAC;gBAChB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE;gBACtB,gBAAgB,EAAE,sEAAsE;gBACxF,mBAAmB,EAAE,uDAAuD;gBAC5E,wBAAwB,EAAE;oBACxB,QAAQ,EAAE,OAAO;oBACjB,YAAY,EAAE,WAAW;oBACzB,YAAY,EAAE,WAAW;iBAC1B;gBACD,yBAAyB,EAAE;oBACzB,MAAM,EAAE,CAAC;oBACT,cAAc,EAAE,WAAW;oBAC3B,YAAY,EAAE,SAAS;oBACvB,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;iBAC1C;gBACD,YAAY,EAAE,SAAS;aACxB,CAAC,CACH,CAAC;YAEF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC;YACpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;YAC3D,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAED,SAAS,wBAAwB,CAAC,KAAc;IAC9C,OAAO,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,iCAAiC,CAAC;AACpF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAyB;IACjE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,YAAY,CAAC,qBAAqB,CAAC,CAAC;IACrE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAEzF,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,KAAqB,CAAC;IAC1B,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E,CAAC;QACD,KAAK,GAAG,IAAI,aAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;IAC5B,CAAC;IAED,iCAAiC;IACjC,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;QACjC,KAAK,CAAC,YAAY,EAAE,CAAC;QACrB,oBAAoB,EAAE,CAAC;IACzB,CAAC;IAED,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,kBAAkB,GAAG,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;QACpF,IAAI,kBAAkB,KAAK,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,CAAC,YAAY,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC;QAEhD,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAE,OAAe,EAAQ,EAAE;YAC9D,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;YACvD,OAAO,CAAC,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACtE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC;QAEF,4CAA4C;QAC5C,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI,SAAS,GAAG,WAAW,CAAC;QAC5B,IAAI,OAAO,GAAG,SAAS,GAAG,GAAG,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACnF,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;YAEjF,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,QAAQ,IAAI,YAAY,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;YAC1F,WAAW,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;YAC9B,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACpD,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;YAC3C,iDAAiD;YACjD,SAAS,GAAG,WAAW,CAAC;YACxB,OAAO,GAAG,QAAQ,CAAC;QACrB,CAAC;QAED,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACjE,OAAO,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,EAAE,GAAG,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { MiddlewareHandler } from 'hono';
|
|
2
|
+
import type { Logger } from '../utils/logger.js';
|
|
2
3
|
/**
|
|
3
4
|
* Generic exception tracker interface for integrating with external error tracking services.
|
|
4
5
|
*
|
|
@@ -124,6 +125,8 @@ export declare function createExceptionTrackingMiddleware(config: ExceptionTrack
|
|
|
124
125
|
* Options for CloudWatch exception tracker
|
|
125
126
|
*/
|
|
126
127
|
export interface CloudWatchTrackerOptions {
|
|
128
|
+
/** Central logger; when configured, replaces direct console calls. */
|
|
129
|
+
logger?: Logger;
|
|
127
130
|
/**
|
|
128
131
|
* CloudWatch metric namespace.
|
|
129
132
|
* @default 'Application/Errors'
|
|
@@ -211,5 +214,7 @@ export declare function createCloudWatchTracker(options?: CloudWatchTrackerOptio
|
|
|
211
214
|
* });
|
|
212
215
|
* ```
|
|
213
216
|
*/
|
|
214
|
-
export declare function createConsoleTracker(
|
|
217
|
+
export declare function createConsoleTracker(options?: {
|
|
218
|
+
logger?: Logger;
|
|
219
|
+
}): ExceptionTracker;
|
|
215
220
|
//# sourceMappingURL=exception-tracking.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exception-tracking.d.ts","sourceRoot":"","sources":["../../src/observability/exception-tracking.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"exception-tracking.d.ts","sourceRoot":"","sources":["../../src/observability/exception-tracking.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAKjD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAExE;;;;;OAKG;IACH,cAAc,CACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,EACnC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,IAAI,CAAC;IAER;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IAE5E;;;;OAIG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC9D;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,OAAO,EAAE,gBAAgB,CAAC;IAE1B;;;;;;;;;;;;;;;;;;OAkBG;IACH,gBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;CACnD;AAED;;;GAGG;AACH,eAAO,MAAM,uBAAuB,eAAgB,MAAM,KAAG,OAA4B,CAAC;AAE1F;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,OAAO,GAAG,SAAS,EAClC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAQT;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,uBAAuB,GAC9B,iBAAiB,CAenB;AAMD;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,sEAAsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEpC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;IAExC;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,GAAE,wBAA6B,GAAG,gBAAgB,CAqIhG;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,gBAAgB,CA6CxF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { isTest } from '../utils/environment.js';
|
|
2
2
|
import { getRequestContext, setRequestUser } from './request-context.js';
|
|
3
|
+
const loggerLevels = { info: 'info', warning: 'warn', error: 'error' };
|
|
3
4
|
/**
|
|
4
5
|
* Default exception tracking configuration.
|
|
5
6
|
* Only tracks 5xx server errors by default.
|
|
@@ -92,7 +93,7 @@ export function createExceptionTrackingMiddleware(config) {
|
|
|
92
93
|
* ```
|
|
93
94
|
*/
|
|
94
95
|
export function createCloudWatchTracker(options = {}) {
|
|
95
|
-
const { namespace = 'Application/Errors', dimensions = {}, cloudWatchClient, logToConsole = !isTest(), } = options;
|
|
96
|
+
const { namespace = 'Application/Errors', dimensions = {}, cloudWatchClient, logToConsole = !isTest(), logger, } = options;
|
|
96
97
|
// Lazy-load AWS SDK to avoid bundling if not used
|
|
97
98
|
let cwClient = cloudWatchClient ?? null;
|
|
98
99
|
async function getClient() {
|
|
@@ -135,7 +136,10 @@ export function createCloudWatchTracker(options = {}) {
|
|
|
135
136
|
}
|
|
136
137
|
catch (err) {
|
|
137
138
|
// Don't throw - exception tracking should never break the app
|
|
138
|
-
if (
|
|
139
|
+
if (logger) {
|
|
140
|
+
logger.error('CloudWatch metric failed', err);
|
|
141
|
+
}
|
|
142
|
+
else if (logToConsole) {
|
|
139
143
|
console.error('[CloudWatchTracker] Failed to put metric:', err);
|
|
140
144
|
}
|
|
141
145
|
}
|
|
@@ -144,7 +148,10 @@ export function createCloudWatchTracker(options = {}) {
|
|
|
144
148
|
return {
|
|
145
149
|
captureException(error, context) {
|
|
146
150
|
const ctx = getRequestContext();
|
|
147
|
-
if (
|
|
151
|
+
if (logger) {
|
|
152
|
+
logger.error('Exception', error, { requestId: ctx?.requestId, ...context });
|
|
153
|
+
}
|
|
154
|
+
else if (logToConsole) {
|
|
148
155
|
console.error('[Exception]', {
|
|
149
156
|
error: error.message,
|
|
150
157
|
stack: error.stack,
|
|
@@ -162,7 +169,13 @@ export function createCloudWatchTracker(options = {}) {
|
|
|
162
169
|
},
|
|
163
170
|
captureMessage(message, level, context) {
|
|
164
171
|
const ctx = getRequestContext();
|
|
165
|
-
if (
|
|
172
|
+
if (logger) {
|
|
173
|
+
logger[loggerLevels[level]](message, {
|
|
174
|
+
requestId: ctx?.requestId,
|
|
175
|
+
...context,
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
else if (logToConsole) {
|
|
166
179
|
const logFn = level === 'error' ? console.error : level === 'warning' ? console.warn : console.log;
|
|
167
180
|
logFn(`[${level.toUpperCase()}]`, message, {
|
|
168
181
|
requestId: ctx?.requestId,
|
|
@@ -209,10 +222,14 @@ export function createCloudWatchTracker(options = {}) {
|
|
|
209
222
|
* });
|
|
210
223
|
* ```
|
|
211
224
|
*/
|
|
212
|
-
export function createConsoleTracker() {
|
|
225
|
+
export function createConsoleTracker(options = {}) {
|
|
213
226
|
return {
|
|
214
227
|
captureException(error, context) {
|
|
215
228
|
const ctx = getRequestContext();
|
|
229
|
+
if (options.logger) {
|
|
230
|
+
options.logger.error('Exception', error, { requestId: ctx?.requestId, ...context });
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
216
233
|
console.error('[Exception]', {
|
|
217
234
|
error: error.message,
|
|
218
235
|
stack: error.stack,
|
|
@@ -222,6 +239,13 @@ export function createConsoleTracker() {
|
|
|
222
239
|
},
|
|
223
240
|
captureMessage(message, level, context) {
|
|
224
241
|
const ctx = getRequestContext();
|
|
242
|
+
if (options.logger) {
|
|
243
|
+
options.logger[level === 'warning' ? 'warn' : level](message, {
|
|
244
|
+
requestId: ctx?.requestId,
|
|
245
|
+
...context,
|
|
246
|
+
});
|
|
247
|
+
return;
|
|
248
|
+
}
|
|
225
249
|
const logFn = level === 'error' ? console.error : level === 'warning' ? console.warn : console.log;
|
|
226
250
|
logFn(`[${level.toUpperCase()}]`, message, {
|
|
227
251
|
requestId: ctx?.requestId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exception-tracking.js","sourceRoot":"","sources":["../../src/observability/exception-tracking.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"exception-tracking.js","sourceRoot":"","sources":["../../src/observability/exception-tracking.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,4 +5,5 @@
|
|
|
5
5
|
export { type CloudWatchClientLike, type CloudWatchTrackerOptions, createCloudWatchTracker, createConsoleTracker, createExceptionTrackingMiddleware, defaultTrackStatusCodes, type ExceptionTracker, type ExceptionTrackingConfig, shouldTrackException, } from './exception-tracking.js';
|
|
6
6
|
export { type ContextAwarePinoOptions, createContextAwarePinoLogger, createPinoHttpMiddleware, lambdaPinoConfig, type PinoLogger, } from './pino-logger.js';
|
|
7
7
|
export { getRequestActor, getRequestContext, getRequestId, type RequestAuthContext, type RequestContext, setRequestAuth, setRequestContextValue, setRequestUser, } from './request-context.js';
|
|
8
|
+
export { createSanitizedExceptionTracker, createSanitizedLogger, type ObservabilitySanitizers, sanitizeLogMetadata, } from './sanitizers.js';
|
|
8
9
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,uBAAuB,EACvB,oBAAoB,EACpB,iCAAiC,EACjC,uBAAuB,EACvB,KAAK,gBAAgB,EACrB,KAAK,uBAAuB,EAC5B,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,KAAK,uBAAuB,EAC5B,4BAA4B,EAC5B,wBAAwB,EACxB,gBAAgB,EAChB,KAAK,UAAU,GAChB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,uBAAuB,EACvB,oBAAoB,EACpB,iCAAiC,EACjC,uBAAuB,EACvB,KAAK,gBAAgB,EACrB,KAAK,uBAAuB,EAC5B,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,KAAK,uBAAuB,EAC5B,4BAA4B,EAC5B,wBAAwB,EACxB,gBAAgB,EAChB,KAAK,UAAU,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,cAAc,EACd,sBAAsB,EACtB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,+BAA+B,EAC/B,qBAAqB,EACrB,KAAK,uBAAuB,EAC5B,mBAAmB,GACpB,MAAM,iBAAiB,CAAC"}
|
|
@@ -5,4 +5,5 @@
|
|
|
5
5
|
export { createCloudWatchTracker, createConsoleTracker, createExceptionTrackingMiddleware, defaultTrackStatusCodes, shouldTrackException, } from './exception-tracking.js';
|
|
6
6
|
export { createContextAwarePinoLogger, createPinoHttpMiddleware, lambdaPinoConfig, } from './pino-logger.js';
|
|
7
7
|
export { getRequestActor, getRequestContext, getRequestId, setRequestAuth, setRequestContextValue, setRequestUser, } from './request-context.js';
|
|
8
|
+
export { createSanitizedExceptionTracker, createSanitizedLogger, sanitizeLogMetadata, } from './sanitizers.js';
|
|
8
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAGL,uBAAuB,EACvB,oBAAoB,EACpB,iCAAiC,EACjC,uBAAuB,EAGvB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAEL,4BAA4B,EAC5B,wBAAwB,EACxB,gBAAgB,GAEjB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAGL,uBAAuB,EACvB,oBAAoB,EACpB,iCAAiC,EACjC,uBAAuB,EAGvB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAEL,4BAA4B,EAC5B,wBAAwB,EACxB,gBAAgB,GAEjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,YAAY,EAGZ,cAAc,EACd,sBAAsB,EACtB,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,+BAA+B,EAC/B,qBAAqB,EAErB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { MiddlewareHandler } from 'hono';
|
|
2
2
|
import type { Logger } from '../utils/logger.js';
|
|
3
|
+
import { type ObservabilitySanitizers } from './sanitizers.js';
|
|
3
4
|
/**
|
|
4
5
|
* Pino logger interface - subset of pino.Logger for type compatibility.
|
|
5
6
|
* This allows the framework to work with Pino without a hard dependency.
|
|
@@ -17,6 +18,7 @@ export interface PinoLogger {
|
|
|
17
18
|
* Options for creating a context-aware Pino logger.
|
|
18
19
|
*/
|
|
19
20
|
export interface ContextAwarePinoOptions {
|
|
21
|
+
sanitizers?: ObservabilitySanitizers;
|
|
20
22
|
/**
|
|
21
23
|
* Base Pino logger instance.
|
|
22
24
|
* Create with: `pino({ level: 'info' })`
|
|
@@ -50,7 +52,7 @@ export declare function createContextAwarePinoLogger(options: ContextAwarePinoOp
|
|
|
50
52
|
* app.use(createPinoHttpMiddleware(logger));
|
|
51
53
|
* ```
|
|
52
54
|
*/
|
|
53
|
-
export declare function createPinoHttpMiddleware(pino: PinoLogger): MiddlewareHandler;
|
|
55
|
+
export declare function createPinoHttpMiddleware(pino: PinoLogger, sanitizers?: ObservabilitySanitizers): MiddlewareHandler;
|
|
54
56
|
/**
|
|
55
57
|
* Default Pino configuration optimized for AWS Lambda.
|
|
56
58
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pino-logger.d.ts","sourceRoot":"","sources":["../../src/observability/pino-logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"pino-logger.d.ts","sourceRoot":"","sources":["../../src/observability/pino-logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,KAAK,uBAAuB,EAAuB,MAAM,iBAAiB,CAAC;AAEpF;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,UAAU,CAAC;IACzD,KAAK,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC;;;OAGG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA+CD,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,uBAAuB,GAAG,MAAM,CAiDrF;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,UAAU,EAChB,UAAU,CAAC,EAAE,uBAAuB,GACnC,iBAAiB,CA8BnB;AAED;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,gBAAgB;IAC3B,KAAK;IAEL,UAAU;QACR,KAAK,UAAU,MAAM;YAAQ,KAAK;;;IAGpC,SAAS;IAET,IAAI;CACL,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getRequestContext } from './request-context.js';
|
|
2
|
+
import { sanitizeLogMetadata } from './sanitizers.js';
|
|
2
3
|
/**
|
|
3
4
|
* Create a context-aware logger that automatically includes request context.
|
|
4
5
|
*
|
|
@@ -61,29 +62,34 @@ export function createContextAwarePinoLogger(options) {
|
|
|
61
62
|
let obj = { ...bindings };
|
|
62
63
|
// Handle meta arguments
|
|
63
64
|
for (const item of meta) {
|
|
64
|
-
if (item
|
|
65
|
+
if (item instanceof Error) {
|
|
66
|
+
const error = options.sanitizers?.error?.(item) ?? item;
|
|
67
|
+
obj.err = { name: error.name, message: error.message, stack: error.stack };
|
|
68
|
+
}
|
|
69
|
+
else if (item && typeof item === 'object' && !Array.isArray(item)) {
|
|
65
70
|
obj = { ...obj, ...item };
|
|
66
71
|
}
|
|
67
72
|
}
|
|
68
|
-
return obj;
|
|
73
|
+
return sanitizeLogMetadata(obj, options.sanitizers);
|
|
69
74
|
}
|
|
70
75
|
return {
|
|
71
76
|
debug(msg, ...meta) {
|
|
72
|
-
pino.debug(createLogObject(msg, meta), msg);
|
|
77
|
+
pino.debug(createLogObject(msg, meta), options.sanitizers?.message?.(msg) ?? msg);
|
|
73
78
|
},
|
|
74
79
|
info(msg, ...meta) {
|
|
75
|
-
pino.info(createLogObject(msg, meta), msg);
|
|
80
|
+
pino.info(createLogObject(msg, meta), options.sanitizers?.message?.(msg) ?? msg);
|
|
76
81
|
},
|
|
77
82
|
warn(msg, ...meta) {
|
|
78
|
-
pino.warn(createLogObject(msg, meta), msg);
|
|
83
|
+
pino.warn(createLogObject(msg, meta), options.sanitizers?.message?.(msg) ?? msg);
|
|
79
84
|
},
|
|
80
85
|
error(msg, ...meta) {
|
|
81
|
-
pino.error(createLogObject(msg, meta), msg);
|
|
86
|
+
pino.error(createLogObject(msg, meta), options.sanitizers?.message?.(msg) ?? msg);
|
|
82
87
|
},
|
|
83
88
|
child(bindings) {
|
|
84
89
|
return createContextAwarePinoLogger({
|
|
85
|
-
pino: pino.child(bindings),
|
|
90
|
+
pino: pino.child(sanitizeLogMetadata(bindings, options.sanitizers)),
|
|
86
91
|
service,
|
|
92
|
+
sanitizers: options.sanitizers,
|
|
87
93
|
});
|
|
88
94
|
},
|
|
89
95
|
};
|
|
@@ -109,7 +115,7 @@ export function createContextAwarePinoLogger(options) {
|
|
|
109
115
|
* app.use(createPinoHttpMiddleware(logger));
|
|
110
116
|
* ```
|
|
111
117
|
*/
|
|
112
|
-
export function createPinoHttpMiddleware(pino) {
|
|
118
|
+
export function createPinoHttpMiddleware(pino, sanitizers) {
|
|
113
119
|
return async (c, next) => {
|
|
114
120
|
const start = Date.now();
|
|
115
121
|
await next();
|
|
@@ -127,13 +133,13 @@ export function createPinoHttpMiddleware(pino) {
|
|
|
127
133
|
}
|
|
128
134
|
// Use appropriate log level based on status
|
|
129
135
|
if (c.res.status >= 500) {
|
|
130
|
-
pino.error(logObject, 'HTTP Request');
|
|
136
|
+
pino.error(sanitizeLogMetadata(logObject, sanitizers), 'HTTP Request');
|
|
131
137
|
}
|
|
132
138
|
else if (c.res.status >= 400) {
|
|
133
|
-
pino.warn(logObject, 'HTTP Request');
|
|
139
|
+
pino.warn(sanitizeLogMetadata(logObject, sanitizers), 'HTTP Request');
|
|
134
140
|
}
|
|
135
141
|
else {
|
|
136
|
-
pino.info(logObject, 'HTTP Request');
|
|
142
|
+
pino.info(sanitizeLogMetadata(logObject, sanitizers), 'HTTP Request');
|
|
137
143
|
}
|
|
138
144
|
};
|
|
139
145
|
}
|