@adaptivestone/framework 5.6.0 → 5.6.1
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 +30 -1
- package/README.md +23 -0
- package/dist/clusterRunner.js +7 -3
- package/dist/clusterRunner.js.map +1 -1
- package/dist/codegen/appTypes.js +9 -6
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/commands/CreateUser.d.ts +1 -0
- package/dist/commands/CreateUser.js +1 -0
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/commands/SyncIndexes.js +4 -12
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Migrate.js +3 -2
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/config/http.d.ts +1 -0
- package/dist/config/http.js +8 -0
- package/dist/config/http.js.map +1 -1
- package/dist/controllers/index.js +44 -13
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.js +3 -0
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/models/Lock.d.ts +2 -2
- package/dist/models/Lock.js +64 -15
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/User.js +4 -1
- package/dist/models/User.js.map +1 -1
- package/dist/modules/BaseCli.d.ts +5 -0
- package/dist/modules/BaseCli.js +10 -1
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.js +48 -8
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +16 -8
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/RedisDriver.js +15 -11
- package/dist/services/cache/drivers/RedisDriver.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +2 -2
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/builtinErrorHandlers.d.ts +9 -3
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/middleware/Cors.js +5 -0
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/IpDetector.js +23 -4
- package/dist/services/http/middleware/IpDetector.js.map +1 -1
- package/dist/services/http/middleware/Pagination.js +4 -2
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.js +1 -0
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +4 -1
- package/dist/services/http/middleware/RequestParser.js +74 -20
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/routing/RouteRegistry.js +21 -10
- package/dist/services/http/routing/RouteRegistry.js.map +1 -1
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +2 -1
- package/dist/services/validate/ValidationError.d.ts +8 -1
- package/dist/services/validate/ValidationError.js +10 -2
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/dist/tests/setupFramework.d.ts +4 -1
- package/dist/tests/setupFramework.js +15 -9
- package/dist/tests/setupFramework.js.map +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,36 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
|
6
6
|
|
|
7
7
|
## [Unreleased]
|
|
8
8
|
|
|
9
|
+
## [5.6.1] - 2026-11-15
|
|
10
|
+
|
|
11
|
+
### Changed
|
|
12
|
+
|
|
13
|
+
- **The optional `oxc-parser` and `i18next` peers accept their current releases.** `oxc-parser` is now `>=0.156.0 <1` instead of `^0.156.0`, which rejected each new weekly 0.x release with `ERESOLVE`; code generation output with 0.158.0 is byte-identical. `i18next` is now `^26.0.1 || ^27.0.0`. i18next 27 changes defaults that affect an app's own translations (an empty translation falls back instead of rendering blank, `/` is no longer escaped in interpolated values; see its [migration guide](https://www.i18next.com/misc/migration-guide#v26.x.x-to-v27.0.0)). The framework passes `fallbackLng` from `config/i18n.ts`, so i18next 27's new `fallbackLng` default does not apply.
|
|
14
|
+
- **Cache misses now return the same serialized representation as cache hits.** Dates become strings, `toJSON()` is respected, and undefined object properties are omitted on the first call too; BigInts remain supported. A non-positive or `NaN` TTL still bypasses caching and returns the callback's original value.
|
|
15
|
+
- **Middleware schemas inherited from parent controllers are now validated on child routes.** Invalid input that previously bypassed these schemas receives the usual validation 400.
|
|
16
|
+
- **User session token lookups have an index on `sessionTokens.token`.** Existing deployments with automatic index creation enabled build it on startup; plan the index build for large user collections.
|
|
17
|
+
|
|
18
|
+
### Added
|
|
19
|
+
|
|
20
|
+
- **CLI argument descriptors accept `sensitive: true`.** Such values are replaced with `[REDACTED]` before generating the Mongo application name or its hash; `createuser` marks its password this way. Ordinary arguments, boolean flags, the existing long-name hash format, and an explicit `MONGO_APP_NAME` are preserved.
|
|
21
|
+
- **`http.requestParser.mediaTypes` parses other media types as JSON or urlencoded.** It maps a media type to `'json'` or `'urlencoded'`, on top of `application/json`, any `+json` type and `application/x-www-form-urlencoded`. The default config maps `application/csp-report`, so browser CSP violation reports are parsed instead of answered with 400. An app's own `config/http.ts` replaces the framework's, so add the entry there: `mediaTypes: { 'application/csp-report': 'json' }`. Keys match case-insensitively, and mapped bodies share the `maxFieldsSize` limit.
|
|
22
|
+
|
|
23
|
+
### Fixed
|
|
24
|
+
|
|
25
|
+
- **An unavailable Redis no longer stalls cache reads or delays rate limiting.** Cache operations fail softly while the connection is pending, and the rate limiter immediately uses its memory insurance limiter. Redis cache TTLs now use milliseconds, so fractional seconds work.
|
|
26
|
+
- **Cluster workers drain requests when shutdown signals are delivered more than once**, then disconnect their IPC channel. The primary no longer mistakes a signal exit with a null code for a nonzero exit code.
|
|
27
|
+
- **Fatal crashes give Sentry a bounded opportunity to flush before exiting.** The source transport import also resolves correctly when running TypeScript directly, and calling `getModel` before initialization reports the intended diagnostic.
|
|
28
|
+
- **Missing or empty model passwords are no longer hashed as login credentials**, and malformed stored password hashes with an incorrect decoded length are rejected.
|
|
29
|
+
- **Method-scoped middleware runs in declaration order**, including overlapping wildcard and exact scopes.
|
|
30
|
+
- **Mounted routes retain their own parameter names.** Sibling controller mounts that share a parameter position no longer borrow the first controller's name, including handlers without explicit parameter metadata.
|
|
31
|
+
- **Applied migrations remain applied after a `.js`/`.ts` extension change.** `syncindexes` also handles models registered from subdirectories, and type generation supports framework/model files outside the consumer root, including hoisted installations.
|
|
32
|
+
- **Trusted forwarded IP addresses accept validated IPv4/IPv6 addresses with ports.** Binary `application/octet-stream` uploads use the configured file-size limit; CORS regexes with `g`/`y` flags match consistently across requests; pagination accepts numeric exponent notation while retaining integer page and limit values.
|
|
33
|
+
- **Lock waiting recognizes logically expired records**, without requiring MongoDB's TTL cleanup to remove them first.
|
|
34
|
+
- **Test teardown drops its database before closing MongoDB.** The shipped test helpers drain HTTP requests, wait for the models' background collection builds, drop the per-suite database, then emit shutdown and disconnect. A build that finished after the drop used to recreate the database; a failed drop now fails the teardown hook instead of being ignored.
|
|
35
|
+
- **`TranslationFunction` accepts the i18next 27 translator.** i18next 27 types `t(key)` and `t(key, options)` as separate signatures, so assigning an i18next 27 instance or its `t` to `I18nBaseInstance`, `TI18n` or `TranslationFunction` failed to compile (TS2322). `TranslationFunction` makes the same split, which still fits i18next 26. A call that passes an options value that may be `undefined` no longer compiles, as with i18next 27's own types; pass the options only when they are defined.
|
|
36
|
+
- **`ValidationError` compiles under `skipLibCheck: false`.** Importing `ValidationError` (from `services/validate/ValidationError.js`) in an app with `skipLibCheck: false` failed with TS2416 inside the framework's own declaration, because its widened `message` was hidden behind a `@ts-expect-error` that does not reach the `.d.ts`. The class is still an `Error` at runtime. `registerErrorHandler` and `ErrorHandlerFn` now also accept it as an error class.
|
|
37
|
+
- **Dependencies updated within their ranges** (lockfile), including Mongoose 9.12.1, Sentry 11.12.0 and rate-limiter-flexible 11.4.1. The Sentry update removes four moderate audit findings.
|
|
38
|
+
|
|
9
39
|
## [5.6.0] - 2026-10-27
|
|
10
40
|
|
|
11
41
|
### Changed
|
|
@@ -746,7 +776,6 @@ This is a big release that contains a lot of new features and breaking changes.
|
|
|
746
776
|
- **[UPDATE]** Update `rate-limiter-flexible` to v9.
|
|
747
777
|
- **[UPDATE]** Remove 'winston-transport-sentry' and implementcustom logic based on 'sentry' itself (from v9.14 sentry have native winston support)
|
|
748
778
|
|
|
749
|
-
|
|
750
779
|
## [5.0.0-beta.39] - 2025-10-25
|
|
751
780
|
|
|
752
781
|
- **[UPDATE]** rete limiter. Do not create index on mongo if we have "process.env.test === 'true'"
|
package/README.md
CHANGED
|
@@ -70,6 +70,29 @@ To add the framework to an existing project instead:
|
|
|
70
70
|
npm install @adaptivestone/framework
|
|
71
71
|
```
|
|
72
72
|
|
|
73
|
+
## Upgrade notes (5.6.1)
|
|
74
|
+
|
|
75
|
+
See the [5.6.1 release notes](CHANGELOG.md). Check these when you upgrade:
|
|
76
|
+
|
|
77
|
+
- To accept browser CSP violation reports (`application/csp-report`) in an app
|
|
78
|
+
with its own `config/http.ts`, add
|
|
79
|
+
`mediaTypes: { 'application/csp-report': 'json' }` to its `requestParser`.
|
|
80
|
+
Your file replaces the framework's, so the new default does not reach it.
|
|
81
|
+
- Child routes now validate middleware schemas inherited from parent
|
|
82
|
+
controllers. Input those schemas reject now receives a validation 400.
|
|
83
|
+
- Cache misses return the same serialized value as hits (dates as strings,
|
|
84
|
+
`toJSON()` applied, undefined properties omitted).
|
|
85
|
+
- The `User` model declares an index on `sessionTokens.token`. With automatic
|
|
86
|
+
index creation it is built on startup; plan the build for large collections.
|
|
87
|
+
- The optional peers accept `oxc-parser` 0.156 or any later 0.x release and
|
|
88
|
+
i18next 26 or 27. Before moving to i18next 27, read its migration guide:
|
|
89
|
+
empty translations now fall back, and `/` is no longer escaped.
|
|
90
|
+
- `TranslationFunction` (`req.appInfo.i18n.t`) splits `t(key, options?)` into
|
|
91
|
+
`t(key)` and `t(key, options)`, as i18next 27 does. A call that passes options
|
|
92
|
+
which may be `undefined` no longer compiles; pass them only when defined.
|
|
93
|
+
- A failed test database drop now fails the shipped teardown hook instead of
|
|
94
|
+
being ignored.
|
|
95
|
+
|
|
73
96
|
## Upgrade notes (5.6.0)
|
|
74
97
|
|
|
75
98
|
See the [5.6.0 release notes](CHANGELOG.md). Check these when you upgrade:
|
package/dist/clusterRunner.js
CHANGED
|
@@ -49,7 +49,6 @@ function supervisePrimary(workerCount, shutdownTimeoutMs, emit) {
|
|
|
49
49
|
const restartTimers = new Set();
|
|
50
50
|
let restartTimes = [];
|
|
51
51
|
let shutdownTimer;
|
|
52
|
-
let shutdownSignal;
|
|
53
52
|
let shuttingDown = false;
|
|
54
53
|
let exitCode = 0;
|
|
55
54
|
let finished = false;
|
|
@@ -93,7 +92,6 @@ function supervisePrimary(workerCount, shutdownTimeoutMs, emit) {
|
|
|
93
92
|
return;
|
|
94
93
|
}
|
|
95
94
|
shuttingDown = true;
|
|
96
|
-
shutdownSignal = signal;
|
|
97
95
|
report('cluster:shutdown', code === 0 ? 'info' : 'error', `Cluster shutting down with ${signal}.`);
|
|
98
96
|
for (const timer of restartTimers) {
|
|
99
97
|
clearTimeout(timer);
|
|
@@ -144,7 +142,13 @@ function supervisePrimary(workerCount, shutdownTimeoutMs, emit) {
|
|
|
144
142
|
const signal = rawSignal;
|
|
145
143
|
activeWorkers.delete(worker.id);
|
|
146
144
|
if (shuttingDown) {
|
|
147
|
-
|
|
145
|
+
// Node reports code=null when a worker exits because it received a
|
|
146
|
+
// signal. A worker may receive the shutdown signal directly as part
|
|
147
|
+
// of a process-group signal, as well as through the primary's
|
|
148
|
+
// forwarding; that is still a clean shutdown if no non-zero exit code
|
|
149
|
+
// was reported. The timeout path already sets exitCode=1 before it
|
|
150
|
+
// sends SIGKILL.
|
|
151
|
+
if (code !== null && code !== 0) {
|
|
148
152
|
exitCode = 1;
|
|
149
153
|
}
|
|
150
154
|
finishIfIdle();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterRunner.js","sourceRoot":"","sources":["../src/clusterRunner.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAe,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAC/B,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACjC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAsB3C,SAAS,mBAAmB,CAAC,KAAmB;IAC9C,MAAM,KAAK,GACT,KAAK,CAAC,KAAK,KAAK,OAAO;QACrB,CAAC,CAAC,OAAO,CAAC,KAAK;QACf,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM;YACtB,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IACpB,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,aAAa,CAAC,OAAO,GAAG,mBAAmB;IAClD,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,IAAI,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,OAA0B;IAIhD,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC;IAChD,MAAM,OAAO,GACX,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;IACpE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,UAAU,CAAC,8CAA8C,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,iBAAiB,GACrB,OAAO,CAAC,iBAAiB,IAAI,2BAA2B,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,UAAU,CAAC,gDAAgD,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACxC,CAAC;AAED,mFAAmF;AACnF,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,WAAuC,EACvC,OAAO,GAAsB,EAAE;IAE/B,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,WAAW,EAAE,CAAC;QACpB,OAAO;IACT,CAAC;IAED,MAAM,gBAAgB,CACpB,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,iBAAiB,EAC1B,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAC/B,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,WAAmB,EACnB,iBAAyB,EACzB,IAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;QAChD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;QAChD,IAAI,YAAY,GAAa,EAAE,CAAC;QAChC,IAAI,aAAyC,CAAC;QAC9C,IAAI,
|
|
1
|
+
{"version":3,"file":"clusterRunner.js","sourceRoot":"","sources":["../src/clusterRunner.ts"],"names":[],"mappings":"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"}
|
package/dist/codegen/appTypes.js
CHANGED
|
@@ -9,15 +9,18 @@ import { isPlainObject } from '../helpers/objects.js';
|
|
|
9
9
|
import { envShapeToType, extractConfigEnvShape, mergeEnvShapes, } from './astConfig.js';
|
|
10
10
|
import { isBaseModelSource } from './astModel.js';
|
|
11
11
|
import { sq } from './emit.js';
|
|
12
|
-
/** A
|
|
13
|
-
* `import('…')`.
|
|
14
|
-
*
|
|
12
|
+
/** A relative, forward-slash specifier from `dir` to `target` for the emitted
|
|
13
|
+
* `import('…')`. Targets may be in a sibling package (for example a hoisted
|
|
14
|
+
* framework install); only paths on a different volume lack a relative form. */
|
|
15
15
|
function toRelativeSpecifier(dir, target) {
|
|
16
16
|
const rel = path.relative(dir, target);
|
|
17
|
-
if (
|
|
18
|
-
throw new Error(`Model path "${target}" is
|
|
17
|
+
if (path.isAbsolute(rel)) {
|
|
18
|
+
throw new Error(`Model path "${target}" is on a different volume from the project root "${dir}"; cannot emit a relative import into genTypes.d.ts`);
|
|
19
19
|
}
|
|
20
|
-
|
|
20
|
+
const specifier = rel.split(path.sep).join('/');
|
|
21
|
+
return specifier === '..' || specifier.startsWith('../')
|
|
22
|
+
? specifier
|
|
23
|
+
: `./${specifier}`;
|
|
21
24
|
}
|
|
22
25
|
/**
|
|
23
26
|
* Render a TypeScript type from a runtime config value's **shape** — value
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appTypes.js","sourceRoot":"","sources":["../../src/codegen/appTypes.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAEL,cAAc,EACd,qBAAqB,EACrB,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAE/B;;
|
|
1
|
+
{"version":3,"file":"appTypes.js","sourceRoot":"","sources":["../../src/codegen/appTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,iIAAiI;AACjI,MAAM,UAAW,SAAQ,eAAe;IACtC,MAAM,KAAK,WAAW;QACpB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,MAAM,KAAK,gBAAgB;QACzB,OAAO;YACL,EAAE,EAAE;gBACF,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,sBAAsB;aACpC;YACD,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,6BAA6B;aAC3C;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"CreateUser.js","sourceRoot":"","sources":["../../src/commands/CreateUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,10 @@
|
|
|
1
|
-
import path from 'node:path';
|
|
2
|
-
import * as url from 'node:url';
|
|
3
1
|
import AbstractCommand from '../modules/AbstractCommand.js';
|
|
4
2
|
class SyncIndexes extends AbstractCommand {
|
|
5
3
|
async run() {
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
for (const
|
|
10
|
-
models.push(path.basename(file.file, path.extname(file.file)));
|
|
11
|
-
}
|
|
12
|
-
models = models.sort();
|
|
13
|
-
this.logger?.info(`Total found ${models.length} models`);
|
|
14
|
-
for (const modelName of models) {
|
|
15
|
-
const Model = this.app.getModelOrThrow(modelName);
|
|
4
|
+
const models = this.app.internalFilesCache.models;
|
|
5
|
+
const modelEntries = Array.from(models).sort(([a], [b]) => a.localeCompare(b));
|
|
6
|
+
this.logger?.info(`Total found ${modelEntries.length} models`);
|
|
7
|
+
for (const [modelName, Model] of modelEntries) {
|
|
16
8
|
const removedIndexes = await Model.syncIndexes(); // await in loop not a bug. Lets do one by one
|
|
17
9
|
if (removedIndexes.length) {
|
|
18
10
|
this.logger?.info(`Model - ${modelName} removed indexes: ${removedIndexes}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncIndexes.js","sourceRoot":"","sources":["../../src/commands/SyncIndexes.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SyncIndexes.js","sourceRoot":"","sources":["../../src/commands/SyncIndexes.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,WAAY,SAAQ,eAAe;IACvC,KAAK,CAAC,GAAG;QACP,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAAC;QAClD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxD,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CACnB,CAAC;QACF,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,YAAY,CAAC,MAAM,SAAS,CAAC,CAAC;QAE/D,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC;YAC9C,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,8CAA8C;YAChG,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,WAAW,SAAS,qBAAqB,cAAc,EAAE,CAC1D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,SAAS,qBAAqB,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,iOAAiO,CAAC;IAC3O,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -9,6 +9,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import * as url from 'node:url';
|
|
11
11
|
import AbstractCommand from '../../modules/AbstractCommand.js';
|
|
12
|
+
const migrationIdentity = (file) => file.replace(/\.[jt]s$/, '');
|
|
12
13
|
class Migrate extends AbstractCommand {
|
|
13
14
|
static get description() {
|
|
14
15
|
return 'Run all pending migrations';
|
|
@@ -44,12 +45,12 @@ class Migrate extends AbstractCommand {
|
|
|
44
45
|
// against the *set* of applied filenames — not the timestamp of the most
|
|
45
46
|
// recent one — means a branch-merged migration with an older timestamp is
|
|
46
47
|
// still run instead of silently skipped. Order by filename timestamp.
|
|
47
|
-
const applied = new Set(await MigrationModel.distinct('migrationFile'));
|
|
48
|
+
const applied = new Set((await MigrationModel.distinct('migrationFile')).map(migrationIdentity));
|
|
48
49
|
// Discovery is recursive, so a migration can arrive as a subfolder-relative
|
|
49
50
|
// path (`2024/1699…_x.ts`). Order by the numeric timestamp prefix of the
|
|
50
51
|
// *basename* (strip directory segments), not the whole path.
|
|
51
52
|
const pending = files
|
|
52
|
-
.filter((f) => !applied.has(f.file))
|
|
53
|
+
.filter((f) => !applied.has(migrationIdentity(f.file)))
|
|
53
54
|
.map((f) => {
|
|
54
55
|
const prefix = /^(\d+)_/.exec(path.basename(f.file));
|
|
55
56
|
return { ...f, order: prefix ? Number(prefix[1]) : NaN };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Migrate.js","sourceRoot":"","sources":["../../../src/commands/migration/Migrate.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAGhC,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,MAAM,OAAQ,SAAQ,eAAe;IACnC,MAAM,KAAK,WAAW;QACpB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAEjE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAClD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,EACvC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAClC,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CACtC,WAAW,CACa,CAAC;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAqB,CAAC;QAEhE,2EAA2E;QAC3E,6EAA6E;QAC7E,2EAA2E;QAC3E,8EAA8E;QAC9E,6EAA6E;QAC7E,6DAA6D;QAC7D,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,SAAS,CAAC,aAAa,EAAE;YACzB,cAAc,CAAC,aAAa,EAAE;SAC/B,CAAC,CAAC;QAEH,6EAA6E;QAC7E,4EAA4E;QAC5E,uEAAuE;QACvE,oCAAoC;QACpC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,wEAAwE;YACxE,qEAAqE;YACrE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,iDAAiD,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,0EAA0E;YAC1E,yEAAyE;YACzE,0EAA0E;YAC1E,sEAAsE;YACtE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Migrate.js","sourceRoot":"","sources":["../../../src/commands/migration/Migrate.ts"],"names":[],"mappings":"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"}
|
package/dist/config/http.d.ts
CHANGED
package/dist/config/http.js
CHANGED
|
@@ -39,6 +39,14 @@ export default {
|
|
|
39
39
|
maxFiles: 10,
|
|
40
40
|
maxFields: 1000,
|
|
41
41
|
maxFieldsSize: 2 * 1024 * 1024, // 2 MB of field data / JSON / urlencoded body
|
|
42
|
+
// Media types parsed as 'json' or 'urlencoded' in addition to
|
|
43
|
+
// `application/json`, any `+json` type and
|
|
44
|
+
// `application/x-www-form-urlencoded`. Keep these entries when you copy
|
|
45
|
+
// this file into your app.
|
|
46
|
+
mediaTypes: {
|
|
47
|
+
// Browsers send CSP `report-uri` violation reports as JSON.
|
|
48
|
+
'application/csp-report': 'json',
|
|
49
|
+
},
|
|
42
50
|
},
|
|
43
51
|
};
|
|
44
52
|
//# sourceMappingURL=http.js.map
|
package/dist/config/http.js.map
CHANGED
|
@@ -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;
|
|
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"}
|
|
@@ -47,6 +47,24 @@ function overridesInstanceSchema(Class) {
|
|
|
47
47
|
}
|
|
48
48
|
return false;
|
|
49
49
|
}
|
|
50
|
+
/** Collect middleware already attached to the registry path this subtree inherits. */
|
|
51
|
+
function inheritedMiddlewaresAtPath(root, path) {
|
|
52
|
+
const middlewares = [...root.middlewares];
|
|
53
|
+
let node = root;
|
|
54
|
+
for (const segment of path.split('/').filter(Boolean)) {
|
|
55
|
+
const child = segment.startsWith(':')
|
|
56
|
+
? node.paramChild
|
|
57
|
+
: segment.startsWith('*')
|
|
58
|
+
? node.splatChild
|
|
59
|
+
: node.children.get(segment.toLowerCase());
|
|
60
|
+
if (!child) {
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
node = child;
|
|
64
|
+
middlewares.push(...node.middlewares);
|
|
65
|
+
}
|
|
66
|
+
return middlewares;
|
|
67
|
+
}
|
|
50
68
|
/**
|
|
51
69
|
* Class does autoloading a http controllers
|
|
52
70
|
*/
|
|
@@ -87,15 +105,16 @@ class ControllerManager extends Base {
|
|
|
87
105
|
return instance;
|
|
88
106
|
}
|
|
89
107
|
const subtree = this.#buildSubtree(instance);
|
|
108
|
+
const mountPath = instance.getHttpPath();
|
|
90
109
|
// `skipWrap` is the codegen escape hatch — we only need the tree
|
|
91
110
|
// structure to emit types, not the runtime validation wrappers.
|
|
92
111
|
// Wrapping instantiates every middleware in every handler's chain
|
|
93
112
|
// to read schemas, which side-effects (Redis clients, timers, etc.)
|
|
94
113
|
// and keeps the event loop open for codegen-only runs.
|
|
95
114
|
if (!options.skipWrap) {
|
|
96
|
-
this.#wrapHandlersInSubtree(subtree,
|
|
115
|
+
this.#wrapHandlersInSubtree(subtree, inheritedMiddlewaresAtPath(registry.root, mountPath), instance.constructor.name);
|
|
97
116
|
}
|
|
98
|
-
registry.registerSubtree(
|
|
117
|
+
registry.registerSubtree(mountPath, subtree);
|
|
99
118
|
return instance;
|
|
100
119
|
}
|
|
101
120
|
/**
|
|
@@ -413,7 +432,11 @@ export function buildSubtreeFromSpec(spec, onWarn) {
|
|
|
413
432
|
for (const h of spec.handlers) {
|
|
414
433
|
attachHandler(subtree, h.method, h.path, h.entry);
|
|
415
434
|
}
|
|
416
|
-
const ctx = {
|
|
435
|
+
const ctx = {
|
|
436
|
+
ctrlName: spec.ctrlName,
|
|
437
|
+
onWarn,
|
|
438
|
+
methodMiddlewareCounts: new WeakMap(),
|
|
439
|
+
};
|
|
417
440
|
for (const m of spec.middleware) {
|
|
418
441
|
attachMiddlewares(subtree, m.method, m.path, m.entries, ctx);
|
|
419
442
|
}
|
|
@@ -585,15 +608,12 @@ function attachMiddlewares(subtree, method, pathStr, entries, ctx) {
|
|
|
585
608
|
return;
|
|
586
609
|
}
|
|
587
610
|
if (hasSplat) {
|
|
588
|
-
attachToMethodHandlers(target, method, entries);
|
|
611
|
+
attachToMethodHandlers(target, method, entries, ctx.methodMiddlewareCounts);
|
|
589
612
|
return;
|
|
590
613
|
}
|
|
591
614
|
const existingHandler = target.methods?.[method];
|
|
592
615
|
if (existingHandler) {
|
|
593
|
-
existingHandler
|
|
594
|
-
...entries,
|
|
595
|
-
...(existingHandler.middlewares ?? []),
|
|
596
|
-
];
|
|
616
|
+
attachMethodScopedMiddlewares(existingHandler, entries, ctx.methodMiddlewareCounts);
|
|
597
617
|
return;
|
|
598
618
|
}
|
|
599
619
|
// No handler for this method at the walked node: the scope key targets a
|
|
@@ -601,21 +621,32 @@ function attachMiddlewares(subtree, method, pathStr, entries, ctx) {
|
|
|
601
621
|
ctx?.onWarn?.(`Controller ${ctx.ctrlName}: middleware scope '${method}${pathStr}' targets a route with no ${method} handler. Middleware not attached.`);
|
|
602
622
|
}
|
|
603
623
|
/** Walk a subtree, attaching mws to every handler that matches `method`. */
|
|
604
|
-
function attachToMethodHandlers(node, method, entries) {
|
|
624
|
+
function attachToMethodHandlers(node, method, entries, methodMiddlewareCounts) {
|
|
605
625
|
const handler = node.methods?.[method];
|
|
606
626
|
if (handler) {
|
|
607
|
-
handler
|
|
627
|
+
attachMethodScopedMiddlewares(handler, entries, methodMiddlewareCounts);
|
|
608
628
|
}
|
|
609
629
|
for (const child of node.children.values()) {
|
|
610
|
-
attachToMethodHandlers(child, method, entries);
|
|
630
|
+
attachToMethodHandlers(child, method, entries, methodMiddlewareCounts);
|
|
611
631
|
}
|
|
612
632
|
if (node.paramChild) {
|
|
613
|
-
attachToMethodHandlers(node.paramChild, method, entries);
|
|
633
|
+
attachToMethodHandlers(node.paramChild, method, entries, methodMiddlewareCounts);
|
|
614
634
|
}
|
|
615
635
|
if (node.splatChild) {
|
|
616
|
-
attachToMethodHandlers(node.splatChild, method, entries);
|
|
636
|
+
attachToMethodHandlers(node.splatChild, method, entries, methodMiddlewareCounts);
|
|
617
637
|
}
|
|
618
638
|
}
|
|
639
|
+
/** Preserve Map declaration order and keep scoped middleware ahead of route middleware. */
|
|
640
|
+
function attachMethodScopedMiddlewares(handler, entries, methodMiddlewareCounts) {
|
|
641
|
+
const existing = handler.middlewares ?? [];
|
|
642
|
+
const count = methodMiddlewareCounts.get(handler) ?? 0;
|
|
643
|
+
handler.middlewares = [
|
|
644
|
+
...existing.slice(0, count),
|
|
645
|
+
...entries,
|
|
646
|
+
...existing.slice(count),
|
|
647
|
+
];
|
|
648
|
+
methodMiddlewareCounts.set(handler, count + entries.length);
|
|
649
|
+
}
|
|
619
650
|
function walkToNode(subtree, pathStr) {
|
|
620
651
|
const segments = pathStr.split('/').filter((s) => s.length > 0);
|
|
621
652
|
let target = subtree;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/crypto.js
CHANGED
|
@@ -127,6 +127,9 @@ export const verifyPassword = async (password, stored) => {
|
|
|
127
127
|
return { valid: false, needsRehash: false };
|
|
128
128
|
}
|
|
129
129
|
const storedHash = Buffer.from(hashB64, 'base64url');
|
|
130
|
+
if (storedHash.length !== SCRYPT_KEYLEN) {
|
|
131
|
+
return { valid: false, needsRehash: false };
|
|
132
|
+
}
|
|
130
133
|
const candidate = await scryptWithOptions(password + pepper, Buffer.from(saltB64, 'base64url'), storedHash.length, {
|
|
131
134
|
N: 2 ** params.ln,
|
|
132
135
|
r: params.r,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/helpers/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,QAAQ,EACR,WAAW,EACX,MAAM,EACN,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAKlC,MAAM,CAAC,CAAC;AAEV;;;GAGG;AACH,MAAM,iBAAiB,GAAG,CACxB,QAAgB,EAChB,IAAY,EACZ,MAAc,EACd,OAA4D,EAC5D,EAAE,CACF,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IACtC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QAC1D,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,UAAU,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEL,yEAAyE;AACzE,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;IAC1E,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACb,6GAA6G,CAC9G,CAAC;IACJ,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,YAAoB,EAAE,EAAE;IAChE,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;IAC1E,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,SAAS,EAAE,EAAE,UAAU,CAAC,CAAC;IACrE,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAAE,YAAoB,EAAE,EAAE;IACxE,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACpD,OAAO,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,+EAA+E;AAC/E,EAAE;AACF,oEAAoE;AACpE,4DAA4D;AAC5D,iFAAiF;AACjF,gFAAgF;AAChF,gFAAgF;AAChF,+EAA+E;AAC/E,6BAA6B;AAE7B,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,gFAAgF;AAChF,yBAAyB;AACzB,MAAM,eAAe,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AAE/C,mFAAmF;AACnF,MAAM,eAAe,GAAG,GAAG,EAAE;IAC3B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;IAC3E,OAAO,EAAE,GAAG,eAAe,EAAE,GAAG,GAAG,EAAE,CAAC;AACxC,CAAC,CAAC;AAEF,4EAA4E;AAC5E,+EAA+E;AAC/E,8EAA8E;AAC9E,+EAA+E;AAC/E,mCAAmC;AACnC,MAAM,qBAAqB,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,UAAU;AAE5D,wEAAwE;AACxE,yEAAyE;AACzE,gFAAgF;AAChF,MAAM,YAAY,GAAG,CAAC,EAAU,EAAE,CAAS,EAAE,EAAE,CAC7C,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,qBAAqB,CAAC,CAAC;AAEzD,4EAA4E;AAC5E,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IACrD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,QAAQ,GAAG,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;QAC3E,CAAC,EAAE,CAAC,IAAI,EAAE;QACV,CAAC;QACD,CAAC;QACD,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;KAC5B,CAAC,CAAC;IACH,OAAO,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CACtD,WAAW,CACZ,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;AACpC,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CACtD,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjD,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;AAE9E;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAC7D,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAExC;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,QAAgB,EAChB,MAAc,EACqC,EAAE;IACrD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,6EAA6E;IAC7E,oEAAoE;IACpE,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAE9C,uEAAuE;IACvE,4EAA4E;IAC5E,iEAAiE;IACjE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,sBAAsB,CAClC,SAAS,EACT,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CACjC,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IACvC,CAAC;IAED,8EAA8E;IAC9E,sDAAsD;IACtD,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,4EAA4E;IAC5E,2EAA2E;IAC3E,uDAAuD;IACvD,IAAI,CAAC;QACH,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/D,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QAC9C,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAC/B,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7B,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,CACqC,CAAC;QAC1C,IACE,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;YAC3B,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAC3B,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QAC9C,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,MAAM,iBAAiB,CACvC,QAAQ,GAAG,MAAM,EACjB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EACjC,UAAU,CAAC,MAAM,EACjB;YACE,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,EAAE;YACjB,CAAC,EAAE,MAAM,CAAC,CAAC;YACX,CAAC,EAAE,MAAM,CAAC,CAAC;YACX,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;SAC1C,CACF,CAAC;QACF,MAAM,KAAK,GAAG,sBAAsB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;QACjC,MAAM,WAAW,GACf,KAAK;YACL,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;AACH,CAAC,CAAC;AAEF,gFAAgF;AAChF,8CAA8C;AAC9C,IAAI,gBAAgB,GAA2B,IAAI,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,QAAgB,EAAiB,EAAE;IAC1E,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,gBAAgB,GAAG,YAAY,CAAC,4BAA4B,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC;QACH,MAAM,cAAc,CAAC,QAAQ,EAAE,MAAM,gBAAgB,CAAC,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,0DAA0D;IAC5D,CAAC;AACH,CAAC,CAAC;AAEF,+EAA+E;AAC/E,EAAE;AACF,0EAA0E;AAC1E,yEAAyE;AACzE,+EAA+E;AAC/E,0EAA0E;AAC1E,4EAA4E;AAE5E,4EAA4E;AAC5E,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,OAAe,EAAE,EAAE;IACpD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,cAAc,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7E,OAAO,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;AACvE,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,OAAO,EAAuB,EAAE,EAAE,CAC5E,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAEnD,0EAA0E;AAC1E,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,KAAa,EACb,MAAc,EACd,EAAE,OAAO,EAAuB,EAChC,EAAE,CACF,sBAAsB,CACpB,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,EAC1B,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CACjC,CAAC"}
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/helpers/crypto.ts"],"names":[],"mappings":"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"}
|