@adaptivestone/framework 5.4.1 → 5.4.2
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 +23 -0
- package/README.md +14 -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/controllers/Auth.js +19 -1
- package/dist/controllers/Auth.js.map +1 -1
- 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/BaseModel.js.map +1 -1
- package/dist/server.js +3 -0
- 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/http/HttpServer.d.ts +6 -0
- package/dist/services/http/HttpServer.js +20 -9
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/middleware/Cors.js +4 -2
- package/dist/services/http/middleware/Cors.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/RequestParser.js +19 -5
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/tests/testHelpers.d.ts +111 -8
- package/package.json +9 -9
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
|
6
6
|
|
|
7
7
|
## [Unreleased]
|
|
8
8
|
|
|
9
|
+
## [5.4.2] - 2026-10-01
|
|
10
|
+
|
|
11
|
+
### Added
|
|
12
|
+
|
|
13
|
+
- **`createuser --token` prints a usable session token again.** Since 5.0.0 tokens are stored hashed and the command logs only identifiers, so the session it created on every run could never be used. Without the flag the command now creates no session; with `--token` it issues one and prints the raw token once to stdout, never to the logger.
|
|
14
|
+
|
|
15
|
+
### Changed
|
|
16
|
+
|
|
17
|
+
- **Code generation now requires `oxc-parser` `^0.152.0`.** Projects that run `npm run gen` should update their optional development peer with `npm i -D oxc-parser@^0.152.0`. Runtime-only consumers do not need it.
|
|
18
|
+
- **Optional peers accept the new majors.** `@sentry/core` / `@sentry/node` accept `^10.34.0 || ^11.0.0` (Sentry 11 needs Node 20.19+), and `vitest` accepts `^4.0.0 || ^5.0.0` for the `setupVitest` helper. Existing installs keep working; no action needed.
|
|
19
|
+
|
|
20
|
+
### Fixed
|
|
21
|
+
|
|
22
|
+
- **A login racing a password reset no longer gets a session.** `generateToken` now saves on the condition that the stored password hash is still the one on the document, so a login whose password check started before a reset answers "User/password not valid" instead of issuing a 30-day token for the old password. The 5.4.1 fix covered only logins that also upgraded the hash. Custom flows that call `generateToken` on a stale document now get a Mongoose `VersionError` (or `DocumentNotFoundError` with versioning disabled) instead of a session.
|
|
23
|
+
- **Concurrent logins and logouts no longer overwrite each other.** Issuing a token rewrote the whole session array whenever an expired token was stored, so two simultaneous logins failed one with a 500, and a logout landing during a login came back to life. Tokens are now appended atomically and expired ones removed with a separate update. Pending changes on the document are still saved with the token, as before.
|
|
24
|
+
- **A repeated `lng` query parameter no longer answers 500.** `?lng=a&lng=_` reached i18next as an array and failed every route with an error-level log. Non-string detector values are now ignored.
|
|
25
|
+
- **An unsupported language no longer stops language detection.** `X-Lang: de` with only `en`/`ru` configured ended detection with the fallback language, hiding a supported `?lng=ru`. Detection now continues to the next detector when the value's language is not in `i18n.supportedLngs`.
|
|
26
|
+
- **The HTTP server accepts connections only once the app is ready.** It used to listen from the `HttpServer` constructor, before controllers, `bootHttp`, the 404 page and the error handler were mounted, so early requests got Express's HTML 404. `startServer` now calls the new `httpServer.listen()` last and resolves after the port is bound.
|
|
27
|
+
- **In-memory cache entries with long TTLs no longer vanish.** A TTL above about 24.8 days overflowed Node's timer and the entry expired after 1 ms. Entries now store their expiry time, checked on every read.
|
|
28
|
+
- **An oversized streamed body gets a 413 instead of a connection reset.** The parser now stops reading and answers 413 with `Connection: close`; a body over the declared-length limit also closes the connection rather than being drained.
|
|
29
|
+
- **Pagination rejects pages that overflow.** A `page` of hundreds of digits parsed to `Infinity`; the query schema now reports it as not a number, and the middleware falls back to page 1 whenever `skip` would not be a safe integer.
|
|
30
|
+
- **CORS keeps other `Vary` values and always varies by `Origin`.** The middleware replaced any existing `Vary` header and set it only for allowed origins, so a shared cache could serve a response without the allow-origin header to an allowed origin.
|
|
31
|
+
|
|
9
32
|
## [5.4.1] - 2026-09-11
|
|
10
33
|
|
|
11
34
|
### Fixed
|
package/README.md
CHANGED
|
@@ -70,6 +70,20 @@ To add the framework to an existing project instead:
|
|
|
70
70
|
npm install @adaptivestone/framework
|
|
71
71
|
```
|
|
72
72
|
|
|
73
|
+
## Upgrade notes (5.4.2)
|
|
74
|
+
|
|
75
|
+
See the [5.4.2 release notes](CHANGELOG.md) for all fixes. Most need no action:
|
|
76
|
+
|
|
77
|
+
- Projects that run `npm run gen` must update the optional peer:
|
|
78
|
+
`npm i -D oxc-parser@^0.152.0`.
|
|
79
|
+
- `user.generateToken()` now rejects with a Mongoose `VersionError` when the
|
|
80
|
+
stored password changed after the document was loaded; the built-in login
|
|
81
|
+
answers this like a wrong password. Custom login flows should do the same.
|
|
82
|
+
- The HTTP server opens its port only after routes, `bootHttp` and error
|
|
83
|
+
handlers are mounted; `startServer()` resolves once it is listening.
|
|
84
|
+
- `createuser --token` prints a usable session token; without the flag the
|
|
85
|
+
command no longer creates a session.
|
|
86
|
+
|
|
73
87
|
## Authentication and cache upgrade notes (5.4.1)
|
|
74
88
|
|
|
75
89
|
See the [5.4.1 release notes](CHANGELOG.md) for all fixes, including model/validation
|
|
@@ -26,6 +26,11 @@ declare class CreateUser extends AbstractCommand {
|
|
|
26
26
|
readonly default: false;
|
|
27
27
|
readonly description: 'Update user if it exists';
|
|
28
28
|
};
|
|
29
|
+
readonly token: {
|
|
30
|
+
readonly type: 'boolean';
|
|
31
|
+
readonly default: false;
|
|
32
|
+
readonly description: 'Issue a 30-day session and print its token once (to stdout, not the log)';
|
|
33
|
+
};
|
|
29
34
|
};
|
|
30
35
|
run(): Promise<boolean>;
|
|
31
36
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import AbstractCommand, {} from '../modules/AbstractCommand.js';
|
|
2
|
-
// Example: node src/cli createuser --email=somemail@gmail.com --password=somePassword --roles=user,admin,someOtherRoles
|
|
2
|
+
// Example: node src/cli createuser --email=somemail@gmail.com --password=somePassword --roles=user,admin,someOtherRoles --token
|
|
3
3
|
class CreateUser extends AbstractCommand {
|
|
4
4
|
static get description() {
|
|
5
5
|
return 'Create user in a database';
|
|
@@ -30,11 +30,16 @@ class CreateUser extends AbstractCommand {
|
|
|
30
30
|
default: false,
|
|
31
31
|
description: 'Update user if it exists',
|
|
32
32
|
},
|
|
33
|
+
token: {
|
|
34
|
+
type: 'boolean',
|
|
35
|
+
default: false,
|
|
36
|
+
description: 'Issue a 30-day session and print its token once (to stdout, not the log)',
|
|
37
|
+
},
|
|
33
38
|
};
|
|
34
39
|
}
|
|
35
40
|
async run() {
|
|
36
41
|
const User = this.app.getModel('User');
|
|
37
|
-
const { id, email, password, roles, update } = this
|
|
42
|
+
const { id, email, password, roles, update, token } = this
|
|
38
43
|
.args;
|
|
39
44
|
if (!email && !id) {
|
|
40
45
|
this.logger?.error('Input validation failded');
|
|
@@ -74,10 +79,15 @@ class CreateUser extends AbstractCommand {
|
|
|
74
79
|
user.set('roles', roles.split(','));
|
|
75
80
|
}
|
|
76
81
|
await user.save();
|
|
77
|
-
await user.generateToken();
|
|
78
82
|
// Log identifiers only — serializing the document leaks the password hash
|
|
79
83
|
// and all session/recovery/verification tokens.
|
|
80
84
|
this.logger?.info(`User was created/updated: id=${user.id}, email=${user.email}, nick=${user.name?.nick ?? ''}`);
|
|
85
|
+
if (token) {
|
|
86
|
+
const session = await user.generateToken();
|
|
87
|
+
// The raw token exists only here (the database keeps its hash), so print
|
|
88
|
+
// it once — to stdout, never the logger, whose transports may ship it.
|
|
89
|
+
console.log(`Session token (valid until ${session.valid.toISOString()}): ${session.token}`);
|
|
90
|
+
}
|
|
81
91
|
return true;
|
|
82
92
|
}
|
|
83
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateUser.js","sourceRoot":"","sources":["../../src/commands/CreateUser.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,EAAE,EAEvB,MAAM,+BAA+B,CAAC;AAEvC,
|
|
1
|
+
{"version":3,"file":"CreateUser.js","sourceRoot":"","sources":["../../src/commands/CreateUser.ts"],"names":[],"mappings":"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"}
|
package/dist/controllers/Auth.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import mongoose from 'mongoose';
|
|
1
2
|
import { hashToken } from '../models/User.js';
|
|
2
3
|
import AbstractController from '../modules/AbstractController.js';
|
|
3
4
|
import GetUserByToken from '../services/http/middleware/GetUserByToken.js';
|
|
@@ -285,7 +286,24 @@ class Auth extends AbstractController {
|
|
|
285
286
|
notVerified: true,
|
|
286
287
|
});
|
|
287
288
|
}
|
|
288
|
-
|
|
289
|
+
let token;
|
|
290
|
+
try {
|
|
291
|
+
token = await user.generateToken();
|
|
292
|
+
}
|
|
293
|
+
catch (err) {
|
|
294
|
+
// The session write is conditioned on the verified password hash. No
|
|
295
|
+
// match means the password changed meanwhile (e.g. a concurrent reset):
|
|
296
|
+
// answer exactly like a wrong password.
|
|
297
|
+
if (err instanceof mongoose.Error.VersionError ||
|
|
298
|
+
err instanceof mongoose.Error.DocumentNotFoundError) {
|
|
299
|
+
return res.status(400).json({
|
|
300
|
+
message: req.appInfo.i18n?.t('auth.errorUPValid', {
|
|
301
|
+
defaultValue: EN['auth.errorUPValid'],
|
|
302
|
+
}),
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
throw err;
|
|
306
|
+
}
|
|
289
307
|
return res.status(200).json({ data: { token, user: user.getPublic() } });
|
|
290
308
|
}
|
|
291
309
|
async postRegister(req, res) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/controllers/Auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/controllers/Auth.ts"],"names":[],"mappings":"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"}
|
package/dist/models/User.d.ts
CHANGED
|
@@ -216,17 +216,12 @@ declare class User extends BaseModel {
|
|
|
216
216
|
};
|
|
217
217
|
static get modelInstanceMethods(): {
|
|
218
218
|
/**
|
|
219
|
-
* Generate token for user
|
|
219
|
+
* Generate a session token for the user and save the document. Rejects
|
|
220
|
+
* (Mongoose `VersionError`/`DocumentNotFoundError`) when the stored
|
|
221
|
+
* password changed after this document was read.
|
|
220
222
|
* @returns {Object}
|
|
221
223
|
*/
|
|
222
|
-
readonly generateToken: (this: {
|
|
223
|
-
email?: string | null;
|
|
224
|
-
sessionTokens?: {
|
|
225
|
-
token?: string | null;
|
|
226
|
-
valid?: Date | null;
|
|
227
|
-
}[] | null;
|
|
228
|
-
save: () => Promise<unknown>;
|
|
229
|
-
}) => Promise<{
|
|
224
|
+
readonly generateToken: (this: UserAuthInstance & Pick<UserSchemaDocument, '_id' | '$where' | 'isModified'>) => Promise<{
|
|
230
225
|
token: string;
|
|
231
226
|
valid: Date;
|
|
232
227
|
}>;
|
package/dist/models/User.js
CHANGED
|
@@ -145,6 +145,11 @@ class User extends BaseModel {
|
|
|
145
145
|
if (upgrade.matchedCount === 0) {
|
|
146
146
|
return false;
|
|
147
147
|
}
|
|
148
|
+
// Keep the in-memory hash equal to the stored one without marking
|
|
149
|
+
// it modified (a save would hash it again): `generateToken` binds
|
|
150
|
+
// the new session to this value.
|
|
151
|
+
data.set('password', newHash);
|
|
152
|
+
data.unmarkModified('password');
|
|
148
153
|
}
|
|
149
154
|
catch (e) {
|
|
150
155
|
appInstance.logger?.error('Failed to upgrade password hash', e);
|
|
@@ -237,7 +242,9 @@ class User extends BaseModel {
|
|
|
237
242
|
static get modelInstanceMethods() {
|
|
238
243
|
return {
|
|
239
244
|
/**
|
|
240
|
-
* Generate token for user
|
|
245
|
+
* Generate a session token for the user and save the document. Rejects
|
|
246
|
+
* (Mongoose `VersionError`/`DocumentNotFoundError`) when the stored
|
|
247
|
+
* password changed after this document was read.
|
|
241
248
|
* @returns {Object}
|
|
242
249
|
*/
|
|
243
250
|
generateToken: async function () {
|
|
@@ -248,17 +255,37 @@ class User extends BaseModel {
|
|
|
248
255
|
}
|
|
249
256
|
const token = createRandomToken();
|
|
250
257
|
if (!this.sessionTokens) {
|
|
251
|
-
this
|
|
258
|
+
clearHydratedArray(this, 'sessionTokens');
|
|
252
259
|
}
|
|
253
|
-
// Prune already-expired tokens on append so the array can't grow
|
|
254
|
-
// forever (keep only tokens still valid right now).
|
|
255
260
|
const now = new Date();
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
261
|
+
const hasExpired = this.sessionTokens.some((t) => !(t.valid && new Date(t.valid) > now));
|
|
262
|
+
// Append only: an atomic `$push` cannot overwrite a concurrent login
|
|
263
|
+
// or logout, while reassigning the array would rewrite it wholesale.
|
|
264
|
+
this.sessionTokens.push({ token: hashToken(token), valid: timestamp });
|
|
265
|
+
// Never issue a session for a password that changed after this
|
|
266
|
+
// document was read (e.g. a reset racing a login). Skipped when the
|
|
267
|
+
// caller is setting a new password on this document now.
|
|
268
|
+
const previousWhere = this.$where;
|
|
269
|
+
if (typeof this.password === 'string' && !this.isModified('password')) {
|
|
270
|
+
this.$where = { ...previousWhere, password: this.password };
|
|
271
|
+
}
|
|
272
|
+
try {
|
|
273
|
+
await this.save();
|
|
274
|
+
}
|
|
275
|
+
finally {
|
|
276
|
+
this.$where = previousWhere;
|
|
277
|
+
}
|
|
278
|
+
if (hasExpired) {
|
|
279
|
+
// Prune separately: `$push` and `$pull` can't share one update.
|
|
280
|
+
// Best effort — the session is already issued.
|
|
281
|
+
const UserModel = this.constructor;
|
|
282
|
+
try {
|
|
283
|
+
await UserModel.updateOne({ _id: this._id }, { $pull: { sessionTokens: { valid: { $not: { $gt: now } } } } });
|
|
284
|
+
}
|
|
285
|
+
catch (e) {
|
|
286
|
+
appInstance.logger?.error('Failed to prune expired sessions', e);
|
|
287
|
+
}
|
|
288
|
+
}
|
|
262
289
|
// The raw token is returned to the caller exactly once; only its hash
|
|
263
290
|
// is persisted. Wire format is unchanged.
|
|
264
291
|
return { token, valid: timestamp };
|
package/dist/models/User.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,cAAc,GACf,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,uEAAuE;AACvE,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAEtE;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,EAAE,CACzC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAsFzD;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,CACzB,QAAW,EACX,IAAkB,EAClB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AA4B7C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,IAAK,SAAQ,SAAS;IAC1B,MAAM,CAAC,SAAS,CAAC,MAAc;QAC7B,MAAM,CAAC,GAAG,CACR,MAAM,EACN,KAAK,UAAU,eAAe;YAC5B,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,QAAkB,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO;YACL,MAAM,EAAE;gBACN,IAAI,EAAE,MAAM;gBACZ,SAAS,EAAE,GAAG;aACf;YACD,IAAI,EAAE;gBACJ,KAAK,EAAE;oBACL,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,GAAG;iBACf;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,GAAG;iBACf;gBACD,IAAI,EAAE;oBACJ,SAAS,EAAE,CAAC;oBACZ,SAAS,EAAE,GAAG;oBACd,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;wBACZ,uBAAuB,EAAE,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;qBAC9D;iBACF;aACF;YACD,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE;gBACL,IAAI,EAAE,MAAM;gBACZ,SAAS,EAAE,GAAG;gBACd,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;oBACZ,uBAAuB,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;iBACxD;aACF;YACD,aAAa,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YAC/C,kBAAkB,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;YACpD,sBAAsB,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;YACxD,WAAW,EAAE,CAAC,MAAM,CAAC;YACrB,KAAK,EAAE,CAAC,MAAM,CAAC;YACf,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE;YAC7C,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;YACvC,SAAS,EAAE,CAAC,MAAM,CAAC;SACX,CAAC;IACb,CAAC;IAED,MAAM,KAAK,YAAY;QACrB,OAAO;YACL;;;;;eAKG;YACH,yBAAyB,EAAE,KAAK,UAAU,yBAAyB,CAExD,KAAa,EAAE,QAAgB;gBACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAkB;oBAC/C,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;iBACrB,CAAC,CAAC;gBACH,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC;oBACpB,uEAAuE;oBACvE,uEAAuE;oBACvE,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;oBACnC,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,cAAc,CACjD,QAAQ,EACR,IAAI,CAAC,QAAkB,CACxB,CAAC;gBACF,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,wEAAwE;gBACxE,sEAAsE;gBACtE,sEAAsE;gBACtE,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,CAAC;wBACH,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;wBAC7C,kEAAkE;wBAClE,2DAA2D;wBAC3D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAClC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,EAC1C,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CAAC;wBACF,8DAA8D;wBAC9D,iEAAiE;wBACjE,IAAI,OAAO,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;4BAC/B,OAAO,KAAK,CAAC;wBACf,CAAC;
|
|
1
|
+
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../src/modules/BaseModel.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,EAAE,EAAc,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../src/modules/BaseModel.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,EAAE,EAAc,MAAM,UAAU,CAAC;AAw4BhD,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAW,CAAC;AAG7E,gFAAgF;AAChF,MAAM,OAAO,SAAS;IACpB,MAAM,KAAK,WAAW;QACpB,OAAO,EAAW,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,aAAa;QACtB,OAAO,EAAW,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,oBAAoB;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,KAAK,aAAa;QACtB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,KAAK,YAAY;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,OAAe;QAC9B,iBAAiB;IACnB,CAAC;IAED,wDAAwD;IACjD,MAAM,CAAC,UAAU;QACtB,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE;YACnD,GAAG,cAAc;YACjB,GAAI,IAAI,CAAC,aAA+B;YACxC,OAAO,EAAE,IAAI,CAAC,oBAAoB;YAClC,OAAO,EAAE,IAAI,CAAC,YAAY;YAC1B,QAAQ,EAAE,IAAI,CAAC,aAAa;SAC7B,CAAmC,CAAC;QAErC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEvB,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAClC,IAAI,CAAC,IAAI,EACT,MAAM,CACqB,CAAC;QAE9B,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,wBAAwB,CAAC,SAAkB;IACzD,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,GAAG,SAA4D,CAAC;IAC1E,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,+DAA+D;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
package/dist/server.js
CHANGED
|
@@ -130,6 +130,9 @@ class Server {
|
|
|
130
130
|
// cross-controller middleware accumulation is visible. Verbose-only:
|
|
131
131
|
// production filters this out by default via the logger level.
|
|
132
132
|
this.app.logger.verbose(formatRouteTree(this.app.httpServer.routeRegistry));
|
|
133
|
+
// Bind last: before this point a request would find no routes and get
|
|
134
|
+
// Express's default HTML 404.
|
|
135
|
+
await this.app.httpServer.listen();
|
|
133
136
|
this.#registerShutdownSignals();
|
|
134
137
|
}
|
|
135
138
|
/**
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { CacheDriver } from '../CacheDriver.ts';
|
|
2
2
|
/**
|
|
3
|
-
* Default cache driver: a per-process `Map` with per-key TTL
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
3
|
+
* Default cache driver: a per-process `Map` with per-key TTL. Reads check the
|
|
4
|
+
* expiry time; a timer removes entries nobody reads again. Needs no external
|
|
5
|
+
* service, which is what makes `@redis/client` an optional dependency.
|
|
6
|
+
* Per-process only — multi-node deployments that need a shared cache should
|
|
7
|
+
* configure the redis driver.
|
|
7
8
|
*/
|
|
8
9
|
declare class MemoryDriver implements CacheDriver {
|
|
9
10
|
#private;
|
|
@@ -1,13 +1,24 @@
|
|
|
1
|
+
// Node fires a longer `setTimeout` delay after 1 ms instead (with a warning).
|
|
2
|
+
const MAX_TIMER_MS = 2 ** 31 - 1;
|
|
1
3
|
/**
|
|
2
|
-
* Default cache driver: a per-process `Map` with per-key TTL
|
|
3
|
-
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
4
|
+
* Default cache driver: a per-process `Map` with per-key TTL. Reads check the
|
|
5
|
+
* expiry time; a timer removes entries nobody reads again. Needs no external
|
|
6
|
+
* service, which is what makes `@redis/client` an optional dependency.
|
|
7
|
+
* Per-process only — multi-node deployments that need a shared cache should
|
|
8
|
+
* configure the redis driver.
|
|
6
9
|
*/
|
|
7
10
|
class MemoryDriver {
|
|
8
11
|
#store = new Map();
|
|
9
12
|
async get(key) {
|
|
10
|
-
|
|
13
|
+
const entry = this.#store.get(key);
|
|
14
|
+
if (!entry) {
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
if (entry.expiresAt <= Date.now()) {
|
|
18
|
+
this.#remove(key, entry);
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
return entry.value;
|
|
11
22
|
}
|
|
12
23
|
async set(key, value, ttlSeconds) {
|
|
13
24
|
// A non-positive TTL never stores (issue #10): storing without a timer would
|
|
@@ -17,30 +28,42 @@ class MemoryDriver {
|
|
|
17
28
|
return;
|
|
18
29
|
}
|
|
19
30
|
const existing = this.#store.get(key);
|
|
20
|
-
if (existing
|
|
31
|
+
if (existing) {
|
|
21
32
|
clearTimeout(existing.timer);
|
|
22
33
|
}
|
|
23
|
-
const entry = { value };
|
|
24
|
-
if (ttlSeconds > 0) {
|
|
25
|
-
entry.timer = setTimeout(() => {
|
|
26
|
-
this.#store.delete(key);
|
|
27
|
-
}, ttlSeconds * 1000);
|
|
28
|
-
// `unref` so a pending expiry never keeps the process alive.
|
|
29
|
-
entry.timer.unref?.();
|
|
30
|
-
}
|
|
34
|
+
const entry = { value, expiresAt: Date.now() + ttlSeconds * 1000 };
|
|
31
35
|
this.#store.set(key, entry);
|
|
36
|
+
this.#schedule(key, entry);
|
|
32
37
|
}
|
|
33
38
|
async del(key) {
|
|
34
39
|
const existing = this.#store.get(key);
|
|
35
40
|
if (!existing) {
|
|
36
41
|
return 0;
|
|
37
42
|
}
|
|
38
|
-
|
|
39
|
-
clearTimeout(existing.timer);
|
|
40
|
-
}
|
|
41
|
-
this.#store.delete(key);
|
|
43
|
+
this.#remove(key, existing);
|
|
42
44
|
return 1;
|
|
43
45
|
}
|
|
46
|
+
/** Arm the cleanup timer; a TTL beyond the timer limit re-arms on wake. */
|
|
47
|
+
#schedule(key, entry) {
|
|
48
|
+
const delay = Math.min(Math.max(entry.expiresAt - Date.now(), 0), MAX_TIMER_MS);
|
|
49
|
+
entry.timer = setTimeout(() => {
|
|
50
|
+
if (this.#store.get(key) !== entry) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (entry.expiresAt <= Date.now()) {
|
|
54
|
+
this.#store.delete(key);
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
this.#schedule(key, entry);
|
|
58
|
+
}
|
|
59
|
+
}, delay);
|
|
60
|
+
// `unref` so a pending expiry never keeps the process alive.
|
|
61
|
+
entry.timer.unref?.();
|
|
62
|
+
}
|
|
63
|
+
#remove(key, entry) {
|
|
64
|
+
clearTimeout(entry.timer);
|
|
65
|
+
this.#store.delete(key);
|
|
66
|
+
}
|
|
44
67
|
}
|
|
45
68
|
export default MemoryDriver;
|
|
46
69
|
//# sourceMappingURL=MemoryDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryDriver.js","sourceRoot":"","sources":["../../../../src/services/cache/drivers/MemoryDriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MemoryDriver.js","sourceRoot":"","sources":["../../../../src/services/cache/drivers/MemoryDriver.ts"],"names":[],"mappings":"AAQA,8EAA8E;AAC9E,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAEjC;;;;;;GAMG;AACH,MAAM,YAAY;IAChB,MAAM,GAAG,IAAI,GAAG,EAAiB,CAAC;IAElC,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,UAAkB;QACtD,6EAA6E;QAC7E,2EAA2E;QAC3E,6EAA6E;QAC7E,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,QAAQ,EAAE,CAAC;YACb,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,KAAK,GAAU,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5B,OAAO,CAAC,CAAC;IACX,CAAC;IAED,2EAA2E;IAC3E,SAAS,CAAC,GAAW,EAAE,KAAY;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EACzC,YAAY,CACb,CAAC;QACF,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC;gBACnC,OAAO;YACT,CAAC;YACD,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;gBAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC,EAAE,KAAK,CAAC,CAAC;QACV,6DAA6D;QAC7D,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAW,EAAE,KAAY;QAC/B,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACF;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -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
|
/**
|
|
@@ -58,15 +58,26 @@ class HttpServer extends Base {
|
|
|
58
58
|
this.logger?.error(`HTTP server failed to start: ${err}`);
|
|
59
59
|
process.exit(1);
|
|
60
60
|
});
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Start accepting connections; resolves once the port is bound. Called by
|
|
64
|
+
* `startServer` after routes, the 404 page and the error handler are
|
|
65
|
+
* mounted, so no request reaches a partly built app.
|
|
66
|
+
*/
|
|
67
|
+
listen() {
|
|
68
|
+
const httpConfig = this.app.getConfig('http');
|
|
69
|
+
return new Promise((resolve) => {
|
|
70
|
+
const listener = this.httpServer.listen(httpConfig.port, httpConfig.hostname, () => {
|
|
71
|
+
const address = listener.address();
|
|
72
|
+
const port = typeof address === 'string' ? 0 : address?.port || 0;
|
|
73
|
+
this.logger?.info(`App started and listening on port ${port}`);
|
|
74
|
+
if (+port !== +httpConfig.port) {
|
|
75
|
+
// in case we using port 0
|
|
76
|
+
this.app.updateConfig('http', { port });
|
|
77
|
+
this.logger?.info(`Updating http config to use new port ${port}. Old was ${httpConfig.port} `);
|
|
78
|
+
}
|
|
79
|
+
resolve();
|
|
80
|
+
});
|
|
70
81
|
});
|
|
71
82
|
}
|
|
72
83
|
/** Mount the route adapter — single entry to the registry. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../src/services/http/HttpServer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../src/services/http/HttpServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,14 +24,16 @@ class Cors extends AbstractMiddleware {
|
|
|
24
24
|
if (!Array.isArray(origins)) {
|
|
25
25
|
return next();
|
|
26
26
|
}
|
|
27
|
+
// Whether the allow-origin header is sent depends on Origin, so every
|
|
28
|
+
// response varies by it. `vary` appends instead of replacing other values.
|
|
29
|
+
res.vary('Origin');
|
|
27
30
|
for (const host of origins) {
|
|
28
31
|
if ((typeof host === 'string' && req.headers.origin === host) ||
|
|
29
32
|
(host instanceof RegExp && host.test(req.headers.origin ?? ''))) {
|
|
30
33
|
res.set('Access-Control-Allow-Origin', req.headers.origin);
|
|
31
|
-
res.set('Vary', 'Origin');
|
|
32
34
|
if (req.method === 'OPTIONS') {
|
|
33
35
|
res.set('Access-Control-Allow-Methods', 'GET,HEAD,PUT,PATCH,POST,DELETE');
|
|
34
|
-
res.
|
|
36
|
+
res.vary('Access-Control-Request-Headers');
|
|
35
37
|
const allowedHeaders = req.headers['access-control-request-headers'];
|
|
36
38
|
if (allowedHeaders) {
|
|
37
39
|
res.set('Access-Control-Allow-Headers', allowedHeaders);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cors.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Cors.ts"],"names":[],"mappings":"AAGA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,IAAK,SAAQ,kBAAkB;IACnC,YACE,GAAS,EACT,MAEC;QAED,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,yEAAyE;QACzE,0EAA0E;QAC1E,sBAAsB;QACtB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,IACE,MAAM,YAAY,MAAM;gBACxB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAChE,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,eAAe,MAAM,CAAC,MAAM,kGAAkG,CAC/H,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,OAA8B,EAAE,CAAC;YAClD,IACE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC;gBACzD,CAAC,IAAI,YAAY,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,EAC/D,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Cors.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Cors.ts"],"names":[],"mappings":"AAGA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,IAAK,SAAQ,kBAAkB;IACnC,YACE,GAAS,EACT,MAEC;QAED,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,yEAAyE;QACzE,0EAA0E;QAC1E,sBAAsB;QACtB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,IACE,MAAM,YAAY,MAAM;gBACxB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAChE,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,eAAe,MAAM,CAAC,MAAM,kGAAkG,CAC/H,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,sEAAsE;QACtE,2EAA2E;QAC3E,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,OAA8B,EAAE,CAAC;YAClD,IACE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC;gBACzD,CAAC,IAAI,YAAY,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,EAC/D,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAE3D,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC7B,GAAG,CAAC,GAAG,CACL,8BAA8B,EAC9B,gCAAgC,CACjC,CAAC;oBACF,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;oBAE3C,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;oBACrE,IAAI,cAAc,EAAE,CAAC;wBACnB,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;oBAC1D,CAAC;oBACD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;oBAC/B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAChB,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF;AAED,eAAe,IAAI,CAAC"}
|
|
@@ -35,10 +35,12 @@ class I18n extends AbstractMiddleware {
|
|
|
35
35
|
};
|
|
36
36
|
detectorOrder = ['XLang', 'query', 'user'];
|
|
37
37
|
async detectLang(req, isUseShortCode = true) {
|
|
38
|
+
const { supportedLngs } = this.app.getConfig('i18n');
|
|
38
39
|
let lang = '';
|
|
39
40
|
for (const detectorName of this.detectorOrder) {
|
|
40
41
|
const lng = this.detectors[detectorName](req);
|
|
41
|
-
|
|
42
|
+
// A repeated query parameter arrives as an array — not a language code.
|
|
43
|
+
if (!lng || typeof lng !== 'string') {
|
|
42
44
|
continue;
|
|
43
45
|
}
|
|
44
46
|
const i18nService = await this.app.getI18nService();
|
|
@@ -48,14 +50,14 @@ class I18n extends AbstractMiddleware {
|
|
|
48
50
|
if (!i18nInstance) {
|
|
49
51
|
break;
|
|
50
52
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
53
|
+
const { languageUtils } = i18nInstance.services;
|
|
54
|
+
const languagePart = languageUtils.getLanguagePartFromCode(lng);
|
|
55
|
+
// i18next accepts any code unless it knows `supportedLngs`, so check the
|
|
56
|
+
// configured list too: an unsupported value falls through to the next
|
|
57
|
+
// detector instead of ending detection with the fallback language.
|
|
58
|
+
if (languageUtils.isSupportedCode(lng) &&
|
|
59
|
+
supportedLngs.includes(languagePart)) {
|
|
60
|
+
lang = isUseShortCode ? languagePart : lng;
|
|
59
61
|
break;
|
|
60
62
|
}
|
|
61
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/I18n.ts"],"names":[],"mappings":"AAKA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAWzD,MAAM,IAAK,SAAQ,kBAAkB;IACnC,OAAO,GAAG,IAAI,CAAC;IAEf,iBAAiB,GAAG,EAAE,CAAC;IAEvB,YAAY,GAAS,EAAE,MAAgC;QACrD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACnB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;QACnE,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QAClC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,CAAC;IACxD,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,4CAA4C,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,IAAc,EAAE,IAAkB;QACxE,IAAI,IAAI,GAAG,EAAE,CAAC;QAEd,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,MAAM,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1D,2CAA2C;QAC3C,GAAG,CAAC,IAAI,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;YACrC,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;gBACpB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,kDAAkD,CAAC,CAAC;gBACtE,+CAA+C;gBAC/C,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;SACF,CAAC,CAAC;QAEH,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,SAAS,GAKL;QACF,KAAK,EAAE,CAAC,GAAqB,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,mBAAmB;QACxE,KAAK,EAAE,CAAC,GAAqB,EAAE,EAAE,CAC/B,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAY,CAAC,CAAC,CAAC,KAAK,EAAE,kBAAkB;QACvF,IAAI,EAAE,CAAC,GAA6C,EAAE,EAAE,CACtD,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,yDAAyD;KACvF,CAAC;IAEF,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAE3C,KAAK,CAAC,UAAU,CACd,GAAqB,EACrB,cAAc,GAAG,IAAI;QAErB,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,CAAC,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/I18n.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,8 @@ const paginationQueryParameters = defineSchema((value) => {
|
|
|
9
9
|
continue;
|
|
10
10
|
}
|
|
11
11
|
const n = Number(v[key]);
|
|
12
|
-
|
|
12
|
+
// `Infinity` (e.g. hundreds of digits) is no usable page or limit either.
|
|
13
|
+
if (!Number.isFinite(n)) {
|
|
13
14
|
issues.push({ message: `${key} must be a number`, path: [key] });
|
|
14
15
|
}
|
|
15
16
|
else {
|
|
@@ -65,19 +66,20 @@ class Pagination extends AbstractMiddleware {
|
|
|
65
66
|
if (effectiveLimit > maxLimit) {
|
|
66
67
|
effectiveLimit = maxLimit;
|
|
67
68
|
}
|
|
69
|
+
const requestedPage = typeof req?.query?.page === 'string' ? parseInt(req.query.page, 10) : 1;
|
|
70
|
+
// A malformed, non-positive or absurdly large page (hundreds of digits
|
|
71
|
+
// parse to Infinity) falls back to 1, so `skip` is always a safe integer.
|
|
72
|
+
let page = Number.isSafeInteger(requestedPage) && requestedPage > 0
|
|
73
|
+
? requestedPage
|
|
74
|
+
: 1;
|
|
75
|
+
if (!Number.isSafeInteger((page - 1) * effectiveLimit)) {
|
|
76
|
+
page = 1;
|
|
77
|
+
}
|
|
68
78
|
req.appInfo.pagination = {
|
|
69
|
-
page
|
|
70
|
-
? parseInt(req?.query?.page, 10) || 1
|
|
71
|
-
: 1,
|
|
79
|
+
page,
|
|
72
80
|
limit: effectiveLimit,
|
|
73
|
-
skip:
|
|
81
|
+
skip: (page - 1) * effectiveLimit,
|
|
74
82
|
};
|
|
75
|
-
if (req.appInfo.pagination.page < 1) {
|
|
76
|
-
req.appInfo.pagination.page = 1;
|
|
77
|
-
}
|
|
78
|
-
req.appInfo.pagination.skip =
|
|
79
|
-
req.appInfo.pagination.page * req.appInfo.pagination.limit -
|
|
80
|
-
req.appInfo.pagination.limit;
|
|
81
83
|
return next();
|
|
82
84
|
}
|
|
83
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pagination.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Pagination.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG9D,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAYzD,MAAM,yBAAyB,GAAG,YAAY,CAI5C,CAAC,KAAK,EAAE,EAAE;IACR,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAA4B,CAAC;IACnD,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,MAAM,GAAG,GAAsC,EAAE,CAAC;IAClD,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;YAC7D,SAAS;QACX,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,IAAI,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"Pagination.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Pagination.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,18 +46,28 @@ class RequestParser extends AbstractMiddleware {
|
|
|
46
46
|
const declaredLength = Number(req.headers?.['content-length']);
|
|
47
47
|
if (Number.isFinite(declaredLength) && declaredLength > maxBodySize) {
|
|
48
48
|
this.logger?.error(`Request body ${declaredLength}B exceeds maxFieldsSize ${maxBodySize}B`);
|
|
49
|
+
// Close after the 413 instead of draining the unread body.
|
|
50
|
+
res.setHeader('Connection', 'close');
|
|
49
51
|
return res.status(413).json({
|
|
50
52
|
message: this.translate(req, 'middleware.requestParser.entityTooLarge', 'Request entity too large. Your upload exceeds the allowed size or count limits.'),
|
|
51
53
|
});
|
|
52
54
|
}
|
|
53
55
|
}
|
|
54
56
|
// Also guard chunked bodies. Only a genuinely selected multipart parser
|
|
55
|
-
// may rely on the separate file/field limits.
|
|
57
|
+
// may rely on the separate file/field limits. Pausing (not destroying) the
|
|
58
|
+
// request keeps the socket writable, so the client receives the 413; its
|
|
59
|
+
// `Connection: close` then ends the connection.
|
|
60
|
+
let rejectOversized = () => { };
|
|
61
|
+
const oversized = new Promise((_resolve, reject) => {
|
|
62
|
+
rejectOversized = reject;
|
|
63
|
+
});
|
|
56
64
|
form.on('progress', (bytesReceived) => {
|
|
57
|
-
if (
|
|
65
|
+
if (!bodyTooLarge &&
|
|
66
|
+
form.type !== 'multipart' &&
|
|
58
67
|
bytesReceived > maxBodySize) {
|
|
59
68
|
bodyTooLarge = true;
|
|
60
|
-
req.
|
|
69
|
+
req.pause();
|
|
70
|
+
rejectOversized(new Error('Request body exceeds maxFieldsSize'));
|
|
61
71
|
}
|
|
62
72
|
});
|
|
63
73
|
// Track every temp file formidable opens (via fileBegin, so a file that
|
|
@@ -83,8 +93,8 @@ class RequestParser extends AbstractMiddleware {
|
|
|
83
93
|
let fields;
|
|
84
94
|
let files;
|
|
85
95
|
try {
|
|
86
|
-
[fields, files] = await form.parse(req);
|
|
87
|
-
//
|
|
96
|
+
[fields, files] = await Promise.race([form.parse(req), oversized]);
|
|
97
|
+
// Pausing the stream cannot cancel a chunk already inside the parser.
|
|
88
98
|
// Even if that chunk completes parsing, an oversized body must not advance.
|
|
89
99
|
if (bodyTooLarge) {
|
|
90
100
|
throw new Error('Request body exceeds maxFieldsSize');
|
|
@@ -96,6 +106,10 @@ class RequestParser extends AbstractMiddleware {
|
|
|
96
106
|
// count) with httpCode 413; our own JSON/urlencoded body-size guard sets
|
|
97
107
|
// `bodyTooLarge`. Everything else (bad content type / length) stays a 400.
|
|
98
108
|
if (bodyTooLarge || err?.httpCode === 413) {
|
|
109
|
+
if (bodyTooLarge) {
|
|
110
|
+
// The rest of the body stays unread; close rather than drain it.
|
|
111
|
+
res.setHeader('Connection', 'close');
|
|
112
|
+
}
|
|
99
113
|
return res.status(413).json({
|
|
100
114
|
message: this.translate(req, 'middleware.requestParser.entityTooLarge', 'Request entity too large. Your upload exceeds the allowed size or count limits.'),
|
|
101
115
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,UAAU,EAAE,EACjB,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,GACZ,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD;;;;;;GAMG;AACH,MAAM,aAAc,SAAQ,kBAAkB;IAC5C,MAAM,KAAK,WAAW;QACpB,OAAO,sDAAsD,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAExC,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAuB,CAAC;QAC3E,gFAAgF;QAChF,MAAM,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3D,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;QACtE,MAAM,WAAW,GACf,SAAS,KAAK,qBAAqB,IAAI,SAAS,KAAK,mBAAmB,CAAC;QAC3E,yEAAyE;QACzE,gEAAgE;QAChE,MAAM,MAAM,GAAG,WAAW;YACxB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,KAAK,kBAAkB,IAAI,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC;gBAChE,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,SAAS,KAAK,mCAAmC;oBACjD,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,SAAS,KAAK,0BAA0B;wBACxC,CAAC,CAAC,WAAW;wBACb,CAAC,CAAC,SAAS,CAAC;QACpB,MAAM,IAAI,GAAG,UAAU,CAAC;YACtB,GAAG,aAAa;YAChB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAChD,CAAC,CAAC;QAEH,wEAAwE;QACxE,8EAA8E;QAC9E,MAAM,WAAW,GACf,OAAO,aAAa,CAAC,aAAa,KAAK,QAAQ;YAC7C,CAAC,CAAC,aAAa,CAAC,aAAa;YAC7B,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;QACtB,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAC/D,IAAI,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,cAAc,GAAG,WAAW,EAAE,CAAC;gBACpE,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,gBAAgB,cAAc,2BAA2B,WAAW,GAAG,CACxE,CAAC;gBACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBAC1B,OAAO,EAAE,IAAI,CAAC,SAAS,CACrB,GAAG,EACH,yCAAyC,EACzC,iFAAiF,CAClF;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,wEAAwE;QACxE,
|
|
1
|
+
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -146,14 +146,117 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
146
146
|
}> & {
|
|
147
147
|
__v: number;
|
|
148
148
|
}, "generateToken" | "getPublic" | "id" | "sendPasswordRecoveryEmail" | "sendVerificationEmail"> & import("mongoose").HydratedDocumentOverrides<{} & import("../modules/BaseModel.ts").DocFacingMethods<{
|
|
149
|
-
readonly generateToken: (this: {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
149
|
+
readonly generateToken: (this: import("../models/User.ts").UserAuthInstance & Pick<import("mongoose").Document<unknown, object, {
|
|
150
|
+
_id: import("mongoose").Types.ObjectId;
|
|
151
|
+
createdAt: NativeDate;
|
|
152
|
+
updatedAt: NativeDate;
|
|
153
|
+
avatar?: string | null | undefined;
|
|
154
|
+
name?: {
|
|
155
|
+
first?: string | null | undefined;
|
|
156
|
+
last?: string | null | undefined;
|
|
157
|
+
nick?: string | null | undefined;
|
|
158
|
+
} | null | undefined;
|
|
159
|
+
password?: string | null | undefined;
|
|
160
|
+
email?: string | null | undefined;
|
|
161
|
+
sessionTokens: ({
|
|
162
|
+
token?: string | null | undefined;
|
|
163
|
+
valid?: NativeDate | null | undefined;
|
|
164
|
+
} & {
|
|
165
|
+
_id: import("mongoose").Types.ObjectId;
|
|
166
|
+
})[];
|
|
167
|
+
verificationTokens: ({
|
|
168
|
+
until?: NativeDate | null | undefined;
|
|
169
|
+
token?: string | null | undefined;
|
|
170
|
+
} & {
|
|
171
|
+
_id: import("mongoose").Types.ObjectId;
|
|
172
|
+
})[];
|
|
173
|
+
passwordRecoveryTokens: ({
|
|
174
|
+
until?: NativeDate | null | undefined;
|
|
175
|
+
token?: string | null | undefined;
|
|
176
|
+
} & {
|
|
177
|
+
_id: import("mongoose").Types.ObjectId;
|
|
178
|
+
})[];
|
|
179
|
+
permissions: string[];
|
|
180
|
+
roles: string[];
|
|
181
|
+
isVerified: boolean;
|
|
182
|
+
locale: string;
|
|
183
|
+
languages: string[];
|
|
184
|
+
}, object, Omit<{
|
|
185
|
+
readonly timestamps: true;
|
|
186
|
+
readonly minimize: false;
|
|
187
|
+
}, never>> & Omit<{
|
|
188
|
+
_id: import("mongoose").Types.ObjectId;
|
|
189
|
+
createdAt: NativeDate;
|
|
190
|
+
updatedAt: NativeDate;
|
|
191
|
+
avatar?: string | null | undefined;
|
|
192
|
+
name?: Omit<{
|
|
193
|
+
_id: import("mongoose").Types.ObjectId;
|
|
194
|
+
first?: string | null | undefined;
|
|
195
|
+
last?: string | null | undefined;
|
|
196
|
+
nick?: string | null | undefined;
|
|
197
|
+
}, "_id"> | null | undefined;
|
|
198
|
+
password?: string | null | undefined;
|
|
199
|
+
email?: string | null | undefined;
|
|
200
|
+
sessionTokens: import("mongoose").Types.DocumentArray<{
|
|
201
|
+
token?: string | null | undefined;
|
|
202
|
+
valid?: NativeDate | null | undefined;
|
|
203
|
+
} & {
|
|
204
|
+
_id: import("mongoose").Types.ObjectId;
|
|
205
|
+
}, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, unknown, {
|
|
206
|
+
token?: string | null | undefined;
|
|
207
|
+
valid?: NativeDate | null | undefined;
|
|
208
|
+
} & {
|
|
209
|
+
_id: import("mongoose").Types.ObjectId;
|
|
210
|
+
}, {}, {}> & {
|
|
211
|
+
token?: string | null | undefined;
|
|
212
|
+
valid?: NativeDate | null | undefined;
|
|
213
|
+
} & {
|
|
214
|
+
_id: import("mongoose").Types.ObjectId;
|
|
215
|
+
}>;
|
|
216
|
+
verificationTokens: import("mongoose").Types.DocumentArray<{
|
|
217
|
+
until?: NativeDate | null | undefined;
|
|
218
|
+
token?: string | null | undefined;
|
|
219
|
+
} & {
|
|
220
|
+
_id: import("mongoose").Types.ObjectId;
|
|
221
|
+
}, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, unknown, {
|
|
222
|
+
until?: NativeDate | null | undefined;
|
|
223
|
+
token?: string | null | undefined;
|
|
224
|
+
} & {
|
|
225
|
+
_id: import("mongoose").Types.ObjectId;
|
|
226
|
+
}, {}, {}> & {
|
|
227
|
+
until?: NativeDate | null | undefined;
|
|
228
|
+
token?: string | null | undefined;
|
|
229
|
+
} & {
|
|
230
|
+
_id: import("mongoose").Types.ObjectId;
|
|
231
|
+
}>;
|
|
232
|
+
passwordRecoveryTokens: import("mongoose").Types.DocumentArray<{
|
|
233
|
+
until?: NativeDate | null | undefined;
|
|
234
|
+
token?: string | null | undefined;
|
|
235
|
+
} & {
|
|
236
|
+
_id: import("mongoose").Types.ObjectId;
|
|
237
|
+
}, import("mongoose").Types.Subdocument<import("mongoose").Types.ObjectId, unknown, {
|
|
238
|
+
until?: NativeDate | null | undefined;
|
|
239
|
+
token?: string | null | undefined;
|
|
240
|
+
} & {
|
|
241
|
+
_id: import("mongoose").Types.ObjectId;
|
|
242
|
+
}, {}, {}> & {
|
|
243
|
+
until?: NativeDate | null | undefined;
|
|
244
|
+
token?: string | null | undefined;
|
|
245
|
+
} & {
|
|
246
|
+
_id: import("mongoose").Types.ObjectId;
|
|
247
|
+
}>;
|
|
248
|
+
permissions: import("mongoose").Types.Array<string>;
|
|
249
|
+
roles: import("mongoose").Types.Array<string>;
|
|
250
|
+
isVerified: boolean;
|
|
251
|
+
locale: string;
|
|
252
|
+
languages: import("mongoose").Types.Array<string>;
|
|
253
|
+
} & Required<{
|
|
254
|
+
_id: import("mongoose").Types.ObjectId;
|
|
255
|
+
}> & {
|
|
256
|
+
__v: number;
|
|
257
|
+
}, "id"> & import("mongoose").HydratedDocumentOverrides<object & {
|
|
258
|
+
id: string;
|
|
259
|
+
}>, '_id' | '$where' | 'isModified'>) => Promise<{
|
|
157
260
|
token: string;
|
|
158
261
|
valid: Date;
|
|
159
262
|
}>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptivestone/framework",
|
|
3
|
-
"version": "5.4.
|
|
3
|
+
"version": "5.4.2",
|
|
4
4
|
"description": "Adaptive stone node js framework",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -74,8 +74,8 @@
|
|
|
74
74
|
"devDependencies": {
|
|
75
75
|
"@biomejs/biome": "^2.0.6",
|
|
76
76
|
"@redis/client": "^6.0.0",
|
|
77
|
-
"@sentry/core": "^
|
|
78
|
-
"@sentry/node": "^
|
|
77
|
+
"@sentry/core": "^11.2.0",
|
|
78
|
+
"@sentry/node": "^11.2.0",
|
|
79
79
|
"@types/express": "^5.0.1",
|
|
80
80
|
"@types/formidable": "^3.4.5",
|
|
81
81
|
"@types/node": "^26.0.0",
|
|
@@ -83,22 +83,22 @@
|
|
|
83
83
|
"i18next-fs-backend": "^2.0.0",
|
|
84
84
|
"lefthook": "^2.0.0",
|
|
85
85
|
"mongodb-memory-server": "^11.0.0",
|
|
86
|
-
"oxc-parser": "^0.
|
|
86
|
+
"oxc-parser": "^0.152.0",
|
|
87
87
|
"typescript": "^7.0.2",
|
|
88
|
-
"vitest": "^
|
|
88
|
+
"vitest": "^5.0.3",
|
|
89
89
|
"yup": "^1.7.0",
|
|
90
90
|
"zod": "^4.0.0"
|
|
91
91
|
},
|
|
92
92
|
"peerDependencies": {
|
|
93
93
|
"@adaptivestone/framework-module-email": "^2.1.0",
|
|
94
94
|
"@redis/client": "^6.0.0",
|
|
95
|
-
"@sentry/core": "^10.34.0",
|
|
96
|
-
"@sentry/node": "^10.34.0",
|
|
95
|
+
"@sentry/core": "^10.34.0 || ^11.0.0",
|
|
96
|
+
"@sentry/node": "^10.34.0 || ^11.0.0",
|
|
97
97
|
"i18next": "^26.0.1",
|
|
98
98
|
"i18next-fs-backend": "^2.0.0",
|
|
99
99
|
"mongodb-memory-server": "^11.0.0",
|
|
100
|
-
"oxc-parser": "^0.
|
|
101
|
-
"vitest": "^4.0.0",
|
|
100
|
+
"oxc-parser": "^0.152.0",
|
|
101
|
+
"vitest": "^4.0.0 || ^5.0.0",
|
|
102
102
|
"yup": "^1.7.0",
|
|
103
103
|
"zod": "^3.24.0 || ^4.0.0"
|
|
104
104
|
},
|