@effect-app/infra 0.234.4 → 0.234.5
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 +8 -0
- package/_cjs/api/routing/makeRequestHandler.cjs +2 -1
- package/_cjs/api/routing/makeRequestHandler.cjs.map +1 -1
- package/dist/api/routing/makeRequestHandler.d.ts +2 -1
- package/dist/api/routing/makeRequestHandler.d.ts.map +1 -1
- package/dist/api/routing/makeRequestHandler.js +5 -3
- package/dist/api/routing/match.d.ts +1 -1
- package/dist/api/routing/match.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/api/routing/makeRequestHandler.ts +168 -165
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.RequestSettings = void 0;
|
|
7
7
|
exports.makeRequestHandler = makeRequestHandler;
|
|
8
8
|
var _utils = require("@effect-app/core/utils");
|
|
9
|
+
var _RequestFiberSet = require("@effect-app/infra-adapters/RequestFiberSet");
|
|
9
10
|
var _util = require("@effect-app/infra/api/util");
|
|
10
11
|
var _errorReporter = require("@effect-app/infra/errorReporter");
|
|
11
12
|
var _effectApp = require("effect-app");
|
|
@@ -90,7 +91,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
90
91
|
const r2 = middlewareLayer ? _effectApp.Effect.provide(r, middlewareLayer)
|
|
91
92
|
// PR is not relevant here
|
|
92
93
|
: r;
|
|
93
|
-
return errorHandler(req, res, r2);
|
|
94
|
+
return errorHandler(req, res, r2.pipe(_effectApp.Effect.andThen(_RequestFiberSet.RequestFiberSet.register)));
|
|
94
95
|
})), _effectApp.Effect.catchAllCause(cause => _effectApp.Effect.sync(() => _http.HttpServerResponse.setStatus(res, 500)).pipe(_effectApp.Effect.tap(res => _effectApp.Effect.all([(0, _errorReporter.reportError)("request")(cause, {
|
|
95
96
|
path: req.originalUrl,
|
|
96
97
|
method: req.method
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","void","resp","encoder","fields","encode","rt","encodedSchema","struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","req","flatMap","HttpServerRequest","ServerRequest","json","pipe","body","headers","params","query","searchParams","cookies","uninterruptibleMask","restore","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAGA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,
|
|
1
|
+
{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_RequestFiberSet","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","void","resp","encoder","fields","encode","rt","encodedSchema","struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","req","flatMap","HttpServerRequest","ServerRequest","json","pipe","body","headers","params","query","searchParams","cookies","uninterruptibleMask","restore","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","RequestFiberSet","register","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { EnforceNonEmptyRecord } from "@effect-app/core/utils";
|
|
2
|
+
import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
|
|
2
3
|
import type { ValidationError } from "@effect-app/infra/errors";
|
|
3
4
|
import type { RequestContextContainer } from "@effect-app/infra/services/RequestContextContainer";
|
|
4
5
|
import type { ContextMapContainer } from "@effect-app/infra/services/Store/ContextMapContainer";
|
|
@@ -15,5 +16,5 @@ export type Middleware<R, M, PathA extends Struct.Fields, CookieA extends Struct
|
|
|
15
16
|
handler: RequestHandler<R2 | PR | RequestContextContainer | ContextMapContainer, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>;
|
|
16
17
|
makeRequestLayer: Layer<PR, MiddlewareE, R2>;
|
|
17
18
|
};
|
|
18
|
-
export declare function makeRequestHandler<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, R2, PR, RErr, PPath extends `/${string}`, Config>(handler: RequestHandlerBase<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | ResE | MiddlewareE, R>) => Effect<HttpServerResponse.ServerResponse, never, RErr | R>, middlewareLayer?: Layer<PR, MiddlewareE, R2>): Effect<HttpServerResponse.ServerResponse, HttpServerError.RequestError, HttpRouter.RouteContext | HttpServerRequest.ServerRequest | RequestContextContainer | ContextMapContainer | RErr | Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR> | R2>;
|
|
19
|
+
export declare function makeRequestHandler<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, R2, PR, RErr, PPath extends `/${string}`, Config>(handler: RequestHandlerBase<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | ResE | MiddlewareE, R>) => Effect<HttpServerResponse.ServerResponse, never, RErr | R>, middlewareLayer?: Layer<PR, MiddlewareE, R2>): Effect<HttpServerResponse.ServerResponse, HttpServerError.RequestError, HttpRouter.RouteContext | HttpServerRequest.ServerRequest | RequestContextContainer | ContextMapContainer | RequestFiberSet | RErr | Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR> | R2>;
|
|
19
20
|
//# sourceMappingURL=makeRequestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"makeRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { copy, pretty } from "@effect-app/core/utils";
|
|
2
|
+
import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
|
|
2
3
|
import { snipString } from "@effect-app/infra/api/util";
|
|
3
4
|
import { reportError } from "@effect-app/infra/errorReporter";
|
|
4
5
|
import { Console, Effect, FiberRef, Option, S } from "effect-app";
|
|
@@ -37,7 +38,8 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
37
38
|
headers: req.headers,
|
|
38
39
|
cookies: {} // req.cookies
|
|
39
40
|
}));
|
|
40
|
-
return Effect
|
|
41
|
+
return Effect
|
|
42
|
+
.uninterruptibleMask((restore) => Effect
|
|
41
43
|
.gen(function* ($) {
|
|
42
44
|
const req = yield* $(HttpServerRequest.ServerRequest);
|
|
43
45
|
const res = HttpServerResponse
|
|
@@ -95,7 +97,7 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
95
97
|
? Effect.provide(r, middlewareLayer)
|
|
96
98
|
// PR is not relevant here
|
|
97
99
|
: r;
|
|
98
|
-
return errorHandler(req, res, r2);
|
|
100
|
+
return errorHandler(req, res, r2.pipe(Effect.andThen(RequestFiberSet.register)));
|
|
99
101
|
})), Effect
|
|
100
102
|
.catchAllCause((cause) => Effect
|
|
101
103
|
.sync(() => HttpServerResponse.setStatus(res, 500))
|
|
@@ -147,4 +149,4 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
147
149
|
name: NonEmptyString255(handler.name)
|
|
148
150
|
})))));
|
|
149
151
|
}
|
|
150
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeRequestHandler.js","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,5 @@ import type { HttpServerRequest, HttpServerResponse } from "effect-app/http";
|
|
|
8
8
|
import type { RequestHandler } from "./base.js";
|
|
9
9
|
import type { Middleware } from "./makeRequestHandler.js";
|
|
10
10
|
export declare const RouteDescriptors: Context.Tag<Ref<RouteDescriptorAny[]>, Ref<RouteDescriptorAny[]>>;
|
|
11
|
-
export declare function match<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, PPath extends `/${string}`, R2, PR, RErr, CTX, Context, Config>(requestHandler: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>) => Effect<HttpServerResponse.ServerResponse, never, Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>>, middleware?: Middleware<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, MiddlewareE, PPath, R2, PR, CTX, Context, Config>): Effect.Effect<HttpRouter.Route<import("../../services/RequestContextContainer.js").RequestContextContainer | import("../../services/Store/ContextMapContainer.js").ContextMapContainer | Exclude<R2, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<RErr, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<Exclude<Exclude<R, import("effect-app/utils").EnforceNonEmptyRecord<M>>, PR>, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext>, import("@effect/platform/Http/ServerError").RequestError>, never, never>;
|
|
11
|
+
export declare function match<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, PPath extends `/${string}`, R2, PR, RErr, CTX, Context, Config>(requestHandler: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>) => Effect<HttpServerResponse.ServerResponse, never, Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>>, middleware?: Middleware<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, MiddlewareE, PPath, R2, PR, CTX, Context, Config>): Effect.Effect<HttpRouter.Route<import("../../services/RequestContextContainer.js").RequestContextContainer | import("../../services/Store/ContextMapContainer.js").ContextMapContainer | import("@effect-app/infra-adapters/RequestFiberSet").RequestFiberSet | Exclude<R2, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<RErr, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<Exclude<Exclude<R, import("effect-app/utils").EnforceNonEmptyRecord<M>>, PR>, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext>, import("@effect/platform/Http/ServerError").RequestError>, never, never>;
|
|
12
12
|
//# sourceMappingURL=match.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../../src/api/routing/match.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,KAAK,EAAS,GAAG,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEzD,eAAO,MAAM,gBAAgB,mEAA8E,CAAA;AAE3G,wBAAgB,KAAK,CACnB,CAAC,EACD,CAAC,EACD,KAAK,SAAS,MAAM,CAAC,MAAM,EAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAC7B,MAAM,SAAS,MAAM,CAAC,MAAM,EAC5B,KAAK,SAAS,MAAM,CAAC,MAAM,EAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAC7B,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,SAAS,MAAM,CAAC,MAAM,EAC1B,IAAI,EACJ,WAAW,EACX,KAAK,SAAS,IAAI,MAAM,EAAE,EAC1B,EAAE,EACF,EAAE,EACF,IAAI,EACJ,GAAG,EACH,OAAO,EACP,MAAM,EAEN,cAAc,EAAE,cAAc,CAC5B,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,GAAG,EACH,OAAO,EACP,MAAM,CACP,EACD,YAAY,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,iBAAiB,CAAC,aAAa,EACpC,GAAG,EAAE,kBAAkB,CAAC,cAAc,EACtC,EAAE,EAAE,MAAM,CAAC,kBAAkB,CAAC,cAAc,EAAE,eAAe,GAAG,WAAW,GAAG,IAAI,EAAE,CAAC,CAAC,KACnF,MAAM,CACT,kBAAkB,CAAC,cAAc,EACjC,KAAK,EACL,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,iBAAiB,CAAC,aAAa,GAAG,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC,CACrF,EACD,UAAU,CAAC,EAAE,UAAU,CACrB,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,KAAK,EACL,EAAE,EACF,EAAE,EACF,GAAG,EACH,OAAO,EACP,MAAM,CACP,
|
|
1
|
+
{"version":3,"file":"match.d.ts","sourceRoot":"","sources":["../../../src/api/routing/match.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,KAAK,EAAS,GAAG,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAE/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEzD,eAAO,MAAM,gBAAgB,mEAA8E,CAAA;AAE3G,wBAAgB,KAAK,CACnB,CAAC,EACD,CAAC,EACD,KAAK,SAAS,MAAM,CAAC,MAAM,EAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAC7B,MAAM,SAAS,MAAM,CAAC,MAAM,EAC5B,KAAK,SAAS,MAAM,CAAC,MAAM,EAC3B,OAAO,SAAS,MAAM,CAAC,MAAM,EAC7B,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,SAAS,MAAM,CAAC,MAAM,EAC1B,IAAI,EACJ,WAAW,EACX,KAAK,SAAS,IAAI,MAAM,EAAE,EAC1B,EAAE,EACF,EAAE,EACF,IAAI,EACJ,GAAG,EACH,OAAO,EACP,MAAM,EAEN,cAAc,EAAE,cAAc,CAC5B,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,GAAG,EACH,OAAO,EACP,MAAM,CACP,EACD,YAAY,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,iBAAiB,CAAC,aAAa,EACpC,GAAG,EAAE,kBAAkB,CAAC,cAAc,EACtC,EAAE,EAAE,MAAM,CAAC,kBAAkB,CAAC,cAAc,EAAE,eAAe,GAAG,WAAW,GAAG,IAAI,EAAE,CAAC,CAAC,KACnF,MAAM,CACT,kBAAkB,CAAC,cAAc,EACjC,KAAK,EACL,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,iBAAiB,CAAC,aAAa,GAAG,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC,CACrF,EACD,UAAU,CAAC,EAAE,UAAU,CACrB,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,KAAK,EACL,EAAE,EACF,EAAE,EACF,GAAG,EACH,OAAO,EACP,MAAM,CACP,4pBA+CF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "0.234.
|
|
3
|
+
"version": "0.234.5",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -19,9 +19,9 @@
|
|
|
19
19
|
"pure-rand": "6.1.0",
|
|
20
20
|
"redlock": "^4.2.0",
|
|
21
21
|
"@effect-app/core": "0.169.1",
|
|
22
|
-
"
|
|
23
|
-
"@effect-app/
|
|
24
|
-
"effect-app": "0.
|
|
22
|
+
"effect-app": "0.202.1",
|
|
23
|
+
"@effect-app/infra-adapters": "0.154.9",
|
|
24
|
+
"@effect-app/schema": "0.220.4"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@babel/cli": "^7.24.1",
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/ban-types */
|
|
3
3
|
import type { EnforceNonEmptyRecord } from "@effect-app/core/utils"
|
|
4
4
|
import { copy, pretty } from "@effect-app/core/utils"
|
|
5
|
+
import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet"
|
|
5
6
|
import { snipString } from "@effect-app/infra/api/util"
|
|
6
7
|
import { reportError } from "@effect-app/infra/errorReporter"
|
|
7
8
|
import type { ValidationError } from "@effect-app/infra/errors"
|
|
@@ -121,6 +122,7 @@ export function makeRequestHandler<
|
|
|
121
122
|
| HttpServerRequest.ServerRequest
|
|
122
123
|
| RequestContextContainer
|
|
123
124
|
| ContextMapContainer
|
|
125
|
+
| RequestFiberSet
|
|
124
126
|
| RErr
|
|
125
127
|
| Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>
|
|
126
128
|
| R2
|
|
@@ -164,178 +166,179 @@ export function makeRequestHandler<
|
|
|
164
166
|
})
|
|
165
167
|
)
|
|
166
168
|
|
|
167
|
-
return Effect
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
169
|
+
return Effect
|
|
170
|
+
.uninterruptibleMask((restore) =>
|
|
171
|
+
Effect
|
|
172
|
+
.gen(function*($) {
|
|
173
|
+
const req = yield* $(HttpServerRequest.ServerRequest)
|
|
174
|
+
const res = HttpServerResponse
|
|
175
|
+
.empty()
|
|
176
|
+
.pipe((_) => req.method === "GET" ? HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _)
|
|
174
177
|
|
|
175
|
-
|
|
178
|
+
const pars = yield* $(getParams)
|
|
176
179
|
|
|
177
|
-
|
|
180
|
+
const settings = yield* $(FiberRef.get(RequestSettings))
|
|
178
181
|
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
)
|
|
230
|
-
),
|
|
231
|
-
Effect.flatMap((parsedReq) =>
|
|
232
|
-
handle(parsedReq)
|
|
233
|
-
.pipe(
|
|
234
|
-
Effect.provideService(handler.Request.Tag, parsedReq as any),
|
|
235
|
-
Effect.flatMap(encoder),
|
|
236
|
-
Effect
|
|
237
|
-
.map((r) =>
|
|
238
|
-
res.pipe(
|
|
239
|
-
HttpServerResponse.setBody(HttpBody.unsafeJson(r)),
|
|
240
|
-
HttpServerResponse.setStatus(r === undefined ? 204 : 200)
|
|
241
|
-
)
|
|
242
|
-
)
|
|
182
|
+
const eff =
|
|
183
|
+
// TODO: we don;t have access to user id here cause context is not yet created
|
|
184
|
+
Effect
|
|
185
|
+
.logInfo("Incoming request")
|
|
186
|
+
.pipe(
|
|
187
|
+
Effect.annotateLogs({
|
|
188
|
+
method: req.method,
|
|
189
|
+
path: req.originalUrl,
|
|
190
|
+
...(settings.verbose
|
|
191
|
+
? {
|
|
192
|
+
reqPath: pretty(pars.params),
|
|
193
|
+
reqQuery: pretty(pars.query),
|
|
194
|
+
reqBody: pretty(pars.body),
|
|
195
|
+
reqCookies: pretty(pars.cookies),
|
|
196
|
+
reqHeaders: pretty(pars.headers)
|
|
197
|
+
}
|
|
198
|
+
: undefined)
|
|
199
|
+
}),
|
|
200
|
+
Effect
|
|
201
|
+
.andThen(
|
|
202
|
+
Effect.suspend(() => {
|
|
203
|
+
const handleRequest = parseRequest(pars)
|
|
204
|
+
.pipe(
|
|
205
|
+
Effect.map(({ body, path, query }) => {
|
|
206
|
+
const hn = {
|
|
207
|
+
...body.pipe(Option.getOrUndefined) ?? {},
|
|
208
|
+
...query.pipe(Option.getOrUndefined) ?? {},
|
|
209
|
+
...path.pipe(Option.getOrUndefined) ?? {}
|
|
210
|
+
} as unknown as ReqA
|
|
211
|
+
return hn
|
|
212
|
+
}),
|
|
213
|
+
Effect.tap((parsedReq) =>
|
|
214
|
+
Effect.annotateCurrentSpan(
|
|
215
|
+
"requestInput",
|
|
216
|
+
Object.entries(parsedReq).reduce((prev, [key, value]: [string, unknown]) => {
|
|
217
|
+
prev[key] = key === "password"
|
|
218
|
+
? "<redacted>"
|
|
219
|
+
: typeof value === "string" || typeof value === "number" || typeof value === "boolean"
|
|
220
|
+
? typeof value === "string" && value.length > 256
|
|
221
|
+
? (value.substring(0, 253) + "...")
|
|
222
|
+
: value
|
|
223
|
+
: Array.isArray(value)
|
|
224
|
+
? `Array[${value.length}]`
|
|
225
|
+
: value === null || value === undefined
|
|
226
|
+
? `${value}`
|
|
227
|
+
: typeof value === "object" && value
|
|
228
|
+
? `Object[${Object.keys(value).length}]`
|
|
229
|
+
: typeof value
|
|
230
|
+
return prev
|
|
231
|
+
}, {} as Record<string, string | number | boolean>)
|
|
243
232
|
)
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
233
|
+
),
|
|
234
|
+
Effect.flatMap((parsedReq) =>
|
|
235
|
+
handle(parsedReq)
|
|
236
|
+
.pipe(
|
|
237
|
+
Effect.provideService(handler.Request.Tag, parsedReq as any),
|
|
238
|
+
Effect.flatMap(encoder),
|
|
239
|
+
Effect
|
|
240
|
+
.map((r) =>
|
|
241
|
+
res.pipe(
|
|
242
|
+
HttpServerResponse.setBody(HttpBody.unsafeJson(r)),
|
|
243
|
+
HttpServerResponse.setStatus(r === undefined ? 204 : 200)
|
|
244
|
+
)
|
|
245
|
+
)
|
|
246
|
+
)
|
|
247
|
+
)
|
|
248
|
+
) as Effect<
|
|
249
|
+
HttpServerResponse.ServerResponse,
|
|
250
|
+
ValidationError | ResE,
|
|
251
|
+
Exclude<R, EnforceNonEmptyRecord<M>>
|
|
252
|
+
>
|
|
250
253
|
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
254
|
+
// Commands should not be interruptable.
|
|
255
|
+
const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : restore(handleRequest) // .instrument("Performance.RequestResponse")
|
|
256
|
+
const r2 = middlewareLayer
|
|
257
|
+
? Effect.provide(r, middlewareLayer)
|
|
258
|
+
// PR is not relevant here
|
|
259
|
+
: (r as Effect<
|
|
260
|
+
HttpServerResponse.ServerResponse,
|
|
261
|
+
ResE | MiddlewareE | ValidationError,
|
|
262
|
+
Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>
|
|
263
|
+
>)
|
|
264
|
+
return errorHandler(
|
|
265
|
+
req,
|
|
266
|
+
res,
|
|
267
|
+
r2.pipe(Effect.andThen(RequestFiberSet.register))
|
|
268
|
+
)
|
|
269
|
+
})
|
|
270
|
+
),
|
|
271
|
+
Effect
|
|
272
|
+
.catchAllCause((cause) =>
|
|
273
|
+
Effect
|
|
274
|
+
.sync(() => HttpServerResponse.setStatus(res, 500))
|
|
275
|
+
.pipe(Effect
|
|
276
|
+
.tap((res) =>
|
|
277
|
+
Effect
|
|
278
|
+
.all([
|
|
279
|
+
reportError("request")(cause, {
|
|
280
|
+
path: req.originalUrl,
|
|
281
|
+
method: req.method
|
|
282
|
+
}),
|
|
283
|
+
Effect.suspend(() => {
|
|
284
|
+
const headers = res.headers
|
|
285
|
+
return Effect
|
|
286
|
+
.logError("Finished request", cause)
|
|
287
|
+
.pipe(Effect.annotateLogs({
|
|
288
|
+
method: req.method,
|
|
289
|
+
path: req.originalUrl,
|
|
290
|
+
statusCode: res.status.toString(),
|
|
288
291
|
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
292
|
+
reqPath: pretty(pars.params),
|
|
293
|
+
reqQuery: pretty(pars.query),
|
|
294
|
+
reqBody: pretty(pars.body),
|
|
295
|
+
reqCookies: pretty(pars.cookies),
|
|
296
|
+
reqHeaders: pretty(pars.headers),
|
|
294
297
|
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
298
|
+
resHeaders: pretty(
|
|
299
|
+
Object
|
|
300
|
+
.entries(headers)
|
|
301
|
+
.reduce((prev, [key, value]) => {
|
|
302
|
+
prev[key] = value && typeof value === "string" ? snipString(value) : value
|
|
303
|
+
return prev
|
|
304
|
+
}, {} as Record<string, any>)
|
|
305
|
+
)
|
|
306
|
+
}))
|
|
307
|
+
})
|
|
308
|
+
], { concurrency: "inherit" })
|
|
309
|
+
))
|
|
310
|
+
.pipe(
|
|
311
|
+
Effect.tapErrorCause((cause) => Console.error("Error occurred while reporting error", cause))
|
|
312
|
+
)
|
|
313
|
+
),
|
|
314
|
+
Effect
|
|
315
|
+
.tap((res) =>
|
|
316
|
+
Effect
|
|
317
|
+
.logInfo("Finished request")
|
|
318
|
+
.pipe(Effect.annotateLogs({
|
|
319
|
+
method: req.method,
|
|
320
|
+
path: req.originalUrl,
|
|
321
|
+
statusCode: res.status.toString(),
|
|
322
|
+
...(settings.verbose
|
|
323
|
+
? {
|
|
324
|
+
resHeaders: pretty(res.headers)
|
|
325
|
+
}
|
|
326
|
+
: undefined)
|
|
327
|
+
}))
|
|
328
|
+
)
|
|
329
|
+
)
|
|
327
330
|
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
331
|
+
return yield* $(eff)
|
|
332
|
+
})
|
|
333
|
+
.pipe((_) =>
|
|
334
|
+
updateRequestContext(
|
|
335
|
+
_,
|
|
336
|
+
copy((_) => ({
|
|
337
|
+
name: NonEmptyString255(
|
|
338
|
+
handler.name
|
|
339
|
+
)
|
|
340
|
+
}))
|
|
341
|
+
)
|
|
338
342
|
)
|
|
339
|
-
|
|
340
|
-
)
|
|
343
|
+
)
|
|
341
344
|
}
|