@reventlessdev/reventless-core 3.0.0-alpha.310 → 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 +44 -0
- package/package.json +6 -6
- package/src/Message.res +23 -6
- package/src/Message.res.mjs +15 -6
- package/src/adapter/Secrets/Secrets_Node_Backend.res +41 -2
- package/src/adapter/Secrets/Secrets_Node_Backend.res.mjs +65 -23
- package/src/admin/Platform_Admin.res.mjs +0 -2
- package/src/components/Aggregate/Aggregate_Callback.res +111 -48
- package/src/components/Aggregate/Aggregate_Callback.res.mjs +107 -49
- package/src/components/AutomationSlice/AutomationSlice_Callback.res.mjs +2 -2
- package/src/components/Builder_Helpers.res +0 -17
- package/src/components/Builder_Helpers.res.mjs +0 -15
- 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/EventLog/EventLog.res +7 -0
- package/src/components/EventLog/EventLog_Builder.res +2 -0
- package/src/components/EventLog/EventLog_Builder.res.mjs +1 -0
- package/src/components/EventLog/EventLog_Operations.res +30 -0
- package/src/components/EventLog/EventLog_Operations.res.mjs +18 -0
- package/src/components/Extension/Extension.res +0 -2
- package/src/components/Extension/Extension_Builder.res +2 -20
- package/src/components/Extension/Extension_Builder.res.mjs +1 -3
- package/src/components/Extension/Extension_Operations.res +0 -19
- package/src/components/Extension/Extension_Operations.res.mjs +1 -7
- 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/ReadModel/ReadModel_Builder.res +12 -2
- package/src/components/ReadModel/ReadModel_Builder.res.mjs +2 -1
- package/src/components/StateChangeSlice/StateChangeSlice_Callback.res +72 -35
- package/src/components/StateChangeSlice/StateChangeSlice_Callback.res.mjs +45 -31
- package/src/components/StateViewSlice/StateViewSlice_Builder.res.mjs +2 -2
- package/src/plugin/component/Plugin_Builder.res +1 -26
- package/src/plugin/component/Plugin_Builder.res.mjs +6 -20
- package/src/plugin/component/Plugin_Helpers.res +0 -37
- package/src/plugin/component/Plugin_Helpers.res.mjs +8 -21
- 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/aggregate/AggregateCacheTest.res +6 -0
- package/tests/aggregate/AggregateCacheTest.res.mjs +5 -0
- package/tests/aggregate/AggregateConflictTest.res +6 -0
- package/tests/aggregate/AggregateConflictTest.res.mjs +5 -0
- package/tests/aggregate/AggregateFixtures.res +6 -0
- package/tests/aggregate/AggregateFixtures.res.mjs +5 -0
- package/tests/aggregate/AggregateRepeatTest.res +186 -0
- package/tests/aggregate/AggregateRepeatTest.res.mjs +332 -0
- package/tests/aggregate/AggregateSnapshotTest.res +6 -0
- package/tests/aggregate/AggregateSnapshotTest.res.mjs +12 -0
- package/tests/commandgenerator/OwnerActingTest.res +6 -0
- package/tests/commandgenerator/OwnerActingTest.res.mjs +5 -0
- package/tests/dcb/DcbEventLogOperationsTest.res.mjs +1 -1
- package/tests/extensionpoint/DerivedMessageIdTest.res +217 -0
- package/tests/extensionpoint/DerivedMessageIdTest.res.mjs +361 -0
- package/tests/logger/LogFormatTest.res +1 -2
- package/tests/logger/LogFormatTest.res.mjs +2 -3
- package/tests/message/MessageTest.res +57 -1
- package/tests/message/MessageTest.res.mjs +61 -2
- package/tests/message/MetaEnvelopeTest.res +37 -20
- package/tests/message/MetaEnvelopeTest.res.mjs +32 -17
- package/tests/plugin/HeartbeatDisconnectGraceTest.res.mjs +1 -1
- package/tests/plugin/pluginDefinitionRequiredScalars.txt +0 -1
|
@@ -143,7 +143,7 @@ function serviceNameToJsonEventsHandlers(outputs, getServiceNames, handlers, get
|
|
|
143
143
|
return dict;
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
-
function createExtensions(extensions, pluginName, publishToPluginExtensionPoint, publishToAggregates,
|
|
146
|
+
function createExtensions(extensions, pluginName, publishToPluginExtensionPoint, publishToAggregates, queryEngine, opts) {
|
|
147
147
|
let groups = {};
|
|
148
148
|
extensions.forEach(bp => {
|
|
149
149
|
let epName = bp.Spec.name;
|
|
@@ -165,7 +165,7 @@ function createExtensions(extensions, pluginName, publishToPluginExtensionPoint,
|
|
|
165
165
|
mappings: allMappings
|
|
166
166
|
};
|
|
167
167
|
let ExtensionMaker = Extension_Builder$ReventlessCore.Make(First.Spec)(Mappings);
|
|
168
|
-
let extension = ExtensionMaker.make(publishToPluginExtensionPoint, publishToAggregates,
|
|
168
|
+
let extension = ExtensionMaker.make(publishToPluginExtensionPoint, publishToAggregates, queryEngine, opts);
|
|
169
169
|
let ops = ExtensionMaker.operations(extension);
|
|
170
170
|
let registryInfo_specModule = First.Spec.moduleUrl;
|
|
171
171
|
let registryInfo_mappingsModule = First.moduleUrl;
|
|
@@ -222,18 +222,17 @@ function extractExtensionPointDefinitions(extensionPointsOutputs) {
|
|
|
222
222
|
function extractExtensionDefinitions(extensionsOutputs) {
|
|
223
223
|
return extensionsOutputs.map(extensionOutputs => ({
|
|
224
224
|
name: extensionOutputs.name,
|
|
225
|
-
extensionPointName: extensionOutputs.extensionPointName
|
|
226
|
-
dcbSources: []
|
|
225
|
+
extensionPointName: extensionOutputs.extensionPointName
|
|
227
226
|
}));
|
|
228
227
|
}
|
|
229
228
|
|
|
230
|
-
function createConnectPluginExtension(pluginDefinition, uiFragments, publishToPluginExtensionPoint, publishToAggregates,
|
|
229
|
+
function createConnectPluginExtension(pluginDefinition, uiFragments, publishToPluginExtensionPoint, publishToAggregates, queryEngine, opts) {
|
|
231
230
|
return Output$Pulumi.unzip(ResourceAttribution_Deploytime$ReventlessCore.applyAttributed(pluginDefinition, pluginDefinition => {
|
|
232
231
|
let ConnectPluginExtension = PluginConnectExtension_Builder$ReventlessCore.Make({
|
|
233
232
|
pluginDefinition: pluginDefinition,
|
|
234
233
|
uiFragments: uiFragments
|
|
235
234
|
});
|
|
236
|
-
let connectPluginExtension = ConnectPluginExtension.make(publishToPluginExtensionPoint, publishToAggregates,
|
|
235
|
+
let connectPluginExtension = ConnectPluginExtension.make(publishToPluginExtensionPoint, publishToAggregates, queryEngine, opts);
|
|
237
236
|
let connectPluginExtensionOutputs = Component$ReventlessCore.outputs(connectPluginExtension);
|
|
238
237
|
let connectPluginExtensionIncomingEventHandler = Component$ReventlessCore.operations(connectPluginExtension).apply(param => param.incomingJsonEventsHandler);
|
|
239
238
|
return [
|
|
@@ -274,13 +273,11 @@ function MakeEventCollectorHelper(RuntimeEnvironment) {
|
|
|
274
273
|
eventCollectorUrn
|
|
275
274
|
];
|
|
276
275
|
};
|
|
277
|
-
let connect = (eventCollector, eventTopics, extensionPointsOutputs, extensionsOutputs, pluginExtensionPointUnwrapped, pluginDefinition, uiFragmentsOpt, connectPluginExtensionIncomingEventHandler, extensionsHandlers, extensionPointsHandlers, connectPluginExtensionOutputs, extensionRegistryInfosOpt, extensionPointRegistryInfosOpt, aggregateQueueUrlsOpt
|
|
276
|
+
let connect = (eventCollector, eventTopics, extensionPointsOutputs, extensionsOutputs, pluginExtensionPointUnwrapped, pluginDefinition, uiFragmentsOpt, connectPluginExtensionIncomingEventHandler, extensionsHandlers, extensionPointsHandlers, connectPluginExtensionOutputs, extensionRegistryInfosOpt, extensionPointRegistryInfosOpt, aggregateQueueUrlsOpt) => {
|
|
278
277
|
let uiFragments = uiFragmentsOpt !== undefined ? Primitive_option.valFromOption(uiFragmentsOpt) : undefined;
|
|
279
278
|
let extensionRegistryInfos = extensionRegistryInfosOpt !== undefined ? extensionRegistryInfosOpt : [];
|
|
280
279
|
let extensionPointRegistryInfos = extensionPointRegistryInfosOpt !== undefined ? extensionPointRegistryInfosOpt : [];
|
|
281
280
|
let aggregateQueueUrls = aggregateQueueUrlsOpt !== undefined ? aggregateQueueUrlsOpt : ({});
|
|
282
|
-
let readModelQueueUrls = readModelQueueUrlsOpt !== undefined ? readModelQueueUrlsOpt : ({});
|
|
283
|
-
let readModelNamesForSourceName = readModelNamesForSourceNameOpt !== undefined ? readModelNamesForSourceNameOpt : ({});
|
|
284
281
|
let resources = Pulumi.all(extensionPointsOutputs.map(extensionPoint => extensionPoint.eventTopic)).apply(eventTopics => {
|
|
285
282
|
let base = eventTopics.map(eventTopic => eventTopic.resources).flat();
|
|
286
283
|
if (pluginExtensionPointUnwrapped !== undefined) {
|
|
@@ -340,15 +337,13 @@ function MakeEventCollectorHelper(RuntimeEnvironment) {
|
|
|
340
337
|
}) : undefined;
|
|
341
338
|
let extensions = extensionsOutputs.length === extensionRegistryInfos.length ? extensionsOutputs.map((output, i) => {
|
|
342
339
|
let info = extensionRegistryInfos[i];
|
|
343
|
-
let rmNames = Stdlib_Option.getOr(readModelNamesForSourceName[output.extensionPointName], []);
|
|
344
340
|
return {
|
|
345
341
|
name: output.name,
|
|
346
342
|
specModule: info.specModule,
|
|
347
343
|
mappingsModule: info.mappingsModule,
|
|
348
344
|
delegateModule: info.delegateModule,
|
|
349
345
|
extensionPointName: output.extensionPointName,
|
|
350
|
-
aggregateNames: output.aggregateNames
|
|
351
|
-
readModelNames: rmNames
|
|
346
|
+
aggregateNames: output.aggregateNames
|
|
352
347
|
};
|
|
353
348
|
}) : [];
|
|
354
349
|
let mergedAggregateUrls = {};
|
|
@@ -387,9 +382,7 @@ function MakeEventCollectorHelper(RuntimeEnvironment) {
|
|
|
387
382
|
connectExtension: connectExtension,
|
|
388
383
|
extensions: extensions,
|
|
389
384
|
pluginExtensionPointCmdTopicUrl: pluginExtensionPointCmdTopicUrl,
|
|
390
|
-
publishToAggregates: mergedAggregateUrls
|
|
391
|
-
readModelQueueUrls: readModelQueueUrls,
|
|
392
|
-
readModelNamesForSourceName: readModelNamesForSourceName
|
|
385
|
+
publishToAggregates: mergedAggregateUrls
|
|
393
386
|
});
|
|
394
387
|
PluginRuntimeBuilder.forPluginEventCollector(handler, eventTopics, param[4], undefined, undefined, eventCollector);
|
|
395
388
|
let r$1 = Component$ReventlessCore.outputs(eventCollector).resources[0];
|
|
@@ -999,10 +992,6 @@ let registerTaskSideEffectHandler = Builder_Helpers$ReventlessCore.registerTaskS
|
|
|
999
992
|
|
|
1000
993
|
let finishTasks = Builder_Helpers$ReventlessCore.finishTasks;
|
|
1001
994
|
|
|
1002
|
-
let readModelNamesForSourceName = Builder_Helpers$ReventlessCore.readModelNamesForSourceName;
|
|
1003
|
-
|
|
1004
|
-
let publishToReadModels = Builder_Helpers$ReventlessCore.publishToReadModels;
|
|
1005
|
-
|
|
1006
995
|
let finishReadModels = Builder_Helpers$ReventlessCore.finishReadModels;
|
|
1007
996
|
|
|
1008
997
|
let extractReadModelsOutputs = Builder_Helpers$ReventlessCore.extractReadModelsOutputs;
|
|
@@ -1058,8 +1047,6 @@ export {
|
|
|
1058
1047
|
taskSideEffectFinishFns,
|
|
1059
1048
|
registerTaskSideEffectHandler,
|
|
1060
1049
|
finishTasks,
|
|
1061
|
-
readModelNamesForSourceName,
|
|
1062
|
-
publishToReadModels,
|
|
1063
1050
|
finishReadModels,
|
|
1064
1051
|
extractReadModelsOutputs,
|
|
1065
1052
|
createReadModels,
|
|
@@ -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;
|
|
@@ -154,6 +154,10 @@ module TestOps = {
|
|
|
154
154
|
) => promise<result<unit, EventLog.appendError>>,
|
|
155
155
|
replay: string => promise<array<AggSpec.event>>,
|
|
156
156
|
replayStream: (string, ~fromSeq: int=?) => Stream.t<AggSpec.event, string, unit>,
|
|
157
|
+
replayStream': (
|
|
158
|
+
string,
|
|
159
|
+
~fromSeq: int=?,
|
|
160
|
+
) => Stream.t<Message.event'<string, AggSpec.event>, string, unit>,
|
|
157
161
|
appendStream: (
|
|
158
162
|
int,
|
|
159
163
|
string,
|
|
@@ -170,6 +174,8 @@ module TestOps = {
|
|
|
170
174
|
append: mock.appendFn,
|
|
171
175
|
replay: mock.replayFn,
|
|
172
176
|
replayStream: (id, ~fromSeq as _=?) => mock.replayStreamFn(id),
|
|
177
|
+
replayStream': (id, ~fromSeq as _=?) =>
|
|
178
|
+
mock.getAll()->Array.filter(e => e.id == id)->Stream.fromIterable,
|
|
173
179
|
appendStream: (_startingSeqNr, _id, stream) => stream->Stream.runDrain,
|
|
174
180
|
latestSnapshot: async _ => Ok(None),
|
|
175
181
|
writeSnapshot: async (_, _) => Ok(),
|
|
@@ -199,6 +199,10 @@ function eventLog_replayStream(id, param) {
|
|
|
199
199
|
return mock.replayStreamFn(id);
|
|
200
200
|
}
|
|
201
201
|
|
|
202
|
+
function eventLog_replayStream$p(id, param) {
|
|
203
|
+
return Stream.fromIterable(mock.getAll().filter(e => e.id === id));
|
|
204
|
+
}
|
|
205
|
+
|
|
202
206
|
function eventLog_appendStream(_startingSeqNr, _id, stream) {
|
|
203
207
|
return Stream.runDrain(stream);
|
|
204
208
|
}
|
|
@@ -221,6 +225,7 @@ let eventLog = {
|
|
|
221
225
|
append: eventLog_append,
|
|
222
226
|
replay: eventLog_replay,
|
|
223
227
|
replayStream: eventLog_replayStream,
|
|
228
|
+
"replayStream'": eventLog_replayStream$p,
|
|
224
229
|
appendStream: eventLog_appendStream,
|
|
225
230
|
latestSnapshot: eventLog_latestSnapshot,
|
|
226
231
|
writeSnapshot: eventLog_writeSnapshot
|
|
@@ -130,6 +130,10 @@ module TestOps = {
|
|
|
130
130
|
) => promise<result<unit, EventLog.appendError>>,
|
|
131
131
|
replay: string => promise<array<AggSpec.event>>,
|
|
132
132
|
replayStream: (string, ~fromSeq: int=?) => Stream.t<AggSpec.event, string, unit>,
|
|
133
|
+
replayStream': (
|
|
134
|
+
string,
|
|
135
|
+
~fromSeq: int=?,
|
|
136
|
+
) => Stream.t<Message.event'<string, AggSpec.event>, string, unit>,
|
|
133
137
|
appendStream: (
|
|
134
138
|
int,
|
|
135
139
|
string,
|
|
@@ -145,6 +149,8 @@ module TestOps = {
|
|
|
145
149
|
append: mock.appendFn,
|
|
146
150
|
replay: mock.replayFn,
|
|
147
151
|
replayStream: (id, ~fromSeq as _=?) => mock.replayStreamFn(id),
|
|
152
|
+
replayStream': (id, ~fromSeq as _=?) =>
|
|
153
|
+
mock.getAll()->Array.filter(e => e.id == id)->Stream.fromIterable,
|
|
148
154
|
appendStream: (_startingSeqNr, _id, stream) => stream->Stream.runDrain,
|
|
149
155
|
latestSnapshot: async _ => Ok(None),
|
|
150
156
|
writeSnapshot: async (_, _) => Ok(),
|
|
@@ -156,6 +156,10 @@ function eventLog_replayStream(id, param) {
|
|
|
156
156
|
return mock.replayStreamFn(id);
|
|
157
157
|
}
|
|
158
158
|
|
|
159
|
+
function eventLog_replayStream$p(id, param) {
|
|
160
|
+
return Stream.fromIterable(mock.getAll().filter(e => e.id === id));
|
|
161
|
+
}
|
|
162
|
+
|
|
159
163
|
function eventLog_appendStream(_startingSeqNr, _id, stream) {
|
|
160
164
|
return Stream.runDrain(stream);
|
|
161
165
|
}
|
|
@@ -178,6 +182,7 @@ let eventLog = {
|
|
|
178
182
|
append: eventLog_append,
|
|
179
183
|
replay: eventLog_replay,
|
|
180
184
|
replayStream: eventLog_replayStream,
|
|
185
|
+
"replayStream'": eventLog_replayStream$p,
|
|
181
186
|
appendStream: eventLog_appendStream,
|
|
182
187
|
latestSnapshot: eventLog_latestSnapshot,
|
|
183
188
|
writeSnapshot: eventLog_writeSnapshot
|
|
@@ -141,6 +141,10 @@ module TestOps = {
|
|
|
141
141
|
) => promise<result<unit, EventLog.appendError>>,
|
|
142
142
|
replay: string => promise<array<AggSpec.event>>,
|
|
143
143
|
replayStream: (string, ~fromSeq: int=?) => Stream.t<AggSpec.event, string, unit>,
|
|
144
|
+
replayStream': (
|
|
145
|
+
string,
|
|
146
|
+
~fromSeq: int=?,
|
|
147
|
+
) => Stream.t<Message.event'<string, AggSpec.event>, string, unit>,
|
|
144
148
|
appendStream: (
|
|
145
149
|
int,
|
|
146
150
|
string,
|
|
@@ -157,6 +161,8 @@ module TestOps = {
|
|
|
157
161
|
append: mock.appendFn,
|
|
158
162
|
replay: mock.replayFn,
|
|
159
163
|
replayStream: (id, ~fromSeq as _=?) => mock.replayStreamFn(id),
|
|
164
|
+
replayStream': (id, ~fromSeq as _=?) =>
|
|
165
|
+
mock.getAll()->Array.filter(e => e.id == id)->Stream.fromIterable,
|
|
160
166
|
appendStream: (_startingSeqNr, _id, stream) => stream->Stream.runDrain,
|
|
161
167
|
latestSnapshot: async _ => Ok(None),
|
|
162
168
|
writeSnapshot: async (_, _) => Ok(),
|
|
@@ -191,6 +191,10 @@ function eventLog_replayStream(id, param) {
|
|
|
191
191
|
return mock.replayStreamFn(id);
|
|
192
192
|
}
|
|
193
193
|
|
|
194
|
+
function eventLog_replayStream$p(id, param) {
|
|
195
|
+
return Stream.fromIterable(mock.getAll().filter(e => e.id === id));
|
|
196
|
+
}
|
|
197
|
+
|
|
194
198
|
function eventLog_appendStream(_startingSeqNr, _id, stream) {
|
|
195
199
|
return Stream.runDrain(stream);
|
|
196
200
|
}
|
|
@@ -213,6 +217,7 @@ let eventLog = {
|
|
|
213
217
|
append: eventLog_append,
|
|
214
218
|
replay: eventLog_replay,
|
|
215
219
|
replayStream: eventLog_replayStream,
|
|
220
|
+
"replayStream'": eventLog_replayStream$p,
|
|
216
221
|
appendStream: eventLog_appendStream,
|
|
217
222
|
latestSnapshot: eventLog_latestSnapshot,
|
|
218
223
|
writeSnapshot: eventLog_writeSnapshot
|
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
// A command with a stable id (one an Extension derived from a published event)
|
|
2
|
+
// that the stream already holds events for is accepted again with nothing new.
|
|
3
|
+
// A command with a random id is decided every time, as before.
|
|
4
|
+
|
|
5
|
+
open JestGlobals
|
|
6
|
+
|
|
7
|
+
module AggSpec = {
|
|
8
|
+
module Id = Reventless.Id.StringPure
|
|
9
|
+
let name = "RepeatTestAggregate"
|
|
10
|
+
|
|
11
|
+
@schema
|
|
12
|
+
type command = Count({by: int})
|
|
13
|
+
|
|
14
|
+
@schema
|
|
15
|
+
type event = Counted({by: int})
|
|
16
|
+
|
|
17
|
+
@schema
|
|
18
|
+
type error = Never
|
|
19
|
+
|
|
20
|
+
let moduleUrl: string = %raw(`import.meta.url`)
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
// No idempotency rule of its own: every Count appends, which is what makes the
|
|
24
|
+
// framework's drop visible.
|
|
25
|
+
module TestDecision = {
|
|
26
|
+
module Spec = AggSpec
|
|
27
|
+
type state = {total: int}
|
|
28
|
+
let initialState = {total: 0}
|
|
29
|
+
let snapshot = None
|
|
30
|
+
let moduleUrl: string = %raw(`import.meta.url`)
|
|
31
|
+
|
|
32
|
+
let evolve = (state: state, event: AggSpec.event): state =>
|
|
33
|
+
switch event {
|
|
34
|
+
| Counted({by}) => {total: state.total + by}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
let decide = (_state: state, command: AggSpec.command): result<
|
|
38
|
+
array<AggSpec.event>,
|
|
39
|
+
AggSpec.error,
|
|
40
|
+
> =>
|
|
41
|
+
switch command {
|
|
42
|
+
| Count({by}) => Ok([AggSpec.Counted({by: by})])
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
// An event log with real optimistic concurrency, holding envelopes so the
|
|
47
|
+
// `causationId`s survive.
|
|
48
|
+
let stored: ref<array<Message.event'<string, AggSpec.event>>> = ref([])
|
|
49
|
+
let eventsFor = id => stored.contents->Array.filter(e => e.id == id)
|
|
50
|
+
|
|
51
|
+
module OuterEventLog = EventLog
|
|
52
|
+
|
|
53
|
+
module TestOps = {
|
|
54
|
+
module Spec = AggSpec
|
|
55
|
+
module EventLog = {
|
|
56
|
+
module Spec = {
|
|
57
|
+
module Id = AggSpec.Id
|
|
58
|
+
let name = "RepeatMockEventLog"
|
|
59
|
+
@schema
|
|
60
|
+
type event = AggSpec.event
|
|
61
|
+
}
|
|
62
|
+
type operations = {
|
|
63
|
+
append: (
|
|
64
|
+
int,
|
|
65
|
+
string,
|
|
66
|
+
array<Message.event'<string, AggSpec.event>>,
|
|
67
|
+
) => promise<result<unit, EventLog.appendError>>,
|
|
68
|
+
replay: string => promise<array<AggSpec.event>>,
|
|
69
|
+
replayStream: (string, ~fromSeq: int=?) => Stream.t<AggSpec.event, string, unit>,
|
|
70
|
+
replayStream': (
|
|
71
|
+
string,
|
|
72
|
+
~fromSeq: int=?,
|
|
73
|
+
) => Stream.t<Message.event'<string, AggSpec.event>, string, unit>,
|
|
74
|
+
appendStream: (
|
|
75
|
+
int,
|
|
76
|
+
string,
|
|
77
|
+
Stream.t<AggSpec.event, string, unit>,
|
|
78
|
+
) => Effect.t<unit, string, unit>,
|
|
79
|
+
latestSnapshot: string => promise<result<option<EventLog.snapshot>, string>>,
|
|
80
|
+
writeSnapshot: (string, EventLog.snapshot) => promise<result<unit, string>>,
|
|
81
|
+
}
|
|
82
|
+
type component = Component.t<OuterEventLog.t, OuterEventLog.outputs, operations>
|
|
83
|
+
let make = (~name as _: string, ~owner as _=?, ~opts as _=?): component => Obj.magic(0)
|
|
84
|
+
}
|
|
85
|
+
let eventLog: EventLog.operations = {
|
|
86
|
+
append: async (seqNr, id, newEvents) =>
|
|
87
|
+
if seqNr != eventsFor(id)->Array.length {
|
|
88
|
+
Error(OuterEventLog.Conflict)
|
|
89
|
+
} else {
|
|
90
|
+
stored := stored.contents->Array.concat(newEvents)
|
|
91
|
+
Ok()
|
|
92
|
+
},
|
|
93
|
+
replay: async id => eventsFor(id)->Array.map(e => e.event),
|
|
94
|
+
replayStream: (id, ~fromSeq=0) =>
|
|
95
|
+
eventsFor(id)->Array.map(e => e.event)->Array.slice(~start=fromSeq)->Stream.fromIterable,
|
|
96
|
+
replayStream': (id, ~fromSeq=0) =>
|
|
97
|
+
eventsFor(id)->Array.slice(~start=fromSeq)->Stream.fromIterable,
|
|
98
|
+
appendStream: (_seqNr, _id, stream) => stream->Stream.runDrain,
|
|
99
|
+
latestSnapshot: async _ => Ok(None),
|
|
100
|
+
writeSnapshot: async (_, _) => Ok(),
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
module TestHandler = Aggregate_Callback.Make(AggSpec, TestDecision, TestOps)
|
|
105
|
+
|
|
106
|
+
// The published event an Extension would have mapped the command from.
|
|
107
|
+
let publishedMeta: Message.meta = {
|
|
108
|
+
service: "Ordering.Orders",
|
|
109
|
+
time: "2024-01-01T00:00:00Z",
|
|
110
|
+
msgId: "published-event-msg",
|
|
111
|
+
correlationId: "root",
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
let run = async (meta: Message.meta) =>
|
|
115
|
+
await TestHandler.handleCommands(
|
|
116
|
+
Stream.fromIterable([
|
|
117
|
+
{
|
|
118
|
+
ReventlessInfra.CommandTopic.command: {
|
|
119
|
+
Message.id: "counter-1",
|
|
120
|
+
meta,
|
|
121
|
+
command: AggSpec.Count({by: 1}),
|
|
122
|
+
},
|
|
123
|
+
reference: meta.msgId,
|
|
124
|
+
},
|
|
125
|
+
]),
|
|
126
|
+
)->Effect.runPromise
|
|
127
|
+
|
|
128
|
+
let _ = beforeEach(() => {
|
|
129
|
+
stored := []
|
|
130
|
+
TestHandler.resetCache()
|
|
131
|
+
})
|
|
132
|
+
|
|
133
|
+
describe("Aggregate_Callback drops a repeated command", () => {
|
|
134
|
+
testPromise("a command with a stable id appends once however often it arrives", async () => {
|
|
135
|
+
// What ExtensionMapping produces for one published event: the same meta each time.
|
|
136
|
+
let derived = Message.deriveStableMeta(~parent=publishedMeta, ~service=AggSpec.name, ~index=0)
|
|
137
|
+
let first = await run(derived)
|
|
138
|
+
expect(first)->toEqual([Ok(derived.msgId)])
|
|
139
|
+
let again = await run(derived)
|
|
140
|
+
expect(again)->toEqual([Ok(derived.msgId)]) // accepted, not rejected
|
|
141
|
+
let third = await run(derived)
|
|
142
|
+
expect(third)->toEqual([Ok(derived.msgId)])
|
|
143
|
+
expect(stored.contents->Array.length)->toBe(1)
|
|
144
|
+
expect((stored.contents->Array.getUnsafe(0)).meta.causationId)->toEqual(Some(derived.msgId))
|
|
145
|
+
})
|
|
146
|
+
|
|
147
|
+
testPromise("a second derived command for another input still appends", async () => {
|
|
148
|
+
let one = Message.deriveStableMeta(~parent=publishedMeta, ~service=AggSpec.name, ~index=0)
|
|
149
|
+
let two = Message.deriveStableMeta(
|
|
150
|
+
~parent={...publishedMeta, msgId: "another-published-event"},
|
|
151
|
+
~service=AggSpec.name,
|
|
152
|
+
~index=0,
|
|
153
|
+
)
|
|
154
|
+
let _ = await run(one)
|
|
155
|
+
let _ = await run(two)
|
|
156
|
+
let _ = await run(one)
|
|
157
|
+
expect(stored.contents->Array.length)->toBe(2)
|
|
158
|
+
})
|
|
159
|
+
|
|
160
|
+
testPromise("a command with a random id is decided every time", async () => {
|
|
161
|
+
// What the API or a person sends: `deriveMeta` strips the mark and mints a
|
|
162
|
+
// fresh id, so nothing is dropped.
|
|
163
|
+
let fresh = () => Message.deriveMeta(~parent=publishedMeta, ~service=AggSpec.name)
|
|
164
|
+
let a = fresh()
|
|
165
|
+
let _ = await run(a)
|
|
166
|
+
let _ = await run(a) // the very same envelope, redelivered without a stable id
|
|
167
|
+
expect(stored.contents->Array.length)->toBe(2)
|
|
168
|
+
})
|
|
169
|
+
|
|
170
|
+
testPromise("two copies in one batch append once", async () => {
|
|
171
|
+
let derived = Message.deriveStableMeta(~parent=publishedMeta, ~service=AggSpec.name, ~index=0)
|
|
172
|
+
let item = {
|
|
173
|
+
ReventlessInfra.CommandTopic.command: {
|
|
174
|
+
Message.id: "counter-1",
|
|
175
|
+
meta: derived,
|
|
176
|
+
command: AggSpec.Count({by: 1}),
|
|
177
|
+
},
|
|
178
|
+
reference: derived.msgId,
|
|
179
|
+
}
|
|
180
|
+
let results = await TestHandler.handleCommands(
|
|
181
|
+
Stream.fromIterable([item, item]),
|
|
182
|
+
)->Effect.runPromise
|
|
183
|
+
expect(results)->toEqual([Ok(derived.msgId), Ok(derived.msgId)])
|
|
184
|
+
expect(stored.contents->Array.length)->toBe(1)
|
|
185
|
+
})
|
|
186
|
+
})
|