@effect-app/infra 0.84.0 → 0.85.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -7
- package/_cjs/_ext/Array.cjs +3 -2
- package/_cjs/_ext/Array.cjs.map +1 -1
- package/_cjs/api/defaultErrorHandler.cjs +11 -10
- package/_cjs/api/defaultErrorHandler.cjs.map +1 -1
- package/_cjs/api/express/makeJsonSchema.cjs +3 -2
- package/_cjs/api/express/makeJsonSchema.cjs.map +1 -1
- package/_cjs/api/express/makeJsonSchema.test.cjs +2 -2
- package/_cjs/api/express/makeJsonSchema.test.cjs.map +1 -1
- package/_cjs/api/express/makeOpenApiSpecs.cjs +6 -4
- package/_cjs/api/express/makeOpenApiSpecs.cjs.map +1 -1
- package/_cjs/api/express/schema/requestHandler.cjs +25 -23
- package/_cjs/api/express/schema/requestHandler.cjs.map +1 -1
- package/_cjs/api/express/schema/routing.cjs +22 -20
- package/_cjs/api/express/schema/routing.cjs.map +1 -1
- package/_cjs/api/reportError.cjs +2 -2
- package/_cjs/api/routing.cjs +56 -53
- package/_cjs/api/routing.cjs.map +1 -1
- package/_cjs/api/setupRequest.cjs +3 -2
- package/_cjs/api/setupRequest.cjs.map +1 -1
- package/_cjs/api/writeDocs.cjs +6 -4
- package/_cjs/api/writeDocs.cjs.map +1 -1
- package/_cjs/errorReporter.cjs +12 -11
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/errors.cjs +8 -8
- package/_cjs/errors.cjs.map +1 -1
- package/_cjs/instrument.cjs +2 -1
- package/_cjs/instrument.cjs.map +1 -1
- package/_cjs/logger/jsonLogger.cjs +11 -10
- package/_cjs/logger/jsonLogger.cjs.map +1 -1
- package/_cjs/logger/logFmtLogger.cjs +5 -5
- package/_cjs/logger/logFmtLogger.cjs.map +1 -1
- package/_cjs/logger/shared.cjs +4 -4
- package/_cjs/logger/shared.cjs.map +1 -1
- package/_cjs/rateLimit.cjs +8 -7
- package/_cjs/rateLimit.cjs.map +1 -1
- package/_cjs/services/Emailer/Sendgrid.cjs +14 -12
- package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
- package/_cjs/services/Emailer/fake.cjs +5 -4
- package/_cjs/services/Emailer/fake.cjs.map +1 -1
- package/_cjs/services/Operations/live.cjs +31 -29
- package/_cjs/services/Operations/live.cjs.map +1 -1
- package/_cjs/services/Operations/service.cjs +6 -5
- package/_cjs/services/Operations/service.cjs.map +1 -1
- package/_cjs/services/QueueMaker/errors.cjs +7 -6
- package/_cjs/services/QueueMaker/errors.cjs.map +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs +18 -17
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs +16 -15
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/_cjs/services/Repository.cjs +17 -16
- package/_cjs/services/Repository.cjs.map +1 -1
- package/_cjs/services/RepositoryBase.cjs +35 -33
- package/_cjs/services/RepositoryBase.cjs.map +1 -1
- package/_cjs/services/RequestContextContainer.cjs +12 -10
- package/_cjs/services/RequestContextContainer.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos.cjs +49 -46
- package/_cjs/services/Store/Cosmos.cjs.map +1 -1
- package/_cjs/services/Store/Disk.cjs +19 -18
- package/_cjs/services/Store/Disk.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs +43 -39
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_cjs/services/Store/Redis.cjs +16 -14
- 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 -6
- package/_cjs/services/Store/index.cjs.map +1 -1
- package/_cjs/services/Store/service.cjs +1 -1
- package/_cjs/services/Store/service.cjs.map +1 -1
- package/_cjs/services/Store/utils.cjs +13 -13
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/_cjs/services/simpledb/cosmosdb.cjs +19 -17
- package/_cjs/services/simpledb/cosmosdb.cjs.map +1 -1
- package/_cjs/services/simpledb/diskdb.cjs +9 -8
- package/_cjs/services/simpledb/diskdb.cjs.map +1 -1
- package/_cjs/services/simpledb/memdb.cjs +11 -9
- package/_cjs/services/simpledb/memdb.cjs.map +1 -1
- package/_cjs/services/simpledb/mongodb.cjs +20 -18
- package/_cjs/services/simpledb/mongodb.cjs.map +1 -1
- package/_cjs/services/simpledb/redisdb.cjs +11 -10
- package/_cjs/services/simpledb/redisdb.cjs.map +1 -1
- package/_cjs/services/simpledb/shared.cjs +5 -5
- package/_cjs/services/simpledb/shared.cjs.map +1 -1
- package/_cjs/services/simpledb/simpledb.cjs +18 -17
- package/_cjs/services/simpledb/simpledb.cjs.map +1 -1
- package/_src/api/authorization.jwt.ts +1 -1
- package/_src/api/defaultErrorHandler.ts +2 -2
- package/_src/api/express/routing.ts.bak +8 -8
- package/_src/api/express/schema/requestHandler.ts +12 -12
- package/_src/api/express/schema/routing.ts +11 -11
- package/_src/api/routing.ts +14 -13
- package/_src/errorReporter.ts +1 -1
- package/_src/services/Emailer/Sendgrid.ts +1 -1
- package/_src/services/Operations/live.ts +5 -5
- package/_src/services/QueueMaker/errors.ts +1 -1
- package/_src/services/QueueMaker/memQueue.ts +2 -2
- package/_src/services/QueueMaker/sbqueue.ts +1 -1
- package/_src/services/Repository.ts +9 -9
- package/_src/services/RepositoryBase.ts +8 -6
- package/_src/services/RequestContextContainer.ts +1 -1
- package/_src/services/Store/Cosmos.ts +17 -12
- package/_src/services/Store/Disk.ts +4 -4
- package/_src/services/Store/Memory.ts +4 -4
- package/_src/services/Store/Redis.ts +1 -1
- package/_src/services/Store/index.test.ts.bak +5 -5
- package/_src/services/Store/index.ts +1 -1
- package/_src/services/Store/utils.ts +16 -16
- package/_src/services/simpledb/diskdb.ts +1 -1
- package/_src/services/simpledb/memdb.ts +1 -1
- package/_src/services/simpledb/redisdb.ts +1 -1
- package/_src/services/simpledb/shared.ts +1 -1
- package/_src/services/simpledb/simpledb.ts +3 -3
- package/dist/RequestContext.d.ts +20 -20
- package/dist/_ext/Array.d.ts +1 -1
- package/dist/_ext/Array.d.ts.map +1 -1
- package/dist/_ext/Array.js +4 -3
- package/dist/api/codec.d.ts +1 -1
- package/dist/api/codec.d.ts.map +1 -1
- package/dist/api/defaultErrorHandler.d.ts +2 -2
- package/dist/api/defaultErrorHandler.d.ts.map +1 -1
- package/dist/api/defaultErrorHandler.js +13 -11
- package/dist/api/express/makeJsonSchema.d.ts +2 -2
- package/dist/api/express/makeJsonSchema.d.ts.map +1 -1
- package/dist/api/express/makeJsonSchema.js +4 -3
- package/dist/api/express/makeOpenApiSpecs.d.ts +1 -1
- package/dist/api/express/makeOpenApiSpecs.js +7 -5
- package/dist/api/express/schema/requestHandler.d.ts +8 -8
- package/dist/api/express/schema/requestHandler.d.ts.map +1 -1
- package/dist/api/express/schema/requestHandler.js +36 -34
- package/dist/api/express/schema/routing.d.ts +2 -2
- package/dist/api/express/schema/routing.js +23 -21
- package/dist/api/reportError.d.ts +5 -5
- package/dist/api/reportError.d.ts.map +1 -1
- package/dist/api/reportError.js +2 -2
- package/dist/api/routing.d.ts +6 -6
- package/dist/api/routing.d.ts.map +1 -1
- package/dist/api/routing.js +60 -57
- package/dist/api/setupRequest.d.ts +2 -2
- package/dist/api/setupRequest.d.ts.map +1 -1
- package/dist/api/setupRequest.js +4 -3
- package/dist/api/writeDocs.d.ts +1 -1
- package/dist/api/writeDocs.d.ts.map +1 -1
- package/dist/api/writeDocs.js +7 -5
- package/dist/errorReporter.d.ts +3 -3
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +13 -12
- package/dist/errors.d.ts +7 -7
- package/dist/errors.js +9 -9
- package/dist/instrument.d.ts +1 -1
- package/dist/instrument.d.ts.map +1 -1
- package/dist/instrument.js +3 -2
- package/dist/logger/jsonLogger.d.ts +2 -2
- package/dist/logger/jsonLogger.d.ts.map +1 -1
- package/dist/logger/jsonLogger.js +12 -11
- package/dist/logger/logFmtLogger.d.ts +2 -2
- package/dist/logger/logFmtLogger.d.ts.map +1 -1
- package/dist/logger/logFmtLogger.js +6 -6
- package/dist/logger/shared.d.ts +1 -1
- package/dist/logger/shared.d.ts.map +1 -1
- package/dist/logger/shared.js +5 -5
- package/dist/rateLimit.d.ts +3 -3
- package/dist/rateLimit.d.ts.map +1 -1
- package/dist/rateLimit.js +9 -8
- package/dist/services/Emailer/Sendgrid.d.ts +1 -1
- package/dist/services/Emailer/Sendgrid.d.ts.map +1 -1
- package/dist/services/Emailer/Sendgrid.js +17 -15
- package/dist/services/Emailer/fake.d.ts +1 -1
- package/dist/services/Emailer/fake.d.ts.map +1 -1
- package/dist/services/Emailer/fake.js +6 -5
- package/dist/services/Emailer/service.d.ts +4 -4
- package/dist/services/Operations/live.d.ts +1 -1
- package/dist/services/Operations/live.d.ts.map +1 -1
- package/dist/services/Operations/live.js +39 -37
- package/dist/services/Operations/service.d.ts +9 -9
- package/dist/services/Operations/service.d.ts.map +1 -1
- package/dist/services/Operations/service.js +13 -12
- package/dist/services/QueueMaker/errors.d.ts +3 -3
- package/dist/services/QueueMaker/errors.d.ts.map +1 -1
- package/dist/services/QueueMaker/errors.js +7 -6
- package/dist/services/QueueMaker/memQueue.d.ts +3 -3
- package/dist/services/QueueMaker/memQueue.js +17 -16
- package/dist/services/QueueMaker/sbqueue.d.ts +4 -4
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +16 -15
- package/dist/services/Repository.d.ts +31 -31
- package/dist/services/Repository.d.ts.map +1 -1
- package/dist/services/Repository.js +18 -17
- package/dist/services/RepositoryBase.d.ts +14 -15
- package/dist/services/RepositoryBase.d.ts.map +1 -1
- package/dist/services/RepositoryBase.js +37 -35
- package/dist/services/RequestContextContainer.d.ts +9 -9
- package/dist/services/RequestContextContainer.d.ts.map +1 -1
- package/dist/services/RequestContextContainer.js +15 -13
- package/dist/services/Store/Cosmos.d.ts +3 -3
- package/dist/services/Store/Cosmos.d.ts.map +1 -1
- package/dist/services/Store/Cosmos.js +54 -51
- package/dist/services/Store/Disk.d.ts +3 -3
- package/dist/services/Store/Disk.d.ts.map +1 -1
- package/dist/services/Store/Disk.js +20 -19
- package/dist/services/Store/Memory.d.ts +5 -5
- package/dist/services/Store/Memory.d.ts.map +1 -1
- package/dist/services/Store/Memory.js +45 -41
- package/dist/services/Store/Redis.d.ts +3 -3
- package/dist/services/Store/Redis.d.ts.map +1 -1
- package/dist/services/Store/Redis.js +17 -15
- package/dist/services/Store/index.d.ts +1 -1
- package/dist/services/Store/index.d.ts.map +1 -1
- package/dist/services/Store/index.js +8 -7
- package/dist/services/Store/service.d.ts +10 -10
- package/dist/services/Store/service.d.ts.map +1 -1
- package/dist/services/Store/service.js +2 -2
- package/dist/services/Store/utils.d.ts +3 -3
- package/dist/services/Store/utils.d.ts.map +1 -1
- package/dist/services/Store/utils.js +21 -21
- package/dist/services/simpledb/cosmosdb.d.ts +5 -5
- package/dist/services/simpledb/cosmosdb.js +19 -17
- package/dist/services/simpledb/diskdb.d.ts +4 -4
- package/dist/services/simpledb/diskdb.js +10 -9
- package/dist/services/simpledb/memdb.d.ts +4 -4
- package/dist/services/simpledb/memdb.js +13 -11
- package/dist/services/simpledb/mongodb.d.ts +5 -5
- package/dist/services/simpledb/mongodb.js +16 -14
- package/dist/services/simpledb/redisdb.d.ts +10 -10
- package/dist/services/simpledb/redisdb.js +12 -11
- package/dist/services/simpledb/shared.d.ts +13 -13
- package/dist/services/simpledb/shared.js +6 -6
- package/dist/services/simpledb/simpledb.d.ts +7 -7
- package/dist/services/simpledb/simpledb.d.ts.map +1 -1
- package/dist/services/simpledb/simpledb.js +16 -15
- package/package.json +8 -8
package/dist/api/routing.js
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "effect/FiberRef";
|
|
2
2
|
import * as tsplus_module_2 from "effect/Option";
|
|
3
|
-
import * as tsplus_module_3 from "effect/
|
|
4
|
-
import * as tsplus_module_4 from "
|
|
5
|
-
import * as tsplus_module_5 from "@effect-app/
|
|
6
|
-
import * as tsplus_module_6 from "
|
|
7
|
-
import * as tsplus_module_7 from "@effect-app/
|
|
8
|
-
import * as tsplus_module_8 from "@effect-app/
|
|
3
|
+
import * as tsplus_module_3 from "effect/Option.impl";
|
|
4
|
+
import * as tsplus_module_4 from "effect/Effect";
|
|
5
|
+
import * as tsplus_module_5 from "@effect-app/core/EffectX";
|
|
6
|
+
import * as tsplus_module_6 from "effect/Effect.impl";
|
|
7
|
+
import * as tsplus_module_7 from "@effect-app/schema/ext";
|
|
8
|
+
import * as tsplus_module_8 from "@effect-app/prelude/utils";
|
|
9
|
+
import * as tsplus_module_9 from "effect/FiberRef.impl";
|
|
10
|
+
import * as tsplus_module_10 from "@effect-app/core/OptionX";
|
|
11
|
+
import * as tsplus_module_11 from "@effect-app/infra/api/setupRequest";
|
|
9
12
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
10
13
|
import * as Ex from "@effect-app/infra-adapters/express";
|
|
11
14
|
import { RequestId } from "@effect-app/prelude/ids";
|
|
@@ -20,20 +23,20 @@ import { parseRequestParams } from "./express/schema/requestHandler.js";
|
|
|
20
23
|
import { makeRouteDescriptor } from "./express/schema/routing.js";
|
|
21
24
|
import { reportRequestError } from "./reportError.js";
|
|
22
25
|
import { snipString } from "./util.js";
|
|
23
|
-
export const RequestSettings = tsplus_module_1.unsafeMake({
|
|
26
|
+
export const RequestSettings = tsplus_module_1.FiberRef.unsafeMake({
|
|
24
27
|
verbose: false
|
|
25
28
|
});
|
|
26
29
|
export function makeRequestParsers(Request) {
|
|
27
|
-
const ph =
|
|
28
|
-
const parseHeaders = (u) =>
|
|
29
|
-
const pq =
|
|
30
|
-
const parseQuery = (u) =>
|
|
31
|
-
const pb =
|
|
32
|
-
const parseBody = (u) =>
|
|
33
|
-
const pp =
|
|
34
|
-
const parsePath = (u) =>
|
|
35
|
-
const pc =
|
|
36
|
-
const parseCookie = (u) =>
|
|
30
|
+
const ph = tsplus_module_4.Effect.sync(() => tsplus_module_3.map(tsplus_module_3.map(tsplus_module_3.map(tsplus_module_2.Option.fromNullable(Request.Headers), (s) => s), MO.Parser.for), MO.condemnFail));
|
|
31
|
+
const parseHeaders = (u) => tsplus_module_5.flatMapOption(ph, (d) => d(u));
|
|
32
|
+
const pq = tsplus_module_4.Effect.sync(() => tsplus_module_3.map(tsplus_module_3.map(tsplus_module_3.map(tsplus_module_2.Option.fromNullable(Request.Query), (s) => s), MO.Parser.for), MO.condemnFail));
|
|
33
|
+
const parseQuery = (u) => tsplus_module_5.flatMapOption(pq, (d) => d(u));
|
|
34
|
+
const pb = tsplus_module_4.Effect.sync(() => tsplus_module_3.map(tsplus_module_3.map(tsplus_module_3.map(tsplus_module_2.Option.fromNullable(Request.Body), (s) => s), MO.Parser.for), MO.condemnFail));
|
|
35
|
+
const parseBody = (u) => tsplus_module_5.flatMapOption(pb, (d) => d(u));
|
|
36
|
+
const pp = tsplus_module_4.Effect.sync(() => tsplus_module_3.map(tsplus_module_3.map(tsplus_module_3.map(tsplus_module_2.Option.fromNullable(Request.Path), (s) => s), MO.Parser.for), MO.condemnFail));
|
|
37
|
+
const parsePath = (u) => tsplus_module_5.flatMapOption(pp, (d) => d(u));
|
|
38
|
+
const pc = tsplus_module_4.Effect.sync(() => tsplus_module_3.map(tsplus_module_3.map(tsplus_module_3.map(tsplus_module_2.Option.fromNullable(Request.Cookie), (s) => s), MO.Parser.for), MO.condemnFail));
|
|
39
|
+
const parseCookie = (u) => tsplus_module_5.flatMapOption(pc, (d) => d(u));
|
|
37
40
|
return {
|
|
38
41
|
parseBody,
|
|
39
42
|
parseCookie,
|
|
@@ -49,11 +52,11 @@ export function match(requestHandler, errorHandler, middleware) {
|
|
|
49
52
|
requestHandler = handler;
|
|
50
53
|
makeMiddlewareContext = makeContext;
|
|
51
54
|
}
|
|
52
|
-
return
|
|
53
|
-
.match(requestHandler.Request.method.toLowerCase())(requestHandler.Request.path.split("?")[0], makeRequestHandler(requestHandler, errorHandler, makeMiddlewareContext)),
|
|
55
|
+
return tsplus_module_6.zipRight(Ex
|
|
56
|
+
.match(requestHandler.Request.method.toLowerCase())(requestHandler.Request.path.split("?")[0], makeRequestHandler(requestHandler, errorHandler, makeMiddlewareContext)), tsplus_module_4.Effect.sync(() => makeRouteDescriptor(requestHandler.Request.path, requestHandler.Request.method, requestHandler)));
|
|
54
57
|
}
|
|
55
58
|
export function respondSuccess(encodeResponse) {
|
|
56
|
-
return (req, res, a) =>
|
|
59
|
+
return (req, res, a) => tsplus_module_6.flatMap(tsplus_module_4.Effect.sync(() => encodeResponse(req)(a)), (r) => tsplus_module_4.Effect.sync(() => {
|
|
57
60
|
r === undefined
|
|
58
61
|
? res.status(204).send()
|
|
59
62
|
: res
|
|
@@ -72,7 +75,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
72
75
|
const parseRequest = parseRequestParams(requestParsers);
|
|
73
76
|
const respond = respondSuccess(encodeResponse);
|
|
74
77
|
function getParams(req) {
|
|
75
|
-
return
|
|
78
|
+
return tsplus_module_4.Effect.sync(() => ({
|
|
76
79
|
path: req.params,
|
|
77
80
|
query: req.query,
|
|
78
81
|
body: req.body,
|
|
@@ -92,7 +95,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
92
95
|
// throw new Error("AI Context missing")
|
|
93
96
|
// }
|
|
94
97
|
const requestId = req.headers["request-id"];
|
|
95
|
-
const rootId = requestId ?
|
|
98
|
+
const rootId = requestId ? tsplus_module_7.parseUnsafe(RequestId)(requestId) : RequestId.make();
|
|
96
99
|
const storeId = req.headers["x-store-id"];
|
|
97
100
|
const namespace = MO.ReasonableString((storeId && (Array.isArray(storeId) ? storeId[0] : storeId)) || "primary");
|
|
98
101
|
const requestContext = new RequestContext({
|
|
@@ -115,8 +118,8 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
115
118
|
return requestContext;
|
|
116
119
|
}
|
|
117
120
|
return (req, res) => {
|
|
118
|
-
return
|
|
119
|
-
requestContext:
|
|
121
|
+
return tsplus_module_6.flatMap(tsplus_module_4.Effect.all({
|
|
122
|
+
requestContext: tsplus_module_4.Effect.sync(() => {
|
|
120
123
|
const requestContext = makeContext(req);
|
|
121
124
|
if (req.method === "GET") {
|
|
122
125
|
res.setHeader("Cache-Control", "no-store");
|
|
@@ -125,77 +128,77 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
125
128
|
return requestContext;
|
|
126
129
|
}),
|
|
127
130
|
pars: getParams(req)
|
|
128
|
-
}), ({ pars, requestContext }) =>
|
|
131
|
+
}), ({ pars, requestContext }) => tsplus_module_6.provideService(tsplus_module_11.withRequestSpan(tsplus_module_6.tap(tsplus_module_6.tapErrorCause(tsplus_module_6.zipRight(tsplus_module_6.flatMap(tsplus_module_9.get(RequestSettings), (s) => tsplus_module_4.Effect.annotateLogs({
|
|
129
132
|
method: req.method,
|
|
130
133
|
path: req.originalUrl,
|
|
131
134
|
...s.verbose
|
|
132
135
|
? {
|
|
133
|
-
reqPath:
|
|
134
|
-
reqQuery:
|
|
136
|
+
reqPath: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.path)),
|
|
137
|
+
reqQuery: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.query)),
|
|
135
138
|
reqBody: pretty(pars.body),
|
|
136
139
|
reqCookies: pretty(pars.cookies),
|
|
137
|
-
reqHeaders:
|
|
140
|
+
reqHeaders: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.headers))
|
|
138
141
|
}
|
|
139
142
|
: undefined
|
|
140
143
|
})(
|
|
141
144
|
// TODO: we don;t have access to user id here cause context is not yet created
|
|
142
|
-
|
|
143
|
-
const handleRequest =
|
|
145
|
+
tsplus_module_4.Effect.logInfo("Incoming request"))), tsplus_module_4.Effect.suspend(() => {
|
|
146
|
+
const handleRequest = tsplus_module_6.flatMap(tsplus_module_6.map(parseRequest(req), ({ body, path, query }) => {
|
|
144
147
|
const hn = {
|
|
145
|
-
...
|
|
146
|
-
...
|
|
147
|
-
...
|
|
148
|
+
...tsplus_module_10.getOrUndefined(body),
|
|
149
|
+
...tsplus_module_10.getOrUndefined(query),
|
|
150
|
+
...tsplus_module_10.getOrUndefined(path)
|
|
148
151
|
};
|
|
149
152
|
return hn;
|
|
150
|
-
}), (parsedReq) =>
|
|
153
|
+
}), (parsedReq) => tsplus_module_6.flatMap(handle(parsedReq), (r) => respond(parsedReq, res, r)));
|
|
151
154
|
// Commands should not be interruptable.
|
|
152
|
-
const r = req.method !== "GET" ?
|
|
155
|
+
const r = req.method !== "GET" ? tsplus_module_6.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
153
156
|
// the first log entry should be of the request start.
|
|
154
157
|
const r2 = makeMiddlewareContext
|
|
155
|
-
?
|
|
158
|
+
? tsplus_module_6.zipRight(restoreFromRequestContext, tsplus_module_5.provideSomeContextEffect(makeMiddlewareContext(req, res))(r
|
|
156
159
|
// the db namespace must be restored, before calling provide here
|
|
157
160
|
))
|
|
158
|
-
:
|
|
161
|
+
: tsplus_module_6.zipRight(restoreFromRequestContext
|
|
159
162
|
// PR is not relevant here
|
|
160
163
|
, r);
|
|
161
164
|
return errorHandler(req, res, r2);
|
|
162
|
-
})), (cause) =>
|
|
163
|
-
|
|
164
|
-
|
|
165
|
+
})), (cause) => tsplus_module_6.tapErrorCause(tsplus_module_4.Effect.all([
|
|
166
|
+
tsplus_module_4.Effect.sync(() => res.status(500).send()),
|
|
167
|
+
tsplus_module_4.Effect.sync(() => reportRequestError(cause, {
|
|
165
168
|
path: req.originalUrl,
|
|
166
169
|
method: req.method
|
|
167
170
|
})),
|
|
168
|
-
|
|
171
|
+
tsplus_module_4.Effect.suspend(() => {
|
|
169
172
|
const headers = res.getHeaders();
|
|
170
|
-
return
|
|
173
|
+
return tsplus_module_4.Effect.annotateLogs({
|
|
171
174
|
method: req.method,
|
|
172
175
|
path: req.originalUrl,
|
|
173
176
|
statusCode: res.statusCode.toString(),
|
|
174
|
-
reqPath:
|
|
175
|
-
reqQuery:
|
|
177
|
+
reqPath: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.path)),
|
|
178
|
+
reqQuery: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.query)),
|
|
176
179
|
reqBody: pretty(pars.body),
|
|
177
180
|
reqCookies: pretty(pars.cookies),
|
|
178
|
-
reqHeaders:
|
|
179
|
-
resHeaders:
|
|
181
|
+
reqHeaders: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.headers)),
|
|
182
|
+
resHeaders: tsplus_module_8.RecordPretty(tsplus_module_8.object$(Object
|
|
180
183
|
.entries(headers)
|
|
181
184
|
.reduce((prev, [key, value]) => {
|
|
182
185
|
prev[key] = value && typeof value === "string" ? snipString(value) : value;
|
|
183
186
|
return prev;
|
|
184
187
|
}, {})))
|
|
185
|
-
})(
|
|
188
|
+
})(tsplus_module_4.Effect.logError("Finished request", cause));
|
|
186
189
|
})
|
|
187
|
-
], { concurrency: "inherit" }), (cause) =>
|
|
190
|
+
], { concurrency: "inherit" }), (cause) => tsplus_module_4.Effect.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_6.flatMap(tsplus_module_9.get(RequestSettings), (s) => {
|
|
188
191
|
const headers = res.getHeaders();
|
|
189
|
-
return
|
|
192
|
+
return tsplus_module_4.Effect.annotateLogs({
|
|
190
193
|
method: req.method,
|
|
191
194
|
path: req.originalUrl,
|
|
192
195
|
statusCode: res.statusCode.toString(),
|
|
193
196
|
...s.verbose
|
|
194
197
|
? {
|
|
195
|
-
resHeaders:
|
|
198
|
+
resHeaders: tsplus_module_8.RecordPretty(tsplus_module_8.object$(headers))
|
|
196
199
|
}
|
|
197
200
|
: undefined
|
|
198
|
-
})(
|
|
201
|
+
})(tsplus_module_4.Effect.logInfo("Finished request"));
|
|
199
202
|
}))), RequestContextContainer, new RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
|
|
200
203
|
);
|
|
201
204
|
};
|
|
@@ -205,7 +208,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
205
208
|
* Requires no login.
|
|
206
209
|
*/
|
|
207
210
|
export function matchAll(handlers) {
|
|
208
|
-
const mapped =
|
|
211
|
+
const mapped = tsplus_module_8.RecordKeys(tsplus_module_8.object$(handlers)).reduce((prev, cur) => {
|
|
209
212
|
prev[cur] = match(handlers[cur], defaultBasicErrorHandler);
|
|
210
213
|
return prev;
|
|
211
214
|
}, {});
|
|
@@ -216,9 +219,9 @@ export function matchAll(handlers) {
|
|
|
216
219
|
* Requires no login.
|
|
217
220
|
*/
|
|
218
221
|
export function matchAllAlt(handlers) {
|
|
219
|
-
const mapped =
|
|
222
|
+
const mapped = tsplus_module_8.RecordKeys(tsplus_module_8.object$(handlers)).reduce((prev, cur) => {
|
|
220
223
|
const matches = matchAll(handlers[cur]);
|
|
221
|
-
|
|
224
|
+
tsplus_module_8.RecordKeys(tsplus_module_8.object$(matches)).forEach((key) => prev[`${cur}.${key}`] = matches[key]);
|
|
222
225
|
return prev;
|
|
223
226
|
}, {});
|
|
224
227
|
return mapped;
|
|
@@ -246,17 +249,17 @@ export function handle(_, adaptResponse) {
|
|
|
246
249
|
* class SayHelloResponse extends Model<SayHelloRequest>()({ message: prop(LongString) }) {}
|
|
247
250
|
*
|
|
248
251
|
* export const SayHelloControllers = matchResource({ SayHello: { SayHelloRequest, SayHelloResponse } })({
|
|
249
|
-
* SayHello: (req) => Effect({ message: `Hi ${req.name}` })
|
|
252
|
+
* SayHello: (req) => Effect.sync(() => { message: `Hi ${req.name}` })
|
|
250
253
|
* })
|
|
251
254
|
* ```
|
|
252
255
|
*/
|
|
253
256
|
export function matchResource(mod) {
|
|
254
257
|
return (handlers) => {
|
|
255
|
-
const handler =
|
|
258
|
+
const handler = tsplus_module_8.RecordKeys(tsplus_module_8.object$(mod)).reduce((prev, cur) => {
|
|
256
259
|
prev[cur] = handle(mod[cur])(handlers[cur]);
|
|
257
260
|
return prev;
|
|
258
261
|
}, {});
|
|
259
262
|
return handler;
|
|
260
263
|
};
|
|
261
264
|
}
|
|
262
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
265
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,10 @@ import { RequestContextContainer } from "../services/RequestContextContainer.js"
|
|
|
4
4
|
* @tsplus fluent effect/io/Effect setupRequestFromWith
|
|
5
5
|
* @tsplus location "@effect-app/infra/api/setupRequest"
|
|
6
6
|
*/
|
|
7
|
-
export declare function setupReq3<R, E, A>(self: Effect<R, E, A>, name: string): import("effect
|
|
7
|
+
export declare function setupReq3<R, E, A>(self: Effect<R, E, A>, name: string): import("effect").Effect<Exclude<Exclude<R, import("effect/Tracer.impl").ParentSpan>, RequestContextContainer>, E, A>;
|
|
8
8
|
/**
|
|
9
9
|
* @tsplus getter effect/io/Effect withRequestSpan
|
|
10
10
|
* @tsplus location "@effect-app/infra/api/setupRequest"
|
|
11
11
|
*/
|
|
12
|
-
export declare const withRequestSpan: <R, E, A>(f: Effect<R, E, A>) => import("effect
|
|
12
|
+
export declare const withRequestSpan: <R, E, A>(f: Effect<R, E, A>) => import("effect").Effect<RequestContextContainer | Exclude<R, import("effect/Tracer.impl").ParentSpan>, E, A>;
|
|
13
13
|
//# sourceMappingURL=setupRequest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,uBAAuB,EAA+B,MAAM,wCAAwC,CAAA;;;;;AAK7G,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,uBAAuB,EAA+B,MAAM,wCAAwC,CAAA;;;;;AAK7G,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,wHAMrE;;;;;AAeD,eAAO,MAAM,eAAe,eAAgB,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,iHAKxD,CAAA"}
|
package/dist/api/setupRequest.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import * as tsplus_module_1 from "effect/Effect";
|
|
1
|
+
import * as tsplus_module_1 from "effect/Effect.impl";
|
|
2
2
|
import * as tsplus_module_2 from "@effect-app/prelude/schema";
|
|
3
|
+
import * as tsplus_module_3 from "effect/Effect";
|
|
3
4
|
import { RequestId } from "@effect-app/prelude/ids";
|
|
4
5
|
import { RequestContext } from "../RequestContext.js";
|
|
5
6
|
import { RequestContextContainer, RequestContextContainerImpl } from "../services/RequestContextContainer.js";
|
|
@@ -10,7 +11,7 @@ export function setupReq3(self, name) {
|
|
|
10
11
|
return tsplus_module_1.flatMap(makeInternalRequestContext(name), (rc) => tsplus_module_1.provideService(withRequestSpan_1(self), RequestContextContainer, new RequestContextContainerImpl(rc)));
|
|
11
12
|
}
|
|
12
13
|
function makeInternalRequestContext(name) {
|
|
13
|
-
return
|
|
14
|
+
return tsplus_module_3.Effect.sync(() => {
|
|
14
15
|
const id = RequestId.make();
|
|
15
16
|
return new RequestContext({
|
|
16
17
|
id,
|
|
@@ -23,4 +24,4 @@ function makeInternalRequestContext(name) {
|
|
|
23
24
|
/** @tsplus getter effect/io/Effect withRequestSpan */
|
|
24
25
|
const withRequestSpan_1 = (f) => tsplus_module_1.flatMap(RequestContextContainer.flatMap((c) => c.requestContext), (ctx) => tsplus_module_1.withLogSpan(tsplus_module_1.withSpan(f, `request[${ctx.name}]#${ctx.id}`), "request"));
|
|
25
26
|
export const withRequestSpan = withRequestSpan_1;
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFFN0c7O0dBRUc7QUFDSCxNQUFNLFVBQVUsU0FBUyxDQUFVLElBQXFCLEVBQUUsSUFBWTtJQUNwRSxPQUFPLHdCQUFBLDBCQUEwQixDQUFDLElBQUksQ0FBQyxFQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FDckQsaURBQUEsSUFBSSxHQUVjLHVCQUF1QixFQUFFLElBQUksMkJBQTJCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FDaEYsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsT0FBTyxnQkFBQSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtRQUN0QixNQUFNLEVBQUUsR0FBRyxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDM0IsT0FBTyxJQUFJLGNBQWMsQ0FBQztZQUN4QixFQUFFO1lBQ0YsTUFBTSxFQUFFLEVBQUU7WUFDVixNQUFNLEVBQUUsSUFBSTtZQUNaLElBQUksRUFBRSxnQkFBQSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUM7U0FDN0IsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsc0RBQXNEO0FBQy9DLE1BQU0sb0JBQWtCLENBQVUsQ0FBa0IsRUFBRSxFQUFFLENBQzdELHdCQUFBLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxFQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDdkUsNEJBQUEseUJBQUEsQ0FBQyxFQUNXLFdBQVcsR0FBRyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsRUFDOUIsU0FBUyxDQUFDLENBQzFCLENBQUE7YUFMVSxlQUFlIn0=
|
package/dist/api/writeDocs.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { RouteDescriptorAny } from "./express/schema/routing.js";
|
|
2
|
-
export declare function writeOpenapiDocs(rdescs: Record<string, Record<string, RouteDescriptorAny>>): import("effect
|
|
2
|
+
export declare function writeOpenapiDocs(rdescs: Record<string, Record<string, RouteDescriptorAny>>): import("effect").Effect<never, import("../errors.js").InvalidStateError, void>;
|
|
3
3
|
//# sourceMappingURL=writeDocs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeDocs.d.ts","sourceRoot":"","sources":["../../_src/api/writeDocs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAErE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"writeDocs.d.ts","sourceRoot":"","sources":["../../_src/api/writeDocs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAErE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,kFAmB1F"}
|
package/dist/api/writeDocs.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "effect/Effect";
|
|
2
|
-
import * as tsplus_module_2 from "effect/
|
|
3
|
-
import * as tsplus_module_3 from "effect/
|
|
2
|
+
import * as tsplus_module_2 from "effect/Effect.impl";
|
|
3
|
+
import * as tsplus_module_3 from "effect/Order";
|
|
4
|
+
import * as tsplus_module_4 from "effect/Order.impl";
|
|
5
|
+
import * as tsplus_module_5 from "effect/ReadonlyArray.impl";
|
|
4
6
|
import { typedValuesOf } from "@effect-app/core/utils";
|
|
5
7
|
import { writeTextFile } from "@effect-app/infra-adapters/fileUtil";
|
|
6
8
|
import * as Plutus from "@effect-app/infra-adapters/Openapi/atlas-plutus";
|
|
7
9
|
import { makeOpenApiSpecs } from "./express/makeOpenApiSpecs.js";
|
|
8
10
|
export function writeOpenapiDocs(rdescs) {
|
|
9
|
-
return
|
|
11
|
+
return tsplus_module_2.flatMap(tsplus_module_2.flatMap(tsplus_module_2.map(makeOpenApiSpecs(tsplus_module_5.sortBy(tsplus_module_4.mapInput(tsplus_module_3.Order.string, (a) => a.path))(typedValuesOf(rdescs)
|
|
10
12
|
.reduce((prev, cur) => prev.concat(typedValuesOf(cur)), [])), Plutus.info({
|
|
11
13
|
title: "api",
|
|
12
14
|
version: "X",
|
|
@@ -16,6 +18,6 @@ export function writeOpenapiDocs(rdescs) {
|
|
|
16
18
|
tags: [
|
|
17
19
|
// add the tags here
|
|
18
20
|
]
|
|
19
|
-
})), (_) =>
|
|
21
|
+
})), (_) => tsplus_module_2.orDie(writeTextFile("./openapi.json", JSON.stringify(_, undefined, 2)))), () => tsplus_module_1.Effect.logInfo("OpenAPI spec written to './openapi.json'"));
|
|
20
22
|
}
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVEb2NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvd3JpdGVEb2NzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHdCQUF3QixDQUFBO0FBQ3RELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUNuRSxPQUFPLEtBQUssTUFBTSxNQUFNLGlEQUFpRCxDQUFBO0FBQ3pFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBR2hFLE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxNQUEwRDtJQUN6RixPQUFPLHdCQUFBLHdCQUFBLG9CQUFBLGdCQUFnQixDQUNyQix1QkFFVSx5QkFBQSxnQkFBQSxLQUFLLENBQUMsTUFBTSxFQUFVLENBQUMsQ0FBcUIsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUZsRSxhQUFhLENBQUMsTUFBTSxDQUFDO1NBQ2xCLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBbUMsQ0FBQyxDQUMzQixFQUNuRSxNQUFNLENBQUMsSUFBSSxDQUFDO1FBQ1YsS0FBSyxFQUFFLEtBQUs7UUFDWixPQUFPLEVBQUUsR0FBRztRQUNaLFNBQVMsRUFBRSxLQUFLO0tBQ2pCLENBQUMsQ0FDSCxFQUNNLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ1gsR0FBRyxDQUFDO1FBQ0osSUFBSSxFQUFFO1FBQ0osb0JBQW9CO1NBQ3JCO0tBQ0YsQ0FBQyxDQUFDLEVBQ00sQ0FBQyxDQUFDLEVBQUUsRUFBRSx1QkFBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQU0sQ0FBQyxFQUM5RSxHQUFHLEVBQUUsQ0FBQyxnQkFBQSxNQUFNLENBQUMsT0FBTyxDQUFDLDBDQUEwQyxDQUFDLENBQUMsQ0FBQTtBQUM5RSxDQUFDIn0=
|
package/dist/errorReporter.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Cause } from "effect/Cause";
|
|
2
2
|
import type { CauseException } from "./errors.js";
|
|
3
|
-
export declare function reportError<E, E2 extends CauseException<unknown>>(makeError: (cause: Cause<E>) => E2): (cause: Cause<E>, extras?: Record<string, unknown>) => import("effect
|
|
4
|
-
export declare function logError<E, E2 extends CauseException<unknown>>(makeError: (cause: Cause<E>) => E2): (cause: Cause<E>, extras?: Record<string, unknown>) => import("effect
|
|
3
|
+
export declare function reportError<E, E2 extends CauseException<unknown>>(makeError: (cause: Cause<E>) => E2): (cause: Cause<E>, extras?: Record<string, unknown>) => import("effect").Effect<never, never, void>;
|
|
4
|
+
export declare function logError<E, E2 extends CauseException<unknown>>(makeError: (cause: Cause<E>) => E2): (cause: Cause<E>, extras?: Record<string, unknown>) => import("effect").Effect<never, never, void>;
|
|
5
5
|
export declare function captureException(error: unknown): void;
|
|
6
6
|
export declare function reportMessage(message: string): void;
|
|
7
|
-
export declare function reportMessageM(message: string): import("effect
|
|
7
|
+
export declare function reportMessageM(message: string): import("effect").Effect<never, never, void>;
|
|
8
8
|
//# sourceMappingURL=errorReporter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorReporter.d.ts","sourceRoot":"","sources":["../_src/errorReporter.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAGjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC/D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"errorReporter.d.ts","sourceRoot":"","sources":["../_src/errorReporter.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAGjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC/D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,iDAkB1D;AAgBD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC5D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,iDAiB1D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,QAG9C;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,+CAE7C"}
|
package/dist/errorReporter.js
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
import * as tsplus_module_1 from "effect/Cause";
|
|
1
|
+
import * as tsplus_module_1 from "effect/Cause.impl";
|
|
2
2
|
import * as tsplus_module_2 from "effect/Effect";
|
|
3
|
-
import * as tsplus_module_3 from "
|
|
3
|
+
import * as tsplus_module_3 from "effect/Effect.impl";
|
|
4
|
+
import * as tsplus_module_4 from "@effect-app/core/OptionX";
|
|
4
5
|
import * as Sentry from "@sentry/node";
|
|
5
6
|
import { RequestContextContainer } from "./services/RequestContextContainer.js";
|
|
6
7
|
export function reportError(makeError) {
|
|
7
|
-
return (cause, extras) => tsplus_module_2.gen(function* ($) {
|
|
8
|
+
return (cause, extras) => tsplus_module_2.Effect.gen(function* ($) {
|
|
8
9
|
if (tsplus_module_1.isInterrupted(cause)) {
|
|
9
|
-
yield* $(
|
|
10
|
+
yield* $(tsplus_module_3.annotateLogs(tsplus_module_2.Effect.logDebug("Interrupted"), "extras", JSON.stringify(extras ?? {})));
|
|
10
11
|
return;
|
|
11
12
|
}
|
|
12
13
|
const error = makeError(cause);
|
|
13
14
|
yield* $(reportSentry(error, extras));
|
|
14
|
-
yield* $(
|
|
15
|
+
yield* $(tsplus_module_3.annotateLogs(tsplus_module_3.logError(cause), {
|
|
15
16
|
extras,
|
|
16
17
|
__cause__: error.toJSON(),
|
|
17
18
|
__error__: { _tag: error._tag, message: error.message }
|
|
@@ -19,8 +20,8 @@ export function reportError(makeError) {
|
|
|
19
20
|
});
|
|
20
21
|
}
|
|
21
22
|
function reportSentry(error, extras) {
|
|
22
|
-
return
|
|
23
|
-
const context =
|
|
23
|
+
return tsplus_module_3.map(RequestContextContainer.getOption, (ctx) => {
|
|
24
|
+
const context = tsplus_module_4.getOrUndefined(ctx);
|
|
24
25
|
const scope = new Sentry.Scope();
|
|
25
26
|
if (context)
|
|
26
27
|
scope.setContext("context", context);
|
|
@@ -31,13 +32,13 @@ function reportSentry(error, extras) {
|
|
|
31
32
|
});
|
|
32
33
|
}
|
|
33
34
|
export function logError(makeError) {
|
|
34
|
-
return (cause, extras) => tsplus_module_2.gen(function* ($) {
|
|
35
|
+
return (cause, extras) => tsplus_module_2.Effect.gen(function* ($) {
|
|
35
36
|
if (tsplus_module_1.isInterrupted(cause)) {
|
|
36
|
-
yield* $(
|
|
37
|
+
yield* $(tsplus_module_3.annotateLogs(tsplus_module_2.Effect.logDebug("Interrupted"), "extras", JSON.stringify(extras ?? {})));
|
|
37
38
|
return;
|
|
38
39
|
}
|
|
39
40
|
const error = makeError(cause);
|
|
40
|
-
yield* $(
|
|
41
|
+
yield* $(tsplus_module_3.annotateLogs(tsplus_module_3.logWarning(cause), {
|
|
41
42
|
extras,
|
|
42
43
|
__cause__: error.toJSON(),
|
|
43
44
|
__error__: { _tag: error._tag, message: error.message }
|
|
@@ -53,6 +54,6 @@ export function reportMessage(message) {
|
|
|
53
54
|
console.warn(message);
|
|
54
55
|
}
|
|
55
56
|
export function reportMessageM(message) {
|
|
56
|
-
return tsplus_module_2.sync(() => reportMessage(message));
|
|
57
|
+
return tsplus_module_2.Effect.sync(() => reportMessage(message));
|
|
57
58
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxLQUFLLE1BQU0sTUFBTSxjQUFjLENBQUE7QUFFdEMsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sdUNBQXVDLENBQUE7QUFFL0UsTUFBTSxVQUFVLFdBQVcsQ0FDekIsU0FBa0M7SUFFbEMsT0FBTyxDQUFDLEtBQWUsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDM0QsZ0JBQUEsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFLENBQUM7WUFDMUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUFBLGdCQUFBLE1BQU0sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLEVBQWMsUUFBUSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUM3RixPQUFNO1FBQ1IsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFBO1FBQ3JDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDTixzREFBQSxLQUFLLEdBRVc7WUFDWixNQUFNO1lBQ04sU0FBUyxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDekIsU0FBUyxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUU7U0FDeEQsQ0FBQyxDQUNMLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FDbkIsS0FBUyxFQUNULE1BQTJDO0lBRTNDLE9BQU8sb0JBQUEsdUJBQXVCLENBQUMsU0FBUyxFQUFLLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDbkQsTUFBTSxPQUFPLEdBQUcsK0JBQUEsR0FBRyxDQUFPLENBQUE7UUFDMUIsTUFBTSxLQUFLLEdBQUcsSUFBSSxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDaEMsSUFBSSxPQUFPO1lBQUUsS0FBSyxDQUFDLFVBQVUsQ0FBQyxTQUFTLEVBQUUsT0FBNkMsQ0FBQyxDQUFBO1FBQ3ZGLElBQUksTUFBTTtZQUFFLEtBQUssQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQzlDLEtBQUssQ0FBQyxVQUFVLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFBO1FBQ3pDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUE7SUFDdkMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLFFBQVEsQ0FDdEIsU0FBa0M7SUFFbEMsT0FBTyxDQUFDLEtBQWUsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDM0QsZ0JBQUEsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFLENBQUM7WUFDMUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUFBLGdCQUFBLE1BQU0sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLEVBQWMsUUFBUSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUM3RixPQUFNO1FBQ1IsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sd0RBQUEsS0FBSyxHQUVXO1lBQ1osTUFBTTtZQUNOLFNBQVMsRUFBRSxLQUFLLENBQUMsTUFBTSxFQUFFO1lBQ3pCLFNBQVMsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFO1NBQ3hELENBQUMsQ0FDTCxDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLEtBQWM7SUFDN0MsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsT0FBZTtJQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBRTlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZTtJQUM1QyxPQUFPLGdCQUFBLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUE7QUFDbEQsQ0FBQyJ9
|
package/dist/errors.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Data } from "effect/Data";
|
|
2
2
|
import { Cause } from "effect/Cause";
|
|
3
|
-
declare const NotFoundError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect
|
|
3
|
+
declare const NotFoundError_base: new <A extends Record<string, any>>(args: import("effect/Types.impl").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data.impl").YieldableError & {
|
|
4
4
|
readonly _tag: "NotFoundError";
|
|
5
5
|
} & Readonly<A>;
|
|
6
6
|
export declare class NotFoundError<T extends string = string> extends NotFoundError_base<{
|
|
@@ -13,24 +13,24 @@ export declare class NotFoundError<T extends string = string> extends NotFoundEr
|
|
|
13
13
|
readonly id: string;
|
|
14
14
|
});
|
|
15
15
|
}
|
|
16
|
-
declare const ValidationError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect
|
|
16
|
+
declare const ValidationError_base: new <A extends Record<string, any>>(args: import("effect/Types.impl").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data.impl").YieldableError & {
|
|
17
17
|
readonly _tag: "ValidationError";
|
|
18
18
|
} & Readonly<A>;
|
|
19
19
|
export declare class ValidationError extends ValidationError_base<{
|
|
20
20
|
errors: ReadonlyArray<unknown>;
|
|
21
21
|
}> {
|
|
22
22
|
}
|
|
23
|
-
declare const NotLoggedInError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect
|
|
23
|
+
declare const NotLoggedInError_base: new <A extends Record<string, any>>(args: import("effect/Types.impl").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data.impl").YieldableError & {
|
|
24
24
|
readonly _tag: "NotLoggedInError";
|
|
25
25
|
} & Readonly<A>;
|
|
26
26
|
export declare class NotLoggedInError extends NotLoggedInError_base<{}> {
|
|
27
27
|
}
|
|
28
|
-
declare const UnauthorizedError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect
|
|
28
|
+
declare const UnauthorizedError_base: new <A extends Record<string, any>>(args: import("effect/Types.impl").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data.impl").YieldableError & {
|
|
29
29
|
readonly _tag: "UnauthorizedError";
|
|
30
30
|
} & Readonly<A>;
|
|
31
31
|
export declare class UnauthorizedError extends UnauthorizedError_base<{}> {
|
|
32
32
|
}
|
|
33
|
-
declare const LoginError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect
|
|
33
|
+
declare const LoginError_base: new <A extends Record<string, any>>(args: import("effect/Types.impl").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data.impl").YieldableError & {
|
|
34
34
|
readonly _tag: "NotLoggeInError";
|
|
35
35
|
} & Readonly<A>;
|
|
36
36
|
/**
|
|
@@ -41,7 +41,7 @@ export declare class LoginError extends LoginError_base<{
|
|
|
41
41
|
}> {
|
|
42
42
|
constructor(message: string);
|
|
43
43
|
}
|
|
44
|
-
declare const InvalidStateError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect
|
|
44
|
+
declare const InvalidStateError_base: new <A extends Record<string, any>>(args: import("effect/Types.impl").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data.impl").YieldableError & {
|
|
45
45
|
readonly _tag: "InvalidStateError";
|
|
46
46
|
} & Readonly<A>;
|
|
47
47
|
export declare class InvalidStateError extends InvalidStateError_base<{
|
|
@@ -62,7 +62,7 @@ export declare class CauseException<E> extends Error {
|
|
|
62
62
|
};
|
|
63
63
|
toString(): string;
|
|
64
64
|
}
|
|
65
|
-
declare const OptimisticConcurrencyException_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect
|
|
65
|
+
declare const OptimisticConcurrencyException_base: new <A extends Record<string, any>>(args: import("effect/Types.impl").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data.impl").YieldableError & {
|
|
66
66
|
readonly _tag: "OptimisticConcurrencyException";
|
|
67
67
|
} & Readonly<A>;
|
|
68
68
|
export declare class OptimisticConcurrencyException extends OptimisticConcurrencyException_base<{
|