@adaptivestone/framework 5.6.0 → 5.7.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 +78 -1
- package/README.md +98 -0
- package/dist/clusterRunner.js +9 -4
- package/dist/clusterRunner.js.map +1 -1
- package/dist/codegen/appTypes.js +9 -6
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/astEmit.js +7 -0
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/astExtract.d.ts +3 -0
- package/dist/codegen/astExtract.js +1 -0
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/astResolve.d.ts +2 -0
- package/dist/codegen/astResolve.js +1 -0
- package/dist/codegen/astResolve.js.map +1 -1
- package/dist/codegen/emit.js +1 -1
- package/dist/codegen/index.js +1 -1
- package/dist/codegen/index.js.map +1 -1
- package/dist/commands/CreateUser.d.ts +1 -0
- package/dist/commands/CreateUser.js +1 -0
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/commands/SyncIndexes.js +4 -12
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Migrate.js +3 -2
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/config/http.d.ts +1 -0
- package/dist/config/http.js +13 -2
- package/dist/config/http.js.map +1 -1
- package/dist/controllers/Auth.d.ts +22 -14
- package/dist/controllers/Auth.js +38 -72
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +1 -1
- package/dist/controllers/Auth.routes.gen.js +1 -1
- package/dist/controllers/Health.d.ts +8 -5
- package/dist/controllers/Health.js +11 -6
- package/dist/controllers/Health.js.map +1 -1
- package/dist/controllers/Health.routes.gen.d.ts +1 -1
- package/dist/controllers/Health.routes.gen.js +1 -1
- package/dist/controllers/Home.d.ts +3 -2
- package/dist/controllers/Home.js +6 -2
- package/dist/controllers/Home.js.map +1 -1
- package/dist/controllers/Home.routes.gen.d.ts +1 -1
- package/dist/controllers/Home.routes.gen.js +1 -1
- package/dist/controllers/index.js +83 -42
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.d.ts +6 -0
- package/dist/helpers/crypto.js +21 -4
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/helpers/logger.d.ts +3 -1
- package/dist/helpers/logger.js +11 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/passwordPolicy.d.ts +23 -0
- package/dist/helpers/passwordPolicy.js +62 -0
- package/dist/helpers/passwordPolicy.js.map +1 -0
- package/dist/helpers/redis/redisConnection.d.ts +1 -0
- package/dist/helpers/redis/redisConnection.js +1 -0
- package/dist/helpers/redis/redisConnection.js.map +1 -1
- package/dist/helpers/yup.d.ts +11 -5
- package/dist/helpers/yup.js +12 -6
- package/dist/helpers/yup.js.map +1 -1
- package/dist/locales/ru/translation.json +31 -0
- package/dist/models/Lock.d.ts +2 -2
- package/dist/models/Lock.js +64 -15
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/User.d.ts +5 -4
- package/dist/models/User.js +4 -4
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +2 -0
- package/dist/models/UserOld.js +9 -3
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/BaseCli.d.ts +5 -0
- package/dist/modules/BaseCli.js +10 -1
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.d.ts +22 -2
- package/dist/server.js +127 -18
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +16 -8
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/RedisDriver.js +15 -11
- package/dist/services/cache/drivers/RedisDriver.js.map +1 -1
- package/dist/services/http/ExpressResponseWriter.d.ts +30 -0
- package/dist/services/http/ExpressResponseWriter.js +447 -0
- package/dist/services/http/ExpressResponseWriter.js.map +1 -0
- package/dist/services/http/HttpServer.d.ts +17 -11
- package/dist/services/http/HttpServer.js +71 -23
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/ResponseWriter.d.ts +11 -0
- package/dist/services/http/ResponseWriter.js +2 -0
- package/dist/services/http/ResponseWriter.js.map +1 -0
- package/dist/services/http/builtInResponse.d.ts +26 -0
- package/dist/services/http/builtInResponse.js +70 -0
- package/dist/services/http/builtInResponse.js.map +1 -0
- package/dist/services/http/builtinErrorHandlers.d.ts +60 -7
- package/dist/services/http/builtinErrorHandlers.js +86 -5
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/files.d.ts +21 -8
- package/dist/services/http/files.js +2 -18
- package/dist/services/http/files.js.map +1 -1
- package/dist/services/http/httpErrors.d.ts +40 -2
- package/dist/services/http/httpErrors.js +50 -2
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/Cors.js +5 -0
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/IpDetector.js +23 -4
- package/dist/services/http/middleware/IpDetector.js.map +1 -1
- package/dist/services/http/middleware/Pagination.js +4 -2
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.d.ts +1 -0
- package/dist/services/http/middleware/RateLimiter.js +37 -13
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +9 -3
- package/dist/services/http/middleware/RequestParser.js +108 -36
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/responses.d.ts +114 -0
- package/dist/services/http/responses.js +191 -0
- package/dist/services/http/responses.js.map +1 -0
- package/dist/services/http/routing/ExpressAdapter.d.ts +4 -1
- package/dist/services/http/routing/ExpressAdapter.js +82 -9
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/RouteRegistry.js +21 -10
- package/dist/services/http/routing/RouteRegistry.js.map +1 -1
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +2 -1
- package/dist/services/validate/ValidationError.d.ts +8 -1
- package/dist/services/validate/ValidationError.js +10 -2
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/dist/services/validate/drivers/YupDriver.js +44 -6
- package/dist/services/validate/drivers/YupDriver.js.map +1 -1
- package/dist/tests/setupFramework.d.ts +4 -1
- package/dist/tests/setupFramework.js +15 -9
- package/dist/tests/setupFramework.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,15 +1,20 @@
|
|
|
1
1
|
import http from 'node:http';
|
|
2
2
|
import express from 'express';
|
|
3
|
+
import { warmPasswordVerify } from '../../helpers/crypto.js';
|
|
4
|
+
import { describeThrown } from '../../helpers/logger.js';
|
|
3
5
|
import { translateWithDefault } from '../../helpers/translate.js';
|
|
4
6
|
import Base from '../../modules/Base.js';
|
|
5
|
-
import { builtInErrorHandlers,
|
|
7
|
+
import { builtInErrorHandlers, errorResultResponse, markErrorHandlerFailed, resolvedErrorResponse, serverErrorMessage, serverErrorResponse, toLoggableError, } from './builtinErrorHandlers.js';
|
|
8
|
+
import { ExpressResponseWriter } from './ExpressResponseWriter.js';
|
|
9
|
+
import { FRAMEWORK_ERROR_CODES } from './httpErrors.js';
|
|
6
10
|
import Cors from './middleware/Cors.js';
|
|
7
11
|
import I18nMiddleware from './middleware/I18n.js';
|
|
8
12
|
import IpDetector from './middleware/IpDetector.js';
|
|
9
13
|
import PrepareAppInfoMiddleware from './middleware/PrepareAppInfo.js';
|
|
10
14
|
import RequestLoggerMiddleware from './middleware/RequestLogger.js';
|
|
11
15
|
import RequestParserMiddleware from './middleware/RequestParser.js';
|
|
12
|
-
import {
|
|
16
|
+
import { HttpResponse } from './responses.js';
|
|
17
|
+
import { createExpressAdapter, failure } from './routing/ExpressAdapter.js';
|
|
13
18
|
import { RouteRegistry } from './routing/RouteRegistry.js';
|
|
14
19
|
/**
|
|
15
20
|
* HTTP server based on Express
|
|
@@ -18,11 +23,17 @@ class HttpServer extends Base {
|
|
|
18
23
|
express;
|
|
19
24
|
httpServer;
|
|
20
25
|
routeRegistry;
|
|
26
|
+
/** Renders route handlers' `HttpResponse` values and the framework's own responses. */
|
|
27
|
+
responseWriter;
|
|
21
28
|
/** Consumer-registered error handlers — checked before the built-ins. */
|
|
22
29
|
#errorHandlers = [];
|
|
23
30
|
#builtInHandlers = builtInErrorHandlers();
|
|
24
|
-
constructor(app) {
|
|
31
|
+
constructor(app, options = {}) {
|
|
25
32
|
super(app);
|
|
33
|
+
this.responseWriter = new ExpressResponseWriter({
|
|
34
|
+
transform: options.transformResponse,
|
|
35
|
+
onTransformError: (message) => this.logger?.error(message),
|
|
36
|
+
});
|
|
26
37
|
this.express = express();
|
|
27
38
|
this.express.disable('x-powered-by');
|
|
28
39
|
this.routeRegistry = new RouteRegistry();
|
|
@@ -66,6 +77,8 @@ class HttpServer extends Base {
|
|
|
66
77
|
* mounted, so no request reaches a partly built app.
|
|
67
78
|
*/
|
|
68
79
|
listen() {
|
|
80
|
+
// The dummy hash unknown-account logins compare against; not awaited.
|
|
81
|
+
warmPasswordVerify();
|
|
69
82
|
const httpConfig = this.app.getConfig('http');
|
|
70
83
|
return new Promise((resolve) => {
|
|
71
84
|
const listener = this.httpServer.listen(httpConfig.port, httpConfig.hostname, () => {
|
|
@@ -83,7 +96,7 @@ class HttpServer extends Base {
|
|
|
83
96
|
}
|
|
84
97
|
/** Mount the route adapter — single entry to the registry. */
|
|
85
98
|
mountAdapter() {
|
|
86
|
-
this.express.use(createExpressAdapter(this.routeRegistry, this.app));
|
|
99
|
+
this.express.use(createExpressAdapter(this.routeRegistry, this.app, this.responseWriter));
|
|
87
100
|
}
|
|
88
101
|
/**
|
|
89
102
|
* Register a handler mapping a thrown error class to an HTTP response.
|
|
@@ -116,28 +129,43 @@ class HttpServer extends Base {
|
|
|
116
129
|
/**
|
|
117
130
|
* Resolve a thrown error through the registry: consumer tier first, then
|
|
118
131
|
* built-ins; first `instanceof` match returning non-null wins. A handler
|
|
119
|
-
* that itself throws
|
|
120
|
-
*
|
|
121
|
-
*
|
|
122
|
-
*
|
|
132
|
+
* that itself throws, or returns a result that is not a valid response,
|
|
133
|
+
* aborts the walk (logged here at `error`; the caller answers its 500, even
|
|
134
|
+
* where it has a fallback response) — never a crash loop. Returns null when no entry produced a response.
|
|
135
|
+
* `response` is what gets sent; `status`/`body`/`headers` repeat a
|
|
136
|
+
* `{ status, body }` result (for an `HttpResponse` result: its status and
|
|
137
|
+
* JSON body). Called by the route-handler and validation catches and by the
|
|
138
|
+
* final sink, which receives middleware errors.
|
|
123
139
|
*/
|
|
124
140
|
async resolveError(err, req) {
|
|
125
141
|
for (const entry of [...this.#errorHandlers, ...this.#builtInHandlers]) {
|
|
126
142
|
if (err instanceof entry.errorClass) {
|
|
127
143
|
let result;
|
|
144
|
+
let response = null;
|
|
128
145
|
try {
|
|
129
146
|
result = await entry.handler(err, req);
|
|
147
|
+
if (result != null) {
|
|
148
|
+
response = HttpResponse.is(result)
|
|
149
|
+
? result
|
|
150
|
+
: errorResultResponse(result);
|
|
151
|
+
}
|
|
130
152
|
}
|
|
131
153
|
catch (handlerErr) {
|
|
132
154
|
// Keep the stack — a broken consumer handler is exactly the case
|
|
133
155
|
// where `${err}` (message-only) isn't enough to debug.
|
|
134
|
-
this.logger?.error(`Error handler for ${entry.errorClass.name} threw: ${handlerErr
|
|
135
|
-
|
|
136
|
-
: handlerErr}`);
|
|
156
|
+
this.logger?.error(`Error handler for ${entry.errorClass.name} threw: ${describeThrown(handlerErr)}`);
|
|
157
|
+
markErrorHandlerFailed(req);
|
|
137
158
|
return null;
|
|
138
159
|
}
|
|
139
|
-
if (
|
|
140
|
-
|
|
160
|
+
if (response) {
|
|
161
|
+
const legacy = HttpResponse.is(result)
|
|
162
|
+
? {
|
|
163
|
+
status: response.status,
|
|
164
|
+
body: response.kind === 'json' ? response.body : undefined,
|
|
165
|
+
}
|
|
166
|
+
: result;
|
|
167
|
+
const logLevel = entry.logLevelFor?.(err) ?? entry.logLevel;
|
|
168
|
+
return { ...legacy, response, logLevel };
|
|
141
169
|
}
|
|
142
170
|
}
|
|
143
171
|
}
|
|
@@ -147,11 +175,14 @@ class HttpServer extends Base {
|
|
|
147
175
|
* Add handle for 404 error
|
|
148
176
|
*/
|
|
149
177
|
add404Page() {
|
|
150
|
-
this.express.use((req, res) => {
|
|
151
|
-
|
|
152
|
-
|
|
178
|
+
this.express.use((req, res, next) => {
|
|
179
|
+
const notFound = HttpResponse.json(404, {
|
|
180
|
+
error: FRAMEWORK_ERROR_CODES.notFound,
|
|
153
181
|
message: translateWithDefault(req, 'http.notFound', 'Not found'),
|
|
154
182
|
});
|
|
183
|
+
return this.responseWriter
|
|
184
|
+
.write(notFound, req, res)
|
|
185
|
+
.catch((err) => next(failure(err)));
|
|
155
186
|
});
|
|
156
187
|
}
|
|
157
188
|
/**
|
|
@@ -166,18 +197,35 @@ class HttpServer extends Base {
|
|
|
166
197
|
// nothing can be sent — hand off to the default finalizer instead of
|
|
167
198
|
// crashing with ERR_HTTP_HEADERS_SENT.
|
|
168
199
|
if (res.headersSent) {
|
|
169
|
-
this.logger?.error(`Unhandled request error: ${err
|
|
200
|
+
this.logger?.error(`Unhandled request error: ${describeThrown(err)}`);
|
|
170
201
|
return next(err);
|
|
171
202
|
}
|
|
172
|
-
const
|
|
203
|
+
const frameworkReq = req;
|
|
204
|
+
const resolved = await this.resolveError(err, frameworkReq);
|
|
173
205
|
if (resolved) {
|
|
174
206
|
this.logger?.[resolved.logLevel](toLoggableError(err));
|
|
175
|
-
return sendErrorResult(res, resolved);
|
|
176
207
|
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
208
|
+
else {
|
|
209
|
+
this.logger?.error(`Unhandled request error: ${describeThrown(err)}`);
|
|
210
|
+
}
|
|
211
|
+
try {
|
|
212
|
+
await this.responseWriter.write(resolved
|
|
213
|
+
? resolvedErrorResponse(resolved)
|
|
214
|
+
: serverErrorResponse(frameworkReq), req, res);
|
|
215
|
+
}
|
|
216
|
+
catch (writeErr) {
|
|
217
|
+
// The error response itself failed (e.g. a body JSON cannot encode):
|
|
218
|
+
// fall back to the plain 500, without the writer or the transform.
|
|
219
|
+
this.logger?.error(`Error response could not be written: ${describeThrown(writeErr)}`);
|
|
220
|
+
if (!res.headersSent) {
|
|
221
|
+
// A type left on res from before must not label the JSON body.
|
|
222
|
+
res.setHeader('Content-Type', 'application/json');
|
|
223
|
+
res.status(500).json({
|
|
224
|
+
error: FRAMEWORK_ERROR_CODES.serverError,
|
|
225
|
+
message: serverErrorMessage(frameworkReq),
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
}
|
|
181
229
|
});
|
|
182
230
|
}
|
|
183
231
|
static get loggerGroup() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../src/services/http/HttpServer.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAQ7B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAGzC,OAAO,EACL,oBAAoB,
|
|
1
|
+
{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../src/services/http/HttpServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { HttpResponse } from './responses.ts';
|
|
2
|
+
/**
|
|
3
|
+
* Renders an `HttpResponse` to one transport. A writer owns the status line,
|
|
4
|
+
* headers, serialization, stream backpressure and client-abort cleanup, and
|
|
5
|
+
* decides the point after which an error can no longer replace the response:
|
|
6
|
+
* `write` rejects with the error either way, and the caller can tell by
|
|
7
|
+
* whether headers were sent.
|
|
8
|
+
*/
|
|
9
|
+
export interface ResponseWriter<Req, Res> {
|
|
10
|
+
write(response: HttpResponse, req: Req, res: Res): Promise<void>;
|
|
11
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ResponseWriter.js","sourceRoot":"","sources":["../../../src/services/http/ResponseWriter.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { HttpResponse } from './responses.ts';
|
|
2
|
+
type Send = (response: HttpResponse) => void;
|
|
3
|
+
type LegacyResponse = {
|
|
4
|
+
statusCode: number;
|
|
5
|
+
headersSent: boolean;
|
|
6
|
+
req?: unknown;
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* Return `response` from a framework controller handler, remembering it in
|
|
10
|
+
* case an app override drops it (calls `super.x(req, res)` without returning
|
|
11
|
+
* the result); the adapter then sends it and warns once. It is kept under
|
|
12
|
+
* `req`, `res`, `req.res` and `res.req`, so it is found if any is the
|
|
13
|
+
* request's own (the override may pass a copy of `req`, a wrapper of `res`, or
|
|
14
|
+
* both). The status is also shown on `res` and `req.res` (`res.req.res` for
|
|
15
|
+
* a copy of `req` without one), where such an override reads it.
|
|
16
|
+
* Transitional: removed in v6.
|
|
17
|
+
*/
|
|
18
|
+
export declare function builtInResponse<T extends HttpResponse>(req: object, response: T, res?: LegacyResponse): T;
|
|
19
|
+
/**
|
|
20
|
+
* Pass `send` the response a framework handler produced and the override
|
|
21
|
+
* dropped: at once if there is one, else when it arrives. Both `req` and `res`
|
|
22
|
+
* are claimed, so a handler called without `res` is found too; the response is
|
|
23
|
+
* delivered once. Transitional: removed in v6.
|
|
24
|
+
*/
|
|
25
|
+
export declare function claimBuiltInResponse(req: object, res: object, send: Send): void;
|
|
26
|
+
export {};
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
// On `globalThis`, so every copy of this module (one bundled by a package) shares it.
|
|
2
|
+
const RECORDS = Symbol.for('@adaptivestone/framework/builtInResponse');
|
|
3
|
+
const shared = globalThis;
|
|
4
|
+
shared[RECORDS] ??= new WeakMap();
|
|
5
|
+
const responses = shared[RECORDS];
|
|
6
|
+
/**
|
|
7
|
+
* Return `response` from a framework controller handler, remembering it in
|
|
8
|
+
* case an app override drops it (calls `super.x(req, res)` without returning
|
|
9
|
+
* the result); the adapter then sends it and warns once. It is kept under
|
|
10
|
+
* `req`, `res`, `req.res` and `res.req`, so it is found if any is the
|
|
11
|
+
* request's own (the override may pass a copy of `req`, a wrapper of `res`, or
|
|
12
|
+
* both). The status is also shown on `res` and `req.res` (`res.req.res` for
|
|
13
|
+
* a copy of `req` without one), where such an override reads it.
|
|
14
|
+
* Transitional: removed in v6.
|
|
15
|
+
*/
|
|
16
|
+
export function builtInResponse(req, response, res) {
|
|
17
|
+
const own = req.res;
|
|
18
|
+
const keys = [res, req, own, res?.req].filter((key) => typeof key === 'object' && key !== null);
|
|
19
|
+
const claim = keys
|
|
20
|
+
.map((key) => responses.get(key))
|
|
21
|
+
.find((record) => !!record && !('response' in record));
|
|
22
|
+
if (claim) {
|
|
23
|
+
claim.send?.(response);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
for (const key of keys) {
|
|
27
|
+
responses.set(key, { response });
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
// An override may read the status after awaiting the built-in handler. Best
|
|
31
|
+
// effort: a wrapper may expose a read-only status.
|
|
32
|
+
const ownRes = own ?? res?.req?.res;
|
|
33
|
+
for (const transport of [res, ownRes]) {
|
|
34
|
+
if (transport && !transport.headersSent) {
|
|
35
|
+
try {
|
|
36
|
+
transport.statusCode = response.status;
|
|
37
|
+
}
|
|
38
|
+
catch {
|
|
39
|
+
// The response is still returned and delivered.
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return response;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Pass `send` the response a framework handler produced and the override
|
|
47
|
+
* dropped: at once if there is one, else when it arrives. Both `req` and `res`
|
|
48
|
+
* are claimed, so a handler called without `res` is found too; the response is
|
|
49
|
+
* delivered once. Transitional: removed in v6.
|
|
50
|
+
*/
|
|
51
|
+
export function claimBuiltInResponse(req, res, send) {
|
|
52
|
+
const record = responses.get(res) ?? responses.get(req);
|
|
53
|
+
if (record && !('response' in record)) {
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const claim = {};
|
|
57
|
+
responses.set(req, claim);
|
|
58
|
+
responses.set(res, claim);
|
|
59
|
+
if (record) {
|
|
60
|
+
send(record.response);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
claim.send = (response) => {
|
|
64
|
+
delete claim.send;
|
|
65
|
+
// Give the override's continuations a chance to answer first.
|
|
66
|
+
setImmediate(send, response);
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=builtInResponse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"builtInResponse.js","sourceRoot":"","sources":["../../../src/services/http/builtInResponse.ts"],"names":[],"mappings":"AAcA,sFAAsF;AACtF,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;AACvE,MAAM,MAAM,GAAG,UAAqC,CAAC;AACrD,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,CAAC;AAClC,MAAM,SAAS,GAAY,MAAM,CAAC,OAAO,CAAC,CAAC;AAE3C;;;;;;;;;GASG;AACH,MAAM,UAAU,eAAe,CAC7B,GAAW,EACX,QAAW,EACX,GAAoB;IAEpB,MAAM,GAAG,GAAI,GAAgC,CAAC,GAAG,CAAC;IAClD,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,MAAM,CAC3C,CAAC,GAAG,EAAiB,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,CAChE,CAAC;IACF,MAAM,KAAK,GAAG,IAAI;SACf,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAChC,IAAI,CAAC,CAAC,MAAM,EAAmB,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC,CAAC,CAAC;IAC1E,IAAI,KAAK,EAAE,CAAC;QACV,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;SAAM,CAAC;QACN,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,4EAA4E;IAC5E,mDAAmD;IACnD,MAAM,MAAM,GAAG,GAAG,IAAK,GAAG,EAAE,GAA4C,EAAE,GAAG,CAAC;IAC9E,KAAK,MAAM,SAAS,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC;QACtC,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,IAAI,CAAC;gBACH,SAAS,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;YACzC,CAAC;YAAC,MAAM,CAAC;gBACP,gDAAgD;YAClD,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,GAAW,EACX,GAAW,EACX,IAAU;IAEV,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxD,IAAI,MAAM,IAAI,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC,EAAE,CAAC;QACtC,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAU,EAAE,CAAC;IACxB,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,EAAE;YACxB,OAAO,KAAK,CAAC,IAAI,CAAC;YAClB,8DAA8D;YAC9D,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC/B,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Response } from 'express';
|
|
2
2
|
import mongoose from 'mongoose';
|
|
3
3
|
import type { FrameworkRequest } from './HttpServer.ts';
|
|
4
|
+
import { HttpResponse } from './responses.ts';
|
|
4
5
|
/** The `message` of every framework 500 response. */
|
|
5
6
|
export declare const serverErrorMessage: (req: FrameworkRequest) => string;
|
|
6
7
|
/** The `message` of every framework field-error (400) response. */
|
|
@@ -14,14 +15,62 @@ export interface ErrorHandlerResult {
|
|
|
14
15
|
/** Response headers, e.g. `{ 'Retry-After': '30' }` on a 429. */
|
|
15
16
|
headers?: Record<string, string>;
|
|
16
17
|
}
|
|
17
|
-
/**
|
|
18
|
+
/** A resolved error: the response to send, the entry's log level, and the legacy result fields. */
|
|
19
|
+
export interface ResolvedError extends ErrorHandlerResult {
|
|
20
|
+
response: HttpResponse;
|
|
21
|
+
logLevel: ErrorLogLevel;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Answer a resolved error: its headers, status and JSON body.
|
|
25
|
+
* @deprecated The framework sends `ResolvedError.response` through the response writer now; build one with `errorResultResponse`.
|
|
26
|
+
*/
|
|
18
27
|
export declare function sendErrorResult(res: Response, { status, body, headers }: ErrorHandlerResult): Response<any, Record<string, any>>;
|
|
19
|
-
|
|
28
|
+
/**
|
|
29
|
+
* A `{ status, body, headers }` result as the response `sendErrorResult` sent:
|
|
30
|
+
* JSON, with a `Content-Type` header kept as the media type, and no body for
|
|
31
|
+
* an undefined body or a status that never carries one.
|
|
32
|
+
*/
|
|
33
|
+
export declare function errorResultResponse({ status, body, headers, }: ErrorHandlerResult): HttpResponse;
|
|
34
|
+
/**
|
|
35
|
+
* @internal The response to send for a resolved error. A replaced
|
|
36
|
+
* `resolveError` may return only the legacy fields; it is built from those.
|
|
37
|
+
*/
|
|
38
|
+
export declare function resolvedErrorResponse(resolved: ErrorHandlerResult & {
|
|
39
|
+
response?: HttpResponse;
|
|
40
|
+
}): HttpResponse;
|
|
41
|
+
/** @internal Record that a registry handler failed for `req`, until `errorHandlerFailed` reads it. */
|
|
42
|
+
export declare function markErrorHandlerFailed(req: object): void;
|
|
43
|
+
/**
|
|
44
|
+
* @internal Did a registry handler fail for `req`? Its error answers the
|
|
45
|
+
* generic 500, never a caller's fallback response. Kept per request, so
|
|
46
|
+
* requests that throw the same error instance do not interfere. The read
|
|
47
|
+
* clears the mark.
|
|
48
|
+
*/
|
|
49
|
+
export declare function errorHandlerFailed(req: object): boolean;
|
|
50
|
+
/** The generic 500 answered for an error nothing in the registry resolved. */
|
|
51
|
+
export declare const serverErrorResponse: (req: FrameworkRequest) => import("./responses.ts").JsonResponse<500, {
|
|
52
|
+
error: "SERVER_ERROR";
|
|
53
|
+
message: string;
|
|
54
|
+
}, "application/json">;
|
|
55
|
+
/**
|
|
56
|
+
* What `registerErrorHandler` accepts: any `Error` subclass, including one that
|
|
57
|
+
* widens `message` (the framework's `ValidationError` carries its field
|
|
58
|
+
* payload there). Structural, so the core declarations need not import it.
|
|
59
|
+
*/
|
|
60
|
+
export type RegistrableError = Omit<Error, 'message'>;
|
|
61
|
+
/**
|
|
62
|
+
* Maps an error to a response: a `{ status, body, headers? }` result, an
|
|
63
|
+
* `HttpResponse` (for other content or full control), or `null`/`undefined`
|
|
64
|
+
* to pass to the next entry.
|
|
65
|
+
*/
|
|
66
|
+
export type ErrorHandlerFn<E extends RegistrableError = Error> = (err: E, req: FrameworkRequest) => ErrorHandlerResult | HttpResponse | null | undefined | Promise<ErrorHandlerResult | HttpResponse | null | undefined>;
|
|
20
67
|
/** A registered (class, handler, level) triple as stored by the registry. */
|
|
21
68
|
export interface RegisteredErrorHandler {
|
|
22
|
-
errorClass: abstract new (...args: never[]) =>
|
|
23
|
-
handler: ErrorHandlerFn
|
|
69
|
+
errorClass: abstract new (...args: never[]) => RegistrableError;
|
|
70
|
+
handler: ErrorHandlerFn<RegistrableError>;
|
|
24
71
|
logLevel: ErrorLogLevel;
|
|
72
|
+
/** @internal Picks the level per error; wins over `logLevel`. */
|
|
73
|
+
logLevelFor?: (err: RegistrableError) => ErrorLogLevel;
|
|
25
74
|
}
|
|
26
75
|
/**
|
|
27
76
|
* Sanitize an error for the RESOLVED-branch log line. A raw Mongoose
|
|
@@ -31,9 +80,12 @@ export interface RegisteredErrorHandler {
|
|
|
31
80
|
* body was sanitized. Rebuild a fresh `Error` that reuses the per-path
|
|
32
81
|
* `safeValidationMessage` texts under the safe static prefix
|
|
33
82
|
* (`<ModelName> validation failed`); its stack is minted here, input-free.
|
|
83
|
+
* A request `ValidationError` (its `message` is the field payload) becomes
|
|
84
|
+
* `Request validation failed (<n> fields)`: a path can be a client-supplied
|
|
85
|
+
* key, so neither paths, values nor per-field texts are logged.
|
|
34
86
|
* Anything else passes through untouched. The UNRESOLVED 500 path deliberately
|
|
35
|
-
* keeps logging the original error in full
|
|
36
|
-
* defect, and the developer needs every detail.
|
|
87
|
+
* keeps logging the original error in full (a request `ValidationError` aside):
|
|
88
|
+
* that branch is a server-side defect, and the developer needs every detail.
|
|
37
89
|
*/
|
|
38
90
|
export declare function toLoggableError(err: unknown): unknown;
|
|
39
91
|
/**
|
|
@@ -72,7 +124,8 @@ export declare function matchedClientCastError(err: mongoose.Error.CastError, re
|
|
|
72
124
|
* handlers ("yours win"):
|
|
73
125
|
* 1. `HttpError` → its own status, headers and
|
|
74
126
|
* `body ?? { error?: code, message }`, message translated via `i18nKey`;
|
|
75
|
-
* `verbose` (deliberate control flow, not a defect)
|
|
127
|
+
* `verbose` (deliberate control flow, not a defect), `error` for a 5xx
|
|
128
|
+
* (a server failure).
|
|
76
129
|
* 2. Escaped Mongoose `ValidationError` → the safety net above; `warn`
|
|
77
130
|
* (signals a route schema missing a constraint the model enforces).
|
|
78
131
|
* 3. Standalone Mongoose `CastError` → {@link matchedClientCastError}; `warn`
|
|
@@ -1,18 +1,85 @@
|
|
|
1
1
|
import mongoose from 'mongoose';
|
|
2
2
|
import { translateWithDefault } from '../../helpers/translate.js';
|
|
3
3
|
import { issuesToPayload, translateIssues, ValidationError, } from '../validate/ValidationError.js';
|
|
4
|
-
import { HttpError } from './httpErrors.js';
|
|
4
|
+
import { FRAMEWORK_ERROR_CODES, HttpError } from './httpErrors.js';
|
|
5
|
+
import { HttpResponse, NO_BODY_STATUSES } from './responses.js';
|
|
5
6
|
/** The `message` of every framework 500 response. */
|
|
6
7
|
export const serverErrorMessage = (req) => translateWithDefault(req, 'http.serverError', 'Something went wrong. Please try again later.');
|
|
7
8
|
/** The `message` of every framework field-error (400) response. */
|
|
8
9
|
export const validationFailedMessage = (req) => translateWithDefault(req, 'http.validationFailed', 'Validation failed');
|
|
9
|
-
/**
|
|
10
|
+
/**
|
|
11
|
+
* Answer a resolved error: its headers, status and JSON body.
|
|
12
|
+
* @deprecated The framework sends `ResolvedError.response` through the response writer now; build one with `errorResultResponse`.
|
|
13
|
+
*/
|
|
10
14
|
export function sendErrorResult(res, { status, body, headers }) {
|
|
11
15
|
for (const [name, value] of Object.entries(headers ?? {})) {
|
|
12
16
|
res.setHeader(name, value);
|
|
13
17
|
}
|
|
14
18
|
return res.status(status).json(body);
|
|
15
19
|
}
|
|
20
|
+
/**
|
|
21
|
+
* A `{ status, body, headers }` result as the response `sendErrorResult` sent:
|
|
22
|
+
* JSON, with a `Content-Type` header kept as the media type, and no body for
|
|
23
|
+
* an undefined body or a status that never carries one.
|
|
24
|
+
*/
|
|
25
|
+
export function errorResultResponse({ status, body, headers, }) {
|
|
26
|
+
// By lower-case name: a later header replaces an earlier one, as `setHeader`
|
|
27
|
+
// did, but cookies add up. Typed as a string, but a JavaScript app may pass
|
|
28
|
+
// an array: each cookie stays its own field, other values are joined.
|
|
29
|
+
const fields = new Map();
|
|
30
|
+
for (const [name, value] of Object.entries(headers ?? {})) {
|
|
31
|
+
const key = name.toLowerCase();
|
|
32
|
+
if (key === 'set-cookie') {
|
|
33
|
+
const cookies = Array.isArray(value) ? value : [value];
|
|
34
|
+
fields.set(key, [
|
|
35
|
+
...(fields.get(key) ?? []),
|
|
36
|
+
...cookies.map((cookie) => [name, String(cookie)]),
|
|
37
|
+
]);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
fields.set(key, [
|
|
41
|
+
[name, Array.isArray(value) ? value.join(', ') : value],
|
|
42
|
+
]);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
if (body === undefined || NO_BODY_STATUSES.has(status)) {
|
|
46
|
+
// `empty` owns no media type, so the header rides along unchanged.
|
|
47
|
+
return HttpResponse.empty(status, { headers: [...fields.values()].flat() });
|
|
48
|
+
}
|
|
49
|
+
const contentType = fields.get('content-type')?.[0]?.[1];
|
|
50
|
+
fields.delete('content-type');
|
|
51
|
+
return HttpResponse.json(status, body, {
|
|
52
|
+
headers: [...fields.values()].flat(),
|
|
53
|
+
contentType,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* @internal The response to send for a resolved error. A replaced
|
|
58
|
+
* `resolveError` may return only the legacy fields; it is built from those.
|
|
59
|
+
*/
|
|
60
|
+
export function resolvedErrorResponse(resolved) {
|
|
61
|
+
return resolved.response ?? errorResultResponse(resolved);
|
|
62
|
+
}
|
|
63
|
+
/** Requests a registry handler failed for (threw, or returned an invalid result). */
|
|
64
|
+
const failedHandlerRequests = new WeakSet();
|
|
65
|
+
/** @internal Record that a registry handler failed for `req`, until `errorHandlerFailed` reads it. */
|
|
66
|
+
export function markErrorHandlerFailed(req) {
|
|
67
|
+
failedHandlerRequests.add(req);
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* @internal Did a registry handler fail for `req`? Its error answers the
|
|
71
|
+
* generic 500, never a caller's fallback response. Kept per request, so
|
|
72
|
+
* requests that throw the same error instance do not interfere. The read
|
|
73
|
+
* clears the mark.
|
|
74
|
+
*/
|
|
75
|
+
export function errorHandlerFailed(req) {
|
|
76
|
+
return failedHandlerRequests.delete(req);
|
|
77
|
+
}
|
|
78
|
+
/** The generic 500 answered for an error nothing in the registry resolved. */
|
|
79
|
+
export const serverErrorResponse = (req) => HttpResponse.json(500, {
|
|
80
|
+
error: FRAMEWORK_ERROR_CODES.serverError,
|
|
81
|
+
message: serverErrorMessage(req),
|
|
82
|
+
});
|
|
16
83
|
/** A numeric/Date schema bound (both are constants, never input) → text. */
|
|
17
84
|
function renderBound(bound) {
|
|
18
85
|
if (typeof bound === 'number') {
|
|
@@ -109,9 +176,12 @@ function safeValidationMessage(error) {
|
|
|
109
176
|
* body was sanitized. Rebuild a fresh `Error` that reuses the per-path
|
|
110
177
|
* `safeValidationMessage` texts under the safe static prefix
|
|
111
178
|
* (`<ModelName> validation failed`); its stack is minted here, input-free.
|
|
179
|
+
* A request `ValidationError` (its `message` is the field payload) becomes
|
|
180
|
+
* `Request validation failed (<n> fields)`: a path can be a client-supplied
|
|
181
|
+
* key, so neither paths, values nor per-field texts are logged.
|
|
112
182
|
* Anything else passes through untouched. The UNRESOLVED 500 path deliberately
|
|
113
|
-
* keeps logging the original error in full
|
|
114
|
-
* defect, and the developer needs every detail.
|
|
183
|
+
* keeps logging the original error in full (a request `ValidationError` aside):
|
|
184
|
+
* that branch is a server-side defect, and the developer needs every detail.
|
|
115
185
|
*/
|
|
116
186
|
export function toLoggableError(err) {
|
|
117
187
|
// A standalone `CastError` ("Cast to ObjectId failed for value \"<input>\"")
|
|
@@ -125,6 +195,13 @@ export function toLoggableError(err) {
|
|
|
125
195
|
sanitized.name = 'CastError';
|
|
126
196
|
return sanitized;
|
|
127
197
|
}
|
|
198
|
+
if (ValidationError.isValidationError(err)) {
|
|
199
|
+
// Its `message` is the field payload; only the field count is logged.
|
|
200
|
+
const count = Object.keys(err.message).length;
|
|
201
|
+
const sanitized = new Error(`Request validation failed (${count} field${count === 1 ? '' : 's'})`);
|
|
202
|
+
sanitized.name = err.name;
|
|
203
|
+
return sanitized;
|
|
204
|
+
}
|
|
128
205
|
if (!(err instanceof mongoose.Error.ValidationError)) {
|
|
129
206
|
return err;
|
|
130
207
|
}
|
|
@@ -232,7 +309,8 @@ export function matchedClientCastError(err, req) {
|
|
|
232
309
|
* handlers ("yours win"):
|
|
233
310
|
* 1. `HttpError` → its own status, headers and
|
|
234
311
|
* `body ?? { error?: code, message }`, message translated via `i18nKey`;
|
|
235
|
-
* `verbose` (deliberate control flow, not a defect)
|
|
312
|
+
* `verbose` (deliberate control flow, not a defect), `error` for a 5xx
|
|
313
|
+
* (a server failure).
|
|
236
314
|
* 2. Escaped Mongoose `ValidationError` → the safety net above; `warn`
|
|
237
315
|
* (signals a route schema missing a constraint the model enforces).
|
|
238
316
|
* 3. Standalone Mongoose `CastError` → {@link matchedClientCastError}; `warn`
|
|
@@ -276,6 +354,7 @@ export function builtInErrorHandlers() {
|
|
|
276
354
|
return { status, body, ...headers };
|
|
277
355
|
},
|
|
278
356
|
logLevel: 'verbose',
|
|
357
|
+
logLevelFor: (err) => err.status >= 500 ? 'error' : 'verbose',
|
|
279
358
|
},
|
|
280
359
|
{
|
|
281
360
|
errorClass: mongoose.Error.ValidationError,
|
|
@@ -285,6 +364,7 @@ export function builtInErrorHandlers() {
|
|
|
285
364
|
? {
|
|
286
365
|
status: 400,
|
|
287
366
|
body: {
|
|
367
|
+
error: FRAMEWORK_ERROR_CODES.validationFailed,
|
|
288
368
|
message: validationFailedMessage(req),
|
|
289
369
|
errors: new ValidationError(clientErrors).message,
|
|
290
370
|
},
|
|
@@ -301,6 +381,7 @@ export function builtInErrorHandlers() {
|
|
|
301
381
|
? {
|
|
302
382
|
status: 400,
|
|
303
383
|
body: {
|
|
384
|
+
error: FRAMEWORK_ERROR_CODES.validationFailed,
|
|
304
385
|
message: validationFailedMessage(req),
|
|
305
386
|
errors: new ValidationError(clientErrors).message,
|
|
306
387
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtinErrorHandlers.js","sourceRoot":"","sources":["../../../src/services/http/builtinErrorHandlers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"builtinErrorHandlers.js","sourceRoot":"","sources":["../../../src/services/http/builtinErrorHandlers.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,qDAAqD;AACrD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAqB,EAAE,EAAE,CAC1D,oBAAoB,CAClB,GAAG,EACH,kBAAkB,EAClB,+CAA+C,CAChD,CAAC;AAEJ,mEAAmE;AACnE,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,GAAqB,EAAE,EAAE,CAC/D,oBAAoB,CAAC,GAAG,EAAE,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;AA0B1E;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,GAAa,EACb,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAsB;IAE7C,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAClC,MAAM,EACN,IAAI,EACJ,OAAO,GACY;IACnB,6EAA6E;IAC7E,4EAA4E;IAC5E,sEAAsE;IACtE,MAAM,MAAM,GAAG,IAAI,GAAG,EAA8B,CAAC;IACrD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,GAAG,KAAK,YAAY,EAAE,CAAC;YACzB,MAAM,OAAO,GAAc,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAClE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE;gBACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAC1B,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAoB,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;aACrE,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE;gBACd,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;aACxD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACvD,mEAAmE;QACnE,OAAO,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACzD,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC9B,OAAO,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE;QACrC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE;QACpC,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACnC,QAA0D;IAE1D,OAAO,QAAQ,CAAC,QAAQ,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AAC5D,CAAC;AAED,qFAAqF;AACrF,MAAM,qBAAqB,GAAG,IAAI,OAAO,EAAU,CAAC;AAEpD,sGAAsG;AACtG,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAChD,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC5C,OAAO,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED,8EAA8E;AAC9E,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAqB,EAAE,EAAE,CAC3D,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE;IACrB,KAAK,EAAE,qBAAqB,CAAC,WAAW;IACxC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC;CACjC,CAAC,CAAC;AAqDL,4EAA4E;AAC5E,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAS,qBAAqB,CAAC,KAAyB;IACtD,yEAAyE;IACzE,0EAA0E;IAC1E,yEAAyE;IACzE,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC/B,QAAQ,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC;YAClC,KAAK,QAAQ,CAAC;YACd,KAAK,YAAY;gBACf,OAAO,kBAAkB,CAAC;YAC5B,KAAK,MAAM;gBACT,OAAO,sBAAsB,CAAC;YAChC,KAAK,UAAU;gBACb,OAAO,oBAAoB,CAAC;YAC9B,KAAK,SAAS;gBACZ,OAAO,mBAAmB,CAAC;YAC7B,KAAK,QAAQ;gBACX,OAAO,kBAAkB,CAAC;YAC5B,KAAK,QAAQ;gBACX,OAAO,8BAA8B,CAAC;YACxC;gBACE,OAAO,eAAe,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,UAA2C,CAAC;IAChE,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,UAAU;YACb,OAAO,UAAU,CAAC;QACpB,KAAK,MAAM,EAAE,CAAC;YACZ,0EAA0E;YAC1E,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC;YAChC,OAAO,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;gBAChC,CAAC,CAAC,mBAAmB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpD,CAAC,CAAC,eAAe,CAAC;QACtB,CAAC;QACD,KAAK,KAAK,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,OAAO,KAAK,KAAK,SAAS;gBACxB,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,oBAAoB,KAAK,EAAE,CAAC;QAClC,CAAC;QACD,KAAK,KAAK,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,OAAO,KAAK,KAAK,SAAS;gBACxB,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,mBAAmB,KAAK,EAAE,CAAC;QACjC,CAAC;QACD,KAAK,WAAW;YACd,OAAO,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;gBACxC,CAAC,CAAC,oBAAoB,KAAK,CAAC,SAAS,aAAa;gBAClD,CAAC,CAAC,WAAW,CAAC;QAClB,KAAK,WAAW;YACd,OAAO,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;gBACxC,CAAC,CAAC,mBAAmB,KAAK,CAAC,SAAS,aAAa;gBACjD,CAAC,CAAC,UAAU,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,gBAAgB,CAAC;QAC1B;YACE,sEAAsE;YACtE,oDAAoD;YACpD,OAAO,eAAe,CAAC;IAC3B,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,eAAe,CAAC,GAAY;IAC1C,6EAA6E;IAC7E,+EAA+E;IAC/E,2EAA2E;IAC3E,8EAA8E;IAC9E,4EAA4E;IAC5E,kEAAkE;IAClE,IAAI,GAAG,YAAY,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,KAAK,CACzB,wBAAwB,GAAG,CAAC,IAAI,8BAA8B,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAC3F,CAAC;QACF,SAAS,CAAC,IAAI,GAAG,WAAW,CAAC;QAC7B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,eAAe,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3C,sEAAsE;QACtE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,KAAK,CACzB,8BAA8B,KAAK,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CACtE,CAAC;QACF,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,CAAC,GAAG,YAAY,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;QACrD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAC1C,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,qBAAqB,CAAC,UAAU,CAAC,EAAE,CACxE,CAAC;IACF,wEAAwE;IACxE,qEAAqE;IACrE,MAAM,SAAS,GAAI,GAA8B,CAAC,QAAQ,CAAC;IAC3D,MAAM,MAAM,GACV,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAClE,MAAM,SAAS,GAAG,IAAI,KAAK,CACzB,GAAG,MAAM,6BAA6B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACzD,CAAC;IACF,SAAS,CAAC,IAAI,GAAG,iBAAiB,CAAC;IACnC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,6BAA6B,CAC3C,GAAmC,EACnC,GAAqB;IAErB,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IACD,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAEhC,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,CAAC,WAAW,CAAC,GAAG,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;0EAE0E;AAC1E,SAAS,qBAAqB,CAAC,KAAc;IAC3C,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AAC5E,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,GAAqB;IAC/C,MAAM,GAAG,GAAwB,EAAE,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;QAC5E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,SAAS;QACX,CAAC;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;gBAC1B,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,sBAAsB,CACpC,GAA6B,EAC7B,GAAqB;IAErB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;QACvD,IAAI,qBAAqB,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvE,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL;YACE,UAAU,EAAE,SAAS;YACrB,oEAAoE;YACpE,sDAAsD;YACtD,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACpB,MAAM,OAAO,GAAG,GAAgB,CAAC;gBACjC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;gBAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;gBAChE,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;oBACzB,gEAAgE;oBAChE,qBAAqB;oBACrB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;gBACpD,CAAC;gBACD,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;gBAC1B,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBACpB,oEAAoE;oBACpE,oEAAoE;oBACpE,kCAAkC;oBAClC,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;wBACvD,YAAY,EAAE,OAAO;wBACrB,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;oBACH,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;wBACnC,OAAO,GAAG,UAAU,CAAC;oBACvB,CAAC;gBACH,CAAC;gBACD,MAAM,IAAI,GACR,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;gBAChE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBACnB,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/B,IAAI,CAAC,MAAM,GAAG,eAAe,CAC3B,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CACxD,CAAC;gBACJ,CAAC;gBACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;YACtC,CAAC;YACD,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAClB,GAAiB,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;SACzD;QACD;YACE,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,eAAe;YAC1C,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACpB,MAAM,YAAY,GAAG,6BAA6B,CAChD,GAAqC,EACrC,GAAG,CACJ,CAAC;gBACF,OAAO,YAAY;oBACjB,CAAC,CAAC;wBACE,MAAM,EAAE,GAAG;wBACX,IAAI,EAAE;4BACJ,KAAK,EAAE,qBAAqB,CAAC,gBAAgB;4BAC7C,OAAO,EAAE,uBAAuB,CAAC,GAAG,CAAC;4BACrC,MAAM,EAAE,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC,OAAO;yBAClD;qBACF;oBACH,CAAC,CAAC,IAAI,CAAC;YACX,CAAC;YACD,QAAQ,EAAE,MAAM;SACjB;QACD;YACE,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS;YACpC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACpB,MAAM,YAAY,GAAG,sBAAsB,CACzC,GAA+B,EAC/B,GAAG,CACJ,CAAC;gBACF,OAAO,YAAY;oBACjB,CAAC,CAAC;wBACE,MAAM,EAAE,GAAG;wBACX,IAAI,EAAE;4BACJ,KAAK,EAAE,qBAAqB,CAAC,gBAAgB;4BAC7C,OAAO,EAAE,uBAAuB,CAAC,GAAG,CAAC;4BACrC,MAAM,EAAE,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC,OAAO;yBAClD;qBACF;oBACH,CAAC,CAAC,IAAI,CAAC;YACX,CAAC;YACD,QAAQ,EAAE,MAAM;SACjB;KACF,CAAC;AACJ,CAAC"}
|