feat: synchronized enforcer

nodece · nodece · commit ecec514a582f · 2020-02-13T19:53:29.000+08:00
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "typescript": "^3.7.2"
   },
   "dependencies": {
+    "await-lock": "^2.0.1",
     "expression-eval": "^2.0.0",
     "ip": "^1.1.5",
     "lodash": "^4.17.15"
diff --git a/src/coreEnforcer.ts b/src/coreEnforcer.ts
@@ -143,7 +143,7 @@ export class CoreEnforcer {
 
     this.model.printPolicy();
     if (this.autoBuildRoleLinks) {
-      await this.buildRoleLinks();
+      await this.buildRoleLinksInternal();
     }
   }
 
@@ -163,7 +163,7 @@ export class CoreEnforcer {
 
     this.model.printPolicy();
     if (this.autoBuildRoleLinks) {
-      await this.buildRoleLinks();
+      await this.buildRoleLinksInternal();
     }
     return true;
   }
@@ -238,10 +238,13 @@ export class CoreEnforcer {
   }
 
   /**
-   * buildRoleLinks manually rebuild the
-   * role inheritance relations.
+   * buildRoleLinks manually rebuild the role inheritance relations.
    */
   public async buildRoleLinks(): Promise<void> {
+    return this.buildRoleLinksInternal();
+  }
+
+  protected async buildRoleLinksInternal(): Promise<void> {
     await this.rm.clear();
     await this.model.buildRoleLinks(this.rm);
   }
diff --git a/src/index.ts b/src/index.ts
@@ -17,6 +17,7 @@ import * as Util from './util';
 export * from './config';
 export * from './enforcer';
 export * from './cachedEnforcer';
+export * from './syncedEnforcer';
 export * from './effect';
 export * from './model';
 export * from './persist';
diff --git a/src/managementEnforcer.ts b/src/managementEnforcer.ts
@@ -342,7 +342,7 @@ export class ManagementEnforcer extends InternalEnforcer {
     const ruleadded = await this.addPolicyInternal('g', ptype, params);
 
     if (this.autoBuildRoleLinks) {
-      await this.buildRoleLinks();
+      await this.buildRoleLinksInternal();
     }
 
     return ruleadded;
@@ -381,7 +381,7 @@ export class ManagementEnforcer extends InternalEnforcer {
     const ruleRemoved = await this.removePolicyInternal('g', ptype, params);
 
     if (this.autoBuildRoleLinks) {
-      await this.buildRoleLinks();
+      await this.buildRoleLinksInternal();
     }
 
     return ruleRemoved;
@@ -400,7 +400,7 @@ export class ManagementEnforcer extends InternalEnforcer {
     const ruleRemoved = await this.removeFilteredPolicyInternal('g', ptype, fieldIndex, fieldValues);
 
     if (this.autoBuildRoleLinks) {
-      await this.buildRoleLinks();
+      await this.buildRoleLinksInternal();
     }
 
     return ruleRemoved;
diff --git a/src/syncedEnforcer.ts b/src/syncedEnforcer.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ export class CoreEnforcer {`
`143`	`143`
`144`	`144`	`this.model.printPolicy();`
`145`	`145`	`if (this.autoBuildRoleLinks) {`
`146`		`- await this.buildRoleLinks();`
	`146`	`+ await this.buildRoleLinksInternal();`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`@@ -163,7 +163,7 @@ export class CoreEnforcer {`
`163`	`163`
`164`	`164`	`this.model.printPolicy();`
`165`	`165`	`if (this.autoBuildRoleLinks) {`
`166`		`- await this.buildRoleLinks();`
	`166`	`+ await this.buildRoleLinksInternal();`
`167`	`167`	`}`
`168`	`168`	`return true;`
`169`	`169`	`}`
`@@ -238,10 +238,13 @@ export class CoreEnforcer {`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`/**`
`241`		`- * buildRoleLinks manually rebuild the`
`242`		`- * role inheritance relations.`
	`241`	`+ * buildRoleLinks manually rebuild the role inheritance relations.`
`243`	`242`	`*/`
`244`	`243`	`public async buildRoleLinks(): Promise<void> {`
	`244`	`+ return this.buildRoleLinksInternal();`
	`245`	`+ }`
	`246`	`+`
	`247`	`+ protected async buildRoleLinksInternal(): Promise<void> {`
`245`	`248`	`await this.rm.clear();`
`246`	`249`	`await this.model.buildRoleLinks(this.rm);`
`247`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ export class ManagementEnforcer extends InternalEnforcer {`
`342`	`342`	`const ruleadded = await this.addPolicyInternal('g', ptype, params);`
`343`	`343`
`344`	`344`	`if (this.autoBuildRoleLinks) {`
`345`		`- await this.buildRoleLinks();`
	`345`	`+ await this.buildRoleLinksInternal();`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`return ruleadded;`
`@@ -381,7 +381,7 @@ export class ManagementEnforcer extends InternalEnforcer {`
`381`	`381`	`const ruleRemoved = await this.removePolicyInternal('g', ptype, params);`
`382`	`382`
`383`	`383`	`if (this.autoBuildRoleLinks) {`
`384`		`- await this.buildRoleLinks();`
	`384`	`+ await this.buildRoleLinksInternal();`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`return ruleRemoved;`
`@@ -400,7 +400,7 @@ export class ManagementEnforcer extends InternalEnforcer {`
`400`	`400`	`const ruleRemoved = await this.removeFilteredPolicyInternal('g', ptype, fieldIndex, fieldValues);`
`401`	`401`
`402`	`402`	`if (this.autoBuildRoleLinks) {`
`403`		`- await this.buildRoleLinks();`
	`403`	`+ await this.buildRoleLinksInternal();`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`return ruleRemoved;`