@reventlessdev/reventless-core 3.0.0-alpha.311 → 3.0.0-alpha.312
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 +24 -0
- package/package.json +7 -7
- package/src/Message.res +15 -5
- package/src/Message.res.mjs +7 -5
- package/src/adapter/Secrets/Secrets_Node_Backend.res +41 -2
- package/src/adapter/Secrets/Secrets_Node_Backend.res.mjs +65 -23
- package/src/components/AutomationSlice/AutomationSlice_Callback.res.mjs +2 -2
- package/src/components/CommandGenerator/CommandGenerator.res +3 -1
- package/src/components/CommandGenerator/CommandGenerator_Callback.res +0 -1
- package/src/components/CommandGenerator/CommandGenerator_Callback.res.mjs +0 -2
- package/src/components/Counter/Counter_Callback.res.mjs +1 -1
- package/src/components/DcbEventLog/DcbEventLog_Operations.res.mjs +1 -1
- package/src/components/Heartbeat/Heartbeat_Callback.res +0 -1
- package/src/components/Heartbeat/Heartbeat_Callback.res.mjs +0 -1
- package/src/components/InboundTranslationSlice/InboundTranslationSlice_Callback.res.mjs +1 -1
- package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Callback.res.mjs +1 -1
- package/src/components/StateViewSlice/StateViewSlice_Builder.res.mjs +2 -2
- package/src/plugin/connect/PluginExtensionPoint_Plugin.res.mjs +1 -1
- package/src/util/CommandPublisher.res.mjs +1 -1
- package/tests/Secrets_Node_BackendTest.res +32 -0
- package/tests/Secrets_Node_BackendTest.res.mjs +29 -1
- package/tests/dcb/DcbEventLogOperationsTest.res.mjs +1 -1
- package/tests/message/MessageTest.res +9 -0
- package/tests/message/MessageTest.res.mjs +5 -0
- package/tests/message/MetaEnvelopeTest.res +37 -20
- package/tests/message/MetaEnvelopeTest.res.mjs +32 -17
- package/tests/plugin/HeartbeatDisconnectGraceTest.res.mjs +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,30 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# 3.0.0-alpha.312 (2026-10-29)
|
|
7
|
+
|
|
8
|
+
* feat(registration)!: the ledger tags an address by its keyed fingerprint ([ccafddf](https://github.com/ReventlessDev/reventless-core/commit/ccafddfc7eb8039687afc62a483ce34b8e7081dd))
|
|
9
|
+
* feat(core)!: the caller's IP address leaves the messages a request causes ([aa9e8c7](https://github.com/ReventlessDev/reventless-core/commit/aa9e8c79c0360528a5cfeda2bb88d1da52f28674))
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* **spec:** personal data has a type, three stored forms and a provider seam ([134c0d1](https://github.com/ReventlessDev/reventless-core/commit/134c0d1e0a3c97304a5cd418db76c7d6b3447dcb))
|
|
13
|
+
|
|
14
|
+
### BREAKING CHANGES
|
|
15
|
+
|
|
16
|
+
* `Secrets.t` has a third field, `fingerprint`; a hand-built provider
|
|
17
|
+
adds it. `Register` and `Invite` take `address`, and their `email` is the
|
|
18
|
+
fingerprint from `ContactAddressId.fingerprint`, not `makeFromString(address)`.
|
|
19
|
+
|
|
20
|
+
Step PD5 of docs/plans/a-personal-field-is-marked-redacted-and-encrypted-at-the-seam.md.
|
|
21
|
+
Claude-Session: https://claude.ai/code/session_01HiQfdxVEsHwLHRoHSUcus1
|
|
22
|
+
* `Message.generateMeta` no longer takes `~ip`. Drop the argument; a
|
|
23
|
+
message that must carry the address declares it as a field of its own payload.
|
|
24
|
+
|
|
25
|
+
Step PD3 of docs/plans/a-personal-field-is-marked-redacted-and-encrypted-at-the-seam.md.
|
|
26
|
+
Claude-Session: https://claude.ai/code/session_01HiQfdxVEsHwLHRoHSUcus1
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
6
30
|
# 3.0.0-alpha.311 (2026-10-29)
|
|
7
31
|
|
|
8
32
|
* refactor!: drop `dcbSources`, the cross-plugin DCB subscription nobody declared ([cf3b66d](https://github.com/ReventlessDev/reventless-core/commit/cf3b66d8c1b5d87673197b64eaee174598bb8253))
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reventlessdev/reventless-core",
|
|
3
|
-
"version": "3.0.0-alpha.
|
|
3
|
+
"version": "3.0.0-alpha.312",
|
|
4
4
|
"description": "Core package for Reventless framework",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"jest": {
|
|
@@ -28,17 +28,17 @@
|
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"sury": "11.0.0",
|
|
30
30
|
"uuid": "^13.0.0",
|
|
31
|
-
"@reventlessdev/rescript-effect": "1.0.0-alpha.1",
|
|
32
31
|
"@reventlessdev/rescript-fast-csv": "2.0.0-alpha.23",
|
|
32
|
+
"@reventlessdev/rescript-effect": "1.0.0-alpha.1",
|
|
33
33
|
"@reventlessdev/rescript-hash-object": "1.2.0-alpha.15",
|
|
34
|
-
"@reventlessdev/rescript-jest": "1.0.0-alpha.13",
|
|
35
34
|
"@reventlessdev/rescript-node": "2.0.0-alpha.23",
|
|
36
|
-
"@reventlessdev/rescript-
|
|
35
|
+
"@reventlessdev/rescript-jest": "1.0.0-alpha.13",
|
|
37
36
|
"@reventlessdev/rescript-ssh2": "2.0.0-alpha.24",
|
|
38
|
-
"@reventlessdev/
|
|
37
|
+
"@reventlessdev/rescript-pulumi-pulumi": "3.0.0-alpha.0",
|
|
39
38
|
"@reventlessdev/rescript-uuid": "2.0.0-alpha.1",
|
|
40
|
-
"@reventlessdev/reventless-
|
|
41
|
-
"@reventlessdev/reventless-interop": "3.0.0-alpha.42"
|
|
39
|
+
"@reventlessdev/reventless-infra": "3.0.0-alpha.209",
|
|
40
|
+
"@reventlessdev/reventless-interop": "3.0.0-alpha.42",
|
|
41
|
+
"@reventlessdev/reventless-spec": "3.0.0-alpha.180"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"rescript": "12.3.1",
|
package/src/Message.res
CHANGED
|
@@ -211,7 +211,6 @@ let hrtimeToString: (~hrtime: hrtime, ~now: float) => string = (~hrtime, ~now) =
|
|
|
211
211
|
|
|
212
212
|
let generateMeta = (
|
|
213
213
|
~service,
|
|
214
|
-
~ip=?,
|
|
215
214
|
~user=?,
|
|
216
215
|
~causationId=?,
|
|
217
216
|
~traceparent=?,
|
|
@@ -225,7 +224,6 @@ let generateMeta = (
|
|
|
225
224
|
time: nowAsISOString(),
|
|
226
225
|
msgId,
|
|
227
226
|
correlationId: correlationId->Option.getOr(msgId),
|
|
228
|
-
?ip,
|
|
229
227
|
?user,
|
|
230
228
|
?causationId,
|
|
231
229
|
?traceparent,
|
|
@@ -238,7 +236,9 @@ let generateMeta = (
|
|
|
238
236
|
// - fresh `msgId` and `time`
|
|
239
237
|
// - `correlationId` inherited (so the chain root id stays stable)
|
|
240
238
|
// - `causationId` = parent.msgId (the *direct* parent)
|
|
241
|
-
// - `
|
|
239
|
+
// - `user`, `traceparent`, `schemaVersion`, `headers` inherited as-is,
|
|
240
|
+
// never `ip`: the caller's address is personal data and stays out of every
|
|
241
|
+
// message a request causes
|
|
242
242
|
// except the stable-id mark: this id is fresh, so the child must not carry it
|
|
243
243
|
// - `service` overridable; defaults to parent's service
|
|
244
244
|
let deriveMeta = (~parent: meta, ~service=?) => {
|
|
@@ -247,7 +247,6 @@ let deriveMeta = (~parent: meta, ~service=?) => {
|
|
|
247
247
|
msgId: uuid(),
|
|
248
248
|
correlationId: parent.correlationId,
|
|
249
249
|
causationId: parent.msgId,
|
|
250
|
-
ip: ?parent.ip,
|
|
251
250
|
user: ?parent.user,
|
|
252
251
|
traceparent: ?parent.traceparent,
|
|
253
252
|
schemaVersion: ?parent.schemaVersion,
|
|
@@ -287,7 +286,16 @@ let composeMeta = (dict: dict<JSON.t>) => {
|
|
|
287
286
|
("msgId", dict->Dict.get("msgId")->Option.getOrThrow),
|
|
288
287
|
("correlationId", dict->Dict.get("correlationId")->Option.getOrThrow),
|
|
289
288
|
]
|
|
290
|
-
let optionalKeys = [
|
|
289
|
+
let optionalKeys = [
|
|
290
|
+
"ip",
|
|
291
|
+
"user",
|
|
292
|
+
"causationId",
|
|
293
|
+
"traceparent",
|
|
294
|
+
"schemaVersion",
|
|
295
|
+
"headers",
|
|
296
|
+
"dataClass",
|
|
297
|
+
"keyRef",
|
|
298
|
+
]
|
|
291
299
|
let optional =
|
|
292
300
|
optionalKeys
|
|
293
301
|
->Array.map(k => dict->Dict.get(k)->Option.map(v => (k, v)))
|
|
@@ -308,6 +316,8 @@ let metaKeys = [
|
|
|
308
316
|
"traceparent",
|
|
309
317
|
"schemaVersion",
|
|
310
318
|
"headers",
|
|
319
|
+
"dataClass",
|
|
320
|
+
"keyRef",
|
|
311
321
|
]
|
|
312
322
|
|
|
313
323
|
/*
|
package/src/Message.res.mjs
CHANGED
|
@@ -170,12 +170,11 @@ function hrtimeToString(hrtime, now) {
|
|
|
170
170
|
return now.toString() + ("-" + ("0".repeat(9 - milLength | 0) + milString));
|
|
171
171
|
}
|
|
172
172
|
|
|
173
|
-
function generateMeta(service,
|
|
173
|
+
function generateMeta(service, user, causationId, traceparent, correlationId, schemaVersion, headers) {
|
|
174
174
|
let msgId = Uuid.v4();
|
|
175
175
|
return {
|
|
176
176
|
service: service,
|
|
177
177
|
time: new Date().toISOString(),
|
|
178
|
-
ip: ip,
|
|
179
178
|
user: user,
|
|
180
179
|
msgId: msgId,
|
|
181
180
|
correlationId: Stdlib_Option.getOr(correlationId, msgId),
|
|
@@ -190,7 +189,6 @@ function deriveMeta(parent, service) {
|
|
|
190
189
|
return {
|
|
191
190
|
service: Stdlib_Option.getOr(service, parent.service),
|
|
192
191
|
time: new Date().toISOString(),
|
|
193
|
-
ip: parent.ip,
|
|
194
192
|
user: parent.user,
|
|
195
193
|
msgId: Uuid.v4(),
|
|
196
194
|
correlationId: parent.correlationId,
|
|
@@ -251,7 +249,9 @@ function composeMeta(dict) {
|
|
|
251
249
|
"causationId",
|
|
252
250
|
"traceparent",
|
|
253
251
|
"schemaVersion",
|
|
254
|
-
"headers"
|
|
252
|
+
"headers",
|
|
253
|
+
"dataClass",
|
|
254
|
+
"keyRef"
|
|
255
255
|
];
|
|
256
256
|
let optional = Stdlib_Array.filterMap(optionalKeys.map(k => Stdlib_Option.map(dict[k], v => [
|
|
257
257
|
k,
|
|
@@ -270,7 +270,9 @@ let metaKeys = [
|
|
|
270
270
|
"causationId",
|
|
271
271
|
"traceparent",
|
|
272
272
|
"schemaVersion",
|
|
273
|
-
"headers"
|
|
273
|
+
"headers",
|
|
274
|
+
"dataClass",
|
|
275
|
+
"keyRef"
|
|
274
276
|
];
|
|
275
277
|
|
|
276
278
|
function storedEventToFlatJson(stored, idSchema) {
|
|
@@ -44,17 +44,56 @@ let _draw = (~length: int, ~from: string): string => {
|
|
|
44
44
|
out->Array.join("")
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
+
/** The environment variable a deployment states its fingerprint key in. */
|
|
48
|
+
let fingerprintKeyVariable = "REVENTLESS_FINGERPRINT_KEY"
|
|
49
|
+
|
|
50
|
+
/** The shortest fingerprint key accepted: 16 bytes as hex. A shorter one is
|
|
51
|
+
refused rather than used, since a guessable key makes every fingerprint an
|
|
52
|
+
address again. */
|
|
53
|
+
let minimumFingerprintKeyLength = 32
|
|
54
|
+
|
|
55
|
+
/** HMAC-SHA256 of `purpose`, a NUL and `input`, as hex. The NUL keeps a purpose
|
|
56
|
+
that is a prefix of another from colliding with it. */
|
|
57
|
+
let fingerprintWith = (~key: string, ~purpose: string, input: string): string =>
|
|
58
|
+
NodeCrypto.createHmac("sha256", key)
|
|
59
|
+
->NodeCrypto.hmacUpdate(`${purpose}\u0000${input}`)
|
|
60
|
+
->NodeCrypto.hmacDigest("hex")
|
|
61
|
+
|
|
47
62
|
/**
|
|
48
|
-
|
|
63
|
+
A source whose fingerprints are keyed by what `fingerprintKey` answers, asked on
|
|
64
|
+
every call so a key installed after start is used.
|
|
49
65
|
|
|
50
66
|
`length` is refused rather than clamped when it is not positive: a caller asking
|
|
51
67
|
for a zero-length token has a bug, and answering `""` would hand back something
|
|
52
68
|
that compares equal to nothing and settles every challenge.
|
|
53
69
|
*/
|
|
54
|
-
let
|
|
70
|
+
let make = (~fingerprintKey: unit => option<string>): Reventless.Secrets.t => {
|
|
55
71
|
randomToken: (~length, ~alphabet) =>
|
|
56
72
|
length <= 0
|
|
57
73
|
? Error(Unavailable(`a token needs a positive length, not ${length->Int.toString}`))
|
|
58
74
|
: Ok(_draw(~length, ~from=Reventless.Secrets.characters(alphabet))),
|
|
59
75
|
hash: input => Ok(NodeCrypto.sha256Hex(input)),
|
|
76
|
+
fingerprint: (~purpose, input) =>
|
|
77
|
+
switch fingerprintKey() {
|
|
78
|
+
| Some(key) if key->String.length >= minimumFingerprintKeyLength =>
|
|
79
|
+
Ok(fingerprintWith(~key, ~purpose, input))
|
|
80
|
+
| Some(_) =>
|
|
81
|
+
Error(
|
|
82
|
+
Unavailable(
|
|
83
|
+
`the fingerprint key is shorter than ${minimumFingerprintKeyLength->Int.toString} characters`,
|
|
84
|
+
),
|
|
85
|
+
)
|
|
86
|
+
| None => Error(Unavailable(`no fingerprint key: set ${fingerprintKeyVariable}`))
|
|
87
|
+
},
|
|
60
88
|
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
The provider a deployed runtime passes: its fingerprint key is the deployment's,
|
|
92
|
+
from `REVENTLESS_FINGERPRINT_KEY`, and fingerprints are refused while none is set.
|
|
93
|
+
*/
|
|
94
|
+
let provider: Reventless.Secrets.t = make(~fingerprintKey=() =>
|
|
95
|
+
switch NodeProcess.env->Dict.get(fingerprintKeyVariable) {
|
|
96
|
+
| Some("") | None => None
|
|
97
|
+
| Some(key) => Some(key)
|
|
98
|
+
}
|
|
99
|
+
)
|
|
@@ -31,39 +31,81 @@ function _draw(length, from) {
|
|
|
31
31
|
return out.join("");
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
_0: {
|
|
39
|
-
TAG: "Unavailable",
|
|
40
|
-
_0: `a token needs a positive length, not ` + length.toString()
|
|
41
|
-
}
|
|
42
|
-
};
|
|
43
|
-
} else {
|
|
44
|
-
return {
|
|
45
|
-
TAG: "Ok",
|
|
46
|
-
_0: _draw(length, Secrets$Reventless.characters(alphabet))
|
|
47
|
-
};
|
|
48
|
-
}
|
|
34
|
+
let fingerprintKeyVariable = "REVENTLESS_FINGERPRINT_KEY";
|
|
35
|
+
|
|
36
|
+
function fingerprintWith(key, purpose, input) {
|
|
37
|
+
return Nodecrypto.createHmac("sha256", key).update(purpose + `\u0000` + input).digest("hex");
|
|
49
38
|
}
|
|
50
39
|
|
|
51
|
-
function
|
|
40
|
+
function make(fingerprintKey) {
|
|
52
41
|
return {
|
|
53
|
-
|
|
54
|
-
|
|
42
|
+
randomToken: (length, alphabet) => {
|
|
43
|
+
if (length <= 0) {
|
|
44
|
+
return {
|
|
45
|
+
TAG: "Error",
|
|
46
|
+
_0: {
|
|
47
|
+
TAG: "Unavailable",
|
|
48
|
+
_0: `a token needs a positive length, not ` + length.toString()
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
} else {
|
|
52
|
+
return {
|
|
53
|
+
TAG: "Ok",
|
|
54
|
+
_0: _draw(length, Secrets$Reventless.characters(alphabet))
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
},
|
|
58
|
+
hash: input => ({
|
|
59
|
+
TAG: "Ok",
|
|
60
|
+
_0: NodeCrypto.sha256Hex(input)
|
|
61
|
+
}),
|
|
62
|
+
fingerprint: (purpose, input) => {
|
|
63
|
+
let key = fingerprintKey();
|
|
64
|
+
if (key !== undefined) {
|
|
65
|
+
if (key.length >= 32) {
|
|
66
|
+
return {
|
|
67
|
+
TAG: "Ok",
|
|
68
|
+
_0: fingerprintWith(key, purpose, input)
|
|
69
|
+
};
|
|
70
|
+
} else {
|
|
71
|
+
return {
|
|
72
|
+
TAG: "Error",
|
|
73
|
+
_0: {
|
|
74
|
+
TAG: "Unavailable",
|
|
75
|
+
_0: `the fingerprint key is shorter than ` + (32).toString() + ` characters`
|
|
76
|
+
}
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
} else {
|
|
80
|
+
return {
|
|
81
|
+
TAG: "Error",
|
|
82
|
+
_0: {
|
|
83
|
+
TAG: "Unavailable",
|
|
84
|
+
_0: `no fingerprint key: set ` + fingerprintKeyVariable
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
}
|
|
55
89
|
};
|
|
56
90
|
}
|
|
57
91
|
|
|
58
|
-
let provider = {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
92
|
+
let provider = make(() => {
|
|
93
|
+
let key = process.env[fingerprintKeyVariable];
|
|
94
|
+
if (key !== undefined && key !== "") {
|
|
95
|
+
return key;
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
let minimumFingerprintKeyLength = 32;
|
|
62
100
|
|
|
63
101
|
export {
|
|
64
102
|
_bytes,
|
|
65
103
|
accepts,
|
|
66
104
|
_draw,
|
|
105
|
+
fingerprintKeyVariable,
|
|
106
|
+
minimumFingerprintKeyLength,
|
|
107
|
+
fingerprintWith,
|
|
108
|
+
make,
|
|
67
109
|
provider,
|
|
68
110
|
}
|
|
69
|
-
/*
|
|
111
|
+
/* provider Not a pure module */
|
|
@@ -49,7 +49,7 @@ function todoRowSchemaFor(itemSchema) {
|
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
function tickEvent(key, at) {
|
|
52
|
-
let newrecord = {...Message$ReventlessCore.generateMeta(Clock$Reventless.name, undefined, undefined, undefined, undefined, undefined, undefined
|
|
52
|
+
let newrecord = {...Message$ReventlessCore.generateMeta(Clock$Reventless.name, undefined, undefined, undefined, undefined, undefined, undefined)};
|
|
53
53
|
return Object.fromEntries([
|
|
54
54
|
[
|
|
55
55
|
"id",
|
|
@@ -83,7 +83,7 @@ function Make(Spec) {
|
|
|
83
83
|
return changes;
|
|
84
84
|
};
|
|
85
85
|
let readsClock = Automation.mappings.some(M => M.sourceName === Clock$Reventless.name);
|
|
86
|
-
let makeMeta = () => Message$ReventlessCore.generateMeta(Spec.targetName, undefined, undefined, undefined, undefined, undefined, undefined
|
|
86
|
+
let makeMeta = () => Message$ReventlessCore.generateMeta(Spec.targetName, undefined, undefined, undefined, undefined, undefined, undefined);
|
|
87
87
|
let processingTimeoutMs = 15 * 60 * 1000;
|
|
88
88
|
let afterFailedAttempt = row => {
|
|
89
89
|
let retryCount = row.retryCount + 1 | 0;
|
|
@@ -13,7 +13,9 @@ The `id` field is the envelope id for the produced command message:
|
|
|
13
13
|
source of truth.
|
|
14
14
|
*/
|
|
15
15
|
type arguments = {id: string}
|
|
16
|
-
|
|
16
|
+
// `ip` is what a resolver written before the caller's address left the envelope
|
|
17
|
+
// still sends; nothing reads it, so it never reaches a message.
|
|
18
|
+
type meta = {ip?: array<string>, user: string, info: string}
|
|
17
19
|
type payload = {
|
|
18
20
|
command: string,
|
|
19
21
|
arguments: arguments,
|
|
@@ -64,13 +64,11 @@ function makeGenerateCommand(publishJsons, publishJsonsAndWait, serviceName, com
|
|
|
64
64
|
let msgId = Message$ReventlessCore.uuid();
|
|
65
65
|
let scope = OwnerScope$Reventless.resolve(payload.identity, undefined);
|
|
66
66
|
let meta_time = Message$ReventlessCore.nowAsISOString();
|
|
67
|
-
let meta_ip = Stdlib_Option.getOr(payload.meta.ip.shift(), "");
|
|
68
67
|
let meta_user = payload.meta.user;
|
|
69
68
|
let meta_callerClaim = OwnerScope$Reventless.toClaim(scope);
|
|
70
69
|
let meta = {
|
|
71
70
|
service: serviceName,
|
|
72
71
|
time: meta_time,
|
|
73
|
-
ip: meta_ip,
|
|
74
72
|
user: meta_user,
|
|
75
73
|
msgId: msgId,
|
|
76
74
|
correlationId: msgId,
|
|
@@ -39,7 +39,7 @@ function Make(Spec) {
|
|
|
39
39
|
if (count === 0) {
|
|
40
40
|
let match$1 = Counter$ReventlessCore.unmakeId(id);
|
|
41
41
|
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter_Callback-ReventlessCore", undefined, `counterHandler: counted down ` + Spec.name + `(` + id + `) to ` + count.toString()));
|
|
42
|
-
let meta = Message$ReventlessCore.generateMeta(ComponentType$ReventlessCore.toName("Counter"),
|
|
42
|
+
let meta = Message$ReventlessCore.generateMeta(ComponentType$ReventlessCore.toName("Counter"), "Counter", undefined, undefined, undefined, undefined, undefined);
|
|
43
43
|
return Object.fromEntries([
|
|
44
44
|
[
|
|
45
45
|
"id",
|
|
@@ -17,7 +17,7 @@ function Make(Ops) {
|
|
|
17
17
|
let serviceName = Ops.serviceName;
|
|
18
18
|
let publishToEventTopic = async rawEvents => {
|
|
19
19
|
let re = rawEvents[0];
|
|
20
|
-
let representativeMeta = re !== undefined ? re.meta : Message$ReventlessCore.generateMeta(serviceName, undefined, undefined, undefined, undefined, undefined, undefined
|
|
20
|
+
let representativeMeta = re !== undefined ? re.meta : Message$ReventlessCore.generateMeta(serviceName, undefined, undefined, undefined, undefined, undefined, undefined);
|
|
21
21
|
let rawEventsJson = rawEvents.map(rawEvent => Message$ReventlessCore.combineMessage(rawEvent.eventType, Stdlib_Option.getOr(Stdlib_JSON.Decode.object(rawEvent.data), {})));
|
|
22
22
|
let hook = EventPublish_Callback$ReventlessCore.beforePublishHook.contents;
|
|
23
23
|
let finalRawEventsJson;
|
|
@@ -151,7 +151,7 @@ function Make(Spec) {
|
|
|
151
151
|
return Translation => {
|
|
152
152
|
let auditLog = {};
|
|
153
153
|
let sensitive = Sensitive$Reventless.fieldNames(Spec.externalInputSchema);
|
|
154
|
-
let makeMeta = () => Message$ReventlessCore.generateMeta(Spec.targetName, undefined, undefined, undefined, undefined, undefined, undefined
|
|
154
|
+
let makeMeta = () => Message$ReventlessCore.generateMeta(Spec.targetName, undefined, undefined, undefined, undefined, undefined, undefined);
|
|
155
155
|
let messageOf = (exn, fallback) => Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(exn), Stdlib_JsExn.message), fallback);
|
|
156
156
|
let failWith = (requestId, input, door, caller, errorCode, error) => {
|
|
157
157
|
auditLog[requestId] = {
|
|
@@ -46,7 +46,7 @@ function todoRowSchemaFor(itemSchema) {
|
|
|
46
46
|
function Make(Spec) {
|
|
47
47
|
return Translation => {
|
|
48
48
|
let todoItems = {};
|
|
49
|
-
let makeMeta = () => Message$ReventlessCore.generateMeta(Stdlib_Option.getOr(Spec.targetName, `OutboundTranslationSlice:` + Spec.name), undefined, undefined, undefined, undefined, undefined, undefined
|
|
49
|
+
let makeMeta = () => Message$ReventlessCore.generateMeta(Stdlib_Option.getOr(Spec.targetName, `OutboundTranslationSlice:` + Spec.name), undefined, undefined, undefined, undefined, undefined, undefined);
|
|
50
50
|
let afterFailedAttempt = (row, lastError) => {
|
|
51
51
|
let retryCount = row.retryCount + 1 | 0;
|
|
52
52
|
let newrecord = {...row};
|
|
@@ -90,10 +90,10 @@ function Make(RuntimeEnvironment) {
|
|
|
90
90
|
try {
|
|
91
91
|
meta = Util_Sury$Reventless.fromJson(m, Message$ReventlessCore.metaSchema);
|
|
92
92
|
} catch (exn) {
|
|
93
|
-
meta = Message$ReventlessCore.generateMeta(Spec.name, undefined, undefined, undefined, undefined, undefined, undefined
|
|
93
|
+
meta = Message$ReventlessCore.generateMeta(Spec.name, undefined, undefined, undefined, undefined, undefined, undefined);
|
|
94
94
|
}
|
|
95
95
|
} else {
|
|
96
|
-
meta = Message$ReventlessCore.generateMeta(Spec.name, undefined, undefined, undefined, undefined, undefined, undefined
|
|
96
|
+
meta = Message$ReventlessCore.generateMeta(Spec.name, undefined, undefined, undefined, undefined, undefined, undefined);
|
|
97
97
|
}
|
|
98
98
|
let recordedAt = Stdlib_Option.getOr(Stdlib_Option.flatMap(envelopeDict["recordedAt"], Stdlib_JSON.Decode.string), "");
|
|
99
99
|
let match = Message$ReventlessCore.splitMessage(rawEvent);
|
|
@@ -111,7 +111,7 @@ function Make(Spec) {
|
|
|
111
111
|
time: ScheduleOps$ReventlessCore.minutesFromNow(directive._1),
|
|
112
112
|
payload: JSON.stringify(Message$ReventlessCore.encodeCommand$p({
|
|
113
113
|
id: id,
|
|
114
|
-
meta: Message$ReventlessCore.generateMeta(PluginExtensionPointSpec$ReventlessInfra.name,
|
|
114
|
+
meta: Message$ReventlessCore.generateMeta(PluginExtensionPointSpec$ReventlessInfra.name, "Scheduler", undefined, undefined, undefined, undefined, undefined),
|
|
115
115
|
command: "DisconnectPlugin"
|
|
116
116
|
}, Sury.string, PluginExtensionPointSpec$ReventlessInfra.commandSchema))
|
|
117
117
|
});
|
|
@@ -41,7 +41,7 @@ function Make(Spec) {
|
|
|
41
41
|
let commandJson = Message$ReventlessCore.encode(param[1], Spec.commandSchema);
|
|
42
42
|
return {
|
|
43
43
|
id: param[0],
|
|
44
|
-
meta: Message$ReventlessCore.generateMeta(Spec.name,
|
|
44
|
+
meta: Message$ReventlessCore.generateMeta(Spec.name, Config.user, undefined, undefined, undefined, undefined, undefined),
|
|
45
45
|
commandJson: commandJson
|
|
46
46
|
};
|
|
47
47
|
});
|
|
@@ -139,3 +139,35 @@ describe("Secrets.fixed", () => {
|
|
|
139
139
|
expect(provider.hash("known"))->toEqual(Ok("hashed:known"))
|
|
140
140
|
)
|
|
141
141
|
})
|
|
142
|
+
|
|
143
|
+
describe("fingerprint", () => {
|
|
144
|
+
let key = "0123456789abcdef0123456789abcdef"
|
|
145
|
+
let keyed = Secrets_Node_Backend.make(~fingerprintKey=() => Some(key))
|
|
146
|
+
|
|
147
|
+
testSync("is deterministic, keyed and never the input", () => {
|
|
148
|
+
let a = keyed.fingerprint(~purpose="contactAddress", "alice@example.com")
|
|
149
|
+
expect(a)->toEqual(keyed.fingerprint(~purpose="contactAddress", "alice@example.com"))
|
|
150
|
+
switch a {
|
|
151
|
+
| Ok(value) =>
|
|
152
|
+
expect(value->String.includes("alice"))->toBe(false)
|
|
153
|
+
expect(value->String.length)->toBe(64)
|
|
154
|
+
| Error(_) => fail("expected a fingerprint")
|
|
155
|
+
}
|
|
156
|
+
let other = Secrets_Node_Backend.make(~fingerprintKey=() => Some(key ++ "-other"))
|
|
157
|
+
expect(other.fingerprint(~purpose="contactAddress", "alice@example.com") == a)->toBe(false)
|
|
158
|
+
})
|
|
159
|
+
|
|
160
|
+
testSync("two purposes never share a fingerprint", () =>
|
|
161
|
+
expect(
|
|
162
|
+
keyed.fingerprint(~purpose="contactAddress", "x") ==
|
|
163
|
+
keyed.fingerprint(~purpose="sourceAddress", "x"),
|
|
164
|
+
)->toBe(false)
|
|
165
|
+
)
|
|
166
|
+
|
|
167
|
+
testSync("is refused, never degraded, without a key or with a short one", () => {
|
|
168
|
+
let none = Secrets_Node_Backend.make(~fingerprintKey=() => None)
|
|
169
|
+
expect(none.fingerprint(~purpose="p", "x")->Result.isError)->toBe(true)
|
|
170
|
+
let short = Secrets_Node_Backend.make(~fingerprintKey=() => Some("short"))
|
|
171
|
+
expect(short.fingerprint(~purpose="p", "x")->Result.isError)->toBe(true)
|
|
172
|
+
})
|
|
173
|
+
})
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// Generated by ReScript, PLEASE EDIT WITH CARE
|
|
2
2
|
|
|
3
|
+
import * as JestGlobals from "@reventlessdev/rescript-jest/src/JestGlobals.res.mjs";
|
|
3
4
|
import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
|
|
4
5
|
import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
|
|
5
6
|
import * as Stdlib_Result from "@rescript/runtime/lib/es6/Stdlib_Result.js";
|
|
@@ -125,7 +126,7 @@ globalThis.describe("Capabilities.none.secrets", () => {
|
|
|
125
126
|
});
|
|
126
127
|
|
|
127
128
|
globalThis.describe("Secrets.fixed", () => {
|
|
128
|
-
let provider = Secrets$Reventless.fixed("known", input => `hashed:` + input);
|
|
129
|
+
let provider = Secrets$Reventless.fixed("known", input => `hashed:` + input, undefined);
|
|
129
130
|
globalThis.test("hands back the token it was built with", () => {
|
|
130
131
|
globalThis.expect(provider.randomToken(32, "UrlSafe")).toEqual({
|
|
131
132
|
TAG: "Ok",
|
|
@@ -140,6 +141,33 @@ globalThis.describe("Secrets.fixed", () => {
|
|
|
140
141
|
});
|
|
141
142
|
});
|
|
142
143
|
|
|
144
|
+
globalThis.describe("fingerprint", () => {
|
|
145
|
+
let key = "0123456789abcdef0123456789abcdef";
|
|
146
|
+
let keyed = Secrets_Node_Backend$ReventlessCore.make(() => key);
|
|
147
|
+
globalThis.test("is deterministic, keyed and never the input", () => {
|
|
148
|
+
let a = keyed.fingerprint("contactAddress", "alice@example.com");
|
|
149
|
+
globalThis.expect(a).toEqual(keyed.fingerprint("contactAddress", "alice@example.com"));
|
|
150
|
+
if (a.TAG === "Ok") {
|
|
151
|
+
let value = a._0;
|
|
152
|
+
globalThis.expect(value.includes("alice")).toBe(false);
|
|
153
|
+
globalThis.expect(value.length).toBe(64);
|
|
154
|
+
} else {
|
|
155
|
+
JestGlobals.fail("expected a fingerprint");
|
|
156
|
+
}
|
|
157
|
+
let other = Secrets_Node_Backend$ReventlessCore.make(() => key + "-other");
|
|
158
|
+
globalThis.expect(Primitive_object.equal(other.fingerprint("contactAddress", "alice@example.com"), a)).toBe(false);
|
|
159
|
+
});
|
|
160
|
+
globalThis.test("two purposes never share a fingerprint", () => {
|
|
161
|
+
globalThis.expect(Primitive_object.equal(keyed.fingerprint("contactAddress", "x"), keyed.fingerprint("sourceAddress", "x"))).toBe(false);
|
|
162
|
+
});
|
|
163
|
+
globalThis.test("is refused, never degraded, without a key or with a short one", () => {
|
|
164
|
+
let none = Secrets_Node_Backend$ReventlessCore.make(() => {});
|
|
165
|
+
globalThis.expect(Stdlib_Result.isError(none.fingerprint("p", "x"))).toBe(true);
|
|
166
|
+
let short = Secrets_Node_Backend$ReventlessCore.make(() => "short");
|
|
167
|
+
globalThis.expect(Stdlib_Result.isError(short.fingerprint("p", "x"))).toBe(true);
|
|
168
|
+
});
|
|
169
|
+
});
|
|
170
|
+
|
|
143
171
|
let Secrets;
|
|
144
172
|
|
|
145
173
|
let Backend;
|
|
@@ -43,7 +43,7 @@ function encodeEvent(event) {
|
|
|
43
43
|
let json = Util_Sury$Reventless.toJson(event, DcbFixtures$ReventlessCore.TestEventLogSpec.eventSchema);
|
|
44
44
|
let match = Message$ReventlessCore.splitMessage(json);
|
|
45
45
|
let tags = DcbTag$Reventless.extractTags(DcbFixtures$ReventlessCore.TestEventLogSpec.eventSchema, event);
|
|
46
|
-
let meta = Message$ReventlessCore.generateMeta("test", undefined, undefined, undefined, undefined, undefined, undefined
|
|
46
|
+
let meta = Message$ReventlessCore.generateMeta("test", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
47
47
|
return {
|
|
48
48
|
eventType: match[0],
|
|
49
49
|
data: match[1],
|
|
@@ -260,6 +260,15 @@ describe("Message.deriveStableMeta", () => {
|
|
|
260
260
|
expect(a.headers->Option.flatMap(h => h->Dict.get("tenantId")))->toEqual(Some("t1"))
|
|
261
261
|
})
|
|
262
262
|
|
|
263
|
+
testSync("a derived message never carries the caller's ip, even from an old parent", () => {
|
|
264
|
+
let a = deriveStableMeta(
|
|
265
|
+
~parent={...parent, ip: "10.0.0.1"},
|
|
266
|
+
~service="Ordering.Orders",
|
|
267
|
+
~index=0,
|
|
268
|
+
)
|
|
269
|
+
expect(a.ip)->toEqual(None)
|
|
270
|
+
})
|
|
271
|
+
|
|
263
272
|
testSync("a different parent, emitter, index or item gives a different msgId", () => {
|
|
264
273
|
let base = deriveStableMeta(~parent, ~service="Ordering.Orders", ~index=0)
|
|
265
274
|
let otherParent = deriveStableMeta(
|
|
@@ -242,6 +242,11 @@ globalThis.describe("Message.deriveStableMeta", () => {
|
|
|
242
242
|
globalThis.expect(a.traceparent).toEqual("00-trace-span-01");
|
|
243
243
|
globalThis.expect(Stdlib_Option.flatMap(a.headers, h => h["tenantId"])).toEqual("t1");
|
|
244
244
|
});
|
|
245
|
+
globalThis.test("a derived message never carries the caller's ip, even from an old parent", () => {
|
|
246
|
+
let newrecord = {...parent};
|
|
247
|
+
let a = Message$ReventlessCore.deriveStableMeta((newrecord.ip = "10.0.0.1", newrecord), "Ordering.Orders", 0, undefined);
|
|
248
|
+
globalThis.expect(a.ip).toEqual(undefined);
|
|
249
|
+
});
|
|
245
250
|
globalThis.test("a different parent, emitter, index or item gives a different msgId", () => {
|
|
246
251
|
let base = Message$ReventlessCore.deriveStableMeta(parent, "Ordering.Orders", 0, undefined);
|
|
247
252
|
let newrecord = {...parent};
|
|
@@ -44,16 +44,19 @@ describe("Message.meta optional fields:", () => {
|
|
|
44
44
|
|
|
45
45
|
testSync("all new optional fields round-trip when set", () => {
|
|
46
46
|
let headers = Dict.fromArray([("tenantId", "t1"), ("feature.x", "on")])
|
|
47
|
-
let meta =
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
47
|
+
let meta = {
|
|
48
|
+
...generateMeta(
|
|
49
|
+
~service="svc",
|
|
50
|
+
~user="bob",
|
|
51
|
+
~causationId="parent-msg-id",
|
|
52
|
+
~traceparent="00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01",
|
|
53
|
+
~correlationId="root-msg-id",
|
|
54
|
+
~schemaVersion="1.2.0",
|
|
55
|
+
~headers,
|
|
56
|
+
),
|
|
57
|
+
// Nothing writes `ip` any more; a message written before still carries it.
|
|
58
|
+
ip: "10.0.0.1",
|
|
59
|
+
}
|
|
57
60
|
let json = meta->Reventless.Util_Sury.toJson(metaSchema)
|
|
58
61
|
let decoded = json->Reventless.Util_Sury.fromJson(metaSchema)
|
|
59
62
|
expect(decoded.ip)->toEqual(Some("10.0.0.1"))->ignore
|
|
@@ -95,17 +98,19 @@ describe("Message.deriveMeta:", () => {
|
|
|
95
98
|
expect(leaf.causationId)->toEqual(Some(mid.msgId))
|
|
96
99
|
})
|
|
97
100
|
|
|
98
|
-
testSync("inherits
|
|
99
|
-
let parent =
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
testSync("inherits user/traceparent/schemaVersion/headers from parent, never ip", () => {
|
|
102
|
+
let parent = {
|
|
103
|
+
...generateMeta(
|
|
104
|
+
~service="svc",
|
|
105
|
+
~user="alice",
|
|
106
|
+
~traceparent="tp",
|
|
107
|
+
~schemaVersion="1",
|
|
108
|
+
~headers=Dict.fromArray([("k", "v")]),
|
|
109
|
+
),
|
|
110
|
+
ip: "10.0.0.1",
|
|
111
|
+
}
|
|
107
112
|
let child = deriveMeta(~parent)
|
|
108
|
-
expect(child.ip)->toEqual(
|
|
113
|
+
expect(child.ip)->toEqual(None)->ignore
|
|
109
114
|
expect(child.user)->toEqual(Some("alice"))->ignore
|
|
110
115
|
expect(child.traceparent)->toEqual(Some("tp"))->ignore
|
|
111
116
|
expect(child.schemaVersion)->toEqual(Some("1"))->ignore
|
|
@@ -194,3 +199,15 @@ describe("StoredEvent encode/decode round-trip:", () => {
|
|
|
194
199
|
},
|
|
195
200
|
)
|
|
196
201
|
})
|
|
202
|
+
|
|
203
|
+
describe("reserved envelope keys", () => {
|
|
204
|
+
testSync("dataClass and keyRef are optional, round-trip, and are meta keys", () => {
|
|
205
|
+
let meta = {...generateMeta(~service="svc"), dataClass: "personal", keyRef: "k-1"}
|
|
206
|
+
let decoded =
|
|
207
|
+
meta->Reventless.Util_Sury.toJson(metaSchema)->Reventless.Util_Sury.fromJson(metaSchema)
|
|
208
|
+
expect(decoded.dataClass)->toEqual(Some("personal"))->ignore
|
|
209
|
+
expect(decoded.keyRef)->toEqual(Some("k-1"))->ignore
|
|
210
|
+
expect(generateMeta(~service="svc").dataClass)->toEqual(None)->ignore
|
|
211
|
+
expect(metaKeys->Array.includes("dataClass") && metaKeys->Array.includes("keyRef"))->toBe(true)
|
|
212
|
+
})
|
|
213
|
+
})
|
|
@@ -8,7 +8,7 @@ import * as Message$ReventlessCore from "../../src/Message.res.mjs";
|
|
|
8
8
|
|
|
9
9
|
globalThis.describe("Message.meta optional fields:", () => {
|
|
10
10
|
globalThis.test("generateMeta() with no ~ip/~user omits those keys from JSON", () => {
|
|
11
|
-
let meta = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined
|
|
11
|
+
let meta = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
12
12
|
let json = Util_Sury$Reventless.toJson(meta, Message$ReventlessCore.metaSchema);
|
|
13
13
|
let obj = Stdlib_Option.getOrThrow(Stdlib_JSON.Decode.object(json), undefined);
|
|
14
14
|
globalThis.expect(obj["ip"]).toEqual(undefined);
|
|
@@ -23,11 +23,11 @@ globalThis.describe("Message.meta optional fields:", () => {
|
|
|
23
23
|
globalThis.expect(Stdlib_Option.isSome(obj["correlationId"])).toBe(true);
|
|
24
24
|
});
|
|
25
25
|
globalThis.test("generateMeta() correlationId defaults to msgId", () => {
|
|
26
|
-
let meta = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined
|
|
26
|
+
let meta = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
27
27
|
globalThis.expect(meta.correlationId).toBe(meta.msgId);
|
|
28
28
|
});
|
|
29
29
|
globalThis.test("generateMeta(~user=alice) round-trips Some(alice)", () => {
|
|
30
|
-
let meta = Message$ReventlessCore.generateMeta("svc",
|
|
30
|
+
let meta = Message$ReventlessCore.generateMeta("svc", "alice", undefined, undefined, undefined, undefined, undefined);
|
|
31
31
|
let json = Util_Sury$Reventless.toJson(meta, Message$ReventlessCore.metaSchema);
|
|
32
32
|
let decoded = Util_Sury$Reventless.fromJson(json, Message$ReventlessCore.metaSchema);
|
|
33
33
|
globalThis.expect(decoded.user).toEqual("alice");
|
|
@@ -43,8 +43,9 @@ globalThis.describe("Message.meta optional fields:", () => {
|
|
|
43
43
|
"on"
|
|
44
44
|
]
|
|
45
45
|
]);
|
|
46
|
-
let
|
|
47
|
-
|
|
46
|
+
let newrecord = {...Message$ReventlessCore.generateMeta("svc", "bob", "parent-msg-id", "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01", "root-msg-id", "1.2.0", headers)};
|
|
47
|
+
newrecord.ip = "10.0.0.1";
|
|
48
|
+
let json = Util_Sury$Reventless.toJson(newrecord, Message$ReventlessCore.metaSchema);
|
|
48
49
|
let decoded = Util_Sury$Reventless.fromJson(json, Message$ReventlessCore.metaSchema);
|
|
49
50
|
globalThis.expect(decoded.ip).toEqual("10.0.0.1");
|
|
50
51
|
globalThis.expect(decoded.user).toEqual("bob");
|
|
@@ -58,37 +59,38 @@ globalThis.describe("Message.meta optional fields:", () => {
|
|
|
58
59
|
|
|
59
60
|
globalThis.describe("Message.deriveMeta:", () => {
|
|
60
61
|
globalThis.test("emits a new msgId distinct from the parent", () => {
|
|
61
|
-
let parent = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined
|
|
62
|
+
let parent = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
62
63
|
let child = Message$ReventlessCore.deriveMeta(parent, undefined);
|
|
63
64
|
globalThis.expect(child.msgId === parent.msgId).toBe(false);
|
|
64
65
|
});
|
|
65
66
|
globalThis.test("sets causationId = parent.msgId", () => {
|
|
66
|
-
let parent = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined
|
|
67
|
+
let parent = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
67
68
|
let child = Message$ReventlessCore.deriveMeta(parent, undefined);
|
|
68
69
|
globalThis.expect(child.causationId).toEqual(parent.msgId);
|
|
69
70
|
});
|
|
70
71
|
globalThis.test("inherits correlationId (chain-root id stays stable)", () => {
|
|
71
|
-
let root = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined
|
|
72
|
+
let root = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
72
73
|
let mid = Message$ReventlessCore.deriveMeta(root, undefined);
|
|
73
74
|
let leaf = Message$ReventlessCore.deriveMeta(mid, undefined);
|
|
74
75
|
globalThis.expect(mid.correlationId).toBe(root.correlationId);
|
|
75
76
|
globalThis.expect(leaf.correlationId).toBe(root.correlationId);
|
|
76
77
|
globalThis.expect(leaf.causationId).toEqual(mid.msgId);
|
|
77
78
|
});
|
|
78
|
-
globalThis.test("inherits
|
|
79
|
-
let
|
|
79
|
+
globalThis.test("inherits user/traceparent/schemaVersion/headers from parent, never ip", () => {
|
|
80
|
+
let newrecord = {...Message$ReventlessCore.generateMeta("svc", "alice", undefined, "tp", undefined, "1", Object.fromEntries([[
|
|
80
81
|
"k",
|
|
81
82
|
"v"
|
|
82
|
-
]]));
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
]]))};
|
|
84
|
+
newrecord.ip = "10.0.0.1";
|
|
85
|
+
let child = Message$ReventlessCore.deriveMeta(newrecord, undefined);
|
|
86
|
+
globalThis.expect(child.ip).toEqual(undefined);
|
|
85
87
|
globalThis.expect(child.user).toEqual("alice");
|
|
86
88
|
globalThis.expect(child.traceparent).toEqual("tp");
|
|
87
89
|
globalThis.expect(child.schemaVersion).toEqual("1");
|
|
88
90
|
globalThis.expect(Stdlib_Option.getOr(child.headers, {})["k"]).toEqual("v");
|
|
89
91
|
});
|
|
90
92
|
globalThis.test("~service overrides parent's service; defaults to parent's service", () => {
|
|
91
|
-
let parent = Message$ReventlessCore.generateMeta("parent-svc", undefined, undefined, undefined, undefined, undefined, undefined
|
|
93
|
+
let parent = Message$ReventlessCore.generateMeta("parent-svc", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
92
94
|
let inherited = Message$ReventlessCore.deriveMeta(parent, undefined);
|
|
93
95
|
let overridden = Message$ReventlessCore.deriveMeta(parent, "child-svc");
|
|
94
96
|
globalThis.expect(inherited.service).toBe("parent-svc");
|
|
@@ -98,7 +100,7 @@ globalThis.describe("Message.deriveMeta:", () => {
|
|
|
98
100
|
|
|
99
101
|
globalThis.describe("StoredEvent encode/decode round-trip:", () => {
|
|
100
102
|
globalThis.test("aggregate-style record (no tags) round-trips through the flat-dict bridge", () => {
|
|
101
|
-
let meta = Message$ReventlessCore.generateMeta("catalog", undefined, undefined, undefined, undefined, undefined, undefined
|
|
103
|
+
let meta = Message$ReventlessCore.generateMeta("catalog", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
102
104
|
let stored_data = Object.fromEntries([
|
|
103
105
|
[
|
|
104
106
|
"itemId",
|
|
@@ -128,7 +130,7 @@ globalThis.describe("StoredEvent encode/decode round-trip:", () => {
|
|
|
128
130
|
globalThis.expect(roundTrip.tags).toEqual(undefined);
|
|
129
131
|
});
|
|
130
132
|
globalThis.test("DCB-style record (with tags) round-trips and preserves the tag list", () => {
|
|
131
|
-
let meta = Message$ReventlessCore.generateMeta("catalog", undefined,
|
|
133
|
+
let meta = Message$ReventlessCore.generateMeta("catalog", undefined, "cmd-1", undefined, undefined, undefined, undefined);
|
|
132
134
|
let stored_data = Object.fromEntries([[
|
|
133
135
|
"productId",
|
|
134
136
|
"p-1"
|
|
@@ -165,7 +167,7 @@ globalThis.describe("StoredEvent encode/decode round-trip:", () => {
|
|
|
165
167
|
globalThis.expect(first.value).toBe("p-1");
|
|
166
168
|
});
|
|
167
169
|
globalThis.test("meta is flattened to top-level keys in the on-disk JSON (DynamoDB GSI projectability)", () => {
|
|
168
|
-
let meta = Message$ReventlessCore.generateMeta("catalog", undefined, undefined, undefined, undefined, undefined, undefined
|
|
170
|
+
let meta = Message$ReventlessCore.generateMeta("catalog", undefined, undefined, undefined, undefined, undefined, undefined);
|
|
169
171
|
let stored_data = {};
|
|
170
172
|
let stored = {
|
|
171
173
|
id: "agg-1",
|
|
@@ -186,4 +188,17 @@ globalThis.describe("StoredEvent encode/decode round-trip:", () => {
|
|
|
186
188
|
});
|
|
187
189
|
});
|
|
188
190
|
|
|
191
|
+
globalThis.describe("reserved envelope keys", () => {
|
|
192
|
+
globalThis.test("dataClass and keyRef are optional, round-trip, and are meta keys", () => {
|
|
193
|
+
let newrecord = {...Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined)};
|
|
194
|
+
newrecord.keyRef = "k-1";
|
|
195
|
+
newrecord.dataClass = "personal";
|
|
196
|
+
let decoded = Util_Sury$Reventless.fromJson(Util_Sury$Reventless.toJson(newrecord, Message$ReventlessCore.metaSchema), Message$ReventlessCore.metaSchema);
|
|
197
|
+
globalThis.expect(decoded.dataClass).toEqual("personal");
|
|
198
|
+
globalThis.expect(decoded.keyRef).toEqual("k-1");
|
|
199
|
+
globalThis.expect(Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined).dataClass).toEqual(undefined);
|
|
200
|
+
globalThis.expect(Message$ReventlessCore.metaKeys.includes("dataClass") && Message$ReventlessCore.metaKeys.includes("keyRef")).toBe(true);
|
|
201
|
+
});
|
|
202
|
+
});
|
|
203
|
+
|
|
189
204
|
/* Not a pure module */
|
|
@@ -23,7 +23,7 @@ function graceFromActions(actions) {
|
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
let meta = Message$ReventlessCore.generateMeta("test",
|
|
26
|
+
let meta = Message$ReventlessCore.generateMeta("test", "test", undefined, undefined, undefined, undefined, undefined);
|
|
27
27
|
|
|
28
28
|
globalThis.describe("disconnectGrace", () => {
|
|
29
29
|
globalThis.test("scales with the interval (5→7, 10→15, 60→90)", () => {
|