@adaptivestone/framework 3.0.0 → 3.0.4

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 3.0.4
+
+[UPDATE] fix bug with app shutdown
+
+### 3.0.3
+
+[UPDATE] update deps
+
+### 3.0.2
+
+[UPDATE] update deps
+
+### 3.0.1
+
+[UPDATE] update deps
+[UPDATE] getUserByTokens more logs
+
 ### 3.0.0
 
 [BREAKING] Mongoose v6. Than a lot of changes:[mongoDB drive changes](https://github.com/mongodb/node-mongodb-native/blob/4.0/docs/CHANGES_4.0.0.md), [Mongoose changes](https://mongoosejs.com/docs/migrating_to_6.html).

package/Cli.js

@@ -12,7 +12,7 @@ class Cli extends BaseCli {
   async run() {
     const command = process.argv[2]?.toLowerCase();
     await super.run(command, this.args);
-    this.app.events.emit('die');
+    this.app.events.emit('shutdown');
   }
 }
 

package/modules/AbstractController.js

@@ -205,10 +205,12 @@ class AbstractController extends Base {
               } catch (e) {
                 let { errors } = e;
                 // translate it
-                if (req.i18n) {
-                  errors = e.errors.map((err) => req.i18n.t(err));
+                if (req.i18n && errors) {
+                  errors = errors.map((err) => req.i18n.t(err));
                 }
-                this.logger.error(`Request validation failed: ${errors}`);
+                this.logger.error(
+                  `Request validation failed with message: ${e.message}. errors: ${errors}`,
+                );
 
                 return res.status(400).json({
                   errors: {

package/modules/AbstractModel.js

@@ -23,7 +23,7 @@ class AbstractModel extends Base {
       mongoose.connect(this.app.getConfig('mongo').connectionString, {}).then(
         () => {
           this.logger.info('Mongo connection success');
-          this.app.events.on('die', async () => {
+          this.app.events.on('shutdown', async () => {
             for (const c of mongoose.connections) {
               c.close(true);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "3.0.0",
+  "version": "3.0.4",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "repository": {
@@ -28,7 +28,7 @@
     "bcrypt": "^5.0.1",
     "cors": "^2.8.5",
     "deepmerge": "^4.2.2",
-    "dotenv": "^10.0.0",
+    "dotenv": "^14.0.0",
     "email-templates": "^8.0.7",
     "express": "^4.17.1",
     "i18next": "^21.2.4",
@@ -53,7 +53,7 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jest": "^25.0.0",
+    "eslint-plugin-jest": "^26.0.0",
     "husky": "^7.0.0",
     "jest": "^27.0.6",
     "lint-staged": "^12.0.0",

package/services/cache/Cache.js

@@ -17,6 +17,9 @@ class Cache extends Base {
     this.redisClient.on('connect', () => {
       this.logger.info('Redis connection success');
     });
+    this.app.events.on('shutdown', () => {
+      this.redisClient.quit();
+    });
     this.redisGetAsync = promisify(this.redisClient.get).bind(this.redisClient);
     this.promiseMapping = new Map();
   }

package/services/http/HttpServer.js

@@ -168,7 +168,7 @@ class HttpServer extends Base {
   /**
    * Stop http server (mostly for unit testing)
    */
-  die() {
+  shutdown() {
     this.httpServer.close();
   }
 }

package/services/http/middleware/GetUserByToken.js

@@ -7,6 +7,11 @@ class GetUserByToken extends AbstractMiddleware {
 
   async middleware(req, res, next) {
     let { token } = req.body;
+    this.logger.verbose(
+      `GetUserByToken token in BODY ${token}. Token if Authorization header ${req.get(
+        'Authorization',
+      )}`,
+    );
     if (!token) {
       token = req.get('Authorization');
       if (!token || token === 'null') {

package/services/http/middleware/RateLimiter.js

@@ -55,6 +55,10 @@ class RateLimiter extends AbstractMiddleware {
       this.logger.info('Redis connection success');
     });
 
+    this.app.events.on('shutdown', () => {
+      redisClient.quit();
+    });
+
     return new RateLimiterRedis({
       storeClient: redisClient,
       ...this.finalOptions.limiterOptions,

package/tests/setup.js

@@ -64,7 +64,8 @@ beforeAll(async () => {
 });
 afterAll(async () => {
   if (global.server) {
-    global.server.app.httpServer.die();
+    global.server.app.httpServer.shutdown();
+    global.server.app.events.emit('shutdown');
   }
   setTimeout(async () => {
     if (typeof global.testSetup.afterAll === 'function') {