@adaptivestone/framework 5.4.1 → 5.5.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 +58 -0
- package/README.md +42 -0
- package/dist/codegen/appTypes.d.ts +4 -5
- package/dist/codegen/appTypes.js +31 -22
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/index.d.ts +2 -2
- package/dist/codegen/index.js +3 -3
- package/dist/codegen/index.js.map +1 -1
- package/dist/commands/CreateEnv.d.ts +7 -0
- package/dist/commands/CreateEnv.js +36 -0
- package/dist/commands/CreateEnv.js.map +1 -0
- package/dist/commands/CreateUser.d.ts +5 -0
- package/dist/commands/CreateUser.js +13 -3
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/config/health.d.ts +4 -0
- package/dist/config/health.js +8 -0
- package/dist/config/health.js.map +1 -0
- package/dist/config/http.d.ts +1 -0
- package/dist/config/http.js +4 -0
- package/dist/config/http.js.map +1 -1
- package/dist/config/log.d.ts +2 -0
- package/dist/config/log.js +5 -0
- package/dist/config/log.js.map +1 -1
- package/dist/config/rateLimiter.js +1 -1
- package/dist/config/rateLimiter.js.map +1 -1
- package/dist/controllers/Auth.js +31 -34
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Health.d.ts +24 -0
- package/dist/controllers/Health.js +83 -0
- package/dist/controllers/Health.js.map +1 -0
- package/dist/controllers/Health.routes.gen.d.ts +13 -0
- package/dist/controllers/Health.routes.gen.js +10 -0
- package/dist/controllers/Health.routes.gen.js.map +1 -0
- package/dist/controllers/index.js +11 -7
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.d.ts +19 -0
- package/dist/helpers/crypto.js +32 -1
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/helpers/deprecation.d.ts +4 -3
- package/dist/helpers/deprecation.js +5 -4
- package/dist/helpers/deprecation.js.map +1 -1
- package/dist/helpers/files.d.ts +6 -1
- package/dist/helpers/files.js +2 -1
- package/dist/helpers/files.js.map +1 -1
- package/dist/helpers/objects.d.ts +5 -0
- package/dist/helpers/objects.js +12 -0
- package/dist/helpers/objects.js.map +1 -0
- package/dist/models/User.d.ts +4 -9
- package/dist/models/User.js +37 -10
- package/dist/models/User.js.map +1 -1
- package/dist/modules/AbstractController.d.ts +3 -3
- package/dist/modules/BaseModel.js.map +1 -1
- package/dist/server.d.ts +4 -0
- package/dist/server.js +19 -2
- package/dist/server.js.map +1 -1
- package/dist/services/cache/drivers/MemoryDriver.d.ts +5 -4
- package/dist/services/cache/drivers/MemoryDriver.js +41 -18
- package/dist/services/cache/drivers/MemoryDriver.js.map +1 -1
- package/dist/services/documentation/OpenApiGenerator.js +21 -3
- package/dist/services/documentation/OpenApiGenerator.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +19 -11
- package/dist/services/http/HttpServer.js +47 -27
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/builtinErrorHandlers.d.ts +12 -2
- package/dist/services/http/builtinErrorHandlers.js +57 -9
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/httpErrors.d.ts +64 -11
- package/dist/services/http/httpErrors.js +42 -6
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/AbstractMiddleware.d.ts +14 -6
- package/dist/services/http/middleware/AbstractMiddleware.js +20 -7
- package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
- package/dist/services/http/middleware/Auth.d.ts +2 -1
- package/dist/services/http/middleware/Auth.js +9 -4
- package/dist/services/http/middleware/Auth.js.map +1 -1
- package/dist/services/http/middleware/Cors.d.ts +2 -0
- package/dist/services/http/middleware/Cors.js +9 -2
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/GetUserByToken.d.ts +1 -1
- package/dist/services/http/middleware/GetUserByToken.js +2 -2
- package/dist/services/http/middleware/GetUserByToken.js.map +1 -1
- package/dist/services/http/middleware/I18n.js +11 -9
- package/dist/services/http/middleware/I18n.js.map +1 -1
- package/dist/services/http/middleware/Pagination.js +13 -11
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.d.ts +2 -0
- package/dist/services/http/middleware/RateLimiter.js +42 -11
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestLogger.js +10 -2
- package/dist/services/http/middleware/RequestLogger.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.js +19 -5
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/middleware/Role.d.ts +2 -1
- package/dist/services/http/middleware/Role.js +14 -5
- package/dist/services/http/middleware/Role.js.map +1 -1
- package/dist/services/http/routing/ExpressAdapter.js +7 -2
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/RouteNode.d.ts +7 -8
- package/dist/services/logging/redaction.d.ts +15 -0
- package/dist/services/logging/redaction.js +54 -0
- package/dist/services/logging/redaction.js.map +1 -0
- package/dist/services/validate/ValidateService.js +3 -27
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/ValidationError.d.ts +10 -0
- package/dist/services/validate/ValidationError.js +28 -0
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/dist/services/validate/mergeValidatedOutputs.d.ts +2 -6
- package/dist/services/validate/mergeValidatedOutputs.js +5 -12
- package/dist/services/validate/mergeValidatedOutputs.js.map +1 -1
- package/dist/tests/testHelpers.d.ts +111 -8
- package/package.json +9 -9
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
* The same seam powers the future MCP surface — nothing here is OpenAPI-only
|
|
13
13
|
* throwaway.
|
|
14
14
|
*/
|
|
15
|
+
import { makeOncePerClassWarner } from '../../helpers/deprecation.js';
|
|
15
16
|
import { isContentTypeRequestMap } from '../validate/contentType.js';
|
|
16
17
|
import ValidateService from '../validate/ValidateService.js';
|
|
17
18
|
/**
|
|
@@ -333,12 +334,24 @@ async function buildRequestBody(route, warn, ctx) {
|
|
|
333
334
|
: 'application/json';
|
|
334
335
|
return { content: { [mediaType]: { schema } } };
|
|
335
336
|
}
|
|
337
|
+
const warnUsedAuthParameters = makeOncePerClassWarner('ASF_DEP_MW_USED_AUTH_PARAMETERS', (name) => `Middleware "${name}" declares the deprecated static usedAuthParameters. Rename it to authSchemes — the old name will be removed in v6.`);
|
|
336
338
|
function collectSecurity(middlewares, securitySchemes) {
|
|
337
339
|
const requirements = [];
|
|
338
340
|
const seen = new Set();
|
|
341
|
+
let isRequired = false;
|
|
339
342
|
for (const mw of middlewares) {
|
|
340
|
-
const
|
|
341
|
-
|
|
343
|
+
const Class = mw.Class;
|
|
344
|
+
if (Class.requiresAuth === true) {
|
|
345
|
+
isRequired = true;
|
|
346
|
+
}
|
|
347
|
+
let params = Class.authSchemes;
|
|
348
|
+
// A middleware written before the rename overrides only the old name.
|
|
349
|
+
if (!(Array.isArray(params) && params.length) &&
|
|
350
|
+
Array.isArray(Class.usedAuthParameters) &&
|
|
351
|
+
Class.usedAuthParameters.length) {
|
|
352
|
+
warnUsedAuthParameters(Class);
|
|
353
|
+
params = Class.usedAuthParameters;
|
|
354
|
+
}
|
|
342
355
|
if (!Array.isArray(params)) {
|
|
343
356
|
continue;
|
|
344
357
|
}
|
|
@@ -352,7 +365,12 @@ function collectSecurity(middlewares, securitySchemes) {
|
|
|
352
365
|
}
|
|
353
366
|
}
|
|
354
367
|
}
|
|
355
|
-
|
|
368
|
+
// A token reader with no middleware rejecting anonymous requests (e.g.
|
|
369
|
+
// `GetUserByToken` without `Auth`): the empty requirement `{}` tells
|
|
370
|
+
// clients an anonymous request is valid too.
|
|
371
|
+
return isRequired || requirements.length === 0
|
|
372
|
+
? requirements
|
|
373
|
+
: [{}, ...requirements];
|
|
356
374
|
}
|
|
357
375
|
function toSecurityScheme(param) {
|
|
358
376
|
if (param.type === 'apiKey') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenApiGenerator.js","sourceRoot":"","sources":["../../../src/services/documentation/OpenApiGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAuB7D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAmB,EACnB,IAA4B;IAE5B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAQ,EAAE,CAAC;IACtB,MAAM,eAAe,GAAQ,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CACF,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,8EAA8E,CAC5G,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAW,CAAC;QACxE,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAElB,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QACtC,MAAM,UAAU,GAAU,MAAM,mBAAmB,CACjD,KAAK,EACL,UAAU,EACV,IAAI,EACJ,GAAG,CACJ,CAAC;QACF,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAEnE,MAAM,SAAS,GAAQ;YACrB,WAAW,EAAE,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC;YACnD,IAAI,EAAE,CAAC,GAAG,CAAC;YACX,SAAS,EAAE,gBAAgB,EAAE;SAC9B,CAAC;QACF,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC;QACvC,CAAC;QACD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,SAAS,CAAC,UAAU,GAAG,gBAAgB,CAAC;QAC1C,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC7D,IAAI,WAAW,EAAE,CAAC;YAChB,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,CAAC;QAED,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QACrE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAChC,CAAC;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAoB,CAAC;QAC9C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,EAAE,CAAC;YACd,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QACzB,CAAC;QACD,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,GAAG,SAAS,CAAC;IACnD,CAAC;IAED,MAAM,GAAG,GAAQ;QACf,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,KAAK;QACL,IAAI,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,UAAU,EAAE,EAAE,eAAe,EAAE;KAChC,CAAC;IACF,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,iFAAiF;AAEjF,wEAAwE;AACxE,SAAS,WAAW,CAAC,YAAoB;IAKvC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,GAAG,GAAG,YAAY;SACrB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,OAAO,IAAI,IAAI,GAAG,CAAC;QACrB,CAAC;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,OAAO,IAAI,IAAI,GAAG,CAAC;QACrB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAChD,CAAC;AAED;;;;;;GAMG;AACH,SAAS,WAAW,CAClB,KAAgB,EAChB,cAAsB,EACtB,IAAY,EACZ,OAAoB;IAEpB,MAAM,IAAI,GAAG,eAAe,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IAC1D,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,SAAS,GAAG,GAAG,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IACtD,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACnC,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;QACD,SAAS,GAAG,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,eAAe,CACtB,KAAgB,EAChB,cAAsB,EACtB,IAAY;IAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1C,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,GAAG,cAAc,IAAI,IAAI,EAAE,CAAC;IACrC,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACvE,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;AAC3D,CAAC;AAED,kFAAkF;AAElF;;;;GAIG;AACH,KAAK,UAAU,YAAY,CACzB,MAAe,EACf,IAA+B,EAC/B,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,OAAO,qCAAqC,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,OAAO,qCAAqC,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,+EAA+E;QAC/E,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,MAAa,CAAC;QAC3C,OAAO,IAAkB,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,GAAG,OAAO,gCAAgC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,iBAAiB;IACxB,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,WAAW,EACT,mGAAmG;KACtG,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,OAAqB;IAC3C,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;AACzE,CAAC;AAED,0EAA0E;AAC1E,SAAS,kBAAkB,CAAC,OAAqB;IAC/C,MAAM,UAAU,GAAQ,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;QAChC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClC,QAAQ,CAAC,GAAG,CAAC,GAAa,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,GAAG,GAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvD,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACtB,GAAG,CAAC,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,cAAc,CAAC,MAAkB;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;IAChC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAY,CAAC,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAK,CAAS,CAAC,MAAM,KAAK,QAAQ,CAC5E,CAAC;AACJ,CAAC;AAED,mFAAmF;AAEnF,qFAAqF;AACrF,SAAS,wBAAwB,CAC/B,WAA8B,EAC9B,IAAyB;IAEzB,MAAM,IAAI,GACR,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,wBAAwB,CAAC;IAC7E,MAAM,GAAG,GAAuB,EAAE,CAAC;IACnC,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAI,EAAE,CAAC,KAA4C,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,CAAC,IAAI,CAAC,MAA0B,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,mFAAmF;AAEnF;;;;;;;GAOG;AACH,SAAS,gBAAgB,CAAC,MAAa;IACrC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAG,GAAU,EAAE,CAAC;IACtB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACzD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,mBAAmB,CAChC,KAAgB,EAChB,UAAoB,EACpB,IAAyB,EACzB,GAAW;IAEX,IAAI,KAAK,GAAQ,EAAE,CAAC;IACpB,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;QAC3E,KAAK,GAAI,IAAI,EAAE,UAAkB,IAAI,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,wEAAwE;gBACxE,qEAAqE;gBACrE,2DAA2D;gBAC3D,IAAI,CACF,GAAG,GAAG,6BAA6B,IAAI,2EAA2E,CACnH,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/B,IAAI;QACJ,EAAE,EAAE,MAAM;QACV,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC1C,CAAC,CAAC,CAAC;AACN,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,KAAgB,EAChB,IAAyB,EACzB,GAAW;IAEX,MAAM,OAAO,GAAc;QACzB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,GAAG,wBAAwB,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC;KACxD,CAAC;IACF,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,QAAQ,CAAC,CAAC;QAC9D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAI,IAAI,CAAC,UAAkB,IAAI,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,CACtB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,IAAI,CAAC,QAAqB,CAAC,CAAC,CAAC,EAAE,CAChE,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvD,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI;gBACJ,EAAE,EAAE,OAAO;gBACX,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;gBAC5B,MAAM,EAAE,UAAU;aACnB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,KAAgB,EAChB,IAAyB,EACzB,GAAW;IAEX,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;IAChC,MAAM,SAAS,GAAG,wBAAwB,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,CACd,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,GAAG,qBAAqB,CAAC,CAAC,CACzE,CACF,CAAC,MAAM,CAAC,CAAC,CAAC,EAAmB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IAE5C,iFAAiF;IACjF,IAAI,GAAG,IAAI,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;QACxC,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACtD,MAAM,SAAS,GAAG,MAAM,YAAY,CAClC,MAAM,EACN,IAAI,EACJ,GAAG,GAAG,UAAU,SAAS,GAAG,CAC7B,CAAC;YACF,MAAM,MAAM,GAAG,cAAc,CAAC;gBAC5B,SAAS,IAAI,iBAAiB,EAAE;gBAChC,GAAG,OAAO;aACX,CAAC,CAAC;YACH,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC1C,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;IAED,2BAA2B;IAC3B,IAAI,QAAQ,GAAsB,IAAI,CAAC;IACvC,IAAI,GAAG,EAAE,CAAC;QACR,QAAQ,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,GAAG,OAAO;KACX,CAAC;IACF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC,CAAC,mBAAmB;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC;QACtC,CAAC,CAAC,qBAAqB;QACvB,CAAC,CAAC,kBAAkB,CAAC;IACvB,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;AAClD,CAAC;AAED,SAAS,eAAe,CACtB,WAA8B,EAC9B,eAAoB;IAEpB,MAAM,YAAY,GAAU,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAI,EAAE,CAAC,KAAqD;aACrE,kBAAkB,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,SAAS;QACX,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,MAAyB,EAAE,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACrB,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAoB;IAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,QAAQ;YACxB,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO;YACL,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,QAAQ;YAChC,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;AAC9D,CAAC;AAED,SAAS,gBAAgB;IACvB,OAAO;QACL,KAAK,EAAE,EAAE,WAAW,EAAE,qBAAqB,EAAE;QAC7C,KAAK,EAAE,EAAE,WAAW,EAAE,kBAAkB,EAAE;QAC1C,KAAK,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE;QACtC,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE;KACpC,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"OpenApiGenerator.js","sourceRoot":"","sources":["../../../src/services/documentation/OpenApiGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,12 @@ declare class HttpServer extends Base {
|
|
|
24
24
|
httpServer: Server;
|
|
25
25
|
routeRegistry: RouteRegistry;
|
|
26
26
|
constructor(app: IApp);
|
|
27
|
+
/**
|
|
28
|
+
* Start accepting connections; resolves once the port is bound. Called by
|
|
29
|
+
* `startServer` after routes, the 404 page and the error handler are
|
|
30
|
+
* mounted, so no request reaches a partly built app.
|
|
31
|
+
*/
|
|
32
|
+
listen(): Promise<void>;
|
|
27
33
|
/** Mount the route adapter — single entry to the registry. */
|
|
28
34
|
mountAdapter(): void;
|
|
29
35
|
/**
|
|
@@ -34,20 +40,20 @@ declare class HttpServer extends Base {
|
|
|
34
40
|
* pass to the next entry. Typical registration point is the project's
|
|
35
41
|
* `bootHttp` hook. Returns an unregister function.
|
|
36
42
|
*
|
|
37
|
-
* Scope: handlers fire for errors thrown from route handlers
|
|
38
|
-
* validation
|
|
39
|
-
*
|
|
43
|
+
* Scope: handlers fire for errors thrown from route handlers, request
|
|
44
|
+
* validation and middleware (the final sink, `addErrorHandler`, resolves
|
|
45
|
+
* through the same registry).
|
|
40
46
|
*/
|
|
41
47
|
registerErrorHandler<E extends Error>(errorClass: abstract new (...args: never[]) => E, handler: ErrorHandlerFn<E>, opts?: {
|
|
42
48
|
logLevel?: ErrorLogLevel;
|
|
43
49
|
}): () => void;
|
|
44
50
|
/**
|
|
45
|
-
* Resolve a
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
+
* Resolve a thrown error through the registry: consumer tier first, then
|
|
52
|
+
* built-ins; first `instanceof` match returning non-null wins. A handler
|
|
53
|
+
* that itself throws aborts the walk (logged here at `error`; the caller
|
|
54
|
+
* falls through to its 500) — never a crash loop. Returns null when no entry
|
|
55
|
+
* produced a response. Called by the route-handler and validation catches
|
|
56
|
+
* and by the final sink, which receives middleware errors.
|
|
51
57
|
*/
|
|
52
58
|
resolveError(err: unknown, req: FrameworkRequest): Promise<(ErrorHandlerResult & {
|
|
53
59
|
logLevel: ErrorLogLevel;
|
|
@@ -57,8 +63,10 @@ declare class HttpServer extends Base {
|
|
|
57
63
|
*/
|
|
58
64
|
add404Page(): void;
|
|
59
65
|
/**
|
|
60
|
-
* Add the
|
|
61
|
-
*
|
|
66
|
+
* Add the final error sink. A 4-arg handler is the error sink, so it must
|
|
67
|
+
* be registered last. Errors from middleware (and from a handler that
|
|
68
|
+
* already streamed) land here; the registry answers what it recognises,
|
|
69
|
+
* anything else is a 500.
|
|
62
70
|
*/
|
|
63
71
|
addErrorHandler(): void;
|
|
64
72
|
static get loggerGroup(): string;
|
|
@@ -2,7 +2,7 @@ import http from 'node:http';
|
|
|
2
2
|
import express from 'express';
|
|
3
3
|
import { translateWithDefault } from '../../helpers/translate.js';
|
|
4
4
|
import Base from '../../modules/Base.js';
|
|
5
|
-
import { builtInErrorHandlers, } from './builtinErrorHandlers.js';
|
|
5
|
+
import { builtInErrorHandlers, sendErrorResult, serverErrorMessage, toLoggableError, } from './builtinErrorHandlers.js';
|
|
6
6
|
import Cors from './middleware/Cors.js';
|
|
7
7
|
import I18nMiddleware from './middleware/I18n.js';
|
|
8
8
|
import IpDetector from './middleware/IpDetector.js';
|
|
@@ -47,6 +47,7 @@ class HttpServer extends Base {
|
|
|
47
47
|
this.express.use(new I18nMiddleware(this.app).getMiddleware());
|
|
48
48
|
this.express.use(new Cors(this.app, {
|
|
49
49
|
origins: httpConfig.corsDomains,
|
|
50
|
+
exposedHeaders: httpConfig.corsExposedHeaders,
|
|
50
51
|
}).getMiddleware());
|
|
51
52
|
this.express.use(new RequestParserMiddleware(this.app).getMiddleware());
|
|
52
53
|
this.httpServer = http.createServer(this.express);
|
|
@@ -58,15 +59,26 @@ class HttpServer extends Base {
|
|
|
58
59
|
this.logger?.error(`HTTP server failed to start: ${err}`);
|
|
59
60
|
process.exit(1);
|
|
60
61
|
});
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Start accepting connections; resolves once the port is bound. Called by
|
|
65
|
+
* `startServer` after routes, the 404 page and the error handler are
|
|
66
|
+
* mounted, so no request reaches a partly built app.
|
|
67
|
+
*/
|
|
68
|
+
listen() {
|
|
69
|
+
const httpConfig = this.app.getConfig('http');
|
|
70
|
+
return new Promise((resolve) => {
|
|
71
|
+
const listener = this.httpServer.listen(httpConfig.port, httpConfig.hostname, () => {
|
|
72
|
+
const address = listener.address();
|
|
73
|
+
const port = typeof address === 'string' ? 0 : address?.port || 0;
|
|
74
|
+
this.logger?.info(`App started and listening on port ${port}`);
|
|
75
|
+
if (+port !== +httpConfig.port) {
|
|
76
|
+
// in case we using port 0
|
|
77
|
+
this.app.updateConfig('http', { port });
|
|
78
|
+
this.logger?.info(`Updating http config to use new port ${port}. Old was ${httpConfig.port} `);
|
|
79
|
+
}
|
|
80
|
+
resolve();
|
|
81
|
+
});
|
|
70
82
|
});
|
|
71
83
|
}
|
|
72
84
|
/** Mount the route adapter — single entry to the registry. */
|
|
@@ -81,9 +93,9 @@ class HttpServer extends Base {
|
|
|
81
93
|
* pass to the next entry. Typical registration point is the project's
|
|
82
94
|
* `bootHttp` hook. Returns an unregister function.
|
|
83
95
|
*
|
|
84
|
-
* Scope: handlers fire for errors thrown from route handlers
|
|
85
|
-
* validation
|
|
86
|
-
*
|
|
96
|
+
* Scope: handlers fire for errors thrown from route handlers, request
|
|
97
|
+
* validation and middleware (the final sink, `addErrorHandler`, resolves
|
|
98
|
+
* through the same registry).
|
|
87
99
|
*/
|
|
88
100
|
registerErrorHandler(errorClass, handler, opts) {
|
|
89
101
|
const entry = {
|
|
@@ -102,12 +114,12 @@ class HttpServer extends Base {
|
|
|
102
114
|
};
|
|
103
115
|
}
|
|
104
116
|
/**
|
|
105
|
-
* Resolve a
|
|
106
|
-
*
|
|
107
|
-
*
|
|
108
|
-
*
|
|
109
|
-
*
|
|
110
|
-
*
|
|
117
|
+
* Resolve a thrown error through the registry: consumer tier first, then
|
|
118
|
+
* built-ins; first `instanceof` match returning non-null wins. A handler
|
|
119
|
+
* that itself throws aborts the walk (logged here at `error`; the caller
|
|
120
|
+
* falls through to its 500) — never a crash loop. Returns null when no entry
|
|
121
|
+
* produced a response. Called by the route-handler and validation catches
|
|
122
|
+
* and by the final sink, which receives middleware errors.
|
|
111
123
|
*/
|
|
112
124
|
async resolveError(err, req) {
|
|
113
125
|
for (const entry of [...this.#errorHandlers, ...this.#builtInHandlers]) {
|
|
@@ -138,25 +150,33 @@ class HttpServer extends Base {
|
|
|
138
150
|
this.express.use((req, res) => {
|
|
139
151
|
// error handling
|
|
140
152
|
res.status(404).json({
|
|
141
|
-
message: translateWithDefault(req, 'http.notFound', '
|
|
153
|
+
message: translateWithDefault(req, 'http.notFound', 'Not found'),
|
|
142
154
|
});
|
|
143
155
|
});
|
|
144
156
|
}
|
|
145
157
|
/**
|
|
146
|
-
* Add the
|
|
147
|
-
*
|
|
158
|
+
* Add the final error sink. A 4-arg handler is the error sink, so it must
|
|
159
|
+
* be registered last. Errors from middleware (and from a handler that
|
|
160
|
+
* already streamed) land here; the registry answers what it recognises,
|
|
161
|
+
* anything else is a 500.
|
|
148
162
|
*/
|
|
149
163
|
addErrorHandler() {
|
|
150
|
-
this.express.use((err, req, res, next) => {
|
|
151
|
-
this.logger?.error(`Unhandled request error: ${err.stack ?? err}`);
|
|
164
|
+
this.express.use(async (err, req, res, next) => {
|
|
152
165
|
// If the response already started (e.g. a handler that threw mid-stream),
|
|
153
|
-
//
|
|
154
|
-
//
|
|
166
|
+
// nothing can be sent — hand off to the default finalizer instead of
|
|
167
|
+
// crashing with ERR_HTTP_HEADERS_SENT.
|
|
155
168
|
if (res.headersSent) {
|
|
169
|
+
this.logger?.error(`Unhandled request error: ${err.stack ?? err}`);
|
|
156
170
|
return next(err);
|
|
157
171
|
}
|
|
172
|
+
const resolved = await this.resolveError(err, req);
|
|
173
|
+
if (resolved) {
|
|
174
|
+
this.logger?.[resolved.logLevel](toLoggableError(err));
|
|
175
|
+
return sendErrorResult(res, resolved);
|
|
176
|
+
}
|
|
177
|
+
this.logger?.error(`Unhandled request error: ${err.stack ?? err}`);
|
|
158
178
|
res.status(500).json({
|
|
159
|
-
message:
|
|
179
|
+
message: serverErrorMessage(req),
|
|
160
180
|
});
|
|
161
181
|
});
|
|
162
182
|
}
|
|
@@ -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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"}
|
|
@@ -1,12 +1,21 @@
|
|
|
1
|
+
import type { Response } from 'express';
|
|
1
2
|
import mongoose from 'mongoose';
|
|
2
3
|
import type { FrameworkRequest } from './HttpServer.ts';
|
|
4
|
+
/** The `message` of every framework 500 response. */
|
|
5
|
+
export declare const serverErrorMessage: (req: FrameworkRequest) => string;
|
|
6
|
+
/** The `message` of every framework field-error (400) response. */
|
|
7
|
+
export declare const validationFailedMessage: (req: FrameworkRequest) => string;
|
|
3
8
|
/** Levels the registry may log a handled error at (winston leveled methods). */
|
|
4
9
|
export type ErrorLogLevel = 'error' | 'warn' | 'info' | 'http' | 'verbose' | 'debug' | 'silly';
|
|
5
10
|
/** What a handler returns to produce a response; `null`/`undefined` = pass. */
|
|
6
11
|
export interface ErrorHandlerResult {
|
|
7
12
|
status: number;
|
|
8
13
|
body: unknown;
|
|
14
|
+
/** Response headers, e.g. `{ 'Retry-After': '30' }` on a 429. */
|
|
15
|
+
headers?: Record<string, string>;
|
|
9
16
|
}
|
|
17
|
+
/** Answer a resolved error: its headers, status and JSON body. */
|
|
18
|
+
export declare function sendErrorResult(res: Response, { status, body, headers }: ErrorHandlerResult): Response<any, Record<string, any>>;
|
|
10
19
|
export type ErrorHandlerFn<E extends Error = Error> = (err: E, req: FrameworkRequest) => ErrorHandlerResult | null | undefined | Promise<ErrorHandlerResult | null | undefined>;
|
|
11
20
|
/** A registered (class, handler, level) triple as stored by the registry. */
|
|
12
21
|
export interface RegisteredErrorHandler {
|
|
@@ -61,8 +70,9 @@ export declare function matchedClientCastError(err: mongoose.Error.CastError, re
|
|
|
61
70
|
/**
|
|
62
71
|
* Framework built-in registry entries, checked AFTER any consumer-registered
|
|
63
72
|
* handlers ("yours win"):
|
|
64
|
-
* 1. `HttpError` → its own status
|
|
65
|
-
*
|
|
73
|
+
* 1. `HttpError` → its own status, headers and
|
|
74
|
+
* `body ?? { error?: code, message }`, message translated via `i18nKey`;
|
|
75
|
+
* `verbose` (deliberate control flow, not a defect).
|
|
66
76
|
* 2. Escaped Mongoose `ValidationError` → the safety net above; `warn`
|
|
67
77
|
* (signals a route schema missing a constraint the model enforces).
|
|
68
78
|
* 3. Standalone Mongoose `CastError` → {@link matchedClientCastError}; `warn`
|
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
import mongoose from 'mongoose';
|
|
2
|
+
import { translateWithDefault } from '../../helpers/translate.js';
|
|
3
|
+
import { issuesToPayload, translateIssues, ValidationError, } from '../validate/ValidationError.js';
|
|
2
4
|
import { HttpError } from './httpErrors.js';
|
|
5
|
+
/** The `message` of every framework 500 response. */
|
|
6
|
+
export const serverErrorMessage = (req) => translateWithDefault(req, 'http.serverError', 'Something went wrong. Please try again later.');
|
|
7
|
+
/** The `message` of every framework field-error (400) response. */
|
|
8
|
+
export const validationFailedMessage = (req) => translateWithDefault(req, 'http.validationFailed', 'Validation failed');
|
|
9
|
+
/** Answer a resolved error: its headers, status and JSON body. */
|
|
10
|
+
export function sendErrorResult(res, { status, body, headers }) {
|
|
11
|
+
for (const [name, value] of Object.entries(headers ?? {})) {
|
|
12
|
+
res.setHeader(name, value);
|
|
13
|
+
}
|
|
14
|
+
return res.status(status).json(body);
|
|
15
|
+
}
|
|
3
16
|
/** A numeric/Date schema bound (both are constants, never input) → text. */
|
|
4
17
|
function renderBound(bound) {
|
|
5
18
|
if (typeof bound === 'number') {
|
|
@@ -217,8 +230,9 @@ export function matchedClientCastError(err, req) {
|
|
|
217
230
|
/**
|
|
218
231
|
* Framework built-in registry entries, checked AFTER any consumer-registered
|
|
219
232
|
* handlers ("yours win"):
|
|
220
|
-
* 1. `HttpError` → its own status
|
|
221
|
-
*
|
|
233
|
+
* 1. `HttpError` → its own status, headers and
|
|
234
|
+
* `body ?? { error?: code, message }`, message translated via `i18nKey`;
|
|
235
|
+
* `verbose` (deliberate control flow, not a defect).
|
|
222
236
|
* 2. Escaped Mongoose `ValidationError` → the safety net above; `warn`
|
|
223
237
|
* (signals a route schema missing a constraint the model enforces).
|
|
224
238
|
* 3. Standalone Mongoose `CastError` → {@link matchedClientCastError}; `warn`
|
|
@@ -232,12 +246,34 @@ export function builtInErrorHandlers() {
|
|
|
232
246
|
errorClass: HttpError,
|
|
233
247
|
// Entries are stored type-erased (`ErrorHandlerFn`); `resolveError`
|
|
234
248
|
// guarantees `instanceof errorClass` before the call.
|
|
235
|
-
handler: (err) => {
|
|
249
|
+
handler: (err, req) => {
|
|
236
250
|
const httpErr = err;
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
251
|
+
const { status } = httpErr;
|
|
252
|
+
const headers = httpErr.headers && { headers: httpErr.headers };
|
|
253
|
+
if (httpErr.body != null) {
|
|
254
|
+
// Custom `{ message, body }` or the deprecated positional body:
|
|
255
|
+
// answered verbatim.
|
|
256
|
+
return { status, body: httpErr.body, ...headers };
|
|
257
|
+
}
|
|
258
|
+
let { message } = httpErr;
|
|
259
|
+
if (httpErr.i18nKey) {
|
|
260
|
+
// `skipInterpolation`: a missing key falls back to the English text
|
|
261
|
+
// literally — it may embed request data, so i18next must not expand
|
|
262
|
+
// `$t(...)` or `{{…}}` inside it.
|
|
263
|
+
const translated = req.appInfo?.i18n?.t(httpErr.i18nKey, {
|
|
264
|
+
defaultValue: message,
|
|
265
|
+
skipInterpolation: true,
|
|
266
|
+
});
|
|
267
|
+
if (typeof translated === 'string') {
|
|
268
|
+
message = translated;
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
const body = httpErr.code ? { error: httpErr.code, message } : { message };
|
|
272
|
+
if (httpErr.issues) {
|
|
273
|
+
const t = req.appInfo?.i18n?.t;
|
|
274
|
+
body.errors = issuesToPayload(t ? translateIssues(httpErr.issues, t) : httpErr.issues);
|
|
275
|
+
}
|
|
276
|
+
return { status, body, ...headers };
|
|
241
277
|
},
|
|
242
278
|
logLevel: 'verbose',
|
|
243
279
|
},
|
|
@@ -246,7 +282,13 @@ export function builtInErrorHandlers() {
|
|
|
246
282
|
handler: (err, req) => {
|
|
247
283
|
const clientErrors = matchedClientValidationErrors(err, req);
|
|
248
284
|
return clientErrors
|
|
249
|
-
? {
|
|
285
|
+
? {
|
|
286
|
+
status: 400,
|
|
287
|
+
body: {
|
|
288
|
+
message: validationFailedMessage(req),
|
|
289
|
+
errors: new ValidationError(clientErrors).message,
|
|
290
|
+
},
|
|
291
|
+
}
|
|
250
292
|
: null;
|
|
251
293
|
},
|
|
252
294
|
logLevel: 'warn',
|
|
@@ -256,7 +298,13 @@ export function builtInErrorHandlers() {
|
|
|
256
298
|
handler: (err, req) => {
|
|
257
299
|
const clientErrors = matchedClientCastError(err, req);
|
|
258
300
|
return clientErrors
|
|
259
|
-
? {
|
|
301
|
+
? {
|
|
302
|
+
status: 400,
|
|
303
|
+
body: {
|
|
304
|
+
message: validationFailedMessage(req),
|
|
305
|
+
errors: new ValidationError(clientErrors).message,
|
|
306
|
+
},
|
|
307
|
+
}
|
|
260
308
|
: null;
|
|
261
309
|
},
|
|
262
310
|
logLevel: 'warn',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtinErrorHandlers.js","sourceRoot":"","sources":["../../../src/services/http/builtinErrorHandlers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"builtinErrorHandlers.js","sourceRoot":"","sources":["../../../src/services/http/builtinErrorHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,30 +1,83 @@
|
|
|
1
|
+
import type { ValidationIssue } from '../validate/types.ts';
|
|
2
|
+
import { type ValidationErrorPayload } from '../validate/ValidationError.ts';
|
|
3
|
+
/** Contract form: answered as `{ error?: code, message, errors? }`; `i18nKey` stays on the server. */
|
|
4
|
+
export interface HttpErrorContractDetails {
|
|
5
|
+
/** English text: the log line, and the response message unless `i18nKey` translates it. */
|
|
6
|
+
message: string;
|
|
7
|
+
/** Machine-readable code, answered as `{ error: code, message }`. */
|
|
8
|
+
code?: string;
|
|
9
|
+
/** Translation key for the response message; stays on the server. */
|
|
10
|
+
i18nKey?: string;
|
|
11
|
+
/**
|
|
12
|
+
* Field errors, the same shape as request validation: `{ field: msg | [msg] }`
|
|
13
|
+
* or validation issues (with `params` for interpolation). Answered as
|
|
14
|
+
* `errors: { field: [msg] }`; i18n-key messages are translated.
|
|
15
|
+
*/
|
|
16
|
+
errors?: ValidationErrorPayload | ReadonlyArray<ValidationIssue>;
|
|
17
|
+
/** Response headers, e.g. `{ 'Retry-After': '30' }` on a 429. */
|
|
18
|
+
headers?: Record<string, string>;
|
|
19
|
+
body?: never;
|
|
20
|
+
}
|
|
21
|
+
/** Custom form: `body` IS the response — the contract fields cannot be combined with it. */
|
|
22
|
+
export interface HttpErrorBodyDetails {
|
|
23
|
+
/** English text for the log line; not sent. */
|
|
24
|
+
message: string;
|
|
25
|
+
/** The whole response body, sent as-is (no `error`/`message`/`errors` added). */
|
|
26
|
+
body: unknown;
|
|
27
|
+
/** Response headers, e.g. `{ 'Retry-After': '30' }` on a 429. */
|
|
28
|
+
headers?: Record<string, string>;
|
|
29
|
+
code?: never;
|
|
30
|
+
i18nKey?: never;
|
|
31
|
+
errors?: never;
|
|
32
|
+
}
|
|
33
|
+
export type HttpErrorDetails = HttpErrorContractDetails | HttpErrorBodyDetails;
|
|
1
34
|
/**
|
|
2
35
|
* Throwable HTTP errors — the deliberate way to produce a status from deep
|
|
3
|
-
* business logic without threading `res`. Thrown
|
|
4
|
-
* resolve through the error-handler registry
|
|
36
|
+
* business logic without threading `res`. Thrown from a route handler or a
|
|
37
|
+
* middleware, they resolve through the error-handler registry
|
|
5
38
|
* (`HttpServer.registerErrorHandler`) via a built-in mapper:
|
|
6
|
-
* `status` + `
|
|
7
|
-
*
|
|
39
|
+
* `status` + `{ error?: code, message, errors? }` (message translated via
|
|
40
|
+
* `i18nKey`, field errors like request validation) or a custom `body`, logged
|
|
41
|
+
* at `verbose` (control flow, not a defect).
|
|
42
|
+
* Subclass for other statuses, or construct the base directly:
|
|
8
43
|
* `new HttpError(422, 'Unprocessable')`.
|
|
9
44
|
*/
|
|
10
45
|
export declare class HttpError extends Error {
|
|
11
46
|
readonly status: number;
|
|
12
|
-
/**
|
|
47
|
+
/** Custom response body (`{ message, body }`); when set, the contract fields are unused. */
|
|
13
48
|
readonly body?: unknown;
|
|
14
|
-
|
|
49
|
+
readonly code?: string;
|
|
50
|
+
readonly i18nKey?: string;
|
|
51
|
+
/** Field errors from `details.errors`, normalized to validation issues. */
|
|
52
|
+
readonly issues?: ReadonlyArray<ValidationIssue>;
|
|
53
|
+
/** Response headers from `details.headers`. */
|
|
54
|
+
readonly headers?: Record<string, string>;
|
|
55
|
+
constructor(status: number, message: string | HttpErrorDetails);
|
|
56
|
+
/** @deprecated Use `{ message, errors }` for field errors, or `{ message, body }` for a custom body. Removed in v6. */
|
|
57
|
+
constructor(status: number, message: string | HttpErrorDetails, body: unknown);
|
|
15
58
|
}
|
|
16
59
|
export declare class BadRequestError extends HttpError {
|
|
17
|
-
constructor(message?: string
|
|
60
|
+
constructor(message?: string | HttpErrorDetails);
|
|
61
|
+
/** @deprecated Use `{ message, errors }` for field errors, or `{ message, body }` for a custom body. Removed in v6. */
|
|
62
|
+
constructor(message: string | HttpErrorDetails | undefined, body: unknown);
|
|
18
63
|
}
|
|
19
64
|
export declare class UnauthorizedError extends HttpError {
|
|
20
|
-
constructor(message?: string
|
|
65
|
+
constructor(message?: string | HttpErrorDetails);
|
|
66
|
+
/** @deprecated Use `{ message, errors }` for field errors, or `{ message, body }` for a custom body. Removed in v6. */
|
|
67
|
+
constructor(message: string | HttpErrorDetails | undefined, body: unknown);
|
|
21
68
|
}
|
|
22
69
|
export declare class ForbiddenError extends HttpError {
|
|
23
|
-
constructor(message?: string
|
|
70
|
+
constructor(message?: string | HttpErrorDetails);
|
|
71
|
+
/** @deprecated Use `{ message, errors }` for field errors, or `{ message, body }` for a custom body. Removed in v6. */
|
|
72
|
+
constructor(message: string | HttpErrorDetails | undefined, body: unknown);
|
|
24
73
|
}
|
|
25
74
|
export declare class NotFoundError extends HttpError {
|
|
26
|
-
constructor(message?: string
|
|
75
|
+
constructor(message?: string | HttpErrorDetails);
|
|
76
|
+
/** @deprecated Use `{ message, errors }` for field errors, or `{ message, body }` for a custom body. Removed in v6. */
|
|
77
|
+
constructor(message: string | HttpErrorDetails | undefined, body: unknown);
|
|
27
78
|
}
|
|
28
79
|
export declare class ConflictError extends HttpError {
|
|
29
|
-
constructor(message?: string
|
|
80
|
+
constructor(message?: string | HttpErrorDetails);
|
|
81
|
+
/** @deprecated Use `{ message, errors }` for field errors, or `{ message, body }` for a custom body. Removed in v6. */
|
|
82
|
+
constructor(message: string | HttpErrorDetails | undefined, body: unknown);
|
|
30
83
|
}
|