@adaptivestone/framework 3.1.1 → 3.2.1

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 3.2.1
+
+[UPDATE] updated deps
+[FIX] fix documentation generation
+
+### 3.2.0
+
+[UPDATE] updated deps
+[NEW] cache.removeKey(key) - function to remove key from cache
+
 ### 3.1.1
 
 [UPDATE] updated deps

package/modules/AbstractController.js

@@ -359,11 +359,15 @@ class AbstractController extends Base {
             routeMiddlewares: routeMiddlewaresReg
               // eslint-disable-next-line consistent-return
               .map((middleware) => {
+                const routeFullPath = route.fullPath.toUpperCase();
+                const middlewareFullPath = middleware.fullPath.toUpperCase();
+                const middlewareFullPathWithSliced = middleware.fullPath
+                  .toUpperCase()
+                  .slice(0, -1);
                 if (
-                  route.fullPath.toUpperCase() ===
-                    middleware.fullPath.toUpperCase() ||
-                  middleware.fullPath.toUpperCase() ===
-                    `${route.fullPath.toUpperCase()}*`
+                  middlewareFullPath === routeFullPath ||
+                  middlewareFullPath === `${routeFullPath}*` ||
+                  routeFullPath?.indexOf(middlewareFullPathWithSliced) !== -1
                 ) {
                   return {
                     name: middleware.name,
@@ -376,13 +380,20 @@ class AbstractController extends Base {
             controllerMiddlewares: [
               ...new Set(
                 middlewaresInfo
-                  .filter(
-                    (middleware) =>
-                      middleware.fullPath.toUpperCase() ===
-                        route.fullPath.toUpperCase() ||
-                      middleware.fullPath.toUpperCase() ===
-                        `${route.fullPath.toUpperCase()}*`,
-                  )
+                  .filter((middleware) => {
+                    const routeFullPath = route.fullPath.toUpperCase();
+                    const middlewareFullPath =
+                      middleware.fullPath.toUpperCase();
+                    const middlewareFullPathWithSliced = middleware.fullPath
+                      .toUpperCase()
+                      .slice(0, -1);
+                    return (
+                      middlewareFullPath === routeFullPath ||
+                      middlewareFullPath === `${routeFullPath}*` ||
+                      routeFullPath?.indexOf(middlewareFullPathWithSliced) !==
+                        -1
+                    );
+                  })
                   .map(({ name, params, authParams }) => ({
                     name,
                     params,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "3.1.1",
+  "version": "3.2.1",
   "description": "Adaptive stone node js framework",
   "main": "src/index.js",
   "engines": {

package/services/cache/Cache.d.ts

@@ -6,6 +6,13 @@ declare class Cache extends Base {
 
   constructor(app: Server['app']);
 
+  /**
+   * As framework support namespaces all key for cache go through this function
+   * Function return new key with added namespace
+   * @param key key to add namespace
+   */
+  getKeyWithNameSpace(key: String): String;
+
   /**
    * Get value from cache. Set and get if not eists
    * @param key key to check
@@ -17,6 +24,12 @@ declare class Cache extends Base {
     onNotFound: () => Promise<any>,
     storeTime: number,
   ): Promise<any>;
+
+  /**
+   * Remove key from cache
+   * @param key key to remove
+   */
+  removeKey(key: String): Promise<number>;
 }
 
 export = Cache;

package/services/cache/Cache.js

@@ -28,11 +28,15 @@ class Cache extends Base {
     this.promiseMapping = new Map();
   }
 
+  getKeyWithNameSpace(key) {
+    return `${this.redisNamespace}-${key}`;
+  }
+
   async getSetValue(keyValue, onNotFound, storeTime = 60 * 5) {
     if (!this.redisClient.isOpen) {
       await this.redisClient.connect();
     }
-    const key = `${this.redisNamespace}-${keyValue}`;
+    const key = this.getKeyWithNameSpace(keyValue);
     // 5 mins default
     let resolve = null;
     let reject = null;
@@ -81,6 +85,14 @@ class Cache extends Base {
     return result;
   }
 
+  async removeKey(keyValue) {
+    if (!this.redisClient.isOpen) {
+      await this.redisClient.connect();
+    }
+    const key = this.getKeyWithNameSpace(keyValue);
+    return this.redisClient.del(key);
+  }
+
   static get loggerGroup() {
     return 'Cache_';
   }