@abtnode/rbac 1.16.44 → 1.16.45-beta-20250609-025419-7fd1f86c

package/lib/store/sequelize.js

@@ -1,6 +1,4 @@
 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');
@@ -17,11 +15,6 @@ class SequelizeStorage extends Storage {
     this.db = db;
   }
 
-  cache = new SingleFlightLRUCache({
-    max: 1000,
-    ttl: RBAC_CACHE_TTL,
-  });
-
   async add(item) {
     const { name } = item;
 
@@ -46,7 +39,6 @@ class SequelizeStorage extends Storage {
     }
 
     await this.db.insert(doc);
-    this.cache.clear();
 
     return true;
   }
@@ -63,7 +55,6 @@ 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;
   }
 
@@ -75,7 +66,6 @@ class SequelizeStorage extends Storage {
     }
 
     await this.db.update({ name }, pick({ title, description, extra }, 'title', 'description', 'extra'));
-    this.cache.clear();
     return this.get(name);
   }
 
@@ -106,8 +96,6 @@ class SequelizeStorage extends Storage {
       )
     );
 
-    this.cache.clear();
-
     return true;
   }
 
@@ -124,60 +112,48 @@ 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;
   }
 
-  get(name) {
-    const cacheKey = JSON.stringify({ type: 'get', name });
-    return this.cache.autoCache(cacheKey, async () => {
-      const item = await this.db.findOne({ name });
+  async get(name) {
+    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;
   }
 
-  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 getRoles() {
+    // 因为对象 JSON 有循环引用, 所以无法用原来的缓存
+    const roles = await this.db.find({ type: ItemTypes.Role }, {}, { createdAt: -1 });
+    return roles.map((item) => this.resolveRole(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 getPermissions() {
+    // 因为对象 JSON 有循环引用, 所以无法用原来的缓存
+    const permissions = await this.db.find({ type: ItemTypes.Permission }, {}, { createdAt: -1 });
+    return permissions.map((item) => this.resolvePermission(item));
   }
 
-  getGrants(name) {
-    const cacheKey = JSON.stringify({ type: 'getGrants', name });
-    return this.cache.autoCache(cacheKey, async () => {
-      const item = await this.db.findOne({ name });
+  async getGrants(name) {
+    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
 
@@ -209,7 +185,6 @@ 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.44",
+  "version": "1.16.45-beta-20250609-025419-7fd1f86c",
   "description": "Simple lib to manage access controls in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -19,14 +19,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.44",
-    "@abtnode/db": "1.16.44",
-    "@abtnode/util": "1.16.44",
+    "@abtnode/constant": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/db": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/db-cache": "1.16.45-beta-20250609-025419-7fd1f86c",
+    "@abtnode/util": "1.16.45-beta-20250609-025419-7fd1f86c",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "a177f040e3e8da94311cec1395c8e8defae2da9e"
+  "gitHead": "0457b82da528653a1b903149ea1fb1966c31bee3"
 }