@adaptivestone/framework 5.1.2 → 5.1.3
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 +53 -1
- package/dist/Cli.js +4 -4
- package/dist/Cli.js.map +1 -1
- package/dist/cluster.js +1 -1
- package/dist/codegen/appTypes.js +7 -6
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/astEmit.js +15 -8
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/astExtract.js +33 -24
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/astModel.js +2 -2
- package/dist/codegen/astResolve.js +3 -3
- package/dist/codegen/astSpec.js +2 -2
- package/dist/codegen/collectMetadata.d.ts +12 -0
- package/dist/codegen/emit.d.ts +10 -3
- package/dist/codegen/emit.js +50 -6
- package/dist/codegen/emit.js.map +1 -1
- package/dist/codegen/index.js +2 -2
- package/dist/codegen/index.js.map +1 -1
- package/dist/commands/CreateUser.d.ts +10 -10
- package/dist/commands/CreateUser.js +1 -1
- package/dist/commands/DropIndex.d.ts +1 -1
- package/dist/commands/DropIndex.js +1 -1
- package/dist/commands/GenerateRandomBytes.js +1 -1
- package/dist/commands/GenerateRandomBytes.js.map +1 -1
- package/dist/commands/GenerateTypes.d.ts +1 -1
- package/dist/commands/GenerateTypes.js +5 -5
- package/dist/commands/GenerateTypes.js.map +1 -1
- package/dist/commands/OpenApi.d.ts +1 -1
- package/dist/commands/OpenApi.js +4 -4
- package/dist/commands/OpenApi.js.map +1 -1
- package/dist/commands/Routes.js +4 -4
- package/dist/commands/Routes.js.map +1 -1
- package/dist/commands/SyncIndexes.js +1 -1
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Create.d.ts +1 -1
- package/dist/commands/migration/Create.js +1 -1
- package/dist/commands/migration/Migrate.js +25 -3
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/config/cache.d.ts +1 -1
- package/dist/config/log.js +1 -1
- package/dist/controllers/Auth.js +54 -15
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Home.js +1 -1
- package/dist/controllers/index.d.ts +13 -1
- package/dist/controllers/index.js +64 -48
- package/dist/controllers/index.js.map +1 -1
- package/dist/folderConfig.js +2 -1
- package/dist/folderConfig.js.map +1 -1
- package/dist/helpers/crypto.js +1 -1
- package/dist/helpers/logger.d.ts +1 -1
- package/dist/helpers/redis/redisConnection.js +1 -1
- package/dist/index.js +2 -2
- package/dist/models/KeyValue.js +1 -1
- package/dist/models/Lock.js +18 -8
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/Migration.js +1 -1
- package/dist/models/Sequence.js +1 -1
- package/dist/models/User.d.ts +3 -3
- package/dist/models/User.js +3 -3
- package/dist/models/UserOld.d.ts +10 -10
- package/dist/models/UserOld.js +17 -8
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/AbstractCommand.js +1 -1
- package/dist/modules/AbstractCommand.js.map +1 -1
- package/dist/modules/AbstractConnector.js +1 -1
- package/dist/modules/AbstractController.js +3 -3
- package/dist/modules/AbstractModel.js +1 -1
- package/dist/modules/Base.js +2 -2
- package/dist/modules/BaseCli.d.ts +1 -1
- package/dist/modules/BaseCli.js +5 -2
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.d.ts +1 -1
- package/dist/server.js +34 -17
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +9 -7
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/MemoryDriver.js +6 -0
- package/dist/services/cache/drivers/MemoryDriver.js.map +1 -1
- package/dist/services/cache/drivers/RedisDriver.js +1 -1
- package/dist/services/documentation/OpenApiGenerator.js +54 -7
- package/dist/services/documentation/OpenApiGenerator.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +6 -1
- package/dist/services/http/HttpServer.js +16 -11
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/builtinErrorHandlers.js +1 -1
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/AbstractMiddleware.js +1 -1
- package/dist/services/http/middleware/Auth.js +1 -1
- package/dist/services/http/middleware/Cors.js +6 -2
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/GetUserByToken.d.ts +10 -2
- package/dist/services/http/middleware/GetUserByToken.js +29 -12
- package/dist/services/http/middleware/GetUserByToken.js.map +1 -1
- package/dist/services/http/middleware/I18n.js +1 -1
- package/dist/services/http/middleware/IpDetector.js +1 -1
- package/dist/services/http/middleware/Pagination.d.ts +1 -1
- package/dist/services/http/middleware/Pagination.js +2 -2
- package/dist/services/http/middleware/PrepareAppInfo.js +8 -2
- package/dist/services/http/middleware/PrepareAppInfo.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.js +2 -2
- package/dist/services/http/middleware/RequestLogger.js +1 -1
- package/dist/services/http/middleware/RequestParser.js +1 -1
- package/dist/services/http/middleware/Role.js +1 -1
- package/dist/services/http/routing/ExpressAdapter.js +9 -1
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/RouteNode.d.ts +1 -1
- package/dist/services/http/routing/RouteRegistry.d.ts +7 -0
- package/dist/services/http/routing/RouteRegistry.js +8 -2
- package/dist/services/http/routing/RouteRegistry.js.map +1 -1
- package/dist/services/http/routing/formatTree.js.map +1 -1
- package/dist/services/i18n/I18n.js +1 -1
- package/dist/services/logging/SentryTransport.js.map +1 -1
- package/dist/services/validate/ValidateService.js +4 -4
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/drivers/StandardSchemaDriver.js +1 -1
- package/dist/services/validate/drivers/YupDriver.js +1 -1
- package/dist/services/validate/drivers/YupDriver.js.map +1 -1
- package/dist/tests/frameworkVitestSetup.js +1 -1
- package/dist/tests/globalSetupNodeTest.js +1 -1
- package/dist/tests/globalSetupVitest.js +1 -1
- package/dist/tests/nodeRunner.node-test.js +3 -3
- package/dist/tests/nodeRunnerShared.node-test.js +2 -2
- package/dist/tests/setupFramework.js +3 -3
- package/dist/tests/setupFramework.js.map +1 -1
- package/dist/tests/setupNodeTest.js +1 -1
- package/dist/tests/setupVitest.js +1 -1
- package/dist/tests/testHelpers.d.ts +16 -16
- package/dist/tests/testHelpers.js +1 -1
- package/dist/types.js +1 -1
- package/package.json +4 -5
|
@@ -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/controllers/Home.js
CHANGED
|
@@ -89,7 +89,19 @@ export interface ControllerSubtreeSpec {
|
|
|
89
89
|
* attachments find them). This is the single home of tree/scope semantics —
|
|
90
90
|
* runtime and codegen both reach it through here.
|
|
91
91
|
*/
|
|
92
|
-
export declare function buildSubtreeFromSpec(spec: ControllerSubtreeSpec): RouteNode;
|
|
92
|
+
export declare function buildSubtreeFromSpec(spec: ControllerSubtreeSpec, onWarn?: (msg: string) => void): RouteNode;
|
|
93
|
+
/**
|
|
94
|
+
* Controller discovery order: index files first (so root-level
|
|
95
|
+
* routes/middleware accumulate before nested ones), and among index files the
|
|
96
|
+
* shallower one first (root `index` before nested `sub/index`). Consistent and
|
|
97
|
+
* antisymmetric per ECMA-262; non-index pairs compare equal and rely on
|
|
98
|
+
* `Array.prototype.sort` stability to keep discovery order.
|
|
99
|
+
*/
|
|
100
|
+
export declare function compareControllerLoadOrder(a: {
|
|
101
|
+
file: string;
|
|
102
|
+
}, b: {
|
|
103
|
+
file: string;
|
|
104
|
+
}): number;
|
|
93
105
|
/**
|
|
94
106
|
* `'POST/login'` → method=POST,path=/login · `'/login'` → method=ALL,path=/login
|
|
95
107
|
*
|
|
@@ -8,15 +8,16 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
8
8
|
};
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import * as url from 'node:url';
|
|
11
|
-
import { makeOncePerClassWarner } from
|
|
12
|
-
import Base from
|
|
13
|
-
import { toLoggableError } from
|
|
14
|
-
import AbstractMiddleware from
|
|
15
|
-
import { normalizeMiddlewares, } from
|
|
16
|
-
import { HTTP_METHODS } from
|
|
17
|
-
import { createNode } from
|
|
18
|
-
import { isContentTypeRequestMap, normalizeContentType, } from
|
|
19
|
-
import ValidateService from
|
|
11
|
+
import { makeOncePerClassWarner } from '../helpers/deprecation.js';
|
|
12
|
+
import Base from '../modules/Base.js';
|
|
13
|
+
import { toLoggableError } from '../services/http/builtinErrorHandlers.js';
|
|
14
|
+
import AbstractMiddleware from '../services/http/middleware/AbstractMiddleware.js';
|
|
15
|
+
import { normalizeMiddlewares, } from '../services/http/routing/middlewareNormalization.js';
|
|
16
|
+
import { HTTP_METHODS } from '../services/http/routing/RouteNode.js';
|
|
17
|
+
import { createNode, ensureChildBySegment, } from '../services/http/routing/RouteRegistry.js';
|
|
18
|
+
import { isContentTypeRequestMap, normalizeContentType, } from '../services/validate/contentType.js';
|
|
19
|
+
import ValidateService from '../services/validate/ValidateService.js';
|
|
20
|
+
import { ValidationError } from '../services/validate/ValidationError.js';
|
|
20
21
|
/** HTTP methods valid in a controller's `routes` getter (no `'ALL'`). */
|
|
21
22
|
const ROUTE_HTTP_METHODS = new Set(HTTP_METHODS);
|
|
22
23
|
/** HTTP methods plus the `'ALL'` pseudo-verb for middleware-Map scope keys. */
|
|
@@ -108,17 +109,7 @@ class ControllerManager extends Base {
|
|
|
108
109
|
const dirname = url.fileURLToPath(new URL('.', import.meta.url));
|
|
109
110
|
const controllersToLoad = await this.getFilesPathWithInheritance(dirname, this.app.foldersConfig.controllers);
|
|
110
111
|
// Index files first so root-level routes/middleware land before nested ones.
|
|
111
|
-
controllersToLoad.sort(
|
|
112
|
-
if (a.file.toLowerCase().endsWith('index.js') ||
|
|
113
|
-
a.file.toLowerCase().endsWith('index.ts')) {
|
|
114
|
-
if (b.file.toLowerCase().endsWith('index.js') ||
|
|
115
|
-
b.file.toLowerCase().endsWith('index.ts')) {
|
|
116
|
-
return 0;
|
|
117
|
-
}
|
|
118
|
-
return -1;
|
|
119
|
-
}
|
|
120
|
-
return 0;
|
|
121
|
-
});
|
|
112
|
+
controllersToLoad.sort(compareControllerLoadOrder);
|
|
122
113
|
return Promise.all(controllersToLoad.map(async ({ path: modulePath, file }) => {
|
|
123
114
|
const { default: ControllerClass } = await import(__rewriteRelativeImportExtension(modulePath));
|
|
124
115
|
const dir = path.dirname(file);
|
|
@@ -148,7 +139,7 @@ class ControllerManager extends Base {
|
|
|
148
139
|
* semantics live entirely in the assembler — there is no parallel builder.
|
|
149
140
|
*/
|
|
150
141
|
#buildSubtree(controller) {
|
|
151
|
-
return buildSubtreeFromSpec(this.#specFromInstance(controller));
|
|
142
|
+
return buildSubtreeFromSpec(this.#specFromInstance(controller), (msg) => this.logger?.warn(msg));
|
|
152
143
|
}
|
|
153
144
|
/**
|
|
154
145
|
* Read a controller instance into a plain `ControllerSubtreeSpec`: walk the
|
|
@@ -344,8 +335,25 @@ class ControllerManager extends Base {
|
|
|
344
335
|
if (res.headersSent) {
|
|
345
336
|
return next(err);
|
|
346
337
|
}
|
|
347
|
-
|
|
348
|
-
|
|
338
|
+
// Only a framework `ValidationError` is a client 400 — its widened
|
|
339
|
+
// `.message` is the per-field payload. Anything else thrown while
|
|
340
|
+
// validating is a server-side defect (a validator that threw; a schema
|
|
341
|
+
// no driver matches): route it through the error-handler registry, same
|
|
342
|
+
// as the handler catch below, so consumer handlers apply consistently;
|
|
343
|
+
// otherwise a generic 500 with the detail LOGGED, never echoed.
|
|
344
|
+
if (ValidationError.isValidationError(err)) {
|
|
345
|
+
return res.status(400).json({ errors: err.message });
|
|
346
|
+
}
|
|
347
|
+
const resolved = app.httpServer
|
|
348
|
+
? await app.httpServer.resolveError(err, req)
|
|
349
|
+
: null;
|
|
350
|
+
if (resolved) {
|
|
351
|
+
logger?.[resolved.logLevel](toLoggableError(err));
|
|
352
|
+
return res.status(resolved.status).json(resolved.body);
|
|
353
|
+
}
|
|
354
|
+
logger?.error(err);
|
|
355
|
+
return res.status(500).json({
|
|
356
|
+
message: 'Platform error. Please check later or contact support',
|
|
349
357
|
});
|
|
350
358
|
}
|
|
351
359
|
try {
|
|
@@ -394,17 +402,41 @@ class ControllerManager extends Base {
|
|
|
394
402
|
* attachments find them). This is the single home of tree/scope semantics —
|
|
395
403
|
* runtime and codegen both reach it through here.
|
|
396
404
|
*/
|
|
397
|
-
export function buildSubtreeFromSpec(spec) {
|
|
405
|
+
export function buildSubtreeFromSpec(spec, onWarn) {
|
|
398
406
|
const subtree = createNode('');
|
|
399
407
|
for (const h of spec.handlers) {
|
|
400
408
|
attachHandler(subtree, h.method, h.path, h.entry);
|
|
401
409
|
}
|
|
410
|
+
const ctx = { ctrlName: spec.ctrlName, onWarn };
|
|
402
411
|
for (const m of spec.middleware) {
|
|
403
|
-
attachMiddlewares(subtree, m.method, m.path, m.entries);
|
|
412
|
+
attachMiddlewares(subtree, m.method, m.path, m.entries, ctx);
|
|
404
413
|
}
|
|
405
414
|
return subtree;
|
|
406
415
|
}
|
|
407
416
|
// ─── translation helpers (file-local) ────────────────────────────────
|
|
417
|
+
/**
|
|
418
|
+
* A controller module named `index.(ts|js)` at any folder depth. Discovery
|
|
419
|
+
* joins paths with `path.join`, so accept both `/` and `\` separators.
|
|
420
|
+
*/
|
|
421
|
+
const isIndexFile = (file) => /(^|[\\/])index\.(js|ts)$/i.test(file);
|
|
422
|
+
/** Folder depth of a discovered `file` path (number of `/` or `\` separators). */
|
|
423
|
+
const fileDepth = (file) => file.match(/[\\/]/g)?.length ?? 0;
|
|
424
|
+
/**
|
|
425
|
+
* Controller discovery order: index files first (so root-level
|
|
426
|
+
* routes/middleware accumulate before nested ones), and among index files the
|
|
427
|
+
* shallower one first (root `index` before nested `sub/index`). Consistent and
|
|
428
|
+
* antisymmetric per ECMA-262; non-index pairs compare equal and rely on
|
|
429
|
+
* `Array.prototype.sort` stability to keep discovery order.
|
|
430
|
+
*/
|
|
431
|
+
export function compareControllerLoadOrder(a, b) {
|
|
432
|
+
const byIndex = Number(isIndexFile(b.file)) - Number(isIndexFile(a.file));
|
|
433
|
+
if (byIndex !== 0) {
|
|
434
|
+
return byIndex;
|
|
435
|
+
}
|
|
436
|
+
// Both index or both non-index. Order index files by depth (root first);
|
|
437
|
+
// leave non-index pairs equal so the stable sort preserves discovery order.
|
|
438
|
+
return isIndexFile(a.file) ? fileDepth(a.file) - fileDepth(b.file) : 0;
|
|
439
|
+
}
|
|
408
440
|
/**
|
|
409
441
|
* `'POST/login'` → method=POST,path=/login · `'/login'` → method=ALL,path=/login
|
|
410
442
|
*
|
|
@@ -504,7 +536,7 @@ function attachHandler(subtree, method, pathStr, entry) {
|
|
|
504
536
|
* - `METHOD` + splat (e.g. `'PUT/{*splat}'`) → walk the subtree at the
|
|
505
537
|
* splat's parent and attach to every handler that matches the method.
|
|
506
538
|
*/
|
|
507
|
-
function attachMiddlewares(subtree, method, pathStr, entries) {
|
|
539
|
+
function attachMiddlewares(subtree, method, pathStr, entries, ctx) {
|
|
508
540
|
const segments = pathStr.split('/').filter((s) => s.length > 0);
|
|
509
541
|
const hasSplat = segments.length > 0 && segments[segments.length - 1]?.startsWith('*');
|
|
510
542
|
if (hasSplat) {
|
|
@@ -512,7 +544,7 @@ function attachMiddlewares(subtree, method, pathStr, entries) {
|
|
|
512
544
|
}
|
|
513
545
|
let target = subtree;
|
|
514
546
|
for (const seg of segments) {
|
|
515
|
-
target =
|
|
547
|
+
target = ensureChildBySegment(target, seg);
|
|
516
548
|
}
|
|
517
549
|
if (method === 'ALL') {
|
|
518
550
|
target.middlewares.push(...entries);
|
|
@@ -528,7 +560,11 @@ function attachMiddlewares(subtree, method, pathStr, entries) {
|
|
|
528
560
|
...entries,
|
|
529
561
|
...(existingHandler.middlewares ?? []),
|
|
530
562
|
];
|
|
563
|
+
return;
|
|
531
564
|
}
|
|
565
|
+
// No handler for this method at the walked node: the scope key targets a
|
|
566
|
+
// route that doesn't exist, so its middleware would attach to nothing.
|
|
567
|
+
ctx?.onWarn?.(`Controller ${ctx.ctrlName}: middleware scope '${method}${pathStr}' targets a route with no ${method} handler. Middleware not attached.`);
|
|
532
568
|
}
|
|
533
569
|
/** Walk a subtree, attaching mws to every handler that matches `method`. */
|
|
534
570
|
function attachToMethodHandlers(node, method, entries) {
|
|
@@ -550,29 +586,9 @@ function walkToNode(subtree, pathStr) {
|
|
|
550
586
|
const segments = pathStr.split('/').filter((s) => s.length > 0);
|
|
551
587
|
let target = subtree;
|
|
552
588
|
for (const seg of segments) {
|
|
553
|
-
target =
|
|
589
|
+
target = ensureChildBySegment(target, seg);
|
|
554
590
|
}
|
|
555
591
|
return target;
|
|
556
592
|
}
|
|
557
|
-
function ensureChildSegment(node, segment) {
|
|
558
|
-
if (segment.startsWith(':')) {
|
|
559
|
-
if (!node.paramChild) {
|
|
560
|
-
node.paramChild = createNode(segment);
|
|
561
|
-
}
|
|
562
|
-
return node.paramChild;
|
|
563
|
-
}
|
|
564
|
-
if (segment.startsWith('*')) {
|
|
565
|
-
if (!node.splatChild) {
|
|
566
|
-
node.splatChild = createNode(segment);
|
|
567
|
-
}
|
|
568
|
-
return node.splatChild;
|
|
569
|
-
}
|
|
570
|
-
let child = node.children.get(segment);
|
|
571
|
-
if (!child) {
|
|
572
|
-
child = createNode(segment);
|
|
573
|
-
node.children.set(segment, child);
|
|
574
|
-
}
|
|
575
|
-
return child;
|
|
576
|
-
}
|
|
577
593
|
export default ControllerManager;
|
|
578
594
|
//# sourceMappingURL=index.js.map
|
|
@@ -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/folderConfig.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
-
|
|
2
|
+
import { fileURLToPath } from 'node:url';
|
|
3
|
+
const basePath = fileURLToPath(new URL('.', import.meta.url));
|
|
3
4
|
export default {
|
|
4
5
|
folders: {
|
|
5
6
|
config: path.resolve(basePath, './config'),
|
package/dist/folderConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folderConfig.js","sourceRoot":"","sources":["../src/folderConfig.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"folderConfig.js","sourceRoot":"","sources":["../src/folderConfig.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE9D,eAAe;IACb,OAAO,EAAE;QACP,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC;QAC1C,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC;QAC1C,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC;QACpD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,sCAAsC,CAAC;QACtE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC;QAC9C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC;KACnD;CACF,CAAC"}
|
package/dist/helpers/crypto.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { randomBytes, scrypt, timingSafeEqual } from 'node:crypto';
|
|
2
2
|
import { promisify } from 'node:util';
|
|
3
|
-
import { appInstance } from
|
|
3
|
+
import { appInstance } from './appInstance.js';
|
|
4
4
|
export const scryptAsync = promisify(scrypt);
|
|
5
5
|
/**
|
|
6
6
|
* scrypt with explicit cost options. The 3-arg `scryptAsync` above cannot pass
|
package/dist/helpers/logger.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type winston from 'winston';
|
|
2
|
-
declare const levels: readonly [
|
|
2
|
+
declare const levels: readonly ['error', 'warn', 'info', 'debug'];
|
|
3
3
|
type LogLevel = (typeof levels)[number];
|
|
4
4
|
declare const noopLogger: winston.Logger;
|
|
5
5
|
declare const consoleLogger: (level: LogLevel, message: string) => void;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createClient } from '@redis/client';
|
|
2
|
-
import { appInstance } from
|
|
2
|
+
import { appInstance } from '../appInstance.js';
|
|
3
3
|
// Cache the CONNECT PROMISE, not the bare client. Caching the bare client let a
|
|
4
4
|
// second concurrent caller get it before `connect()` resolved (double-connect),
|
|
5
5
|
// and a failed first connect cached a dead client forever. `redisClient` is kept
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import folderConfig from
|
|
2
|
-
import Server from
|
|
1
|
+
import folderConfig from './folderConfig.js';
|
|
2
|
+
import Server from './server.js';
|
|
3
3
|
const server = new Server(folderConfig);
|
|
4
4
|
server.startServer().catch((e) => {
|
|
5
5
|
console.error('Failed to start server:', e);
|
package/dist/models/KeyValue.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Schema } from 'mongoose';
|
|
2
|
-
import { BaseModel } from
|
|
2
|
+
import { BaseModel } from '../modules/BaseModel.js';
|
|
3
3
|
/**
|
|
4
4
|
* Simple key/value storage backed by MongoDB.
|
|
5
5
|
* Handy as a lightweight persistent cache, runtime config, feature flags, etc.
|
package/dist/models/Lock.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BaseModel } from
|
|
1
|
+
import { BaseModel } from '../modules/BaseModel.js';
|
|
2
2
|
class Lock extends BaseModel {
|
|
3
3
|
static initHooks(schema) {
|
|
4
4
|
schema.index({ expiredAt: 1 }, { expireAfterSeconds: 0 });
|
|
@@ -65,22 +65,32 @@ class Lock extends BaseModel {
|
|
|
65
65
|
* @param {number} [timeoutMs] reject after this many ms if still locked
|
|
66
66
|
*/
|
|
67
67
|
waitForUnlock: async function (name, timeoutMs) {
|
|
68
|
-
//
|
|
69
|
-
//
|
|
70
|
-
//
|
|
68
|
+
// The driver opens the change-stream cursor lazily on the first
|
|
69
|
+
// 'change' listener and only then fixes its server-side start point.
|
|
70
|
+
// Checking existence BEFORE that point leaves a window where a delete
|
|
71
|
+
// is missed forever. So: attach the listener (opening the cursor),
|
|
72
|
+
// wait for 'resumeTokenChanged' — the wrapper's first signal that the
|
|
73
|
+
// aggregate has run and the start point is fixed — and only then read.
|
|
74
|
+
// A delete after that point is guaranteed observed; if the lock is
|
|
75
|
+
// already gone, the re-check resolves.
|
|
71
76
|
const stream = this.watch([
|
|
72
77
|
{ $match: { operationType: 'delete', 'documentKey._id': name } },
|
|
73
78
|
]);
|
|
74
79
|
try {
|
|
75
|
-
const exists = await this.findOne({ _id: name });
|
|
76
|
-
if (!exists) {
|
|
77
|
-
return undefined;
|
|
78
|
-
}
|
|
79
80
|
return await new Promise((resolve, reject) => {
|
|
80
81
|
stream.on('change', () => resolve(true));
|
|
81
82
|
// A standalone Mongo (change streams need a replica set) or a stream
|
|
82
83
|
// failure emits 'error'; unhandled, it would crash the process.
|
|
83
84
|
stream.on('error', reject);
|
|
85
|
+
stream.once('resumeTokenChanged', () => {
|
|
86
|
+
this.findOne({ _id: name })
|
|
87
|
+
.then((exists) => {
|
|
88
|
+
if (!exists) {
|
|
89
|
+
resolve(undefined);
|
|
90
|
+
}
|
|
91
|
+
})
|
|
92
|
+
.catch(reject);
|
|
93
|
+
});
|
|
84
94
|
if (timeoutMs) {
|
|
85
95
|
setTimeout(() => reject(new Error(`waitForUnlock('${name}') timed out`)), timeoutMs).unref();
|
|
86
96
|
}
|
package/dist/models/Lock.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Lock.js","sourceRoot":"","sources":["../../src/models/Lock.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD,MAAM,IAAK,SAAQ,SAAS;IAC1B,MAAM,CAAC,SAAS,CAAC,MAAc;QAC7B,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO;YACL,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrC,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;aACX;SACO,CAAC;IACb,CAAC;IAED,MAAM,KAAK,YAAY;QAMrB,OAAO;YACL;;;;;;;;eAQG;YACH,WAAW,EAAE,KAAK,WAEhB,IAAY,EACZ,UAAU,GAAG,EAAE;gBAEf,IAAI,CAAC;oBACH,mEAAmE;oBACnE,wEAAwE;oBACxE,qEAAqE;oBACrE,wEAAwE;oBACxE,kEAAkE;oBAClE,MAAM,IAAI,CAAC,gBAAgB,CACzB;wBACE,GAAG,EAAE,IAAI;wBACT,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;qBAC/D,EACD,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC,EAAE,EACvD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACxB,IAAK,KAAoB,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;wBACzC,oDAAoD;wBACpD,MAAM,KAAK,CAAC;oBACd,CAAC;oBACD,iDAAiD;oBACjD,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED;;;;;;eAMG;YACH,WAAW,EAAE,KAAK,WAAgC,IAAY;gBAC5D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChD,IAAI,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;oBACzC,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YAED;;;;;eAKG;YACH,aAAa,EAAE,KAAK,WAElB,IAAY,EACZ,SAAkB;gBAElB,sEAAsE;gBACtE,
|
|
1
|
+
{"version":3,"file":"Lock.js","sourceRoot":"","sources":["../../src/models/Lock.ts"],"names":[],"mappings":"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"}
|
package/dist/models/Migration.js
CHANGED
package/dist/models/Sequence.js
CHANGED
package/dist/models/User.d.ts
CHANGED
|
@@ -142,7 +142,7 @@ declare class User extends BaseModel {
|
|
|
142
142
|
readonly unique: true;
|
|
143
143
|
readonly partialFilterExpression: {
|
|
144
144
|
readonly 'name.nick': {
|
|
145
|
-
readonly $type:
|
|
145
|
+
readonly $type: 'string';
|
|
146
146
|
};
|
|
147
147
|
};
|
|
148
148
|
};
|
|
@@ -156,7 +156,7 @@ declare class User extends BaseModel {
|
|
|
156
156
|
readonly unique: true;
|
|
157
157
|
readonly partialFilterExpression: {
|
|
158
158
|
readonly email: {
|
|
159
|
-
readonly $type:
|
|
159
|
+
readonly $type: 'string';
|
|
160
160
|
};
|
|
161
161
|
};
|
|
162
162
|
};
|
|
@@ -181,7 +181,7 @@ declare class User extends BaseModel {
|
|
|
181
181
|
};
|
|
182
182
|
readonly locale: {
|
|
183
183
|
readonly type: StringConstructor;
|
|
184
|
-
readonly default:
|
|
184
|
+
readonly default: 'en';
|
|
185
185
|
};
|
|
186
186
|
readonly languages: readonly [StringConstructor];
|
|
187
187
|
};
|
package/dist/models/User.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createHash, randomBytes } from 'node:crypto';
|
|
2
|
-
import { appInstance } from
|
|
3
|
-
import { burnPasswordVerify, hashPassword, verifyPassword, } from
|
|
4
|
-
import { BaseModel } from
|
|
2
|
+
import { appInstance } from '../helpers/appInstance.js';
|
|
3
|
+
import { burnPasswordVerify, hashPassword, verifyPassword, } from '../helpers/crypto.js';
|
|
4
|
+
import { BaseModel } from '../modules/BaseModel.js';
|
|
5
5
|
/** A fresh, unguessable bearer token (43-char base64url, 256 bits). */
|
|
6
6
|
const createRandomToken = () => randomBytes(32).toString('base64url');
|
|
7
7
|
/**
|
package/dist/models/UserOld.d.ts
CHANGED
|
@@ -122,9 +122,9 @@ declare class UserOld extends AbstractModel<IUser, IAbstractModelMethods<IUser>,
|
|
|
122
122
|
_id: import("mongoose").Types.ObjectId;
|
|
123
123
|
} & {
|
|
124
124
|
__v: number;
|
|
125
|
-
}, "
|
|
125
|
+
}, "getSuper" | "id"> & import("mongoose").HydratedDocumentOverrides<IAbstractModelMethods<IUser> & {
|
|
126
126
|
id: string;
|
|
127
|
-
})>;
|
|
127
|
+
}>)>;
|
|
128
128
|
generateToken(this: InstanceType<UserOld['mongooseModel']>): Promise<{
|
|
129
129
|
token: string;
|
|
130
130
|
valid: Date;
|
|
@@ -147,16 +147,16 @@ declare class UserOld extends AbstractModel<IUser, IAbstractModelMethods<IUser>,
|
|
|
147
147
|
_id: import("mongoose").Types.ObjectId;
|
|
148
148
|
} & {
|
|
149
149
|
__v: number;
|
|
150
|
-
}, "
|
|
150
|
+
}, "getSuper" | "id"> & import("mongoose").HydratedDocumentOverrides<IAbstractModelMethods<IUser> & {
|
|
151
151
|
id: string;
|
|
152
|
-
})>;
|
|
152
|
+
}>)>;
|
|
153
153
|
static getUserByEmail(this: UserOld['mongooseModel'], email: string): Promise<false | (import("mongoose").Document<unknown, object, IUser, {}, import("mongoose").DefaultSchemaOptions> & Omit<IUser & {
|
|
154
154
|
_id: import("mongoose").Types.ObjectId;
|
|
155
155
|
} & {
|
|
156
156
|
__v: number;
|
|
157
|
-
}, "
|
|
157
|
+
}, "getSuper" | "id"> & import("mongoose").HydratedDocumentOverrides<IAbstractModelMethods<IUser> & {
|
|
158
158
|
id: string;
|
|
159
|
-
})>;
|
|
159
|
+
}>)>;
|
|
160
160
|
static generateUserPasswordRecoveryToken(userMongoose: InstanceType<UserOld['mongooseModel']>): Promise<{
|
|
161
161
|
token: string;
|
|
162
162
|
until: number;
|
|
@@ -165,9 +165,9 @@ declare class UserOld extends AbstractModel<IUser, IAbstractModelMethods<IUser>,
|
|
|
165
165
|
_id: import("mongoose").Types.ObjectId;
|
|
166
166
|
} & {
|
|
167
167
|
__v: number;
|
|
168
|
-
}, "
|
|
168
|
+
}, "getSuper" | "id"> & import("mongoose").HydratedDocumentOverrides<IAbstractModelMethods<IUser> & {
|
|
169
169
|
id: string;
|
|
170
|
-
}
|
|
170
|
+
}>>;
|
|
171
171
|
sendPasswordRecoveryEmail(this: InstanceType<UserOld['mongooseModel']>, i18n: {
|
|
172
172
|
t: TFunction;
|
|
173
173
|
language: string;
|
|
@@ -180,9 +180,9 @@ declare class UserOld extends AbstractModel<IUser, IAbstractModelMethods<IUser>,
|
|
|
180
180
|
_id: import("mongoose").Types.ObjectId;
|
|
181
181
|
} & {
|
|
182
182
|
__v: number;
|
|
183
|
-
}, "
|
|
183
|
+
}, "getSuper" | "id"> & import("mongoose").HydratedDocumentOverrides<IAbstractModelMethods<IUser> & {
|
|
184
184
|
id: string;
|
|
185
|
-
}
|
|
185
|
+
}>>;
|
|
186
186
|
sendVerificationEmail(this: InstanceType<UserOld['mongooseModel']>, i18n: {
|
|
187
187
|
t: TFunction;
|
|
188
188
|
language: string;
|