@effect-app/infra 4.0.0-beta.283 → 4.0.0-beta.285
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 +15 -0
- package/dist/ClusterCosmos.d.ts +15 -15
- package/dist/internal/RequestContextMiddleware.js +4 -4
- package/dist/routing.d.ts.map +1 -1
- package/dist/routing.js +16 -17
- package/package.json +2 -2
- package/src/internal/RequestContextMiddleware.ts +3 -3
- package/src/routing.ts +65 -61
- package/test/repository-ext.test.ts +4 -4
- package/test/rpc-e2e-invalidation.test.ts +24 -24
- package/dist/QueueMaker/SQLQueue.d.ts +0 -15
- package/dist/QueueMaker/SQLQueue.d.ts.map +0 -1
- package/dist/QueueMaker/SQLQueue.js +0 -148
- package/dist/QueueMaker/memQueue.d.ts +0 -15
- package/dist/QueueMaker/memQueue.d.ts.map +0 -1
- package/dist/QueueMaker/memQueue.js +0 -92
- package/dist/QueueMaker/sbqueue.d.ts +0 -16
- package/dist/QueueMaker/sbqueue.d.ts.map +0 -1
- package/dist/QueueMaker/sbqueue.js +0 -93
- package/dist/RequestFiberSet.d.ts +0 -39
- package/dist/RequestFiberSet.d.ts.map +0 -1
- package/dist/RequestFiberSet.js +0 -83
- package/dist/ServiceBus.d.ts +0 -61
- package/dist/ServiceBus.d.ts.map +0 -1
- package/dist/ServiceBus.js +0 -108
- package/dist/memQueue.d.ts +0 -15
- package/dist/memQueue.d.ts.map +0 -1
- package/dist/memQueue.js +0 -21
|
@@ -22,7 +22,8 @@ import { makeRepo, RepositoryRegistryLive } from "effect-app/Model"
|
|
|
22
22
|
import { Invalidation, MiddlewareMaker } from "effect-app/rpc"
|
|
23
23
|
import * as S from "effect-app/Schema"
|
|
24
24
|
import { TaggedErrorClass } from "effect-app/Schema"
|
|
25
|
-
import {
|
|
25
|
+
import { RequestContextMiddleware } from "../src/internal/RequestContextMiddleware.js"
|
|
26
|
+
import * as Cause from "effect/Cause"
|
|
26
27
|
import * as Effect from "effect/Effect"
|
|
27
28
|
import * as Exit from "effect/Exit"
|
|
28
29
|
import * as Layer from "effect/Layer"
|
|
@@ -200,15 +201,11 @@ const router = Router(InvRsc)({
|
|
|
200
201
|
),
|
|
201
202
|
StreamWithRepoWrite: () =>
|
|
202
203
|
Stream.fromIterable([1, 2, 3]).pipe(
|
|
203
|
-
Stream.tap((n) =>
|
|
204
|
-
repo.save(new RepoItem({ id: String(n), label: "x" })).pipe(Effect.orDie, setupRequestContextFromCurrent())
|
|
205
|
-
)
|
|
204
|
+
Stream.tap((n) => repo.save(new RepoItem({ id: String(n), label: "x" })).pipe(Effect.orDie))
|
|
206
205
|
),
|
|
207
|
-
GetRepoCount: () => repo.all.pipe(Effect.map((_) => _.length), Effect.orDie
|
|
208
|
-
SaveRepoItem: ({ id, label }) =>
|
|
209
|
-
|
|
210
|
-
SaveOtherItem: ({ id, label }) =>
|
|
211
|
-
otherRepo.save(new OtherItem({ id, label })).pipe(Effect.orDie, setupRequestContextFromCurrent())
|
|
206
|
+
GetRepoCount: () => repo.all.pipe(Effect.map((_) => _.length), Effect.orDie),
|
|
207
|
+
SaveRepoItem: ({ id, label }) => repo.save(new RepoItem({ id, label })).pipe(Effect.orDie),
|
|
208
|
+
SaveOtherItem: ({ id, label }) => otherRepo.save(new OtherItem({ id, label })).pipe(Effect.orDie)
|
|
212
209
|
})
|
|
213
210
|
}
|
|
214
211
|
})
|
|
@@ -222,7 +219,7 @@ const RpcRouterLayer = matchAll({ router })
|
|
|
222
219
|
const NodeServerLayer = NodeHttpServer.layer(() => createServer(), { port: 0 })
|
|
223
220
|
|
|
224
221
|
const ServerLayer = HttpRouter
|
|
225
|
-
.serve(RpcRouterLayer)
|
|
222
|
+
.serve(RpcRouterLayer.pipe(Layer.provide(HttpRouter.middleware(RequestContextMiddleware()).layer)))
|
|
226
223
|
.pipe(
|
|
227
224
|
Layer.provide(NodeServerLayer),
|
|
228
225
|
Layer.provide(RpcSerialization.layerNdjson)
|
|
@@ -256,8 +253,8 @@ const withCapture = <A, E, R>(eff: Effect.Effect<A, E, R>) =>
|
|
|
256
253
|
|
|
257
254
|
const withDependencyCapture = <A, E, R>(eff: Effect.Effect<A, E, R>) =>
|
|
258
255
|
Effect.gen(function*() {
|
|
259
|
-
const readsRef = yield* Ref.make
|
|
260
|
-
const writesRef = yield* Ref.make
|
|
256
|
+
const readsRef = yield* Ref.make(DataDependencies.empty())
|
|
257
|
+
const writesRef = yield* Ref.make(DataDependencies.empty())
|
|
261
258
|
const svc = DataDependencies.makeDataDependencyRecorder(readsRef, writesRef)
|
|
262
259
|
const result = yield* eff.pipe(Effect.provideService(DataDependencies.DataDependencyRecorder, svc), Effect.exit)
|
|
263
260
|
return { result, dependencies: yield* svc.get }
|
|
@@ -320,9 +317,12 @@ it.live(
|
|
|
320
317
|
const { result, keys } = yield* withCapture(client.DoAndFail.handler())
|
|
321
318
|
expect(Exit.isFailure(result)).toBe(true)
|
|
322
319
|
if (Exit.isFailure(result)) {
|
|
323
|
-
const
|
|
324
|
-
expect(
|
|
325
|
-
|
|
320
|
+
const error = Cause.findErrorOption(result.cause)
|
|
321
|
+
expect(Option.isSome(error)).toBe(true)
|
|
322
|
+
if (Option.isSome(error)) {
|
|
323
|
+
expect(error.value._tag).toBe("CmdBoom")
|
|
324
|
+
expect(error.value.reason).toBe("intentional failure")
|
|
325
|
+
}
|
|
326
326
|
}
|
|
327
327
|
expect(keys).toStrictEqual([DynamicKey])
|
|
328
328
|
}, Effect.provide(TestLayer)),
|
|
@@ -351,8 +351,8 @@ it.live(
|
|
|
351
351
|
"stream: per-chunk repo writes are drained and forwarded to the client recorder",
|
|
352
352
|
Effect.fnUntraced(function*() {
|
|
353
353
|
const client = yield* ApiClientFactory.makeFor(Layer.empty)(InvRsc)
|
|
354
|
-
const readsRef = yield* Ref.make
|
|
355
|
-
const writesRef = yield* Ref.make
|
|
354
|
+
const readsRef = yield* Ref.make(DataDependencies.empty())
|
|
355
|
+
const writesRef = yield* Ref.make(DataDependencies.empty())
|
|
356
356
|
const svc = DataDependencies.makeDataDependencyRecorder(readsRef, writesRef)
|
|
357
357
|
const values = yield* Stream.runCollect(client.StreamWithRepoWrite.handler()).pipe(
|
|
358
358
|
Effect.provideService(DataDependencies.DataDependencyRecorder, svc)
|
|
@@ -361,7 +361,7 @@ it.live(
|
|
|
361
361
|
expect(values).toStrictEqual([1, 2, 3])
|
|
362
362
|
// Each emitted value writes to RepoItem; routing drains the writes per chunk and the client
|
|
363
363
|
// accumulates them — the recorder dedupes, so a single RepoItem entry is recorded.
|
|
364
|
-
expect(writes).toStrictEqual([DataDependencies.repo("RepoItem")])
|
|
364
|
+
expect(writes).toStrictEqual(new Set([DataDependencies.repo("RepoItem")]))
|
|
365
365
|
}, Effect.provide(TestLayer)),
|
|
366
366
|
{ timeout: 10_000 }
|
|
367
367
|
)
|
|
@@ -373,13 +373,13 @@ it.live(
|
|
|
373
373
|
|
|
374
374
|
const query = yield* withDependencyCapture(client.GetRepoCount.handler())
|
|
375
375
|
expect(Exit.isSuccess(query.result) && query.result.value).toBe(0)
|
|
376
|
-
expect(query.dependencies.reads).toStrictEqual([DataDependencies.repo("RepoItem")])
|
|
377
|
-
expect(query.dependencies.writes).toStrictEqual(
|
|
376
|
+
expect(query.dependencies.reads).toStrictEqual(new Set([DataDependencies.repo("RepoItem")]))
|
|
377
|
+
expect(query.dependencies.writes).toStrictEqual(DataDependencies.empty())
|
|
378
378
|
|
|
379
379
|
const command = yield* withDependencyCapture(client.SaveRepoItem.handler({ id: "1", label: "one" }))
|
|
380
380
|
expect(Exit.isSuccess(command.result)).toBe(true)
|
|
381
|
-
expect(command.dependencies.reads).toStrictEqual(
|
|
382
|
-
expect(command.dependencies.writes).toStrictEqual([DataDependencies.repo("RepoItem")])
|
|
381
|
+
expect(command.dependencies.reads).toStrictEqual(DataDependencies.empty())
|
|
382
|
+
expect(command.dependencies.writes).toStrictEqual(new Set([DataDependencies.repo("RepoItem")]))
|
|
383
383
|
}, Effect.provide(TestLayer)),
|
|
384
384
|
{ timeout: 10_000 }
|
|
385
385
|
)
|
|
@@ -403,7 +403,7 @@ it.live(
|
|
|
403
403
|
expect(Exit.isSuccess(query.result)).toBe(true)
|
|
404
404
|
queryReads.set("GetRepoCount", query.dependencies.reads)
|
|
405
405
|
// Before any command, nothing is invalidated.
|
|
406
|
-
expect(invalidatedBy(
|
|
406
|
+
expect(invalidatedBy(DataDependencies.empty())).toStrictEqual([])
|
|
407
407
|
|
|
408
408
|
// A command writing the SAME repo the query read => the query is selected for invalidation.
|
|
409
409
|
const save = yield* withDependencyCapture(client.SaveRepoItem.handler({ id: "1", label: "one" }))
|
|
@@ -413,7 +413,7 @@ it.live(
|
|
|
413
413
|
// A command writing an UNRELATED repo => the query is NOT invalidated (negative control).
|
|
414
414
|
const saveOther = yield* withDependencyCapture(client.SaveOtherItem.handler({ id: "2", label: "two" }))
|
|
415
415
|
expect(Exit.isSuccess(saveOther.result)).toBe(true)
|
|
416
|
-
expect(saveOther.dependencies.writes).toStrictEqual([DataDependencies.repo("OtherItem")])
|
|
416
|
+
expect(saveOther.dependencies.writes).toStrictEqual(new Set([DataDependencies.repo("OtherItem")]))
|
|
417
417
|
expect(invalidatedBy(saveOther.dependencies.writes)).toStrictEqual([])
|
|
418
418
|
}, Effect.provide(TestLayer)),
|
|
419
419
|
{ timeout: 10_000 }
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import * as Effect from "effect-app/Effect";
|
|
2
|
-
import { type QueueBase } from "effect-app/QueueMaker";
|
|
3
|
-
import * as S from "effect-app/Schema";
|
|
4
|
-
import { type NonEmptyString255 } from "effect-app/Schema";
|
|
5
|
-
import { SqlClient } from "effect/unstable/sql";
|
|
6
|
-
export declare const QueueId: S.brand<import("effect/Schema").Finite, "QueueId">;
|
|
7
|
-
export type QueueId = typeof QueueId.Type;
|
|
8
|
-
export declare const makeSQLQueue: <Evt extends {
|
|
9
|
-
id: S.StringId;
|
|
10
|
-
_tag: string;
|
|
11
|
-
}, DrainEvt extends {
|
|
12
|
-
id: S.StringId;
|
|
13
|
-
_tag: string;
|
|
14
|
-
}, EvtE, DrainEvtE>(queueName: NonEmptyString255, queueDrainName: NonEmptyString255, schema: S.Codec<Evt, EvtE, never, never>, drainSchema: S.Codec<DrainEvt, DrainEvtE, never, never>) => Effect.Effect<QueueBase<Evt, DrainEvt>, never, SqlClient.SqlClient>;
|
|
15
|
-
//# sourceMappingURL=SQLQueue.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../src/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,uBAAuB,CAAA;AACjE,OAAO,KAAK,CAAC,MAAM,mBAAmB,CAAA;AACtC,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAK1D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAK/C,eAAO,MAAM,OAAO,oDAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAGzC,eAAO,MAAM,YAAY,GACvB,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,4OAgKT,CAAA"}
|
|
@@ -1,148 +0,0 @@
|
|
|
1
|
-
import { reportNonInterruptedFailure } from "@effect-app/infra/QueueMaker/errors";
|
|
2
|
-
import { subMinutes } from "date-fns";
|
|
3
|
-
import * as Effect from "effect-app/Effect";
|
|
4
|
-
import * as Option from "effect-app/Option";
|
|
5
|
-
import { QueueMeta } from "effect-app/QueueMaker";
|
|
6
|
-
import * as S from "effect-app/Schema";
|
|
7
|
-
import { getRequestContext, setupRequestContextWithCustomSpan } from "effect-app/setupRequest";
|
|
8
|
-
import { pretty } from "effect-app/utils";
|
|
9
|
-
import * as Fiber from "effect/Fiber";
|
|
10
|
-
import * as Tracer from "effect/Tracer";
|
|
11
|
-
import { SqlClient } from "effect/unstable/sql";
|
|
12
|
-
import { InfraLogger } from "../logger.js";
|
|
13
|
-
import { messagingSpanArgs } from "../otel.js";
|
|
14
|
-
import { SQLModel } from "../SQL.js";
|
|
15
|
-
export const QueueId = S.Finite.pipe(S.brand("QueueId"));
|
|
16
|
-
// TODO: let the model track and Auto Generate versionColumn on every update instead
|
|
17
|
-
export const makeSQLQueue = Effect.fnUntraced(function* (queueName, queueDrainName, schema, drainSchema) {
|
|
18
|
-
const base = {
|
|
19
|
-
id: SQLModel.Generated(QueueId),
|
|
20
|
-
meta: SQLModel.JsonFromString(QueueMeta),
|
|
21
|
-
name: S.NonEmptyString255,
|
|
22
|
-
createdAt: SQLModel.DateTimeInsert,
|
|
23
|
-
updatedAt: SQLModel.DateTimeUpdate,
|
|
24
|
-
// TODO: at+owner
|
|
25
|
-
processingAt: SQLModel.FieldOption(S.Date),
|
|
26
|
-
finishedAt: SQLModel.FieldOption(S.Date),
|
|
27
|
-
etag: S.String // TODO: use a SQLModel thing that auto updates it?
|
|
28
|
-
// TODO: record locking.. / optimistic locking
|
|
29
|
-
// rowVersion: SQLModel.DateTimeFromNumberWithNow
|
|
30
|
-
};
|
|
31
|
-
class Queue extends SQLModel.Class("Queue")({
|
|
32
|
-
body: SQLModel.JsonFromString(schema),
|
|
33
|
-
...base
|
|
34
|
-
}) {
|
|
35
|
-
}
|
|
36
|
-
class Drain extends SQLModel.Class("Drain")({
|
|
37
|
-
body: SQLModel.JsonFromString(drainSchema),
|
|
38
|
-
...base
|
|
39
|
-
}) {
|
|
40
|
-
}
|
|
41
|
-
const sql = yield* SqlClient.SqlClient;
|
|
42
|
-
const queueRepo = yield* SQLModel.makeRepository(Queue, {
|
|
43
|
-
tableName: "queue",
|
|
44
|
-
spanPrefix: "QueueRepo",
|
|
45
|
-
idColumn: "id",
|
|
46
|
-
versionColumn: "etag"
|
|
47
|
-
});
|
|
48
|
-
const drainRepo = yield* SQLModel.makeRepository(Drain, {
|
|
49
|
-
tableName: "queue",
|
|
50
|
-
spanPrefix: "DrainRepo",
|
|
51
|
-
idColumn: "id",
|
|
52
|
-
versionColumn: "etag"
|
|
53
|
-
});
|
|
54
|
-
const decodeDrain = S.decodeEffectConcurrently(Drain);
|
|
55
|
-
const drain = Effect.gen(function* () {
|
|
56
|
-
const limit = subMinutes(new Date(), 15);
|
|
57
|
-
return yield* sql `SELECT *
|
|
58
|
-
FROM queue
|
|
59
|
-
WHERE name = ${queueDrainName} AND finishedAt IS NULL AND (processingAt IS NULL OR processingAt < ${limit.getTime()})
|
|
60
|
-
LIMIT 1`;
|
|
61
|
-
});
|
|
62
|
-
const q = {
|
|
63
|
-
offer: Effect.fnUntraced(function* (body, meta) {
|
|
64
|
-
yield* queueRepo.insertVoid(Queue.insert.make({
|
|
65
|
-
body,
|
|
66
|
-
meta,
|
|
67
|
-
name: queueName,
|
|
68
|
-
processingAt: Option.none(),
|
|
69
|
-
finishedAt: Option.none(),
|
|
70
|
-
etag: crypto.randomUUID()
|
|
71
|
-
}));
|
|
72
|
-
}),
|
|
73
|
-
take: Effect.gen(function* () {
|
|
74
|
-
while (true) {
|
|
75
|
-
const [first] = yield* drain.pipe(Effect.withTracerEnabled(false)); // disable sql tracer otherwise we spam it..
|
|
76
|
-
if (first) {
|
|
77
|
-
const dec = yield* decodeDrain(first);
|
|
78
|
-
const { createdAt, updatedAt, ...rest } = dec;
|
|
79
|
-
return yield* drainRepo.update(Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }) // auto in lib , etag: crypto.randomUUID()
|
|
80
|
-
);
|
|
81
|
-
}
|
|
82
|
-
if (first)
|
|
83
|
-
return first;
|
|
84
|
-
yield* Effect.sleep(250);
|
|
85
|
-
}
|
|
86
|
-
}),
|
|
87
|
-
finish: Effect.fn(function* ({ createdAt, updatedAt, ...q }) {
|
|
88
|
-
return yield* drainRepo.updateVoid(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })); // auto in lib , etag: crypto.randomUUID()
|
|
89
|
-
})
|
|
90
|
-
};
|
|
91
|
-
const queue = {
|
|
92
|
-
publish: Effect.fn(`publish ${queueName}`, {
|
|
93
|
-
kind: "producer",
|
|
94
|
-
attributes: {
|
|
95
|
-
"messaging.system": "sql",
|
|
96
|
-
"messaging.operation.name": "publish",
|
|
97
|
-
"messaging.destination.name": queueName
|
|
98
|
-
}
|
|
99
|
-
})(function* (...messages) {
|
|
100
|
-
yield* Effect.annotateCurrentSpan({
|
|
101
|
-
"messaging.batch.message_count": messages.length,
|
|
102
|
-
"messaging.message.types": messages.map((_) => _._tag)
|
|
103
|
-
});
|
|
104
|
-
const requestContext = yield* getRequestContext;
|
|
105
|
-
yield* Effect.forEach(messages, (m) => q.offer(m, requestContext), { discard: true });
|
|
106
|
-
}),
|
|
107
|
-
drain: (handleEvent, sessionId) => {
|
|
108
|
-
const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName });
|
|
109
|
-
const processMessage = Effect.fnUntraced(function* ({ body, meta }) {
|
|
110
|
-
let effect = InfraLogger
|
|
111
|
-
.logDebug(`[${queueDrainName}] Processing incoming message`)
|
|
112
|
-
.pipe(Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }), Effect.andThen(handleEvent(body)), silenceAndReportError, (_) => {
|
|
113
|
-
const args = messagingSpanArgs({
|
|
114
|
-
operation: "process",
|
|
115
|
-
system: "sql",
|
|
116
|
-
destination: queueDrainName,
|
|
117
|
-
messageId: body.id,
|
|
118
|
-
conversationId: sessionId,
|
|
119
|
-
extra: { "messaging.message.type": body._tag, "messaging.message.body": body }
|
|
120
|
-
}, "consumer");
|
|
121
|
-
return setupRequestContextWithCustomSpan(_, meta, args.name, {
|
|
122
|
-
captureStackTrace: false,
|
|
123
|
-
kind: args.kind,
|
|
124
|
-
attributes: args.attributes
|
|
125
|
-
});
|
|
126
|
-
});
|
|
127
|
-
if (meta.span) {
|
|
128
|
-
effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span));
|
|
129
|
-
}
|
|
130
|
-
return yield* effect;
|
|
131
|
-
});
|
|
132
|
-
return Effect.fn(`receive ${queueDrainName}`, {
|
|
133
|
-
kind: "consumer",
|
|
134
|
-
attributes: {
|
|
135
|
-
"messaging.system": "sql",
|
|
136
|
-
"messaging.operation.name": "receive",
|
|
137
|
-
"messaging.destination.name": queueDrainName,
|
|
138
|
-
...(sessionId !== undefined && { "messaging.message.conversation_id": sessionId })
|
|
139
|
-
}
|
|
140
|
-
})(function* () {
|
|
141
|
-
const x = yield* q.take;
|
|
142
|
-
yield* processMessage(x).pipe(Effect.uninterruptible, Effect.forkChild, Effect.flatMap(Fiber.join), Effect.tap(q.finish(x)));
|
|
143
|
-
}, (effect) => effect.pipe(silenceAndReportError, Effect.forever))();
|
|
144
|
-
}
|
|
145
|
-
};
|
|
146
|
-
return queue;
|
|
147
|
-
});
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQLQueue.js","sourceRoot":"","sources":["../../src/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import * as Effect from "effect-app/Effect";
|
|
2
|
-
import * as S from "effect-app/Schema";
|
|
3
|
-
import * as Tracer from "effect/Tracer";
|
|
4
|
-
import { MemQueue } from "../memQueue.js";
|
|
5
|
-
export declare const makeMemQueue: <Evt extends {
|
|
6
|
-
id: S.StringId;
|
|
7
|
-
_tag: string;
|
|
8
|
-
}, DrainEvt extends {
|
|
9
|
-
id: S.StringId;
|
|
10
|
-
_tag: string;
|
|
11
|
-
}, EvtE, DrainEvtE>(queueName: string, queueDrainName: string, schema: S.Codec<Evt, EvtE, never, never>, drainSchema: S.Codec<DrainEvt, DrainEvtE, never, never>) => Effect.Effect<{
|
|
12
|
-
publish: (args_0: Evt, ...args: Evt[]) => Effect.Effect<void, never, never>;
|
|
13
|
-
drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect.Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>>;
|
|
14
|
-
}, never, MemQueue>;
|
|
15
|
-
//# sourceMappingURL=memQueue.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"memQueue.d.ts","sourceRoot":"","sources":["../../src/QueueMaker/memQueue.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,CAAC,MAAM,mBAAmB,CAAA;AAOtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIzC,eAAO,MAAM,YAAY,GACvB,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS;;YA8CC,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cACtD,MAAM;mBAmEtB,CAAA"}
|
|
@@ -1,92 +0,0 @@
|
|
|
1
|
-
import * as Effect from "effect-app/Effect";
|
|
2
|
-
import { QueueMeta } from "effect-app/QueueMaker";
|
|
3
|
-
import * as S from "effect-app/Schema";
|
|
4
|
-
import { getRequestContext, setupRequestContextWithCustomSpan } from "effect-app/setupRequest";
|
|
5
|
-
import { pretty } from "effect-app/utils";
|
|
6
|
-
import * as Cause from "effect/Cause";
|
|
7
|
-
import * as Fiber from "effect/Fiber";
|
|
8
|
-
import { flow } from "effect/Function";
|
|
9
|
-
import * as Q from "effect/Queue";
|
|
10
|
-
import * as Tracer from "effect/Tracer";
|
|
11
|
-
import { InfraLogger } from "../logger.js";
|
|
12
|
-
import { MemQueue } from "../memQueue.js";
|
|
13
|
-
import { messagingSpanArgs } from "../otel.js";
|
|
14
|
-
import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js";
|
|
15
|
-
export const makeMemQueue = Effect.fnUntraced(function* (queueName, queueDrainName, schema, drainSchema) {
|
|
16
|
-
const mem = yield* MemQueue;
|
|
17
|
-
const q = yield* mem.getOrCreateQueue(queueName);
|
|
18
|
-
const qDrain = yield* mem.getOrCreateQueue(queueDrainName);
|
|
19
|
-
const wireSchema = S.Struct({ body: schema, meta: QueueMeta });
|
|
20
|
-
const wireSchemaJson = S.fromJsonString(S.toCodecJson(wireSchema));
|
|
21
|
-
const encodePublish = S.encodeEffect(wireSchemaJson);
|
|
22
|
-
const drainW = S.Struct({ body: drainSchema, meta: QueueMeta });
|
|
23
|
-
const drainWJson = S.fromJsonString(S.toCodecJson(drainW));
|
|
24
|
-
const parseDrain = flow(S.decodeUnknownEffectConcurrently(drainWJson), Effect.orDie);
|
|
25
|
-
const queue = {
|
|
26
|
-
publish: Effect.fn(`publish ${queueName}`, {
|
|
27
|
-
kind: "producer",
|
|
28
|
-
attributes: {
|
|
29
|
-
"messaging.system": "memory",
|
|
30
|
-
"messaging.operation.name": "publish",
|
|
31
|
-
"messaging.destination.name": queueName
|
|
32
|
-
}
|
|
33
|
-
})(function* (...messages) {
|
|
34
|
-
yield* Effect.annotateCurrentSpan({
|
|
35
|
-
"messaging.batch.message_count": messages.length,
|
|
36
|
-
"messaging.message.types": messages.map((_) => _._tag)
|
|
37
|
-
});
|
|
38
|
-
const requestContext = yield* getRequestContext;
|
|
39
|
-
// we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
|
|
40
|
-
yield* Effect.forEach(messages, (m) => encodePublish({ body: m, meta: requestContext }).pipe(Effect.orDie, Effect.flatMap((_) => Q.offer(q, _))), { discard: true });
|
|
41
|
-
}),
|
|
42
|
-
drain: (handleEvent, sessionId) => {
|
|
43
|
-
const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName });
|
|
44
|
-
const reportError = reportNonInterruptedFailureCause({ name: "MemQueue.drain." + queueDrainName });
|
|
45
|
-
const processMessage = Effect.fnUntraced(function* (msg) {
|
|
46
|
-
// we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
|
|
47
|
-
const { body, meta } = yield* parseDrain(msg).pipe(Effect.orDie);
|
|
48
|
-
let effect = InfraLogger
|
|
49
|
-
.logDebug(`[${queueDrainName}] Processing incoming message`)
|
|
50
|
-
.pipe(Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }), Effect.andThen(handleEvent(body)), silenceAndReportError, (_) => {
|
|
51
|
-
const args = messagingSpanArgs({
|
|
52
|
-
operation: "process",
|
|
53
|
-
system: "memory",
|
|
54
|
-
destination: queueDrainName,
|
|
55
|
-
messageId: body.id,
|
|
56
|
-
conversationId: sessionId,
|
|
57
|
-
extra: { "messaging.message.type": body._tag, "messaging.message.body": body }
|
|
58
|
-
}, "consumer");
|
|
59
|
-
return setupRequestContextWithCustomSpan(_, meta, args.name, {
|
|
60
|
-
captureStackTrace: false,
|
|
61
|
-
kind: args.kind,
|
|
62
|
-
attributes: args.attributes
|
|
63
|
-
});
|
|
64
|
-
});
|
|
65
|
-
if (meta.span) {
|
|
66
|
-
effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span));
|
|
67
|
-
}
|
|
68
|
-
return yield* effect;
|
|
69
|
-
});
|
|
70
|
-
return Effect.fn(`receive ${queueDrainName}`, {
|
|
71
|
-
kind: "consumer",
|
|
72
|
-
attributes: {
|
|
73
|
-
"messaging.system": "memory",
|
|
74
|
-
"messaging.operation.name": "receive",
|
|
75
|
-
"messaging.destination.name": queueDrainName,
|
|
76
|
-
...(sessionId !== undefined && { "messaging.message.conversation_id": sessionId })
|
|
77
|
-
}
|
|
78
|
-
})(function* () {
|
|
79
|
-
const x = yield* Q.take(qDrain);
|
|
80
|
-
const exit = yield* processMessage(x).pipe(Effect.uninterruptible, Effect.forkChild, Effect.flatMap(Fiber.join));
|
|
81
|
-
if (exit._tag === "Failure" && !Cause.hasInterruptsOnly(exit.cause)) {
|
|
82
|
-
// normally a failed item would be returned to the queue and retried up to X times.
|
|
83
|
-
yield* Q.offer(qDrain, x).pipe(
|
|
84
|
-
// TODO: retry count tracking and max retries.
|
|
85
|
-
Effect.delay("5 seconds"), Effect.tapCause(reportError), Effect.forkDetach);
|
|
86
|
-
}
|
|
87
|
-
}, (effect) => effect.pipe(silenceAndReportError, Effect.forever))();
|
|
88
|
-
}
|
|
89
|
-
};
|
|
90
|
-
return queue;
|
|
91
|
-
});
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUXVldWVNYWtlci9tZW1RdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssTUFBTSxNQUFNLG1CQUFtQixDQUFBO0FBQzNDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQUNqRCxPQUFPLEtBQUssQ0FBQyxNQUFNLG1CQUFtQixDQUFBO0FBQ3RDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQzlGLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEtBQUssS0FBSyxNQUFNLGNBQWMsQ0FBQTtBQUNyQyxPQUFPLEtBQUssS0FBSyxNQUFNLGNBQWMsQ0FBQTtBQUNyQyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDdEMsT0FBTyxLQUFLLENBQUMsTUFBTSxjQUFjLENBQUE7QUFDakMsT0FBTyxLQUFLLE1BQU0sTUFBTSxlQUFlLENBQUE7QUFDdkMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDekMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzlDLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUUzRixNQUFNLENBQUMsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFNckQsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBMEIsRUFDMUIsV0FBeUM7SUFFekMsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFBO0lBQzNCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLEdB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
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import * as Effect from "effect-app/Effect";
|
|
2
|
-
import * as S from "effect-app/Schema";
|
|
3
|
-
import type { StringId } from "effect-app/Schema";
|
|
4
|
-
import * as Tracer from "effect/Tracer";
|
|
5
|
-
import { Receiver, Sender } from "../ServiceBus.js";
|
|
6
|
-
export declare function makeServiceBusQueue<Evt extends {
|
|
7
|
-
id: StringId;
|
|
8
|
-
_tag: string;
|
|
9
|
-
}, DrainEvt extends {
|
|
10
|
-
id: StringId;
|
|
11
|
-
_tag: string;
|
|
12
|
-
}, EvtE, DrainEvtE>(schema: S.Codec<Evt, EvtE>, drainSchema: S.Codec<DrainEvt, DrainEvtE>): Effect.Effect<{
|
|
13
|
-
drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect.Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>>;
|
|
14
|
-
publish: (args_0: Evt, ...args: Evt[]) => Effect.Effect<void, never, never>;
|
|
15
|
-
}, never, Receiver | Sender>;
|
|
16
|
-
//# sourceMappingURL=sbqueue.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../src/QueueMaker/sbqueue.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,CAAC,MAAM,mBAAmB,CAAA;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAKjD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAGnD,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,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,EAC1B,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC;YAuB7B,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cACtD,MAAM;;6BA6EzB"}
|
|
@@ -1,93 +0,0 @@
|
|
|
1
|
-
import * as Effect from "effect-app/Effect";
|
|
2
|
-
import { QueueMeta } from "effect-app/QueueMaker";
|
|
3
|
-
import * as S from "effect-app/Schema";
|
|
4
|
-
import { getRequestContext, setupRequestContextWithCustomSpan } from "effect-app/setupRequest";
|
|
5
|
-
import { pretty } from "effect-app/utils";
|
|
6
|
-
import * as Cause from "effect/Cause";
|
|
7
|
-
import { flow } from "effect/Function";
|
|
8
|
-
import * as Tracer from "effect/Tracer";
|
|
9
|
-
import { InfraLogger } from "../logger.js";
|
|
10
|
-
import { messagingSpanArgs } from "../otel.js";
|
|
11
|
-
import { Receiver, Sender } from "../ServiceBus.js";
|
|
12
|
-
import { reportNonInterruptedFailure, reportNonInterruptedFailureCause, reportQueueError } from "./errors.js";
|
|
13
|
-
export function makeServiceBusQueue(schema, drainSchema) {
|
|
14
|
-
const wireSchema = S.Struct({
|
|
15
|
-
body: schema,
|
|
16
|
-
meta: QueueMeta
|
|
17
|
-
});
|
|
18
|
-
const wireSchemaJson = S.fromJsonString(S.toCodecJson(wireSchema));
|
|
19
|
-
const encodePublish = S.encodeEffect(wireSchemaJson);
|
|
20
|
-
const drainW = S.Struct({ body: drainSchema, meta: QueueMeta });
|
|
21
|
-
const drainWJson = S.fromJsonString(S.toCodecJson(drainW));
|
|
22
|
-
const parseDrain = flow(S.decodeUnknownEffectConcurrently(drainWJson), Effect.orDie);
|
|
23
|
-
return Effect.gen(function* () {
|
|
24
|
-
const sender = yield* Sender;
|
|
25
|
-
const receiver = yield* Receiver;
|
|
26
|
-
const silenceAndReportError = reportNonInterruptedFailure({ name: receiver.name });
|
|
27
|
-
const reportError = reportNonInterruptedFailureCause({ name: receiver.name });
|
|
28
|
-
// TODO: or do async?
|
|
29
|
-
// 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
|
|
30
|
-
// const deferred = yield* Deferred.make<never, ServiceBusError | Error>()
|
|
31
|
-
const queue = {
|
|
32
|
-
drain: (handleEvent, sessionId) => {
|
|
33
|
-
const processMessage = Effect.fnUntraced(function* (messageBody) {
|
|
34
|
-
const { body, meta } = yield* parseDrain(messageBody).pipe(Effect.orDie);
|
|
35
|
-
let effect = InfraLogger
|
|
36
|
-
.logDebug(`[${receiver.name}] Processing incoming message`)
|
|
37
|
-
.pipe(Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }), Effect.andThen(handleEvent(body)), Effect.orDie,
|
|
38
|
-
// we silenceAndReportError here, so that the error is reported, and moves into the Exit.
|
|
39
|
-
silenceAndReportError, (_) => {
|
|
40
|
-
const args = messagingSpanArgs({
|
|
41
|
-
operation: "process",
|
|
42
|
-
system: "servicebus",
|
|
43
|
-
destination: receiver.name,
|
|
44
|
-
messageId: body.id,
|
|
45
|
-
conversationId: sessionId,
|
|
46
|
-
extra: { "messaging.message.type": body._tag, "messaging.message.body": body }
|
|
47
|
-
}, "consumer");
|
|
48
|
-
return setupRequestContextWithCustomSpan(_, meta, args.name, {
|
|
49
|
-
captureStackTrace: false,
|
|
50
|
-
kind: args.kind,
|
|
51
|
-
attributes: args.attributes
|
|
52
|
-
});
|
|
53
|
-
});
|
|
54
|
-
if (meta.span) {
|
|
55
|
-
effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span));
|
|
56
|
-
}
|
|
57
|
-
// we reportError here, so that we report the error only, and keep flowing
|
|
58
|
-
const exit = yield* Effect.tapCause(effect, reportError);
|
|
59
|
-
return yield* exit;
|
|
60
|
-
});
|
|
61
|
-
return receiver
|
|
62
|
-
.subscribe({
|
|
63
|
-
processMessage: (x) => processMessage(x.body).pipe(Effect.uninterruptible),
|
|
64
|
-
processError: (err) => reportQueueError(Cause.fail(err.error))
|
|
65
|
-
}, sessionId)
|
|
66
|
-
.pipe(Effect.andThen(Effect.never));
|
|
67
|
-
},
|
|
68
|
-
publish: Effect.fn(`publish ${sender.name}`, {
|
|
69
|
-
kind: "producer",
|
|
70
|
-
attributes: {
|
|
71
|
-
"messaging.system": "servicebus",
|
|
72
|
-
"messaging.operation.name": "publish",
|
|
73
|
-
"messaging.destination.name": sender.name
|
|
74
|
-
}
|
|
75
|
-
})(function* (...messages) {
|
|
76
|
-
yield* Effect.annotateCurrentSpan({
|
|
77
|
-
"messaging.batch.message_count": messages.length,
|
|
78
|
-
"messaging.message.types": messages.map((_) => _._tag)
|
|
79
|
-
});
|
|
80
|
-
const requestContext = yield* getRequestContext;
|
|
81
|
-
const msgs = yield* Effect.forEach(messages, (m) => encodePublish({ body: m, meta: requestContext }).pipe(Effect.orDie, Effect.map((body) => ({
|
|
82
|
-
body,
|
|
83
|
-
messageId: m.id, /* correllationid: requestId */
|
|
84
|
-
contentType: "application/json",
|
|
85
|
-
sessionId: "sessionId" in m ? m.sessionId : undefined // TODO: optional
|
|
86
|
-
}))));
|
|
87
|
-
yield* sender.sendMessages(msgs);
|
|
88
|
-
})
|
|
89
|
-
};
|
|
90
|
-
return queue;
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9RdWV1ZU1ha2VyL3NicXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sdUJBQXVCLENBQUE7QUFDakQsT0FBTyxLQUFLLENBQUMsTUFBTSxtQkFBbUIsQ0FBQTtBQUV0QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsaUNBQWlDLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUM5RixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDekMsT0FBTyxLQUFLLEtBQUssTUFBTSxjQUFjLENBQUE7QUFDckMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ3RDLE9BQU8sS0FBSyxNQUFNLE1BQU0sZUFBZSxDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFDMUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzlDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDbkQsT0FBTyxFQUFFLDJCQUEyQixFQUFFLGdDQUFnQyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRTdHLE1BQU0sVUFBVSxtQkFBbUIsQ0FNakMsTUFBMEIsRUFDMUIsV0FBeUM7SUFFekMsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztRQUMxQixJQUFJLEVBQUUsTUFBTTtRQUNaLElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQTtJQUNGLE1BQU0sY0FBYyxHQUFHLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFBO0lBQ2xFLE1BQU0sYUFBYSxHQUFH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
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
import * as Context from "effect-app/Context";
|
|
2
|
-
import * as Effect from "effect-app/Effect";
|
|
3
|
-
import * as Layer from "effect-app/Layer";
|
|
4
|
-
import * as Fiber from "effect/Fiber";
|
|
5
|
-
export declare const setRootParentSpan: <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
6
|
-
declare const RequestFiberSet_base: Context.ServiceClass<RequestFiberSet, "RequestFiberSet", {
|
|
7
|
-
interrupt: Effect.Effect<void, never, never>;
|
|
8
|
-
join: Effect.Effect<void, any, never>;
|
|
9
|
-
run: <R, XE extends any, XA extends any>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.Fiber<XA, XE>, never, R>;
|
|
10
|
-
add: (...fibers: Fiber.Fiber<any, any>[]) => Effect.Effect<void, never, never>;
|
|
11
|
-
addAll: (fibers: readonly Fiber.Fiber<any, any>[]) => Effect.Effect<void, never, never>;
|
|
12
|
-
register: <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
13
|
-
forkDaemonReport: <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<Fiber.Fiber<A, E>, never, R>;
|
|
14
|
-
forkDaemonReportUnexpected: <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<Fiber.Fiber<A, E>, never, R>;
|
|
15
|
-
}> & {
|
|
16
|
-
readonly make: Effect.Effect<{
|
|
17
|
-
interrupt: Effect.Effect<void, never, never>;
|
|
18
|
-
join: Effect.Effect<void, any, never>;
|
|
19
|
-
run: <R, XE extends any, XA extends any>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.Fiber<XA, XE>, never, R>;
|
|
20
|
-
add: (...fibers: Fiber.Fiber<any, any>[]) => Effect.Effect<void, never, never>;
|
|
21
|
-
addAll: (fibers: readonly Fiber.Fiber<any, any>[]) => Effect.Effect<void, never, never>;
|
|
22
|
-
register: <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
23
|
-
forkDaemonReport: <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<Fiber.Fiber<A, E>, never, R>;
|
|
24
|
-
forkDaemonReportUnexpected: <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<Fiber.Fiber<A, E>, never, R>;
|
|
25
|
-
}, never, import("effect/Scope").Scope>;
|
|
26
|
-
};
|
|
27
|
-
/**
|
|
28
|
-
* Whenever you fork a fiber for a Request, and you want to prevent dependent services to close prematurely on interruption,
|
|
29
|
-
* like the ServiceBus Sender, you should register these fibers in this FiberSet.
|
|
30
|
-
*/
|
|
31
|
-
export declare class RequestFiberSet extends RequestFiberSet_base {
|
|
32
|
-
static readonly Live: Layer.Layer<RequestFiberSet, never, never>;
|
|
33
|
-
static readonly register: <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R | RequestFiberSet>;
|
|
34
|
-
static readonly run: <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<Fiber.Fiber<A, E>, never, R | RequestFiberSet>;
|
|
35
|
-
static readonly forkDaemonReport: <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<Fiber.Fiber<A, E>, never, R | RequestFiberSet>;
|
|
36
|
-
static readonly forkDaemonReportUnexpected: <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<Fiber.Fiber<A, E>, never, R | RequestFiberSet>;
|
|
37
|
-
}
|
|
38
|
-
export {};
|
|
39
|
-
//# sourceMappingURL=RequestFiberSet.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"RequestFiberSet.d.ts","sourceRoot":"","sources":["../src/RequestFiberSet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAiBrC,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2BAC4B,CAAA;;;;;qBAIzE,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;qBAEvB,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;eAOtC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;uBAuB7B,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;iCAgB3B,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;;;;;;;;;;;AAqB3E;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,oBAA+D;IAClG,MAAM,CAAC,QAAQ,CAAC,IAAI,6CAAgC;IACpD,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,8CACb;IACpD,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kEAAkD;IAC9G,MAAM,CAAC,QAAQ,CAAC,gBAAgB,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kEACb;IAC5D,MAAM,CAAC,QAAQ,CAAC,0BAA0B,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kEACb;CACvE"}
|