@effect-app/infra 2.1.1 → 2.2.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 +13 -0
- package/_cjs/api/routing/DynamicMiddleware.cjs +6 -7
- package/_cjs/api/routing/DynamicMiddleware.cjs.map +1 -1
- package/_cjs/api/routing.cjs +115 -112
- package/_cjs/api/routing.cjs.map +1 -1
- package/dist/api/routing/DynamicMiddleware.d.ts +8 -7
- package/dist/api/routing/DynamicMiddleware.d.ts.map +1 -1
- package/dist/api/routing/DynamicMiddleware.js +7 -8
- package/dist/api/routing.d.ts +49 -27
- package/dist/api/routing.d.ts.map +1 -1
- package/dist/api/routing.js +150 -122
- package/dist/services/CUPS.d.ts +1 -1
- package/package.json +1 -21
- package/src/api/routing/DynamicMiddleware.ts +30 -26
- package/src/api/routing.ts +360 -344
- package/tsconfig.src.json +1 -1
- package/_cjs/api/routing2.cjs +0 -270
- package/_cjs/api/routing2.cjs.map +0 -1
- package/_cjs/api/routing3.cjs +0 -187
- package/_cjs/api/routing3.cjs.map +0 -1
- package/dist/api/routing2.d.ts +0 -112
- package/dist/api/routing2.d.ts.map +0 -1
- package/dist/api/routing2.js +0 -302
- package/dist/api/routing3.d.ts +0 -108
- package/dist/api/routing3.d.ts.map +0 -1
- package/dist/api/routing3.js +0 -206
- package/src/api/routing2.ts +0 -757
- package/src/api/routing3.ts +0 -510
package/dist/api/routing3.js
DELETED
|
@@ -1,206 +0,0 @@
|
|
|
1
|
-
import { Rpc, RpcRouter } from "@effect/rpc";
|
|
2
|
-
import { Cause, Chunk, Context, Effect, FiberRef, flow, Layer, Predicate, S, Schema, Scope, Stream, Tracer } from "effect-app";
|
|
3
|
-
import { HttpMiddleware, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http";
|
|
4
|
-
import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils";
|
|
5
|
-
import { logError, reportError } from "../errorReporter.js";
|
|
6
|
-
import { InfraLogger } from "../logger.js";
|
|
7
|
-
import { makeRpc } from "./routing/DynamicMiddleware.js";
|
|
8
|
-
const logRequestError = logError("Request");
|
|
9
|
-
const reportRequestError = reportError("Request");
|
|
10
|
-
/**
|
|
11
|
-
* Plain jane JSON version
|
|
12
|
-
* @deprecated use HttpRpcRouterNoStream.toHttpApp once support options
|
|
13
|
-
*/
|
|
14
|
-
export const toHttpApp = (self, options) => {
|
|
15
|
-
const handler = RpcRouter.toHandler(self, options);
|
|
16
|
-
return Effect.withFiberRuntime((fiber) => {
|
|
17
|
-
const context = fiber.getFiberRef(FiberRef.currentContext);
|
|
18
|
-
const request = Context.unsafeGet(context, HttpServerRequest.HttpServerRequest);
|
|
19
|
-
return Effect.flatMap(request.json, (_) => handler(_).pipe(Stream.provideContext(context), Stream.runCollect, Effect.map((_) => Chunk.toReadonlyArray(_)), Effect.andThen((_) => {
|
|
20
|
-
let status = 200;
|
|
21
|
-
for (const r of _.flat()) {
|
|
22
|
-
if (typeof r === "number")
|
|
23
|
-
continue;
|
|
24
|
-
const results = Array.isArray(r) ? r : [r];
|
|
25
|
-
if (results.some((_) => _._tag === "Failure" && _.cause._tag === "Die")) {
|
|
26
|
-
status = 500;
|
|
27
|
-
break;
|
|
28
|
-
}
|
|
29
|
-
if (results.some((_) => _._tag === "Failure" && _.cause._tag === "Fail")) {
|
|
30
|
-
status = 422; // 418
|
|
31
|
-
break;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
return HttpServerResponse.json(_, { status });
|
|
35
|
-
}), Effect.orDie, Effect.tapDefect(reportError("RPCHttpApp"))));
|
|
36
|
-
});
|
|
37
|
-
};
|
|
38
|
-
export const RouterSymbol = Symbol();
|
|
39
|
-
// export interface RouteMatcher<
|
|
40
|
-
// Filtered extends Record<string, any>,
|
|
41
|
-
// CTXMap extends Record<string, any>,
|
|
42
|
-
// Rsc extends Filtered
|
|
43
|
-
// > extends RouteMatcherInt<Filtered, CTXMap, Rsc> {}
|
|
44
|
-
export const makeRouter = (middleware, devMode) => {
|
|
45
|
-
const rpc = makeRpc(middleware);
|
|
46
|
-
function matchFor(rsc) {
|
|
47
|
-
const meta = rsc.meta;
|
|
48
|
-
const filtered = typedKeysOf(rsc).reduce((acc, cur) => {
|
|
49
|
-
if (Predicate.isObject(rsc[cur]) && rsc[cur]["success"]) {
|
|
50
|
-
acc[cur] = rsc[cur];
|
|
51
|
-
}
|
|
52
|
-
return acc;
|
|
53
|
-
}, {});
|
|
54
|
-
const items = typedKeysOf(filtered).reduce((prev, cur) => {
|
|
55
|
-
;
|
|
56
|
-
prev[cur] = Object.assign((fnOrEffect) => {
|
|
57
|
-
const stack = new Error().stack?.split("\n").slice(2).join("\n");
|
|
58
|
-
return Effect.isEffect(fnOrEffect)
|
|
59
|
-
? class {
|
|
60
|
-
static stack = stack;
|
|
61
|
-
static _tag = "d";
|
|
62
|
-
static handler = () => fnOrEffect;
|
|
63
|
-
}
|
|
64
|
-
: class {
|
|
65
|
-
static stack = stack;
|
|
66
|
-
static _tag = "d";
|
|
67
|
-
static handler = fnOrEffect;
|
|
68
|
-
};
|
|
69
|
-
}, {
|
|
70
|
-
success: rsc[cur].success,
|
|
71
|
-
successRaw: S.encodedSchema(rsc[cur].success),
|
|
72
|
-
failure: rsc[cur].failure,
|
|
73
|
-
raw: // "Raw" variations are for when you don't want to decode just to encode it again on the response
|
|
74
|
-
// e.g for direct projection from DB
|
|
75
|
-
// but more importantly, to skip Effectful decoders, like to resolve relationships from the database or remote client.
|
|
76
|
-
(fnOrEffect) => {
|
|
77
|
-
const stack = new Error().stack?.split("\n").slice(2).join("\n");
|
|
78
|
-
return Effect.isEffect(fnOrEffect)
|
|
79
|
-
? class {
|
|
80
|
-
static stack = stack;
|
|
81
|
-
static _tag = "raw";
|
|
82
|
-
static handler = () => fnOrEffect;
|
|
83
|
-
}
|
|
84
|
-
: class {
|
|
85
|
-
static stack = stack;
|
|
86
|
-
static _tag = "raw";
|
|
87
|
-
static handler = (req, ctx) => fnOrEffect(req, { ...ctx, Response: rsc[cur].success });
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
});
|
|
91
|
-
return prev;
|
|
92
|
-
}, {});
|
|
93
|
-
const effect = (layers, make) => {
|
|
94
|
-
const r = (class Router extends HttpRouter.Tag(`${meta.moduleName}Router`)() {
|
|
95
|
-
});
|
|
96
|
-
const layer = r.use((router) => Effect.gen(function* () {
|
|
97
|
-
const controllers = yield* make(items);
|
|
98
|
-
// return make.pipe(Effect.map((c) => controllers(c, layers)))
|
|
99
|
-
const mapped = typedKeysOf(filtered).reduce((acc, cur) => {
|
|
100
|
-
const handler = controllers[cur];
|
|
101
|
-
const req = rsc[cur];
|
|
102
|
-
acc[cur] = rpc.effect(handler._tag === "raw"
|
|
103
|
-
? class extends req {
|
|
104
|
-
static success = S.encodedSchema(req.success);
|
|
105
|
-
get [Schema.symbolSerializable]() {
|
|
106
|
-
return this.constructor;
|
|
107
|
-
}
|
|
108
|
-
get [Schema.symbolWithResult]() {
|
|
109
|
-
return {
|
|
110
|
-
failure: req.failure,
|
|
111
|
-
success: S.encodedSchema(req.success)
|
|
112
|
-
};
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
: req, (req) => Effect
|
|
116
|
-
.annotateCurrentSpan("requestInput", Object.entries(req).reduce((prev, [key, value]) => {
|
|
117
|
-
prev[key] = key === "password"
|
|
118
|
-
? "<redacted>"
|
|
119
|
-
: typeof value === "string" || typeof value === "number" || typeof value === "boolean"
|
|
120
|
-
? typeof value === "string" && value.length > 256
|
|
121
|
-
? (value.substring(0, 253) + "...")
|
|
122
|
-
: value
|
|
123
|
-
: Array.isArray(value)
|
|
124
|
-
? `Array[${value.length}]`
|
|
125
|
-
: value === null || value === undefined
|
|
126
|
-
? `${value}`
|
|
127
|
-
: typeof value === "object" && value
|
|
128
|
-
? `Object[${Object.keys(value).length}]`
|
|
129
|
-
: typeof value;
|
|
130
|
-
return prev;
|
|
131
|
-
}, {}))
|
|
132
|
-
.pipe(
|
|
133
|
-
// can't use andThen due to some being a function and effect
|
|
134
|
-
Effect.zipRight(handler.handler(req)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
|
|
135
|
-
.all([
|
|
136
|
-
reportRequestError(cause, {
|
|
137
|
-
action: `${meta.moduleName}.${req._tag}`
|
|
138
|
-
}),
|
|
139
|
-
Rpc.currentHeaders.pipe(Effect.andThen((headers) => {
|
|
140
|
-
return InfraLogger
|
|
141
|
-
.logError("Finished request", cause)
|
|
142
|
-
.pipe(Effect.annotateLogs({
|
|
143
|
-
action: `${meta.moduleName}.${req._tag}`,
|
|
144
|
-
req: pretty(req),
|
|
145
|
-
headers: pretty(headers)
|
|
146
|
-
// resHeaders: pretty(
|
|
147
|
-
// Object
|
|
148
|
-
// .entries(headers)
|
|
149
|
-
// .reduce((prev, [key, value]) => {
|
|
150
|
-
// prev[key] = value && typeof value === "string" ? snipString(value) : value
|
|
151
|
-
// return prev
|
|
152
|
-
// }, {} as Record<string, any>)
|
|
153
|
-
// )
|
|
154
|
-
}));
|
|
155
|
-
}))
|
|
156
|
-
])), devMode ? (_) => _ : Effect.catchAllDefect(() => Effect.die("Internal Server Error")), Effect.withSpan("Request." + meta.moduleName + "." + req._tag, {
|
|
157
|
-
captureStackTrace: () => handler.stack
|
|
158
|
-
})), meta.moduleName); // TODO
|
|
159
|
-
return acc;
|
|
160
|
-
}, {});
|
|
161
|
-
const rpcRouter = RpcRouter.make(...Object.values(mapped));
|
|
162
|
-
const httpApp = toHttpApp(rpcRouter, {
|
|
163
|
-
spanPrefix: rsc
|
|
164
|
-
.meta
|
|
165
|
-
.moduleName + "."
|
|
166
|
-
});
|
|
167
|
-
const services = (yield* Effect.context()).pipe(Context.omit(Scope.Scope), Context.omit(Tracer.ParentSpan));
|
|
168
|
-
yield* router
|
|
169
|
-
.all("/", (httpApp
|
|
170
|
-
.pipe(HttpMiddleware.make(Effect.provide(services)))),
|
|
171
|
-
// TODO: not queries.
|
|
172
|
-
{ uninterruptible: true });
|
|
173
|
-
}));
|
|
174
|
-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
|
|
175
|
-
const routes = layer.pipe(Layer.provideMerge(r.Live), layers ? Layer.provide(layers) : (_) => _);
|
|
176
|
-
// Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
|
|
177
|
-
return {
|
|
178
|
-
moduleName: meta.moduleName,
|
|
179
|
-
Router: r,
|
|
180
|
-
routes
|
|
181
|
-
};
|
|
182
|
-
};
|
|
183
|
-
return effect;
|
|
184
|
-
}
|
|
185
|
-
function matchAll(handlers, requestLayer) {
|
|
186
|
-
const routers = typedValuesOf(handlers);
|
|
187
|
-
const rootRouter = class extends HttpRouter.Tag("RootRouter")() {
|
|
188
|
-
};
|
|
189
|
-
const r = rootRouter
|
|
190
|
-
.use((router) => Effect.gen(function* () {
|
|
191
|
-
for (const route of routers) {
|
|
192
|
-
yield* router.mount(("/rpc/" + route.moduleName), yield* route
|
|
193
|
-
.Router
|
|
194
|
-
.router
|
|
195
|
-
.pipe(Effect.map(HttpRouter.use(flow(Effect.provide(requestLayer))))));
|
|
196
|
-
}
|
|
197
|
-
}))
|
|
198
|
-
.pipe(Layer.provide(routers.map((r) => r.routes).flat()));
|
|
199
|
-
return {
|
|
200
|
-
layer: r,
|
|
201
|
-
Router: rootRouter
|
|
202
|
-
};
|
|
203
|
-
}
|
|
204
|
-
return { matchAll, matchFor };
|
|
205
|
-
};
|
|
206
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing3.js","sourceRoot":"","sources":["../../src/api/routing3.ts"],"names":[],"mappings":"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"}
|