@adaptivestone/framework 5.0.0-alpha.20 → 5.0.0-alpha.22

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 5.0.0-alpha.22
+
+[UPDATE] update deps
+[FIX] fix optional routing parameters
+
+### 5.0.0-alpha.21
+
+[BREAKING] possible breaking. Framework start using express 5 instead of express 4. Please follow express migration guide too https://expressjs.com/en/guide/migrating-5.html.
+[BREAKING] AS part of express 5 migration _ in rotes (middlewares) should have perameter. please replace _ to \*splat
+[UPDATE] update deps
+[UPDATE] Mailer uses await import() for startup speedup
+
 ### 5.0.0-alpha.20
 
 [UPDATE] update deps

package/controllers/Auth.js

@@ -203,7 +203,7 @@ class Auth extends AbstractController {
   }
 
   static get middleware() {
-    return new Map([['/*', [GetUserByToken, RateLimiter]]]);
+    return new Map([['/{*splat}', [GetUserByToken, RateLimiter]]]);
   }
 }
 

package/controllers/Home.js

@@ -21,7 +21,7 @@ class Home extends AbstractController {
   }
 
   static get middleware() {
-    return new Map([['/*', [GetUserByToken]]]);
+    return new Map([['{/*splat}', [GetUserByToken]]]);
   }
 }
 

package/models/User.js

@@ -4,7 +4,6 @@ import { scrypt } from 'node:crypto';
 
 import { promisify } from 'node:util';
 import AbstractModel from '../modules/AbstractModel.js';
-import Mailer from '../services/messaging/email/index.js';
 
 class User extends AbstractModel {
   constructor(app) {
@@ -175,6 +174,10 @@ class User extends AbstractModel {
   async sendPasswordRecoveryEmail(i18n) {
     const passwordRecoveryToken =
       await User.generateUserPasswordRecoveryToken(this);
+    // speed optimisation
+    const Mailer = (await import('../services/messaging/email/index.js'))
+      .default;
+
     const mail = new Mailer(
       this.getSuper().app,
       'recovery',
@@ -241,6 +244,9 @@ class User extends AbstractModel {
 
   async sendVerificationEmail(i18n) {
     const verificationToken = await User.generateUserVerificationToken(this);
+    // speed optimisation
+    const Mailer = (await import('../services/messaging/email/index.js'))
+      .default;
     const mail = new Mailer(
       this.getSuper().app,
       'verification',

package/modules/AbstractController.js

@@ -376,14 +376,14 @@ class AbstractController extends Base {
    * @returns {Map<string, Array<typeof import('../services/http/middleware/AbstractMiddleware.js').default | [Function, ...any]>>}
    * @example
    * return new Map([
-   *    ['/*', [GetUserByToken]] // for any method for this controller
+   *    ['/{*splat}', [GetUserByToken]] // for any method for this controller
    *    ['POST/', [Auth]] // for POST method
    *    ['/superSecretMethod', [OnlySuperSecretUsers]] // route with ANY method
    *    ['PUT/superSecretMathod', [OnlySuperSecretAdmin]] // route with PUT method
    * ]);
    */
   static get middleware() {
-    return new Map([['/*', [GetUserByToken, Auth]]]);
+    return new Map([['/{*splat}', [GetUserByToken, Auth]]]);
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "5.0.0-alpha.20",
+  "version": "5.0.0-alpha.22",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "type": "module",
@@ -31,7 +31,7 @@
   "license": "MIT",
   "dependencies": {
     "deepmerge": "^4.2.2",
-    "express": "^4.17.1",
+    "express": "^5.0.1",
     "formidable": "^3.5.1",
     "html-to-text": "^9.0.3",
     "i18next": "^23.2.8",

package/services/http/HttpServer.js

@@ -25,9 +25,9 @@ class HttpServer extends Base {
     // ]);
     // this.express.set('view engine', 'pug');
 
+    this.express.use(new RequestLoggerMiddleware(this.app).getMiddleware());
     this.express.use(new PrepareAppInfoMiddleware(this.app).getMiddleware());
     this.express.use(new IpDetector(this.app).getMiddleware());
-    this.express.use(new RequestLoggerMiddleware(this.app).getMiddleware());
     this.express.use(new I18nMiddleware(this.app).getMiddleware());
 
     const httpConfig = this.app.getConfig('http');

package/services/http/middleware/GetUserByToken.js

@@ -22,7 +22,7 @@ class GetUserByToken extends AbstractMiddleware {
       this.logger.warn('You call GetUserByToken more then once');
       return next();
     }
-    let { token } = req.body;
+    let { token } = req.body || {};
     this.logger.verbose(
       `GetUserByToken token in BODY ${token}. Token in Authorization header ${req.get(
         'Authorization',

package/services/http/middleware/RequestLogger.js

@@ -6,13 +6,13 @@ class RequestLogger extends AbstractMiddleware {
   }
 
   async middleware(req, res, next) {
-    const startTime = Date.now();
+    const startTime = performance.now();
     const text = `Request is  [${req.method}] ${req.url}`;
     this.logger.info(text);
     res.on('finish', () => {
-      const duration = Date.now() - startTime;
+      const end = performance.now();
       this.logger.info(
-        `Finished ${text}. Status: ${res.statusCode}. Duration ${duration} ms`,
+        `Finished ${text}. Status: ${res.statusCode}.  [${(end - startTime).toFixed(2)} ms]`,
       );
     });
     next();

package/services/http/middleware/RequestParser.js

@@ -29,7 +29,7 @@ class RequestParser extends AbstractMiddleware {
 
     req.body = {
       // todo avoid body in next versions
-      ...req.body,
+      ...(req.body || {}),
       ...fields,
       ...files,
     };

package/services/validate/ValidateService.js

@@ -26,7 +26,7 @@ class ValidateService extends Base {
     );
   }
 
-  static getDriverByValidatorBody(app, body) {
+  static getDriverByValidatorBody(app, body = {}) {
     if (this.isValidatorExists(body)) {
       return body;
     }