@adaptivestone/framework 5.6.1 → 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 +48 -0
- package/README.md +75 -0
- package/dist/clusterRunner.js +2 -1
- package/dist/clusterRunner.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/config/http.js +5 -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 +39 -29
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.d.ts +6 -0
- package/dist/helpers/crypto.js +18 -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/User.d.ts +5 -4
- package/dist/models/User.js +0 -3
- 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/server.d.ts +22 -2
- package/dist/server.js +83 -14
- package/dist/server.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 +16 -10
- 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 +52 -5
- 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/RateLimiter.d.ts +1 -0
- package/dist/services/http/middleware/RateLimiter.js +36 -13
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +5 -2
- package/dist/services/http/middleware/RequestParser.js +43 -25
- 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/validate/drivers/YupDriver.js +44 -6
- package/dist/services/validate/drivers/YupDriver.js.map +1 -1
- package/package.json +2 -2
|
@@ -12,8 +12,10 @@ import { makeOncePerClassWarner } from '../helpers/deprecation.js';
|
|
|
12
12
|
import { translateWithDefault } from '../helpers/translate.js';
|
|
13
13
|
import { controllerOverridePath } from '../modules/AbstractController.js';
|
|
14
14
|
import Base from '../modules/Base.js';
|
|
15
|
-
import {
|
|
15
|
+
import { errorHandlerFailed, resolvedErrorResponse, serverErrorResponse, toLoggableError, validationFailedMessage, } from '../services/http/builtinErrorHandlers.js';
|
|
16
|
+
import { FRAMEWORK_ERROR_CODES } from '../services/http/httpErrors.js';
|
|
16
17
|
import AbstractMiddleware from '../services/http/middleware/AbstractMiddleware.js';
|
|
18
|
+
import { HttpResponse } from '../services/http/responses.js';
|
|
17
19
|
import { normalizeMiddlewares, } from '../services/http/routing/middlewareNormalization.js';
|
|
18
20
|
import { HTTP_METHODS } from '../services/http/routing/RouteNode.js';
|
|
19
21
|
import { createNode, ensureChildBySegment, } from '../services/http/routing/RouteRegistry.js';
|
|
@@ -360,7 +362,8 @@ class ControllerManager extends Base {
|
|
|
360
362
|
? entryRequestMapLookup[contentType]
|
|
361
363
|
: undefined;
|
|
362
364
|
if (!matched) {
|
|
363
|
-
return
|
|
365
|
+
return HttpResponse.json(415, {
|
|
366
|
+
error: FRAMEWORK_ERROR_CODES.unsupportedContentType,
|
|
364
367
|
message: translateWithDefault(req, 'http.unsupportedContentType', 'Unsupported Content-Type. Expected one of: {{types}}').replace('{{types}}', entryRequestMapKeys.join(', ')),
|
|
365
368
|
});
|
|
366
369
|
}
|
|
@@ -387,19 +390,19 @@ class ControllerManager extends Base {
|
|
|
387
390
|
if (res.headersSent) {
|
|
388
391
|
return next(err);
|
|
389
392
|
}
|
|
390
|
-
//
|
|
391
|
-
//
|
|
392
|
-
//
|
|
393
|
-
//
|
|
394
|
-
//
|
|
395
|
-
// the detail LOGGED, never echoed.
|
|
396
|
-
|
|
397
|
-
|
|
393
|
+
// Registry first, as in the handler catch below: a handler registered
|
|
394
|
+
// for `ValidationError` (or a catch-all `Error`) may reshape it. Left
|
|
395
|
+
// unresolved, a framework `ValidationError` is the client 400 — its
|
|
396
|
+
// widened `.message` is the per-field payload. Anything else thrown
|
|
397
|
+
// while validating is a server-side defect (a validator that threw): a
|
|
398
|
+
// generic 500 with the detail LOGGED, never echoed.
|
|
399
|
+
return answerError(app, logger, err, req, ValidationError.isValidationError(err)
|
|
400
|
+
? HttpResponse.json(400, {
|
|
401
|
+
error: FRAMEWORK_ERROR_CODES.validationFailed,
|
|
398
402
|
message: validationFailedMessage(req),
|
|
399
403
|
errors: err.message,
|
|
400
|
-
})
|
|
401
|
-
|
|
402
|
-
return answerError(app, logger, err, req, res);
|
|
404
|
+
})
|
|
405
|
+
: undefined);
|
|
403
406
|
}
|
|
404
407
|
try {
|
|
405
408
|
return await Promise.resolve(original(req, res, next));
|
|
@@ -412,7 +415,7 @@ class ControllerManager extends Base {
|
|
|
412
415
|
return next(err);
|
|
413
416
|
}
|
|
414
417
|
// Same registry walk as the validation catch above (see `answerError`).
|
|
415
|
-
return answerError(app, logger, err, req
|
|
418
|
+
return answerError(app, logger, err, req);
|
|
416
419
|
}
|
|
417
420
|
};
|
|
418
421
|
entry.handler = wrapped;
|
|
@@ -443,28 +446,35 @@ export function buildSubtreeFromSpec(spec, onWarn) {
|
|
|
443
446
|
return subtree;
|
|
444
447
|
}
|
|
445
448
|
/**
|
|
446
|
-
*
|
|
447
|
-
*
|
|
448
|
-
*
|
|
449
|
-
*
|
|
450
|
-
*
|
|
451
|
-
*
|
|
452
|
-
*
|
|
453
|
-
*
|
|
454
|
-
*
|
|
449
|
+
* The response for an error thrown while validating or handling a request
|
|
450
|
+
* (returned, so the adapter writes it). Error-handler registry first:
|
|
451
|
+
* consumer-registered handlers, then the built-ins (`HttpError` mapper,
|
|
452
|
+
* mongoose safety nets) — the first `instanceof` match returning non-null
|
|
453
|
+
* wins, logged at the entry's own level (`verbose` for deliberate HttpError
|
|
454
|
+
* control flow, `error` for a 5xx one, `warn` for the safety nets' schema-gap
|
|
455
|
+
* signal, `warn` default for consumer entries). A handled error's log line
|
|
456
|
+
* rides into log shippers (Sentry, retention), so it is rebuilt value-free by
|
|
457
|
+
* `toLoggableError` first. Anything unresolved is a server-side defect: logged
|
|
458
|
+
* in full, answered with a generic 500 — unless the caller passes the
|
|
459
|
+
* `unresolved` response (the validation 400), which is a client error and not
|
|
460
|
+
* logged (value-free if a failed handler turns it into the 500).
|
|
455
461
|
*/
|
|
456
|
-
async function answerError(app, logger, err, req,
|
|
462
|
+
async function answerError(app, logger, err, req, unresolved) {
|
|
457
463
|
const resolved = app.httpServer
|
|
458
464
|
? await app.httpServer.resolveError(err, req)
|
|
459
465
|
: null;
|
|
460
466
|
if (resolved) {
|
|
461
467
|
logger?.[resolved.logLevel](toLoggableError(err));
|
|
462
|
-
return
|
|
468
|
+
return resolvedErrorResponse(resolved);
|
|
469
|
+
}
|
|
470
|
+
// A failed handler is a server-side defect: the 500, not the fallback.
|
|
471
|
+
if (unresolved && !errorHandlerFailed(req)) {
|
|
472
|
+
return unresolved;
|
|
463
473
|
}
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
474
|
+
// A client error a handler failed on (that failure is logged with its
|
|
475
|
+
// stack): its payload can carry client keys, so it is logged value-free.
|
|
476
|
+
logger?.error(unresolved ? toLoggableError(err) : err);
|
|
477
|
+
return serverErrorResponse(req);
|
|
468
478
|
}
|
|
469
479
|
// ─── translation helpers (file-local) ────────────────────────────────
|
|
470
480
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,IAAI,MAAM,oBAAoB,CAAC;AAEtC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,uBAAuB,GACxB,MAAM,0CAA0C,CAAC;AAElD,OAAO,kBAAkB,MAAM,mDAAmD,CAAC;AACnF,OAAO,EAEL,oBAAoB,GACrB,MAAM,qDAAqD,CAAC;AAO7D,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EACL,UAAU,EACV,oBAAoB,GACrB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,+CAA+C,CAAC;AAEvD,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE1E,yEAAyE;AACzE,MAAM,kBAAkB,GAAwB,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;AAEtE,+EAA+E;AAC/E,MAAM,eAAe,GAAwB,IAAI,GAAG,CAAC,CAAC,GAAG,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;AAE/E,0EAA0E;AAC1E,yEAAyE;AACzE,4EAA4E;AAC5E,2EAA2E;AAC3E,+DAA+D;AAC/D,MAAM,4BAA4B,GAAG,sBAAsB,CACzD,4BAA4B,EAC5B,CAAC,IAAI,EAAE,EAAE,CACP,eAAe,IAAI,wQAAwQ,CAC9R,CAAC;AAEF;;;;GAIG;AACH,SAAS,uBAAuB,CAAC,KAA+B;IAC9D,IAAI,KAAK,GAAkB,KAAK,CAAC,SAAS,CAAC;IAC3C,OAAO,KAAK,IAAI,KAAK,KAAK,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACvD,IACE,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,0BAA0B,CAAC;YAClE,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,wBAAwB,CAAC,EAChE,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,sFAAsF;AACtF,SAAS,0BAA0B,CACjC,IAAe,EACf,IAAY;IAEZ,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;IAC1C,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YACnC,CAAC,CAAC,IAAI,CAAC,UAAU;YACjB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBACvB,CAAC,CAAC,IAAI,CAAC,UAAU;gBACjB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM;QACR,CAAC;QACD,IAAI,GAAG,KAAK,CAAC;QACb,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,MAAM,iBAAkB,SAAQ,IAAI;IAClC,WAAW,CAAqC;IAChD,YAAY,GAAS;QACnB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED;;;;;;OAMG;IACH,kBAAkB,CAChB,eAAkB,EAClB,MAAM,GAAG,EAAE,EACX,OAAO,GAA2B,EAAE;QAEpC,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAoB,CAAC;QAC1E,OAAO,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IAED;;;;;;;;;OASG;IACH,0BAA0B,CACxB,QAAW,EACX,MAAM,GAAG,EAAE,EACX,OAAO,GAA2B,EAAE;QAEpC,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;QAEjC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC;QACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,2CAA2C,GAAG,uCAAuC,CACtF,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzC,iEAAiE;QACjE,gEAAgE;QAChE,kEAAkE;QAClE,oEAAoE;QACpE,uDAAuD;QACvD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtB,IAAI,CAAC,sBAAsB,CACzB,OAAO,EACP,0BAA0B,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EACpD,QAAQ,CAAC,WAAW,CAAC,IAAI,CAC1B,CAAC;QACJ,CAAC;QACD,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,qBAAqB;QAGzB,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACjE,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAC9D,OAAO,EACP,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,WAAW,EAClC,KAAK,EACL,sBAAsB,CACvB,CAAC;QAEF,6EAA6E;QAC7E,iBAAiB,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEnD,OAAO,OAAO,CAAC,GAAG,CAChB,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE;YACzD,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,kCAAC,UAAU,EAAC,CAAC;YAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7D,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,eAAe,CAAC,OAAO,GAA2B,EAAE;QACxD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACnD,KAAK,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;YAClD,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CAAC,UAA8B;QAC1C,OAAO,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CACtE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CACvB,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,iBAAiB,CAAC,UAA8B;QAC9C,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC;QAC7C,MAAM,QAAQ,GAAsC,EAAE,CAAC;QACvD,MAAM,UAAU,GAAwC,EAAE,CAAC;QAE3D,kEAAkE;QAClE,gCAAgC;QAChC,MAAM,MAAM,GAAI,UAA6C,CAAC,MAAM,CAAC;QACrE,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YACzC,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAC3C,MAAiD,CAClD,EAAE,CAAC;gBACF,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC9C,SAAS;gBACX,CAAC;gBACD,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;oBACvC,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,cAAc,QAAQ,mBAAmB,IAAI,wCAAwC,CAAC,GAAG,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,6CAA6C,CACnL,CAAC;oBACF,SAAS;gBACX,CAAC;gBACD,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5D,MAAM,KAAK,GAAG,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACvD,IAAI,CAAC,KAAK,EAAE,CAAC;wBACX,yDAAyD;wBACzD,0DAA0D;wBAC1D,2DAA2D;wBAC3D,oCAAoC;wBACpC,IACE,SAAS,KAAK,IAAI;4BAClB,OAAO,SAAS,KAAK,QAAQ;4BAC7B,OAAQ,SAAmC,CAAC,OAAO,KAAK,UAAU,EAClE,CAAC;4BACD,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,cAAc,QAAQ,WAAW,SAAS,IAAI,OAAO,yCAAyC,CAC/F,CAAC;wBACJ,CAAC;wBACD,SAAS;oBACX,CAAC;oBACD,gEAAgE;oBAChE,uDAAuD;oBACvD,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;wBACf,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,QAAQ,CAAC;oBAC1C,CAAC;oBACD,QAAQ,CAAC,IAAI,CAAC;wBACZ,MAAM,EAAE,SAAuB;wBAC/B,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;wBAChC,KAAK;qBACN,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,+CAA+C;QAC/C,qEAAqE;QACrE,0DAA0D;QAC1D,MAAM,eAAe,GAAG,UAAU,CAAC,WAElC,CAAC;QACF,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC;QACzC,IAAI,KAAK,YAAY,GAAG,EAAE,CAAC;YACzB,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;gBACvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACjC,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,cAAc,QAAQ,6CAA6C,OAAO,QAAQ,cAAc,CACjG,CAAC;oBACF,SAAS;gBACX,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAClD,SAAS;gBACX,CAAC;gBACD,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACvC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;oBACzB,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,cAAc,QAAQ,yBAAyB,QAAQ,gCAAgC,MAAM,CAAC,aAAa,0EAA0E,CAAC,GAAG,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACxN,CAAC;gBACJ,CAAC;gBACD,UAAU,CAAC,IAAI,CAAC;oBACd,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;oBACpC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC;iBACtC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IAC5C,CAAC;IAED;;;;;OAKG;IACH,sBAAsB,CACpB,IAAe,EACf,WAA8B,EAC9B,QAAgB,EAChB,UAAU,GAAG,EAAE;QAEf,MAAM,KAAK,GAAG,CAAC,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO;YAC3B,CAAC,CAAC,GAAG,UAAU,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,CAAC,CAAC,UAAU,CAAC;QACf,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAmC,CAAC,CAAC;gBAChE,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,SAAS,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC3D,IAAI,CAAC,iBAAiB,CACpB,KAAK,EACL,SAAS,EACT,cAAc,QAAQ,WAAW,MAAM,IAAI,QAAQ,IAAI,GAAG,EAAE,CAC7D,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3C,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED,iBAAiB,CACf,KAAmB,EACnB,KAAwB,EACxB,UAAkB;QAElB,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE3B,4EAA4E;QAC5E,0EAA0E;QAC1E,wEAAwE;QACxE,MAAM,cAAc,GAAG,CAAC,MAAwB,EAAmB,EAAE;YACnE,IAAI,CAAC;gBACH,OAAO,IAAI,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CACb,GAAG,UAAU,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EACpE,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEF,4EAA4E;QAC5E,sEAAsE;QACtE,2DAA2D;QAC3D,MAAM,2BAA2B,GAAsB,EAAE,CAAC;QAC1D,MAAM,yBAAyB,GAAsB,EAAE,CAAC;QACxD,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,wBAAwB,CAAC;YAC1C,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC;YACxC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,uBAAuB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClD,4BAA4B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;gBACvC,MAAM,IAAI,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;gBAChD,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC;gBAClC,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC;YAClC,CAAC;YACD,IAAI,CAAC,EAAE,CAAC;gBACN,2BAA2B,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,CAAC,EAAE,CAAC;gBACN,yBAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAED,0EAA0E;QAC1E,yEAAyE;QACzE,6EAA6E;QAC7E,oDAAoD;QACpD,EAAE;QACF,0EAA0E;QAC1E,yEAAyE;QACzE,qEAAqE;QACrE,+DAA+D;QAC/D,MAAM,YAAY,GAAG,KAAK,CAAC,OAGd,CAAC;QACd,IAAI,qBAAqB,GAA2B,IAAI,CAAC;QACzD,IAAI,qBAAqB,GAA2C,IAAI,CAAC;QACzE,IAAI,mBAAmB,GAAa,EAAE,CAAC;QACvC,IAAI,uBAAuB,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1C,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAGzC,CAAC;YACF,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChD,KAAK,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;gBACtC,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAI,MAAM,EAAE,CAAC;oBACX,qBAAqB,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,YAAY,EAAE,CAAC;YACxB,qBAAqB,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,eAAe,GAAsB,EAAE,CAAC;QAC9C,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,eAAe,CAAC,IAAI,CAAC,GAAG,yBAAyB,CAAC,CAAC;QAEnD,sEAAsE;QACtE,sEAAsE;QACtE,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE3E,MAAM,OAAO,GAAG,KAAK,EACnB,GAAqB,EACrB,GAAa,EACb,IAAkB,EACA,EAAE;YACpB,IAAI,CAAC;gBACH,oEAAoE;gBACpE,uEAAuE;gBACvE,qEAAqE;gBACrE,8DAA8D;gBAC9D,IAAI,eAAe,EAAE,CAAC;oBACpB,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,MAAM,eAAe,CAAC,QAAQ,CAClD,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,OAAO,CAAC,IAAI,CACjB,CAA4B,CAAC;gBAChC,CAAC;gBAED,MAAM,iBAAiB,GAAsB,EAAE,CAAC;gBAChD,IAAI,mBAAmB,GAAkB,IAAI,CAAC;gBAC9C,IAAI,qBAAqB,EAAE,CAAC;oBAC1B,MAAM,WAAW,GAAG,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;oBACtE,MAAM,OAAO,GACX,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,WAAW,CAAC;wBAC9D,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC;wBACpC,CAAC,CAAC,SAAS,CAAC;oBAChB,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;4BAC1B,OAAO,EAAE,oBAAoB,CAC3B,GAAG,EACH,6BAA6B,EAC7B,sDAAsD,CACvD,CAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;yBACvD,CAAC,CAAC;oBACL,CAAC;oBACD,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAChC,mBAAmB,GAAG,WAAW,CAAC;gBACpC,CAAC;qBAAM,IAAI,qBAAqB,EAAE,CAAC;oBACjC,iBAAiB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBAChD,CAAC;gBACD,iBAAiB,CAAC,IAAI,CAAC,GAAG,2BAA2B,CAAC,CAAC;gBAEvD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACjC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1B,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CACvC,CACF,CAAC;oBACF,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,qBAAqB,CAAC,KAAK,CAGhD,CAAC;oBACF,IAAI,mBAAmB,EAAE,CAAC;wBACxB,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,2BAA2B,CAC/C,GAAG,CAAC,OAAO,CAAC,OAAO,EACnB,mBAAmB,CACpB,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC/B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CACpE,CAAC;oBACF,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAG9C,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;oBACpB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC;gBACD,mEAAmE;gBACnE,kEAAkE;gBAClE,wEAAwE;gBACxE,uEAAuE;gBACvE,wEAAwE;gBACxE,mCAAmC;gBACnC,IAAI,eAAe,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC3C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBAC1B,OAAO,EAAE,uBAAuB,CAAC,GAAG,CAAC;wBACrC,MAAM,EAAE,GAAG,CAAC,OAAO;qBACpB,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YACjD,CAAC;YAED,IAAI,CAAC;gBACH,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;YACzD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,uEAAuE;gBACvE,sEAAsE;gBACtE,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;oBACpB,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;oBACnB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC;gBACD,wEAAwE;gBACxE,OAAO,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YACjD,CAAC;QACH,CAAC,CAAC;QAEF,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAwBD;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,IAA2B,EAC3B,MAA8B;IAE9B,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,GAAG,GAAG;QACV,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM;QACN,sBAAsB,EAAE,IAAI,OAAO,EAAwB;KAC5D,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QAChC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,WAAW,CACxB,GAAS,EACT,MAA+C,EAC/C,GAAY,EACZ,GAAqB,EACrB,GAAa;IAEb,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU;QAC7B,CAAC,CAAC,MAAM,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC;QAC7C,CAAC,CAAC,IAAI,CAAC;IACT,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;QAClD,OAAO,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC;KACjC,CAAC,CAAC;AACL,CAAC;AAED,wEAAwE;AAExE;;;GAGG;AACH,MAAM,WAAW,GAAG,CAAC,IAAY,EAAW,EAAE,CAC5C,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEzC,kFAAkF;AAClF,MAAM,SAAS,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CACxC,CAAmB,EACnB,CAAmB;IAEnB,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,yEAAyE;IACzE,4EAA4E;IAC5E,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,GAAW;IAKvC,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IACtC,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IAC5C,CAAC;IACD,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,IAAI,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,MAAM,EAAE,SAA+B;YACvC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC1B,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;AACtE,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,iBAAiB,CAAC,CAAS;IACzC,OAAO,CAAC,CAAC,OAAO,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAa,EACb,UAAkB;IAElB,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9B,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE;SAC7C,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAG,IAQX,CAAC;IAEF,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;IACrC,MAAM,KAAK,GAAiB;QAC1B,kFAAkF;QAClF,OAAO,EAAG,GAAG,CAAC,OAAoB,CAAC,IAAI,CAAC,UAAU,CAAC;QACnD,IAAI,EAAE;YACJ,UAAU,EAAE,WAAW,IAAI,SAAS;YACpC,GAAG,CAAC,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ;gBACrC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE;gBAClC,CAAC,CAAC,EAAE,CAAC;SACR;KACF,CAAC;IACF,IAAI,GAAG,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;QACxB,oFAAoF;QACpF,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,OAAc,CAAC;IACrC,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QACtB,oFAAoF;QACpF,KAAK,CAAC,KAAK,GAAG,GAAG,CAAC,KAAY,CAAC;IACjC,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QACvB,oFAAoF;QACpF,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,MAAa,CAAC;IACnC,CAAC;IACD,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,KAAK,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;IACtC,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/D,KAAK,CAAC,WAAW,GAAG,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CACpB,OAAkB,EAClB,MAAkB,EAClB,OAAe,EACf,KAAmB;IAEnB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;IACtB,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,4CAA4C,MAAM,IAAI,OAAO,EAAE,CAChE,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChE,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;IAChC,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;AACjC,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,iBAAiB,CACxB,OAAkB,EAClB,MAA0B,EAC1B,OAAe,EACf,OAA0B,EAC1B,GAIC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEhE,MAAM,QAAQ,GACZ,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IACxE,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;QACrB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QACpC,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC5E,OAAO;IACT,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;IACjD,IAAI,eAAe,EAAE,CAAC;QACpB,6BAA6B,CAC3B,eAAe,EACf,OAAO,EACP,GAAG,CAAC,sBAAsB,CAC3B,CAAC;QACF,OAAO;IACT,CAAC;IACD,yEAAyE;IACzE,uEAAuE;IACvE,GAAG,EAAE,MAAM,EAAE,CACX,cAAc,GAAG,CAAC,QAAQ,uBAAuB,MAAM,GAAG,OAAO,6BAA6B,MAAM,oCAAoC,CACzI,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,SAAS,sBAAsB,CAC7B,IAAe,EACf,MAAkB,EAClB,OAA0B,EAC1B,sBAAqD;IAErD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,OAAO,EAAE,CAAC;QACZ,6BAA6B,CAAC,OAAO,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAC1E,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3C,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,sBAAsB,CACpB,IAAI,CAAC,UAAU,EACf,MAAM,EACN,OAAO,EACP,sBAAsB,CACvB,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,sBAAsB,CACpB,IAAI,CAAC,UAAU,EACf,MAAM,EACN,OAAO,EACP,sBAAsB,CACvB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,2FAA2F;AAC3F,SAAS,6BAA6B,CACpC,OAAqB,EACrB,OAA0B,EAC1B,sBAAqD;IAErD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;IAC3C,MAAM,KAAK,GAAG,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,OAAO,CAAC,WAAW,GAAG;QACpB,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;QAC3B,GAAG,OAAO;QACV,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;KACzB,CAAC;IACF,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,UAAU,CAAC,OAAkB,EAAE,OAAe;IACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChE,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,eAAe,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/crypto.d.ts
CHANGED
|
@@ -22,6 +22,12 @@ export declare const verifyPassword: (password: string, stored: string) => Promi
|
|
|
22
22
|
valid: boolean;
|
|
23
23
|
needsRehash: boolean;
|
|
24
24
|
}>;
|
|
25
|
+
/**
|
|
26
|
+
* @internal Start computing the dummy hash {@link burnPasswordVerify} compares against,
|
|
27
|
+
* so the first unknown-account login after a restart costs one scrypt, not two.
|
|
28
|
+
* Safe to call without awaiting: a failure is dropped and the next call retries.
|
|
29
|
+
*/
|
|
30
|
+
export declare const warmPasswordVerify: () => Promise<string>;
|
|
25
31
|
/**
|
|
26
32
|
* Burn one password-verify's worth of scrypt work, then discard the result.
|
|
27
33
|
* Call this on the "no such user / no password" branch of a login so that a
|
package/dist/helpers/crypto.js
CHANGED
|
@@ -149,6 +149,23 @@ export const verifyPassword = async (password, stored) => {
|
|
|
149
149
|
// A throwaway v2 hash, computed once at the current cost, used only to equalize
|
|
150
150
|
// timing. The comparison result is discarded.
|
|
151
151
|
let dummyHashPromise = null;
|
|
152
|
+
/**
|
|
153
|
+
* @internal Start computing the dummy hash {@link burnPasswordVerify} compares against,
|
|
154
|
+
* so the first unknown-account login after a restart costs one scrypt, not two.
|
|
155
|
+
* Safe to call without awaiting: a failure is dropped and the next call retries.
|
|
156
|
+
*/
|
|
157
|
+
export const warmPasswordVerify = () => {
|
|
158
|
+
if (!dummyHashPromise) {
|
|
159
|
+
const promise = hashPassword('framework:timing-equalizer');
|
|
160
|
+
dummyHashPromise = promise;
|
|
161
|
+
promise.catch(() => {
|
|
162
|
+
if (dummyHashPromise === promise) {
|
|
163
|
+
dummyHashPromise = null;
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
return dummyHashPromise;
|
|
168
|
+
};
|
|
152
169
|
/**
|
|
153
170
|
* Burn one password-verify's worth of scrypt work, then discard the result.
|
|
154
171
|
* Call this on the "no such user / no password" branch of a login so that a
|
|
@@ -156,11 +173,8 @@ let dummyHashPromise = null;
|
|
|
156
173
|
* latency — i.e. it closes the user-enumeration timing oracle.
|
|
157
174
|
*/
|
|
158
175
|
export const burnPasswordVerify = async (password) => {
|
|
159
|
-
if (!dummyHashPromise) {
|
|
160
|
-
dummyHashPromise = hashPassword('framework:timing-equalizer');
|
|
161
|
-
}
|
|
162
176
|
try {
|
|
163
|
-
await verifyPassword(password, await
|
|
177
|
+
await verifyPassword(password, await warmPasswordVerify());
|
|
164
178
|
}
|
|
165
179
|
catch {
|
|
166
180
|
// Timing side effect only — any error here is irrelevant.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/helpers/crypto.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/helpers/crypto.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/logger.d.ts
CHANGED
|
@@ -3,4 +3,6 @@ declare const levels: readonly ['error', 'warn', 'info', 'debug'];
|
|
|
3
3
|
type LogLevel = (typeof levels)[number];
|
|
4
4
|
declare const noopLogger: winston.Logger;
|
|
5
5
|
declare const consoleLogger: (level: LogLevel, message: string) => void;
|
|
6
|
-
|
|
6
|
+
/** @internal A thrown value as log text: its stack if it has one, else its string form. Never throws. */
|
|
7
|
+
declare const describeThrown: (value: unknown) => string;
|
|
8
|
+
export { consoleLogger, describeThrown, levels, noopLogger };
|
package/dist/helpers/logger.js
CHANGED
|
@@ -30,5 +30,15 @@ const consoleLogger = (level, message) => {
|
|
|
30
30
|
console.log(message);
|
|
31
31
|
}
|
|
32
32
|
};
|
|
33
|
-
|
|
33
|
+
/** @internal A thrown value as log text: its stack if it has one, else its string form. Never throws. */
|
|
34
|
+
const describeThrown = (value) => {
|
|
35
|
+
try {
|
|
36
|
+
const stack = value?.stack;
|
|
37
|
+
return typeof stack === 'string' ? stack : String(value);
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return '[unprintable value]';
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
export { consoleLogger, describeThrown, levels, noopLogger };
|
|
34
44
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAI3D;;;;;;GAMG;AACH,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AACtB,MAAM,UAAU,GAAG;IACjB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;IACX,GAAG,EAAE,IAAI;IACT,KAAK;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;CAC2B,CAAC;AAE/B,+EAA+E;AAC/E,gFAAgF;AAChF,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,EAAE;IACzD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAI3D;;;;;;GAMG;AACH,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AACtB,MAAM,UAAU,GAAG;IACjB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;IACX,GAAG,EAAE,IAAI;IACT,KAAK;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;CAC2B,CAAC;AAE/B,+EAA+E;AAC/E,gFAAgF;AAChF,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,EAAE;IACzD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,yGAAyG;AACzG,MAAM,cAAc,GAAG,CAAC,KAAc,EAAU,EAAE;IAChD,IAAI,CAAC;QACH,MAAM,KAAK,GAAI,KAAgD,EAAE,KAAK,CAAC;QACvE,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,qBAAqB,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { ValidationIssue } from '../services/validate/types.ts';
|
|
2
|
+
/** @internal English defaults of the password messages, shared with the `Auth` controller. */
|
|
3
|
+
export declare const PASSWORD_EN: {
|
|
4
|
+
readonly 'auth.passwordProvided': 'Password must be provided';
|
|
5
|
+
readonly 'auth.passwordTooShort': 'Password must be at least {{min}} characters';
|
|
6
|
+
readonly 'auth.passwordTooLong': 'Password must be at most {{max}} characters';
|
|
7
|
+
};
|
|
8
|
+
/** @internal {@link passwordPolicyIssues} against the given `auth` config. */
|
|
9
|
+
export declare const passwordPolicyIssuesFor: (authConfig: Record<string, unknown>, password: unknown, field?: string) => ValidationIssue[];
|
|
10
|
+
/**
|
|
11
|
+
* Check a new password against `auth.passwordPolicy` (`minLength`..`maxLength`
|
|
12
|
+
* Unicode code points). Returns `[]` when it passes, otherwise one issue at
|
|
13
|
+
* `field` whose message is an i18n key with an English default; a thrown
|
|
14
|
+
* `HttpError` translates it. Throws when the policy config is invalid.
|
|
15
|
+
*
|
|
16
|
+
* ```ts
|
|
17
|
+
* const issues = passwordPolicyIssues(req.appInfo.request.newPassword, 'newPassword');
|
|
18
|
+
* if (issues.length) {
|
|
19
|
+
* throw new BadRequestError({ code: 'VALIDATION_FAILED', message: 'Validation failed', errors: issues });
|
|
20
|
+
* }
|
|
21
|
+
* ```
|
|
22
|
+
*/
|
|
23
|
+
export declare const passwordPolicyIssues: (password: unknown, field?: string) => ValidationIssue[];
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { getAppInstance } from './appInstance.js';
|
|
2
|
+
/** @internal English defaults of the password messages, shared with the `Auth` controller. */
|
|
3
|
+
export const PASSWORD_EN = {
|
|
4
|
+
'auth.passwordProvided': 'Password must be provided',
|
|
5
|
+
'auth.passwordTooShort': 'Password must be at least {{min}} characters',
|
|
6
|
+
'auth.passwordTooLong': 'Password must be at most {{max}} characters',
|
|
7
|
+
};
|
|
8
|
+
/** @internal {@link passwordPolicyIssues} against the given `auth` config. */
|
|
9
|
+
export const passwordPolicyIssuesFor = (authConfig, password, field = 'password') => {
|
|
10
|
+
if (typeof password !== 'string' || password === '') {
|
|
11
|
+
return [
|
|
12
|
+
{
|
|
13
|
+
message: 'auth.passwordProvided',
|
|
14
|
+
path: [field],
|
|
15
|
+
params: { defaultValue: PASSWORD_EN['auth.passwordProvided'] },
|
|
16
|
+
},
|
|
17
|
+
];
|
|
18
|
+
}
|
|
19
|
+
const policy = authConfig.passwordPolicy;
|
|
20
|
+
const min = policy?.minLength ?? 15;
|
|
21
|
+
const max = policy?.maxLength ?? 128;
|
|
22
|
+
if (!Number.isInteger(min) ||
|
|
23
|
+
min < 1 ||
|
|
24
|
+
!Number.isInteger(max) ||
|
|
25
|
+
max < min) {
|
|
26
|
+
throw new Error('Invalid auth.passwordPolicy: require 1 <= minLength <= maxLength');
|
|
27
|
+
}
|
|
28
|
+
// Count Unicode code points, without normalizing or truncating the secret.
|
|
29
|
+
const length = Array.from(password).length;
|
|
30
|
+
if (length >= min && length <= max) {
|
|
31
|
+
return [];
|
|
32
|
+
}
|
|
33
|
+
const message = length < min ? 'auth.passwordTooShort' : 'auth.passwordTooLong';
|
|
34
|
+
return [
|
|
35
|
+
{
|
|
36
|
+
message,
|
|
37
|
+
path: [field],
|
|
38
|
+
params: {
|
|
39
|
+
min,
|
|
40
|
+
max,
|
|
41
|
+
defaultValue: PASSWORD_EN[message]
|
|
42
|
+
.replace('{{min}}', String(min))
|
|
43
|
+
.replace('{{max}}', String(max)),
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
];
|
|
47
|
+
};
|
|
48
|
+
/**
|
|
49
|
+
* Check a new password against `auth.passwordPolicy` (`minLength`..`maxLength`
|
|
50
|
+
* Unicode code points). Returns `[]` when it passes, otherwise one issue at
|
|
51
|
+
* `field` whose message is an i18n key with an English default; a thrown
|
|
52
|
+
* `HttpError` translates it. Throws when the policy config is invalid.
|
|
53
|
+
*
|
|
54
|
+
* ```ts
|
|
55
|
+
* const issues = passwordPolicyIssues(req.appInfo.request.newPassword, 'newPassword');
|
|
56
|
+
* if (issues.length) {
|
|
57
|
+
* throw new BadRequestError({ code: 'VALIDATION_FAILED', message: 'Validation failed', errors: issues });
|
|
58
|
+
* }
|
|
59
|
+
* ```
|
|
60
|
+
*/
|
|
61
|
+
export const passwordPolicyIssues = (password, field = 'password') => passwordPolicyIssuesFor(getAppInstance().getConfig('auth'), password, field);
|
|
62
|
+
//# sourceMappingURL=passwordPolicy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"passwordPolicy.js","sourceRoot":"","sources":["../../src/helpers/passwordPolicy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,8FAA8F;AAC9F,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,uBAAuB,EAAE,2BAA2B;IACpD,uBAAuB,EAAE,8CAA8C;IACvE,sBAAsB,EAAE,6CAA6C;CAC7D,CAAC;AAEX,8EAA8E;AAC9E,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,UAAmC,EACnC,QAAiB,EACjB,KAAK,GAAG,UAAU,EACC,EAAE;IACrB,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACpD,OAAO;YACL;gBACE,OAAO,EAAE,uBAAuB;gBAChC,IAAI,EAAE,CAAC,KAAK,CAAC;gBACb,MAAM,EAAE,EAAE,YAAY,EAAE,WAAW,CAAC,uBAAuB,CAAC,EAAE;aAC/D;SACF,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,cAEb,CAAC;IACd,MAAM,GAAG,GAAG,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC;IACpC,MAAM,GAAG,GAAG,MAAM,EAAE,SAAS,IAAI,GAAG,CAAC;IACrC,IACE,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;QACtB,GAAG,GAAG,CAAC;QACP,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;QACtB,GAAG,GAAG,GAAG,EACT,CAAC;QACD,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;IACJ,CAAC;IACD,2EAA2E;IAC3E,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAC3C,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,OAAO,GACX,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAClE,OAAO;QACL;YACE,OAAO;YACP,IAAI,EAAE,CAAC,KAAK,CAAC;YACb,MAAM,EAAE;gBACN,GAAG;gBACH,GAAG;gBACH,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC;qBAC/B,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;qBAC/B,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;aACnC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,QAAiB,EACjB,KAAK,GAAG,UAAU,EACC,EAAE,CACrB,uBAAuB,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC"}
|
|
@@ -4,5 +4,6 @@ export declare const getRedisClient: () => Promise<RedisClientType>;
|
|
|
4
4
|
* Synchronous way to get redis client. Make sure to call connect on it before usage.
|
|
5
5
|
* Connection failure is logged (not an unhandled rejection), and concurrent async
|
|
6
6
|
* callers all await the same connect via {@link getRedisClient}.
|
|
7
|
+
* Throws when `redis.url` is malformed: the client parses it when built.
|
|
7
8
|
*/
|
|
8
9
|
export declare const getRedisClientSync: () => RedisClientType;
|
|
@@ -25,6 +25,7 @@ export const getRedisClient = () => {
|
|
|
25
25
|
* Synchronous way to get redis client. Make sure to call connect on it before usage.
|
|
26
26
|
* Connection failure is logged (not an unhandled rejection), and concurrent async
|
|
27
27
|
* callers all await the same connect via {@link getRedisClient}.
|
|
28
|
+
* Throws when `redis.url` is malformed: the client parses it when built.
|
|
28
29
|
*/
|
|
29
30
|
export const getRedisClientSync = () => {
|
|
30
31
|
if (!redisClient) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisConnection.js","sourceRoot":"","sources":["../../../src/helpers/redis/redisConnection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,gFAAgF;AAChF,gFAAgF;AAChF,iFAAiF;AACjF,+CAA+C;AAC/C,IAAI,aAAa,GAAoC,IAAI,CAAC;AAC1D,IAAI,WAAW,GAA2B,IAAI,CAAC;AAC/C,IAAI,sBAAsB,GAAG,KAAK,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,GAA6B,EAAE;IAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;QAC7B,WAAW,GAAG,MAAM,CAAC;QACrB,aAAa,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;QACpD,2EAA2E;QAC3E,6EAA6E;QAC7E,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE;YACvB,aAAa,GAAG,IAAI,CAAC;YACrB,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"redisConnection.js","sourceRoot":"","sources":["../../../src/helpers/redis/redisConnection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,gFAAgF;AAChF,gFAAgF;AAChF,iFAAiF;AACjF,+CAA+C;AAC/C,IAAI,aAAa,GAAoC,IAAI,CAAC;AAC1D,IAAI,WAAW,GAA2B,IAAI,CAAC;AAC/C,IAAI,sBAAsB,GAAG,KAAK,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,GAA6B,EAAE;IAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;QAC7B,WAAW,GAAG,MAAM,CAAC;QACrB,aAAa,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;QACpD,2EAA2E;QAC3E,6EAA6E;QAC7E,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE;YACvB,aAAa,GAAG,IAAI,CAAC;YACrB,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAoB,EAAE;IACtD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,4EAA4E;QAC5E,2EAA2E;QAC3E,wCAAwC;QACxC,cAAc,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3B,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,yBAAyB,CAAC,EAAE,CAAC,CACxD,CAAC;IACJ,CAAC;IACD,OAAO,WAA8B,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,GAAoB,EAAE;IACxC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,CAEhD,CAAC;IAEF,MAAM,MAAM,GAAoB,YAAY,CAAC;QAC3C,GAAG,EAAE,WAAW,CAAC,GAAG;KACrB,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACxB,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,4EAA4E;IAC5E,4DAA4D;IAC5D,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,sBAAsB,GAAG,IAAI,CAAC;QAC9B,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YAC3C,IAAI,WAAW,EAAE,MAAM,EAAE,CAAC;gBACxB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;YAC3B,CAAC;YACD,WAAW,GAAG,IAAI,CAAC;YACnB,aAAa,GAAG,IAAI,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
package/dist/helpers/yup.d.ts
CHANGED
|
@@ -3,13 +3,19 @@ import { Schema } from 'yup';
|
|
|
3
3
|
* Validator for an uploaded file (yup-specific).
|
|
4
4
|
*
|
|
5
5
|
* @deprecated Since 5.0.0-beta.51 — `YupFile` will be removed in v6. Validate
|
|
6
|
-
* files with the framework's vendor-neutral `File` type and
|
|
7
|
-
*
|
|
6
|
+
* files with the framework's vendor-neutral `File` type and an `instanceof`
|
|
7
|
+
* check instead (no yup required). A file field always arrives as an array;
|
|
8
|
+
* check the array as a whole, as `YupFile` does, so an error stays under the
|
|
9
|
+
* field name (a per-element check reports `avatar[0]`, not `avatar`):
|
|
8
10
|
*
|
|
9
11
|
* import { File } from '@adaptivestone/framework/types.js';
|
|
10
|
-
*
|
|
11
|
-
* //
|
|
12
|
-
* //
|
|
12
|
+
* const files = (v: unknown) => Array.isArray(v) && v.every((f) => f instanceof File);
|
|
13
|
+
* // zod: z.custom<File[]>(files, 'not a file')
|
|
14
|
+
* // valibot: v.custom<File[]>(files, 'not a file')
|
|
15
|
+
* // yup: mixed<File[]>().test('file', 'not a file', files)
|
|
16
|
+
*
|
|
17
|
+
* A missing field fails these checks; for an optional one, let `files` also
|
|
18
|
+
* accept `undefined`.
|
|
13
19
|
*
|
|
14
20
|
* @example
|
|
15
21
|
* request: yup.object().shape({
|
package/dist/helpers/yup.js
CHANGED
|
@@ -9,13 +9,19 @@ let deprecationWarned = false;
|
|
|
9
9
|
* Validator for an uploaded file (yup-specific).
|
|
10
10
|
*
|
|
11
11
|
* @deprecated Since 5.0.0-beta.51 — `YupFile` will be removed in v6. Validate
|
|
12
|
-
* files with the framework's vendor-neutral `File` type and
|
|
13
|
-
*
|
|
12
|
+
* files with the framework's vendor-neutral `File` type and an `instanceof`
|
|
13
|
+
* check instead (no yup required). A file field always arrives as an array;
|
|
14
|
+
* check the array as a whole, as `YupFile` does, so an error stays under the
|
|
15
|
+
* field name (a per-element check reports `avatar[0]`, not `avatar`):
|
|
14
16
|
*
|
|
15
17
|
* import { File } from '@adaptivestone/framework/types.js';
|
|
16
|
-
*
|
|
17
|
-
* //
|
|
18
|
-
* //
|
|
18
|
+
* const files = (v: unknown) => Array.isArray(v) && v.every((f) => f instanceof File);
|
|
19
|
+
* // zod: z.custom<File[]>(files, 'not a file')
|
|
20
|
+
* // valibot: v.custom<File[]>(files, 'not a file')
|
|
21
|
+
* // yup: mixed<File[]>().test('file', 'not a file', files)
|
|
22
|
+
*
|
|
23
|
+
* A missing field fails these checks; for an optional one, let `files` also
|
|
24
|
+
* accept `undefined`.
|
|
19
25
|
*
|
|
20
26
|
* @example
|
|
21
27
|
* request: yup.object().shape({
|
|
@@ -31,7 +37,7 @@ class YupFile extends Schema {
|
|
|
31
37
|
});
|
|
32
38
|
if (!deprecationWarned) {
|
|
33
39
|
deprecationWarned = true;
|
|
34
|
-
process.emitWarning(
|
|
40
|
+
process.emitWarning("YupFile is deprecated and will be removed in v6. Validate uploaded files with the `File` export from \"@adaptivestone/framework/types.js\" and an instanceof check. A file field arrives as an array; check the array as a whole so errors stay under the field name (e.g. mixed().test('file', 'not a file', (v) => Array.isArray(v) && v.every((f) => f instanceof File))).", { type: 'DeprecationWarning', code: 'ASF_DEP_YUPFILE' });
|
|
35
41
|
}
|
|
36
42
|
}
|
|
37
43
|
}
|
package/dist/helpers/yup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yup.js","sourceRoot":"","sources":["../../src/helpers/yup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAE7B,2EAA2E;AAC3E,+EAA+E;AAC/E,qEAAqE;AACrE,qEAAqE;AACrE,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B
|
|
1
|
+
{"version":3,"file":"yup.js","sourceRoot":"","sources":["../../src/helpers/yup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAE7B,2EAA2E;AAC3E,+EAA+E;AAC/E,qEAAqE;AACrE,qEAAqE;AACrE,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,OAAQ,SAAQ,MAAM;IAC1B;QACE,KAAK,CAAC;YACJ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,CAAC,KAAc,EAAE,EAAE,CACxB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBACpB,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,cAAc,CAAC;SACxD,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,iBAAiB,GAAG,IAAI,CAAC;YACzB,OAAO,CAAC,WAAW,CACjB,+WAA+W,EAC/W,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CACxD,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
"passwordRecoveryTokenProvided": "Нужно указать токен восстановления пароля",
|
|
8
8
|
"passwordValid": "Неверный формат пароля,только a-z,A-Z,0-9,!,@,#,$,%,ˆ,&,*,(,),_,+,{,},[,],<,>",
|
|
9
9
|
"passwordTooShort": "Пароль должен быть не менее {{min}} символов",
|
|
10
|
+
"passwordTooLong": "Пароль должен быть не более {{max}} символов",
|
|
10
11
|
"emailValid": "Неверный формат Email-а",
|
|
11
12
|
"errorUPValid": "Не правильно указаны емэйл или пароль",
|
|
12
13
|
"messageSome": "Проблемы с сервером. Пожалуйста попробуйте позже",
|
|
@@ -24,5 +25,35 @@
|
|
|
24
25
|
"passwordChanged": "Пароль был изменен",
|
|
25
26
|
"passwordRecovery": "Восстановление пароля",
|
|
26
27
|
"emailConfirm": "Подтверждение Email"
|
|
28
|
+
},
|
|
29
|
+
"password": {
|
|
30
|
+
"wrongToken": "Неверный токен восстановления пароля"
|
|
31
|
+
},
|
|
32
|
+
"http": {
|
|
33
|
+
"notFound": "Не найдено",
|
|
34
|
+
"methodNotAllowed": "Метод не поддерживается",
|
|
35
|
+
"unsupportedContentType": "Неподдерживаемый Content-Type. Ожидается один из: {{types}}",
|
|
36
|
+
"malformedUrl": "Некорректный URL",
|
|
37
|
+
"serverError": "Что-то пошло не так. Пожалуйста, попробуйте позже.",
|
|
38
|
+
"validationFailed": "Ошибка проверки данных"
|
|
39
|
+
},
|
|
40
|
+
"middleware": {
|
|
41
|
+
"auth": {
|
|
42
|
+
"notLoggedIn": "Пожалуйста, войдите в приложение"
|
|
43
|
+
},
|
|
44
|
+
"role": {
|
|
45
|
+
"userRequired": "Требуется авторизованный пользователь",
|
|
46
|
+
"noAccess": "У вас нет доступа"
|
|
47
|
+
},
|
|
48
|
+
"rateLimiter": {
|
|
49
|
+
"tooManyRequests": "Слишком много запросов"
|
|
50
|
+
},
|
|
51
|
+
"requestParser": {
|
|
52
|
+
"entityTooLarge": "Слишком большой запрос. Загрузка превышает допустимые ограничения по размеру или количеству.",
|
|
53
|
+
"parseError": "Не удалось разобрать запрос. Указан неверный Content-Type или Content-Length. Пожалуйста, проверьте заголовки и тип содержимого запроса."
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
"health": {
|
|
57
|
+
"unauthorized": "Требуется авторизация"
|
|
27
58
|
}
|
|
28
59
|
}
|
package/dist/models/User.d.ts
CHANGED
|
@@ -62,10 +62,11 @@ export type UserAuthModel<TField extends UserAuthField = UserAuthField> = Model<
|
|
|
62
62
|
export type UserPublicDoc = Pick<InstanceType<UserModelLite>, 'avatar' | 'name' | 'email' | 'id' | 'isVerified' | 'permissions' | 'locale'>;
|
|
63
63
|
/**
|
|
64
64
|
* Augmentation point so `req.appInfo.user` follows a project's OWN `User` model
|
|
65
|
-
* when it replaces the framework's. `
|
|
66
|
-
* `genTypes.d.ts` (mirroring how it types
|
|
67
|
-
* hand only if you don't run codegen.
|
|
68
|
-
* so wrap the model class in
|
|
65
|
+
* when it replaces the framework's. `node src/cli.ts generatetypes` emits this
|
|
66
|
+
* automatically into `genTypes.d.ts` (mirroring how it types
|
|
67
|
+
* `app.getModel('User')`); declare it by hand only if you don't run codegen.
|
|
68
|
+
* `User` must be the hydrated DOCUMENT type, so wrap the model class in
|
|
69
|
+
* `InstanceType<GetModelTypeFromClass<…>>`:
|
|
69
70
|
*
|
|
70
71
|
* import type { GetModelTypeFromClass } from '@adaptivestone/framework/modules/BaseModel.js';
|
|
71
72
|
* declare module '@adaptivestone/framework/models/User.js' {
|
package/dist/models/User.js
CHANGED
|
@@ -269,9 +269,6 @@ class User extends BaseModel {
|
|
|
269
269
|
generateToken: async function () {
|
|
270
270
|
const timestamp = new Date();
|
|
271
271
|
timestamp.setDate(timestamp.getDate() + 30);
|
|
272
|
-
if (!this.email) {
|
|
273
|
-
throw new Error('Email is required');
|
|
274
|
-
}
|
|
275
272
|
const token = createRandomToken();
|
|
276
273
|
if (!this.sessionTokens) {
|
|
277
274
|
clearHydratedArray(this, 'sessionTokens');
|