@effect-app/infra 1.0.3 → 1.0.5
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 +12 -0
- package/_cjs/services/QueueMaker/memQueue.cjs +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs +10 -5
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/dist/services/QueueMaker/memQueue.js +2 -2
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +12 -7
- package/dist/services/RequestContextContainer.d.ts +1 -1
- package/dist/services/Store/service.d.ts +2 -2
- package/package.json +2 -2
- package/src/services/QueueMaker/memQueue.ts +1 -1
- package/src/services/QueueMaker/sbqueue.ts +18 -7
- package/vitest.config.ts.timestamp-1711656440838-19c636fe320df.mjs +0 -0
- package/vitest.config.ts.timestamp-1711724061890-6ecedb0a07fdd.mjs +0 -0
- package/vitest.config.ts.timestamp-1711743489537-da8d9e5f66c9f.mjs +0 -0
- package/vitest.config.ts.timestamp-1711744615239-dcf257a844e01.mjs +37 -0
package/CHANGELOG.md
CHANGED
|
@@ -61,7 +61,7 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
61
61
|
body,
|
|
62
62
|
meta
|
|
63
63
|
}) => {
|
|
64
|
-
let effect = _effectApp.Effect.
|
|
64
|
+
let effect = _effectApp.Effect.logDebug(`[${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
|
|
65
65
|
body: (0, _utils.pretty)(body),
|
|
66
66
|
meta: (0, _utils.pretty)(meta)
|
|
67
67
|
}), _effectApp.Effect.zipRight(handleEvent(body)), silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_schema","_effect","_effectApp","_ids","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeMemQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","S","Struct","body","meta","QueueMeta","drainW","parseDrain","flow","decodeUnknown","orDie","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","encode","Option","getOrUndefined","pipe","andThen","JSON","stringify","flatMap","_","offer","discard","drain","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","sync","parse","effect","
|
|
1
|
+
{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_schema","_effect","_effectApp","_ids","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeMemQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","S","Struct","body","meta","QueueMeta","drainW","parseDrain","flow","decodeUnknown","orDie","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","encode","Option","getOrUndefined","pipe","andThen","JSON","stringify","flatMap","_","offer","discard","drain","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","sync","parse","effect","logDebug","annotateLogs","pretty","zipRight","setupRequestContext","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","undefined","keys","withParentSpan","externalSpan","take","x","uninterruptible","fork","Fiber","join","forever"],"sources":["../../../src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -40,6 +40,9 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
40
40
|
name: "ServiceBusQueue.drain." + queueDrainName
|
|
41
41
|
});
|
|
42
42
|
const rcc = yield* $(_RequestContextContainer.RequestContextContainer);
|
|
43
|
+
// TODO: or do async?
|
|
44
|
+
// This will make sure that the host receives the error (MainFiberSet.join), who will then interrupt everything and commence a shutdown and restart of app
|
|
45
|
+
const deferred = yield* $(_effectApp.Deferred.make());
|
|
43
46
|
return {
|
|
44
47
|
drain: (handleEvent, sessionId) => _effectApp.Effect.gen(function* ($) {
|
|
45
48
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -48,7 +51,7 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
48
51
|
body,
|
|
49
52
|
meta
|
|
50
53
|
}) => {
|
|
51
|
-
let effect = _effectApp.Effect.
|
|
54
|
+
let effect = _effectApp.Effect.logDebug(`[${queueDrainName}] Processing incoming message`).pipe(_effectApp.Effect.annotateLogs({
|
|
52
55
|
body: (0, _utils.pretty)(body),
|
|
53
56
|
meta: (0, _utils.pretty)(meta)
|
|
54
57
|
}), _effectApp.Effect.zipRight(handleEvent(body)), _effectApp.Effect.orDie)
|
|
@@ -77,13 +80,13 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
77
80
|
}
|
|
78
81
|
return yield* $((0, _ServiceBus.subscribe)({
|
|
79
82
|
processMessage: x => processMessage(x.body).pipe(_effectApp.Effect.uninterruptible),
|
|
80
|
-
processError: err => _effectApp.Effect.sync(() => (0, _errorReporter.captureException)(err.error))
|
|
83
|
+
processError: err => _effectApp.Deferred.completeWith(deferred, _effectApp.Effect.sync(() => (0, _errorReporter.captureException)(err.error)).pipe(_effectApp.Effect.andThen(_effectApp.Effect.fail(err.error))))
|
|
81
84
|
}, sessionId).pipe(_effectApp.Effect.provideService(_ServiceBus.ServiceBusReceiverFactory, receiver)));
|
|
82
|
-
}).pipe(_effectApp.Effect.andThen(_effectApp.Effect.
|
|
85
|
+
}).pipe(_effectApp.Effect.andThen(_effectApp.Deferred.await(deferred).pipe(_effectApp.Effect.orDie))),
|
|
83
86
|
publish: (...messages) => _effectApp.Effect.gen(function* ($) {
|
|
84
87
|
const requestContext = yield* $(rcc.requestContext);
|
|
85
88
|
const span = yield* $(_effectApp.Effect.serviceOption(_effect.Tracer.ParentSpan));
|
|
86
|
-
return yield* $(_effectApp.Effect.promise(
|
|
89
|
+
return yield* $(_effectApp.Effect.promise(abortSignal => s.sendMessages(messages.map(m => ({
|
|
87
90
|
body: JSON.stringify(_effectApp.S.encodeSync(wireSchema)({
|
|
88
91
|
body: m,
|
|
89
92
|
meta: {
|
|
@@ -95,7 +98,9 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
95
98
|
/* correllationid: requestId */
|
|
96
99
|
contentType: "application/json",
|
|
97
100
|
sessionId: "sessionId" in m ? m.sessionId : undefined
|
|
98
|
-
}))
|
|
101
|
+
})), {
|
|
102
|
+
abortSignal
|
|
103
|
+
})));
|
|
99
104
|
})
|
|
100
105
|
};
|
|
101
106
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_effect","_effectApp","_ids","_schema","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","wireSchema","S","Struct","body","meta","QueueMeta","drainW","parseDrain","flow","decodeUnknown","Effect","orDie","gen","$","s","Sender","receiver","ServiceBusReceiverFactory","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","sessionId","processMessage","messageBody","sync","JSON","parse","pipe","flatMap","x","effect","
|
|
1
|
+
{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_effect","_effectApp","_ids","_schema","_utils","_setupRequest","_RequestContextContainer","_errors","_service","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","wireSchema","S","Struct","body","meta","QueueMeta","drainW","parseDrain","flow","decodeUnknown","Effect","orDie","gen","$","s","Sender","receiver","ServiceBusReceiverFactory","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","deferred","Deferred","make","drain","handleEvent","sessionId","processMessage","messageBody","sync","JSON","parse","pipe","flatMap","x","effect","logDebug","annotateLogs","pretty","zipRight","_","setupRequestContext","RequestContext","inherit","requestContext","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","undefined","keys","span","withParentSpan","Tracer","externalSpan","tapErrorCause","subscribe","uninterruptible","processError","err","completeWith","captureException","error","andThen","fail","provideService","await","publish","messages","serviceOption","ParentSpan","promise","abortSignal","sendMessages","map","m","stringify","encodeSync","Option","getOrUndefined","messageId","contentType","makeServiceBusLayers","url","queueName","Layer","merge","Live","LiveSender","provide","LiveServiceBusClient"],"sources":["../../../src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -43,7 +43,7 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
43
43
|
.pipe(Effect.flatMap(parseDrain), Effect.orDie, Effect
|
|
44
44
|
.flatMap(({ body, meta }) => {
|
|
45
45
|
let effect = Effect
|
|
46
|
-
.
|
|
46
|
+
.logDebug(`[${queueDrainName}] Processing incoming message`)
|
|
47
47
|
.pipe(Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }), Effect.zipRight(handleEvent(body)), silenceAndReportError, (_) => setupRequestContext(_, RequestContext.inherit(meta.requestContext, {
|
|
48
48
|
id: RequestId(body.id),
|
|
49
49
|
locale: "en",
|
|
@@ -88,4 +88,4 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
88
88
|
};
|
|
89
89
|
});
|
|
90
90
|
}
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvUXVldWVNYWtlci9tZW1RdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ3RELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDekQsT0FBTyxFQUFrQixTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFeEQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsWUFBWSxDQU0xQixTQUFpQixFQUNqQixjQUFzQixFQUN0QixNQUEyQixFQUMzQixXQUEwQztJQUUxQyxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUMzQixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDOUIsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0Is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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,yBAAyB,EAE1B,MAAM,uCAAuC,CAAA;AAG9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAY,MAAM,EAAQ,KAAK,EAAU,CAAC,EAAE,MAAM,YAAY,CAAA;AAErE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAIjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAIvE;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1C,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,SAAS,EAET,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;yCAsBvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;;+GAmHzB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wGAI1F"}
|
|
@@ -2,7 +2,7 @@ import { LiveSender, LiveServiceBusClient, Sender, ServiceBusReceiverFactory, su
|
|
|
2
2
|
import { captureException } from "@effect-app/infra/errorReporter";
|
|
3
3
|
import { RequestContext } from "@effect-app/infra/RequestContext";
|
|
4
4
|
import { Tracer } from "effect";
|
|
5
|
-
import { Effect, flow, Layer, Option, S } from "effect-app";
|
|
5
|
+
import { Deferred, Effect, flow, Layer, Option, S } from "effect-app";
|
|
6
6
|
import { RequestId } from "effect-app/ids";
|
|
7
7
|
import { NonEmptyString255 } from "effect-app/schema";
|
|
8
8
|
import { pretty } from "effect-app/utils";
|
|
@@ -26,6 +26,9 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
26
26
|
const silenceAndReportError = reportNonInterruptedFailure({ name: "ServiceBusQueue.drain." + queueDrainName });
|
|
27
27
|
const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName });
|
|
28
28
|
const rcc = yield* $(RequestContextContainer);
|
|
29
|
+
// TODO: or do async?
|
|
30
|
+
// This will make sure that the host receives the error (MainFiberSet.join), who will then interrupt everything and commence a shutdown and restart of app
|
|
31
|
+
const deferred = yield* $(Deferred.make());
|
|
29
32
|
return {
|
|
30
33
|
drain: (handleEvent, sessionId) => Effect
|
|
31
34
|
.gen(function* ($) {
|
|
@@ -36,7 +39,7 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
36
39
|
.pipe(Effect.flatMap((x) => parseDrain(x)), Effect.orDie, Effect
|
|
37
40
|
.flatMap(({ body, meta }) => {
|
|
38
41
|
let effect = Effect
|
|
39
|
-
.
|
|
42
|
+
.logDebug(`[${queueDrainName}] Processing incoming message`)
|
|
40
43
|
.pipe(Effect.annotateLogs({
|
|
41
44
|
body: pretty(body),
|
|
42
45
|
meta: pretty(meta)
|
|
@@ -81,17 +84,19 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
81
84
|
}
|
|
82
85
|
return yield* $(subscribe({
|
|
83
86
|
processMessage: (x) => processMessage(x.body).pipe(Effect.uninterruptible),
|
|
84
|
-
processError: (err) =>
|
|
87
|
+
processError: (err) => Deferred.completeWith(deferred, Effect
|
|
88
|
+
.sync(() => captureException(err.error))
|
|
89
|
+
.pipe(Effect.andThen(Effect.fail(err.error))))
|
|
85
90
|
}, sessionId)
|
|
86
91
|
.pipe(Effect.provideService(ServiceBusReceiverFactory, receiver)));
|
|
87
92
|
})
|
|
88
|
-
.pipe(Effect.andThen(Effect.
|
|
93
|
+
.pipe(Effect.andThen(Deferred.await(deferred).pipe(Effect.orDie))),
|
|
89
94
|
publish: (...messages) => Effect
|
|
90
95
|
.gen(function* ($) {
|
|
91
96
|
const requestContext = yield* $(rcc.requestContext);
|
|
92
97
|
const span = yield* $(Effect.serviceOption(Tracer.ParentSpan));
|
|
93
98
|
return yield* $(Effect
|
|
94
|
-
.promise(() => s.sendMessages(messages.map((m) => ({
|
|
99
|
+
.promise((abortSignal) => s.sendMessages(messages.map((m) => ({
|
|
95
100
|
body: JSON.stringify(S.encodeSync(wireSchema)({
|
|
96
101
|
body: m,
|
|
97
102
|
meta: { requestContext, span: Option.getOrUndefined(span) }
|
|
@@ -99,7 +104,7 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
99
104
|
messageId: m.id, /* correllationid: requestId */
|
|
100
105
|
contentType: "application/json",
|
|
101
106
|
sessionId: "sessionId" in m ? m.sessionId : undefined
|
|
102
|
-
})))));
|
|
107
|
+
})), { abortSignal })));
|
|
103
108
|
})
|
|
104
109
|
};
|
|
105
110
|
});
|
|
@@ -110,4 +115,4 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
110
115
|
export function makeServiceBusLayers(url, queueName, queueDrainName) {
|
|
111
116
|
return Layer.merge(ServiceBusReceiverFactory.Live(queueDrainName), LiveSender(queueName)).pipe(Layer.provide(LiveServiceBusClient(url)));
|
|
112
117
|
}
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsTUFBTSxFQUNOLHlCQUF5QixFQUN6QixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUM5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRTFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDM0YsT0FBTyxFQUFrQixTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFeEQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBTWpDLFVBQWtCLEVBQ2xCLGNBQXNCLEVBQ3RCLE1BQTJCLEVBQzNCLFdBQTBDO0lBRTFDLE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUM7UUFDMUIsSUFBSSxFQUFFLE1BQU07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
|
|
@@ -25,7 +25,7 @@ declare const RequestContextContainer_base: (abstract new (service: {
|
|
|
25
25
|
requestContext: Effect<RequestContext>;
|
|
26
26
|
update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
|
|
27
27
|
start: (f: RequestContext) => Effect<void>;
|
|
28
|
-
}) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4,
|
|
28
|
+
}) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, R_4 | RequestContextContainer> : Effect<X, never, RequestContextContainer>;
|
|
29
29
|
};
|
|
30
30
|
/**
|
|
31
31
|
* @tsplus type RequestContextContainer
|
|
@@ -88,7 +88,7 @@ declare const StoreMaker_base: (abstract new (service: {
|
|
|
88
88
|
make: <Encoded extends {
|
|
89
89
|
id: Id;
|
|
90
90
|
}, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<Encoded>, E, R> | undefined, config?: StoreConfig<Encoded> | undefined) => Effect<Store<Encoded, Id, PersistenceModelType<Encoded>>, E, R>;
|
|
91
|
-
}) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4,
|
|
91
|
+
}) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, StoreMaker | R_4> : Effect<X, never, StoreMaker>;
|
|
92
92
|
};
|
|
93
93
|
/**
|
|
94
94
|
* @tsplus type StoreMaker
|
|
@@ -127,7 +127,7 @@ declare const ContextMap_base: (abstract new (service: {
|
|
|
127
127
|
use: <X>(body: (_: {
|
|
128
128
|
get: (id: string) => string | undefined;
|
|
129
129
|
set: (id: string, eTag: string | undefined) => void;
|
|
130
|
-
}) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5,
|
|
130
|
+
}) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, ContextMap | R_5> : Effect<X, never, ContextMap>;
|
|
131
131
|
};
|
|
132
132
|
/**
|
|
133
133
|
* @tsplus type ContextMap
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.5",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
"proper-lockfile": "^4.1.2",
|
|
19
19
|
"pure-rand": "6.1.0",
|
|
20
20
|
"redlock": "^4.2.0",
|
|
21
|
-
"@effect-app/core": "1.0.0",
|
|
22
21
|
"@effect-app/infra-adapters": "1.0.1",
|
|
23
22
|
"effect-app": "1.0.1",
|
|
23
|
+
"@effect-app/core": "1.0.0",
|
|
24
24
|
"@effect-app/schema": "1.0.1"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
@@ -69,7 +69,7 @@ export function makeMemQueue<
|
|
|
69
69
|
Effect
|
|
70
70
|
.flatMap(({ body, meta }) => {
|
|
71
71
|
let effect = Effect
|
|
72
|
-
.
|
|
72
|
+
.logDebug(`[${queueDrainName}] Processing incoming message`)
|
|
73
73
|
.pipe(
|
|
74
74
|
Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }),
|
|
75
75
|
Effect.zipRight(handleEvent(body)),
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ServiceBusError } from "@azure/service-bus"
|
|
1
2
|
import {
|
|
2
3
|
LiveSender,
|
|
3
4
|
LiveServiceBusClient,
|
|
@@ -5,11 +6,10 @@ import {
|
|
|
5
6
|
ServiceBusReceiverFactory,
|
|
6
7
|
subscribe
|
|
7
8
|
} from "@effect-app/infra-adapters/ServiceBus"
|
|
8
|
-
import type {} from "@azure/service-bus"
|
|
9
9
|
import { captureException } from "@effect-app/infra/errorReporter"
|
|
10
10
|
import { RequestContext } from "@effect-app/infra/RequestContext"
|
|
11
11
|
import { Tracer } from "effect"
|
|
12
|
-
import { Effect, flow, Layer, Option, S } from "effect-app"
|
|
12
|
+
import { Deferred, Effect, flow, Layer, Option, S } from "effect-app"
|
|
13
13
|
import { RequestId } from "effect-app/ids"
|
|
14
14
|
import type { StringId } from "effect-app/schema"
|
|
15
15
|
import { NonEmptyString255 } from "effect-app/schema"
|
|
@@ -47,6 +47,10 @@ export function makeServiceBusQueue<
|
|
|
47
47
|
const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName })
|
|
48
48
|
const rcc = yield* $(RequestContextContainer)
|
|
49
49
|
|
|
50
|
+
// TODO: or do async?
|
|
51
|
+
// This will make sure that the host receives the error (MainFiberSet.join), who will then interrupt everything and commence a shutdown and restart of app
|
|
52
|
+
const deferred = yield* $(Deferred.make<never, ServiceBusError | Error>())
|
|
53
|
+
|
|
50
54
|
return {
|
|
51
55
|
drain: <DrainE, DrainR>(
|
|
52
56
|
handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
|
|
@@ -64,7 +68,7 @@ export function makeServiceBusQueue<
|
|
|
64
68
|
Effect
|
|
65
69
|
.flatMap(({ body, meta }) => {
|
|
66
70
|
let effect = Effect
|
|
67
|
-
.
|
|
71
|
+
.logDebug(`[${queueDrainName}] Processing incoming message`)
|
|
68
72
|
.pipe(
|
|
69
73
|
Effect.annotateLogs({
|
|
70
74
|
body: pretty(body),
|
|
@@ -125,12 +129,18 @@ export function makeServiceBusQueue<
|
|
|
125
129
|
return yield* $(
|
|
126
130
|
subscribe({
|
|
127
131
|
processMessage: (x) => processMessage(x.body).pipe(Effect.uninterruptible),
|
|
128
|
-
processError: (err) =>
|
|
132
|
+
processError: (err) =>
|
|
133
|
+
Deferred.completeWith(
|
|
134
|
+
deferred,
|
|
135
|
+
Effect
|
|
136
|
+
.sync(() => captureException(err.error))
|
|
137
|
+
.pipe(Effect.andThen(Effect.fail(err.error)))
|
|
138
|
+
)
|
|
129
139
|
}, sessionId)
|
|
130
140
|
.pipe(Effect.provideService(ServiceBusReceiverFactory, receiver))
|
|
131
141
|
)
|
|
132
142
|
})
|
|
133
|
-
.pipe(Effect.andThen(Effect.
|
|
143
|
+
.pipe(Effect.andThen(Deferred.await(deferred).pipe(Effect.orDie))),
|
|
134
144
|
|
|
135
145
|
publish: (...messages) =>
|
|
136
146
|
Effect
|
|
@@ -139,7 +149,7 @@ export function makeServiceBusQueue<
|
|
|
139
149
|
const span = yield* $(Effect.serviceOption(Tracer.ParentSpan))
|
|
140
150
|
return yield* $(
|
|
141
151
|
Effect
|
|
142
|
-
.promise(() =>
|
|
152
|
+
.promise((abortSignal) =>
|
|
143
153
|
s.sendMessages(
|
|
144
154
|
messages.map((m) => ({
|
|
145
155
|
body: JSON.stringify(
|
|
@@ -151,7 +161,8 @@ export function makeServiceBusQueue<
|
|
|
151
161
|
messageId: m.id, /* correllationid: requestId */
|
|
152
162
|
contentType: "application/json",
|
|
153
163
|
sessionId: "sessionId" in m ? m.sessionId : undefined
|
|
154
|
-
}))
|
|
164
|
+
})),
|
|
165
|
+
{ abortSignal }
|
|
155
166
|
)
|
|
156
167
|
)
|
|
157
168
|
)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
// packages/infra/vitest.config.ts
|
|
2
|
+
import { defineConfig } from "file:///Users/patrickroza/pj/effect-app/libs/node_modules/.pnpm/vite@5.2.6_@types+node@20.11.30/node_modules/vite/dist/node/index.js";
|
|
3
|
+
|
|
4
|
+
// vite.config.base.ts
|
|
5
|
+
import path from "path";
|
|
6
|
+
import fs from "fs";
|
|
7
|
+
var __vite_injected_original_dirname = "/Users/patrickroza/pj/effect-app/libs";
|
|
8
|
+
function makeConfig(dirName) {
|
|
9
|
+
const prefix = path.resolve(__vite_injected_original_dirname, "packages");
|
|
10
|
+
const packages = fs.readdirSync(prefix).map((f) => prefix + "/" + f).filter((f) => fs.lstatSync(f).isDirectory());
|
|
11
|
+
const cfg = {
|
|
12
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
13
|
+
//plugins: [autoImport],
|
|
14
|
+
test: {
|
|
15
|
+
include: ["./test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
|
|
16
|
+
reporters: "verbose",
|
|
17
|
+
globals: true
|
|
18
|
+
},
|
|
19
|
+
resolve: {
|
|
20
|
+
alias: packages.reduce((acc, cur) => {
|
|
21
|
+
acc[JSON.parse(fs.readFileSync(cur + "/package.json", "utf-8")).name] = path.resolve(cur, cur.endsWith("core") ? "dist" : "src");
|
|
22
|
+
return acc;
|
|
23
|
+
}, {})
|
|
24
|
+
// "@effect-app/core/Prelude": path.join(__dirname, "packages/core/src/Prelude.code.ts")
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
console.log(cfg);
|
|
28
|
+
return cfg;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
// packages/infra/vitest.config.ts
|
|
32
|
+
var __vite_injected_original_dirname2 = "/Users/patrickroza/pj/effect-app/libs/packages/infra";
|
|
33
|
+
var vitest_config_default = defineConfig(makeConfig(__vite_injected_original_dirname2));
|
|
34
|
+
export {
|
|
35
|
+
vitest_config_default as default
|
|
36
|
+
};
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsicGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50cyIsICJ2aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYS92aXRlc3QuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvcGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoX19kaXJuYW1lKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCBmcyBmcm9tIFwiZnNcIlxuaW1wb3J0IEF1dG9JbXBvcnQgZnJvbSBcInVucGx1Z2luLWF1dG8taW1wb3J0L3ZpdGVcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVzdC9jb25maWdcIlxuXG4vLyBjb25zdCBhdXRvSW1wb3J0ID0gQXV0b0ltcG9ydCh7XG4vLyAgIGR0czogXCIuL3Rlc3QvYXV0by1pbXBvcnRzLmQudHNcIixcbi8vICAgLy8gaW5jbHVkZTogW1xuLy8gICAvLyAgIC9cXC50ZXN0XFwuW3RqXXN4PyQvIC8vIC50cywgLnRzeCwgLmpzLCAuanN4XG4vLyAgIC8vIF0sXG4vLyAgIGltcG9ydHM6IFtcbi8vICAgICBcInZpdGVzdFwiXG4vLyAgIF1cbi8vIH0pXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1ha2VDb25maWcoZGlyTmFtZT86IHN0cmluZykge1xuICBjb25zdCBwcmVmaXggPSBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcInBhY2thZ2VzXCIpXG4gIGNvbnN0IHBhY2thZ2VzID0gZnMucmVhZGRpclN5bmMocHJlZml4KS5tYXAoZiA9PiBwcmVmaXggKyBcIi9cIiArIGYpLmZpbHRlcihmID0+IGZzLmxzdGF0U3luYyhmKS5pc0RpcmVjdG9yeSgpIClcbiAgY29uc3QgY2ZnID0ge1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdmFyLXJlcXVpcmVzXG4gICAgLy9wbHVnaW5zOiBbYXV0b0ltcG9ydF0sXG4gICAgdGVzdDoge1xuICAgICAgaW5jbHVkZTogIFtcIi4vdGVzdC8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICByZXNvbHZlOiB7XG4gICAgICBhbGlhczogcGFja2FnZXMucmVkdWNlKChhY2MsIGN1cikgPT4geyAvLyB3b3JrYXJvdW5kIGZvciAvUHJlbHVkZSBpc3N1ZVxuICAgICAgYWNjW0pTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGN1ciArIFwiL3BhY2thZ2UuanNvblwiLCBcInV0Zi04XCIpKS5uYW1lXSA9IHBhdGgucmVzb2x2ZShjdXIsIGN1ci5lbmRzV2l0aChcImNvcmVcIikgPyBcImRpc3RcIiA6IFwic3JjXCIpXG4gICAgICByZXR1cm4gYWNjXG4gICAgfSwgeyB9KSAvLyBcIkBlZmZlY3QtYXBwL2NvcmUvUHJlbHVkZVwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcInBhY2thZ2VzL2NvcmUvc3JjL1ByZWx1ZGUuY29kZS50c1wiKVxuICB9XG4gIH1cbiAgY29uc29sZS5sb2coY2ZnKVxuICByZXR1cm4gY2ZnXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixPQUFPLFVBQVU7QUFDakIsT0FBTyxRQUFRO0FBRmYsSUFBTSxtQ0FBbUM7QUFnQjFCLFNBQVIsV0FBNEIsU0FBa0I7QUFDbkQsUUFBTSxTQUFTLEtBQUssUUFBUSxrQ0FBVyxVQUFVO0FBQ2pELFFBQU0sV0FBVyxHQUFHLFlBQVksTUFBTSxFQUFFLElBQUksT0FBSyxTQUFTLE1BQU0sQ0FBQyxFQUFFLE9BQU8sT0FBSyxHQUFHLFVBQVUsQ0FBQyxFQUFFLFlBQVksQ0FBRTtBQUM3RyxRQUFNLE1BQU07QUFBQTtBQUFBO0FBQUEsSUFHVixNQUFNO0FBQUEsTUFDSixTQUFVLENBQUMsa0RBQWtEO0FBQUEsTUFDN0QsV0FBVztBQUFBLE1BQ1gsU0FBUztBQUFBLElBQ1g7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNQLE9BQU8sU0FBUyxPQUFPLENBQUMsS0FBSyxRQUFRO0FBQ3JDLFlBQUksS0FBSyxNQUFNLEdBQUcsYUFBYSxNQUFNLGlCQUFpQixPQUFPLENBQUMsRUFBRSxJQUFJLElBQUksS0FBSyxRQUFRLEtBQUssSUFBSSxTQUFTLE1BQU0sSUFBSSxTQUFTLEtBQUs7QUFDL0gsZUFBTztBQUFBLE1BQ1QsR0FBRyxDQUFFLENBQUM7QUFBQTtBQUFBLElBQ1I7QUFBQSxFQUNBO0FBQ0EsVUFBUSxJQUFJLEdBQUc7QUFDZixTQUFPO0FBQ1Q7OztBRHBDQSxJQUFNQSxvQ0FBbUM7QUFJekMsSUFBTyx3QkFBUSxhQUFhLFdBQVdDLGlDQUFTLENBQUM7IiwKICAibmFtZXMiOiBbIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIiwgIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIl0KfQo=
|