@antelopejs/dms-api 0.6.1 → 0.6.3
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/README.md +43 -21
- package/dist/automation/get-api-health.d.ts +2 -2
- package/dist/automation/query-request-logs.d.ts +7 -3
- package/dist/automation/query-request-logs.js +9 -1
- package/dist/automation/query-request-logs.js.map +1 -1
- package/dist/automation/route-unhealthy.d.ts +6 -1
- package/dist/automation/route-unhealthy.js +2 -5
- package/dist/automation/route-unhealthy.js.map +1 -1
- package/dist/db/models/api_settings.model.d.ts +7 -5
- package/dist/db/models/request_log.model.d.ts +7 -5
- package/dist/db/models/routes.model.d.ts +7 -5
- package/dist/db/models/routes_statistics.model.d.ts +9 -6
- package/dist/db/models/routes_statistics.model.js +11 -9
- package/dist/db/models/routes_statistics.model.js.map +1 -1
- package/dist/db/tables/request_log.table.d.ts +4 -4
- package/dist/db/tables/routes_statistics.table.d.ts +1 -1
- package/dist/db/tables/routes_statistics.table.js.map +1 -1
- package/dist/guards.d.ts +2 -1
- package/dist/guards.js +25 -12
- package/dist/guards.js.map +1 -1
- package/dist/memo.js +2 -1
- package/dist/memo.js.map +1 -1
- package/dist/routes/settings.js +5 -2
- package/dist/routes/settings.js.map +1 -1
- package/dist/services/introspection/decorators.d.ts +1 -2
- package/dist/services/introspection/decorators.js +2 -7
- package/dist/services/introspection/decorators.js.map +1 -1
- package/dist/services/introspection/index.d.ts +2 -1
- package/dist/services/introspection/index.js +15 -13
- package/dist/services/introspection/index.js.map +1 -1
- package/dist/services/live.d.ts +7 -2
- package/dist/services/live.js +17 -13
- package/dist/services/live.js.map +1 -1
- package/dist/services/request-log/capture.js +35 -29
- package/dist/services/request-log/capture.js.map +1 -1
- package/dist/services/request-log/list.js +12 -12
- package/dist/services/request-log/list.js.map +1 -1
- package/dist/services/request-log/redaction.d.ts +2 -1
- package/dist/services/request-log/redaction.js +8 -2
- package/dist/services/request-log/redaction.js.map +1 -1
- package/dist/services/request-log/util.js +13 -13
- package/dist/services/request-log/util.js.map +1 -1
- package/dist/services/route-catalog.js +1 -2
- package/dist/services/route-catalog.js.map +1 -1
- package/dist/services/route-contract.js +7 -1
- package/dist/services/route-contract.js.map +1 -1
- package/dist/services/settings-form.d.ts +2 -2
- package/dist/services/settings-form.js +2 -1
- package/dist/services/settings-form.js.map +1 -1
- package/dist/services/statistics-aggregate.d.ts +6 -6
- package/dist/services/window.js +1 -2
- package/dist/services/window.js.map +1 -1
- package/dist/services/zod-json.d.ts +3 -0
- package/dist/services/zod-json.js +21 -0
- package/dist/services/zod-json.js.map +1 -0
- package/frontend-vue/i18n/locales/api-en-GB.json +1 -1
- package/frontend-vue/i18n/locales/api-fr-FR.json +1 -1
- package/frontend-vue/package.json +2 -2
- package/frontend-vue/pnpm-lock.yaml +17 -5
- package/frontend-vue/tests/testerRequest.test.ts +12 -0
- package/package.json +12 -13
- package/skills/dms-api/SKILL.md +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/services/introspection/decorators.ts"],"names":[],"mappings":";;AAwLA,8DA4BC;
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/services/introspection/decorators.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,5 +47,6 @@ export interface RouteInspection {
|
|
|
47
47
|
errorCodes: InferredErrorCode[];
|
|
48
48
|
authGuards: string[];
|
|
49
49
|
}
|
|
50
|
-
export declare function
|
|
50
|
+
export declare function inferredTypeOf(typeName: string | null): InferredType;
|
|
51
|
+
export declare function handlerMethod(handler: Pick<RouteHandler, "callback" | "controller">): Function;
|
|
51
52
|
export declare function getRouteInspection(id: string): RouteInspection | undefined;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isAuthMiddleware = void 0;
|
|
4
|
+
exports.inferredTypeOf = inferredTypeOf;
|
|
4
5
|
exports.handlerMethod = handlerMethod;
|
|
5
6
|
exports.getRouteInspection = getRouteInspection;
|
|
6
7
|
const interface_api_1 = require("@antelopejs/interface-api");
|
|
@@ -26,13 +27,16 @@ const PARAMETER_SOURCES = [
|
|
|
26
27
|
function isParameterSource(source) {
|
|
27
28
|
return PARAMETER_SOURCES.some((parameterSource) => parameterSource === source);
|
|
28
29
|
}
|
|
29
|
-
const DECLARED_TYPES =
|
|
30
|
-
String
|
|
31
|
-
Number
|
|
32
|
-
Boolean
|
|
33
|
-
Object
|
|
34
|
-
Buffer
|
|
35
|
-
|
|
30
|
+
const DECLARED_TYPES = new Map([
|
|
31
|
+
["String", "string"],
|
|
32
|
+
["Number", "number"],
|
|
33
|
+
["Boolean", "boolean"],
|
|
34
|
+
["Object", "object"],
|
|
35
|
+
["Buffer", "buffer"],
|
|
36
|
+
]);
|
|
37
|
+
function inferredTypeOf(typeName) {
|
|
38
|
+
return DECLARED_TYPES.get(typeName ?? "") ?? "string";
|
|
39
|
+
}
|
|
36
40
|
function declaredParameter(decorated) {
|
|
37
41
|
if ((0, decorators_1.isAuthDecorator)(decorated.decorator)) {
|
|
38
42
|
return {
|
|
@@ -53,9 +57,7 @@ function declaredParameter(decorated) {
|
|
|
53
57
|
name,
|
|
54
58
|
source,
|
|
55
59
|
multi,
|
|
56
|
-
inferredType: multi
|
|
57
|
-
? "object"
|
|
58
|
-
: (DECLARED_TYPES[decorated.type ?? ""] ?? "string"),
|
|
60
|
+
inferredType: multi ? "object" : inferredTypeOf(decorated.type),
|
|
59
61
|
};
|
|
60
62
|
}
|
|
61
63
|
function inspectParameter(param, index, decorated) {
|
|
@@ -152,12 +154,12 @@ function comparePriorityThenMode(a, b) {
|
|
|
152
154
|
return ap - bp;
|
|
153
155
|
}
|
|
154
156
|
function controllerNameOf(handler) {
|
|
155
|
-
|
|
156
|
-
return name && name !== "Object" ? name : null;
|
|
157
|
+
return handler.controller.name || null;
|
|
157
158
|
}
|
|
158
159
|
function handlerMethod(handler) {
|
|
159
160
|
const name = handler.callback.name;
|
|
160
|
-
const
|
|
161
|
+
const prototype = handler.controller.prototype;
|
|
162
|
+
const method = name && (0, guards_1.isRecord)(prototype) ? prototype[name] : undefined;
|
|
161
163
|
return (0, guards_1.isFunction)(method) ? method : handler.callback;
|
|
162
164
|
}
|
|
163
165
|
function authGuardsOf(parameters, properties, middleware, decorators) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/introspection/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/introspection/index.ts"],"names":[],"mappings":"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"}
|
package/dist/services/live.d.ts
CHANGED
|
@@ -19,8 +19,13 @@ export interface LiveTraffic {
|
|
|
19
19
|
to: string;
|
|
20
20
|
live: boolean;
|
|
21
21
|
}
|
|
22
|
-
export
|
|
23
|
-
|
|
22
|
+
export interface DrawnRange {
|
|
23
|
+
from: number;
|
|
24
|
+
to: number;
|
|
25
|
+
live: boolean;
|
|
26
|
+
}
|
|
27
|
+
export declare function liveBucketMs(range: DrawnRange): number;
|
|
28
|
+
export declare function resolveBucketMs(raw: string | undefined, range: DrawnRange): number;
|
|
24
29
|
export interface LiveQuery extends WindowQuery {
|
|
25
30
|
bucket?: string;
|
|
26
31
|
}
|
package/dist/services/live.js
CHANGED
|
@@ -25,17 +25,23 @@ const LIVE_BUCKET_SIZES_MS = [
|
|
|
25
25
|
];
|
|
26
26
|
const TARGET_MAX_BARS = 120;
|
|
27
27
|
const MAX_BARS = 240;
|
|
28
|
-
function
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
function barsOver(range, bucketMs) {
|
|
29
|
+
const { from, to, live } = range;
|
|
30
|
+
const last = barOf(live ? to : Math.max(to - 1, from), bucketMs);
|
|
31
|
+
const count = live
|
|
32
|
+
? Math.ceil((to - from) / bucketMs)
|
|
33
|
+
: Math.floor((last - barOf(from, bucketMs)) / bucketMs) + 1;
|
|
34
|
+
return { last, count: Math.max(count, 1) };
|
|
35
|
+
}
|
|
36
|
+
function liveBucketMs(range) {
|
|
37
|
+
return (LIVE_BUCKET_SIZES_MS.find((size) => barsOver(range, size).count <= TARGET_MAX_BARS) ?? types_1.MS_PER_DAY);
|
|
32
38
|
}
|
|
33
|
-
function resolveBucketMs(raw,
|
|
39
|
+
function resolveBucketMs(raw, range) {
|
|
34
40
|
const asked = Number(raw);
|
|
35
41
|
const allowed = LIVE_BUCKET_SIZES_MS.find((size) => size === asked);
|
|
36
|
-
if (allowed &&
|
|
42
|
+
if (allowed && barsOver(range, allowed).count <= MAX_BARS)
|
|
37
43
|
return allowed;
|
|
38
|
-
return liveBucketMs(
|
|
44
|
+
return liveBucketMs(range);
|
|
39
45
|
}
|
|
40
46
|
const DEFAULT_LIVE_PRESET = "last-hour";
|
|
41
47
|
function liveRange(query, now) {
|
|
@@ -70,13 +76,11 @@ async function getLiveTraffic(model, keys, query = {}, now = new Date()) {
|
|
|
70
76
|
const { period, range } = liveRange(query, pinned);
|
|
71
77
|
const from = range.from.getTime();
|
|
72
78
|
const to = range.to.getTime();
|
|
73
|
-
const bucketMs = resolveBucketMs(query.bucket, to - from);
|
|
74
79
|
const live = to >= pinned.getTime() - window_1.CACHE_QUANTUM_MS;
|
|
75
|
-
const
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
const count = Math.min(Math.max(barCount, 1), MAX_BARS);
|
|
80
|
+
const drawn = { from, to, live };
|
|
81
|
+
const bucketMs = resolveBucketMs(query.bucket, drawn);
|
|
82
|
+
const { last, count: barCount } = barsOver(drawn, bucketMs);
|
|
83
|
+
const count = Math.min(barCount, MAX_BARS);
|
|
80
84
|
const start = last - (count - 1) * bucketMs;
|
|
81
85
|
const bars = Array.from({ length: count }, (_, index) => (0, traffic_1.emptyBucket)(start + index * bucketMs));
|
|
82
86
|
const barAt = (at) => bars[Math.floor((at - start) / bucketMs)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live.js","sourceRoot":"","sources":["../../src/services/live.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"live.js","sourceRoot":"","sources":["../../src/services/live.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,9 +44,7 @@ class RequestLogCapture extends (0, interface_api_1.Controller)("/") {
|
|
|
44
44
|
context.__dmsApiCaptureStart = process.hrtime.bigint();
|
|
45
45
|
}
|
|
46
46
|
capture(context) {
|
|
47
|
-
void persistLog(context)
|
|
48
|
-
logging_1.Logging.Error("[dms-api] request log capture failed:", err);
|
|
49
|
-
});
|
|
47
|
+
void logRejection(persistLog(context), "[dms-api] request log capture failed:");
|
|
50
48
|
}
|
|
51
49
|
}
|
|
52
50
|
exports.RequestLogCapture = RequestLogCapture;
|
|
@@ -76,14 +74,20 @@ function requestIdOf(headers) {
|
|
|
76
74
|
return id && id.length <= types_1.REQUEST_ID_MAX_LENGTH ? id : undefined;
|
|
77
75
|
}
|
|
78
76
|
function recordRouteStatistics(method, uri, statusCode, responseTimeMs) {
|
|
79
|
-
void (0, statistics_write_1.addRequestStatistics)((0, interface_database_decorators_1.GetModel)(db_1.RouteStatisticsModel), {
|
|
77
|
+
void logRejection((0, statistics_write_1.addRequestStatistics)((0, interface_database_decorators_1.GetModel)(db_1.RouteStatisticsModel), {
|
|
80
78
|
responseTime: responseTimeMs,
|
|
81
79
|
method,
|
|
82
80
|
uri,
|
|
83
81
|
statusCode,
|
|
84
|
-
})
|
|
85
|
-
|
|
86
|
-
|
|
82
|
+
}), "[dms-api] route statistics write failed:");
|
|
83
|
+
}
|
|
84
|
+
async function logRejection(work, message) {
|
|
85
|
+
try {
|
|
86
|
+
await work;
|
|
87
|
+
}
|
|
88
|
+
catch (err) {
|
|
89
|
+
logging_1.Logging.Error(message, err);
|
|
90
|
+
}
|
|
87
91
|
}
|
|
88
92
|
const PAYLOAD_TOO_LARGE = 413;
|
|
89
93
|
function announcesBody(headers) {
|
|
@@ -133,6 +137,29 @@ function captureResponse(response, config, droppedHeaders) {
|
|
|
133
137
|
function assembleLogRecord(input) {
|
|
134
138
|
const { context, route, request, response } = input;
|
|
135
139
|
const headers = context.rawRequest.headers;
|
|
140
|
+
const err = context.error;
|
|
141
|
+
let thrown;
|
|
142
|
+
if (!err) {
|
|
143
|
+
thrown = undefined;
|
|
144
|
+
}
|
|
145
|
+
else if (err instanceof Error) {
|
|
146
|
+
thrown = { message: err.message, stack: err.stack };
|
|
147
|
+
}
|
|
148
|
+
else if ((0, guards_1.hasStatusGetter)(err)) {
|
|
149
|
+
const body = (0, util_1.extractBody)(err);
|
|
150
|
+
thrown = {
|
|
151
|
+
message: bodyErrorMessage((0, guards_1.isErrorBody)(body) ? body : undefined) ??
|
|
152
|
+
`HTTP ${(0, util_1.extractStatusCode)(err)}`,
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
else {
|
|
156
|
+
try {
|
|
157
|
+
thrown = { message: String(err) };
|
|
158
|
+
}
|
|
159
|
+
catch {
|
|
160
|
+
thrown = { message: "unknown error" };
|
|
161
|
+
}
|
|
162
|
+
}
|
|
136
163
|
return {
|
|
137
164
|
timestamp: new Date(),
|
|
138
165
|
method: route.method,
|
|
@@ -140,8 +167,7 @@ function assembleLogRecord(input) {
|
|
|
140
167
|
rawPath: route.rawPath,
|
|
141
168
|
statusCode: input.statusCode,
|
|
142
169
|
responseTimeMs: input.responseTimeMs,
|
|
143
|
-
error:
|
|
144
|
-
responseError(input.statusCode, context.response),
|
|
170
|
+
error: thrown ?? responseError(input.statusCode, context.response),
|
|
145
171
|
routeId: route.matched?.id,
|
|
146
172
|
routeMethod: route.routeMethod,
|
|
147
173
|
source: input.source,
|
|
@@ -285,26 +311,6 @@ function responseError(statusCode, response) {
|
|
|
285
311
|
const message = bodyErrorMessage((0, guards_1.isErrorBody)(body) ? body : undefined);
|
|
286
312
|
return message ? { message } : undefined;
|
|
287
313
|
}
|
|
288
|
-
function formatError(err) {
|
|
289
|
-
if (!err)
|
|
290
|
-
return undefined;
|
|
291
|
-
if (err instanceof Error) {
|
|
292
|
-
return { message: err.message, stack: err.stack };
|
|
293
|
-
}
|
|
294
|
-
if ((0, guards_1.hasStatusGetter)(err)) {
|
|
295
|
-
const body = (0, util_1.extractBody)(err);
|
|
296
|
-
return {
|
|
297
|
-
message: bodyErrorMessage((0, guards_1.isErrorBody)(body) ? body : undefined) ??
|
|
298
|
-
`HTTP ${(0, util_1.extractStatusCode)(err)}`,
|
|
299
|
-
};
|
|
300
|
-
}
|
|
301
|
-
try {
|
|
302
|
-
return { message: String(err) };
|
|
303
|
-
}
|
|
304
|
-
catch {
|
|
305
|
-
return { message: "unknown error" };
|
|
306
|
-
}
|
|
307
|
-
}
|
|
308
314
|
function clientIp(context) {
|
|
309
315
|
const fwd = context.rawRequest.headers["x-forwarded-for"];
|
|
310
316
|
if ((0, guards_1.isString)(fwd)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/services/request-log/capture.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/services/request-log/capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,16 +12,16 @@ const links_1 = require("../links");
|
|
|
12
12
|
const period_1 = require("../period");
|
|
13
13
|
const route_catalog_1 = require("../route-catalog");
|
|
14
14
|
const window_1 = require("../window");
|
|
15
|
-
const STATUS_CLASS_OF_TAB =
|
|
16
|
-
"2xx"
|
|
17
|
-
"4xx"
|
|
18
|
-
"5xx"
|
|
19
|
-
|
|
20
|
-
const SORT_KEYS =
|
|
21
|
-
timestamp
|
|
22
|
-
status
|
|
23
|
-
responseTimeMs
|
|
24
|
-
|
|
15
|
+
const STATUS_CLASS_OF_TAB = new Map([
|
|
16
|
+
["2xx", "success"],
|
|
17
|
+
["4xx", "client-error"],
|
|
18
|
+
["5xx", "server-error"],
|
|
19
|
+
]);
|
|
20
|
+
const SORT_KEYS = new Map([
|
|
21
|
+
["timestamp", "timestamp"],
|
|
22
|
+
["status", "statusCode"],
|
|
23
|
+
["responseTimeMs", "responseTimeMs"],
|
|
24
|
+
]);
|
|
25
25
|
const DEFAULT_PAGE_SIZE = 50;
|
|
26
26
|
const SUB_MS_PRECISION = 100;
|
|
27
27
|
function filterValues(raw) {
|
|
@@ -75,7 +75,7 @@ function periodRange(query, now) {
|
|
|
75
75
|
}
|
|
76
76
|
function filtersFromQuery(query, now = new Date()) {
|
|
77
77
|
const filters = {};
|
|
78
|
-
const statusClass = STATUS_CLASS_OF_TAB
|
|
78
|
+
const statusClass = STATUS_CLASS_OF_TAB.get(filterValue(query.filter_statusClass) ?? "");
|
|
79
79
|
if (statusClass)
|
|
80
80
|
filters.statusClass = statusClass;
|
|
81
81
|
const methods = filterValues(query.filter_method);
|
|
@@ -186,7 +186,7 @@ async function listRequestLogs(model, query, keys, options = {}) {
|
|
|
186
186
|
const page = await model.list(filters, {
|
|
187
187
|
offset: positiveInt(query.offset),
|
|
188
188
|
limit: Math.min(positiveInt(query.limit) || DEFAULT_PAGE_SIZE, types_1.REQUEST_LOG_LIST_MAX_ROWS),
|
|
189
|
-
sortKey: SORT_KEYS
|
|
189
|
+
sortKey: SORT_KEYS.get(query.sortKey ?? ""),
|
|
190
190
|
sortDirection: query.sortDirection === "asc" ? "asc" : "desc",
|
|
191
191
|
});
|
|
192
192
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/services/request-log/list.ts"],"names":[],"mappings":";;AAgHA,sCAMC;AAiCD,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/services/request-log/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { JsonValue } from "@antelopejs/interface-dms/base/types/json";
|
|
1
2
|
export declare const REDACTED_KEY_WORDS: readonly string[];
|
|
2
3
|
export declare function isSensitiveKey(key: string): boolean;
|
|
3
4
|
export declare function isSensitiveHeader(name: string): boolean;
|
|
@@ -7,7 +8,7 @@ export interface Redacted<T> {
|
|
|
7
8
|
value: T;
|
|
8
9
|
redacted: number;
|
|
9
10
|
}
|
|
10
|
-
export declare function redactValue(value:
|
|
11
|
+
export declare function redactValue(value: JsonValue): Redacted<JsonValue>;
|
|
11
12
|
export declare function redactSearchParams(params: URLSearchParams): Redacted<URLSearchParams>;
|
|
12
13
|
export interface SanitizedBody {
|
|
13
14
|
text?: string;
|
|
@@ -162,8 +162,14 @@ function sanitizeBody(body, contentType) {
|
|
|
162
162
|
const { value, redacted } = redactSearchParams(new URLSearchParams(text));
|
|
163
163
|
return { text: value.toString(), redacted };
|
|
164
164
|
}
|
|
165
|
-
|
|
166
|
-
|
|
165
|
+
if (!(0, guards_1.isString)(text) && !(0, guards_1.isObject)(text)) {
|
|
166
|
+
return { omitted: "not-json", redacted: 0 };
|
|
167
|
+
}
|
|
168
|
+
const serialised = (0, guards_1.isString)(text)
|
|
169
|
+
? text
|
|
170
|
+
: JSON.stringify(text);
|
|
171
|
+
const parsed = serialised === undefined ? undefined : JSON.parse(serialised);
|
|
172
|
+
if (!(0, guards_1.isJsonValue)(parsed) || !(0, guards_1.isObject)(parsed)) {
|
|
167
173
|
return { omitted: "not-json", redacted: 0 };
|
|
168
174
|
}
|
|
169
175
|
const { value, redacted } = redactValue(parsed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redaction.js","sourceRoot":"","sources":["../../../src/services/request-log/redaction.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"redaction.js","sourceRoot":"","sources":["../../../src/services/request-log/redaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,13 +30,11 @@ function pickHeaders(headers, allowList, dropped) {
|
|
|
30
30
|
function omittedBody(reason) {
|
|
31
31
|
return { truncated: false, omitted: reason, redacted: 0 };
|
|
32
32
|
}
|
|
33
|
-
function isEmptyBody(body) {
|
|
34
|
-
if (body === undefined || body === null || body === "")
|
|
35
|
-
return true;
|
|
36
|
-
return Buffer.isBuffer(body) && body.length === 0;
|
|
37
|
-
}
|
|
38
33
|
function captureBody(body, contentType, maxBytes) {
|
|
39
|
-
if (
|
|
34
|
+
if (body === undefined || body === null || body === "") {
|
|
35
|
+
return omittedBody("empty");
|
|
36
|
+
}
|
|
37
|
+
if (Buffer.isBuffer(body) && body.length === 0)
|
|
40
38
|
return omittedBody("empty");
|
|
41
39
|
if (maxBytes <= 0)
|
|
42
40
|
return omittedBody("disabled");
|
|
@@ -73,17 +71,19 @@ function queryToRecord(url) {
|
|
|
73
71
|
function extractStatusCode(value) {
|
|
74
72
|
if (!(0, guards_1.isObject)(value))
|
|
75
73
|
return constants_1.HTTP_STATUS_OK;
|
|
76
|
-
|
|
77
|
-
if (typeof v.getStatus === "function") {
|
|
74
|
+
if ((0, guards_1.hasStatusGetter)(value)) {
|
|
78
75
|
try {
|
|
79
|
-
|
|
76
|
+
const status = value.getStatus();
|
|
77
|
+
if ((0, guards_1.isNumber)(status))
|
|
78
|
+
return status;
|
|
80
79
|
}
|
|
81
80
|
catch { }
|
|
82
81
|
}
|
|
83
|
-
if ((0, guards_1.isNumber)(
|
|
84
|
-
return
|
|
85
|
-
|
|
86
|
-
|
|
82
|
+
if ("statusCode" in value && (0, guards_1.isNumber)(value.statusCode)) {
|
|
83
|
+
return value.statusCode;
|
|
84
|
+
}
|
|
85
|
+
if ("status" in value && (0, guards_1.isNumber)(value.status))
|
|
86
|
+
return value.status;
|
|
87
87
|
return constants_1.HTTP_STATUS_OK;
|
|
88
88
|
}
|
|
89
89
|
function extractBody(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/services/request-log/util.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/services/request-log/util.ts"],"names":[],"mappings":"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"}
|