@effect-app/infra 4.0.0-beta.290 → 4.0.0-beta.291
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
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 4.0.0-beta.291
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 848d26d: Capture more of the rpc request payload in the `rpc.request.payload` span
|
|
8
|
+
attribute.
|
|
9
|
+
|
|
10
|
+
The summarizer was one level deep: top-level scalars were kept, but any nested
|
|
11
|
+
object collapsed to `Object[N]` and any array to `Array[N]`, hiding useful
|
|
12
|
+
inputs (carrier, packageType, dimensions, ids, per-item amounts, …).
|
|
13
|
+
|
|
14
|
+
It now recurses into nested objects up to `PAYLOAD_MAX_DEPTH` (4) and samples
|
|
15
|
+
arrays to their first `PAYLOAD_ARRAY_HEAD` (20) elements, appending a `…N more`
|
|
16
|
+
marker when longer — so item arrays stay diagnosable without dumping the whole
|
|
17
|
+
tail on high-frequency commands. Long strings are still snipped at 256 chars,
|
|
18
|
+
and `password`/`secret`/`token` keys are redacted at any depth (previously only
|
|
19
|
+
a top-level `password`).
|
|
20
|
+
|
|
21
|
+
- effect-app@4.0.0-beta.291
|
|
22
|
+
|
|
3
23
|
## 4.0.0-beta.290
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/routing/middleware/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mCAAmC,EAAW,iBAAiB,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACjJ,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAIlE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/routing/middleware/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mCAAmC,EAAW,iBAAiB,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACjJ,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAIlE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AA8CtD,eAAO,MAAM,WAAW,+CAMvB,CAAA;AAED,eAAO,MAAM,0BAA0B,mDAGtC,CAAA;AAKD,eAAO,MAAM,WAAW,wCAGvB,CAAA;AAED,eAAO,MAAM,uCAAuC,gEAcnD,CAAA;AAED,eAAO,MAAM,oBAAoB,0DA0CE,CAAA;AAEnC,eAAO,MAAM,qBAAqB,2DAQC,CAAA;AAEnC,eAAO,MAAM,6BAA6B,6IAKzC,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,kEAAkD,CAAA;AAExF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,4BAA4B;eACrB,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,KAAK;QAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;KAAE;iGASvF,CAAA"}
|
|
@@ -14,6 +14,47 @@ import { InfraLogger } from "../../logger.js";
|
|
|
14
14
|
import { WithNsTransaction } from "../../Store/SQL.js";
|
|
15
15
|
const logRequestError = logError("Request");
|
|
16
16
|
const reportRequestError = reportError("Request");
|
|
17
|
+
// Summarize an rpc payload for the `rpc.request.payload` span attribute.
|
|
18
|
+
// Scalars are kept (long strings snipped), nested objects are recursed into up
|
|
19
|
+
// to `PAYLOAD_MAX_DEPTH` so useful inputs (carrier, packageType, dimensions, ids,
|
|
20
|
+
// …) are captured. Arrays are sampled to the first `PAYLOAD_ARRAY_HEAD` elements
|
|
21
|
+
// (with a `…N more` marker when longer) so pack/pick item arrays — one entry per
|
|
22
|
+
// article, quantity folded into `amount` — are diagnosable without dumping the
|
|
23
|
+
// whole tail on every (high-frequency) SaveItems.
|
|
24
|
+
const PAYLOAD_MAX_DEPTH = 4;
|
|
25
|
+
const PAYLOAD_ARRAY_HEAD = 20;
|
|
26
|
+
const REDACTED_KEYS = new Set(["password", "secret", "token"]);
|
|
27
|
+
const summarizePayloadValue = (key, value, depth) => {
|
|
28
|
+
if (REDACTED_KEYS.has(key))
|
|
29
|
+
return "<redacted>";
|
|
30
|
+
if (typeof value === "string")
|
|
31
|
+
return value.length > 256 ? value.substring(0, 253) + "..." : value;
|
|
32
|
+
if (typeof value === "number" || typeof value === "boolean")
|
|
33
|
+
return value;
|
|
34
|
+
if (value === null || value === undefined)
|
|
35
|
+
return `${value}`;
|
|
36
|
+
if (Array.isArray(value)) {
|
|
37
|
+
if (depth >= PAYLOAD_MAX_DEPTH)
|
|
38
|
+
return `Array[${value.length}]`;
|
|
39
|
+
const head = value.slice(0, PAYLOAD_ARRAY_HEAD).map((v) => summarizePayloadValue(key, v, depth + 1));
|
|
40
|
+
return value.length > PAYLOAD_ARRAY_HEAD ? [...head, `…${value.length - PAYLOAD_ARRAY_HEAD} more`] : head;
|
|
41
|
+
}
|
|
42
|
+
if (typeof value === "object") {
|
|
43
|
+
return depth >= PAYLOAD_MAX_DEPTH
|
|
44
|
+
? `Object[${Object.keys(value).length}]`
|
|
45
|
+
: Object.entries(value).reduce((prev, [k, v]) => {
|
|
46
|
+
prev[k] = summarizePayloadValue(k, v, depth + 1);
|
|
47
|
+
return prev;
|
|
48
|
+
}, {});
|
|
49
|
+
}
|
|
50
|
+
return typeof value;
|
|
51
|
+
};
|
|
52
|
+
const summarizePayload = (payload) => typeof payload === "object" && payload !== null
|
|
53
|
+
? Object.entries(payload).reduce((prev, [key, value]) => {
|
|
54
|
+
prev[key] = summarizePayloadValue(key, value, 1);
|
|
55
|
+
return prev;
|
|
56
|
+
}, {})
|
|
57
|
+
: payload;
|
|
17
58
|
// TODO: do we need this as middleware or just as layer?
|
|
18
59
|
export const DevModeLive = Layer.effect(DevMode, Effect.gen(function* () {
|
|
19
60
|
const env = yield* Config.string("env").pipe(Config.withDefault("local-dev"));
|
|
@@ -38,24 +79,7 @@ export const LoggerMiddlewareLive = Layer
|
|
|
38
79
|
return (effect, { headers, payload, rpc }) => Effect
|
|
39
80
|
.annotateCurrentSpan({
|
|
40
81
|
"rpc.method": rpc._tag,
|
|
41
|
-
"rpc.request.payload":
|
|
42
|
-
? Object.entries(payload).reduce((prev, [key, value]) => {
|
|
43
|
-
prev[key] = key === "password"
|
|
44
|
-
? "<redacted>"
|
|
45
|
-
: typeof value === "string" || typeof value === "number" || typeof value === "boolean"
|
|
46
|
-
? typeof value === "string" && value.length > 256
|
|
47
|
-
? (value.substring(0, 253) + "...")
|
|
48
|
-
: value
|
|
49
|
-
: Array.isArray(value)
|
|
50
|
-
? `Array[${value.length}]`
|
|
51
|
-
: value === null || value === undefined
|
|
52
|
-
? `${value}`
|
|
53
|
-
: typeof value === "object" && value
|
|
54
|
-
? `Object[${Object.keys(value).length}]`
|
|
55
|
-
: typeof value;
|
|
56
|
-
return prev;
|
|
57
|
-
}, {})
|
|
58
|
-
: payload
|
|
82
|
+
"rpc.request.payload": summarizePayload(payload)
|
|
59
83
|
})
|
|
60
84
|
.pipe(Effect.andThen(effect),
|
|
61
85
|
// TODO: support SchemaError if the error channel of the request allows it.. but who would want that?
|
|
@@ -125,4 +149,4 @@ export const makeSqlTransactionMiddleware = Effect.fnUntraced(function* (rcm) {
|
|
|
125
149
|
};
|
|
126
150
|
return mw;
|
|
127
151
|
});
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/routing/middleware/middleware.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.291",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"proper-lockfile": "^4.1.2",
|
|
11
11
|
"pure-rand": "8.4.0",
|
|
12
12
|
"query-string": "^9.4.0",
|
|
13
|
-
"effect-app": "4.0.0-beta.
|
|
13
|
+
"effect-app": "4.0.0-beta.291"
|
|
14
14
|
},
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"@azure/cosmos": "^4.9.3",
|
|
@@ -17,6 +17,46 @@ import { WithNsTransaction } from "../../Store/SQL.ts"
|
|
|
17
17
|
const logRequestError = logError("Request")
|
|
18
18
|
const reportRequestError = reportError("Request")
|
|
19
19
|
|
|
20
|
+
// Summarize an rpc payload for the `rpc.request.payload` span attribute.
|
|
21
|
+
// Scalars are kept (long strings snipped), nested objects are recursed into up
|
|
22
|
+
// to `PAYLOAD_MAX_DEPTH` so useful inputs (carrier, packageType, dimensions, ids,
|
|
23
|
+
// …) are captured. Arrays are sampled to the first `PAYLOAD_ARRAY_HEAD` elements
|
|
24
|
+
// (with a `…N more` marker when longer) so pack/pick item arrays — one entry per
|
|
25
|
+
// article, quantity folded into `amount` — are diagnosable without dumping the
|
|
26
|
+
// whole tail on every (high-frequency) SaveItems.
|
|
27
|
+
const PAYLOAD_MAX_DEPTH = 4
|
|
28
|
+
const PAYLOAD_ARRAY_HEAD = 20
|
|
29
|
+
const REDACTED_KEYS = new Set(["password", "secret", "token"])
|
|
30
|
+
|
|
31
|
+
const summarizePayloadValue = (key: string, value: unknown, depth: number): unknown => {
|
|
32
|
+
if (REDACTED_KEYS.has(key)) return "<redacted>"
|
|
33
|
+
if (typeof value === "string") return value.length > 256 ? value.substring(0, 253) + "..." : value
|
|
34
|
+
if (typeof value === "number" || typeof value === "boolean") return value
|
|
35
|
+
if (value === null || value === undefined) return `${value}`
|
|
36
|
+
if (Array.isArray(value)) {
|
|
37
|
+
if (depth >= PAYLOAD_MAX_DEPTH) return `Array[${value.length}]`
|
|
38
|
+
const head = value.slice(0, PAYLOAD_ARRAY_HEAD).map((v) => summarizePayloadValue(key, v, depth + 1))
|
|
39
|
+
return value.length > PAYLOAD_ARRAY_HEAD ? [...head, `…${value.length - PAYLOAD_ARRAY_HEAD} more`] : head
|
|
40
|
+
}
|
|
41
|
+
if (typeof value === "object") {
|
|
42
|
+
return depth >= PAYLOAD_MAX_DEPTH
|
|
43
|
+
? `Object[${Object.keys(value).length}]`
|
|
44
|
+
: Object.entries(value).reduce((prev, [k, v]) => {
|
|
45
|
+
prev[k] = summarizePayloadValue(k, v, depth + 1)
|
|
46
|
+
return prev
|
|
47
|
+
}, {} as Record<string, unknown>)
|
|
48
|
+
}
|
|
49
|
+
return typeof value
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
const summarizePayload = (payload: unknown): unknown =>
|
|
53
|
+
typeof payload === "object" && payload !== null
|
|
54
|
+
? Object.entries(payload).reduce((prev, [key, value]) => {
|
|
55
|
+
prev[key] = summarizePayloadValue(key, value, 1)
|
|
56
|
+
return prev
|
|
57
|
+
}, {} as Record<string, unknown>)
|
|
58
|
+
: payload
|
|
59
|
+
|
|
20
60
|
// TODO: do we need this as middleware or just as layer?
|
|
21
61
|
export const DevModeLive = Layer.effect(
|
|
22
62
|
DevMode,
|
|
@@ -64,24 +104,7 @@ export const LoggerMiddlewareLive = Layer
|
|
|
64
104
|
Effect
|
|
65
105
|
.annotateCurrentSpan({
|
|
66
106
|
"rpc.method": rpc._tag,
|
|
67
|
-
"rpc.request.payload":
|
|
68
|
-
? Object.entries(payload).reduce((prev, [key, value]: [string, unknown]) => {
|
|
69
|
-
prev[key] = key === "password"
|
|
70
|
-
? "<redacted>"
|
|
71
|
-
: typeof value === "string" || typeof value === "number" || typeof value === "boolean"
|
|
72
|
-
? typeof value === "string" && value.length > 256
|
|
73
|
-
? (value.substring(0, 253) + "...")
|
|
74
|
-
: value
|
|
75
|
-
: Array.isArray(value)
|
|
76
|
-
? `Array[${value.length}]`
|
|
77
|
-
: value === null || value === undefined
|
|
78
|
-
? `${value}`
|
|
79
|
-
: typeof value === "object" && value
|
|
80
|
-
? `Object[${Object.keys(value).length}]`
|
|
81
|
-
: typeof value
|
|
82
|
-
return prev
|
|
83
|
-
}, {} as Record<string, string | number | boolean>)
|
|
84
|
-
: payload
|
|
107
|
+
"rpc.request.payload": summarizePayload(payload)
|
|
85
108
|
})
|
|
86
109
|
.pipe(
|
|
87
110
|
Effect.andThen(effect),
|