@effect-app/infra 0.13.0 → 0.14.1
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 +25 -0
- package/_cjs/api/codec.cjs +2 -4
- package/_cjs/api/codec.cjs.map +1 -1
- package/_cjs/api/defaultErrorHandler.cjs +18 -21
- package/_cjs/api/defaultErrorHandler.cjs.map +1 -1
- package/_cjs/api/express/makeJsonSchema.cjs +4 -4
- package/_cjs/api/express/makeJsonSchema.cjs.map +1 -1
- package/_cjs/api/express/makeOpenApiSpecs.cjs +5 -7
- package/_cjs/api/express/makeOpenApiSpecs.cjs.map +1 -1
- package/_cjs/api/express/schema/requestHandler.cjs +57 -56
- package/_cjs/api/express/schema/requestHandler.cjs.map +1 -1
- package/_cjs/api/express/schema/routing.cjs +22 -22
- package/_cjs/api/express/schema/routing.cjs.map +1 -1
- package/_cjs/api/reportError.cjs +6 -17
- package/_cjs/api/reportError.cjs.map +1 -1
- package/_cjs/api/routing.cjs +70 -70
- package/_cjs/api/routing.cjs.map +1 -1
- package/_cjs/api/setupRequest.cjs +2 -4
- package/_cjs/api/setupRequest.cjs.map +1 -1
- package/_cjs/api/writeDocs.cjs +6 -8
- package/_cjs/api/writeDocs.cjs.map +1 -1
- package/_cjs/errorReporter.cjs +11 -13
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/errors.cjs +1 -1
- package/_cjs/errors.cjs.map +1 -1
- package/_cjs/instrument.cjs +1 -3
- package/_cjs/instrument.cjs.map +1 -1
- package/_cjs/rateLimit.cjs +6 -8
- package/_cjs/rateLimit.cjs.map +1 -1
- package/_cjs/services/Emailer/Sendgrid.cjs +12 -18
- package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
- package/_cjs/services/Emailer/fake.cjs +4 -7
- package/_cjs/services/Emailer/fake.cjs.map +1 -1
- package/_cjs/services/Operations/live.cjs +23 -26
- package/_cjs/services/Operations/live.cjs.map +1 -1
- package/_cjs/services/Operations/service.cjs +3 -5
- package/_cjs/services/Operations/service.cjs.map +1 -1
- package/_cjs/services/Repository.cjs +28 -30
- package/_cjs/services/Repository.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos.cjs +58 -58
- package/_cjs/services/Store/Cosmos.cjs.map +1 -1
- package/_cjs/services/Store/Disk.cjs +15 -16
- package/_cjs/services/Store/Disk.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs +14 -16
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_cjs/services/Store/Redis.cjs +22 -23
- package/_cjs/services/Store/Redis.cjs.map +1 -1
- package/_cjs/services/Store/codeFilter.test.cjs +1 -1
- package/_cjs/services/Store/index.cjs +7 -7
- package/_cjs/services/Store/index.cjs.map +1 -1
- package/_cjs/services/Store/service.cjs +2 -4
- package/_cjs/services/Store/service.cjs.map +1 -1
- package/_cjs/services/Store/utils.cjs +16 -17
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/_cjs/services/simpledb/cosmosdb.cjs +23 -25
- package/_cjs/services/simpledb/cosmosdb.cjs.map +1 -1
- package/_cjs/services/simpledb/diskdb.cjs +20 -21
- package/_cjs/services/simpledb/diskdb.cjs.map +1 -1
- package/_cjs/services/simpledb/memdb.cjs +11 -13
- package/_cjs/services/simpledb/memdb.cjs.map +1 -1
- package/_cjs/services/simpledb/mongodb.cjs +20 -22
- package/_cjs/services/simpledb/mongodb.cjs.map +1 -1
- package/_cjs/services/simpledb/redisdb.cjs +25 -25
- package/_cjs/services/simpledb/redisdb.cjs.map +1 -1
- package/_cjs/services/simpledb/shared.cjs +4 -6
- package/_cjs/services/simpledb/shared.cjs.map +1 -1
- package/_cjs/services/simpledb/simpledb.cjs +16 -17
- package/_cjs/services/simpledb/simpledb.cjs.map +1 -1
- package/_src/errors.ts +1 -1
- package/_src/services/simpledb/memdb.ts +1 -1
- package/dist/RequestContext.d.ts +12 -12
- package/dist/api/codec.js +3 -5
- package/dist/api/defaultErrorHandler.js +20 -21
- package/dist/api/express/makeJsonSchema.js +3 -5
- package/dist/api/express/makeOpenApiSpecs.js +5 -7
- package/dist/api/express/schema/requestHandler.d.ts +5 -5
- package/dist/api/express/schema/requestHandler.js +50 -52
- package/dist/api/express/schema/routing.js +21 -23
- package/dist/api/reportError.js +6 -18
- package/dist/api/routing.js +65 -67
- package/dist/api/setupRequest.js +3 -5
- package/dist/api/writeDocs.js +7 -9
- package/dist/errorReporter.js +10 -12
- package/dist/errors.js +2 -2
- package/dist/instrument.js +2 -4
- package/dist/rateLimit.js +7 -9
- package/dist/services/Emailer/Sendgrid.js +15 -22
- package/dist/services/Emailer/fake.js +5 -8
- package/dist/services/Emailer/service.d.ts +1 -1
- package/dist/services/Operations/live.js +24 -27
- package/dist/services/Operations/service.js +4 -6
- package/dist/services/Repository.d.ts +4 -4
- package/dist/services/Repository.js +22 -24
- package/dist/services/Store/Cosmos.d.ts +1 -1
- package/dist/services/Store/Cosmos.js +61 -63
- package/dist/services/Store/Disk.js +16 -19
- package/dist/services/Store/Memory.d.ts +1 -1
- package/dist/services/Store/Memory.js +16 -18
- package/dist/services/Store/Redis.d.ts +1 -1
- package/dist/services/Store/Redis.js +21 -24
- package/dist/services/Store/index.js +6 -8
- package/dist/services/Store/service.d.ts +1 -1
- package/dist/services/Store/service.js +3 -5
- package/dist/services/Store/utils.d.ts +2 -2
- package/dist/services/Store/utils.js +18 -19
- package/dist/services/simpledb/cosmosdb.d.ts +2 -2
- package/dist/services/simpledb/cosmosdb.js +23 -25
- package/dist/services/simpledb/diskdb.d.ts +2 -2
- package/dist/services/simpledb/diskdb.js +18 -18
- package/dist/services/simpledb/memdb.d.ts +3 -3
- package/dist/services/simpledb/memdb.js +13 -14
- package/dist/services/simpledb/mongodb.d.ts +2 -2
- package/dist/services/simpledb/mongodb.js +18 -20
- package/dist/services/simpledb/redisdb.d.ts +8 -8
- package/dist/services/simpledb/redisdb.js +21 -23
- package/dist/services/simpledb/shared.d.ts +9 -9
- package/dist/services/simpledb/shared.js +5 -7
- package/dist/services/simpledb/simpledb.d.ts +1 -1
- package/dist/services/simpledb/simpledb.js +19 -19
- package/package.json +12 -12
- package/tsconfig.json +5 -1
package/dist/api/routing.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import * as
|
|
2
|
-
const fileName_1 = "packages/infra/_src/api/routing.ts";
|
|
3
|
-
import * as tsplus_module_1 from "@fp-ts/data/Option";
|
|
1
|
+
import * as tsplus_module_1 from "@fp-ts/core/Option";
|
|
4
2
|
import * as tsplus_module_2 from "@effect/io/Effect";
|
|
5
3
|
import * as tsplus_module_3 from "@effect-app/core/Effect";
|
|
6
4
|
import * as tsplus_module_4 from "@effect-app/prelude/_ext/Schema.ext";
|
|
@@ -21,16 +19,16 @@ import { makeRouteDescriptor } from "./express/schema/routing.js";
|
|
|
21
19
|
import { reportRequestError } from "./reportError.js";
|
|
22
20
|
import { snipString, snipValue } from "./util.js";
|
|
23
21
|
export function makeRequestParsers(Request) {
|
|
24
|
-
const ph =
|
|
25
|
-
const parseHeaders = (u) =>
|
|
26
|
-
const pq =
|
|
27
|
-
const parseQuery = (u) =>
|
|
28
|
-
const pb =
|
|
29
|
-
const parseBody = (u) =>
|
|
30
|
-
const pp =
|
|
31
|
-
const parsePath = (u) =>
|
|
32
|
-
const pc =
|
|
33
|
-
const parseCookie = (u) =>
|
|
22
|
+
const ph = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Headers)))));
|
|
23
|
+
const parseHeaders = (u) => tsplus_module_3.flatMapOpt(ph, d => d(u));
|
|
24
|
+
const pq = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Query)))));
|
|
25
|
+
const parseQuery = (u) => tsplus_module_3.flatMapOpt(pq, d => d(u));
|
|
26
|
+
const pb = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Body)))));
|
|
27
|
+
const parseBody = (u) => tsplus_module_3.flatMapOpt(pb, d => d(u));
|
|
28
|
+
const pp = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Path)))));
|
|
29
|
+
const parsePath = (u) => tsplus_module_3.flatMapOpt(pp, d => d(u));
|
|
30
|
+
const pc = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Cookie)))));
|
|
31
|
+
const parseCookie = (u) => tsplus_module_3.flatMapOpt(pc, d => d(u));
|
|
34
32
|
return {
|
|
35
33
|
parseBody,
|
|
36
34
|
parseCookie,
|
|
@@ -46,15 +44,15 @@ export function match(requestHandler, errorHandler, middleware) {
|
|
|
46
44
|
requestHandler = handler;
|
|
47
45
|
makeMiddlewareContext = makeContext;
|
|
48
46
|
}
|
|
49
|
-
return
|
|
47
|
+
return tsplus_module_2.zipRight(Ex.match(requestHandler.Request.method.toLowerCase())(requestHandler.Request.path.split("?")[0], makeRequestHandler(requestHandler, errorHandler, makeMiddlewareContext)), tsplus_module_2.sync(() => makeRouteDescriptor(requestHandler.Request.path, requestHandler.Request.method, requestHandler)));
|
|
50
48
|
}
|
|
51
49
|
export function respondSuccess(encodeResponse) {
|
|
52
|
-
return (req, res, a) =>
|
|
50
|
+
return (req, res, a) => tsplus_module_2.flatMap(tsplus_module_2.sync(() => encodeResponse(req)(a)), r => tsplus_module_2.sync(() => {
|
|
53
51
|
r === undefined
|
|
54
52
|
? res.status(204).send()
|
|
55
53
|
: res.status(200)
|
|
56
54
|
.send(JSON.stringify(r));
|
|
57
|
-
}))
|
|
55
|
+
}));
|
|
58
56
|
}
|
|
59
57
|
export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
60
58
|
const { Request, Response, adaptResponse, h: handle } = handler;
|
|
@@ -67,7 +65,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
67
65
|
const parseRequest = parseRequestParams(requestParsers);
|
|
68
66
|
const respond = respondSuccess(encodeResponse);
|
|
69
67
|
function getParams(req) {
|
|
70
|
-
return
|
|
68
|
+
return tsplus_module_2.sync(() => ({
|
|
71
69
|
path: req.params,
|
|
72
70
|
query: req.query,
|
|
73
71
|
body: req.body,
|
|
@@ -85,7 +83,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
85
83
|
return prev;
|
|
86
84
|
}, {})
|
|
87
85
|
: req.cookies
|
|
88
|
-
}))
|
|
86
|
+
}));
|
|
89
87
|
}
|
|
90
88
|
function makeContext(req) {
|
|
91
89
|
const start = new Date();
|
|
@@ -119,7 +117,49 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
119
117
|
return requestContext;
|
|
120
118
|
}
|
|
121
119
|
return (req, res) => {
|
|
122
|
-
return
|
|
120
|
+
return tsplus_module_2.flatMap(tsplus_module_2.struct({
|
|
121
|
+
requestContext: tsplus_module_2.sync(() => {
|
|
122
|
+
const requestContext = makeContext(req);
|
|
123
|
+
if (req.method === "GET") {
|
|
124
|
+
res.setHeader("Cache-Control", "no-store");
|
|
125
|
+
}
|
|
126
|
+
res.setHeader("Content-Language", requestContext.locale);
|
|
127
|
+
return requestContext;
|
|
128
|
+
}),
|
|
129
|
+
pars: getParams(req)
|
|
130
|
+
}), ({ pars, requestContext }) => tsplus_module_9.setupRequest(tsplus_module_2.provideService(tsplus_module_2.tap(tsplus_module_2.tapErrorCause(tsplus_module_2.zipRight(tsplus_module_7.logAnnotates({
|
|
131
|
+
method: req.method,
|
|
132
|
+
path: req.originalUrl,
|
|
133
|
+
reqPath: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.path)),
|
|
134
|
+
reqQuery: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.query)),
|
|
135
|
+
reqBody: pretty(pars.body),
|
|
136
|
+
reqCookies: pretty(pars.cookies),
|
|
137
|
+
reqHeaders: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.headers))
|
|
138
|
+
})(tsplus_module_2.logInfo("Processing request")), tsplus_module_2.suspendSucceed(() => {
|
|
139
|
+
const handleRequest = tsplus_module_2.flatMap(tsplus_module_2.map(parseRequest(req), ({ body, path, query }) => {
|
|
140
|
+
const hn = {
|
|
141
|
+
...tsplus_module_8.getOrUndefined(body),
|
|
142
|
+
...tsplus_module_8.getOrUndefined(query),
|
|
143
|
+
...tsplus_module_8.getOrUndefined(path)
|
|
144
|
+
};
|
|
145
|
+
return hn;
|
|
146
|
+
}), parsedReq => tsplus_module_2.flatMap(handle(parsedReq), r => respond(parsedReq, res, r)));
|
|
147
|
+
// Commands should not be interruptable.
|
|
148
|
+
const r = req.method !== "GET" ? tsplus_module_2.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
149
|
+
// the first log entry should be of the request start.
|
|
150
|
+
const r2 = makeMiddlewareContext
|
|
151
|
+
? tsplus_module_3.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)
|
|
152
|
+
// PR is not relevant here
|
|
153
|
+
: r;
|
|
154
|
+
return errorHandler(req, res, requestContext, r2);
|
|
155
|
+
})), cause => tsplus_module_2.tapErrorCause(tsplus_module_2.zipRight(tsplus_module_2.suspendSucceed(() => {
|
|
156
|
+
res.status(500).send();
|
|
157
|
+
return reportRequestError(cause, {
|
|
158
|
+
requestContext,
|
|
159
|
+
path: req.originalUrl,
|
|
160
|
+
method: req.method
|
|
161
|
+
});
|
|
162
|
+
}), tsplus_module_2.suspendSucceed(() => {
|
|
123
163
|
const headers = res.getHeaders();
|
|
124
164
|
return tsplus_module_7.logAnnotates({
|
|
125
165
|
method: req.method,
|
|
@@ -129,8 +169,8 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
129
169
|
prev[key] = value && typeof value === "string" ? snipString(value) : value;
|
|
130
170
|
return prev;
|
|
131
171
|
}, {})))
|
|
132
|
-
})(
|
|
133
|
-
}))
|
|
172
|
+
})(tsplus_module_2.logErrorCauseMessage("Processed request", cause));
|
|
173
|
+
})), cause => tsplus_module_2.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_2.suspendSucceed(() => {
|
|
134
174
|
const headers = res.getHeaders();
|
|
135
175
|
return tsplus_module_7.logAnnotates({
|
|
136
176
|
method: req.method,
|
|
@@ -140,51 +180,9 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
140
180
|
prev[key] = value && typeof value === "string" ? snipString(value) : value;
|
|
141
181
|
return prev;
|
|
142
182
|
}, {})))
|
|
143
|
-
})(
|
|
144
|
-
}))
|
|
145
|
-
|
|
146
|
-
return reportRequestError(cause, {
|
|
147
|
-
requestContext,
|
|
148
|
-
path: req.originalUrl,
|
|
149
|
-
method: req.method
|
|
150
|
-
});
|
|
151
|
-
}))))))(tracer_1.withCallTrace(fileName_1 + ":325:13")(tsplus_module_2.zipRight(tracer_1.withCallTrace(fileName_1 + ":326:18")(tsplus_module_2.suspendSucceed(() => {
|
|
152
|
-
const handleRequest = tracer_1.withCallTrace(fileName_1 + ":336:16")(tsplus_module_2.flatMap(parsedReq => tracer_1.withCallTrace(fileName_1 + ":338:20")(tsplus_module_2.flatMap(r => respond(parsedReq, res, r)))(handle(parsedReq))))(tracer_1.withCallTrace(fileName_1 + ":328:16")(tsplus_module_2.map(({ body, path, query }) => {
|
|
153
|
-
const hn = {
|
|
154
|
-
...tsplus_module_8.getOrUndefined(body),
|
|
155
|
-
...tsplus_module_8.getOrUndefined(query),
|
|
156
|
-
...tsplus_module_8.getOrUndefined(path)
|
|
157
|
-
};
|
|
158
|
-
return hn;
|
|
159
|
-
}))(parseRequest(req)));
|
|
160
|
-
// Commands should not be interruptable.
|
|
161
|
-
const r = req.method !== "GET" ? tsplus_module_2.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
162
|
-
// the first log entry should be of the request start.
|
|
163
|
-
const r2 = makeMiddlewareContext
|
|
164
|
-
? tsplus_module_3.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)
|
|
165
|
-
// PR is not relevant here
|
|
166
|
-
: r;
|
|
167
|
-
return errorHandler(req, res, requestContext, r2);
|
|
168
|
-
}))))(tsplus_module_7.logAnnotates({
|
|
169
|
-
method: req.method,
|
|
170
|
-
path: req.originalUrl,
|
|
171
|
-
reqPath: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.path)),
|
|
172
|
-
reqQuery: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.query)),
|
|
173
|
-
reqBody: pretty(pars.body),
|
|
174
|
-
reqCookies: pretty(pars.cookies),
|
|
175
|
-
reqHeaders: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.headers))
|
|
176
|
-
})(tracer_1.withCallTrace(fileName_1 + ":317:16")(tsplus_module_2.logInfo("Processing request"))))))) // otherwise external error reporter breaks.
|
|
177
|
-
, requestContext)))(tracer_1.withCallTrace(fileName_1 + ":305:19")(tsplus_module_2.struct({
|
|
178
|
-
requestContext: tracer_1.withCallTrace(fileName_1 + ":306:23")(tsplus_module_2.sync(() => {
|
|
179
|
-
const requestContext = makeContext(req);
|
|
180
|
-
if (req.method === "GET") {
|
|
181
|
-
res.setHeader("Cache-Control", "no-store");
|
|
182
|
-
}
|
|
183
|
-
res.setHeader("Content-Language", requestContext.locale);
|
|
184
|
-
return requestContext;
|
|
185
|
-
})),
|
|
186
|
-
pars: getParams(req)
|
|
187
|
-
})));
|
|
183
|
+
})(tsplus_module_2.logInfo("Processed request"));
|
|
184
|
+
})), tsplus_module_5.tag, requestContext) // otherwise external error reporter breaks.
|
|
185
|
+
, requestContext));
|
|
188
186
|
};
|
|
189
187
|
}
|
|
190
188
|
/**
|
|
@@ -246,4 +244,4 @@ export function matchResource(mod) {
|
|
|
246
244
|
return handler;
|
|
247
245
|
};
|
|
248
246
|
}
|
|
249
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
247
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
package/dist/api/setupRequest.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import * as tracer_1 from "@effect/io/Debug";
|
|
2
|
-
const fileName_1 = "packages/infra/_src/api/setupRequest.ts";
|
|
3
1
|
import * as tsplus_module_1 from "@effect/io/Effect";
|
|
4
2
|
import * as tsplus_module_2 from "@effect-app/prelude/_ext/Prelude.ext";
|
|
5
3
|
import * as tsplus_module_3 from "@effect-app/core/Function";
|
|
@@ -10,7 +8,7 @@ import "../RequestContext.js";
|
|
|
10
8
|
* @tsplus fluent effect/io/Effect setupRequest
|
|
11
9
|
*/
|
|
12
10
|
function setupRequest_1(self, requestContext) {
|
|
13
|
-
return tsplus_module_3.pipe(
|
|
11
|
+
return tsplus_module_3.pipe(tsplus_module_1.logSpan(self, "request"), tsplus_module_2.logAnnotates({
|
|
14
12
|
requestRootId: requestContext.rootId,
|
|
15
13
|
requestId: requestContext.id,
|
|
16
14
|
requestName: requestContext.name
|
|
@@ -20,6 +18,6 @@ function setupRequest_1(self, requestContext) {
|
|
|
20
18
|
* @tsplus getter effect/io/Effect setupRequestFrom
|
|
21
19
|
*/
|
|
22
20
|
export function setupRequestFrom(self) {
|
|
23
|
-
return
|
|
21
|
+
return tsplus_module_1.serviceWithEffect(tsplus_module_4.tag, requestContext => setupRequest_1(self, requestContext));
|
|
24
22
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7YUFLZ0IsWUFBWTtBQUw1QixPQUErQixzQkFBc0IsQ0FBQTtBQUVyRDs7R0FFRztBQUNILHdCQUFzQyxJQUFxQixFQUFFLGNBQThCO0lBQ3pGLE9BQU8sZ0JBQUEsSUFBSSxDQUNULHdCQUFBLElBQUksRUFBUyxTQUFTLENBQUMsRUFDdkIsNkJBQW9CO1FBQ2xCLGFBQWEsRUFBRSxjQUFjLENBQUMsTUFBTTtRQUNwQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUU7UUFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO0tBQ2pDLENBQUMsQ0FDSCxDQUFBO0FBQ0gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGdCQUFnQixDQUFVLElBQXFCO0lBQzdELE9BQU8sdURBQW9DLGNBQWMsQ0FBQyxFQUFFLENBQUMsZUFBQSxJQUFJLEVBQWMsY0FBYyxDQUFDLENBQUMsQ0FBQTtBQUNqRyxDQUFDIn0=
|
package/dist/api/writeDocs.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import * as tracer_1 from "@effect/io/Debug";
|
|
2
|
-
const fileName_1 = "packages/infra/_src/api/writeDocs.ts";
|
|
3
1
|
import * as tsplus_module_1 from "@effect/io/Effect";
|
|
4
2
|
import * as tsplus_module_2 from "@effect-app/core/Order";
|
|
5
3
|
import * as tsplus_module_3 from "@effect-app/core/_ext/ord.ext";
|
|
@@ -9,15 +7,15 @@ import { writeTextFile } from "@effect-app/infra-adapters/fileUtil";
|
|
|
9
7
|
import * as Plutus from "@effect-app/infra-adapters/Openapi/atlas-plutus";
|
|
10
8
|
import { makeOpenApiSpecs } from "./express/makeOpenApiSpecs.js";
|
|
11
9
|
export function writeOpenapiDocs(rdescs) {
|
|
12
|
-
return
|
|
10
|
+
return tsplus_module_1.flatMap(tsplus_module_1.flatMap(tsplus_module_1.map(makeOpenApiSpecs(tsplus_module_4.sortWith(tsplus_module_3.OrdContramap((a) => a.path)(tsplus_module_2.string))(typedValuesOf(rdescs).reduce((prev, cur) => prev.concat(typedValuesOf(cur)), [])), Plutus.info({
|
|
11
|
+
title: "api",
|
|
12
|
+
version: "X",
|
|
13
|
+
pageTitle: "api"
|
|
14
|
+
})), _ => ({
|
|
13
15
|
..._,
|
|
14
16
|
tags: [
|
|
15
17
|
// add the tags here
|
|
16
18
|
]
|
|
17
|
-
}))
|
|
18
|
-
title: "api",
|
|
19
|
-
version: "X",
|
|
20
|
-
pageTitle: "api"
|
|
21
|
-
})))));
|
|
19
|
+
})), _ => tsplus_module_1.orDie(writeTextFile("./openapi.json", JSON.stringify(_, undefined, 2)))), () => tsplus_module_1.logInfo("OpenAPI spec written to './openapi.json'"));
|
|
22
20
|
}
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVEb2NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvd3JpdGVEb2NzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUE7QUFDdEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFDQUFxQyxDQUFBO0FBQ25FLE9BQU8sS0FBSyxNQUFNLE1BQU0saURBQWlELENBQUE7QUFDekUsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFHaEUsTUFBTSxVQUFVLGdCQUFnQixDQUFDLE1BQTBEO0lBQ3pGLE9BQU8sd0JBQUEsd0JBQUEsb0JBQUEsZ0JBQWdCLENBQ3JCLHlCQUNZLDZCQUF1QixDQUFDLENBQXFCLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLHlCQUFDLEVBRHJFLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQW1DLENBQUMsQ0FDM0MsRUFDdEUsTUFBTSxDQUFDLElBQUksQ0FBQztRQUNWLEtBQUssRUFBRSxLQUFLO1FBQ1osT0FBTyxFQUFFLEdBQUc7UUFDWixTQUFTLEVBQUUsS0FBSztLQUNqQixDQUFDLENBQ0gsRUFDTSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDVCxHQUFHLENBQUM7UUFDSixJQUFJLEVBQUU7UUFDSixvQkFBb0I7U0FDckI7S0FDRixDQUFDLENBQUMsRUFDTSxDQUFDLENBQUMsRUFBRSx1QkFBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQU0sQ0FBQyxFQUM1RSxHQUFHLEVBQUUsQ0FBQyx3QkFBZSwwQ0FBMEMsQ0FBQyxDQUFDLENBQUE7QUFDOUUsQ0FBQyJ9
|
package/dist/errorReporter.js
CHANGED
|
@@ -1,20 +1,18 @@
|
|
|
1
|
-
import * as tracer_1 from "@effect/io/Debug";
|
|
2
|
-
const fileName_1 = "packages/infra/_src/errorReporter.ts";
|
|
3
1
|
import * as tsplus_module_1 from "@effect/io/Cause";
|
|
4
2
|
import * as tsplus_module_2 from "@effect-app/prelude/utils";
|
|
5
3
|
import * as tsplus_module_3 from "@effect/io/Effect";
|
|
6
4
|
import * as Sentry from "@sentry/node";
|
|
7
5
|
export function reportError(makeError) {
|
|
8
|
-
return (cause, context) =>
|
|
6
|
+
return (cause, context) => tsplus_module_3.gen(function* ($) {
|
|
9
7
|
if (tsplus_module_1.isInterrupted(cause)) {
|
|
10
|
-
yield* $(
|
|
8
|
+
yield* $(tsplus_module_3.logDebug("Interrupted: " + (context ? tsplus_module_2.RecordPretty(tsplus_module_2.object$(context)) : "")));
|
|
11
9
|
return;
|
|
12
10
|
}
|
|
13
11
|
const error = makeError(cause);
|
|
14
12
|
const extras = { context, error: error.toJSON() };
|
|
15
13
|
reportSentry(error, extras);
|
|
16
|
-
yield* $(
|
|
17
|
-
})
|
|
14
|
+
yield* $(tsplus_module_3.logAnnotate(tsplus_module_3.logErrorCause(cause), "extras", JSON.stringify({ context, error: { _tag: error._tag, message: error.message } })));
|
|
15
|
+
});
|
|
18
16
|
}
|
|
19
17
|
function reportSentry(error, extras) {
|
|
20
18
|
const scope = new Sentry.Scope();
|
|
@@ -22,14 +20,14 @@ function reportSentry(error, extras) {
|
|
|
22
20
|
Sentry.captureException(error, scope);
|
|
23
21
|
}
|
|
24
22
|
export function logError(makeError) {
|
|
25
|
-
return (cause, context) =>
|
|
23
|
+
return (cause, context) => tsplus_module_3.gen(function* ($) {
|
|
26
24
|
if (tsplus_module_1.isInterrupted(cause)) {
|
|
27
|
-
yield* $(
|
|
25
|
+
yield* $(tsplus_module_3.logDebug("Interrupted: " + (context ? tsplus_module_2.RecordPretty(tsplus_module_2.object$(context)) : "")));
|
|
28
26
|
return;
|
|
29
27
|
}
|
|
30
28
|
const error = makeError(cause);
|
|
31
|
-
yield* $(
|
|
32
|
-
})
|
|
29
|
+
yield* $(tsplus_module_3.logAnnotate(tsplus_module_3.logWarningCause(cause), "extras", JSON.stringify({ context, error: { _tag: error._tag, message: error.message } })));
|
|
30
|
+
});
|
|
33
31
|
}
|
|
34
32
|
export function captureException(error) {
|
|
35
33
|
Sentry.captureException(error);
|
|
@@ -40,6 +38,6 @@ export function reportMessage(message) {
|
|
|
40
38
|
console.warn(message);
|
|
41
39
|
}
|
|
42
40
|
export function reportMessageM(message) {
|
|
43
|
-
return
|
|
41
|
+
return tsplus_module_3.sync(() => reportMessage(message));
|
|
44
42
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxPQUFPLEtBQUssTUFBTSxNQUFNLGNBQWMsQ0FBQTtBQUd0QyxNQUFNLFVBQVUsV0FBVyxDQUN6QixTQUFrQztJQUVsQyxPQUFPLENBQUMsS0FBZSxFQUFFLE9BQWlDLEVBQUUsRUFBRSxDQUM1RCxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFO1lBQ3pCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx5QkFBZ0IsZUFBZSxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsc0RBQUMsT0FBTyxHQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDL0UsT0FBTTtTQUNQO1FBQ0QsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlCLE1BQU0sTUFBTSxHQUFHLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQTtRQUNqRCxZQUFZLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQzNCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDTiwwREFBQSxLQUFLLEdBQ0gsUUFBUSxFQUNSLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQ2pGLENBQ0YsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQztBQUVELFNBQVMsWUFBWSxDQUFDLEtBQWMsRUFBRSxNQUErQjtJQUNuRSxNQUFNLEtBQUssR0FBRyxJQUFJLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUNoQyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUE7QUFDdkMsQ0FBQztBQUVELE1BQU0sVUFBVSxRQUFRLENBQ3RCLFNBQWtDO0lBRWxDLE9BQU8sQ0FBQyxLQUFlLEVBQUUsT0FBaUMsRUFBRSxFQUFFLENBQzVELG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDcEIsSUFBSSw4QkFBQSxLQUFLLENBQWdCLEVBQUU7WUFDekIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLHlCQUFnQixlQUFlLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxzREFBQyxPQUFPLEdBQVcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUMvRSxPQUFNO1NBQ1A7UUFDRCxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDOUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNOLDREQUFBLEtBQUssR0FDSCxRQUFRLEVBQ1IsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FDakYsQ0FDRixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLEtBQWM7SUFDN0MsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsT0FBZTtJQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBRTlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZTtJQUM1QyxPQUFPLDJCQUFPLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFBO0FBQ3ZDLENBQUMifQ==
|
package/dist/errors.js
CHANGED
|
@@ -41,7 +41,7 @@ export class CauseException extends Error {
|
|
|
41
41
|
super(`An unexpected ${_tag} Exception occurred, see \`pretty\` for details.`);
|
|
42
42
|
this.exitCause = exitCause;
|
|
43
43
|
this._tag = _tag;
|
|
44
|
-
this.pretty = tsplus_module_1.pretty(
|
|
44
|
+
this.pretty = tsplus_module_1.pretty(exitCause);
|
|
45
45
|
}
|
|
46
46
|
toJSON() {
|
|
47
47
|
return {
|
|
@@ -62,4 +62,4 @@ export class OptimisticConcurrencyException {
|
|
|
62
62
|
this.message = `Existing ${type} ${id} record changed`;
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQU0sT0FBTyxhQUFhO0lBR3hCLFlBQVksSUFBTyxFQUFFLEVBQVU7UUFGZixTQUFJLEdBQUcsZUFBZSxDQUFBO1FBR3BDLElBQUksQ0FBQyxPQUFPLEdBQUcsZUFBZSxJQUFJLElBQUksRUFBRSxFQUFFLENBQUE7SUFDNUMsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLGVBQWU7SUFFMUIsWUFBNEIsTUFBOEI7UUFBOUIsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFEMUMsU0FBSSxHQUFHLGlCQUFpQixDQUFBO0lBQ3FCLENBQUM7Q0FDL0Q7QUFFRCxNQUFNLE9BQU8sZ0JBQWdCO0lBQTdCO1FBQ2tCLFNBQUksR0FBRyxrQkFBa0IsQ0FBQTtJQUMzQyxDQUFDO0NBQUE7QUFFRCxNQUFNLE9BQU8saUJBQWlCO0lBQTlCO1FBQ2tCLFNBQUksR0FBRyxtQkFBbUIsQ0FBQTtJQUM1QyxDQUFDO0NBQUE7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBTyxVQUFXLFNBQVEsZ0JBQWdCO0lBQzlDLFlBQXFCLE9BQWU7UUFDbEMsS0FBSyxFQUFFLENBQUE7UUFEWSxZQUFPLEdBQVAsT0FBTyxDQUFRO0lBRXBDLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyxpQkFBaUI7SUFFNUIsWUFBNEIsT0FBZTtRQUFmLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFEM0IsU0FBSSxHQUFHLG1CQUFtQixDQUFBO0lBQ0ksQ0FBQztDQUNoRDtBQUVELE1BQU0sT0FBTyxjQUFrQixTQUFRLEtBQUs7SUFFMUMsWUFBcUIsU0FBbUIsRUFBVyxJQUFZO1FBQzdELEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxrREFBa0QsQ0FBQyxDQUFBO1FBRDNELGNBQVMsR0FBVCxTQUFTLENBQVU7UUFBVyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBRTdELElBQUksQ0FBQyxNQUFNLDBCQUFHLFNBQVMsQ0FBTyxDQUFBO0lBQ2hDLENBQUM7SUFFRCxNQUFNO1FBQ0osT0FBTztZQUNMLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtZQUNmLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztZQUNyQixNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07WUFDbkIsMkRBQTJEO1NBQzVELENBQUE7SUFDSCxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sOEJBQThCO0lBR3pDLFlBQXFCLElBQVksRUFBVyxFQUFVLEVBQVcsT0FBZ0IsRUFBVyxLQUFjO1FBQXJGLFNBQUksR0FBSixJQUFJLENBQVE7UUFBVyxPQUFFLEdBQUYsRUFBRSxDQUFRO1FBQVcsWUFBTyxHQUFQLE9BQU8sQ0FBUztRQUFXLFVBQUssR0FBTCxLQUFLLENBQVM7UUFGakcsU0FBSSxHQUFHLGdDQUFnQyxDQUFBO1FBRzlDLElBQUksQ0FBQyxPQUFPLEdBQUcsWUFBWSxJQUFJLElBQUksRUFBRSxpQkFBaUIsQ0FBQTtJQUN4RCxDQUFDO0NBQ0YifQ==
|
package/dist/instrument.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import * as tracer_1 from "@effect/io/Debug";
|
|
2
|
-
const fileName_1 = "packages/infra/_src/instrument.ts";
|
|
3
1
|
import * as tsplus_module_1 from "@effect-app/prelude/utils";
|
|
4
2
|
import * as tsplus_module_2 from "@effect/io/Effect";
|
|
5
3
|
/**
|
|
6
4
|
* @tsplus fluent effect/io/Effect instrument
|
|
7
5
|
*/
|
|
8
6
|
export function instr(self, name, properties) {
|
|
9
|
-
return
|
|
7
|
+
return tsplus_module_2.logSpan(tsplus_module_2.tap(self, () => tsplus_module_2.logAnnotate(tsplus_module_2.logDebug(`instrumented`), "properties", tsplus_module_1.RecordPretty(tsplus_module_1.object$((properties || {}))))), name);
|
|
10
8
|
// trackMetric(name, time, properties))
|
|
11
9
|
}
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvaW5zdHJ1bWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBOztHQUVHO0FBQ0gsTUFBTSxVQUFVLEtBQUssQ0FBVSxJQUFxQixFQUFFLElBQVksRUFBRSxVQUFtQztJQUNyRyxPQUFPLHdCQUFBLG9CQUFBLElBQUksRUFDSixHQUFHLEVBQUUsQ0FBQyw0QkFBQSx5QkFBZ0IsY0FBYyxDQUFDLEVBQWEsWUFBWSx1REFBRSxDQUFDLFVBQVUsSUFBSSxFQUFFLENBQUMsR0FBVyxDQUFDLEVBQzFGLElBQUksQ0FBQyxDQUFBO0lBQ2hCLHVDQUF1QztBQUN6QyxDQUFDIn0=
|
package/dist/rateLimit.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import * as tracer_1 from "@effect/io/Debug";
|
|
2
|
-
const fileName_1 = "packages/infra/_src/rateLimit.ts";
|
|
3
1
|
import * as tsplus_module_1 from "@effect/io/Effect";
|
|
4
|
-
import * as tsplus_module_2 from "@effect-app/core/
|
|
5
|
-
import * as tsplus_module_3 from "@effect-app/core/
|
|
2
|
+
import * as tsplus_module_2 from "@effect-app/core/Effect";
|
|
3
|
+
import * as tsplus_module_3 from "@effect-app/core/Array";
|
|
6
4
|
// /**
|
|
7
5
|
// * Executes the specified effect, acquiring the specified number of permits
|
|
8
6
|
// * immediately before the effect begins execution and releasing them
|
|
@@ -38,7 +36,7 @@ import * as tsplus_module_3 from "@effect-app/core/Effect";
|
|
|
38
36
|
*/
|
|
39
37
|
export function SEM_withPermitsDuration(permits, duration) {
|
|
40
38
|
return (self) => {
|
|
41
|
-
return effect =>
|
|
39
|
+
return effect => tsplus_module_1.uninterruptibleMask(restore => tsplus_module_2.EffectZipRight(tsplus_module_1.ensuring(restore(effect), tsplus_module_1.delay(self.release(permits), duration)))(restore(self.take(permits))));
|
|
42
40
|
};
|
|
43
41
|
}
|
|
44
42
|
/**
|
|
@@ -46,14 +44,14 @@ export function SEM_withPermitsDuration(permits, duration) {
|
|
|
46
44
|
* @tsplus static Collection.Aspects batchNPar
|
|
47
45
|
*/
|
|
48
46
|
export function batchNPar(n, forEachItem, forEachBatch) {
|
|
49
|
-
return (items) =>
|
|
47
|
+
return (items) => tsplus_module_3.ext_forEachParWithIndex(tsplus_module_3.chunk_(items, n), (_, i) => tsplus_module_1.flatMap(tsplus_module_1.forEachParWithIndex(_, (_, j) => forEachItem(_, j, i)), _ => forEachBatch(_, i)));
|
|
50
48
|
}
|
|
51
49
|
/**
|
|
52
50
|
* @tsplus pipeable Iterable batch
|
|
53
51
|
* @tsplus static Collection.Aspects batch
|
|
54
52
|
*/
|
|
55
53
|
export function batch(n, forEachItem, forEachBatch) {
|
|
56
|
-
return (items) =>
|
|
54
|
+
return (items) => tsplus_module_3.ext_forEachWithIndex(tsplus_module_3.chunk_(items, n), (_, i) => tsplus_module_1.flatMap(tsplus_module_1.forEachParWithIndex(_, (_, j) => forEachItem(_, j, i)), _ => forEachBatch(_, i)));
|
|
57
55
|
}
|
|
58
56
|
// /**
|
|
59
57
|
// * @tsplus pipeable Iterable rateLimit
|
|
@@ -79,6 +77,6 @@ export function batch(n, forEachItem, forEachBatch) {
|
|
|
79
77
|
* @tsplus static Collection.Aspects naiveRateLimit
|
|
80
78
|
*/
|
|
81
79
|
export function naiveRateLimit(n, d) {
|
|
82
|
-
return (items) => ((forEachItem, forEachBatch) =>
|
|
80
|
+
return (items) => ((forEachItem, forEachBatch) => tsplus_module_3.ext_forEachWithIndex(tsplus_module_3.chunk_(items, n), (batch, i) => tsplus_module_1.zipRight(((i === 0) ? tsplus_module_2.unit : tsplus_module_1.delay(tsplus_module_2.unit, d)), tsplus_module_1.flatMap(tsplus_module_1.withParallelism(tsplus_module_3.ext_forEachEffectPar(batch, forEachItem), n), forEachBatch))));
|
|
83
81
|
}
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmF0ZUxpbWl0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9yYXRlTGltaXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsTUFBTTtBQUNOLDhFQUE4RTtBQUM5RSx1RUFBdUU7QUFDdkUsbUZBQW1GO0FBQ25GLCtCQUErQjtBQUMvQixLQUFLO0FBQ0wsa0VBQWtFO0FBQ2xFLGdFQUFnRTtBQUNoRSxNQUFNO0FBQ04sd0VBQXdFO0FBQ3hFLDBGQUEwRjtBQUMxRix1QkFBdUI7QUFDdkIsb0NBQW9DO0FBQ3BDLHFCQUFxQjtBQUNyQixtREFBbUQ7QUFDbkQsZ0NBQWdDO0FBQ2hDLDJCQUEyQjtBQUMzQix5Q0FBeUM7QUFDekMsNEJBQTRCO0FBQzVCLHFDQUFxQztBQUNyQyxrQkFBa0I7QUFDbEIsVUFBVTtBQUNWLE1BQU07QUFDTixJQUFJO0FBRUo7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQUMsT0FBZSxFQUFFLFFBQWE7SUFDcEUsT0FBTyxDQUFDLElBQWUsRUFBeUQsRUFBRTtRQUNoRixPQUFPLE1BQU0sQ0FBQyxFQUFFLENBQ2Qsb0NBQ0UsT0FBTyxDQUFDLEVBQUUsZ0NBRUoseUJBQUEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUViLHNCQUFBLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQ1osUUFBUSxDQUFDLENBQ25CLEVBTEwsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FLdEIsQ0FDUixDQUFBO0lBQ0wsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sVUFBVSxTQUFTLENBQ3ZCLENBQVMsRUFDVCxXQUEwRSxFQUMxRSxZQUE0RDtJQUU1RCxPQUFPLENBQUMsS0FBa0IsRUFBRSxFQUFFLENBQzVCLHdDQUFBLHVCQUFBLEtBQUssRUFBTyxDQUFDLENBQUMsRUFDZSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNsQyx3QkFBQSxvQ0FBQSxDQUFDLEVBQXFCLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFDMUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQ3BDLENBQUE7QUFDUCxDQUFDO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxVQUFVLEtBQUssQ0FDbkIsQ0FBUyxFQUNULFdBQStFLEVBQy9FLFlBQTREO0lBRTVELE9BQU8sQ0FBQyxLQUFrQixFQUFFLEVBQUUsQ0FDNUIscUNBQUEsdUJBQUEsS0FBSyxFQUFPLENBQUMsQ0FBQyxFQUNZLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQy9CLHdCQUFBLG9DQUFBLENBQUMsRUFBcUIsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxXQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUMxQyxDQUFDLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FDcEMsQ0FBQTtBQUNQLENBQUM7QUFFRCxNQUFNO0FBQ04seUNBQXlDO0FBQ3pDLGlEQUFpRDtBQUNqRCxNQUFNO0FBQ04sNkJBQTZCO0FBQzdCLGVBQWU7QUFDZixXQUFXO0FBQ1gsTUFBTTtBQUNOLHNDQUFzQztBQUN0Qyw2QkFBNkI7QUFDN0IsZ0RBQWdEO0FBQ2hELDBEQUEwRDtBQUMxRCxXQUFXO0FBQ1gscUNBQXFDO0FBQ3JDLHNCQUFzQjtBQUN0Qix3Q0FBd0M7QUFDeEMsbUZBQW1GO0FBQ25GLHNCQUFzQjtBQUN0QixJQUFJO0FBRUo7OztHQUdHO0FBRUgsTUFBTSxVQUFVLGNBQWMsQ0FDNUIsQ0FBUyxFQUNULENBQU07SUFFTixPQUFPLENBQUksS0FBa0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUNqQyxXQUFzQyxFQUN0QyxZQUFpRCxFQUNqRCxFQUFFLENBQ0YscUNBQUEsdUJBQUEsS0FBSyxFQUFPLENBQUMsQ0FBQyxFQUNZLENBQUMsS0FBSyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQ25DLHlCQUFBLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxzQkFBYSxDQUFDLENBQUMsNENBQWtCLENBQUMsQ0FBQyxDQUFDLEVBRTVDLHdCQUFBLGdDQUFBLHFDQUFBLEtBQUssRUFBa0IsV0FBVyxDQUFDLEVBQ2hCLENBQUMsQ0FBQyxFQUNWLFlBQVksQ0FBQyxDQUN6QixDQUNKLENBQUMsQ0FBQTtBQUNSLENBQUMifQ==
|
|
@@ -1,27 +1,24 @@
|
|
|
1
|
-
import * as tracer_1 from "@effect/io/Debug";
|
|
2
|
-
const fileName_1 = "packages/infra/_src/services/Emailer/Sendgrid.ts";
|
|
3
1
|
import * as tsplus_module_1 from "@effect/io/Config/Secret";
|
|
4
2
|
import * as tsplus_module_2 from "@effect/io/Effect";
|
|
5
|
-
import * as tsplus_module_3 from "@
|
|
6
|
-
import * as tsplus_module_4 from "@
|
|
7
|
-
import * as tsplus_module_5 from "@effect-app/core/
|
|
8
|
-
import * as tsplus_module_6 from "@effect-app/core/Array";
|
|
3
|
+
import * as tsplus_module_3 from "@fp-ts/core/typeclass/Equivalence";
|
|
4
|
+
import * as tsplus_module_4 from "@effect-app/core/_ext/ord.ext";
|
|
5
|
+
import * as tsplus_module_5 from "@effect-app/core/Array";
|
|
9
6
|
import sgMail from "@sendgrid/mail";
|
|
10
7
|
import { inspect } from "util";
|
|
11
8
|
import { Emailer } from "./service.js";
|
|
12
|
-
const makeLiveSendgrid = ({ apiKey, defaultFrom, realMail, subjectPrefix }) =>
|
|
9
|
+
const makeLiveSendgrid = ({ apiKey, defaultFrom, realMail, subjectPrefix }) => tsplus_module_2.sync(() => {
|
|
13
10
|
sgMail.setApiKey(tsplus_module_1.value(apiKey));
|
|
14
11
|
return {
|
|
15
12
|
sendMail(msg_) {
|
|
16
|
-
return
|
|
13
|
+
return tsplus_module_2.gen(function* ($) {
|
|
17
14
|
const msg = { ...msg_, from: msg_.from ?? defaultFrom };
|
|
18
15
|
const render = renderMessage(!realMail);
|
|
19
16
|
const renderedMsg_ = render(msg);
|
|
20
17
|
const renderedMsg = { ...renderedMsg_, subject: `${subjectPrefix}${renderedMsg_.subject}` };
|
|
21
|
-
yield* $(
|
|
22
|
-
const ret = yield* $(
|
|
23
|
-
cb(
|
|
24
|
-
cb(
|
|
18
|
+
yield* $(tsplus_module_2.logAnnotate(tsplus_module_2.logDebug("Sending email"), "msg", inspect(renderedMsg, false, 5)));
|
|
19
|
+
const ret = yield* $(tsplus_module_2.async(cb => void sgMail.send(renderedMsg, false, (err, result) => err ?
|
|
20
|
+
cb(tsplus_module_2.fail(err)) :
|
|
21
|
+
cb(tsplus_module_2.sync(() => result)))));
|
|
25
22
|
// const event = {
|
|
26
23
|
// name: "EmailSent",
|
|
27
24
|
// properties: {
|
|
@@ -32,19 +29,15 @@ const makeLiveSendgrid = ({ apiKey, defaultFrom, realMail, subjectPrefix }) => t
|
|
|
32
29
|
// const { trackEvent } = yield* $(AiContextService.access)
|
|
33
30
|
// trackEvent(event)
|
|
34
31
|
return ret;
|
|
35
|
-
})
|
|
32
|
+
});
|
|
36
33
|
}
|
|
37
34
|
};
|
|
38
|
-
})
|
|
39
|
-
/**
|
|
40
|
-
* @tsplus static Emailer.Ops LiveSendgrid
|
|
41
|
-
*/
|
|
42
|
-
);
|
|
35
|
+
});
|
|
43
36
|
/**
|
|
44
37
|
* @tsplus static Emailer.Ops LiveSendgrid
|
|
45
38
|
*/
|
|
46
39
|
export function LiveSendgrid(config) {
|
|
47
|
-
return
|
|
40
|
+
return tsplus_module_2.toLayer(tsplus_module_2.flatMap(tsplus_module_2.config(config), makeLiveSendgrid), Emailer);
|
|
48
41
|
}
|
|
49
42
|
/**
|
|
50
43
|
* @hidden
|
|
@@ -81,12 +74,12 @@ function renderFake(addr, makeId) {
|
|
|
81
74
|
email: `test+${makeId()}@nomizz.com`
|
|
82
75
|
};
|
|
83
76
|
}
|
|
84
|
-
const eq =
|
|
77
|
+
const eq = tsplus_module_3.contramap((to) => typeof to === "string" ? to.toLowerCase() : to.email.toLowerCase())(tsplus_module_3.string);
|
|
85
78
|
// TODO: should just not add any already added email address
|
|
86
79
|
// https://stackoverflow.com/a/53603076/11595834
|
|
87
80
|
function renderFakeIfTest(addr, makeId) {
|
|
88
81
|
return Array.isArray(addr)
|
|
89
|
-
?
|
|
82
|
+
? tsplus_module_5.iterableToArray(tsplus_module_4.uniqArray(eq)(addr
|
|
90
83
|
.map(x => (isTestAddress(x) ? renderFake(x, makeId) : x)))) : isTestAddress(addr)
|
|
91
84
|
? renderFake(addr, makeId)
|
|
92
85
|
: addr;
|
|
@@ -100,4 +93,4 @@ function renderMailData(md) {
|
|
|
100
93
|
}
|
|
101
94
|
return md.email;
|
|
102
95
|
}
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VuZGdyaWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL0VtYWlsZXIvU2VuZGdyaWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSxPQUFPLE1BQU0sTUFBTSxnQkFBZ0IsQ0FBQTtBQUNuQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQzlCLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFHdEMsTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFrQixFQUFFLEVBQUUsQ0FDNUYscUJBQU8sR0FBRyxFQUFFO0lBQ1YsTUFBTSxDQUFDLFNBQVMsdUJBQUMsTUFBTSxFQUFPLENBQUE7SUFFOUIsT0FBTztRQUNMLFFBQVEsQ0FBQyxJQUEwQjtZQUNqQyxPQUFPLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7Z0JBQzNCLE1BQU0sR0FBRyxHQUFHLEVBQUUsR0FBRyxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLElBQUksV0FBVyxFQUFFLENBQUE7Z0JBQ3ZELE1BQU0sTUFBTSxHQUFHLGFBQWEsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFBO2dCQUV2QyxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hDLE1BQU0sV0FBVyxHQUFHLEVBQUUsR0FBRyxZQUFZLEVBQUUsT0FBTyxFQUFFLEdBQUcsYUFBYSxHQUFHLFlBQVksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFBO2dCQUMzRixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsNEJBQUEseUJBQWdCLGVBQWUsQ0FBQyxFQUFhLEtBQUssRUFBRSxPQUFPLENBQUMsV0FBVyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBRTdGLE1BQU0sR0FBRyxHQUFHLEtBQUss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
|