@abtnode/rbac 1.15.17 → 1.16.0-beta-b16cb035

package/lib/index.js

@@ -70,6 +70,8 @@ const createRBAC = async ({ storage, data = {} } = {}) => {
     canAny: rbac.canAny.bind(rbac),
     canAll: rbac.canAll.bind(rbac),
     can: rbac.can.bind(rbac),
+
+    storage: rbac.storage,
   };
 };
 

package/lib/store/nedb.js

@@ -1,7 +1,6 @@
-const util = require('util');
 const pick = require('lodash/pick');
-const DataStore =
-  process.env.NODE_ENV === 'test' ? require('@nedb/core') : require('@nedb/multi')(Number(process.env.NEDB_MULTI_PORT));
+const { DataStore } = require('@abtnode/db/lib/base');
+
 const Storage = require('../core/storage');
 const Permission = require('../core/permission');
 const Role = require('../core/role');
@@ -33,39 +32,12 @@ class Nedb extends Storage {
         });
       }
     });
-
-    this.asyncDB = new Proxy(this.db, {
-      get(target, property) {
-        if (typeof target[property] === 'function') {
-          return util
-            .promisify((...args) => {
-              const cb = args[args.length - 1];
-              const rest = args.slice(0, args.length - 1);
-
-              target[property](...rest, (err, ...result) => {
-                if (err) {
-                  return cb(err);
-                }
-
-                if (result.length === 1) {
-                  return cb(null, result[0]);
-                }
-
-                return cb(null, result);
-              });
-            })
-            .bind(target);
-        }
-
-        return target[property];
-      },
-    });
   }
 
   async add(item) {
     const { name } = item;
 
-    if (await this.asyncDB.count({ name })) {
+    if (await this.db.count({ name })) {
       throw new Error(`Item ${name} already exists`);
     }
 
@@ -85,7 +57,7 @@ class Nedb extends Storage {
       doc.type = ItemTypes.Permission;
     }
 
-    await this.asyncDB.insert(doc);
+    await this.db.insert(doc);
 
     return true;
   }
@@ -93,12 +65,12 @@ class Nedb extends Storage {
   async remove(item) {
     const { name } = item;
 
-    if (!(await this.asyncDB.count({ name }))) {
+    if (!(await this.db.count({ name }))) {
       throw new Error(`Item ${name} is not presented in storage`);
     }
 
-    await this.asyncDB.remove({ name });
-    await this.asyncDB.update(
+    await this.db.remove({ name });
+    await this.db.update(
       {
         type: ItemTypes.Role,
       },
@@ -118,11 +90,11 @@ class Nedb extends Storage {
   async update(item, { title, description, extra } = {}) {
     const { name } = item;
 
-    if (!(await this.asyncDB.count({ name }))) {
+    if (!(await this.db.count({ name }))) {
       throw new Error(`Item ${name} is not presented in storage`);
     }
 
-    await this.asyncDB.update(
+    await this.db.update(
       { name },
       {
         $set: pick({ title, description, extra }, 'title', 'description', 'extra'),
@@ -136,11 +108,11 @@ class Nedb extends Storage {
     const { name } = role;
     const { name: childName } = child;
 
-    if (!(await this.asyncDB.count({ name }))) {
+    if (!(await this.db.count({ name }))) {
       throw new Error(`Role ${name} is not exist`);
     }
 
-    if (!(await this.asyncDB.count({ name: childName }))) {
+    if (!(await this.db.count({ name: childName }))) {
       throw new Error(`Base ${childName} is not exist`);
     }
 
@@ -152,7 +124,7 @@ class Nedb extends Storage {
       throw new Error(`You can grant yourself ${name}`);
     }
 
-    await this.asyncDB.update(
+    await this.db.update(
       {
         name,
       },
@@ -170,11 +142,11 @@ class Nedb extends Storage {
     const { name } = role;
     const { name: childName } = child;
 
-    if (!(await this.asyncDB.count({ name })) || !(await this.asyncDB.count({ name: childName }))) {
+    if (!(await this.db.count({ name })) || !(await this.db.count({ name: childName }))) {
       throw new Error('Role is not exist');
     }
 
-    await this.asyncDB.update(
+    await this.db.update(
       {
         name,
       },
@@ -189,7 +161,7 @@ class Nedb extends Storage {
   }
 
   async get(name) {
-    const item = await this.asyncDB.findOne({ name });
+    const item = await this.db.findOne({ name });
 
     if (!item) {
       return undefined;
@@ -209,7 +181,7 @@ class Nedb extends Storage {
   async getRoles() {
     const roles = await new Promise((resolve, reject) => {
       this.db
-        .find({ type: ItemTypes.Role })
+        .cursor({ type: ItemTypes.Role })
         .sort({ createdAt: -1 })
         .exec((err, docs) => {
           if (err) {
@@ -226,7 +198,7 @@ class Nedb extends Storage {
   async getPermissions() {
     const permissions = await new Promise((resolve, reject) => {
       this.db
-        .find({ type: ItemTypes.Permission })
+        .cursor({ type: ItemTypes.Permission })
         .sort({ createdAt: -1 })
         .exec((err, docs) => {
           if (err) {
@@ -241,7 +213,7 @@ class Nedb extends Storage {
   }
 
   async getGrants(name) {
-    const item = await this.asyncDB.findOne({ name });
+    const item = await this.db.findOne({ name });
 
     if (item) {
       const grants = await Promise.all((item.grants || []).map((x) => this.get(x)));
@@ -255,7 +227,7 @@ class Nedb extends Storage {
   // custom
 
   async updateGrants(roleName, grantNames = []) {
-    const role = await this.asyncDB.findOne({ name: roleName });
+    const role = await this.db.findOne({ name: roleName });
 
     if (!role) {
       throw new Error(`Role ${roleName} is not exist`);
@@ -265,7 +237,7 @@ class Nedb extends Storage {
       throw new Error(`${roleName} is not a role`);
     }
 
-    const names = await this.asyncDB.find(
+    const names = await this.db.find(
       {},
       {
         name: 1,
@@ -287,7 +259,7 @@ class Nedb extends Storage {
       }
     });
 
-    await this.asyncDB.update(
+    await this.db.update(
       { name: roleName },
       {
         $set: {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.15.17",
+  "version": "1.16.0-beta-b16cb035",
   "description": "Simple lib to manage access controls in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -19,13 +19,12 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@nedb/core": "^1.2.2",
-    "@nedb/multi": "^1.2.2",
-    "fs-extra": "^10.0.0",
+    "@abtnode/db": "1.16.0-beta-b16cb035",
+    "fs-extra": "^10.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "jest": "^27.3.1"
+    "jest": "^27.5.1"
   },
-  "gitHead": "22715c3ea74d0230f3413162a17f491614b6735a"
+  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
 }