@abtnode/rbac 1.16.43-beta-20250424-125523-08a65a5c → 1.16.43-beta-20250427-132304-6da95c55

package/lib/store/sequelize.js

@@ -1,4 +1,6 @@
 const pick = require('lodash/pick');
+const SingleFlightLRUCache = require('@abtnode/util/lib/single-flight-lru-cache');
+const { RBAC_CACHE_TTL } = require('@abtnode/constant');
 
 const Storage = require('../core/storage');
 const Permission = require('../core/permission');
@@ -15,6 +17,11 @@ class SequelizeStorage extends Storage {
     this.db = db;
   }
 
+  cache = new SingleFlightLRUCache({
+    max: 1000,
+    ttl: RBAC_CACHE_TTL,
+  });
+
   async add(item) {
     const { name } = item;
 
@@ -39,6 +46,7 @@ class SequelizeStorage extends Storage {
     }
 
     await this.db.insert(doc);
+    this.cache.clear();
 
     return true;
   }
@@ -55,6 +63,7 @@ class SequelizeStorage extends Storage {
     await Promise.all(
       docs.map((doc) => this.db.update({ id: doc.id }, { $set: { grants: doc.grants.filter((x) => x !== name) } }))
     );
+    this.cache.clear();
     return true;
   }
 
@@ -66,6 +75,7 @@ class SequelizeStorage extends Storage {
     }
 
     await this.db.update({ name }, pick({ title, description, extra }, 'title', 'description', 'extra'));
+    this.cache.clear();
     return this.get(name);
   }
 
@@ -96,6 +106,8 @@ class SequelizeStorage extends Storage {
       )
     );
 
+    this.cache.clear();
+
     return true;
   }
 
@@ -112,48 +124,61 @@ class SequelizeStorage extends Storage {
       docs.map((doc) => this.db.update({ id: doc.id }, { grants: doc.grants.filter((x) => x !== childName) }))
     );
 
+    this.cache.clear();
+
     return true;
   }
 
-  async get(name) {
-    const item = await this.db.findOne({ name });
+  get(name) {
+    const cacheKey = JSON.stringify({ type: 'get', name });
+    return this.cache.autoCache(cacheKey, async () => {
+      const item = await this.db.findOne({ name });
 
-    if (!item) {
-      return undefined;
-    }
+      if (!item) {
+        return undefined;
+      }
 
-    if (item.type === ItemTypes.Role) {
-      return this.resolveRole(item);
-    }
+      if (item.type === ItemTypes.Role) {
+        return this.resolveRole(item);
+      }
 
-    if (item.type === ItemTypes.Permission) {
-      return this.resolvePermission(item);
-    }
+      if (item.type === ItemTypes.Permission) {
+        return this.resolvePermission(item);
+      }
 
-    return undefined;
+      return undefined;
+    });
   }
 
-  async getRoles() {
-    const roles = await this.db.find({ type: ItemTypes.Role }, {}, { createdAt: -1 });
-    return roles.map((item) => this.resolveRole(item));
+  getRoles() {
+    const cacheKey = JSON.stringify({ type: 'getRoles' });
+    return this.cache.autoCache(cacheKey, async () => {
+      const roles = await this.db.find({ type: ItemTypes.Role }, {}, { createdAt: -1 });
+      return roles.map((item) => this.resolveRole(item));
+    });
   }
 
-  async getPermissions() {
-    const permissions = await this.db.find({ type: ItemTypes.Permission }, {}, { createdAt: -1 });
-    return permissions.map((item) => this.resolvePermission(item));
+  getPermissions() {
+    const cacheKey = JSON.stringify({ type: 'getPermissions' });
+    return this.cache.autoCache(cacheKey, async () => {
+      const permissions = await this.db.find({ type: ItemTypes.Permission }, {}, { createdAt: -1 });
+      return permissions.map((item) => this.resolvePermission(item));
+    });
   }
 
-  async getGrants(name) {
-    const item = await this.db.findOne({ name });
+  getGrants(name) {
+    const cacheKey = JSON.stringify({ type: 'getGrants', name });
+    return this.cache.autoCache(cacheKey, async () => {
+      const item = await this.db.findOne({ name });
 
-    if (item) {
-      const grants = await Promise.all((item.grants || []).map((x) => this.get(x)));
-      return grants;
-    }
+      if (item) {
+        const grants = await Promise.all((item.grants || []).map((x) => this.get(x)));
+        return grants;
+      }
 
-    return [];
+      return [];
+    });
   }
-
   // custom
 
   async updateGrants(roleName, grantNames = []) {
@@ -184,6 +209,7 @@ class SequelizeStorage extends Storage {
     });
 
     await this.db.update({ name: roleName }, { grants: grantNames });
+    this.cache.clear();
     return this.get(roleName);
   }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.43-beta-20250424-125523-08a65a5c",
+  "version": "1.16.43-beta-20250427-132304-6da95c55",
   "description": "Simple lib to manage access controls in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -19,12 +19,14 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/db": "1.16.43-beta-20250424-125523-08a65a5c",
+    "@abtnode/constant": "1.16.43-beta-20250427-132304-6da95c55",
+    "@abtnode/db": "1.16.43-beta-20250427-132304-6da95c55",
+    "@abtnode/util": "1.16.43-beta-20250427-132304-6da95c55",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "499de9f28770298a819122ba16a7f2b3cc78c7ee"
+  "gitHead": "9df10dcb3135a528912241e7fc1ed54171bfeb03"
 }