@effect-app/infra 0.232.9 → 0.233.0
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 +17 -0
- package/_cjs/services/QueueMaker/memQueue.cjs +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs +8 -6
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/service.cjs.map +1 -1
- package/dist/services/QueueMaker/memQueue.js +2 -2
- package/dist/services/QueueMaker/sbqueue.d.ts +4 -1
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +8 -7
- package/dist/services/QueueMaker/service.d.ts +1 -1
- package/dist/services/QueueMaker/service.d.ts.map +1 -1
- package/dist/services/QueueMaker/service.js +1 -1
- package/package.json +4 -4
- package/src/services/QueueMaker/memQueue.ts +1 -1
- package/src/services/QueueMaker/sbqueue.ts +8 -6
- package/src/services/QueueMaker/service.ts +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 0.233.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- feat: queue sessionId (service bus)
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
- @effect-app/infra-adapters@0.154.0
|
|
13
|
+
|
|
14
|
+
## 0.232.10
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- 44ab467: include quename at drain request name
|
|
19
|
+
|
|
3
20
|
## 0.232.9
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -67,7 +67,7 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
67
67
|
}), _effectApp.Effect.zipRight(handleEvent(body)), silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
|
|
68
68
|
id: (0, _ids.RequestId)(body.id),
|
|
69
69
|
locale: "en",
|
|
70
|
-
name: (0, _schema.NonEmptyString255)(body._tag)
|
|
70
|
+
name: (0, _schema.NonEmptyString255)(`${queueDrainName}.${body._tag}`)
|
|
71
71
|
})), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
|
|
72
72
|
attributes: {
|
|
73
73
|
"queue.name": queueDrainName
|
|
@@ -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","struct","body","meta","QueueMeta","drainW","parseDrain","flow","S","decodeUnknown","orDie","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","encode","Option","getOrUndefined","pipe","andThen","JSON","stringify","flatMap","_","offer","discard","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","sync","parse","effect","logDebug","annotateLogs","pretty","zipRight","setupRequestContext","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","withParentSpan","externalSpan","take","x","uninterruptible","fork","Fiber","join","forever"],"sources":["../../../src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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
|
|
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","struct","body","meta","QueueMeta","drainW","parseDrain","flow","S","decodeUnknown","orDie","publish","messages","requestContext","span","serviceOption","Tracer","ParentSpan","forEach","m","encode","Option","getOrUndefined","pipe","andThen","JSON","stringify","flatMap","_","offer","discard","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","sync","parse","effect","logDebug","annotateLogs","pretty","zipRight","setupRequestContext","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","withParentSpan","externalSpan","take","x","uninterruptible","fork","Fiber","join","forever"],"sources":["../../../src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -42,7 +42,7 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
42
42
|
});
|
|
43
43
|
const rcc = yield* $(_RequestContextContainer.RequestContextContainer);
|
|
44
44
|
return {
|
|
45
|
-
drain: handleEvent => _effectApp.Effect.gen(function* ($) {
|
|
45
|
+
drain: (handleEvent, sessionId) => _effectApp.Effect.gen(function* ($) {
|
|
46
46
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
47
47
|
function processMessage(messageBody) {
|
|
48
48
|
return _effectApp.Effect.sync(() => JSON.parse(messageBody)).pipe(_effectApp.Effect.flatMap(x => parseDrain(x)), _effectApp.Effect.orDie, _effectApp.Effect.flatMap(({
|
|
@@ -57,10 +57,11 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
57
57
|
.pipe(silenceAndReportError, _ => (0, _setupRequest.setupRequestContext)(_, _RequestContext.RequestContext.inherit(meta.requestContext, {
|
|
58
58
|
id: (0, _ids.RequestId)(body.id),
|
|
59
59
|
locale: "en",
|
|
60
|
-
name: (0, _schema.NonEmptyString255)(body._tag)
|
|
61
|
-
})), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}`, {
|
|
60
|
+
name: (0, _schema.NonEmptyString255)(`${queueDrainName}.${body._tag}`)
|
|
61
|
+
})), _effectApp.Effect.withSpan(`queue.drain: ${queueDrainName}${sessionId ? `#${sessionId}` : ""}`, {
|
|
62
62
|
attributes: {
|
|
63
|
-
"queue.name": queueDrainName
|
|
63
|
+
"queue.name": queueDrainName,
|
|
64
|
+
"queue.sessionId": sessionId
|
|
64
65
|
}
|
|
65
66
|
}));
|
|
66
67
|
if (meta.span) {
|
|
@@ -74,7 +75,7 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
74
75
|
return yield* $((0, _ServiceBus.subscribe)({
|
|
75
76
|
processMessage: x => processMessage(x.body).pipe(_effectApp.Effect.uninterruptible),
|
|
76
77
|
processError: err => _effectApp.Effect.sync(() => (0, _errorReporter.captureException)(err.error))
|
|
77
|
-
}).pipe(_effectApp.Effect.provide(receiverLayer)));
|
|
78
|
+
}, sessionId).pipe(_effectApp.Effect.provide(receiverLayer)));
|
|
78
79
|
}).pipe(_effectApp.Effect.andThen(_effectApp.Effect.never)),
|
|
79
80
|
publish: (...messages) => _effectApp.Effect.gen(function* ($) {
|
|
80
81
|
const requestContext = yield* $(rcc.requestContext);
|
|
@@ -89,7 +90,8 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
89
90
|
})),
|
|
90
91
|
messageId: m.id,
|
|
91
92
|
/* correllationid: requestId */
|
|
92
|
-
contentType: "application/json"
|
|
93
|
+
contentType: "application/json",
|
|
94
|
+
sessionId: "sessionId" in m ? m.sessionId : undefined
|
|
93
95
|
})))));
|
|
94
96
|
})
|
|
95
97
|
};
|
|
@@ -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","struct","body","meta","QueueMeta","drainW","parseDrain","flow","S","decodeUnknown","Effect","orDie","gen","$","s","Sender","receiver","Receiver","receiverLayer","Layer","succeed","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","processMessage","messageBody","sync","JSON","parse","pipe","flatMap","x","effect","logDebug","annotateLogs","pretty","zipRight","_","setupRequestContext","RequestContext","inherit","requestContext","id","RequestId","locale","NonEmptyString255","_tag","withSpan","attributes","span","withParentSpan","Tracer","externalSpan","tapErrorCause","subscribe","uninterruptible","processError","err","captureException","error","provide","andThen","never","publish","messages","serviceOption","ParentSpan","promise","sendMessages","map","m","stringify","encodeSync","Option","getOrUndefined","messageId","contentType","makeServiceBusLayers","url","queueName","merge","LiveReceiver","LiveSender","LiveServiceBusClient"],"sources":["../../../src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AASA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,IAAA,GAAAL,OAAA;AAEA,IAAAM,OAAA,GAAAN,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AACA,IAAAQ,aAAA,GAAAR,OAAA;AACA,IAAAS,wBAAA,GAAAT,OAAA;AACA,IAAAU,OAAA,GAAAV,OAAA;AACA,IAAAW,QAAA,GAAAX,OAAA;AAEA;;;AAGM,SAAUY,mBAAmBA,CAMjCC,UAAkB,EAClBC,cAAsB,EACtBC,MAA2B,EAC3BC,WAA0C;EAE1C,MAAMC,UAAU,GAAG,IAAAC,cAAM,EAAC;IACxBC,IAAI,EAAEJ,MAAM;IACZK,IAAI,EAAEC;GACP,CAAC;EACF,MAAMC,MAAM,GAAG,IAAAJ,cAAM,EAAC;IAAEC,IAAI,EAAEH,WAAW;IAAEI,IAAI,EAAEC;EAAS,CAAE,CAAC;EAC7D,MAAME,UAAU,GAAG,IAAAC,eAAI,EAACC,YAAC,CAACC,aAAa,CAACJ,MAAM,CAAC,EAAEK,iBAAM,CAACC,KAAK,CAAC;EAE9D,OAAOD,iBAAM,CAACE,GAAG,CAAC,WAAUC,CAAC;IAC3B,MAAMC,CAAC,GAAG,OAAOD,CAAC,CAACE,kBAAM,CAAC;IAC1B,MAAMC,QAAQ,GAAG,OAAOH,CAAC,CAACI,oBAAQ,CAAC;IACnC,MAAMC,aAAa,GAAGC,gBAAK,CAACC,OAAO,CAACH,oBAAQ,EAAED,QAAQ,CAAC;IACvD,MAAMK,qBAAqB,GAAG,IAAAC,mCAA2B,EAAC;MAAEC,IAAI,EAAE,wBAAwB,GAAG1B;IAAc,CAAE,CAAC;IAC9G,MAAM2B,WAAW,GAAG,IAAAC,wCAAgC,EAAC;MAAEF,IAAI,EAAE,wBAAwB,GAAG1B;IAAc,CAAE,CAAC;IACzG,MAAM6B,GAAG,GAAG,OAAOb,CAAC,CAACc,gDAAuB,CAAC;IAE7C,OAAO;MACLC,KAAK,
|
|
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","struct","body","meta","QueueMeta","drainW","parseDrain","flow","S","decodeUnknown","Effect","orDie","gen","$","s","Sender","receiver","Receiver","receiverLayer","Layer","succeed","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","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","span","withParentSpan","Tracer","externalSpan","tapErrorCause","subscribe","uninterruptible","processError","err","captureException","error","provide","andThen","never","publish","messages","serviceOption","ParentSpan","promise","sendMessages","map","m","stringify","encodeSync","Option","getOrUndefined","messageId","contentType","undefined","makeServiceBusLayers","url","queueName","merge","LiveReceiver","LiveSender","LiveServiceBusClient"],"sources":["../../../src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.cjs","names":["_schema","require","_effectApp","_RequestContext","QueueMaker","exports","QueueMeta","struct","requestContext","RequestContext","span","S","optional","spanId","string","traceId","sampled","boolean"],"sources":["../../../src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;
|
|
1
|
+
{"version":3,"file":"service.cjs","names":["_schema","require","_effectApp","_RequestContext","QueueMaker","exports","QueueMeta","struct","requestContext","RequestContext","span","S","optional","spanId","string","traceId","sampled","boolean"],"sources":["../../../src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;AAkBO,MAAMG,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE;AAEpC,MAAME,SAAS,GAAAD,OAAA,CAAAC,SAAA,GAAG,IAAAC,cAAM,EAAC;EAC9BC,cAAc,EAAEC,8BAAc;EAC9BC,IAAI,EAAEC,YAAC,CAACC,QAAQ,CAAC,IAAAL,cAAM,EAAC;IACtBM,MAAM,EAAEF,YAAC,CAACG,MAAM;IAChBC,OAAO,EAAEJ,YAAC,CAACG,MAAM;IACjBE,OAAO,EAAEL,YAAC,CAACM;GACZ,CAAC;CACH,CAAC","ignoreList":[]}
|
|
@@ -47,7 +47,7 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
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",
|
|
50
|
-
name: NonEmptyString255(body._tag)
|
|
50
|
+
name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
|
|
51
51
|
})), Effect
|
|
52
52
|
.withSpan(`queue.drain: ${queueDrainName}`, {
|
|
53
53
|
attributes: { "queue.name": queueDrainName }
|
|
@@ -67,4 +67,4 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
67
67
|
};
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvUXVldWVNYWtlci9tZW1RdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzNELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDekMsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDL0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FNMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBMkIsRUFDM0IsV0FBMEM7SUFFMUMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDM0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQzlCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENB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
|
|
@@ -12,17 +12,20 @@ export declare function makeServiceBusQueue<Evt extends {
|
|
|
12
12
|
id: StringId;
|
|
13
13
|
_tag: string;
|
|
14
14
|
}, EvtE, DrainEvtE>(_queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
|
|
15
|
-
drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR
|
|
15
|
+
drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, {
|
|
16
16
|
make: Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
|
|
17
|
+
makeSession: (sessionId: string) => Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
|
|
17
18
|
}>>;
|
|
18
19
|
publish: (messages_0: Evt, ...messages_1: Evt[]) => Effect.Effect<void, never, never>;
|
|
19
20
|
}, never, RequestContextContainer | {
|
|
20
21
|
make: Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
|
|
22
|
+
makeSession: (sessionId: string) => Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
|
|
21
23
|
} | import("@azure/service-bus").ServiceBusSender>;
|
|
22
24
|
/**
|
|
23
25
|
* @tsplus static QueueMaker.Ops makeServiceBusLayers
|
|
24
26
|
*/
|
|
25
27
|
export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<import("@azure/service-bus").ServiceBusSender | {
|
|
26
28
|
make: Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
|
|
29
|
+
makeSession: (sessionId: string) => Effect<import("@azure/service-bus").ServiceBusReceiver, never, import("effect/Scope").Scope>;
|
|
27
30
|
}, never, never>;
|
|
28
31
|
//# sourceMappingURL=sbqueue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAQ,KAAK,EAAU,CAAC,EAAE,MAAM,YAAY,CAAA;AAE3D,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;yCAmBvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC
|
|
1
|
+
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAQ,KAAK,EAAU,CAAC,EAAE,MAAM,YAAY,CAAA;AAE3D,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;yCAmBvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;;;;;;;;mDAuFzB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;;;iBAE1F"}
|
|
@@ -28,7 +28,7 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
28
28
|
const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName });
|
|
29
29
|
const rcc = yield* $(RequestContextContainer);
|
|
30
30
|
return {
|
|
31
|
-
drain: (handleEvent) => Effect
|
|
31
|
+
drain: (handleEvent, sessionId) => Effect
|
|
32
32
|
.gen(function* ($) {
|
|
33
33
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
34
34
|
function processMessage(messageBody) {
|
|
@@ -46,10 +46,10 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
46
46
|
.pipe(silenceAndReportError, (_) => setupRequestContext(_, RequestContext.inherit(meta.requestContext, {
|
|
47
47
|
id: RequestId(body.id),
|
|
48
48
|
locale: "en",
|
|
49
|
-
name: NonEmptyString255(body._tag)
|
|
49
|
+
name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
|
|
50
50
|
})), Effect
|
|
51
|
-
.withSpan(`queue.drain: ${queueDrainName}`, {
|
|
52
|
-
attributes: { "queue.name": queueDrainName }
|
|
51
|
+
.withSpan(`queue.drain: ${queueDrainName}${sessionId ? `#${sessionId}` : ""}`, {
|
|
52
|
+
attributes: { "queue.name": queueDrainName, "queue.sessionId": sessionId }
|
|
53
53
|
}));
|
|
54
54
|
if (meta.span) {
|
|
55
55
|
effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span));
|
|
@@ -62,7 +62,7 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
62
62
|
return yield* $(subscribe({
|
|
63
63
|
processMessage: (x) => processMessage(x.body).pipe(Effect.uninterruptible),
|
|
64
64
|
processError: (err) => Effect.sync(() => captureException(err.error))
|
|
65
|
-
})
|
|
65
|
+
}, sessionId)
|
|
66
66
|
.pipe(Effect.provide(receiverLayer)));
|
|
67
67
|
})
|
|
68
68
|
.pipe(Effect.andThen(Effect.never)),
|
|
@@ -77,7 +77,8 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
77
77
|
meta: { requestContext, span: Option.getOrUndefined(span) }
|
|
78
78
|
})),
|
|
79
79
|
messageId: m.id, /* correllationid: requestId */
|
|
80
|
-
contentType: "application/json"
|
|
80
|
+
contentType: "application/json",
|
|
81
|
+
sessionId: "sessionId" in m ? m.sessionId : undefined
|
|
81
82
|
})))));
|
|
82
83
|
})
|
|
83
84
|
};
|
|
@@ -89,4 +90,4 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
89
90
|
export function makeServiceBusLayers(url, queueName, queueDrainName) {
|
|
90
91
|
return Layer.merge(LiveReceiver(queueDrainName), LiveSender(queueName)).pipe(Layer.provide(LiveServiceBusClient(url)));
|
|
91
92
|
}
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWixVQUFVLEVBQ1Ysb0JBQW9CLEVBQ3BCLFFBQVEsRUFDUixNQUFNLEVBQ04sU0FBUyxFQUNWLE1BQU0sdUNBQXVDLENBQUE7QUFFOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRTFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUM3RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDekMsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDL0QsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLGdDQUFnQyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQzNGLE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQU1qQyxVQUFrQixFQUNsQixjQUFzQixFQUN0QixNQUEyQixFQUMzQixXQUEwQztJQUUxQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUM7UUFDeEIsSUFBSSxFQUFFLE1BQU07UUFDWixJQUFJLEVBQUUsU0FBUztLQUNoQixDQUFDLENBQUE7SUFDRixNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFBO0lBQzdELE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUU5RCxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUMzQixNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDMUIsTUFBTSxRQUFRLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ25DLE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFBO1FBQ3ZELE1BQU0scUJBQXFCLEdBQUcsMkJBQTJCLENBQUMsRUFBRSxJQUFJLEVBQUUsd0JBQXdCLEdBQUcsY0FBYyxFQUFFLENBQUMsQ0FBQTtRQUM5RyxNQUFNLFdBQVcsR0FBRyxnQ0FBZ0MsQ0FBQyxFQUFFLElBQUksRUFBRSx3QkFBd0IsR0FBRyxjQUFjLEVBQUUsQ0FBQyxDQUFBO1FBQ3pHLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBRTdDLE9BQU87WUFDTCxLQUFLLEVBQUUsQ0FDTCxXQUEyRCxFQUMzRCxTQUFrQixFQUNsQixFQUFFLENBQ0YsTUFBTTtpQkFDSCxHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUMsQ0FBQztnQkFDZCw4REFBOEQ7Z0JBQzlELFNBQVMsY0FBYyxDQUFDLFdBQWdCO29CQUN0QyxPQUFPLE1BQU07eUJBQ1YsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7eUJBQ25DLElBQUksQ0FDSCxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFDcEMsTUFBTSxDQUFDLEtBQUssRUFDWixNQUFNO3lCQUNILE9BQU8sQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUU7d0JBQzFCLElBQUksTUFBTSxHQUFHLE1BQU07NkJBQ2hCLFFBQVEsQ0FBQyxPQUFPLGNBQWMsK0JBQStCLENBQUM7NkJBQzlELElBQUksQ0FDSCxNQUFNLENBQUMsWUFBWSxDQUFDOzRCQUNsQixJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQzs0QkFDbEIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUM7eUJBQ25CLENBQUMsRUFDRixNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUNsQyxNQUFNLENBQUMsS0FBSyxDQUNiOzRCQUNELHlGQUF5Rjs2QkFDeEYsSUFBSSxDQUNILHFCQUFxQixFQUNyQixDQUFDLENBQUMsRUFBRSxFQUFFLENBQ0osbUJBQW1CLENBQ2pCLENBQUMsRUFDRCxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUU7NEJBQzFDLEVBQUUsRUFBRSxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQzs0QkFDdEIsTUFBTSxFQUFFLElBQWE7NEJBQ3JCLElBQUksRUFBRSxpQkFBaUIsQ0FBQyxHQUFHLGNBQWMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7eUJBQzFELENBQUMsQ0FDSCxFQUNILE1BQU07NkJBQ0gsUUFBUSxDQUFDLGdCQUFnQixjQUFjLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRTs0QkFDN0UsVUFBVSxFQUFFLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxpQkFBaUIsRUFBRSxTQUFTLEVBQUU7eUJBQzNFLENBQUMsQ0FDTCxDQUFBO3dCQUNILElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDOzRCQUNkLE1BQU0sR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO3dCQUN4RSxDQUFDO3dCQUNELE9BQU8sTUFBTSxDQUFBO29CQUNmLENBQUMsQ0FBQyxFQUNKLE1BQU07d0JBQ0osMEVBQTBFO3lCQUN6RSxhQUFhLENBQUMsV0FBVyxDQUFDLENBQzlCLENBQUE7Z0JBQ0wsQ0FBQztnQkFFRCxPQUFPLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDYixTQUFTLENBQUM7b0JBQ1IsY0FBYyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsZUFBZSxDQUFDO29CQUMxRSxZQUFZLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO2lCQUN0RSxFQUFFLFNBQVMsQ0FBQztxQkFDVixJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUN2QyxDQUFBO1lBQ0gsQ0FBQyxDQUFDO2lCQUNELElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUV2QyxPQUFPLEVBQUUsQ0FBQyxHQUFHLFFBQVEsRUFBRSxFQUFFLENBQ3ZCLE1BQU07aUJBQ0gsR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFDLENBQUM7Z0JBQ2QsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQTtnQkFDbkQsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUE7Z0JBQzlELE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNiLE1BQU07cUJBQ0gsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUNaLENBQUMsQ0FBQyxZQUFZLENBQ1osUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztvQkFDbkIsSUFBSSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQ2xCLENBQUMsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7d0JBQ3ZCLElBQUksRUFBRSxDQUFDO3dCQUNQLElBQUksRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsRUFBRTtxQkFDNUQsQ0FBQyxDQUNIO29CQUNELFNBQVMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLCtCQUErQjtvQkFDaEQsV0FBVyxFQUFFLGtCQUFrQjtvQkFDL0IsU0FBUyxFQUFFLFdBQVcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLFNBQVM7aUJBQ3RELENBQUMsQ0FBQyxDQUNKLENBQ0YsQ0FDSixDQUFBO1lBQ0gsQ0FBQyxDQUFDO1NBQzRCLENBQUE7SUFDdEMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQUMsR0FBVyxFQUFFLFNBQWlCLEVBQUUsY0FBc0I7SUFDekYsT0FBTyxLQUFLLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsRUFBRSxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDeEgsQ0FBQyJ9
|
|
@@ -4,7 +4,7 @@ import { RequestContext } from "../../RequestContext.js";
|
|
|
4
4
|
import type { RequestContextContainer } from "../RequestContextContainer.js";
|
|
5
5
|
import type { ContextMapContainer } from "../Store/ContextMapContainer.js";
|
|
6
6
|
export interface QueueBase<Evt, DrainEvt> {
|
|
7
|
-
drain: <DrainE, DrainR>(makeHandleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR
|
|
7
|
+
drain: <DrainE, DrainR>(makeHandleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect<never, never, Scope | RequestContextContainer | ContextMapContainer | DrainR>;
|
|
8
8
|
publish: (...messages: NonEmptyReadonlyArray<Evt>) => Effect<void>;
|
|
9
9
|
}
|
|
10
10
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAC9B,OAAO,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAE1E,MAAM,WAAW,SAAS,CAAC,GAAG,EAAE,QAAQ;IACtC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EACpB,eAAe,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/services/QueueMaker/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAC9B,OAAO,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAE1E,MAAM,WAAW,SAAS,CAAC,GAAG,EAAE,QAAQ;IACtC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EACpB,eAAe,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAC/D,SAAS,CAAC,EAAE,MAAM,KACf,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,uBAAuB,GAAG,mBAAmB,GAAG,MAAM,CAAC,CAAA;IACzF,OAAO,EAAE,CACP,GAAG,QAAQ,EAAE,qBAAqB,CAAC,GAAG,CAAC,KACpC,MAAM,CAAC,IAAI,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;CAAG;AACjC,eAAO,MAAM,UAAU,EAAE,aAAkB,CAAA;AAE3C,eAAO,MAAM,SAAS;;;;;;;;;;;EAOpB,CAAA"}
|
|
@@ -10,4 +10,4 @@ export const QueueMeta = struct({
|
|
|
10
10
|
sampled: S.boolean
|
|
11
11
|
}))
|
|
12
12
|
});
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQzNDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFOUIsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBa0J4RCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQWtCLEVBQUUsQ0FBQTtBQUUzQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDO0lBQzlCLGNBQWMsRUFBRSxjQUFjO0lBQzlCLElBQUksRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQztRQUN0QixNQUFNLEVBQUUsQ0FBQyxDQUFDLE1BQU07UUFDaEIsT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNO1FBQ2pCLE9BQU8sRUFBRSxDQUFDLENBQUMsT0FBTztLQUNuQixDQUFDLENBQUM7Q0FDSixDQUFDLENBQUEifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.233.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -19,9 +19,9 @@
|
|
|
19
19
|
"pure-rand": "6.1.0",
|
|
20
20
|
"redlock": "^4.2.0",
|
|
21
21
|
"@effect-app/core": "0.169.0",
|
|
22
|
-
"
|
|
23
|
-
"@effect-app/
|
|
24
|
-
"effect-app": "0.
|
|
22
|
+
"effect-app": "0.201.3",
|
|
23
|
+
"@effect-app/infra-adapters": "0.154.0",
|
|
24
|
+
"@effect-app/schema": "0.220.3"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@babel/cli": "^7.24.1",
|
|
@@ -51,7 +51,8 @@ export function makeServiceBusQueue<
|
|
|
51
51
|
|
|
52
52
|
return {
|
|
53
53
|
drain: <DrainE, DrainR>(
|
|
54
|
-
handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR
|
|
54
|
+
handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
|
|
55
|
+
sessionId?: string
|
|
55
56
|
) =>
|
|
56
57
|
Effect
|
|
57
58
|
.gen(function*($) {
|
|
@@ -83,12 +84,12 @@ export function makeServiceBusQueue<
|
|
|
83
84
|
RequestContext.inherit(meta.requestContext, {
|
|
84
85
|
id: RequestId(body.id),
|
|
85
86
|
locale: "en" as const,
|
|
86
|
-
name: NonEmptyString255(body._tag)
|
|
87
|
+
name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
|
|
87
88
|
})
|
|
88
89
|
),
|
|
89
90
|
Effect
|
|
90
|
-
.withSpan(`queue.drain: ${queueDrainName}`, {
|
|
91
|
-
attributes: { "queue.name": queueDrainName }
|
|
91
|
+
.withSpan(`queue.drain: ${queueDrainName}${sessionId ? `#${sessionId}` : ""}`, {
|
|
92
|
+
attributes: { "queue.name": queueDrainName, "queue.sessionId": sessionId }
|
|
92
93
|
})
|
|
93
94
|
)
|
|
94
95
|
if (meta.span) {
|
|
@@ -106,7 +107,7 @@ export function makeServiceBusQueue<
|
|
|
106
107
|
subscribe({
|
|
107
108
|
processMessage: (x) => processMessage(x.body).pipe(Effect.uninterruptible),
|
|
108
109
|
processError: (err) => Effect.sync(() => captureException(err.error))
|
|
109
|
-
})
|
|
110
|
+
}, sessionId)
|
|
110
111
|
.pipe(Effect.provide(receiverLayer))
|
|
111
112
|
)
|
|
112
113
|
})
|
|
@@ -129,7 +130,8 @@ export function makeServiceBusQueue<
|
|
|
129
130
|
})
|
|
130
131
|
),
|
|
131
132
|
messageId: m.id, /* correllationid: requestId */
|
|
132
|
-
contentType: "application/json"
|
|
133
|
+
contentType: "application/json",
|
|
134
|
+
sessionId: "sessionId" in m ? m.sessionId : undefined
|
|
133
135
|
}))
|
|
134
136
|
)
|
|
135
137
|
)
|
|
@@ -7,7 +7,8 @@ import type { ContextMapContainer } from "../Store/ContextMapContainer.js"
|
|
|
7
7
|
|
|
8
8
|
export interface QueueBase<Evt, DrainEvt> {
|
|
9
9
|
drain: <DrainE, DrainR>(
|
|
10
|
-
makeHandleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR
|
|
10
|
+
makeHandleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
|
|
11
|
+
sessionId?: string
|
|
11
12
|
) => Effect<never, never, Scope | RequestContextContainer | ContextMapContainer | DrainR>
|
|
12
13
|
publish: (
|
|
13
14
|
...messages: NonEmptyReadonlyArray<Evt>
|