@adaptivestone/framework 5.1.2 → 5.1.4
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 +66 -1
- package/dist/Cli.js +4 -4
- package/dist/Cli.js.map +1 -1
- package/dist/cluster.d.ts +3 -1
- package/dist/cluster.js +8 -64
- package/dist/cluster.js.map +1 -1
- package/dist/clusterRunner.d.ts +16 -0
- package/dist/clusterRunner.js +180 -0
- package/dist/clusterRunner.js.map +1 -0
- 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 +6 -6
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;
|
package/dist/models/UserOld.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
import { appInstance } from
|
|
2
|
-
import { scryptAsync } from
|
|
3
|
-
import AbstractModel from
|
|
1
|
+
import { appInstance } from '../helpers/appInstance.js';
|
|
2
|
+
import { burnPasswordVerify, scryptAsync } from '../helpers/crypto.js';
|
|
3
|
+
import AbstractModel from '../modules/AbstractModel.js';
|
|
4
4
|
/**
|
|
5
5
|
* @deprecated Use the `User` model instead. `UserOld` is kept for v5 and will be
|
|
6
6
|
* **removed in v6**.
|
|
7
7
|
*/
|
|
8
8
|
class UserOld extends AbstractModel {
|
|
9
9
|
constructor(app) {
|
|
10
|
-
|
|
10
|
+
process.emitWarning('UserOld is deprecated and will be removed in v6 — migrate to the User model. ' +
|
|
11
|
+
'SECURITY: UserOld implements known-weak legacy auth (timing-unsafe password ' +
|
|
12
|
+
'compare, no per-user salt, plaintext non-expiring session tokens).', { type: 'DeprecationWarning', code: 'ASF_DEP_USEROLD' });
|
|
11
13
|
super(app);
|
|
12
14
|
}
|
|
13
15
|
initHooks() {
|
|
@@ -65,6 +67,9 @@ class UserOld extends AbstractModel {
|
|
|
65
67
|
static async getUserByEmailAndPassword(email, password) {
|
|
66
68
|
const data = await this.findOne({ email: String(email) });
|
|
67
69
|
if (!data) {
|
|
70
|
+
// Equalize timing with the hash path below: an unknown email must not be
|
|
71
|
+
// distinguishable from a wrong password by response latency.
|
|
72
|
+
await burnPasswordVerify(password);
|
|
68
73
|
return false;
|
|
69
74
|
}
|
|
70
75
|
const hashedPasswords = await this.hashPassword(password);
|
|
@@ -134,13 +139,15 @@ class UserOld extends AbstractModel {
|
|
|
134
139
|
static async getUserByPasswordRecoveryToken(passwordRecoveryToken) {
|
|
135
140
|
const data = await this.findOne({
|
|
136
141
|
passwordRecoveryTokens: {
|
|
137
|
-
$elemMatch: {
|
|
142
|
+
$elemMatch: {
|
|
143
|
+
token: String(passwordRecoveryToken),
|
|
144
|
+
until: { $gt: new Date() },
|
|
145
|
+
},
|
|
138
146
|
},
|
|
139
147
|
});
|
|
140
148
|
if (!data) {
|
|
141
149
|
return Promise.reject(new Error('User not exists'));
|
|
142
150
|
}
|
|
143
|
-
// TODO token expiration and remove that token
|
|
144
151
|
data.passwordRecoveryTokens.pop();
|
|
145
152
|
const result = await data.save();
|
|
146
153
|
return result;
|
|
@@ -186,13 +193,15 @@ class UserOld extends AbstractModel {
|
|
|
186
193
|
static async getUserByVerificationToken(verificationToken) {
|
|
187
194
|
const data = await this.findOne({
|
|
188
195
|
verificationTokens: {
|
|
189
|
-
$elemMatch: {
|
|
196
|
+
$elemMatch: {
|
|
197
|
+
token: String(verificationToken),
|
|
198
|
+
until: { $gt: new Date() },
|
|
199
|
+
},
|
|
190
200
|
},
|
|
191
201
|
});
|
|
192
202
|
if (!data) {
|
|
193
203
|
return Promise.reject(new Error('User not exists'));
|
|
194
204
|
}
|
|
195
|
-
// TODO token expiration and remove that token
|
|
196
205
|
data.verificationTokens.pop();
|
|
197
206
|
const result = await data.save();
|
|
198
207
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserOld.js","sourceRoot":"","sources":["../../src/models/UserOld.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"UserOld.js","sourceRoot":"","sources":["../../src/models/UserOld.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractCommand.js","sourceRoot":"","sources":["../../src/modules/AbstractCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAoB7B,MAAM,eAAgB,SAAQ,IAAI;IAChC,QAAQ,CAAyB;IAEjC,IAAI,CAA0B;IAE9B,YACE,GAAS,EACT,QAAgC,EAChC,IAA6B;QAE7B,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,wCAAwC,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAEjC;;OAEG;IACH,MAAM,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAEpC;;;;OAIG;IACH,MAAM,CAAC,sBAAsB,CAC3B,WAAmB,EACnB,IAA6B;QAE7B,IAAI,IAAI,GAAG,QAAQ,WAAW,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QACzD,2GAA2G;QAC3G,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YACtB,4EAA4E;YAC5E,OAAO,CAAC,IAAI,CACV,QAAQ,WAAW,2DAA2D,CAC/E,CAAC;YACF,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC;iBAC9B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;iBAC5B,MAAM,CAAC,KAAK,CAAC;iBACb,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACpB,IAAI,GAAG,QAAQ,WAAW,IAAI,IAAI,EAAE,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,MAAM,KAAK,gBAAgB;QAIzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC
|
|
1
|
+
{"version":3,"file":"AbstractCommand.js","sourceRoot":"","sources":["../../src/modules/AbstractCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAoB7B,MAAM,eAAgB,SAAQ,IAAI;IAChC,QAAQ,CAAyB;IAEjC,IAAI,CAA0B;IAE9B,YACE,GAAS,EACT,QAAgC,EAChC,IAA6B;QAE7B,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,wCAAwC,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAEjC;;OAEG;IACH,MAAM,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAEpC;;;;OAIG;IACH,MAAM,CAAC,sBAAsB,CAC3B,WAAmB,EACnB,IAA6B;QAE7B,IAAI,IAAI,GAAG,QAAQ,WAAW,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QACzD,2GAA2G;QAC3G,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YACtB,4EAA4E;YAC5E,OAAO,CAAC,IAAI,CACV,QAAQ,WAAW,2DAA2D,CAC/E,CAAC;YACF,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC;iBAC9B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;iBAC5B,MAAM,CAAC,KAAK,CAAC;iBACb,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACpB,IAAI,GAAG,QAAQ,WAAW,IAAI,IAAI,EAAE,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,MAAM,KAAK,gBAAgB;QAIzB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import Auth from
|
|
2
|
-
import GetUserByToken from
|
|
3
|
-
import Base from
|
|
1
|
+
import Auth from '../services/http/middleware/Auth.js';
|
|
2
|
+
import GetUserByToken from '../services/http/middleware/GetUserByToken.js';
|
|
3
|
+
import Base from './Base.js';
|
|
4
4
|
/**
|
|
5
5
|
* The default mount segment for a controller: `ClassName`, prefixed by the
|
|
6
6
|
* folder when nested (`admin/Users.ts` → `Admin/Users`). Exported so codegen
|
package/dist/modules/Base.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { getFilesPathWithInheritance } from
|
|
2
|
-
import { consoleLogger, noopLogger } from
|
|
1
|
+
import { getFilesPathWithInheritance } from '../helpers/files.js';
|
|
2
|
+
import { consoleLogger, noopLogger } from '../helpers/logger.js';
|
|
3
3
|
class Base {
|
|
4
4
|
#realLogger = null;
|
|
5
5
|
app;
|
|
@@ -19,7 +19,7 @@ declare class Cli extends Base {
|
|
|
19
19
|
loadCommands(): Promise<boolean>;
|
|
20
20
|
printCommandTable(): Promise<void>;
|
|
21
21
|
static showHelp(Command: typeof AbstractCommand, finalArguments: Record<string, ParseArgsOptionsConfigExtended>): void;
|
|
22
|
-
run(command: string): Promise<boolean
|
|
22
|
+
run(command: string): Promise<boolean>;
|
|
23
23
|
static get loggerGroup(): string;
|
|
24
24
|
}
|
|
25
25
|
export default Cli;
|
package/dist/modules/BaseCli.js
CHANGED
|
@@ -9,7 +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 { parseArgs } from 'node:util';
|
|
12
|
-
import Base from
|
|
12
|
+
import Base from './Base.js';
|
|
13
13
|
class Cli extends Base {
|
|
14
14
|
server;
|
|
15
15
|
commands;
|
|
@@ -145,9 +145,12 @@ class Cli extends Base {
|
|
|
145
145
|
console.info(`Command ${command} NOT need to isShouldInitModels`);
|
|
146
146
|
}
|
|
147
147
|
const c = new Command(this.app, this.commands, parsedArgs.values);
|
|
148
|
+
// A thrown command is one more `false` path (like not-found / bad-args) so
|
|
149
|
+
// the entry can exit non-zero. Don't rethrow: the entry's `.catch` is
|
|
150
|
+
// reserved for boot/infra failures, not command failures.
|
|
148
151
|
const result = await c.run().catch((e) => {
|
|
149
152
|
this.logger?.error(e.stack);
|
|
150
|
-
return
|
|
153
|
+
return false;
|
|
151
154
|
});
|
|
152
155
|
return result;
|
|
153
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseCli.js","sourceRoot":"","sources":["../../src/modules/BaseCli.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,OAAO,IAAI,MAAM,WAAW,CAAC;AAe7B,MAAM,GAAI,SAAQ,IAAI;IACpB,MAAM,CAAS;IACf,QAAQ,CAAyB;IAEjC,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"BaseCli.js","sourceRoot":"","sources":["../../src/modules/BaseCli.ts"],"names":[],"mappings":"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"}
|
package/dist/server.d.ts
CHANGED
|
@@ -144,7 +144,7 @@ declare class Server {
|
|
|
144
144
|
* Run cli command into framework (http, ws, etc)
|
|
145
145
|
* @param {String} commandName name of command to load
|
|
146
146
|
*/
|
|
147
|
-
runCliCommand(commandName: string): Promise<boolean
|
|
147
|
+
runCliCommand(commandName: string): Promise<boolean>;
|
|
148
148
|
/**
|
|
149
149
|
* Get internal cache service
|
|
150
150
|
*/
|
package/dist/server.js
CHANGED
|
@@ -12,10 +12,10 @@ import { hrtime, loadEnvFile } from 'node:process';
|
|
|
12
12
|
import * as url from 'node:url';
|
|
13
13
|
import merge from 'deepmerge';
|
|
14
14
|
import winston from 'winston';
|
|
15
|
-
import { setAppInstance } from
|
|
16
|
-
import { getFilesPathWithInheritance } from
|
|
17
|
-
import { consoleLogger } from
|
|
18
|
-
import Cache from
|
|
15
|
+
import { setAppInstance } from './helpers/appInstance.js';
|
|
16
|
+
import { getFilesPathWithInheritance } from './helpers/files.js';
|
|
17
|
+
import { consoleLogger } from './helpers/logger.js';
|
|
18
|
+
import Cache from './services/cache/Cache.js';
|
|
19
19
|
try {
|
|
20
20
|
loadEnvFile();
|
|
21
21
|
}
|
|
@@ -90,7 +90,7 @@ class Server {
|
|
|
90
90
|
},
|
|
91
91
|
httpServer: null,
|
|
92
92
|
controllerManager: null,
|
|
93
|
-
frameworkFolder: new URL('.', import.meta.url)
|
|
93
|
+
frameworkFolder: url.fileURLToPath(new URL('.', import.meta.url)),
|
|
94
94
|
internalFilesCache: that.cache,
|
|
95
95
|
};
|
|
96
96
|
setAppInstance(this.app);
|
|
@@ -101,9 +101,9 @@ class Server {
|
|
|
101
101
|
*/
|
|
102
102
|
async startServer(callbackBefore404 = async () => Promise.resolve()) {
|
|
103
103
|
const [{ default: HttpServer }, { default: ControllerManager }, { formatRouteTree },] = await Promise.all([
|
|
104
|
-
import(
|
|
105
|
-
import(
|
|
106
|
-
import(
|
|
104
|
+
import('./services/http/HttpServer.js'), // Speed optimisation
|
|
105
|
+
import('./controllers/index.js'), // Speed optimisation
|
|
106
|
+
import('./services/http/routing/formatTree.js'),
|
|
107
107
|
this.init(),
|
|
108
108
|
]);
|
|
109
109
|
this.addErrorHandling();
|
|
@@ -284,7 +284,7 @@ class Server {
|
|
|
284
284
|
await this.#loadModelFiles();
|
|
285
285
|
}
|
|
286
286
|
if (this.app.getConfig('mongo').connectionString) {
|
|
287
|
-
const { BaseModel, isBaseModelSubclassShape } = await import(
|
|
287
|
+
const { BaseModel, isBaseModelSubclassShape } = await import('./modules/BaseModel.js');
|
|
288
288
|
// Kick the connection off once (shared promise). Not awaited here — model
|
|
289
289
|
// schema registration below works against an unconnected mongoose.
|
|
290
290
|
if (!this.#mongooseConnectionPromise) {
|
|
@@ -375,21 +375,35 @@ class Server {
|
|
|
375
375
|
}
|
|
376
376
|
}
|
|
377
377
|
const loadConfig = async (configName, values) => {
|
|
378
|
-
// The source files that contribute to this config, in merge order:
|
|
379
|
-
//
|
|
380
|
-
// import the values AND (by
|
|
381
|
-
//
|
|
382
|
-
|
|
378
|
+
// The source files that contribute to this config, in merge order: base
|
|
379
|
+
// default first (may be absent for an env-only config), then the
|
|
380
|
+
// NODE_ENV-specific override. Used both to import the values AND (by
|
|
381
|
+
// codegen) to recover env-only key types from source — deriving the list
|
|
382
|
+
// once keeps the two perfectly in sync. Only real paths go in, so
|
|
383
|
+
// `import(undefined)` can never be reached.
|
|
384
|
+
const paths = [];
|
|
385
|
+
if (values.default) {
|
|
386
|
+
paths.push(values.default);
|
|
387
|
+
}
|
|
383
388
|
if (process.env.NODE_ENV && values[process.env.NODE_ENV]) {
|
|
384
389
|
paths.push(values[process.env.NODE_ENV]);
|
|
385
390
|
}
|
|
391
|
+
if (paths.length === 0) {
|
|
392
|
+
// Env-only config (no base `<name>.ts`) whose env segment doesn't match
|
|
393
|
+
// the current NODE_ENV → no applicable file. Treat it as absent, exactly
|
|
394
|
+
// like a config that was never defined (getConfig warns + returns {}),
|
|
395
|
+
// rather than importing `undefined` and crashing boot with an opaque
|
|
396
|
+
// `Cannot find package 'undefined'`.
|
|
397
|
+
consoleLogger('warn', `Config '${configName}' has only environment-specific file(s) [${Object.keys(values).join(', ')}] and no base '${configName}.ts'; none matches NODE_ENV=${process.env.NODE_ENV ?? '(unset)'}, so it is treated as absent (getConfig('${configName}') returns {}).`);
|
|
398
|
+
return null;
|
|
399
|
+
}
|
|
386
400
|
const result = await Promise.all(paths.map((p) => import(__rewriteRelativeImportExtension(p))));
|
|
387
401
|
return {
|
|
388
402
|
name: configName,
|
|
389
403
|
finalValue: merge(result[0].default, result[1]?.default || {}, {
|
|
390
404
|
arrayMerge: (_destinationArray, sourceArray) => sourceArray,
|
|
391
405
|
}),
|
|
392
|
-
paths
|
|
406
|
+
paths,
|
|
393
407
|
};
|
|
394
408
|
};
|
|
395
409
|
const loadingPromises = [];
|
|
@@ -398,6 +412,9 @@ class Server {
|
|
|
398
412
|
}
|
|
399
413
|
const configs = await Promise.all(loadingPromises);
|
|
400
414
|
for (const config of configs) {
|
|
415
|
+
if (!config) {
|
|
416
|
+
continue;
|
|
417
|
+
}
|
|
401
418
|
this.cache.configs.set(config.name, config.finalValue);
|
|
402
419
|
this.cache.configPaths.set(config.name, config.paths);
|
|
403
420
|
}
|
|
@@ -581,7 +598,7 @@ class Server {
|
|
|
581
598
|
}
|
|
582
599
|
if (!this.#i18nServicePromise) {
|
|
583
600
|
this.#i18nServicePromise = (async () => {
|
|
584
|
-
const I18nService = (await import(
|
|
601
|
+
const I18nService = (await import('./services/i18n/I18n.js')).I18n; // speed optimisation
|
|
585
602
|
this.#i18nService = new I18nService(this.app);
|
|
586
603
|
return this.#i18nService;
|
|
587
604
|
})();
|
|
@@ -614,7 +631,7 @@ class Server {
|
|
|
614
631
|
*/
|
|
615
632
|
async runCliCommand(commandName) {
|
|
616
633
|
if (!this.cli) {
|
|
617
|
-
const { default: BaseCli } = await import(
|
|
634
|
+
const { default: BaseCli } = await import('./modules/BaseCli.js'); // Speed optimisation
|
|
618
635
|
this.cli = new BaseCli(this);
|
|
619
636
|
}
|
|
620
637
|
return this.cli.run(commandName);
|