@effect-app/infra 1.23.2 → 1.23.4
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 +20 -0
- package/_cjs/api/internal/events.cjs +2 -1
- package/_cjs/api/internal/events.cjs.map +1 -1
- package/_cjs/api/internal/middlewares.cjs +3 -2
- package/_cjs/api/internal/middlewares.cjs.map +1 -1
- package/_cjs/api/routing/defaultErrorHandler.cjs +3 -2
- package/_cjs/api/routing/defaultErrorHandler.cjs.map +1 -1
- package/_cjs/api/routing/makeRequestHandler.cjs +9 -8
- package/_cjs/api/routing/makeRequestHandler.cjs.map +1 -1
- package/_cjs/errorReporter.cjs +12 -11
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/logger.cjs +9 -0
- package/_cjs/logger.cjs.map +1 -0
- package/_cjs/services/Emailer/Sendgrid.cjs +6 -5
- package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
- package/_cjs/services/Emailer/fake.cjs +3 -2
- package/_cjs/services/Emailer/fake.cjs.map +1 -1
- package/_cjs/services/QueueMaker/SQLQueue.cjs +7 -6
- package/_cjs/services/QueueMaker/SQLQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs +15 -14
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs +15 -14
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/_cjs/services/RepositoryBase.cjs +22 -22
- package/_cjs/services/RepositoryBase.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos/query.cjs +2 -3
- package/_cjs/services/Store/Cosmos/query.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos.cjs +24 -23
- package/_cjs/services/Store/Cosmos.cjs.map +1 -1
- package/_cjs/services/Store/Disk.cjs +6 -6
- package/_cjs/services/Store/Disk.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs +7 -6
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_cjs/services/Store/utils.cjs +5 -5
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/dist/api/internal/events.d.ts.map +1 -1
- package/dist/api/internal/events.js +3 -2
- package/dist/api/internal/middlewares.d.ts.map +1 -1
- package/dist/api/internal/middlewares.js +4 -3
- package/dist/api/routing/defaultErrorHandler.d.ts.map +1 -1
- package/dist/api/routing/defaultErrorHandler.js +4 -3
- package/dist/api/routing/makeRequestHandler.d.ts.map +1 -1
- package/dist/api/routing/makeRequestHandler.js +10 -9
- package/dist/errorReporter.d.ts +1 -1
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +12 -11
- package/dist/logger.d.ts +8 -0
- package/dist/logger.d.ts.map +1 -0
- package/dist/logger.js +3 -0
- package/dist/services/Emailer/Sendgrid.d.ts.map +1 -1
- package/dist/services/Emailer/Sendgrid.js +8 -7
- package/dist/services/Emailer/fake.d.ts.map +1 -1
- package/dist/services/Emailer/fake.js +5 -4
- package/dist/services/QueueMaker/SQLQueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/SQLQueue.js +9 -8
- package/dist/services/QueueMaker/memQueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/memQueue.js +17 -16
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +17 -16
- package/dist/services/RepositoryBase.d.ts.map +1 -1
- package/dist/services/RepositoryBase.js +23 -23
- package/dist/services/Store/Cosmos/query.d.ts.map +1 -1
- package/dist/services/Store/Cosmos/query.js +3 -4
- package/dist/services/Store/Cosmos.d.ts.map +1 -1
- package/dist/services/Store/Cosmos.js +24 -23
- package/dist/services/Store/Disk.d.ts.map +1 -1
- package/dist/services/Store/Disk.js +8 -8
- package/dist/services/Store/Memory.d.ts.map +1 -1
- package/dist/services/Store/Memory.js +8 -7
- package/dist/services/Store/utils.d.ts.map +1 -1
- package/dist/services/Store/utils.js +5 -5
- package/examples/query.ts +3 -3
- package/package.json +15 -5
- package/src/api/internal/events.ts +2 -1
- package/src/api/internal/middlewares.ts +3 -2
- package/src/api/routing/defaultErrorHandler.ts +3 -2
- package/src/api/routing/makeRequestHandler.ts +9 -8
- package/src/api/writeDocs.ts.bak +1 -1
- package/src/errorReporter.ts +31 -33
- package/src/logger.ts +3 -0
- package/src/services/Emailer/Sendgrid.ts +14 -12
- package/src/services/Emailer/fake.ts +4 -3
- package/src/services/QueueMaker/SQLQueue.ts +18 -19
- package/src/services/QueueMaker/memQueue.ts +33 -36
- package/src/services/QueueMaker/sbqueue.ts +38 -41
- package/src/services/RepositoryBase.ts +40 -43
- package/src/services/Store/Cosmos/query.ts +6 -5
- package/src/services/Store/Cosmos.ts +75 -90
- package/src/services/Store/Disk.ts +12 -14
- package/src/services/Store/Memory.ts +7 -6
- package/src/services/Store/utils.ts +10 -14
- package/test/query.test.ts +56 -61
- package/tsconfig.json +0 -1
|
@@ -4,6 +4,7 @@ import { CosmosClient, CosmosClientLayer } from "@effect-app/infra-adapters/cosm
|
|
|
4
4
|
import { Array, Chunk, Duration, Effect, Layer, Option, pipe, Secret, Struct } from "effect-app";
|
|
5
5
|
import { dropUndefinedT } from "effect-app/utils";
|
|
6
6
|
import { OptimisticConcurrencyException } from "../../errors.js";
|
|
7
|
+
import { InfraLogger } from "../../logger.js";
|
|
7
8
|
import { buildWhereCosmosQuery3, logQuery } from "./Cosmos/query.js";
|
|
8
9
|
import { StoreMaker } from "./service.js";
|
|
9
10
|
class CosmosDbOperationError {
|
|
@@ -13,24 +14,24 @@ class CosmosDbOperationError {
|
|
|
13
14
|
}
|
|
14
15
|
} // TODO: Retry operation when running into RU limit.
|
|
15
16
|
function makeCosmosStore({ prefix }) {
|
|
16
|
-
return Effect.gen(function* (
|
|
17
|
-
const { db } = yield*
|
|
17
|
+
return Effect.gen(function* () {
|
|
18
|
+
const { db } = yield* CosmosClient;
|
|
18
19
|
return {
|
|
19
|
-
make: (name, seed, config) => Effect.gen(function* (
|
|
20
|
+
make: (name, seed, config) => Effect.gen(function* () {
|
|
20
21
|
const containerId = `${prefix}${name}`;
|
|
21
|
-
yield*
|
|
22
|
+
yield* Effect.promise(() => db.containers.createIfNotExists(dropUndefinedT({
|
|
22
23
|
id: containerId,
|
|
23
24
|
uniqueKeyPolicy: config?.uniqueKeys
|
|
24
25
|
? { uniqueKeys: config.uniqueKeys }
|
|
25
26
|
: undefined
|
|
26
|
-
})))
|
|
27
|
+
})));
|
|
27
28
|
const defaultValues = config?.defaultValues ?? {};
|
|
28
29
|
const container = db.container(containerId);
|
|
29
30
|
const bulk = container.items.bulk.bind(container.items);
|
|
30
31
|
const execBatch = container.items.batch.bind(container.items);
|
|
31
32
|
const importedMarkerId = containerId;
|
|
32
33
|
const bulkSet = (items) => Effect
|
|
33
|
-
.gen(function* (
|
|
34
|
+
.gen(function* () {
|
|
34
35
|
// TODO: disable batching if need atomicity
|
|
35
36
|
// we delay and batch to keep low amount of RUs
|
|
36
37
|
const b = [...items].map((x) => [
|
|
@@ -57,26 +58,26 @@ function makeCosmosStore({ prefix }) {
|
|
|
57
58
|
})
|
|
58
59
|
]);
|
|
59
60
|
const batches = Chunk.toReadonlyArray(Array.chunk_(b, config?.maxBulkSize ?? 10));
|
|
60
|
-
const batchResult = yield*
|
|
61
|
+
const batchResult = yield* Effect.forEach(batches
|
|
61
62
|
.map((x, i) => [i, x]), ([i, batch]) => Effect
|
|
62
63
|
.promise(() => bulk(batch.map(([, op]) => op)))
|
|
63
64
|
.pipe(Effect
|
|
64
65
|
.delay(Duration.millis(i === 0 ? 0 : 1100)), Effect
|
|
65
|
-
.flatMap((responses) => Effect.gen(function* (
|
|
66
|
+
.flatMap((responses) => Effect.gen(function* () {
|
|
66
67
|
const r = responses.find((x) => x.statusCode === 412 || x.statusCode === 404);
|
|
67
68
|
if (r) {
|
|
68
|
-
return yield*
|
|
69
|
+
return yield* Effect.fail(new OptimisticConcurrencyException({ type: name, id: JSON.stringify(r.resourceBody?.["id"]) }));
|
|
69
70
|
}
|
|
70
71
|
const r2 = responses.find((x) => x.statusCode > 299 || x.statusCode < 200);
|
|
71
72
|
if (r2) {
|
|
72
|
-
return yield*
|
|
73
|
+
return yield* Effect.die(new CosmosDbOperationError("not able to update record: " + r2.statusCode));
|
|
73
74
|
}
|
|
74
75
|
return batch.map(([e], i) => ({
|
|
75
76
|
...e,
|
|
76
77
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
77
78
|
_etag: responses[i].eTag
|
|
78
79
|
}));
|
|
79
|
-
}))))
|
|
80
|
+
}))));
|
|
80
81
|
return batchResult.flat();
|
|
81
82
|
})
|
|
82
83
|
.pipe(Effect.withSpan("Cosmos.bulkSet [effect-app/infra/Store]", {
|
|
@@ -110,15 +111,15 @@ function makeCosmosStore({ prefix }) {
|
|
|
110
111
|
const ex = batch.map(([, c]) => c);
|
|
111
112
|
return Effect
|
|
112
113
|
.promise(() => execBatch(ex, ex[0]?.resourceBody._partitionKey))
|
|
113
|
-
.pipe(Effect.flatMap((x) => Effect.gen(function* (
|
|
114
|
+
.pipe(Effect.flatMap((x) => Effect.gen(function* () {
|
|
114
115
|
const result = x.result ?? [];
|
|
115
116
|
const firstFailed = result.find((x) => x.statusCode > 299 || x.statusCode < 200);
|
|
116
117
|
if (firstFailed) {
|
|
117
118
|
const code = firstFailed.statusCode ?? 0;
|
|
118
119
|
if (code === 412 || code === 404) {
|
|
119
|
-
return yield*
|
|
120
|
+
return yield* new OptimisticConcurrencyException({ type: name, id: "batch" });
|
|
120
121
|
}
|
|
121
|
-
return yield*
|
|
122
|
+
return yield* Effect.die(new CosmosDbOperationError("not able to update record: " + code));
|
|
122
123
|
}
|
|
123
124
|
return batch.map(([e], i) => ({
|
|
124
125
|
...e,
|
|
@@ -225,24 +226,24 @@ function makeCosmosStore({ prefix }) {
|
|
|
225
226
|
}))
|
|
226
227
|
};
|
|
227
228
|
// handle mock data
|
|
228
|
-
const marker = yield*
|
|
229
|
+
const marker = yield* Effect.promise(() => container
|
|
229
230
|
.item(importedMarkerId, importedMarkerId)
|
|
230
231
|
.read()
|
|
231
|
-
.then(({ resource }) => Option.fromNullable(resource)))
|
|
232
|
+
.then(({ resource }) => Option.fromNullable(resource)));
|
|
232
233
|
if (!Option.isSome(marker)) {
|
|
233
|
-
|
|
234
|
+
yield* InfraLogger.logInfo("Creating mock data for " + name);
|
|
234
235
|
if (seed) {
|
|
235
|
-
const m = yield*
|
|
236
|
-
yield*
|
|
236
|
+
const m = yield* seed;
|
|
237
|
+
yield* Effect.flatMapOption(Effect.succeed(toNonEmptyArray([...m])), (a) => s.bulkSet(a).pipe(Effect.orDie, Effect
|
|
237
238
|
// we delay extra here, so that initial creation between Companies/POs also have an interval between them.
|
|
238
|
-
.delay(Duration.millis(1100))))
|
|
239
|
+
.delay(Duration.millis(1100))));
|
|
239
240
|
}
|
|
240
241
|
// Mark as imported
|
|
241
|
-
yield*
|
|
242
|
+
yield* Effect.promise(() => container.items.create({
|
|
242
243
|
_partitionKey: importedMarkerId,
|
|
243
244
|
id: importedMarkerId,
|
|
244
245
|
ttl: -1
|
|
245
|
-
}))
|
|
246
|
+
}));
|
|
246
247
|
}
|
|
247
248
|
return s;
|
|
248
249
|
})
|
|
@@ -254,4 +255,4 @@ export function CosmosStoreLayer(cfg) {
|
|
|
254
255
|
.toLayer(makeCosmosStore(cfg))
|
|
255
256
|
.pipe(Layer.provide(CosmosClientLayer(Secret.value(cfg.url), cfg.dbName)));
|
|
256
257
|
}
|
|
257
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../../src/services/Store/Cosmos.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAC1F,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEhG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAA;AAChE,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,MAAM,sBAAsB;IACL;IAArB,YAAqB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;CACzC,CAAC,oDAAoD;AAEtD,SAAS,eAAe,CAAC,EAAE,MAAM,EAAiB;IAChD,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;QAC3B,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;QACrC,OAAO;YACL,IAAI,EAAE,CACJ,IAAY,EACZ,IAAsC,EACtC,MAA6B,EAC7B,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;gBAEpB,MAAM,WAAW,GAAG,GAAG,MAAM,GAAG,IAAI,EAAE,CAAA;gBACtC,KAAK,CAAC,CAAC,CAAC,CACN,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,cAAc,CAAC;oBAC7C,EAAE,EAAE,WAAW;oBACf,eAAe,EAAE,MAAM,EAAE,UAAU;wBACjC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE;wBACnC,CAAC,CAAC,SAAS;iBACd,CAAC,CAAC,CACJ,CACF,CAAA;gBACD,MAAM,aAAa,GAAG,MAAM,EAAE,aAAa,IAAI,EAAE,CAAA;gBACjD,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;gBAC3C,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;gBACvD,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;gBAC7D,MAAM,gBAAgB,GAAG,WAAW,CAAA;gBAEpC,MAAM,OAAO,GAAG,CAAC,KAAgC,EAAE,EAAE,CACnD,MAAM;qBACH,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;oBACd,2CAA2C;oBAC3C,+CAA+C;oBAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CACtB,CAAC,CAAC,EAAE,EAAE,CACJ;wBACE,CAAC;wBACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;4BACzC,MAAM,EAAE,GAAG,EAAE,CACX,cAAc,CAAC;gCACb,aAAa,EAAE,QAAiB;gCAChC,YAAY,EAAE;oCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;oCAC1B,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;iCACzC;gCACD,YAAY,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;6BACxC,CAAC;4BACJ,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACf,cAAc,CAAC;gCACb,aAAa,EAAE,SAAkB;gCACjC,EAAE,EAAE,CAAC,CAAC,EAAE;gCACR,YAAY,EAAE;oCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;oCAC1B,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;iCACzC;gCACD,OAAO,EAAE,IAAI;gCACb,YAAY,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;6BACxC,CAAC;yBACL,CAAC;qBACM,CACb,CAAA;oBACD,MAAM,OAAO,GAAG,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC,CAAA;oBAEjF,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAC1B,MAAM,CAAC,OAAO,CACZ,OAAO;yBACJ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAU,CAAC,EACjC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CACb,MAAM;yBACH,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;yBAC9C,IAAI,CACH,MAAM;yBACH,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAC7C,MAAM;yBACH,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;wBACpB,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC,CAAA;wBAC7E,IAAI,CAAC,EAAE,CAAC;4BACN,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,MAAM,CAAC,IAAI,CACT,IAAI,8BAA8B,CAChC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAC3D,CACF,CACF,CAAA;wBACH,CAAC;wBACD,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,CAChD,CAAA;wBACD,IAAI,EAAE,EAAE,CAAC;4BACP,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,MAAM,CAAC,GAAG,CACR,IAAI,sBAAsB,CACxB,6BAA6B,GAAG,EAAE,CAAC,UAAU,CAC9C,CACF,CACF,CAAA;wBACH,CAAC;wBACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;4BAC5B,GAAG,CAAC;4BACJ,oEAAoE;4BACpE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAE,CAAC,IAAI;yBAC1B,CAAC,CAAC,CAAA;oBACL,CAAC,CAAC,CACH,CACJ,CACN,CACF,CAAA;oBACD,OAAO,WAAW,CAAC,IAAI,EAA+C,CAAA;gBACxE,CAAC,CAAC;qBACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yCAAyC,EAAE;oBAC/D,iBAAiB,EAAE,KAAK;oBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;iBACtF,CAAC,CAAC,CAAA;gBAEP,MAAM,QAAQ,GAAG,CAAC,KAAgC,EAAE,EAAE;oBACpD,OAAO,MAAM;yBACV,OAAO,CAAC,GAAG,EAAE;wBACZ,MAAM,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAC1B,CAAC,CAAC,EAAE,EAAE,CACJ;4BACE,CAAC;4BACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;gCACzC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;oCACb,aAAa,EAAE,QAAiB;oCAChC,YAAY,EAAE;wCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;wCAC1B,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;qCACzC;iCACF,CAAC;gCACF,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oCACjB,aAAa,EAAE,SAAkB;oCACjC,EAAE,EAAE,CAAC,CAAC,EAAE;oCACR,YAAY,EAAE;wCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;wCAC1B,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;qCACzC;oCACD,OAAO,EAAE,IAAI;iCACd,CAAC;6BACH,CAAC;yBACM,CACb,CAAA;wBAED,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;wBAElC,OAAO,MAAM;6BACV,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;6BAC/D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACzB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;4BACpB,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,CAAA;4BAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAC7B,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,CACrD,CAAA;4BACD,IAAI,WAAW,EAAE,CAAC;gCAChB,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,IAAI,CAAC,CAAA;gCACxC,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oCACjC,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAChE,CAAA;gCACH,CAAC;gCAED,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,MAAM,CAAC,GAAG,CACR,IAAI,sBAAsB,CAAC,6BAA6B,GAAG,IAAI,CAAC,CACjE,CACF,CAAA;4BACH,CAAC;4BAED,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gCAC5B,GAAG,CAAC;gCACJ,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI;6BACvB,CAAC,CAA8C,CAAA;wBAClD,CAAC,CAAC,CACH,CAAC,CAAA;oBACN,CAAC,CAAC;yBACD,IAAI,CAAC,MAAM;yBACT,QAAQ,CAAC,0CAA0C,EAAE;wBACpD,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBACtF,CAAC,CAAC,CAAA;gBACT,CAAC,CAAA;gBAED,MAAM,CAAC,GAAuB;oBAC5B,GAAG,EAAE,MAAM;yBACR,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;wBACX,KAAK,EAAE,iBAAiB,IAAI,sBAAsB;wBAClD,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;qBACvD,CAAC,CAAC;yBACF,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS;yBACN,KAAK;yBACL,KAAK,CAAK,CAAC,CAAC;yBACZ,QAAQ,EAAE;yBACV,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAC/E,CACF,EACD,MAAM;yBACH,QAAQ,CAAC,qCAAqC,EAAE;wBAC/C,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBACtF,CAAC,CACL;oBACH;;uBAEG;oBACH,MAAM,EAAE,CACN,CAAyB,EACzB,EAAE;wBACF,MAAM,IAAI,GAAG,CAAC,EAAE,IAAI,CAAA;wBACpB,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,CAAA;wBACtB,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAA;wBAEvB,OAAO,MAAM;6BACV,IAAI,CAAC,GAAG,EAAE,CACT,sBAAsB,CACpB,MAAM,IAAI,EAAE,EACZ,IAAI,EACJ,gBAAgB,EAChB,aAAa,EACb,CAAC,CAAC,MAAmD,EACrD,CAAC,CAAC,KAAsF,EACxF,IAAI,EACJ,KAAK,CACN,CACF;6BACA,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC9B,MAAM;6BACH,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACb,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,CAAC,CAAC,MAAM;4BACN,CAAC,CAAC,SAAS;iCACR,KAAK;iCACL,KAAK,CAAI,CAAC,CAAC;iCACX,QAAQ,EAAE;iCACV,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CACtB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAO,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CACpF;4BACH,CAAC,CAAC,SAAS;iCACR,KAAK;iCACL,KAAK,CAAW,CAAC,CAAC;iCAClB,QAAQ,EAAE;iCACV,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CACnF,CACF,CACJ;6BACA,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,wCAAwC,EAAE;4BAC9D,iBAAiB,EAAE,KAAK;4BACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;yBACtF,CAAC,CAAC,CAAA;oBACP,CAAC;oBACD,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CACX,MAAM;yBACH,OAAO,CAAC,GAAG,EAAE,CACZ,SAAS;yBACN,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,EAAE,EAAa,CAAC,CAAC;yBACnD,IAAI,EAAW;yBACf,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CACrB,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CACpF,CACJ;yBACA,IAAI,CAAC,MAAM;yBACT,QAAQ,CAAC,sCAAsC,EAAE;wBAChD,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBACtF,CAAC,CAAC;oBACT,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CACT,MAAM;yBACH,KAAK,CACJ,MAAM;yBACH,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,EACxB;wBACE,MAAM,EAAE,GAAG,EAAE,CACX,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;4BACrB,GAAG,CAAC;4BACJ,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;yBACzC,CAAC,CACH;wBACH,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACf,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CACrD,EAAE,GAAG,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,EAClD;4BACE,eAAe,EAAE;gCACf,IAAI,EAAE,SAAS;gCACf,SAAS,EAAE,IAAI;6BAChB;yBACF,CACF,CACF;qBACJ,CACF;yBACA,IAAI,CACH,MAAM;yBACH,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;wBACb,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;4BACjD,OAAO,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;wBACrE,CAAC;wBACD,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;4BAC7C,OAAO,MAAM,CAAC,GAAG,CACf,IAAI,sBAAsB,CACxB,6BAA6B,GAAG,CAAC,CAAC,UAAU,CAC7C,CACF,CAAA;wBACH,CAAC;wBACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;4BACxB,GAAG,CAAC;4BACJ,KAAK,EAAE,CAAC,CAAC,IAAI;yBACd,CAAC,CAAC,CAAA;oBACL,CAAC,CAAC,EACJ,MAAM;yBACH,QAAQ,CAAC,qCAAqC,EAAE;wBAC/C,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBACtF,CAAC,CACL;oBACL,QAAQ;oBACR,OAAO;oBACP,MAAM,EAAE,CAAC,CAAU,EAAE,EAAE,CACrB,MAAM;yBACH,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;yBACvE,IAAI,CAAC,MAAM;yBACT,QAAQ,CAAC,wCAAwC,EAAE;wBAClD,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBACtF,CAAC,CAAC;iBACV,CAAA;gBAED,mBAAmB;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CACrB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS;qBACN,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;qBACxC,IAAI,EAAkB;qBACtB,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CACzD,CACF,CAAA;gBAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3B,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAAA;oBAC7C,IAAI,IAAI,EAAE,CAAC;wBACT,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;wBACxB,KAAK,CAAC,CAAC,CAAC,CACN,MAAM,CAAC,aAAa,CAClB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACvC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CACf,MAAM,CAAC,KAAK,EACZ,MAAM;4BACJ,0GAA0G;6BACzG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAChC,CACJ,CACF,CAAA;oBACH,CAAC;oBACD,mBAAmB;oBACnB,KAAK,CAAC,CAAC,CAAC,CACN,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;wBACrB,aAAa,EAAE,gBAAgB;wBAC/B,EAAE,EAAE,gBAAgB;wBACpB,GAAG,EAAE,CAAC,CAAC;qBACR,CAAC,CACH,CACF,CAAA;gBACH,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC,CAAC;SACL,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAkB;IACjD,OAAO,UAAU;SACd,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;SAC7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAC9E,CAAC"}
|
|
258
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../../src/services/Store/Cosmos.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Disk.d.ts","sourceRoot":"","sources":["../../../src/services/Store/Disk.ts"],"names":[],"mappings":"AAKA,OAAO,EAAW,MAAM,EAAkB,MAAM,YAAY,CAAA;AAE5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"Disk.d.ts","sourceRoot":"","sources":["../../../src/services/Store/Disk.ts"],"names":[],"mappings":"AAKA,OAAO,EAAW,MAAM,EAAkB,MAAM,YAAY,CAAA;AAE5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC3F,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAyGzC;;;GAGG;AACH,wBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM;WAMvD,EAAE,SAAS,MAAM,EAAE,OAAO,SAAS;QAAE,EAAE,EAAE,EAAE,CAAA;KAAE,EAAE,CAAC,EAAE,CAAC,QAClD,MAAM,SACL,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,WAC7B,WAAW,CAAC,OAAO,CAAC;iBA4CpC;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,wDAEhE"}
|
|
@@ -5,7 +5,7 @@ import { Console, Effect, FiberRef, flow } from "effect-app";
|
|
|
5
5
|
import { makeMemoryStoreInt, storeId } from "./Memory.js";
|
|
6
6
|
import { StoreMaker } from "./service.js";
|
|
7
7
|
function makeDiskStoreInt(prefix, namespace, dir, name, seed, defaultValues) {
|
|
8
|
-
return Effect.gen(function* (
|
|
8
|
+
return Effect.gen(function* () {
|
|
9
9
|
if (namespace !== "primary") {
|
|
10
10
|
dir = dir + "/" + namespace;
|
|
11
11
|
if (!fs.existsSync(dir)) {
|
|
@@ -38,10 +38,10 @@ function makeDiskStoreInt(prefix, namespace, dir, name, seed, defaultValues) {
|
|
|
38
38
|
attributes: { "disk.file": file }
|
|
39
39
|
}))
|
|
40
40
|
};
|
|
41
|
-
const store = yield*
|
|
41
|
+
const store = yield* makeMemoryStoreInt(name, namespace, !fs.existsSync(file)
|
|
42
42
|
? seed
|
|
43
|
-
: fsStore.get, defaultValues)
|
|
44
|
-
yield*
|
|
43
|
+
: fsStore.get, defaultValues);
|
|
44
|
+
yield* store.all.pipe(Effect.flatMap(fsStore.setRaw));
|
|
45
45
|
const sem = Effect.unsafeMakeSemaphore(1);
|
|
46
46
|
const withPermit = sem.withPermits(1);
|
|
47
47
|
const flushToDisk = Effect.flatMap(store.all, fsStore.setRaw).pipe(withPermit);
|
|
@@ -66,11 +66,11 @@ export function makeDiskStore({ prefix }, dir) {
|
|
|
66
66
|
fs.mkdirSync(dir);
|
|
67
67
|
}
|
|
68
68
|
return {
|
|
69
|
-
make: (name, seed, config) => Effect.gen(function* (
|
|
69
|
+
make: (name, seed, config) => Effect.gen(function* () {
|
|
70
70
|
const storesSem = Effect.unsafeMakeSemaphore(1);
|
|
71
|
-
const primary = yield*
|
|
71
|
+
const primary = yield* makeDiskStoreInt(prefix, "primary", dir, name, seed, config?.defaultValues);
|
|
72
72
|
const stores = new Map([["primary", primary]]);
|
|
73
|
-
const ctx = yield*
|
|
73
|
+
const ctx = yield* Effect.context();
|
|
74
74
|
const getStore = !config?.allowNamespace
|
|
75
75
|
? Effect.succeed(primary)
|
|
76
76
|
: FiberRef.get(storeId).pipe(Effect.flatMap((namespace) => {
|
|
@@ -106,4 +106,4 @@ export function makeDiskStore({ prefix }, dir) {
|
|
|
106
106
|
export function DiskStoreLayer(config, dir) {
|
|
107
107
|
return StoreMaker.toLayer(makeDiskStore(config, dir));
|
|
108
108
|
}
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9EaXNrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEtBQUssRUFBRSxNQUFNLHFDQUFxQyxDQUFBO0FBRXpELE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQTtBQUVuQixPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzVELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV6QyxTQUFTLGdCQUFnQixDQUN2QixNQUFjLEVBQ2QsU0FBaUIsRUFDakIsR0FBVyxFQUNYLElBQVksRUFDWixJQUFzQyxFQUN0QyxhQUFnQztJQUdoQyxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3pCLElBQUksU0FBUyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQzVCLEdBQUcsR0FBRyxHQUFHLEdBQUcsR0FBRyxHQUFHLFNBQVMsQ0FBQTtZQUMzQixJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUN4QixFQUFFLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ25CLENBQUM7UUFDSCxDQUFDO1FBQ0QsTUFBTSxJQUFJLEdBQUcsR0FBRyxHQUFHLEdBQUcsR0FBRyxNQUFNLEdBQUcsSUFBSSxHQUFHLE9BQU8sQ0FBQTtRQUNoRCxNQUFNLE9BQU8sR0FBRztZQUNkLEdBQUcsRUFBRSxFQUFFO2lCQUNKLFlBQVksQ0FBQyxJQUFJLENBQUM7aUJBQ2xCLElBQUksQ0FDSCxNQUFNLENBQUMsUUFBUSxDQUFDLDZDQUE2QyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxF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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../../src/services/Store/Memory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,QAAQ,EAA0C,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../../src/services/Store/Memory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,QAAQ,EAA0C,MAAM,YAAY,CAAA;AAI5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,wBAAgB,SAAS,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,OAEpF,CAAC,EAAE,KAAG,wCAAG,CA0CtB;AAED,eAAO,MAAM,OAAO,2BAAiC,CAAA;AAErD;;GAEG;AACH,eAAO,MAAM,yBAAyB,QAAS,cAAc,sCAAsD,CAAA;AAmBnH,wBAAgB,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,OAAO,SAAS;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EACpG,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACtC,cAAc,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,0EAgIlC;AAED,eAAO,MAAM,eAAe;WACnB,EAAE,SAAS,MAAM,EAAE,OAAO,SAAS;QAAE,EAAE,EAAE,EAAE,CAAA;KAAE,EAAE,CAAC,UAAU,CAAC,qBACrD,MAAM,SACV,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,WAC7B,WAAW,CAAC,OAAO,CAAC;CAyC/B,CAAA;AAEF,eAAO,MAAM,eAAe,sDAA2D,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { Array, Effect, FiberRef, flow, Option, Order, pipe, Ref, Struct } from "effect-app";
|
|
3
3
|
import { get } from "effect-app/utils";
|
|
4
|
+
import { InfraLogger } from "../../logger.js";
|
|
4
5
|
import { StoreMaker } from "./service.js";
|
|
5
6
|
import { codeFilter, makeUpdateETag } from "./utils.js";
|
|
6
7
|
export function memFilter(f) {
|
|
@@ -42,7 +43,7 @@ export const storeId = FiberRef.unsafeMake("primary");
|
|
|
42
43
|
*/
|
|
43
44
|
export const restoreFromRequestContext = (ctx) => FiberRef.set(storeId, ctx.namespace ?? "primary");
|
|
44
45
|
function logQuery(f, defaultValues) {
|
|
45
|
-
return
|
|
46
|
+
return InfraLogger
|
|
46
47
|
.logDebug("mem query")
|
|
47
48
|
.pipe(Effect.annotateLogs({
|
|
48
49
|
filter: JSON.stringify(f.filter, undefined, 2),
|
|
@@ -54,9 +55,9 @@ function logQuery(f, defaultValues) {
|
|
|
54
55
|
}));
|
|
55
56
|
}
|
|
56
57
|
export function makeMemoryStoreInt(modelName, namespace, seed, _defaultValues) {
|
|
57
|
-
return Effect.gen(function* (
|
|
58
|
+
return Effect.gen(function* () {
|
|
58
59
|
const updateETag = makeUpdateETag(modelName);
|
|
59
|
-
const items_ = yield*
|
|
60
|
+
const items_ = yield* seed ?? Effect.sync(() => []);
|
|
60
61
|
const defaultValues = _defaultValues ?? {};
|
|
61
62
|
const items = new Map([...items_].map((_) => [_.id, { _etag: undefined, ...defaultValues, ..._ }]));
|
|
62
63
|
const store = Ref.unsafeMake(items);
|
|
@@ -131,10 +132,10 @@ export function makeMemoryStoreInt(modelName, namespace, seed, _defaultValues) {
|
|
|
131
132
|
});
|
|
132
133
|
}
|
|
133
134
|
export const makeMemoryStore = () => ({
|
|
134
|
-
make: (modelName, seed, config) => Effect.gen(function* (
|
|
135
|
+
make: (modelName, seed, config) => Effect.gen(function* () {
|
|
135
136
|
const storesSem = Effect.unsafeMakeSemaphore(1);
|
|
136
|
-
const primary = yield*
|
|
137
|
-
const ctx = yield*
|
|
137
|
+
const primary = yield* makeMemoryStoreInt(modelName, "primary", seed, config?.defaultValues);
|
|
138
|
+
const ctx = yield* Effect.context();
|
|
138
139
|
const stores = new Map([["primary", primary]]);
|
|
139
140
|
const getStore = !config?.allowNamespace
|
|
140
141
|
? Effect.succeed(primary)
|
|
@@ -169,4 +170,4 @@ export const makeMemoryStore = () => ({
|
|
|
169
170
|
})
|
|
170
171
|
});
|
|
171
172
|
export const MemoryStoreLive = StoreMaker.toLayer(Effect.sync(() => makeMemoryStore()));
|
|
172
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Memory.js","sourceRoot":"","sources":["../../../src/services/Store/Memory.ts"],"names":[],"mappings":"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"}
|
|
173
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Memory.js","sourceRoot":"","sources":["../../../src/services/Store/Memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/services/Store/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE3C,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAElF,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,oBAAoB,CAAC,EAAE,CAAC,mBACxC,CAAC,KACjB,CAGO,CAAA;AACV,eAAO,MAAM,cAAc,SAClB,MAAM,MAAM,CAAC,SAAS,oBAAoB,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/services/Store/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE3C,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAElF,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,oBAAoB,CAAC,EAAE,CAAC,mBACxC,CAAC,KACjB,CAGO,CAAA;AACV,eAAO,MAAM,cAAc,SAClB,MAAM,MAAM,CAAC,SAAS,oBAAoB,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,CAAC,CAAC,4DAkBvF,CAAA;AAEN,wBAAgB,UAAU,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,OACpE,CAAC,uCACb;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,cAK1C;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,WAEnD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEvE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEhF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEzE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAElF"}
|
|
@@ -6,17 +6,17 @@ export const makeETag = ({ _etag, ...e }) => ({
|
|
|
6
6
|
...e,
|
|
7
7
|
_etag: objectHash(e)
|
|
8
8
|
});
|
|
9
|
-
export const makeUpdateETag = (type) => (e, current) => Effect.gen(function* (
|
|
9
|
+
export const makeUpdateETag = (type) => (e, current) => Effect.gen(function* () {
|
|
10
10
|
if (e._etag) {
|
|
11
|
-
yield*
|
|
11
|
+
yield* Effect.mapError(current, () => new OptimisticConcurrencyException({ type, id: e.id, current: "", found: e._etag }));
|
|
12
12
|
}
|
|
13
13
|
if (Option.isSome(current) && current.value._etag !== e._etag) {
|
|
14
|
-
return yield*
|
|
14
|
+
return yield* new OptimisticConcurrencyException({
|
|
15
15
|
type,
|
|
16
16
|
id: current.value.id,
|
|
17
17
|
current: current.value._etag,
|
|
18
18
|
found: e._etag
|
|
19
|
-
})
|
|
19
|
+
});
|
|
20
20
|
}
|
|
21
21
|
const newE = makeETag(e);
|
|
22
22
|
return newE;
|
|
@@ -45,4 +45,4 @@ export function greaterThan(valA, valB) {
|
|
|
45
45
|
export function greaterThanExclusive(valA, valB) {
|
|
46
46
|
return valA >= valB;
|
|
47
47
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvU3RvcmUvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0MsT0FBTyxVQUFVLE1BQU0sYUFBYSxDQUFBO0FBQ3BDLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ2hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUc5QyxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FDdEIsRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUssRUFDZixFQUFFLENBQUUsQ0FBQztJQUNSLEdBQUcsQ0FBQztJQUNKLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO0NBQ3JCLENBQVMsQ0FBQTtBQUNWLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FDekIsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQWlELENBQUksRUFBRSxPQUFrQixFQUFFLEVBQUUsQ0FDN0YsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7SUFDbEIsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDWixLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUNwQixPQUFPLEVBQ1AsR0FBRyxFQUFFLENBQUMsSUFBSSw4QkFBOEIsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FDMUYsQ0FBQTtJQUNILENBQUM7SUFDRCxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzlELE9BQU8sS0FBSyxDQUFDLENBQUMsSUFBSSw4QkFBOEIsQ0FBQztZQUMvQyxJQUFJO1lBQ0osRUFBRSxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNwQixPQUFPLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLO1lBQzVCLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSztTQUNmLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEIsT0FBTyxJQUFJLENBQUE7QUFDYixDQUFDLENBQUMsQ0FBQTtBQUVOLE1BQU0sVUFBVSxVQUFVLENBQXlDLE1BQWM7SUFDL0UsT0FBTyxDQUFDLENBQUksRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtBQUM1RixDQUFDO0FBRUQsTUFBTSxVQUFVLGlCQUFpQixDQUFJLEdBQU07SUFDekMsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM1QixPQUFPLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtJQUMxQixDQUFDO0lBQ0QsT0FBTyxHQUFHLENBQUE7QUFDWixDQUFDO0FBRUQsTUFBTSxVQUFVLE9BQU8sQ0FBQyxJQUFhLEVBQUUsSUFBYTtJQUNsRCxPQUFPLElBQUksS0FBSyxJQUFJLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxTQUFTLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUN0RSxPQUFPLElBQUksR0FBRyxJQUFJLENBQUE7QUFDcEIsQ0FBQztBQUVELE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQy9FLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQTtBQUNyQixDQUFDO0FBRUQsTUFBTSxVQUFVLFdBQVcsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQ3hFLE9BQU8sSUFBSSxHQUFHLElBQUksQ0FBQTtBQUNwQixDQUFDO0FBRUQsTUFBTSxVQUFVLG9CQUFvQixDQUFDLElBQXNCLEVBQUUsSUFBc0I7SUFDakYsT0FBTyxJQUFJLElBQUksSUFBSSxDQUFBO0FBQ3JCLENBQUMifQ==
|
package/examples/query.ts
CHANGED
|
@@ -42,8 +42,8 @@ class SomethingRepo extends RepositoryDefaultImpl<SomethingRepo>()(
|
|
|
42
42
|
)
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
const program = Effect.gen(function*(
|
|
46
|
-
const r = yield*
|
|
45
|
+
const program = Effect.gen(function*() {
|
|
46
|
+
const r = yield* SomethingRepo.query(flow(
|
|
47
47
|
where("displayName", "Verona"),
|
|
48
48
|
or(
|
|
49
49
|
where("displayName", "Riley"),
|
|
@@ -52,7 +52,7 @@ const program = Effect.gen(function*($) {
|
|
|
52
52
|
order("displayName"),
|
|
53
53
|
page({ take: 1 }),
|
|
54
54
|
project(S.Struct(Something.pick("id", "displayName")))
|
|
55
|
-
))
|
|
55
|
+
))
|
|
56
56
|
console.log("$$ result", r)
|
|
57
57
|
})
|
|
58
58
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "1.23.
|
|
3
|
+
"version": "1.23.4",
|
|
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": "1.
|
|
22
|
-
"
|
|
23
|
-
"@effect-app/
|
|
24
|
-
"@effect-app/
|
|
21
|
+
"@effect-app/core": "1.10.2",
|
|
22
|
+
"effect-app": "1.17.5",
|
|
23
|
+
"@effect-app/infra-adapters": "1.11.7",
|
|
24
|
+
"@effect-app/schema": "1.12.2"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@babel/cli": "^7.25.6",
|
|
@@ -306,6 +306,16 @@
|
|
|
306
306
|
"default": "./_cjs/filter/types/validator.cjs"
|
|
307
307
|
}
|
|
308
308
|
},
|
|
309
|
+
"./logger": {
|
|
310
|
+
"import": {
|
|
311
|
+
"types": "./dist/logger.d.ts",
|
|
312
|
+
"default": "./dist/logger.js"
|
|
313
|
+
},
|
|
314
|
+
"require": {
|
|
315
|
+
"types": "./dist/logger.d.ts",
|
|
316
|
+
"default": "./_cjs/logger.cjs"
|
|
317
|
+
}
|
|
318
|
+
},
|
|
309
319
|
"./logger/jsonLogger": {
|
|
310
320
|
"import": {
|
|
311
321
|
"types": "./dist/logger/jsonLogger.d.ts",
|
|
@@ -2,6 +2,7 @@ import { setupRequestContext } from "@effect-app/infra/api/setupRequest"
|
|
|
2
2
|
import { reportError } from "@effect-app/infra/errorReporter"
|
|
3
3
|
import { Duration, Effect, pipe, S, Schedule, Stream } from "effect-app"
|
|
4
4
|
import { HttpHeaders, HttpServerResponse } from "effect-app/http"
|
|
5
|
+
import { InfraLogger } from "../../logger.js"
|
|
5
6
|
|
|
6
7
|
// Tell the client to retry every 10 seconds if connectivity is lost
|
|
7
8
|
const setRetry = Stream.succeed("retry: 10000")
|
|
@@ -13,7 +14,7 @@ export const makeSSE = <A extends { id: any }, E, R, SI, SR>(
|
|
|
13
14
|
) =>
|
|
14
15
|
Effect
|
|
15
16
|
.gen(function*() {
|
|
16
|
-
yield*
|
|
17
|
+
yield* InfraLogger.logInfo("$ start listening to events")
|
|
17
18
|
|
|
18
19
|
const enc = new TextEncoder()
|
|
19
20
|
|
|
@@ -17,6 +17,7 @@ import * as FiberRef from "effect/FiberRef"
|
|
|
17
17
|
import { pipe } from "effect/Function"
|
|
18
18
|
import * as HashMap from "effect/HashMap"
|
|
19
19
|
import * as Metric from "effect/Metric"
|
|
20
|
+
import { InfraLogger } from "../../logger.js"
|
|
20
21
|
import type * as Middlewares from "../middlewares.js"
|
|
21
22
|
|
|
22
23
|
export const accessLog = (level: "Info" | "Warning" | "Debug" = "Info") =>
|
|
@@ -67,13 +68,13 @@ export const errorLog = Middleware.make((app) =>
|
|
|
67
68
|
|
|
68
69
|
if (response.status >= 400 && response.status < 500) {
|
|
69
70
|
yield* _(
|
|
70
|
-
|
|
71
|
+
InfraLogger.logWarning(
|
|
71
72
|
`${request.method.toUpperCase()} ${request.url} client error ${response.status}`
|
|
72
73
|
)
|
|
73
74
|
)
|
|
74
75
|
} else if (response.status >= 500) {
|
|
75
76
|
yield* _(
|
|
76
|
-
|
|
77
|
+
InfraLogger.logError(
|
|
77
78
|
`${request.method.toUpperCase()} ${request.url} server error ${response.status}`
|
|
78
79
|
)
|
|
79
80
|
)
|
|
@@ -19,6 +19,7 @@ import type {
|
|
|
19
19
|
InvalidTokenError,
|
|
20
20
|
UnauthorizedError as JWTUnauthorizedError
|
|
21
21
|
} from "express-oauth2-jwt-bearer"
|
|
22
|
+
import { InfraLogger } from "../../logger.js"
|
|
22
23
|
|
|
23
24
|
export class JWTError extends Data.TaggedClass("JWTError")<{
|
|
24
25
|
error:
|
|
@@ -43,7 +44,7 @@ export function defaultBasicErrorHandler<R>(
|
|
|
43
44
|
Effect
|
|
44
45
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
45
46
|
.catchAll((err: never) =>
|
|
46
|
-
|
|
47
|
+
InfraLogger
|
|
47
48
|
.logError(
|
|
48
49
|
"Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err
|
|
49
50
|
)
|
|
@@ -126,7 +127,7 @@ export function defaultErrorHandler<R, A extends { _tag: string } = never>(
|
|
|
126
127
|
Effect
|
|
127
128
|
// final catch all; expecting never so that unhandled known errors will show up
|
|
128
129
|
.catchAll((err: never) =>
|
|
129
|
-
|
|
130
|
+
InfraLogger
|
|
130
131
|
.logError(
|
|
131
132
|
"Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err
|
|
132
133
|
)
|