@adaptivestone/framework 3.0.3 → 3.0.4

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.0.4
+
+[UPDATE] fix bug with app shutdown
+
 ### 3.0.3
 
 [UPDATE] update deps

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/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.3",
+  "version": "3.0.4",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "repository": {

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/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') {