@effect-app/infra 0.233.10 → 0.233.11
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/_cjs/services/QueueMaker/sbqueue.cjs +3 -4
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/dist/services/Operations.d.ts +1 -1
- package/dist/services/QueueMaker/sbqueue.d.ts +4 -12
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +5 -6
- package/package.json +4 -4
- package/src/services/QueueMaker/sbqueue.ts +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -32,8 +32,7 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
32
32
|
const parseDrain = (0, _effectApp.flow)(_effectApp.S.decodeUnknown(drainW), _effectApp.Effect.orDie);
|
|
33
33
|
return _effectApp.Effect.gen(function* ($) {
|
|
34
34
|
const s = yield* $(_ServiceBus.Sender);
|
|
35
|
-
const receiver = yield* $(_ServiceBus.
|
|
36
|
-
const receiverLayer = _effectApp.Layer.succeed(_ServiceBus.Receiver, receiver);
|
|
35
|
+
const receiver = yield* $(_ServiceBus.ServiceBusReceiverFactory);
|
|
37
36
|
const silenceAndReportError = (0, _errors.reportNonInterruptedFailure)({
|
|
38
37
|
name: "ServiceBusQueue.drain." + queueDrainName
|
|
39
38
|
});
|
|
@@ -79,7 +78,7 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
79
78
|
return yield* $((0, _ServiceBus.subscribe)({
|
|
80
79
|
processMessage: x => processMessage(x.body).pipe(_effectApp.Effect.uninterruptible),
|
|
81
80
|
processError: err => _effectApp.Effect.sync(() => (0, _errorReporter.captureException)(err.error))
|
|
82
|
-
}, sessionId).pipe(_effectApp.Effect.
|
|
81
|
+
}, sessionId).pipe(_effectApp.Effect.provideService(_ServiceBus.ServiceBusReceiverFactory, receiver)));
|
|
83
82
|
}).pipe(_effectApp.Effect.andThen(_effectApp.Effect.never)),
|
|
84
83
|
publish: (...messages) => _effectApp.Effect.gen(function* ($) {
|
|
85
84
|
const requestContext = yield* $(rcc.requestContext);
|
|
@@ -105,6 +104,6 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
|
|
|
105
104
|
* @tsplus static QueueMaker.Ops makeServiceBusLayers
|
|
106
105
|
*/
|
|
107
106
|
function makeServiceBusLayers(url, queueName, queueDrainName) {
|
|
108
|
-
return _effectApp.Layer.merge(
|
|
107
|
+
return _effectApp.Layer.merge(_ServiceBus.ServiceBusReceiverFactory.Live(queueDrainName), (0, _ServiceBus.LiveSender)(queueName)).pipe(_effectApp.Layer.provide((0, _ServiceBus.LiveServiceBusClient)(url)));
|
|
109
108
|
}
|
|
110
109
|
//# sourceMappingURL=sbqueue.cjs.map
|
|
@@ -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","
|
|
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","ServiceBusReceiverFactory","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","sessionId","processMessage","messageBody","sync","JSON","parse","pipe","flatMap","x","effect","logInfo","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","captureException","error","provideService","andThen","never","publish","messages","serviceOption","ParentSpan","promise","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":[]}
|
|
@@ -46,7 +46,7 @@ declare const Operations_base: (abstract new (service: {
|
|
|
46
46
|
all: Effect.Effect<Operation[], never, never>;
|
|
47
47
|
find: (id: StringId) => Effect.Effect<Option.Option<Operation>, never, never>;
|
|
48
48
|
update: (id: StringId, progress: OperationProgress) => Effect.Effect<void, never, never>;
|
|
49
|
-
}) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5,
|
|
49
|
+
}) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, Operations | R_5> : Effect<X, never, Operations>;
|
|
50
50
|
};
|
|
51
51
|
export declare class Operations extends Operations_base {
|
|
52
52
|
private static readonly CleanupLive;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ServiceBusReceiverFactory } from "@effect-app/infra-adapters/ServiceBus";
|
|
1
2
|
import { Tracer } from "effect";
|
|
2
3
|
import { Effect, Layer, S } from "effect-app";
|
|
3
4
|
import type { StringId } from "effect-app/schema";
|
|
@@ -12,20 +13,11 @@ export declare function makeServiceBusQueue<Evt extends {
|
|
|
12
13
|
id: StringId;
|
|
13
14
|
_tag: string;
|
|
14
15
|
}, 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>, sessionId?: string) => Effect.Effect<never, never, import("
|
|
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>;
|
|
18
|
-
}>>;
|
|
16
|
+
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>, ServiceBusReceiverFactory>>;
|
|
19
17
|
publish: (messages_0: Evt, ...messages_1: Evt[]) => Effect.Effect<void, never, never>;
|
|
20
|
-
}, never, RequestContextContainer |
|
|
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>;
|
|
23
|
-
} | import("@azure/service-bus").ServiceBusSender>;
|
|
18
|
+
}, never, RequestContextContainer | ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender>;
|
|
24
19
|
/**
|
|
25
20
|
* @tsplus static QueueMaker.Ops makeServiceBusLayers
|
|
26
21
|
*/
|
|
27
|
-
export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<import("@azure/service-bus").ServiceBusSender
|
|
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>;
|
|
30
|
-
}, never, never>;
|
|
22
|
+
export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender, never, never>;
|
|
31
23
|
//# sourceMappingURL=sbqueue.d.ts.map
|
|
@@ -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":"AAAA,OAAO,EAIL,yBAAyB,EAE1B,MAAM,uCAAuC,CAAA;AAI9C,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;yCAkBvB,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;;+GA4GzB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wGAI1F"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LiveSender, LiveServiceBusClient, Sender, ServiceBusReceiverFactory, subscribe } from "@effect-app/infra-adapters/ServiceBus";
|
|
2
2
|
import { captureException } from "@effect-app/infra/errorReporter";
|
|
3
3
|
import { RequestContext } from "@effect-app/infra/RequestContext";
|
|
4
4
|
import { Tracer } from "effect";
|
|
@@ -22,8 +22,7 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
22
22
|
const parseDrain = flow(S.decodeUnknown(drainW), Effect.orDie);
|
|
23
23
|
return Effect.gen(function* ($) {
|
|
24
24
|
const s = yield* $(Sender);
|
|
25
|
-
const receiver = yield* $(
|
|
26
|
-
const receiverLayer = Layer.succeed(Receiver, receiver);
|
|
25
|
+
const receiver = yield* $(ServiceBusReceiverFactory);
|
|
27
26
|
const silenceAndReportError = reportNonInterruptedFailure({ name: "ServiceBusQueue.drain." + queueDrainName });
|
|
28
27
|
const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName });
|
|
29
28
|
const rcc = yield* $(RequestContextContainer);
|
|
@@ -84,7 +83,7 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
84
83
|
processMessage: (x) => processMessage(x.body).pipe(Effect.uninterruptible),
|
|
85
84
|
processError: (err) => Effect.sync(() => captureException(err.error))
|
|
86
85
|
}, sessionId)
|
|
87
|
-
.pipe(Effect.
|
|
86
|
+
.pipe(Effect.provideService(ServiceBusReceiverFactory, receiver)));
|
|
88
87
|
})
|
|
89
88
|
.pipe(Effect.andThen(Effect.never)),
|
|
90
89
|
publish: (...messages) => Effect
|
|
@@ -109,6 +108,6 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
109
108
|
* @tsplus static QueueMaker.Ops makeServiceBusLayers
|
|
110
109
|
*/
|
|
111
110
|
export function makeServiceBusLayers(url, queueName, queueDrainName) {
|
|
112
|
-
return Layer.merge(
|
|
111
|
+
return Layer.merge(ServiceBusReceiverFactory.Live(queueDrainName), LiveSender(queueName)).pipe(Layer.provide(LiveServiceBusClient(url)));
|
|
113
112
|
}
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsTUFBTSxFQUNOLHlCQUF5QixFQUN6QixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUMzRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFFMUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQzdELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUMvRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDM0YsT0FBTyxFQUFrQixTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFeEQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBTWpDLFVBQWtCLEVBQ2xCLGNBQXNCLEVBQ3RCLE1BQTJCLEVBQzNCLFdBQTBDO0lBRTFDLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQztRQUN4QixJQUFJLEVBQUUsTUFBTTtRQUNaLElBQUks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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "0.233.
|
|
3
|
+
"version": "0.233.11",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -18,10 +18,10 @@
|
|
|
18
18
|
"proper-lockfile": "^4.1.2",
|
|
19
19
|
"pure-rand": "6.1.0",
|
|
20
20
|
"redlock": "^4.2.0",
|
|
21
|
+
"@effect-app/infra-adapters": "0.154.5",
|
|
21
22
|
"@effect-app/core": "0.169.1",
|
|
22
|
-
"
|
|
23
|
-
"@effect-app/schema": "0.220.4"
|
|
24
|
-
"effect-app": "0.201.6"
|
|
23
|
+
"effect-app": "0.201.6",
|
|
24
|
+
"@effect-app/schema": "0.220.4"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@babel/cli": "^7.24.1",
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import {
|
|
2
|
-
LiveReceiver,
|
|
3
2
|
LiveSender,
|
|
4
3
|
LiveServiceBusClient,
|
|
5
|
-
Receiver,
|
|
6
4
|
Sender,
|
|
5
|
+
ServiceBusReceiverFactory,
|
|
7
6
|
subscribe
|
|
8
7
|
} from "@effect-app/infra-adapters/ServiceBus"
|
|
9
8
|
import type {} from "@azure/service-bus"
|
|
@@ -43,8 +42,7 @@ export function makeServiceBusQueue<
|
|
|
43
42
|
|
|
44
43
|
return Effect.gen(function*($) {
|
|
45
44
|
const s = yield* $(Sender)
|
|
46
|
-
const receiver = yield* $(
|
|
47
|
-
const receiverLayer = Layer.succeed(Receiver, receiver)
|
|
45
|
+
const receiver = yield* $(ServiceBusReceiverFactory)
|
|
48
46
|
const silenceAndReportError = reportNonInterruptedFailure({ name: "ServiceBusQueue.drain." + queueDrainName })
|
|
49
47
|
const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName })
|
|
50
48
|
const rcc = yield* $(RequestContextContainer)
|
|
@@ -129,7 +127,7 @@ export function makeServiceBusQueue<
|
|
|
129
127
|
processMessage: (x) => processMessage(x.body).pipe(Effect.uninterruptible),
|
|
130
128
|
processError: (err) => Effect.sync(() => captureException(err.error))
|
|
131
129
|
}, sessionId)
|
|
132
|
-
.pipe(Effect.
|
|
130
|
+
.pipe(Effect.provideService(ServiceBusReceiverFactory, receiver))
|
|
133
131
|
)
|
|
134
132
|
})
|
|
135
133
|
.pipe(Effect.andThen(Effect.never)),
|
|
@@ -166,5 +164,7 @@ export function makeServiceBusQueue<
|
|
|
166
164
|
* @tsplus static QueueMaker.Ops makeServiceBusLayers
|
|
167
165
|
*/
|
|
168
166
|
export function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string) {
|
|
169
|
-
return Layer.merge(
|
|
167
|
+
return Layer.merge(ServiceBusReceiverFactory.Live(queueDrainName), LiveSender(queueName)).pipe(
|
|
168
|
+
Layer.provide(LiveServiceBusClient(url))
|
|
169
|
+
)
|
|
170
170
|
}
|