casbin 5.16.0 → 5.18.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.18.0](https://github.com/casbin/node-casbin/compare/v5.17.0...v5.18.0) (2022-09-14)
+
+
+### Features
+
+* add management api for watcherEx callbacks ([#384](https://github.com/casbin/node-casbin/issues/384)) ([591233f](https://github.com/casbin/node-casbin/commit/591233f4b80dec422a7dc299c605f7a0e22dba9f))
+
+# [5.17.0](https://github.com/casbin/node-casbin/compare/v5.16.0...v5.17.0) (2022-08-18)
+
+
+### Features
+
+* add WatcherEx ([#381](https://github.com/casbin/node-casbin/issues/381)) ([10d7086](https://github.com/casbin/node-casbin/commit/10d7086c810ff18d9a3c792a3ec1173744bceeef))
+
 # [5.16.0](https://github.com/casbin/node-casbin/compare/v5.15.2...v5.16.0) (2022-08-11)
 
 

package/lib/cjs/coreEnforcer.d.ts

@@ -1,6 +1,6 @@
 import { Effector } from './effect';
 import { FunctionMap, Model, PolicyOp } from './model';
-import { Adapter, FilteredAdapter, Watcher, BatchAdapter, UpdatableAdapter } from './persist';
+import { Adapter, FilteredAdapter, Watcher, BatchAdapter, UpdatableAdapter, WatcherEx } from './persist';
 import { RoleManager } from './rbac';
 import { MatchingFunc } from './rbac';
 /**
@@ -14,6 +14,7 @@ export declare class CoreEnforcer {
     private matcherMap;
     protected adapter: UpdatableAdapter | FilteredAdapter | Adapter | BatchAdapter;
     protected watcher: Watcher | null;
+    protected watcherEx: WatcherEx | null;
     protected rmMap: Map<string, RoleManager>;
     protected enabled: boolean;
     protected autoSave: boolean;
@@ -56,6 +57,12 @@ export declare class CoreEnforcer {
      * @param watcher the watcher.
      */
     setWatcher(watcher: Watcher): void;
+    /**
+     * setWatcherEx sets the current watcherEx.
+     *
+     * @param watcherEx the watcherEx.
+     */
+    setWatcherEx(watcherEx: WatcherEx): void;
     /**
      * setRoleManager sets the current role manager.
      *

package/lib/cjs/coreEnforcer.js

@@ -29,6 +29,7 @@ class CoreEnforcer {
         this.eft = new effect_1.DefaultEffector();
         this.matcherMap = new Map();
         this.watcher = null;
+        this.watcherEx = null;
         this.enabled = true;
         this.autoSave = true;
         this.autoBuildRoleLinks = true;
@@ -96,6 +97,14 @@ class CoreEnforcer {
         this.watcher = watcher;
         watcher.setUpdateCallback(async () => await this.loadPolicy());
     }
+    /**
+     * setWatcherEx sets the current watcherEx.
+     *
+     * @param watcherEx the watcherEx.
+     */
+    setWatcherEx(watcherEx) {
+        this.watcherEx = watcherEx;
+    }
     /**
      * setRoleManager sets the current role manager.
      *
@@ -215,7 +224,10 @@ class CoreEnforcer {
         if (!flag) {
             return false;
         }
-        if (this.watcher) {
+        if (this.watcherEx) {
+            return await this.watcherEx.updateForSavePolicy(this.model);
+        }
+        else if (this.watcher) {
             return await this.watcher.update();
         }
         return true;

package/lib/cjs/internalEnforcer.d.ts

@@ -6,19 +6,19 @@ export declare class InternalEnforcer extends CoreEnforcer {
     /**
      * addPolicyInternal adds a rule to the current policy.
      */
-    addPolicyInternal(sec: string, ptype: string, rule: string[]): Promise<boolean>;
-    addPoliciesInternal(sec: string, ptype: string, rules: string[][]): Promise<boolean>;
+    protected addPolicyInternal(sec: string, ptype: string, rule: string[], useWatcher: boolean): Promise<boolean>;
+    protected addPoliciesInternal(sec: string, ptype: string, rules: string[][], useWatcher: boolean): Promise<boolean>;
     /**
      * updatePolicyInternal updates a rule from the current policy.
      */
-    updatePolicyInternal(sec: string, ptype: string, oldRule: string[], newRule: string[]): Promise<boolean>;
+    protected updatePolicyInternal(sec: string, ptype: string, oldRule: string[], newRule: string[], useWatcher: boolean): Promise<boolean>;
     /**
      * removePolicyInternal removes a rule from the current policy.
      */
-    removePolicyInternal(sec: string, ptype: string, rule: string[]): Promise<boolean>;
-    removePoliciesInternal(sec: string, ptype: string, rules: string[][]): Promise<boolean>;
+    protected removePolicyInternal(sec: string, ptype: string, rule: string[], useWatcher: boolean): Promise<boolean>;
+    protected removePoliciesInternal(sec: string, ptype: string, rules: string[][], useWatcher: boolean): Promise<boolean>;
     /**
      * removeFilteredPolicyInternal removes rules based on field filters from the current policy.
      */
-    removeFilteredPolicyInternal(sec: string, ptype: string, fieldIndex: number, fieldValues: string[]): Promise<boolean>;
+    protected removeFilteredPolicyInternal(sec: string, ptype: string, fieldIndex: number, fieldValues: string[], useWatcher: boolean): Promise<boolean>;
 }

package/lib/cjs/internalEnforcer.js

@@ -23,7 +23,7 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
     /**
      * addPolicyInternal adds a rule to the current policy.
      */
-    async addPolicyInternal(sec, ptype, rule) {
+    async addPolicyInternal(sec, ptype, rule, useWatcher) {
         if (this.model.hasPolicy(sec, ptype, rule)) {
             return false;
         }
@@ -37,9 +37,16 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
                 }
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForAddPolicy(sec, ptype, ...rule);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const ok = this.model.addPolicy(sec, ptype, rule);
         if (sec === 'g' && ok) {
@@ -49,7 +56,7 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
     }
     // addPolicies adds rules to the current policy.
     // removePolicies removes rules from the current policy.
-    async addPoliciesInternal(sec, ptype, rules) {
+    async addPoliciesInternal(sec, ptype, rules, useWatcher) {
         for (const rule of rules) {
             if (this.model.hasPolicy(sec, ptype, rule)) {
                 return false;
@@ -70,9 +77,16 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
                 throw new Error('cannot to save policy, the adapter does not implement the BatchAdapter');
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForAddPolicies(sec, ptype, ...rules);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const [ok, effects] = await this.model.addPolicies(sec, ptype, rules);
         if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {
@@ -83,7 +97,7 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
     /**
      * updatePolicyInternal updates a rule from the current policy.
      */
-    async updatePolicyInternal(sec, ptype, oldRule, newRule) {
+    async updatePolicyInternal(sec, ptype, oldRule, newRule, useWatcher) {
         if (!this.model.hasPolicy(sec, ptype, oldRule)) {
             return false;
         }
@@ -102,10 +116,12 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
                 throw new Error('cannot to update policy, the adapter does not implement the UpdatableAdapter');
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // In fact I think it should wait for the respond, but they implement add_policy() like this
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.watcher && this.autoNotifyWatcher) {
+                // In fact I think it should wait for the respond, but they implement add_policy() like this
+                // error intentionally ignored
+                this.watcher.update();
+            }
         }
         const ok = this.model.updatePolicy(sec, ptype, oldRule, newRule);
         if (sec === 'g' && ok) {
@@ -117,7 +133,7 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
     /**
      * removePolicyInternal removes a rule from the current policy.
      */
-    async removePolicyInternal(sec, ptype, rule) {
+    async removePolicyInternal(sec, ptype, rule, useWatcher) {
         if (!this.model.hasPolicy(sec, ptype, rule)) {
             return false;
         }
@@ -131,9 +147,16 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
                 }
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.watcher && this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForRemovePolicy(sec, ptype, ...rule);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const ok = await this.model.removePolicy(sec, ptype, rule);
         if (sec === 'g' && ok) {
@@ -142,7 +165,7 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
         return ok;
     }
     // removePolicies removes rules from the current policy.
-    async removePoliciesInternal(sec, ptype, rules) {
+    async removePoliciesInternal(sec, ptype, rules, useWatcher) {
         for (const rule of rules) {
             if (!this.model.hasPolicy(sec, ptype, rule)) {
                 return false;
@@ -163,9 +186,16 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
                 throw new Error('cannot to save policy, the adapter does not implement the BatchAdapter');
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.watcher && this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForRemovePolicies(sec, ptype, ...rules);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const [ok, effects] = this.model.removePolicies(sec, ptype, rules);
         if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {
@@ -176,7 +206,7 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
     /**
      * removeFilteredPolicyInternal removes rules based on field filters from the current policy.
      */
-    async removeFilteredPolicyInternal(sec, ptype, fieldIndex, fieldValues) {
+    async removeFilteredPolicyInternal(sec, ptype, fieldIndex, fieldValues, useWatcher) {
         if (this.adapter && this.autoSave) {
             try {
                 await this.adapter.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
@@ -187,9 +217,16 @@ class InternalEnforcer extends coreEnforcer_1.CoreEnforcer {
                 }
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.watcher && this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForRemoveFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const [ok, effects] = this.model.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
         if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {

package/lib/cjs/managementEnforcer.d.ts

@@ -373,4 +373,10 @@ export declare class ManagementEnforcer extends InternalEnforcer {
      * @param func function
      */
     addFunction(name: string, func: MatchingFunction): Promise<void>;
+    selfAddPolicy(sec: string, ptype: string, rule: string[]): Promise<boolean>;
+    selfRemovePolicy(sec: string, ptype: string, rule: string[]): Promise<boolean>;
+    selfRemoveFilteredPolicy(sec: string, ptype: string, fieldIndex: number, fieldValues: string[]): Promise<boolean>;
+    selfUpdatePolicy(sec: string, ptype: string, oldRule: string[], newRule: string[]): Promise<boolean>;
+    selfAddPolicies(sec: string, ptype: string, rule: string[][]): Promise<boolean>;
+    selfRemovePolicies(sec: string, ptype: string, rule: string[][]): Promise<boolean>;
 }

package/lib/cjs/managementEnforcer.js

@@ -240,7 +240,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async addNamedPolicy(ptype, ...params) {
-        return this.addPolicyInternal('p', ptype, params);
+        return this.addPolicyInternal('p', ptype, params, true);
     }
     /**
      * addNamedPolicies adds authorization rules to the current named policy.
@@ -252,7 +252,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async addNamedPolicies(ptype, rules) {
-        return this.addPoliciesInternal('p', ptype, rules);
+        return this.addPoliciesInternal('p', ptype, rules, true);
     }
     /**
      * updatePolicy updates an authorization rule from the current policy.
@@ -277,7 +277,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async updateNamedPolicy(ptype, oldRule, newRule) {
-        return this.updatePolicyInternal('p', ptype, oldRule, newRule);
+        return this.updatePolicyInternal('p', ptype, oldRule, newRule, true);
     }
     /**
      * removePolicy removes an authorization rule from the current policy.
@@ -316,7 +316,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async removeNamedPolicy(ptype, ...params) {
-        return this.removePolicyInternal('p', ptype, params);
+        return this.removePolicyInternal('p', ptype, params, true);
     }
     /**
      * removeNamedPolicies removes authorization rules from the current named policy.
@@ -326,7 +326,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async removeNamedPolicies(ptype, rules) {
-        return this.removePoliciesInternal('p', ptype, rules);
+        return this.removePoliciesInternal('p', ptype, rules, true);
     }
     /**
      * removeFilteredNamedPolicy removes an authorization rule from the current named policy, field filters can be specified.
@@ -338,7 +338,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async removeFilteredNamedPolicy(ptype, fieldIndex, ...fieldValues) {
-        return this.removeFilteredPolicyInternal('p', ptype, fieldIndex, fieldValues);
+        return this.removeFilteredPolicyInternal('p', ptype, fieldIndex, fieldValues, true);
     }
     /**
      * hasGroupingPolicy determines whether a role inheritance rule exists.
@@ -391,7 +391,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async addNamedGroupingPolicy(ptype, ...params) {
-        return this.addPolicyInternal('g', ptype, params);
+        return this.addPolicyInternal('g', ptype, params, true);
     }
     /**
      * addNamedGroupingPolicies adds named role inheritance rules to the current policy.
@@ -403,7 +403,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async addNamedGroupingPolicies(ptype, rules) {
-        return this.addPoliciesInternal('g', ptype, rules);
+        return this.addPoliciesInternal('g', ptype, rules, true);
     }
     /**
      * removeGroupingPolicy removes a role inheritance rule from the current policy.
@@ -442,7 +442,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async removeNamedGroupingPolicy(ptype, ...params) {
-        return this.removePolicyInternal('g', ptype, params);
+        return this.removePolicyInternal('g', ptype, params, true);
     }
     /**
      * removeNamedGroupingPolicies removes role inheritance rules from the current named policy.
@@ -452,7 +452,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async removeNamedGroupingPolicies(ptype, rules) {
-        return this.removePoliciesInternal('g', ptype, rules);
+        return this.removePoliciesInternal('g', ptype, rules, true);
     }
     /**
      * removeFilteredNamedGroupingPolicy removes a role inheritance rule from the current named policy, field filters can be specified.
@@ -464,7 +464,7 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
      * @return succeeds or not.
      */
     async removeFilteredNamedGroupingPolicy(ptype, fieldIndex, ...fieldValues) {
-        return this.removeFilteredPolicyInternal('g', ptype, fieldIndex, fieldValues);
+        return this.removeFilteredPolicyInternal('g', ptype, fieldIndex, fieldValues, true);
     }
     /**
      * addFunction adds a customized function.
@@ -474,5 +474,23 @@ class ManagementEnforcer extends internalEnforcer_1.InternalEnforcer {
     async addFunction(name, func) {
         this.fm.addFunction(name, func);
     }
+    async selfAddPolicy(sec, ptype, rule) {
+        return this.addPolicyInternal(sec, ptype, rule, false);
+    }
+    async selfRemovePolicy(sec, ptype, rule) {
+        return this.removePolicyInternal(sec, ptype, rule, false);
+    }
+    async selfRemoveFilteredPolicy(sec, ptype, fieldIndex, fieldValues) {
+        return this.removeFilteredPolicyInternal(sec, ptype, fieldIndex, fieldValues, false);
+    }
+    async selfUpdatePolicy(sec, ptype, oldRule, newRule) {
+        return this.updatePolicyInternal(sec, ptype, oldRule, newRule, false);
+    }
+    async selfAddPolicies(sec, ptype, rule) {
+        return this.addPoliciesInternal(sec, ptype, rule, false);
+    }
+    async selfRemovePolicies(sec, ptype, rule) {
+        return this.removePoliciesInternal(sec, ptype, rule, false);
+    }
 }
 exports.ManagementEnforcer = ManagementEnforcer;

package/lib/cjs/persist/index.d.ts

@@ -3,6 +3,7 @@ export * from './fileAdapter';
 export * from './stringAdapter';
 export * from './helper';
 export * from './watcher';
+export * from './watcherEx';
 export * from './filteredAdapter';
 export * from './defaultFilteredAdapter';
 export * from './batchAdapter';

package/lib/cjs/persist/index.js

@@ -15,6 +15,7 @@ __exportStar(require("./fileAdapter"), exports);
 __exportStar(require("./stringAdapter"), exports);
 __exportStar(require("./helper"), exports);
 __exportStar(require("./watcher"), exports);
+__exportStar(require("./watcherEx"), exports);
 __exportStar(require("./filteredAdapter"), exports);
 __exportStar(require("./defaultFilteredAdapter"), exports);
 __exportStar(require("./batchAdapter"), exports);

package/lib/cjs/persist/watcherEx.d.ts

@@ -0,0 +1,9 @@
+import { Model } from '../model';
+export interface WatcherEx {
+    updateForAddPolicy(sec: string, ptype: string, ...params: string[]): Promise<void>;
+    updateForRemovePolicy(sec: string, ptype: string, ...params: string[]): Promise<void>;
+    updateForRemoveFilteredPolicy(sec: string, ptype: string, fieldIndex: number, ...fieldValues: string[]): Promise<void>;
+    updateForSavePolicy(model: Model): Promise<boolean>;
+    updateForAddPolicies(sec: string, ptype: string, ...rules: string[][]): Promise<void>;
+    updateForRemovePolicies(sec: string, ptype: string, ...rules: string[][]): Promise<void>;
+}

package/lib/cjs/persist/watcherEx.js

@@ -0,0 +1,15 @@
+"use strict";
+// Copyright 2022 The Casbin Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/syncedEnforcer.js

@@ -340,7 +340,7 @@ class SyncedEnforcer extends enforcer_1.Enforcer {
      */
     async removeNamedPolicy(ptype, ...params) {
         await this.lock.acquireAsync();
-        return this.removePolicyInternal('p', ptype, params).finally(() => this.lock.release());
+        return this.removePolicyInternal('p', ptype, params, true).finally(() => this.lock.release());
     }
     /**
      * removeFilteredNamedPolicy removes an authorization rule from the current named policy, field filters can be specified.

package/lib/esm/coreEnforcer.d.ts

@@ -1,6 +1,6 @@
 import { Effector } from './effect';
 import { FunctionMap, Model, PolicyOp } from './model';
-import { Adapter, FilteredAdapter, Watcher, BatchAdapter, UpdatableAdapter } from './persist';
+import { Adapter, FilteredAdapter, Watcher, BatchAdapter, UpdatableAdapter, WatcherEx } from './persist';
 import { RoleManager } from './rbac';
 import { MatchingFunc } from './rbac';
 /**
@@ -14,6 +14,7 @@ export declare class CoreEnforcer {
     private matcherMap;
     protected adapter: UpdatableAdapter | FilteredAdapter | Adapter | BatchAdapter;
     protected watcher: Watcher | null;
+    protected watcherEx: WatcherEx | null;
     protected rmMap: Map<string, RoleManager>;
     protected enabled: boolean;
     protected autoSave: boolean;
@@ -56,6 +57,12 @@ export declare class CoreEnforcer {
      * @param watcher the watcher.
      */
     setWatcher(watcher: Watcher): void;
+    /**
+     * setWatcherEx sets the current watcherEx.
+     *
+     * @param watcherEx the watcherEx.
+     */
+    setWatcherEx(watcherEx: WatcherEx): void;
     /**
      * setRoleManager sets the current role manager.
      *

package/lib/esm/coreEnforcer.js

@@ -26,6 +26,7 @@ export class CoreEnforcer {
         this.eft = new DefaultEffector();
         this.matcherMap = new Map();
         this.watcher = null;
+        this.watcherEx = null;
         this.enabled = true;
         this.autoSave = true;
         this.autoBuildRoleLinks = true;
@@ -93,6 +94,14 @@ export class CoreEnforcer {
         this.watcher = watcher;
         watcher.setUpdateCallback(async () => await this.loadPolicy());
     }
+    /**
+     * setWatcherEx sets the current watcherEx.
+     *
+     * @param watcherEx the watcherEx.
+     */
+    setWatcherEx(watcherEx) {
+        this.watcherEx = watcherEx;
+    }
     /**
      * setRoleManager sets the current role manager.
      *
@@ -212,7 +221,10 @@ export class CoreEnforcer {
         if (!flag) {
             return false;
         }
-        if (this.watcher) {
+        if (this.watcherEx) {
+            return await this.watcherEx.updateForSavePolicy(this.model);
+        }
+        else if (this.watcher) {
             return await this.watcher.update();
         }
         return true;

package/lib/esm/internalEnforcer.d.ts

@@ -6,19 +6,19 @@ export declare class InternalEnforcer extends CoreEnforcer {
     /**
      * addPolicyInternal adds a rule to the current policy.
      */
-    addPolicyInternal(sec: string, ptype: string, rule: string[]): Promise<boolean>;
-    addPoliciesInternal(sec: string, ptype: string, rules: string[][]): Promise<boolean>;
+    protected addPolicyInternal(sec: string, ptype: string, rule: string[], useWatcher: boolean): Promise<boolean>;
+    protected addPoliciesInternal(sec: string, ptype: string, rules: string[][], useWatcher: boolean): Promise<boolean>;
     /**
      * updatePolicyInternal updates a rule from the current policy.
      */
-    updatePolicyInternal(sec: string, ptype: string, oldRule: string[], newRule: string[]): Promise<boolean>;
+    protected updatePolicyInternal(sec: string, ptype: string, oldRule: string[], newRule: string[], useWatcher: boolean): Promise<boolean>;
     /**
      * removePolicyInternal removes a rule from the current policy.
      */
-    removePolicyInternal(sec: string, ptype: string, rule: string[]): Promise<boolean>;
-    removePoliciesInternal(sec: string, ptype: string, rules: string[][]): Promise<boolean>;
+    protected removePolicyInternal(sec: string, ptype: string, rule: string[], useWatcher: boolean): Promise<boolean>;
+    protected removePoliciesInternal(sec: string, ptype: string, rules: string[][], useWatcher: boolean): Promise<boolean>;
     /**
      * removeFilteredPolicyInternal removes rules based on field filters from the current policy.
      */
-    removeFilteredPolicyInternal(sec: string, ptype: string, fieldIndex: number, fieldValues: string[]): Promise<boolean>;
+    protected removeFilteredPolicyInternal(sec: string, ptype: string, fieldIndex: number, fieldValues: string[], useWatcher: boolean): Promise<boolean>;
 }

package/lib/esm/internalEnforcer.js

@@ -20,7 +20,7 @@ export class InternalEnforcer extends CoreEnforcer {
     /**
      * addPolicyInternal adds a rule to the current policy.
      */
-    async addPolicyInternal(sec, ptype, rule) {
+    async addPolicyInternal(sec, ptype, rule, useWatcher) {
         if (this.model.hasPolicy(sec, ptype, rule)) {
             return false;
         }
@@ -34,9 +34,16 @@ export class InternalEnforcer extends CoreEnforcer {
                 }
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForAddPolicy(sec, ptype, ...rule);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const ok = this.model.addPolicy(sec, ptype, rule);
         if (sec === 'g' && ok) {
@@ -46,7 +53,7 @@ export class InternalEnforcer extends CoreEnforcer {
     }
     // addPolicies adds rules to the current policy.
     // removePolicies removes rules from the current policy.
-    async addPoliciesInternal(sec, ptype, rules) {
+    async addPoliciesInternal(sec, ptype, rules, useWatcher) {
         for (const rule of rules) {
             if (this.model.hasPolicy(sec, ptype, rule)) {
                 return false;
@@ -67,9 +74,16 @@ export class InternalEnforcer extends CoreEnforcer {
                 throw new Error('cannot to save policy, the adapter does not implement the BatchAdapter');
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForAddPolicies(sec, ptype, ...rules);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const [ok, effects] = await this.model.addPolicies(sec, ptype, rules);
         if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {
@@ -80,7 +94,7 @@ export class InternalEnforcer extends CoreEnforcer {
     /**
      * updatePolicyInternal updates a rule from the current policy.
      */
-    async updatePolicyInternal(sec, ptype, oldRule, newRule) {
+    async updatePolicyInternal(sec, ptype, oldRule, newRule, useWatcher) {
         if (!this.model.hasPolicy(sec, ptype, oldRule)) {
             return false;
         }
@@ -99,10 +113,12 @@ export class InternalEnforcer extends CoreEnforcer {
                 throw new Error('cannot to update policy, the adapter does not implement the UpdatableAdapter');
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // In fact I think it should wait for the respond, but they implement add_policy() like this
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.watcher && this.autoNotifyWatcher) {
+                // In fact I think it should wait for the respond, but they implement add_policy() like this
+                // error intentionally ignored
+                this.watcher.update();
+            }
         }
         const ok = this.model.updatePolicy(sec, ptype, oldRule, newRule);
         if (sec === 'g' && ok) {
@@ -114,7 +130,7 @@ export class InternalEnforcer extends CoreEnforcer {
     /**
      * removePolicyInternal removes a rule from the current policy.
      */
-    async removePolicyInternal(sec, ptype, rule) {
+    async removePolicyInternal(sec, ptype, rule, useWatcher) {
         if (!this.model.hasPolicy(sec, ptype, rule)) {
             return false;
         }
@@ -128,9 +144,16 @@ export class InternalEnforcer extends CoreEnforcer {
                 }
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.watcher && this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForRemovePolicy(sec, ptype, ...rule);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const ok = await this.model.removePolicy(sec, ptype, rule);
         if (sec === 'g' && ok) {
@@ -139,7 +162,7 @@ export class InternalEnforcer extends CoreEnforcer {
         return ok;
     }
     // removePolicies removes rules from the current policy.
-    async removePoliciesInternal(sec, ptype, rules) {
+    async removePoliciesInternal(sec, ptype, rules, useWatcher) {
         for (const rule of rules) {
             if (!this.model.hasPolicy(sec, ptype, rule)) {
                 return false;
@@ -160,9 +183,16 @@ export class InternalEnforcer extends CoreEnforcer {
                 throw new Error('cannot to save policy, the adapter does not implement the BatchAdapter');
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.watcher && this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForRemovePolicies(sec, ptype, ...rules);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const [ok, effects] = this.model.removePolicies(sec, ptype, rules);
         if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {
@@ -173,7 +203,7 @@ export class InternalEnforcer extends CoreEnforcer {
     /**
      * removeFilteredPolicyInternal removes rules based on field filters from the current policy.
      */
-    async removeFilteredPolicyInternal(sec, ptype, fieldIndex, fieldValues) {
+    async removeFilteredPolicyInternal(sec, ptype, fieldIndex, fieldValues, useWatcher) {
         if (this.adapter && this.autoSave) {
             try {
                 await this.adapter.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
@@ -184,9 +214,16 @@ export class InternalEnforcer extends CoreEnforcer {
                 }
             }
         }
-        if (this.watcher && this.autoNotifyWatcher) {
-            // error intentionally ignored
-            this.watcher.update();
+        if (useWatcher) {
+            if (this.watcher && this.autoNotifyWatcher) {
+                // error intentionally ignored
+                if (this.watcherEx) {
+                    this.watcherEx.updateForRemoveFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
+                }
+                else if (this.watcher) {
+                    this.watcher.update();
+                }
+            }
         }
         const [ok, effects] = this.model.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
         if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {

package/lib/esm/managementEnforcer.d.ts

@@ -373,4 +373,10 @@ export declare class ManagementEnforcer extends InternalEnforcer {
      * @param func function
      */
     addFunction(name: string, func: MatchingFunction): Promise<void>;
+    selfAddPolicy(sec: string, ptype: string, rule: string[]): Promise<boolean>;
+    selfRemovePolicy(sec: string, ptype: string, rule: string[]): Promise<boolean>;
+    selfRemoveFilteredPolicy(sec: string, ptype: string, fieldIndex: number, fieldValues: string[]): Promise<boolean>;
+    selfUpdatePolicy(sec: string, ptype: string, oldRule: string[], newRule: string[]): Promise<boolean>;
+    selfAddPolicies(sec: string, ptype: string, rule: string[][]): Promise<boolean>;
+    selfRemovePolicies(sec: string, ptype: string, rule: string[][]): Promise<boolean>;
 }

package/lib/esm/managementEnforcer.js

@@ -237,7 +237,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async addNamedPolicy(ptype, ...params) {
-        return this.addPolicyInternal('p', ptype, params);
+        return this.addPolicyInternal('p', ptype, params, true);
     }
     /**
      * addNamedPolicies adds authorization rules to the current named policy.
@@ -249,7 +249,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async addNamedPolicies(ptype, rules) {
-        return this.addPoliciesInternal('p', ptype, rules);
+        return this.addPoliciesInternal('p', ptype, rules, true);
     }
     /**
      * updatePolicy updates an authorization rule from the current policy.
@@ -274,7 +274,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async updateNamedPolicy(ptype, oldRule, newRule) {
-        return this.updatePolicyInternal('p', ptype, oldRule, newRule);
+        return this.updatePolicyInternal('p', ptype, oldRule, newRule, true);
     }
     /**
      * removePolicy removes an authorization rule from the current policy.
@@ -313,7 +313,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async removeNamedPolicy(ptype, ...params) {
-        return this.removePolicyInternal('p', ptype, params);
+        return this.removePolicyInternal('p', ptype, params, true);
     }
     /**
      * removeNamedPolicies removes authorization rules from the current named policy.
@@ -323,7 +323,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async removeNamedPolicies(ptype, rules) {
-        return this.removePoliciesInternal('p', ptype, rules);
+        return this.removePoliciesInternal('p', ptype, rules, true);
     }
     /**
      * removeFilteredNamedPolicy removes an authorization rule from the current named policy, field filters can be specified.
@@ -335,7 +335,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async removeFilteredNamedPolicy(ptype, fieldIndex, ...fieldValues) {
-        return this.removeFilteredPolicyInternal('p', ptype, fieldIndex, fieldValues);
+        return this.removeFilteredPolicyInternal('p', ptype, fieldIndex, fieldValues, true);
     }
     /**
      * hasGroupingPolicy determines whether a role inheritance rule exists.
@@ -388,7 +388,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async addNamedGroupingPolicy(ptype, ...params) {
-        return this.addPolicyInternal('g', ptype, params);
+        return this.addPolicyInternal('g', ptype, params, true);
     }
     /**
      * addNamedGroupingPolicies adds named role inheritance rules to the current policy.
@@ -400,7 +400,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async addNamedGroupingPolicies(ptype, rules) {
-        return this.addPoliciesInternal('g', ptype, rules);
+        return this.addPoliciesInternal('g', ptype, rules, true);
     }
     /**
      * removeGroupingPolicy removes a role inheritance rule from the current policy.
@@ -439,7 +439,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async removeNamedGroupingPolicy(ptype, ...params) {
-        return this.removePolicyInternal('g', ptype, params);
+        return this.removePolicyInternal('g', ptype, params, true);
     }
     /**
      * removeNamedGroupingPolicies removes role inheritance rules from the current named policy.
@@ -449,7 +449,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async removeNamedGroupingPolicies(ptype, rules) {
-        return this.removePoliciesInternal('g', ptype, rules);
+        return this.removePoliciesInternal('g', ptype, rules, true);
     }
     /**
      * removeFilteredNamedGroupingPolicy removes a role inheritance rule from the current named policy, field filters can be specified.
@@ -461,7 +461,7 @@ export class ManagementEnforcer extends InternalEnforcer {
      * @return succeeds or not.
      */
     async removeFilteredNamedGroupingPolicy(ptype, fieldIndex, ...fieldValues) {
-        return this.removeFilteredPolicyInternal('g', ptype, fieldIndex, fieldValues);
+        return this.removeFilteredPolicyInternal('g', ptype, fieldIndex, fieldValues, true);
     }
     /**
      * addFunction adds a customized function.
@@ -471,4 +471,22 @@ export class ManagementEnforcer extends InternalEnforcer {
     async addFunction(name, func) {
         this.fm.addFunction(name, func);
     }
+    async selfAddPolicy(sec, ptype, rule) {
+        return this.addPolicyInternal(sec, ptype, rule, false);
+    }
+    async selfRemovePolicy(sec, ptype, rule) {
+        return this.removePolicyInternal(sec, ptype, rule, false);
+    }
+    async selfRemoveFilteredPolicy(sec, ptype, fieldIndex, fieldValues) {
+        return this.removeFilteredPolicyInternal(sec, ptype, fieldIndex, fieldValues, false);
+    }
+    async selfUpdatePolicy(sec, ptype, oldRule, newRule) {
+        return this.updatePolicyInternal(sec, ptype, oldRule, newRule, false);
+    }
+    async selfAddPolicies(sec, ptype, rule) {
+        return this.addPoliciesInternal(sec, ptype, rule, false);
+    }
+    async selfRemovePolicies(sec, ptype, rule) {
+        return this.removePoliciesInternal(sec, ptype, rule, false);
+    }
 }

package/lib/esm/persist/index.d.ts

@@ -3,6 +3,7 @@ export * from './fileAdapter';
 export * from './stringAdapter';
 export * from './helper';
 export * from './watcher';
+export * from './watcherEx';
 export * from './filteredAdapter';
 export * from './defaultFilteredAdapter';
 export * from './batchAdapter';

package/lib/esm/persist/index.js

@@ -3,6 +3,7 @@ export * from './fileAdapter';
 export * from './stringAdapter';
 export * from './helper';
 export * from './watcher';
+export * from './watcherEx';
 export * from './filteredAdapter';
 export * from './defaultFilteredAdapter';
 export * from './batchAdapter';

package/lib/esm/persist/watcherEx.d.ts

@@ -0,0 +1,9 @@
+import { Model } from '../model';
+export interface WatcherEx {
+    updateForAddPolicy(sec: string, ptype: string, ...params: string[]): Promise<void>;
+    updateForRemovePolicy(sec: string, ptype: string, ...params: string[]): Promise<void>;
+    updateForRemoveFilteredPolicy(sec: string, ptype: string, fieldIndex: number, ...fieldValues: string[]): Promise<void>;
+    updateForSavePolicy(model: Model): Promise<boolean>;
+    updateForAddPolicies(sec: string, ptype: string, ...rules: string[][]): Promise<void>;
+    updateForRemovePolicies(sec: string, ptype: string, ...rules: string[][]): Promise<void>;
+}

package/lib/esm/persist/watcherEx.js

@@ -0,0 +1,13 @@
+// Copyright 2022 The Casbin Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.

package/lib/esm/syncedEnforcer.js

@@ -334,7 +334,7 @@ export class SyncedEnforcer extends Enforcer {
      */
     async removeNamedPolicy(ptype, ...params) {
         await this.lock.acquireAsync();
-        return this.removePolicyInternal('p', ptype, params).finally(() => this.lock.release());
+        return this.removePolicyInternal('p', ptype, params, true).finally(() => this.lock.release());
     }
     /**
      * removeFilteredNamedPolicy removes an authorization rule from the current named policy, field filters can be specified.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.16.0",
+  "version": "5.18.0",
   "description": "An authorization library that supports access control models like ACL, RBAC, ABAC in Node.JS",
   "main": "lib/cjs/index.js",
   "typings": "lib/cjs/index.d.ts",