@effect-app/infra 0.85.0-next.3 → 0.85.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 +3 -25
- package/_cjs/_ext/Array.cjs +2 -3
- package/_cjs/_ext/Array.cjs.map +1 -1
- package/_cjs/api/defaultErrorHandler.cjs +10 -11
- package/_cjs/api/defaultErrorHandler.cjs.map +1 -1
- package/_cjs/api/express/makeJsonSchema.cjs +2 -3
- 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 +4 -6
- package/_cjs/api/express/makeOpenApiSpecs.cjs.map +1 -1
- package/_cjs/api/express/schema/routing.cjs +22 -23
- package/_cjs/api/express/schema/routing.cjs.map +1 -1
- package/_cjs/api/reportError.cjs +2 -2
- package/_cjs/api/setupRequest.cjs +4 -5
- package/_cjs/api/setupRequest.cjs.map +1 -1
- package/_cjs/api/writeDocs.cjs +4 -6
- package/_cjs/api/writeDocs.cjs.map +1 -1
- package/_cjs/errorReporter.cjs +11 -12
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/errors.cjs +8 -8
- package/_cjs/errors.cjs.map +1 -1
- package/_cjs/instrument.cjs +1 -2
- package/_cjs/instrument.cjs.map +1 -1
- package/_cjs/logger/jsonLogger.cjs +10 -11
- 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 +7 -8
- package/_cjs/rateLimit.cjs.map +1 -1
- package/_cjs/services/Emailer/Sendgrid.cjs +12 -14
- package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
- package/_cjs/services/Emailer/fake.cjs +4 -5
- package/_cjs/services/Emailer/fake.cjs.map +1 -1
- package/_cjs/services/Operations/live.cjs +29 -31
- package/_cjs/services/Operations/live.cjs.map +1 -1
- package/_cjs/services/Operations/service.cjs +5 -6
- package/_cjs/services/Operations/service.cjs.map +1 -1
- package/_cjs/services/QueueMaker/errors.cjs +6 -7
- package/_cjs/services/QueueMaker/errors.cjs.map +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs +17 -18
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs +15 -16
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/_cjs/services/Repository.cjs +16 -17
- package/_cjs/services/Repository.cjs.map +1 -1
- package/_cjs/services/RepositoryBase.cjs +33 -35
- package/_cjs/services/RepositoryBase.cjs.map +1 -1
- package/_cjs/services/RequestContextContainer.cjs +20 -15
- package/_cjs/services/RequestContextContainer.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos.cjs +46 -49
- package/_cjs/services/Store/Cosmos.cjs.map +1 -1
- package/_cjs/services/Store/Disk.cjs +18 -19
- package/_cjs/services/Store/Disk.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs +39 -43
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_cjs/services/Store/Redis.cjs +14 -16
- package/_cjs/services/Store/Redis.cjs.map +1 -1
- package/_cjs/services/Store/codeFilter.test.cjs +1 -1
- package/_cjs/services/Store/index.cjs +6 -7
- 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 +17 -19
- package/_cjs/services/simpledb/cosmosdb.cjs.map +1 -1
- package/_cjs/services/simpledb/diskdb.cjs +8 -9
- package/_cjs/services/simpledb/diskdb.cjs.map +1 -1
- package/_cjs/services/simpledb/memdb.cjs +9 -11
- package/_cjs/services/simpledb/memdb.cjs.map +1 -1
- package/_cjs/services/simpledb/mongodb.cjs +18 -20
- package/_cjs/services/simpledb/mongodb.cjs.map +1 -1
- package/_cjs/services/simpledb/redisdb.cjs +10 -11
- 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 +17 -18
- 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/routing.ts +59 -37
- package/_src/api/setupRequest.ts +11 -10
- 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 +6 -8
- package/_src/services/RequestContextContainer.ts +12 -7
- package/_src/services/Store/Cosmos.ts +12 -17
- 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 +4 -4
- package/dist/_ext/Array.d.ts +1 -1
- package/dist/_ext/Array.d.ts.map +1 -1
- package/dist/_ext/Array.js +3 -4
- 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 +11 -13
- 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 +3 -4
- package/dist/api/express/makeOpenApiSpecs.d.ts +1 -1
- package/dist/api/express/makeOpenApiSpecs.js +5 -7
- package/dist/api/express/schema/routing.d.ts +22 -7
- package/dist/api/express/schema/routing.d.ts.map +1 -1
- package/dist/api/express/schema/routing.js +23 -24
- 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/setupRequest.d.ts +2 -2
- package/dist/api/setupRequest.d.ts.map +1 -1
- package/dist/api/setupRequest.js +7 -7
- package/dist/api/writeDocs.d.ts +1 -1
- package/dist/api/writeDocs.d.ts.map +1 -1
- package/dist/api/writeDocs.js +5 -7
- package/dist/errorReporter.d.ts +3 -3
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +12 -13
- 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 +2 -3
- package/dist/logger/jsonLogger.d.ts +2 -2
- package/dist/logger/jsonLogger.d.ts.map +1 -1
- package/dist/logger/jsonLogger.js +11 -12
- 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 +8 -9
- 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 +15 -17
- 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 +5 -6
- package/dist/services/Emailer/service.d.ts +3 -3
- 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 +37 -39
- package/dist/services/Operations/service.d.ts +8 -8
- package/dist/services/Operations/service.d.ts.map +1 -1
- package/dist/services/Operations/service.js +12 -13
- 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 +6 -7
- package/dist/services/QueueMaker/memQueue.d.ts +3 -3
- package/dist/services/QueueMaker/memQueue.js +16 -17
- 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 +15 -16
- package/dist/services/Repository.d.ts +31 -31
- package/dist/services/Repository.d.ts.map +1 -1
- package/dist/services/Repository.js +17 -18
- package/dist/services/RepositoryBase.d.ts +12 -11
- package/dist/services/RepositoryBase.d.ts.map +1 -1
- package/dist/services/RepositoryBase.js +35 -37
- package/dist/services/RequestContextContainer.d.ts +14 -11
- package/dist/services/RequestContextContainer.d.ts.map +1 -1
- package/dist/services/RequestContextContainer.js +19 -18
- 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 +51 -54
- 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 +19 -20
- 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 +41 -45
- 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 +15 -17
- 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 +7 -8
- package/dist/services/Store/service.d.ts +8 -8
- 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 +2 -2
- 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 +17 -19
- package/dist/services/simpledb/diskdb.d.ts +4 -4
- package/dist/services/simpledb/diskdb.js +9 -10
- package/dist/services/simpledb/memdb.d.ts +4 -4
- package/dist/services/simpledb/memdb.js +11 -13
- package/dist/services/simpledb/mongodb.d.ts +5 -5
- package/dist/services/simpledb/mongodb.js +14 -16
- package/dist/services/simpledb/redisdb.d.ts +4 -4
- package/dist/services/simpledb/redisdb.js +11 -12
- package/dist/services/simpledb/shared.d.ts +4 -4
- package/dist/services/simpledb/shared.js +6 -6
- package/dist/services/simpledb/simpledb.d.ts +6 -6
- package/dist/services/simpledb/simpledb.d.ts.map +1 -1
- package/dist/services/simpledb/simpledb.js +15 -16
- package/package.json +5 -25
- package/_cjs/api/express/schema/requestHandler.cjs +0 -172
- package/_cjs/api/express/schema/requestHandler.cjs.map +0 -1
- package/_cjs/api/routing.cjs +0 -278
- package/_cjs/api/routing.cjs.map +0 -1
- package/_src/api/express/schema/requestHandler.ts +0 -372
- package/_src/api/routing.ts +0 -660
- package/dist/api/express/schema/requestHandler.d.ts +0 -71
- package/dist/api/express/schema/requestHandler.d.ts.map +0 -1
- package/dist/api/express/schema/requestHandler.js +0 -140
- package/dist/api/routing.d.ts +0 -103
- package/dist/api/routing.d.ts.map +0 -1
- package/dist/api/routing.js +0 -265
package/dist/api/routing.js
DELETED
|
@@ -1,265 +0,0 @@
|
|
|
1
|
-
import * as tsplus_module_1 from "effect/FiberRef";
|
|
2
|
-
import * as tsplus_module_2 from "effect/Option";
|
|
3
|
-
import * as tsplus_module_3 from "effect/impl/Option";
|
|
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/impl/Effect";
|
|
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/impl/FiberRef";
|
|
10
|
-
import * as tsplus_module_10 from "@effect-app/core/OptionX";
|
|
11
|
-
import * as tsplus_module_11 from "@effect-app/infra/api/setupRequest";
|
|
12
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
13
|
-
import * as Ex from "@effect-app/infra-adapters/express";
|
|
14
|
-
import { RequestId } from "@effect-app/prelude/ids";
|
|
15
|
-
import { extractSchema, SchemaNamed } from "@effect-app/prelude/schema";
|
|
16
|
-
import * as MO from "@effect-app/prelude/schema";
|
|
17
|
-
import { pretty } from "@effect-app/prelude/utils";
|
|
18
|
-
import { RequestContext } from "../RequestContext.js";
|
|
19
|
-
import { RequestContextContainer, RequestContextContainerImpl } from "../services/RequestContextContainer.js";
|
|
20
|
-
import { restoreFromRequestContext } from "../services/Store/Memory.js";
|
|
21
|
-
import { defaultBasicErrorHandler } from "./defaultErrorHandler.js";
|
|
22
|
-
import { parseRequestParams } from "./express/schema/requestHandler.js";
|
|
23
|
-
import { makeRouteDescriptor } from "./express/schema/routing.js";
|
|
24
|
-
import { reportRequestError } from "./reportError.js";
|
|
25
|
-
import { snipString } from "./util.js";
|
|
26
|
-
export const RequestSettings = tsplus_module_1.FiberRef.unsafeMake({
|
|
27
|
-
verbose: false
|
|
28
|
-
});
|
|
29
|
-
export function makeRequestParsers(Request) {
|
|
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));
|
|
40
|
-
return {
|
|
41
|
-
parseBody,
|
|
42
|
-
parseCookie,
|
|
43
|
-
parseHeaders,
|
|
44
|
-
parsePath,
|
|
45
|
-
parseQuery
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
export function match(requestHandler, errorHandler, middleware) {
|
|
49
|
-
let makeMiddlewareContext = undefined;
|
|
50
|
-
if (middleware) {
|
|
51
|
-
const { handler, makeContext } = middleware(requestHandler);
|
|
52
|
-
requestHandler = handler;
|
|
53
|
-
makeMiddlewareContext = makeContext;
|
|
54
|
-
}
|
|
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)));
|
|
57
|
-
}
|
|
58
|
-
export function respondSuccess(encodeResponse) {
|
|
59
|
-
return (req, res, a) => tsplus_module_6.flatMap(tsplus_module_4.Effect.sync(() => encodeResponse(req)(a)), (r) => tsplus_module_4.Effect.sync(() => {
|
|
60
|
-
r === undefined
|
|
61
|
-
? res.status(204).send()
|
|
62
|
-
: res
|
|
63
|
-
.status(200)
|
|
64
|
-
.send(JSON.stringify(r));
|
|
65
|
-
}));
|
|
66
|
-
}
|
|
67
|
-
export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
68
|
-
const { Request, Response, adaptResponse, h: handle } = handler;
|
|
69
|
-
const response = Response ? extractSchema(Response) : MO.Void;
|
|
70
|
-
const encoder = MO.Encoder.for(response);
|
|
71
|
-
const encodeResponse = adaptResponse
|
|
72
|
-
? (req) => MO.Encoder.for(adaptResponse(req))
|
|
73
|
-
: () => encoder;
|
|
74
|
-
const requestParsers = makeRequestParsers(Request);
|
|
75
|
-
const parseRequest = parseRequestParams(requestParsers);
|
|
76
|
-
const respond = respondSuccess(encodeResponse);
|
|
77
|
-
function getParams(req) {
|
|
78
|
-
return tsplus_module_4.Effect.sync(() => ({
|
|
79
|
-
path: req.params,
|
|
80
|
-
query: req.query,
|
|
81
|
-
body: req.body,
|
|
82
|
-
headers: req.headers,
|
|
83
|
-
cookies: req.cookies
|
|
84
|
-
}));
|
|
85
|
-
}
|
|
86
|
-
function makeContext(req) {
|
|
87
|
-
const start = new Date();
|
|
88
|
-
const supported = ["en", "de"];
|
|
89
|
-
const desiredLocale = req.headers["x-locale"];
|
|
90
|
-
const locale = desiredLocale && supported.includes(desiredLocale)
|
|
91
|
-
? desiredLocale
|
|
92
|
-
: "en";
|
|
93
|
-
// const context = getAppInsightsContext()
|
|
94
|
-
// if (!context) {
|
|
95
|
-
// throw new Error("AI Context missing")
|
|
96
|
-
// }
|
|
97
|
-
const requestId = req.headers["request-id"];
|
|
98
|
-
const rootId = requestId ? tsplus_module_7.parseUnsafe(RequestId)(requestId) : RequestId.make();
|
|
99
|
-
const storeId = req.headers["x-store-id"];
|
|
100
|
-
const namespace = MO.ReasonableString((storeId && (Array.isArray(storeId) ? storeId[0] : storeId)) || "primary");
|
|
101
|
-
const requestContext = new RequestContext({
|
|
102
|
-
rootId,
|
|
103
|
-
name: MO.ReasonableString(Request.Model instanceof SchemaNamed ? Request.Model.name : Request.name),
|
|
104
|
-
locale,
|
|
105
|
-
createdAt: start,
|
|
106
|
-
namespace
|
|
107
|
-
// ...(context.operation.parentId
|
|
108
|
-
// ? {
|
|
109
|
-
// parent: new RequestContextParent({
|
|
110
|
-
// id: RequestId(context.operation.parentId),
|
|
111
|
-
// locale,
|
|
112
|
-
// name: ReasonableString("API Request")
|
|
113
|
-
// })
|
|
114
|
-
// }
|
|
115
|
-
// : {})
|
|
116
|
-
});
|
|
117
|
-
// context.requestContext = requestContext
|
|
118
|
-
return requestContext;
|
|
119
|
-
}
|
|
120
|
-
return (req, res) => {
|
|
121
|
-
return tsplus_module_6.flatMap(tsplus_module_4.Effect.all({
|
|
122
|
-
requestContext: tsplus_module_4.Effect.sync(() => {
|
|
123
|
-
const requestContext = makeContext(req);
|
|
124
|
-
if (req.method === "GET") {
|
|
125
|
-
res.setHeader("Cache-Control", "no-store");
|
|
126
|
-
}
|
|
127
|
-
res.setHeader("Content-Language", requestContext.locale);
|
|
128
|
-
return requestContext;
|
|
129
|
-
}),
|
|
130
|
-
pars: getParams(req)
|
|
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({
|
|
132
|
-
method: req.method,
|
|
133
|
-
path: req.originalUrl,
|
|
134
|
-
...s.verbose
|
|
135
|
-
? {
|
|
136
|
-
reqPath: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.path)),
|
|
137
|
-
reqQuery: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.query)),
|
|
138
|
-
reqBody: pretty(pars.body),
|
|
139
|
-
reqCookies: pretty(pars.cookies),
|
|
140
|
-
reqHeaders: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.headers))
|
|
141
|
-
}
|
|
142
|
-
: undefined
|
|
143
|
-
})(
|
|
144
|
-
// TODO: we don;t have access to user id here cause context is not yet created
|
|
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 }) => {
|
|
147
|
-
const hn = {
|
|
148
|
-
...tsplus_module_10.getOrUndefined(body),
|
|
149
|
-
...tsplus_module_10.getOrUndefined(query),
|
|
150
|
-
...tsplus_module_10.getOrUndefined(path)
|
|
151
|
-
};
|
|
152
|
-
return hn;
|
|
153
|
-
}), (parsedReq) => tsplus_module_6.flatMap(handle(parsedReq), (r) => respond(parsedReq, res, r)));
|
|
154
|
-
// Commands should not be interruptable.
|
|
155
|
-
const r = req.method !== "GET" ? tsplus_module_6.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
156
|
-
// the first log entry should be of the request start.
|
|
157
|
-
const r2 = makeMiddlewareContext
|
|
158
|
-
? tsplus_module_6.zipRight(restoreFromRequestContext, tsplus_module_5.provideSomeContextEffect(makeMiddlewareContext(req, res))(r
|
|
159
|
-
// the db namespace must be restored, before calling provide here
|
|
160
|
-
))
|
|
161
|
-
: tsplus_module_6.zipRight(restoreFromRequestContext
|
|
162
|
-
// PR is not relevant here
|
|
163
|
-
, r);
|
|
164
|
-
return errorHandler(req, res, r2);
|
|
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, {
|
|
168
|
-
path: req.originalUrl,
|
|
169
|
-
method: req.method
|
|
170
|
-
})),
|
|
171
|
-
tsplus_module_4.Effect.suspend(() => {
|
|
172
|
-
const headers = res.getHeaders();
|
|
173
|
-
return tsplus_module_4.Effect.annotateLogs({
|
|
174
|
-
method: req.method,
|
|
175
|
-
path: req.originalUrl,
|
|
176
|
-
statusCode: res.statusCode.toString(),
|
|
177
|
-
reqPath: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.path)),
|
|
178
|
-
reqQuery: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.query)),
|
|
179
|
-
reqBody: pretty(pars.body),
|
|
180
|
-
reqCookies: pretty(pars.cookies),
|
|
181
|
-
reqHeaders: tsplus_module_8.RecordPretty(tsplus_module_8.object$(pars.headers)),
|
|
182
|
-
resHeaders: tsplus_module_8.RecordPretty(tsplus_module_8.object$(Object
|
|
183
|
-
.entries(headers)
|
|
184
|
-
.reduce((prev, [key, value]) => {
|
|
185
|
-
prev[key] = value && typeof value === "string" ? snipString(value) : value;
|
|
186
|
-
return prev;
|
|
187
|
-
}, {})))
|
|
188
|
-
})(tsplus_module_4.Effect.logError("Finished request", cause));
|
|
189
|
-
})
|
|
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) => {
|
|
191
|
-
const headers = res.getHeaders();
|
|
192
|
-
return tsplus_module_4.Effect.annotateLogs({
|
|
193
|
-
method: req.method,
|
|
194
|
-
path: req.originalUrl,
|
|
195
|
-
statusCode: res.statusCode.toString(),
|
|
196
|
-
...s.verbose
|
|
197
|
-
? {
|
|
198
|
-
resHeaders: tsplus_module_8.RecordPretty(tsplus_module_8.object$(headers))
|
|
199
|
-
}
|
|
200
|
-
: undefined
|
|
201
|
-
})(tsplus_module_4.Effect.logInfo("Finished request"));
|
|
202
|
-
}))), RequestContextContainer, new RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
|
|
203
|
-
);
|
|
204
|
-
};
|
|
205
|
-
}
|
|
206
|
-
/**
|
|
207
|
-
* Gather all handlers of a module and attach them to the Server.
|
|
208
|
-
* Requires no login.
|
|
209
|
-
*/
|
|
210
|
-
export function matchAll(handlers) {
|
|
211
|
-
const mapped = tsplus_module_8.RecordKeys(tsplus_module_8.object$(handlers)).reduce((prev, cur) => {
|
|
212
|
-
prev[cur] = match(handlers[cur], defaultBasicErrorHandler);
|
|
213
|
-
return prev;
|
|
214
|
-
}, {});
|
|
215
|
-
return mapped;
|
|
216
|
-
}
|
|
217
|
-
/**
|
|
218
|
-
* Gather all handlers of a module and attach them to the Server.
|
|
219
|
-
* Requires no login.
|
|
220
|
-
*/
|
|
221
|
-
export function matchAllAlt(handlers) {
|
|
222
|
-
const mapped = tsplus_module_8.RecordKeys(tsplus_module_8.object$(handlers)).reduce((prev, cur) => {
|
|
223
|
-
const matches = matchAll(handlers[cur]);
|
|
224
|
-
tsplus_module_8.RecordKeys(tsplus_module_8.object$(matches)).forEach((key) => prev[`${cur}.${key}`] = matches[key]);
|
|
225
|
-
return prev;
|
|
226
|
-
}, {});
|
|
227
|
-
return mapped;
|
|
228
|
-
}
|
|
229
|
-
export function handle(_, adaptResponse) {
|
|
230
|
-
// TODO: Prevent over providing // no strict/shrink yet.
|
|
231
|
-
const Request = MO.extractRequest(_);
|
|
232
|
-
const Response = MO.extractResponse(_);
|
|
233
|
-
return (h) => ({
|
|
234
|
-
adaptResponse,
|
|
235
|
-
h,
|
|
236
|
-
Request,
|
|
237
|
-
Response,
|
|
238
|
-
ResponseOpenApi: _.ResponseOpenApi ?? Response
|
|
239
|
-
});
|
|
240
|
-
}
|
|
241
|
-
/**
|
|
242
|
-
* Provided a module with resources, and provided an Object with resource handlers, will prepare route handlers to be attached to server.
|
|
243
|
-
* @param mod The module with Resources you want to match.
|
|
244
|
-
* @returns A function that must be called with an Object with a handler "Request -> Effect<R, E, Response>" for each resource defined in the Module.
|
|
245
|
-
*
|
|
246
|
-
* Example:
|
|
247
|
-
* ```
|
|
248
|
-
* class SayHelloRequest extends Get("/say-hello")<SayHelloRequest>()({ name: prop(ReasonableString) }) {}
|
|
249
|
-
* class SayHelloResponse extends Model<SayHelloRequest>()({ message: prop(LongString) }) {}
|
|
250
|
-
*
|
|
251
|
-
* export const SayHelloControllers = matchResource({ SayHello: { SayHelloRequest, SayHelloResponse } })({
|
|
252
|
-
* SayHello: (req) => Effect.sync(() => { message: `Hi ${req.name}` })
|
|
253
|
-
* })
|
|
254
|
-
* ```
|
|
255
|
-
*/
|
|
256
|
-
export function matchResource(mod) {
|
|
257
|
-
return (handlers) => {
|
|
258
|
-
const handler = tsplus_module_8.RecordKeys(tsplus_module_8.object$(mod)).reduce((prev, cur) => {
|
|
259
|
-
prev[cur] = handle(mod[cur])(handlers[cur]);
|
|
260
|
-
return prev;
|
|
261
|
-
}, {});
|
|
262
|
-
return handler;
|
|
263
|
-
};
|
|
264
|
-
}
|
|
265
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|