@reventlessdev/reventless-core 3.0.0-alpha.326 → 3.0.0-alpha.327
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 +8 -0
- package/package.json +5 -5
- package/src/adapter/Runtime/AggregateRuntime_Builder_Common.res.mjs +5 -5
- package/src/adapter/Runtime/EventCollectorRuntime_Builder_Single.res.mjs +2 -2
- package/src/admin/Platform_Admin_Callback.res.mjs +1 -1
- package/src/components/Aggregate/Aggregate_Callback.res +88 -18
- package/src/components/Aggregate/Aggregate_Callback.res.mjs +53 -32
- package/src/components/AutomationSlice/AutomationSlice_Builder.res.mjs +1 -1
- package/src/components/AutomationSlice/AutomationSlice_Callback.res +8 -0
- package/src/components/AutomationSlice/AutomationSlice_Callback.res.mjs +16 -12
- package/src/components/CommandGenerator/CommandGenerator_Callback.res +47 -6
- package/src/components/CommandGenerator/CommandGenerator_Callback.res.mjs +41 -4
- package/src/components/CommandTopic/CommandTopic_Callback.res.mjs +1 -1
- package/src/components/CommandTopic/CommandTopic_Helpers.res +9 -1
- package/src/components/CommandTopic/CommandTopic_Helpers.res.mjs +7 -6
- package/src/components/CommandTopic/CommandTopic_Operations.res +2 -0
- package/src/components/CommandTopic/CommandTopic_Operations.res.mjs +2 -2
- package/src/components/Counter/Counter_Callback.res.mjs +3 -3
- package/src/components/Counter/Counter_Operations.res.mjs +4 -4
- package/src/components/DcbEventLog/DcbEventLog_Operations.res.mjs +3 -3
- package/src/components/EventLog/EventLog_Operations.res +1 -0
- package/src/components/EventLog/EventLog_Operations.res.mjs +3 -3
- package/src/components/EventMapper/EventMapper_Callback.res +4 -0
- package/src/components/EventMapper/EventMapper_Callback.res.mjs +13 -12
- package/src/components/EventTopic/EventTopic_Operations.res +2 -0
- package/src/components/EventTopic/EventTopic_Operations.res.mjs +2 -2
- package/src/components/Extension/Extension_Operations.res +4 -0
- package/src/components/Extension/Extension_Operations.res.mjs +8 -8
- package/src/components/ExtensionPoint/ExtensionPoint_Callback.res.mjs +2 -2
- package/src/components/ExtensionPoint/ExtensionPoint_Operations.res +2 -0
- package/src/components/ExtensionPoint/ExtensionPoint_Operations.res.mjs +9 -8
- package/src/components/InboundTranslationSlice/InboundTranslationSlice_Callback.res.mjs +1 -1
- package/src/components/InboundTranslationSlice/InboundTranslationSlice_Webhook.res.mjs +1 -1
- package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Builder.res.mjs +1 -1
- package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Callback.res +8 -0
- package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Callback.res.mjs +10 -10
- package/src/components/ReadModel/ReadModel_Callback.res +1 -0
- package/src/components/ReadModel/ReadModel_Callback.res.mjs +1 -1
- package/src/components/SideEffectHandler/SideEffectHandler_Callback.res +2 -0
- package/src/components/SideEffectHandler/SideEffectHandler_Callback.res.mjs +6 -6
- package/src/components/StateChangeSlice/StateChangeSlice_Callback.res +36 -7
- package/src/components/StateChangeSlice/StateChangeSlice_Callback.res.mjs +38 -20
- package/src/components/StateViewSlice/StateViewSlice_Builder.res +2 -0
- package/src/components/StateViewSlice/StateViewSlice_Builder.res.mjs +2 -2
- package/src/components/StateViewSlice/StateViewSlice_Callback.res +6 -0
- package/src/components/StateViewSlice/StateViewSlice_Callback.res.mjs +3 -2
- package/src/plugin/component/Plugin_Callback.res.mjs +2 -2
- package/src/plugin/connect/PluginExtensionPoint_Plugin.res.mjs +6 -6
- package/src/util/CommandPublisher.res.mjs +9 -9
- package/src/util/EffectLogger.res +85 -17
- package/src/util/EffectLogger.res.mjs +63 -12
- package/src/util/FTPHandler.res.mjs +6 -6
- package/src/util/ScheduleOps.res.mjs +4 -4
- package/src/util/Util_AdapterRuntime.res.mjs +2 -2
- package/src/util/Util_Promise.res.mjs +1 -1
- package/src/util/Util_QueryDbRuntime.res.mjs +1 -1
- package/src/util/Validation.res.mjs +1 -1
- package/tests/commandgenerator/OwnerStampingTest.res +65 -0
- package/tests/commandgenerator/OwnerStampingTest.res.mjs +62 -0
- package/tests/commandtopic/CommandOutcomeHookTest.res +25 -0
- package/tests/commandtopic/CommandOutcomeHookTest.res.mjs +28 -0
- package/tests/commandtopic/CommandTopicHelpersRejectionTest.res.mjs +4 -4
- package/tests/logger/ComponentLineIdsTest.res +97 -0
- package/tests/logger/ComponentLineIdsTest.res.mjs +118 -0
- package/tests/logger/LogFormatTest.res.mjs +5 -5
- package/tests/logger/LoggerSinkTest.res.mjs +3 -3
|
@@ -22,7 +22,7 @@ function Make(Spec) {
|
|
|
22
22
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
23
23
|
let commandStr = JSON.stringify(LogRedaction$Reventless.redactJson(json));
|
|
24
24
|
let errMsg = Util_Sury$Reventless.exnMessage(err, undefined);
|
|
25
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, `decode failed: ` + commandStr + ` err=` + errMsg));
|
|
25
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, undefined, `decode failed: ` + commandStr + ` err=` + errMsg));
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
28
|
return {
|
|
@@ -54,6 +54,9 @@ type commandOutcomeReport = {
|
|
|
54
54
|
component: string,
|
|
55
55
|
reference: string,
|
|
56
56
|
correlationId?: string,
|
|
57
|
+
/** The message that caused the command: the event an automation or a translation acted on,
|
|
58
|
+
when it sent the command. */
|
|
59
|
+
causationId?: string,
|
|
57
60
|
outcome: observedOutcome,
|
|
58
61
|
}
|
|
59
62
|
|
|
@@ -95,12 +98,13 @@ let fireCommandOutcome = (
|
|
|
95
98
|
~component: string,
|
|
96
99
|
~reference: string,
|
|
97
100
|
~correlationId: option<string>=?,
|
|
101
|
+
~causationId: option<string>=?,
|
|
98
102
|
outcome: observedOutcome,
|
|
99
103
|
) =>
|
|
100
104
|
switch commandOutcomeHooks.contents {
|
|
101
105
|
| [] => ()
|
|
102
106
|
| hooks =>
|
|
103
|
-
let report = {component, reference, ?correlationId, outcome}
|
|
107
|
+
let report = {component, reference, ?correlationId, ?causationId, outcome}
|
|
104
108
|
hooks->Array.forEach(({hook}) =>
|
|
105
109
|
switch hook(report) {
|
|
106
110
|
| () => ()
|
|
@@ -168,6 +172,7 @@ let ownershipRefusal = (
|
|
|
168
172
|
let reportAccepted = (
|
|
169
173
|
~component: string,
|
|
170
174
|
~correlationId: option<string>=?,
|
|
175
|
+
~causationId: option<string>=?,
|
|
171
176
|
reference: string,
|
|
172
177
|
result: acceptedResult,
|
|
173
178
|
) => {
|
|
@@ -176,6 +181,7 @@ let reportAccepted = (
|
|
|
176
181
|
~component,
|
|
177
182
|
~reference,
|
|
178
183
|
~correlationId?,
|
|
184
|
+
~causationId?,
|
|
179
185
|
OutcomeAccepted({entityId: result.entityId, eventCount: result.eventCount}),
|
|
180
186
|
)
|
|
181
187
|
}
|
|
@@ -184,6 +190,7 @@ let reportRejected = (
|
|
|
184
190
|
~component: string,
|
|
185
191
|
~cause: refusalCause,
|
|
186
192
|
~correlationId: option<string>=?,
|
|
193
|
+
~causationId: option<string>=?,
|
|
187
194
|
reference: string,
|
|
188
195
|
result: rejectedResult,
|
|
189
196
|
) => {
|
|
@@ -192,6 +199,7 @@ let reportRejected = (
|
|
|
192
199
|
~component,
|
|
193
200
|
~reference,
|
|
194
201
|
~correlationId?,
|
|
202
|
+
~causationId?,
|
|
195
203
|
OutcomeRejected({errorCode: result.errorCode, errorDetail: result.errorDetail, cause}),
|
|
196
204
|
)
|
|
197
205
|
}
|
|
@@ -46,7 +46,7 @@ function clearCommandOutcome() {
|
|
|
46
46
|
commandOutcomeHooks.contents = [];
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
function fireCommandOutcome(component, reference, correlationId, outcome) {
|
|
49
|
+
function fireCommandOutcome(component, reference, correlationId, causationId, outcome) {
|
|
50
50
|
let hooks = commandOutcomeHooks.contents;
|
|
51
51
|
if (hooks.length === 0) {
|
|
52
52
|
return;
|
|
@@ -55,6 +55,7 @@ function fireCommandOutcome(component, reference, correlationId, outcome) {
|
|
|
55
55
|
component: component,
|
|
56
56
|
reference: reference,
|
|
57
57
|
correlationId: correlationId,
|
|
58
|
+
causationId: causationId,
|
|
58
59
|
outcome: outcome
|
|
59
60
|
};
|
|
60
61
|
hooks.forEach(param => {
|
|
@@ -63,7 +64,7 @@ function fireCommandOutcome(component, reference, correlationId, outcome) {
|
|
|
63
64
|
return;
|
|
64
65
|
} catch (raw_err) {
|
|
65
66
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
66
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(`CommandTopic(` + component + `)`, undefined, `command-outcome hook threw (ignored): ` + Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown")));
|
|
67
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(`CommandTopic(` + component + `)`, undefined, undefined, `command-outcome hook threw (ignored): ` + Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown")));
|
|
67
68
|
}
|
|
68
69
|
});
|
|
69
70
|
}
|
|
@@ -104,18 +105,18 @@ function ownershipRefusal(verdict, component, command) {
|
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
107
|
|
|
107
|
-
function reportAccepted(component, correlationId, reference, result) {
|
|
108
|
+
function reportAccepted(component, correlationId, causationId, reference, result) {
|
|
108
109
|
Stdlib_Option.forEach(acceptedResultChannel.contents, cb => cb(reference, result));
|
|
109
|
-
fireCommandOutcome(component, reference, correlationId, {
|
|
110
|
+
fireCommandOutcome(component, reference, correlationId, causationId, {
|
|
110
111
|
TAG: "OutcomeAccepted",
|
|
111
112
|
entityId: result.entityId,
|
|
112
113
|
eventCount: result.eventCount
|
|
113
114
|
});
|
|
114
115
|
}
|
|
115
116
|
|
|
116
|
-
function reportRejected(component, cause, correlationId, reference, result) {
|
|
117
|
+
function reportRejected(component, cause, correlationId, causationId, reference, result) {
|
|
117
118
|
Stdlib_Option.forEach(rejectedResultChannel.contents, cb => cb(reference, result, cause));
|
|
118
|
-
fireCommandOutcome(component, reference, correlationId, {
|
|
119
|
+
fireCommandOutcome(component, reference, correlationId, causationId, {
|
|
119
120
|
TAG: "OutcomeRejected",
|
|
120
121
|
errorCode: result.errorCode,
|
|
121
122
|
errorDetail: result.errorDetail,
|
|
@@ -11,6 +11,7 @@ module Make = (Spec: ReventlessInfra.CommandTopic.T, Ops: Ops) => {
|
|
|
11
11
|
let idxStr = (idx + 1)->Int.toString
|
|
12
12
|
EffectLogger.logInfo(
|
|
13
13
|
~comp,
|
|
14
|
+
~ids=EffectLogger.idsOf(cmdJson.meta),
|
|
14
15
|
~detail=cmdJson.Message.commandJson,
|
|
15
16
|
`publishing command ${idxStr}/${count}: ${LogFormat.cmdDetailNoId(cmdJson)}`,
|
|
16
17
|
)->Effect.runSync
|
|
@@ -21,6 +22,7 @@ module Make = (Spec: ReventlessInfra.CommandTopic.T, Ops: Ops) => {
|
|
|
21
22
|
let idxStr = (idx + 1)->Int.toString
|
|
22
23
|
EffectLogger.logError(
|
|
23
24
|
~comp,
|
|
25
|
+
~ids=EffectLogger.idsOf(cmdJson.meta),
|
|
24
26
|
~detail=cmdJson.Message.commandJson,
|
|
25
27
|
`publish failed ${idxStr}/${count}: ${LogFormat.cmdDetailNoId(cmdJson)}`,
|
|
26
28
|
)->Effect.runSync
|
|
@@ -12,14 +12,14 @@ function Make(Spec) {
|
|
|
12
12
|
let count = cmdJsons.length.toString();
|
|
13
13
|
cmdJsons.forEach((cmdJson, idx) => {
|
|
14
14
|
let idxStr = (idx + 1 | 0).toString();
|
|
15
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, cmdJson.commandJson, `publishing command ` + idxStr + `/` + count + `: ` + LogFormat$ReventlessCore.cmdDetailNoId(cmdJson)));
|
|
15
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, cmdJson.commandJson, EffectLogger$ReventlessCore.idsOf(undefined, undefined, cmdJson.meta), `publishing command ` + idxStr + `/` + count + `: ` + LogFormat$ReventlessCore.cmdDetailNoId(cmdJson)));
|
|
16
16
|
});
|
|
17
17
|
try {
|
|
18
18
|
return await Ops.publishJsons(cmdJsons);
|
|
19
19
|
} catch (exn) {
|
|
20
20
|
cmdJsons.forEach((cmdJson, idx) => {
|
|
21
21
|
let idxStr = (idx + 1 | 0).toString();
|
|
22
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError(comp, cmdJson.commandJson, `publish failed ` + idxStr + `/` + count + `: ` + LogFormat$ReventlessCore.cmdDetailNoId(cmdJson)));
|
|
22
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError(comp, cmdJson.commandJson, EffectLogger$ReventlessCore.idsOf(undefined, undefined, cmdJson.meta), `publish failed ` + idxStr + `/` + count + `: ` + LogFormat$ReventlessCore.cmdDetailNoId(cmdJson)));
|
|
23
23
|
});
|
|
24
24
|
throw exn;
|
|
25
25
|
}
|
|
@@ -26,7 +26,7 @@ function groupByCounterId(references) {
|
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
function Make(Spec) {
|
|
29
|
-
let counterHandler = (references, counts) => Effect.runPromise(Effect.zipRight(Effect.zipRight(Effect.zipRight(EffectLogger$ReventlessCore.logInfo("Counter", undefined, `counterHandler: references: ` + references.length.toString()), EffectLogger$ReventlessCore.logInfo("Counter", undefined, `counterHandler: counts: ` + Stdlib_Option.getOr(JSON.stringify(counts), "[]"))), Effect.map(Effect.all(groupByCounterId(references).map(param => {
|
|
29
|
+
let counterHandler = (references, counts) => Effect.runPromise(Effect.zipRight(Effect.zipRight(Effect.zipRight(EffectLogger$ReventlessCore.logInfo("Counter", undefined, undefined, `counterHandler: references: ` + references.length.toString()), EffectLogger$ReventlessCore.logInfo("Counter", undefined, undefined, `counterHandler: counts: ` + Stdlib_Option.getOr(JSON.stringify(counts), "[]"))), Effect.map(Effect.all(groupByCounterId(references).map(param => {
|
|
30
30
|
let dec = param[1];
|
|
31
31
|
let counterId = param[0];
|
|
32
32
|
return Effect.promise(() => Spec.countsDbCount(counterId, "count", -dec | 0));
|
|
@@ -38,7 +38,7 @@ function Make(Spec) {
|
|
|
38
38
|
let id = match.id;
|
|
39
39
|
if (count === 0) {
|
|
40
40
|
let match$1 = Counter$ReventlessCore.unmakeId(id);
|
|
41
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter_Callback-ReventlessCore", undefined, `counterHandler: counted down ` + Spec.name + `(` + id + `) to ` + count.toString()));
|
|
41
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter_Callback-ReventlessCore", undefined, undefined, `counterHandler: counted down ` + Spec.name + `(` + id + `) to ` + count.toString()));
|
|
42
42
|
let meta = Message$ReventlessCore.generateMeta(ComponentType$ReventlessCore.toName("Counter"), "Counter", undefined, undefined, undefined, undefined, undefined);
|
|
43
43
|
return Object.fromEntries([
|
|
44
44
|
[
|
|
@@ -55,7 +55,7 @@ function Make(Spec) {
|
|
|
55
55
|
]
|
|
56
56
|
]);
|
|
57
57
|
}
|
|
58
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter_Callback-ReventlessCore", undefined, `counterHandler: counted down ` + Spec.name + `(` + id + `) to ` + count.toString()));
|
|
58
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter_Callback-ReventlessCore", undefined, undefined, `counterHandler: counted down ` + Spec.name + `(` + id + `) to ` + count.toString()));
|
|
59
59
|
})))));
|
|
60
60
|
return {
|
|
61
61
|
counterHandler: counterHandler
|
|
@@ -27,7 +27,7 @@ function logCountItems(countItems) {
|
|
|
27
27
|
let references = param[1];
|
|
28
28
|
let size = references.length;
|
|
29
29
|
let referencesStr = references.join(",");
|
|
30
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter", undefined, ` ` + size.toString() + ` reference(s) for counterId ` + param[0] + `: ` + referencesStr));
|
|
30
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter", undefined, undefined, ` ` + size.toString() + ` reference(s) for counterId ` + param[0] + `: ` + referencesStr));
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
|
|
@@ -53,13 +53,13 @@ function Make(Ops) {
|
|
|
53
53
|
}));
|
|
54
54
|
if (result.TAG === "Ok") {
|
|
55
55
|
let batchSize = countItems.length;
|
|
56
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter_Operations-ReventlessCore", undefined, `saved batch of ` + batchSize.toString() + ` reference(s):`));
|
|
56
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo("Counter_Operations-ReventlessCore", undefined, undefined, `saved batch of ` + batchSize.toString() + ` reference(s):`));
|
|
57
57
|
return logCountItems(countItems);
|
|
58
58
|
}
|
|
59
59
|
let err = result._0;
|
|
60
60
|
if (typeof err === "object" && err.TAG === "NotSavedToStorage") {
|
|
61
61
|
let batchSize$1 = countItems.length;
|
|
62
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("Counter", undefined, `couldn't save batch of ` + batchSize$1.toString() + ` reference(s):`));
|
|
62
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("Counter", undefined, undefined, `couldn't save batch of ` + batchSize$1.toString() + ` reference(s):`));
|
|
63
63
|
logCountItems(countItems);
|
|
64
64
|
throw {
|
|
65
65
|
RE_EXN_ID: NotCounted,
|
|
@@ -68,7 +68,7 @@ function Make(Ops) {
|
|
|
68
68
|
};
|
|
69
69
|
}
|
|
70
70
|
let batchSize$2 = countItems.length;
|
|
71
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError("Counter", undefined, `Unknown error: couldn't save batch of ` + batchSize$2.toString() + ` reference(s):`));
|
|
71
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError("Counter", undefined, undefined, `Unknown error: couldn't save batch of ` + batchSize$2.toString() + ` reference(s):`));
|
|
72
72
|
logCountItems(countItems);
|
|
73
73
|
throw {
|
|
74
74
|
RE_EXN_ID: NotCounted,
|
|
@@ -35,7 +35,7 @@ function Make(Ops) {
|
|
|
35
35
|
} catch (raw_err) {
|
|
36
36
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
37
37
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
38
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError(`DcbEventLog(` + name + `)`, undefined, `beforePublishHook error: ` + errMsg));
|
|
38
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError(`DcbEventLog(` + name + `)`, undefined, undefined, `beforePublishHook error: ` + errMsg));
|
|
39
39
|
finalRawEventsJson = rawEventsJson;
|
|
40
40
|
}
|
|
41
41
|
} else {
|
|
@@ -52,7 +52,7 @@ function Make(Ops) {
|
|
|
52
52
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
53
53
|
if (err.RE_EXN_ID === "JsExn") {
|
|
54
54
|
let errMsg = Stdlib_Option.getOr(Stdlib_JsExn.message(err._1), "unknown");
|
|
55
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(`DcbEventLog(` + name + `)`, undefined, `EventTopic.publish Error: ` + errMsg));
|
|
55
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(`DcbEventLog(` + name + `)`, undefined, undefined, `EventTopic.publish Error: ` + errMsg));
|
|
56
56
|
}
|
|
57
57
|
throw err;
|
|
58
58
|
}
|
|
@@ -77,7 +77,7 @@ function Make(Ops) {
|
|
|
77
77
|
} catch (raw_err$1) {
|
|
78
78
|
let err$1 = Primitive_exceptions.internalToException(raw_err$1);
|
|
79
79
|
let errMsg$1 = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err$1), Stdlib_JsExn.message), "unknown");
|
|
80
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(`DcbEventLog(` + name + `)`, undefined, `afterPublishHook error: ` + errMsg$1));
|
|
80
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(`DcbEventLog(` + name + `)`, undefined, undefined, `afterPublishHook error: ` + errMsg$1));
|
|
81
81
|
}
|
|
82
82
|
};
|
|
83
83
|
let append = async (rawEvents, condition) => {
|
|
@@ -164,6 +164,7 @@ module Make = (Spec: ReventlessInfra.EventLog.T, Ops: Ops with module Spec = Spe
|
|
|
164
164
|
let _ = await Ops.eventTopic.publishJson(idStr, event'.meta, json)
|
|
165
165
|
EffectLogger.logInfo(
|
|
166
166
|
~comp=`EventTopic(${Spec.name})`,
|
|
167
|
+
~ids=?EffectLogger.idsOfJson(json),
|
|
167
168
|
~detail=json,
|
|
168
169
|
`published event ${(i + 1)->Int.toString}/${count}: ${LogFormat.eventDetail(json)}`,
|
|
169
170
|
)->Effect.runSync
|
|
@@ -106,7 +106,7 @@ function Make(Spec) {
|
|
|
106
106
|
} catch (raw_err) {
|
|
107
107
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
108
108
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
109
|
-
return Effect$1.runSync(EffectLogger$ReventlessCore.logError(`EventLog(` + Spec.name + `)`, undefined, `beforePublishHook error: ` + errMsg));
|
|
109
|
+
return Effect$1.runSync(EffectLogger$ReventlessCore.logError(`EventLog(` + Spec.name + `)`, undefined, undefined, `beforePublishHook error: ` + errMsg));
|
|
110
110
|
}
|
|
111
111
|
};
|
|
112
112
|
let runAfterPublishHook = async (idStr, eventsJson, meta) => {
|
|
@@ -120,7 +120,7 @@ function Make(Spec) {
|
|
|
120
120
|
} catch (raw_err) {
|
|
121
121
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
122
122
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
123
|
-
return Effect$1.runSync(EffectLogger$ReventlessCore.logError(`EventLog(` + Spec.name + `)`, undefined, `afterPublishHook error: ` + errMsg));
|
|
123
|
+
return Effect$1.runSync(EffectLogger$ReventlessCore.logError(`EventLog(` + Spec.name + `)`, undefined, undefined, `afterPublishHook error: ` + errMsg));
|
|
124
124
|
}
|
|
125
125
|
};
|
|
126
126
|
let publishToEventTopic = async (id, events$p, sealed, eventsJson) => {
|
|
@@ -133,7 +133,7 @@ function Make(Spec) {
|
|
|
133
133
|
await Promise.all(events$p.map(async (event$p, i) => {
|
|
134
134
|
let json = publishedJsonOf(event$p.id, event$p.meta, sealed[i]);
|
|
135
135
|
await Ops.eventTopic.publishJson(idStr, event$p.meta, json);
|
|
136
|
-
return Effect$1.runSync(EffectLogger$ReventlessCore.logInfo(`EventTopic(` + Spec.name + `)`, json, `published event ` + (i + 1 | 0).toString() + `/` + count + `: ` + LogFormat$ReventlessCore.eventDetail(json)));
|
|
136
|
+
return Effect$1.runSync(EffectLogger$ReventlessCore.logInfo(`EventTopic(` + Spec.name + `)`, json, EffectLogger$ReventlessCore.idsOfJson(json), `published event ` + (i + 1 | 0).toString() + `/` + count + `: ` + LogFormat$ReventlessCore.eventDetail(json)));
|
|
137
137
|
}));
|
|
138
138
|
await runAfterPublishHook(idStr, eventsJson, meta);
|
|
139
139
|
return {
|
|
@@ -47,6 +47,7 @@ module MakeCounterHandler = (
|
|
|
47
47
|
| None =>
|
|
48
48
|
EffectLogger.logInfo(
|
|
49
49
|
~comp="EventMapper",
|
|
50
|
+
~ids=EffectLogger.idsOf(eventMeta),
|
|
50
51
|
`map: No mapping ${source} -> ${target} found`,
|
|
51
52
|
)->Effect.runSync
|
|
52
53
|
None
|
|
@@ -55,6 +56,7 @@ module MakeCounterHandler = (
|
|
|
55
56
|
let source = Mapping.Source.name
|
|
56
57
|
EffectLogger.logInfo(
|
|
57
58
|
~comp="EventMapper",
|
|
59
|
+
~ids=EffectLogger.idsOf(eventMeta),
|
|
58
60
|
`map: found mapping ${source} -> ${target}`,
|
|
59
61
|
)->Effect.runSync
|
|
60
62
|
Some((eventObj', eventMeta, mapping, acceptedTags))
|
|
@@ -167,6 +169,7 @@ module MakeCounterHandler = (
|
|
|
167
169
|
| _ =>
|
|
168
170
|
EffectLogger.logError(
|
|
169
171
|
~comp="EventMapper",
|
|
172
|
+
~ids=EffectLogger.idsOf(eventMeta),
|
|
170
173
|
`map: Invalid event: ${eventJson'->JSON.stringify}`,
|
|
171
174
|
)->Effect.runSync
|
|
172
175
|
None
|
|
@@ -177,6 +180,7 @@ module MakeCounterHandler = (
|
|
|
177
180
|
err->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("unknown")
|
|
178
181
|
EffectLogger.logError(
|
|
179
182
|
~comp="EventMapper",
|
|
183
|
+
~ids=EffectLogger.idsOf(eventMeta),
|
|
180
184
|
`map: Couldn't decode event: ${eventJson'->JSON.stringify} ${errMsg}`,
|
|
181
185
|
)->Effect.runSync
|
|
182
186
|
None
|
|
@@ -32,7 +32,7 @@ function MakeCounterHandler(Target) {
|
|
|
32
32
|
} catch (raw_err) {
|
|
33
33
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
34
34
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
35
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logError("EventMapper", undefined, `findMapping: Couldn't decode meta: ` + errMsg));
|
|
35
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logError("EventMapper", undefined, undefined, `findMapping: Couldn't decode meta: ` + errMsg));
|
|
36
36
|
return;
|
|
37
37
|
}
|
|
38
38
|
if (eventMeta !== undefined) {
|
|
@@ -41,7 +41,7 @@ function MakeCounterHandler(Target) {
|
|
|
41
41
|
if (entry !== undefined) {
|
|
42
42
|
let mapping = entry[0];
|
|
43
43
|
let source$1 = mapping.Source.name;
|
|
44
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, `map: found mapping ` + source$1 + ` -> ` + target));
|
|
44
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, EffectLogger$ReventlessCore.idsOf(undefined, undefined, eventMeta), `map: found mapping ` + source$1 + ` -> ` + target));
|
|
45
45
|
return [
|
|
46
46
|
eventObj$p,
|
|
47
47
|
eventMeta,
|
|
@@ -49,10 +49,10 @@ function MakeCounterHandler(Target) {
|
|
|
49
49
|
entry[1]
|
|
50
50
|
];
|
|
51
51
|
}
|
|
52
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, `map: No mapping ` + source + ` -> ` + target + ` found`));
|
|
52
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, EffectLogger$ReventlessCore.idsOf(undefined, undefined, eventMeta), `map: No mapping ` + source + ` -> ` + target + ` found`));
|
|
53
53
|
return;
|
|
54
54
|
}
|
|
55
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logError("EventMapper", undefined, `findMapping: Invalid JSON object: ` + JSON.stringify(eventJson$p)));
|
|
55
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logError("EventMapper", undefined, undefined, `findMapping: Invalid JSON object: ` + JSON.stringify(eventJson$p)));
|
|
56
56
|
});
|
|
57
57
|
let createCommandJson = (delay, id, meta, command) => ({
|
|
58
58
|
id: Target.Id.toString(id),
|
|
@@ -121,12 +121,13 @@ function MakeCounterHandler(Target) {
|
|
|
121
121
|
let eventsCount = eventsJson$p.length;
|
|
122
122
|
let match = Stdlib_Array.partition(Stdlib_Array.filterMap(eventsJson$p.map((eventJson$p, idx) => {
|
|
123
123
|
let idx$1 = idx + 1 | 0;
|
|
124
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, `eventsHandler: incoming event ` + idx$1.toString() + `/` + eventsCount.toString() + `: ` + LogFormat$ReventlessCore.event$pJsonToLogMessage(eventJson$p)));
|
|
124
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, undefined, `eventsHandler: incoming event ` + idx$1.toString() + `/` + eventsCount.toString() + `: ` + LogFormat$ReventlessCore.event$pJsonToLogMessage(eventJson$p)));
|
|
125
125
|
let match = findMapping(mappingsWithTags, eventJson$p);
|
|
126
126
|
if (match === undefined) {
|
|
127
127
|
return;
|
|
128
128
|
}
|
|
129
129
|
let mapping = match[2];
|
|
130
|
+
let eventMeta = match[1];
|
|
130
131
|
let eventObj = match[0];
|
|
131
132
|
let tag = Stdlib_Option.getOr(Stdlib_Option.map(eventObj["event"], Message$ReventlessCore.variantNameOfJson), "unknown");
|
|
132
133
|
if (!match[3].includes(tag)) {
|
|
@@ -138,20 +139,20 @@ function MakeCounterHandler(Target) {
|
|
|
138
139
|
let exit = 0;
|
|
139
140
|
if (idDecoded !== undefined) {
|
|
140
141
|
if (eventDecoded !== undefined) {
|
|
141
|
-
return processMappingActions(mapping.map(Primitive_option.valFromOption(idDecoded), Primitive_option.valFromOption(eventDecoded), Ops.queryEngine),
|
|
142
|
+
return processMappingActions(mapping.map(Primitive_option.valFromOption(idDecoded), Primitive_option.valFromOption(eventDecoded), Ops.queryEngine), eventMeta);
|
|
142
143
|
}
|
|
143
144
|
exit = 1;
|
|
144
145
|
} else {
|
|
145
146
|
exit = 1;
|
|
146
147
|
}
|
|
147
148
|
if (exit === 1) {
|
|
148
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logError("EventMapper", undefined, `map: Invalid event: ` + JSON.stringify(eventJson$p)));
|
|
149
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logError("EventMapper", undefined, EffectLogger$ReventlessCore.idsOf(undefined, undefined, eventMeta), `map: Invalid event: ` + JSON.stringify(eventJson$p)));
|
|
149
150
|
return;
|
|
150
151
|
}
|
|
151
152
|
} catch (raw_err) {
|
|
152
153
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
153
154
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
154
|
-
Effect$1.runSync(EffectLogger$ReventlessCore.logError("EventMapper", undefined, `map: Couldn't decode event: ` + JSON.stringify(eventJson$p) + ` ` + errMsg));
|
|
155
|
+
Effect$1.runSync(EffectLogger$ReventlessCore.logError("EventMapper", undefined, EffectLogger$ReventlessCore.idsOf(undefined, undefined, eventMeta), `map: Couldn't decode event: ` + JSON.stringify(eventJson$p) + ` ` + errMsg));
|
|
155
156
|
return;
|
|
156
157
|
}
|
|
157
158
|
}), entry => entry).flat(), resultType => resultType.TAG !== "Counter");
|
|
@@ -176,7 +177,7 @@ function MakeCounterHandler(Target) {
|
|
|
176
177
|
};
|
|
177
178
|
let handleCounterEvents = stream => Stream.runForEach(stream, eventJson$p => Effect$1.flatMap(Effect$1.tap(Effect$1.promise(() => commonEventsHandler([eventJson$p])), param => {
|
|
178
179
|
if (param[1].length !== 0) {
|
|
179
|
-
return EffectLogger$ReventlessCore.logError("EventMapper", undefined, "handleCounterEvents: Counter actions are not allowed in Count mapping!");
|
|
180
|
+
return EffectLogger$ReventlessCore.logError("EventMapper", undefined, undefined, "handleCounterEvents: Counter actions are not allowed in Count mapping!");
|
|
180
181
|
} else {
|
|
181
182
|
return Effect$1.succeed();
|
|
182
183
|
}
|
|
@@ -202,14 +203,14 @@ function MakeEventCollectorHandler(Ops) {
|
|
|
202
203
|
return countAction._0;
|
|
203
204
|
}
|
|
204
205
|
});
|
|
205
|
-
return Effect$1.flatMap(Effect$1.flatMap(Effect$1.flatMap(Effect$1.flatMap(EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, `eventCollectorEventsHandler: countItems: ` + countItems.length.toString()), () => {
|
|
206
|
+
return Effect$1.flatMap(Effect$1.flatMap(Effect$1.flatMap(Effect$1.flatMap(EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, undefined, `eventCollectorEventsHandler: countItems: ` + countItems.length.toString()), () => {
|
|
206
207
|
let match = countItems.length;
|
|
207
208
|
if (match !== 0) {
|
|
208
|
-
return Effect$1.catchAll(Effect$1.retry(Effect.tryPromise(e => Util_Error$ReventlessCore.messageFromUnknown(e, "unknown"), () => Ops.count(countItems)), countRetrySchedule), errMsg => EffectLogger$ReventlessCore.logError("EventMapper_Callback-ReventlessCore", undefined, `doCount: count error after retries: ` + errMsg));
|
|
209
|
+
return Effect$1.catchAll(Effect$1.retry(Effect.tryPromise(e => Util_Error$ReventlessCore.messageFromUnknown(e, "unknown"), () => Ops.count(countItems)), countRetrySchedule), errMsg => EffectLogger$ReventlessCore.logError("EventMapper_Callback-ReventlessCore", undefined, undefined, `doCount: count error after retries: ` + errMsg));
|
|
209
210
|
} else {
|
|
210
211
|
return Effect$1.succeed();
|
|
211
212
|
}
|
|
212
|
-
}), () => EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, `eventCollectorEventsHandler: addToCounterTargetActions: ` + Stdlib_Option.getOr(JSON.stringify(addToCounterTargetActions), "[]"))), () => Effect$1.map(Effect$1.all(Stdlib_Array.filterMap(addToCounterTargetActions, x => {
|
|
213
|
+
}), () => EffectLogger$ReventlessCore.logInfo("EventMapper", undefined, undefined, `eventCollectorEventsHandler: addToCounterTargetActions: ` + Stdlib_Option.getOr(JSON.stringify(addToCounterTargetActions), "[]"))), () => Effect$1.map(Effect$1.all(Stdlib_Array.filterMap(addToCounterTargetActions, x => {
|
|
213
214
|
if (x.TAG === "Count") {
|
|
214
215
|
return;
|
|
215
216
|
}
|
|
@@ -19,6 +19,7 @@ module Make = (Spec: ReventlessInfra.EventTopic.T, Ops: Ops) => {
|
|
|
19
19
|
| exception e =>
|
|
20
20
|
EffectLogger.logError(
|
|
21
21
|
~comp,
|
|
22
|
+
~ids=?EffectLogger.idsOfJson(eventJson'),
|
|
22
23
|
~detail=eventJson',
|
|
23
24
|
`publish failed ${idxStr}: ${LogFormat.eventDetail(eventJson')}`,
|
|
24
25
|
)->Effect.runSync
|
|
@@ -26,6 +27,7 @@ module Make = (Spec: ReventlessInfra.EventTopic.T, Ops: Ops) => {
|
|
|
26
27
|
| _ =>
|
|
27
28
|
EffectLogger.logInfo(
|
|
28
29
|
~comp,
|
|
30
|
+
~ids=?EffectLogger.idsOfJson(eventJson'),
|
|
29
31
|
~detail=eventJson',
|
|
30
32
|
`published event ${idxStr}: ${LogFormat.eventDetail(eventJson')}`,
|
|
31
33
|
)->Effect.runSync
|
|
@@ -20,10 +20,10 @@ function Make(Spec) {
|
|
|
20
20
|
try {
|
|
21
21
|
val = await Ops.publishJson(Spec.Id.toString(id), event$p.meta, eventJson$p);
|
|
22
22
|
} catch (e) {
|
|
23
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError(comp, eventJson$p, `publish failed ` + idxStr + `: ` + LogFormat$ReventlessCore.eventDetail(eventJson$p)));
|
|
23
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError(comp, eventJson$p, EffectLogger$ReventlessCore.idsOfJson(eventJson$p), `publish failed ` + idxStr + `: ` + LogFormat$ReventlessCore.eventDetail(eventJson$p)));
|
|
24
24
|
throw e;
|
|
25
25
|
}
|
|
26
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, eventJson$p, `published event ` + idxStr + `: ` + LogFormat$ReventlessCore.eventDetail(eventJson$p)));
|
|
26
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, eventJson$p, EffectLogger$ReventlessCore.idsOfJson(eventJson$p), `published event ` + idxStr + `: ` + LogFormat$ReventlessCore.eventDetail(eventJson$p)));
|
|
27
27
|
})));
|
|
28
28
|
};
|
|
29
29
|
return {
|
|
@@ -65,6 +65,7 @@ module Make = (
|
|
|
65
65
|
let publishAggregateCommand = async (aggregateName, cmdJson: Message.commandJson) => {
|
|
66
66
|
EffectLogger.logInfo(
|
|
67
67
|
~comp,
|
|
68
|
+
~ids=EffectLogger.idsOf(cmdJson.meta),
|
|
68
69
|
`EP→${aggregateName}: ${cmdJson.commandJson
|
|
69
70
|
->Message.variantNameOfJson
|
|
70
71
|
->LogFormat.bold}(${cmdJson.id})`,
|
|
@@ -157,6 +158,7 @@ module Make = (
|
|
|
157
158
|
}
|
|
158
159
|
EffectLogger.logInfo(
|
|
159
160
|
~comp,
|
|
161
|
+
~ids=?EffectLogger.idsOfJson(eventJson'),
|
|
160
162
|
`incoming EP event: ${LogFormat.eventSummary(eventJson')}`,
|
|
161
163
|
)->Effect.runSync
|
|
162
164
|
switch eventJson'->Message.decodeEvent'(
|
|
@@ -176,6 +178,7 @@ module Make = (
|
|
|
176
178
|
let errMsg = err->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("unknown")
|
|
177
179
|
EffectLogger.logError(
|
|
178
180
|
~comp,
|
|
181
|
+
~ids=?EffectLogger.idsOfJson(eventJson'),
|
|
179
182
|
`Could not decode event': ${eventJson'->JSON.stringify} ${errMsg}`,
|
|
180
183
|
)->Effect.runSync
|
|
181
184
|
}
|
|
@@ -187,6 +190,7 @@ module Make = (
|
|
|
187
190
|
}
|
|
188
191
|
EffectLogger.logInfo(
|
|
189
192
|
~comp,
|
|
193
|
+
~ids=?EffectLogger.idsOfJson(eventJson'),
|
|
190
194
|
`outgoing delegate event: ${LogFormat.eventSummary(eventJson')}`,
|
|
191
195
|
)->Effect.runSync
|
|
192
196
|
let commandActions = mapOutgoingEvent(eventJson', pluginDef)
|
|
@@ -27,19 +27,19 @@ function Make(MappingSpec) {
|
|
|
27
27
|
if (mapOutgoingEvent$1 !== undefined) {
|
|
28
28
|
return mapOutgoingEvent$1(eventJson$p, pluginDef);
|
|
29
29
|
} else {
|
|
30
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, "mapOutgoingEvent: shouldn't be called, because Plugin EventCollector shouldn't subscribe to EventLog stream not having mapOutgoingEvent() !"));
|
|
30
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, undefined, "mapOutgoingEvent: shouldn't be called, because Plugin EventCollector shouldn't subscribe to EventLog stream not having mapOutgoingEvent() !"));
|
|
31
31
|
return [];
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
34
|
let publishAggregateCommand = async (aggregateName, cmdJson) => {
|
|
35
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, undefined, `EP→` + aggregateName + `: ` + LogFormat$ReventlessCore.bold(Message$ReventlessCore.variantNameOfJson(cmdJson.commandJson)) + `(` + cmdJson.id + `)`));
|
|
35
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, undefined, EffectLogger$ReventlessCore.idsOf(undefined, undefined, cmdJson.meta), `EP→` + aggregateName + `: ` + LogFormat$ReventlessCore.bold(Message$ReventlessCore.variantNameOfJson(cmdJson.commandJson)) + `(` + cmdJson.id + `)`));
|
|
36
36
|
let pub = Stdlib_Option.getOrThrow(Ops.publishToAggregates[aggregateName], undefined);
|
|
37
37
|
try {
|
|
38
38
|
return await pub([cmdJson]);
|
|
39
39
|
} catch (raw_err) {
|
|
40
40
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
41
41
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
42
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, `Error on publish command to aggregate ` + aggregateName + `: ` + errMsg));
|
|
42
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, undefined, `Error on publish command to aggregate ` + aggregateName + `: ` + errMsg));
|
|
43
43
|
}
|
|
44
44
|
};
|
|
45
45
|
let publishPluginExtensionPointCommand = async cmdJson => {
|
|
@@ -48,7 +48,7 @@ function Make(MappingSpec) {
|
|
|
48
48
|
} catch (raw_err) {
|
|
49
49
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
50
50
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
51
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, `Error on publish command to Plugin ExtensionPoint: ` + errMsg));
|
|
51
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, undefined, `Error on publish command to Plugin ExtensionPoint: ` + errMsg));
|
|
52
52
|
}
|
|
53
53
|
};
|
|
54
54
|
let forwardCommand = (extensionPointName, commandJson) => {
|
|
@@ -72,7 +72,7 @@ function Make(MappingSpec) {
|
|
|
72
72
|
} catch (raw_err) {
|
|
73
73
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
74
74
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
75
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, `Error on handling directive: ` + errMsg));
|
|
75
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, undefined, `Error on handling directive: ` + errMsg));
|
|
76
76
|
}
|
|
77
77
|
};
|
|
78
78
|
let applyIncomingCommandAction = async action => {
|
|
@@ -115,14 +115,14 @@ function Make(MappingSpec) {
|
|
|
115
115
|
if (Pii$Reventless.needsPrepare([eventJson$p])) {
|
|
116
116
|
await Pii$Reventless.prepareOrThrow([eventJson$p]);
|
|
117
117
|
}
|
|
118
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, undefined, `incoming EP event: ` + LogFormat$ReventlessCore.eventSummary(eventJson$p)));
|
|
118
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, undefined, EffectLogger$ReventlessCore.idsOfJson(eventJson$p), `incoming EP event: ` + LogFormat$ReventlessCore.eventSummary(eventJson$p)));
|
|
119
119
|
let event$p;
|
|
120
120
|
try {
|
|
121
121
|
event$p = Message$ReventlessCore.decodeEvent$p(eventJson$p, Id$Reventless.StringPure.schema, MappingSpec.eventSchema);
|
|
122
122
|
} catch (raw_err) {
|
|
123
123
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
124
124
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
125
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, `Could not decode event': ` + JSON.stringify(eventJson$p) + ` ` + errMsg));
|
|
125
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, EffectLogger$ReventlessCore.idsOfJson(eventJson$p), `Could not decode event': ` + JSON.stringify(eventJson$p) + ` ` + errMsg));
|
|
126
126
|
}
|
|
127
127
|
let commandActions = mapIncomingEvent(event$p, pluginDef, Ops.queryEngine);
|
|
128
128
|
let apply = async commandActions => await Util_Promise$ReventlessCore.toUnit(Promise.all(commandActions.map(applyIncomingCommandAction)));
|
|
@@ -132,7 +132,7 @@ function Make(MappingSpec) {
|
|
|
132
132
|
if (Pii$Reventless.needsPrepare([eventJson$p])) {
|
|
133
133
|
await Pii$Reventless.prepareOrThrow([eventJson$p]);
|
|
134
134
|
}
|
|
135
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, undefined, `outgoing delegate event: ` + LogFormat$ReventlessCore.eventSummary(eventJson$p)));
|
|
135
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo(comp, undefined, EffectLogger$ReventlessCore.idsOfJson(eventJson$p), `outgoing delegate event: ` + LogFormat$ReventlessCore.eventSummary(eventJson$p)));
|
|
136
136
|
let commandActions = mapOutgoingEvent(eventJson$p, pluginDef);
|
|
137
137
|
return await Util_Promise$ReventlessCore.toUnit(Promise.all(commandActions.map(applyOutgoingCommandAction)));
|
|
138
138
|
};
|
|
@@ -35,7 +35,7 @@ function Make(Spec) {
|
|
|
35
35
|
};
|
|
36
36
|
}), param => {
|
|
37
37
|
let errorResult = param[0];
|
|
38
|
-
return Effect$1.map(EffectLogger$ReventlessCore.logError("ExtensionPoint", undefined, param[1]), () => errorResult);
|
|
38
|
+
return Effect$1.map(EffectLogger$ReventlessCore.logError("ExtensionPoint", undefined, undefined, param[1]), () => errorResult);
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
41
|
let handler = action._1;
|
|
@@ -54,7 +54,7 @@ function Make(Spec) {
|
|
|
54
54
|
_0: reference$1
|
|
55
55
|
})), param => {
|
|
56
56
|
let errorResult = param[0];
|
|
57
|
-
return Effect$1.map(EffectLogger$ReventlessCore.logError("ExtensionPoint", undefined, param[1]), () => errorResult);
|
|
57
|
+
return Effect$1.map(EffectLogger$ReventlessCore.logError("ExtensionPoint", undefined, undefined, param[1]), () => errorResult);
|
|
58
58
|
});
|
|
59
59
|
};
|
|
60
60
|
let handleIncomingCommands = stream => Effect$1.flatMap(Stream.runCollect(stream), topicItems => {
|
|
@@ -114,6 +114,7 @@ module Make = (
|
|
|
114
114
|
| ReventlessInfra.ExtensionPointMapping.AbstractPublishEvent(id, meta, eventJson) =>
|
|
115
115
|
EffectLogger.logInfo(
|
|
116
116
|
~comp=`ExtensionPoint(${MappingSpec.name})`,
|
|
117
|
+
~ids=EffectLogger.idsOf(meta),
|
|
117
118
|
`applying event: ${LogFormat.eventSummary(eventJson)}`,
|
|
118
119
|
)->Effect.runSync
|
|
119
120
|
await publishWithHooks(id, meta, eventJson)
|
|
@@ -138,6 +139,7 @@ module Make = (
|
|
|
138
139
|
}
|
|
139
140
|
EffectLogger.logInfo(
|
|
140
141
|
~comp=`ExtensionPoint(${MappingSpec.name})`,
|
|
142
|
+
~ids=?EffectLogger.idsOfJson(eventJson'),
|
|
141
143
|
`outgoing event: ${LogFormat.eventSummary(eventJson')}`,
|
|
142
144
|
)->Effect.runSync
|
|
143
145
|
let eventActions = mapOutgoingEvent(
|
|
@@ -25,7 +25,7 @@ function Make(MappingSpec) {
|
|
|
25
25
|
if (mapOutgoingEvent$1 !== undefined) {
|
|
26
26
|
return mapOutgoingEvent$1(eventJson$p, ScheduleOps$ReventlessCore.create(scheduler, queue, resourceNaming), ScheduleOps$ReventlessCore.$$delete(scheduler, queue, resourceNaming), queryEngine);
|
|
27
27
|
} else {
|
|
28
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, "mapOutgoingEvent: shouldn't be called, because Plugin EventCollector shouldn't subscribe to EventLog stream not having mapOutgoingEvent() !"));
|
|
28
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, undefined, "mapOutgoingEvent: shouldn't be called, because Plugin EventCollector shouldn't subscribe to EventLog stream not having mapOutgoingEvent() !"));
|
|
29
29
|
return [];
|
|
30
30
|
}
|
|
31
31
|
};
|
|
@@ -48,7 +48,7 @@ function Make(MappingSpec) {
|
|
|
48
48
|
} catch (raw_err) {
|
|
49
49
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
50
50
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
51
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, `beforePublishHook error: ` + errMsg));
|
|
51
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, undefined, `beforePublishHook error: ` + errMsg));
|
|
52
52
|
finalEventJson = eventJson;
|
|
53
53
|
}
|
|
54
54
|
} else {
|
|
@@ -59,7 +59,7 @@ function Make(MappingSpec) {
|
|
|
59
59
|
} catch (raw_err$1) {
|
|
60
60
|
let err$1 = Primitive_exceptions.internalToException(raw_err$1);
|
|
61
61
|
let errMsg$1 = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err$1), Stdlib_JsExn.message), "unknown");
|
|
62
|
-
Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, `Error on publishToEventTopic command: ` + errMsg$1));
|
|
62
|
+
Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, undefined, `Error on publishToEventTopic command: ` + errMsg$1));
|
|
63
63
|
}
|
|
64
64
|
let hook$1 = EventPublish_Callback$ReventlessCore.afterPublishHook.contents;
|
|
65
65
|
if (hook$1 === undefined) {
|
|
@@ -80,15 +80,16 @@ function Make(MappingSpec) {
|
|
|
80
80
|
} catch (raw_err$2) {
|
|
81
81
|
let err$2 = Primitive_exceptions.internalToException(raw_err$2);
|
|
82
82
|
let errMsg$2 = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err$2), Stdlib_JsExn.message), "unknown");
|
|
83
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, `afterPublishHook error: ` + errMsg$2));
|
|
83
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, undefined, `afterPublishHook error: ` + errMsg$2));
|
|
84
84
|
}
|
|
85
85
|
};
|
|
86
86
|
let applyEventAction = async action => {
|
|
87
87
|
switch (action.TAG) {
|
|
88
88
|
case "AbstractPublishEvent" :
|
|
89
89
|
let eventJson = action._2;
|
|
90
|
-
|
|
91
|
-
|
|
90
|
+
let meta = action._1;
|
|
91
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, EffectLogger$ReventlessCore.idsOf(undefined, undefined, meta), `applying event: ` + LogFormat$ReventlessCore.eventSummary(eventJson)));
|
|
92
|
+
return await publishWithHooks(action._0, meta, eventJson);
|
|
92
93
|
case "AbstractPublishEventAsync" :
|
|
93
94
|
let match = await action._0;
|
|
94
95
|
return await publishWithHooks(match[0], match[1], match[2]);
|
|
@@ -98,7 +99,7 @@ function Make(MappingSpec) {
|
|
|
98
99
|
} catch (raw_err) {
|
|
99
100
|
let err = Primitive_exceptions.internalToException(raw_err);
|
|
100
101
|
let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
|
|
101
|
-
return Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, `Error on handling directive: ` + errMsg));
|
|
102
|
+
return Effect.runSync(EffectLogger$ReventlessCore.logError(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, undefined, `Error on handling directive: ` + errMsg));
|
|
102
103
|
}
|
|
103
104
|
}
|
|
104
105
|
};
|
|
@@ -106,7 +107,7 @@ function Make(MappingSpec) {
|
|
|
106
107
|
if (Pii$Reventless.needsPrepare([eventJson$p])) {
|
|
107
108
|
await Pii$Reventless.prepareOrThrow([eventJson$p]);
|
|
108
109
|
}
|
|
109
|
-
Effect.runSync(EffectLogger$ReventlessCore.logInfo(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, `outgoing event: ` + LogFormat$ReventlessCore.eventSummary(eventJson$p)));
|
|
110
|
+
Effect.runSync(EffectLogger$ReventlessCore.logInfo(`ExtensionPoint(` + MappingSpec.name + `)`, undefined, EffectLogger$ReventlessCore.idsOfJson(eventJson$p), `outgoing event: ` + LogFormat$ReventlessCore.eventSummary(eventJson$p)));
|
|
110
111
|
let eventActions = mapOutgoingEvent(eventJson$p, Mappings.mappings, Ops.scheduler, Ops.commandTopicResources, Ops.queryEngine, Ops.resourceNaming);
|
|
111
112
|
return await Util_Promise$ReventlessCore.toUnit(Promise.all(eventActions.map(applyEventAction)));
|
|
112
113
|
};
|