@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.
Files changed (95) hide show
  1. package/CHANGELOG.md +48 -0
  2. package/README.md +75 -0
  3. package/dist/clusterRunner.js +2 -1
  4. package/dist/clusterRunner.js.map +1 -1
  5. package/dist/codegen/astEmit.js +7 -0
  6. package/dist/codegen/astEmit.js.map +1 -1
  7. package/dist/codegen/astExtract.d.ts +3 -0
  8. package/dist/codegen/astExtract.js +1 -0
  9. package/dist/codegen/astExtract.js.map +1 -1
  10. package/dist/codegen/astResolve.d.ts +2 -0
  11. package/dist/codegen/astResolve.js +1 -0
  12. package/dist/codegen/astResolve.js.map +1 -1
  13. package/dist/codegen/emit.js +1 -1
  14. package/dist/codegen/index.js +1 -1
  15. package/dist/codegen/index.js.map +1 -1
  16. package/dist/config/http.js +5 -2
  17. package/dist/config/http.js.map +1 -1
  18. package/dist/controllers/Auth.d.ts +22 -14
  19. package/dist/controllers/Auth.js +38 -72
  20. package/dist/controllers/Auth.js.map +1 -1
  21. package/dist/controllers/Auth.routes.gen.d.ts +1 -1
  22. package/dist/controllers/Auth.routes.gen.js +1 -1
  23. package/dist/controllers/Health.d.ts +8 -5
  24. package/dist/controllers/Health.js +11 -6
  25. package/dist/controllers/Health.js.map +1 -1
  26. package/dist/controllers/Health.routes.gen.d.ts +1 -1
  27. package/dist/controllers/Health.routes.gen.js +1 -1
  28. package/dist/controllers/Home.d.ts +3 -2
  29. package/dist/controllers/Home.js +6 -2
  30. package/dist/controllers/Home.js.map +1 -1
  31. package/dist/controllers/Home.routes.gen.d.ts +1 -1
  32. package/dist/controllers/Home.routes.gen.js +1 -1
  33. package/dist/controllers/index.js +39 -29
  34. package/dist/controllers/index.js.map +1 -1
  35. package/dist/helpers/crypto.d.ts +6 -0
  36. package/dist/helpers/crypto.js +18 -4
  37. package/dist/helpers/crypto.js.map +1 -1
  38. package/dist/helpers/logger.d.ts +3 -1
  39. package/dist/helpers/logger.js +11 -1
  40. package/dist/helpers/logger.js.map +1 -1
  41. package/dist/helpers/passwordPolicy.d.ts +23 -0
  42. package/dist/helpers/passwordPolicy.js +62 -0
  43. package/dist/helpers/passwordPolicy.js.map +1 -0
  44. package/dist/helpers/redis/redisConnection.d.ts +1 -0
  45. package/dist/helpers/redis/redisConnection.js +1 -0
  46. package/dist/helpers/redis/redisConnection.js.map +1 -1
  47. package/dist/helpers/yup.d.ts +11 -5
  48. package/dist/helpers/yup.js +12 -6
  49. package/dist/helpers/yup.js.map +1 -1
  50. package/dist/locales/ru/translation.json +31 -0
  51. package/dist/models/User.d.ts +5 -4
  52. package/dist/models/User.js +0 -3
  53. package/dist/models/User.js.map +1 -1
  54. package/dist/models/UserOld.d.ts +2 -0
  55. package/dist/models/UserOld.js +9 -3
  56. package/dist/models/UserOld.js.map +1 -1
  57. package/dist/server.d.ts +22 -2
  58. package/dist/server.js +83 -14
  59. package/dist/server.js.map +1 -1
  60. package/dist/services/http/ExpressResponseWriter.d.ts +30 -0
  61. package/dist/services/http/ExpressResponseWriter.js +447 -0
  62. package/dist/services/http/ExpressResponseWriter.js.map +1 -0
  63. package/dist/services/http/HttpServer.d.ts +16 -10
  64. package/dist/services/http/HttpServer.js +71 -23
  65. package/dist/services/http/HttpServer.js.map +1 -1
  66. package/dist/services/http/ResponseWriter.d.ts +11 -0
  67. package/dist/services/http/ResponseWriter.js +2 -0
  68. package/dist/services/http/ResponseWriter.js.map +1 -0
  69. package/dist/services/http/builtInResponse.d.ts +26 -0
  70. package/dist/services/http/builtInResponse.js +70 -0
  71. package/dist/services/http/builtInResponse.js.map +1 -0
  72. package/dist/services/http/builtinErrorHandlers.d.ts +52 -5
  73. package/dist/services/http/builtinErrorHandlers.js +86 -5
  74. package/dist/services/http/builtinErrorHandlers.js.map +1 -1
  75. package/dist/services/http/files.d.ts +21 -8
  76. package/dist/services/http/files.js +2 -18
  77. package/dist/services/http/files.js.map +1 -1
  78. package/dist/services/http/httpErrors.d.ts +40 -2
  79. package/dist/services/http/httpErrors.js +50 -2
  80. package/dist/services/http/httpErrors.js.map +1 -1
  81. package/dist/services/http/middleware/RateLimiter.d.ts +1 -0
  82. package/dist/services/http/middleware/RateLimiter.js +36 -13
  83. package/dist/services/http/middleware/RateLimiter.js.map +1 -1
  84. package/dist/services/http/middleware/RequestParser.d.ts +5 -2
  85. package/dist/services/http/middleware/RequestParser.js +43 -25
  86. package/dist/services/http/middleware/RequestParser.js.map +1 -1
  87. package/dist/services/http/responses.d.ts +114 -0
  88. package/dist/services/http/responses.js +191 -0
  89. package/dist/services/http/responses.js.map +1 -0
  90. package/dist/services/http/routing/ExpressAdapter.d.ts +4 -1
  91. package/dist/services/http/routing/ExpressAdapter.js +82 -9
  92. package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
  93. package/dist/services/validate/drivers/YupDriver.js +44 -6
  94. package/dist/services/validate/drivers/YupDriver.js.map +1 -1
  95. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -6,6 +6,54 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6
6
 
7
7
  ## [Unreleased]
8
8
 
9
+ ## [5.7.0] - 2026-11-22
10
+
11
+ ### Added
12
+
13
+ - **Route handlers can return their response instead of writing to `res`.** `HttpResponse` from `services/http/responses.js` builds typed response values: `json`, `text`, `bytes`, `stream`, `redirect`, `empty`, and `native` for a Web `Response`. A handler returns one (`return HttpResponse.json(201, user)`) and the framework sends it. The status comes first and keeps its literal type, so `Promise<JsonResponse<201, UserDto>>` describes the handler. A status a kind cannot use fails to compile and throws a `RangeError` at runtime: informational statuses, 204/205/304 anywhere but `empty`, and 206 (`native` sends a Web `Response` with the status it has; for one that came from `fetch`, the encoding, length and digest headers of a body `fetch` decoded are dropped; a ranged 206 is passed on as received). Set the media type with `contentType` (`HttpResponse.json(422, problem, { contentType: 'application/problem+json' })`) and other headers with `headers`. JSON, text and bytes are sent like `res.json` / `res.send`, with the same `ETag` and charset. Headers already on the response (security headers, CORS) stay: a returned header replaces one of the same name, `set-cookie` is appended and `vary` merged. A stream sends its status and headers with its first chunk, so an error before that chunk is answered like a thrown error. A client that disconnects stops the stream's source, also while a chunk is still pending (an async generator finishes its current step first). A source yields a new chunk object each time: chunks are not copied, so reusing one buffer corrupts the body. Errors are still thrown (`throw new NotFoundError(…)`), and handlers that write to `res` keep working. A handler that has already sent through `res`, or piped the returned stream into it, and also returns a response gets an error logged, and the returned response is not sent.
14
+ - **`transformResponse` reshapes every response the framework renders.** Pass it to the `Server` constructor (and to `configureTestServer` in tests) to rewrite responses in one place, for example to wrap JSON bodies in an envelope: `transformResponse: (response) => response.kind === 'json' ? HttpResponse.json(response.status, { data: response.body }, { headers: response.headers, contentType: response.contentType }) : response`. It receives the response a handler returns (the built-in `Auth`, `Home` and `Health` answers included), validation and other error responses, and the 404 and 405 pages, plus `{ req }`, and returns the response to send. A response written to `res` directly is not covered: one a handler writes itself, the CORS preflight 204, the rate limiter's 500 for a broken setup, and the plain 500 sent when an error response itself cannot be written. It must be synchronous; if it throws or returns anything but an `HttpResponse`, the error is logged and the original response is sent. A stream response the transform replaces with another body is cancelled. A replacement that wraps the original stream reads it itself, and is responsible for stopping it when the client disconnects.
15
+ - **Error handlers can return an `HttpResponse`.** A handler registered with `registerErrorHandler` may return `HttpResponse.json(…)` or any other response instead of `{ status, body }`, for example to answer `application/problem+json`. `{ status, body, headers }` results keep working. `resolveError` also returns the `response` that will be sent. An override of `HttpServer.resolveError` should return it too, and must change `response` itself to change the answer: when it is present, `status`, `body` and `headers` no longer decide what is sent.
16
+ - **Validation, routing, body-parsing and server errors carry an error code.** Clients can branch on `error` instead of the translated `message`: validation 400s and the Mongoose safety-net 400s answer `VALIDATION_FAILED`, the malformed-URL 400 `MALFORMED_URL`, the unparsable-body 400 `MALFORMED_BODY`, the 404 `NOT_FOUND`, the 405 `METHOD_NOT_ALLOWED`, the 413 `PAYLOAD_TOO_LARGE`, the 415 `UNSUPPORTED_CONTENT_TYPE` and the 500 `SERVER_ERROR`. The codes are exported as `FRAMEWORK_ERROR_CODES` from `services/http/httpErrors.js`. Statuses and messages are unchanged; tests that compare whole bodies need the new `error` field. The built-in `Auth` and `Health` controllers' own answers (for example the wrong-password 400) are not part of this and are unchanged.
17
+ - **A `'beforeShutdown'` event lets the app close long-lived connections.** On SIGTERM or SIGINT the server stops accepting new connections, then calls the `app.events.on('beforeShutdown', …)` listeners as `emit` does (no arguments) and waits for them, async ones included, for at most 3 seconds, then drains the HTTP server. Close WebSocket and other long-lived connections there: they are not idle, so they kept the drain open until the 10-second forced exit (exit code 1, and `'shutdown'` never ran). A listener that throws or rejects is logged and does not stop the shutdown. `'shutdown'` is unchanged.
18
+ - **`HttpError` subclasses for 422, 429, 500, 502 and 503.** `UnprocessableEntityError`, `TooManyRequestsError`, `InternalServerError`, `BadGatewayError` and `ServiceUnavailableError` from `services/http/httpErrors.js` take a message or the details object, like the other subclasses, for example `new TooManyRequestsError({ message, headers: { 'Retry-After': '30' } })`.
19
+ - **`passwordPolicyIssues` applies `auth.passwordPolicy` in your own password endpoints.** From `helpers/passwordPolicy.js`: `passwordPolicyIssues(password, field)` returns the issues the built-in registration and password reset produce (the `auth.passwordProvided`, `auth.passwordTooShort` or `auth.passwordTooLong` key with its `min`/`max` params), or an empty list. Throw them as `new BadRequestError({ code: 'VALIDATION_FAILED', message, errors: issues })` to answer the same translated 400.
20
+
21
+ ### Changed
22
+
23
+ - **Request-body errors go through the error-handler registry.** The 413 for an oversized body and the 400 for a body that cannot be parsed are passed on as `HttpError`s, so a handler you register for `HttpError` (or `Error`) now sees them and can reshape them. Status and message are unchanged. An Express error middleware that an app mounts itself (for example in `bootHttp`) now receives these errors before the framework answers them.
24
+ - **The built-in `Auth`, `Home` and `Health` handlers return their response** instead of writing to `res`. Responses are unchanged, except that the `Auth` answers without a body (register 201, verify and recover 200) no longer send `Content-Type: application/json`, and an Express `json replacer` no longer sees them. Overrides that write to `res` keep working and keep compiling. For an override that calls the built-in handler:
25
+ - Return its result: `return super.postLogin(req, res)`. The built-in handlers now declare `HttpResponse | Response` as their result, so an override annotated `Promise<Response>` that returns the built-in result no longer compiles: widen the annotation or drop it.
26
+ - One that calls it without returning the result (`await super.postLogin(req, res)`, or the same call without `await`) still answers with that response for now and gets a one-time `ASF_DEP_DROPPED_RESPONSE` warning; v6 will not send a response that was not returned.
27
+ - The response of such a call is sent when the override finishes, not when the built-in handler does. Code after the call runs before the response goes out, and if it throws, the client gets the error response instead. Waiting inside the override for `res` to finish never completes.
28
+ - After the call, `res.statusCode` still shows the built-in answer's status, but nothing has been sent yet (`res.headersSent` is false).
29
+ - The built-in handler no longer calls `res.json` or `res.status`. A wrapper around `res` that changed what it sends no longer has an effect, and a status set on `res` before the call is replaced by the built-in status. Change the returned response instead.
30
+ - An override that answers through `res` itself should do so before it returns; otherwise the built-in response can be sent first.
31
+ - A built-in handler used directly as an Express route handler, outside the framework's routes, no longer answers by itself.
32
+ - **Framework-built JSON responses set their own `Content-Type`.** The 404, 405 and 415, the validation and body-parser errors, the 500 and the built-in `Auth`, `Home` and `Health` answers are sent as `application/json`, replacing a `Content-Type` set on `res` earlier (for example by a middleware calling `res.type(…)`). Before, they kept it. To send another media type on the responses it sees, set `contentType` in `transformResponse`.
33
+ - **An error-handler result must be a valid response.** A `{ status, body }` result from a `registerErrorHandler` handler is now sent as a JSON response, so a status a JSON response cannot carry (206, or outside 200–599) counts as a failed handler: it is logged and answered with the 500. Before, 206 was sent as given. Statuses that never carry a body (204, 205, 304) are still sent without one. Such a result also sets its own `Content-Type`: `application/json`, or the `Content-Type` in its `headers`, replacing one set on `res` earlier. A result whose `body` is `undefined` no longer adds a `Content-Type` and no longer answers 304 to a conditional request, and a 304 result no longer gets an `ETag`. A `Set-Cookie` in its `headers` is added to the cookies already on the response and `Vary` is merged; before, both replaced what was there. A result without a body is sent without one, so an Express `json replacer` no longer sees it.
34
+ - **Request-validation 400s go through the error-handler registry.** A handler registered with `registerErrorHandler` for `ValidationError` (from `services/validate/ValidationError.js`) can now reshape the 400 answered when a route's `params:`, `request:` or `query:` schema rejects the input, for example `registerErrorHandler(ValidationError, (err) => HttpResponse.json(422, { errors: err.message }))`. With no such handler the framework answers the same 400. A handler registered for `Error` (a catch-all) now receives these validation errors too: return `null` for a `ValidationError` to keep the default 400.
35
+ - **A 5xx `HttpError` is logged at `error`.** A thrown `HttpError` with a status of 500 or above (for example a 502 for a failed upstream) is logged at `error`, so it reaches production log levels and Sentry. Other `HttpError`s stay at `verbose`.
36
+ - **A cluster worker that exits cleanly outside a shutdown is logged as a warning**, with the number of workers left. `runCluster` does not restart it, so the cluster runs with less capacity; it was logged at `info`.
37
+ - **`ASF_DEP_USEROLD` fires only when the app uses `UserOld`**: on the first `getModel('UserOld')`, or when an app model extends it. Before, every app got it at boot, because the framework loads its own models, along with the "old type model" log line.
38
+ - **Dependencies updated within their ranges** (lockfile), including Mongoose 9.12.3, Sentry 11.16.0, rate-limiter-flexible 11.5.0, i18next 27.2.4 and Biome 2.6.8. The `oxc-parser` dev dependency moves to 0.159; the optional peer range (`>=0.156.0 <1`) already allows it, and the generated types are unchanged.
39
+
40
+ ### Fixed
41
+
42
+ - **A cluster worker finishes its `'shutdown'` teardown.** After the HTTP drain, a worker closed its IPC channel in a way that makes Node exit it at once, so the async parts of the `'shutdown'` listeners (closing Redis and Mongo, flushing the logger) were cut off while the exit still reported 0. Workers of `runCluster` and of pm2 cluster mode now exit when the teardown ends, as a single process does. A handle that is never closed now shows up as it does for a single process: the worker is forced to exit with code 1 after 10 seconds, unless the process manager kills it first (pm2's `kill_timeout`, or a `runCluster` `shutdownTimeoutMs` below 10 seconds).
43
+ - **`application/octet-stream` bodies have a size limit again.** 5.6.1 stopped applying `maxFieldsSize` to them so that `maxFileSize` would, but the parser checks its file limits only on multipart parts, so such a body had no size limit at all and was written to the temp directory in full. The parser runs before routing and authentication, so any client could send one to any URL. It is now answered with the 413 above `maxFileSize` (20 MB by default), or `maxTotalFileSize` if lower, whether the length is declared or the body is streamed.
44
+ - **A failed temp-file write for an `application/octet-stream` body no longer crashes the process.** The parser handled such an error (disk full, a missing `uploadDir`) only for multipart uploads; for an octet-stream body it was an uncaught exception that took the server down. The request now fails with the parser's 400, as a multipart upload does.
45
+ - **The files of one multipart field keep the order they were sent.** They came in the order their uploads finished writing, so several files under one field could reach the handler in another order, and a per-file error such as `media[2]` could point at the wrong file.
46
+ - **The rate limiter's Redis setup error names `redis.url`.** A malformed `redis.url` (`REDIS_URI`) makes the Redis client throw when it is built. The limiter then answers 500 on its routes, as when `@redis/client` is missing; its error now says so and names `redis.url`, where it only asked whether the package was installed.
47
+ - **The rate limiter warns when requests share one bucket by accident.** With `ip` disabled in `consumeKeyComponents`, a request that has none of the enabled identities (no user, no configured `request` field) is keyed by the route alone, so all such requests share one bucket, for example every logged-out caller of a login route. The limiter now logs a warning naming the route, once per mount. Keys are unchanged. A mount with every identity disabled is an intended per-route budget and does not warn.
48
+ - **`User.generateToken` no longer requires an email.** Issuing a session token never used it, so users without an email could not get a token from this method.
49
+ - **The framework's `ru` catalog has every framework text.** The `http`, `middleware`, `health` and `password` messages were missing from it. The framework does not load this catalog for your app, which reads only its own `locales` folder: to answer these messages in Russian, copy the keys from `dist/locales/ru/translation.json` in the package into your app's `ru` file.
50
+ - **The login-timing hash is computed when the server starts, not on the first unknown-account login.** That first login used to pay for it and was slower than the others. The hash is now computed in the background when the HTTP server starts listening. This costs one password hash per HTTP process at start; a login that arrives before it finishes waits for it.
51
+ - **Codegen warns when a `get routes()` annotation can break the generated request types.** An annotation such as `RouteParams` widens the route shapes, so every request type of that controller failed to compile with no hint. Use `satisfies RouteParams` on the returned object instead.
52
+ - **Yup validation issues no longer carry values a `ref()` resolves.** For `oneOf` / `notOneOf` with a `ref()`, such as the documented `repeatPassword: string().oneOf([ref('password')])`, the issue params kept the referenced field's value (the plaintext password), so an error handler that logs issues would write it out. It is dropped, with yup's internal `spec`.
53
+ - **A list or object sent to a trimmed yup string answers 400.** `string().trim()`, `.lowercase()` and `.uppercase()` threw a `TypeError` on an array or object (a multipart field sent twice, or `{"phone": ["…"]}`), which was answered with the 500 and an error log. The yup driver now answers such values with the validation 400; any other error is still a 500.
54
+ - **The `File` type has the upload fields.** `File` from `types.js` now types `filepath`, `mimetype`, `originalFilename` and `size`; before, a `File` annotation resolved to the global web `File`. The value, used with `instanceof`, is unchanged.
55
+ - **Corrected advice:** `YupFile`'s deprecation note and warning recommended `z.instanceof(File)` and similar checks, which reject every upload because a file field arrives as an array; they now check the array as a whole, so an error stays under the field name. The `config/http.ts` note no longer suggests raising the parser limits with per-mount `RequestParser` params, which cannot work. The generated-file header names `node src/cli.ts generatetypes`.
56
+
9
57
  ## [5.6.1] - 2026-11-15
10
58
 
11
59
  ### Changed
package/README.md CHANGED
@@ -70,6 +70,81 @@ To add the framework to an existing project instead:
70
70
  npm install @adaptivestone/framework
71
71
  ```
72
72
 
73
+ ## Upgrade notes (5.7.0)
74
+
75
+ See the [5.7.0 release notes](CHANGELOG.md). Handlers that write to `res` keep
76
+ working. Check these when you upgrade:
77
+
78
+ - Validation, routing, body-parsing and server error bodies now carry an
79
+ `error` code (`VALIDATION_FAILED`, `NOT_FOUND`, `SERVER_ERROR` and others,
80
+ exported as `FRAMEWORK_ERROR_CODES`). Statuses and messages are unchanged.
81
+ Tests that compare whole error bodies must add the field. The built-in
82
+ `Auth` and `Health` controllers' own answers are unchanged.
83
+ - A catch-all `registerErrorHandler(Error, …)` now also receives
84
+ request-validation errors and the body parser's 413 and 400. Return `null`
85
+ for the errors you do not handle, to keep the default answers.
86
+ - A `{ status, body }` result from an error handler must be a valid response.
87
+ A 206, or a status outside 200–599, is logged and answered with the 500. The
88
+ result sets its own `Content-Type`, replacing one set on `res` earlier. A
89
+ result without a body adds no `Content-Type` and no longer answers 304 to
90
+ a conditional request, and a 304 result gets no `ETag`. A `Set-Cookie` in
91
+ its `headers` is added to the cookies already on the response, and `Vary` is
92
+ merged; before, both replaced what was there. A result without a body is
93
+ sent without one, so an Express `json replacer` no longer sees it.
94
+ - The built-in `Auth`, `Home` and `Health` handlers return their response. An
95
+ override that calls one should return the result:
96
+ `return super.postLogin(req, res)`. One that calls it without returning still
97
+ answers for now, with a one-time `ASF_DEP_DROPPED_RESPONSE` warning; v6
98
+ removes that. Its response goes out when the override finishes, so code after
99
+ the call runs first, and if that code throws, the client gets the error
100
+ response. `res.statusCode` shows the built-in status after the call, as
101
+ before, but `res.headersSent` is still false, and waiting for `res` to
102
+ finish inside the override never completes.
103
+ - An override that calls a built-in handler and then answers through `res`
104
+ itself should do so before it returns; otherwise the built-in response can
105
+ be sent first.
106
+ - The built-in handlers no longer call `res.json` or `res.status`. A wrapper
107
+ around `res` that changed what they send no longer has an effect, and a
108
+ status set on `res` before the call is replaced by the built-in status.
109
+ Change the returned response instead. A built-in handler used directly as
110
+ an Express route handler no longer answers by itself.
111
+ - An override of `HttpServer.resolveError` should also return the `response`
112
+ to send, and must change `response` itself to change the answer.
113
+ - An Express error middleware that your app mounts itself (for example in
114
+ `bootHttp`) now receives the body parser's 413 and 400 before the framework
115
+ answers them.
116
+ - An override annotated `Promise<Response>` that returns the built-in result no
117
+ longer compiles. Widen the annotation or drop it.
118
+ - Framework-built JSON responses (404, 405, 415, validation and body-parser
119
+ errors, the 500, and the built-in `Auth`, `Home` and `Health` answers) are
120
+ sent as `application/json`, replacing a `Content-Type` set on `res` earlier,
121
+ for example by a middleware. To send another media type on the responses it
122
+ sees, set `contentType` in `transformResponse`.
123
+ - The `Auth` answers without a body (register 201, verify and recover 200) no
124
+ longer send `Content-Type: application/json`, and an Express `json replacer`
125
+ no longer sees them.
126
+ - A thrown `HttpError` with a 5xx status is logged at `error` (other statuses
127
+ stay at `verbose`), so it now reaches Sentry at the default level.
128
+ - Cluster workers (`runCluster`, pm2 cluster mode) finish their `'shutdown'`
129
+ teardown before they exit, as a single process does. A worker that keeps a
130
+ handle open (a timer or a socket that is never closed) now exits with code 1
131
+ after 10 seconds instead of at once with 0, unless the process manager kills
132
+ it first (pm2's `kill_timeout`, or a `shutdownTimeoutMs` below 10 seconds);
133
+ close such handles in a `'shutdown'` listener.
134
+ - An `application/octet-stream` body above `http.requestParser.maxFileSize`
135
+ (20 MB by default) is answered with 413; 5.6.1 accepted any size. To accept
136
+ larger bodies, raise `maxFileSize` and `maxTotalFileSize` in your app's
137
+ `config/http.ts`.
138
+ - A rate limiter with `ip` disabled warns once when a request without any
139
+ enabled identity shares the route's bucket. If you see it, enable `ip` in
140
+ `consumeKeyComponents`.
141
+ - `File` from `types.js` now types an upload (`filepath`, `mimetype`,
142
+ `originalFilename`, `size`). Code that read web `File` members from it, which
143
+ were never there at runtime, no longer compiles.
144
+ - Generated `*.routes.gen.ts` files have a new header line. If you commit
145
+ them and run `node src/cli.ts generatetypes --check` in CI, regenerate them
146
+ once after upgrading.
147
+
73
148
  ## Upgrade notes (5.6.1)
74
149
 
75
150
  See the [5.6.1 release notes](CHANGELOG.md). Check these when you upgrade:
@@ -155,7 +155,8 @@ function supervisePrimary(workerCount, shutdownTimeoutMs, emit) {
155
155
  return;
156
156
  }
157
157
  if (code === 0 && !signal) {
158
- report('worker:exit', 'info', `Worker ${worker.process.pid ?? worker.id} exited cleanly; it will not be restarted.`);
158
+ // Not restarted, so the cluster runs with less capacity: say so.
159
+ report('worker:exit', 'warn', `Worker ${worker.process.pid ?? worker.id} exited cleanly outside a shutdown; it will not be restarted, ${activeWorkers.size} worker(s) left.`);
159
160
  finishIfIdle();
160
161
  return;
161
162
  }
@@ -1 +1 @@
1
- {"version":3,"file":"clusterRunner.js","sourceRoot":"","sources":["../src/clusterRunner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clusterRunner.js","sourceRoot":"","sources":["../src/clusterRunner.ts"],"names":[],"mappings":"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"}
@@ -85,6 +85,13 @@ export async function planRouteTypes(app, logger, options = {}) {
85
85
  if (r.isInternal) {
86
86
  continue;
87
87
  }
88
+ // The gen file reads schemas through `InstanceType<…>['routes']`, which an
89
+ // annotation can widen, breaking every request type of this controller.
90
+ if (r.resolved.routesAnnotated &&
91
+ r.resolved.routes.some((route) => route.hasRequest || route.hasQuery || route.hasParams)) {
92
+ logger?.warn?.(`${r.srcPath}: \`get routes()\` has a return type annotation, which can widen the route shapes so generated request types fail to compile. ` +
93
+ 'Remove the annotation, or use `satisfies RouteParams` on the returned object.');
94
+ }
88
95
  const text = renderResolved(r.srcPath, r.resolved, flatByKey, r.resolved.urlPrefix);
89
96
  const outPath = path.join(path.dirname(r.srcPath),
90
97
  // Strip whichever source extension (.ts or .js); the gen file is always .ts.
@@ -1 +1 @@
1
- {"version":3,"file":"astEmit.js","sourceRoot":"","sources":["../../src/codegen/astEmit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"astEmit.js","sourceRoot":"","sources":["../../src/codegen/astEmit.ts"],"names":[],"mappings":"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"}
@@ -63,6 +63,9 @@ export interface ExtractResult {
63
63
  extendsName?: string | null;
64
64
  imports: Record<string, ImportInfo>;
65
65
  routes: RouteInfo[];
66
+ /** `get routes()` has a return type annotation, which widens the literal
67
+ * shape the generated request types navigate. */
68
+ routesAnnotated?: boolean;
66
69
  /** `undefined` = no own middleware (inherits); `[]` is a real empty map. */
67
70
  middleware?: MiddlewareScope[];
68
71
  /** A `static get middleware()` is defined here but isn't a literal `new Map([…])`
@@ -117,6 +117,7 @@ export function extractController(src, fileName) {
117
117
  extendsName,
118
118
  imports,
119
119
  routes,
120
+ routesAnnotated: routesNode?.kind === 'get' && !!routesNode.value.returnType,
120
121
  middleware,
121
122
  middlewareDynamic: !!mwFailed,
122
123
  httpPath,
@@ -1 +1 @@
1
- {"version":3,"file":"astExtract.js","sourceRoot":"","sources":["../../src/codegen/astExtract.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"astExtract.js","sourceRoot":"","sources":["../../src/codegen/astExtract.ts"],"names":[],"mappings":"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"}
@@ -36,6 +36,8 @@ export interface ResolvedController {
36
36
  /** Mount path: the literal `getHttpPath()` return, else `/<classname>`. */
37
37
  urlPrefix: string;
38
38
  routes: RouteInfo[];
39
+ /** `get routes()` has a return type annotation (see {@link ExtractResult}). */
40
+ routesAnnotated?: boolean;
39
41
  /** Effective middleware (own, or inherited from the nearest defining ancestor). */
40
42
  middleware: MiddlewareScope[];
41
43
  /** Emittable import for each middleware binding in `middleware`. */
@@ -147,6 +147,7 @@ export async function resolveController(srcPath, prefix = '', cache) {
147
147
  className: self.className,
148
148
  urlPrefix,
149
149
  routes: self.routes,
150
+ routesAnnotated: self.routesAnnotated,
150
151
  middleware,
151
152
  imports,
152
153
  needsBoot,
@@ -1 +1 @@
1
- {"version":3,"file":"astResolve.js","sourceRoot":"","sources":["../../src/codegen/astResolve.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"astResolve.js","sourceRoot":"","sources":["../../src/codegen/astResolve.ts"],"names":[],"mappings":"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"}
@@ -96,7 +96,7 @@ export function renderGenFile(input) {
96
96
  const header = `/**
97
97
  * AUTOGENERATED — do not edit by hand.
98
98
  *
99
- * Regenerate with: \`npm run gen\`
99
+ * Regenerate with: \`node src/cli.ts generatetypes\`
100
100
  *
101
101
  * Source of truth: \`${ctrlBaseName}${ctrlExt}\`'s \`routes\` getter and
102
102
  * \`static get middleware()\` Map.${degradedNote}
@@ -65,7 +65,7 @@ export async function generateAll(app, logger, options = {}) {
65
65
  if (options.check) {
66
66
  const drift = await collectDrift(outputs, plan.orphans);
67
67
  if (drift.length > 0) {
68
- throw new Error(`generatetypes --check: ${drift.length} generated file(s) out of date — run \`npm run gen\`:\n${drift.join('\n')}`);
68
+ throw new Error(`generatetypes --check: ${drift.length} generated file(s) out of date — run \`node src/cli.ts generatetypes\`:\n${drift.join('\n')}`);
69
69
  }
70
70
  logger?.info?.('generatetypes --check: all generated files up to date');
71
71
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"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"}
@@ -28,11 +28,14 @@ export default {
28
28
  },
29
29
  // Limits for request parsing (formidable). Conservative defaults bound
30
30
  // unauthenticated requests (formidable's own defaults allow ~200 MB/file with
31
- // no cap). Copy this file into your app to raise them, or pass per-mount
32
- // params to the RequestParser middleware.
31
+ // no cap). To change them, copy this file into your app: the global parser
32
+ // runs before any route and answers 413 first, so per-mount RequestParser
33
+ // params cannot raise them.
33
34
  // NOTE: `maxFieldsSize` doubles as the total body ceiling for JSON and
34
35
  // urlencoded requests — formidable only enforces it on multipart field data,
35
36
  // so RequestParser applies it to the whole body for those content types.
37
+ // An `application/octet-stream` body is one file: RequestParser bounds it by
38
+ // `maxFileSize` (or `maxTotalFileSize`, if lower).
36
39
  requestParser: {
37
40
  maxFileSize: 20 * 1024 * 1024, // 20 MB per file
38
41
  maxTotalFileSize: 50 * 1024 * 1024, // 50 MB across all files
@@ -1 +1 @@
1
- {"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/config/http.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI;IACnC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,SAAS;IAC5C,sEAAsE;IACtE,0EAA0E;IAC1E,+EAA+E;IAC/E,8EAA8E;IAC9E,oEAAoE;IACpE,WAAW,EAAE,CAAC,uBAAuB,CAAC;IACtC,2EAA2E;IAC3E,wEAAwE;IACxE,8EAA8E;IAC9E,kBAAkB,EAAE,CAAC,aAAa,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,uBAAuB;IAC5D,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,uBAAuB;IAC/D,6EAA6E;IAC7E,8EAA8E;IAC9E,eAAe;IACf,eAAe,EAAE;QACf,OAAO,EAAE,IAAI;QACb,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,MAAM;QACzB,iBAAiB,EAAE,aAAa;QAChC,0EAA0E;QAC1E,6CAA6C;QAC7C,2EAA2E;QAC3E,2BAA2B,EAAE,IAAqB;KACnD;IACD,uEAAuE;IACvE,8EAA8E;IAC9E,yEAAyE;IACzE,0CAA0C;IAC1C,uEAAuE;IACvE,6EAA6E;IAC7E,yEAAyE;IACzE,aAAa,EAAE;QACb,WAAW,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,iBAAiB;QAChD,gBAAgB,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,yBAAyB;QAC7D,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,8CAA8C;QAC9E,8DAA8D;QAC9D,2CAA2C;QAC3C,wEAAwE;QACxE,2BAA2B;QAC3B,UAAU,EAAE;YACV,4DAA4D;YAC5D,wBAAwB,EAAE,MAAM;SACQ;KAC3C;CACF,CAAC"}
1
+ {"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/config/http.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI;IACnC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,SAAS;IAC5C,sEAAsE;IACtE,0EAA0E;IAC1E,+EAA+E;IAC/E,8EAA8E;IAC9E,oEAAoE;IACpE,WAAW,EAAE,CAAC,uBAAuB,CAAC;IACtC,2EAA2E;IAC3E,wEAAwE;IACxE,8EAA8E;IAC9E,kBAAkB,EAAE,CAAC,aAAa,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,uBAAuB;IAC5D,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,uBAAuB;IAC/D,6EAA6E;IAC7E,8EAA8E;IAC9E,eAAe;IACf,eAAe,EAAE;QACf,OAAO,EAAE,IAAI;QACb,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,MAAM;QACzB,iBAAiB,EAAE,aAAa;QAChC,0EAA0E;QAC1E,6CAA6C;QAC7C,2EAA2E;QAC3E,2BAA2B,EAAE,IAAqB;KACnD;IACD,uEAAuE;IACvE,8EAA8E;IAC9E,2EAA2E;IAC3E,0EAA0E;IAC1E,4BAA4B;IAC5B,uEAAuE;IACvE,6EAA6E;IAC7E,yEAAyE;IACzE,6EAA6E;IAC7E,mDAAmD;IACnD,aAAa,EAAE;QACb,WAAW,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,iBAAiB;QAChD,gBAAgB,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,yBAAyB;QAC7D,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,EAAE,8CAA8C;QAC9E,8DAA8D;QAC9D,2CAA2C;QAC3C,wEAAwE;QACxE,2BAA2B;QAC3B,UAAU,EAAE;YACV,4DAA4D;YAC5D,wBAAwB,EAAE,MAAM;SACQ;KAC3C;CACF,CAAC"}
@@ -2,19 +2,27 @@ import type { Response } from 'express';
2
2
  import AbstractController from '../modules/AbstractController.ts';
3
3
  import GetUserByToken from '../services/http/middleware/GetUserByToken.ts';
4
4
  import RateLimiter from '../services/http/middleware/RateLimiter.ts';
5
+ import { HttpResponse } from '../services/http/responses.ts';
5
6
  import type { PostLoginRequest, PostLogoutRequest, PostRegisterRequest, RecoverPasswordRequest, SendPasswordRecoveryEmailRequest, SendVerificationRequest, VerifyUserRequest } from './Auth.routes.gen.ts';
7
+ /**
8
+ * What the auth handlers answer. They return an `HttpResponse`; `Response`
9
+ * stays in the type (and `res` an optional parameter) so overrides written
10
+ * against `res` still fit. An override that calls a handler must return its
11
+ * result (`return super.postLogin(req, res)`).
12
+ */
13
+ type AuthAnswer = HttpResponse | Response;
6
14
  declare class Auth extends AbstractController {
7
15
  get routes(): {
8
16
  post: {
9
17
  '/login': {
10
- handler: (req: PostLoginRequest, res: Response) => Promise<Response<any, Record<string, any>>>;
18
+ handler: (req: PostLoginRequest, res?: Response) => Promise<AuthAnswer>;
11
19
  request: import("../services/validate/defineSchema.ts").DefinedSchema<{
12
20
  email: string;
13
21
  password: string;
14
22
  }>;
15
23
  };
16
24
  '/register': {
17
- handler: (req: PostRegisterRequest, res: Response) => Promise<Response<any, Record<string, any>>>;
25
+ handler: (req: PostRegisterRequest, res?: Response) => Promise<AuthAnswer>;
18
26
  request: import("../services/validate/defineSchema.ts").DefinedSchema<{
19
27
  email: string;
20
28
  password: string;
@@ -23,36 +31,36 @@ declare class Auth extends AbstractController {
23
31
  lastName?: string;
24
32
  }>;
25
33
  };
26
- '/logout': (req: PostLogoutRequest, res: Response) => Promise<Response<any, Record<string, any>>>;
27
- '/verify': (req: VerifyUserRequest, res: Response) => Promise<Response<any, Record<string, any>>>;
34
+ '/logout': (req: PostLogoutRequest, res?: Response) => Promise<AuthAnswer>;
35
+ '/verify': (req: VerifyUserRequest, res?: Response) => Promise<AuthAnswer>;
28
36
  '/send-recovery-email': {
29
- handler: (req: SendPasswordRecoveryEmailRequest, res: Response) => Promise<Response<any, Record<string, any>>>;
37
+ handler: (req: SendPasswordRecoveryEmailRequest, res?: Response) => Promise<AuthAnswer>;
30
38
  request: import("../services/validate/defineSchema.ts").DefinedSchema<{
31
39
  email: string;
32
40
  }>;
33
41
  };
34
42
  '/recover-password': {
35
- handler: (req: RecoverPasswordRequest, res: Response) => Promise<Response<any, Record<string, any>>>;
43
+ handler: (req: RecoverPasswordRequest, res?: Response) => Promise<AuthAnswer>;
36
44
  request: import("../services/validate/defineSchema.ts").DefinedSchema<{
37
45
  password: string;
38
46
  passwordRecoveryToken: string;
39
47
  }>;
40
48
  };
41
49
  '/send-verification': {
42
- handler: (req: SendVerificationRequest, res: Response) => Promise<Response<any, Record<string, any>>>;
50
+ handler: (req: SendVerificationRequest, res?: Response) => Promise<AuthAnswer>;
43
51
  request: import("../services/validate/defineSchema.ts").DefinedSchema<{
44
52
  email: string;
45
53
  }>;
46
54
  };
47
55
  };
48
56
  };
49
- postLogin(req: PostLoginRequest, res: Response): Promise<Response<any, Record<string, any>>>;
50
- postRegister(req: PostRegisterRequest, res: Response): Promise<Response<any, Record<string, any>>>;
51
- postLogout(req: PostLogoutRequest, res: Response): Promise<Response<any, Record<string, any>>>;
52
- verifyUser(req: VerifyUserRequest, res: Response): Promise<Response<any, Record<string, any>>>;
53
- sendPasswordRecoveryEmail(req: SendPasswordRecoveryEmailRequest, res: Response): Promise<Response<any, Record<string, any>>>;
54
- recoverPassword(req: RecoverPasswordRequest, res: Response): Promise<Response<any, Record<string, any>>>;
55
- sendVerification(req: SendVerificationRequest, res: Response): Promise<Response<any, Record<string, any>>>;
57
+ postLogin(req: PostLoginRequest, res?: Response): Promise<AuthAnswer>;
58
+ postRegister(req: PostRegisterRequest, res?: Response): Promise<AuthAnswer>;
59
+ postLogout(req: PostLogoutRequest, res?: Response): Promise<AuthAnswer>;
60
+ verifyUser(req: VerifyUserRequest, res?: Response): Promise<AuthAnswer>;
61
+ sendPasswordRecoveryEmail(req: SendPasswordRecoveryEmailRequest, res?: Response): Promise<AuthAnswer>;
62
+ recoverPassword(req: RecoverPasswordRequest, res?: Response): Promise<AuthAnswer>;
63
+ sendVerification(req: SendVerificationRequest, res?: Response): Promise<AuthAnswer>;
56
64
  static get middleware(): Map<string, (typeof GetUserByToken | typeof RateLimiter)[]>;
57
65
  }
58
66
  export default Auth;