@lanaqi/rsr 0.0.1-rc.0 → 0.0.1

package/README.md

@@ -15,7 +15,7 @@ rsr 是 react security router 的简写，一个基于 react router 实现路由
 
 # 版本兼容
 
-注意：不兼容 react router 7 版本，在 v7 😒 版本上的 `useBlocker` 逻辑变更了，暂时不考虑兼容。
+注意：目前只兼容 react router v6 & v7 版本，其它的版本，暂时不考虑兼容。
 
 # 简单例子
 

package/dist/index.js

@@ -97,7 +97,7 @@ class SimpleResource {
         this.patterns = new Set(patterns);
         this.permissions = new Set(permissions);
         this.labels = new Set(labels);
-        if (0 === this.patterns.size) throw new Error('访问资源模式集合不能为空，请检查！');
+        if (0 === this.patterns.size) throw new Error("\u8BBF\u95EE\u8D44\u6E90\u6A21\u5F0F\u96C6\u5408\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\uFF01");
         if (0 === this.permissions.size) {
             this.anonymous = true;
             this.authenticated = false;
@@ -431,10 +431,8 @@ class SimpleStorer {
         const authenticationStr = this.aaaStorage.getItem(this.authenticationKey);
         if (authenticationStr) {
             const authenticationObj = JSON.parse(authenticationStr);
-            if ('boolean' == typeof authenticationObj.authenticated) {
-                if (void 0 !== authenticationObj.permissions && Array.isArray(authenticationObj.permissions)) return new SimpleUser(authenticationObj);
-                return new SimpleAuthentication(authenticationObj);
-            }
+            if ('boolean' == typeof authenticationObj.authenticated) if (void 0 !== authenticationObj.permissions && Array.isArray(authenticationObj.permissions)) return new SimpleUser(authenticationObj);
+            else return new SimpleAuthentication(authenticationObj);
         }
     }
     verifyAuthentication(recorder, authentication) {
@@ -639,7 +637,7 @@ class BehaveHandler {
             return common_AccessBehave.goNavigate;
         }
         if (this._config.notAuthenticationFunc) return this._config.notAuthenticationFunc(context);
-        throw new Error('没有认证的行为是必须配置的，请检查！');
+        throw new Error("\u6CA1\u6709\u8BA4\u8BC1\u7684\u884C\u4E3A\u662F\u5FC5\u987B\u914D\u7F6E\u7684\uFF0C\u8BF7\u68C0\u67E5\uFF01");
     }
     invalidAuthentication(context) {
         if (this._config.invalidAuthenticationPath) {
@@ -671,24 +669,21 @@ class BehaveHandler {
             return common_AccessBehave.goNavigate;
         }
         if (this._config.accessDeniedFunc) return this._config.accessDeniedFunc(context);
-        throw new Error('拒绝访问的行为是必须配置的，请检查！');
+        throw new Error("\u62D2\u7EDD\u8BBF\u95EE\u7684\u884C\u4E3A\u662F\u5FC5\u987B\u914D\u7F6E\u7684\uFF0C\u8BF7\u68C0\u67E5\uFF01");
     }
     allowAccess(context) {
         if (this._config.allowAccessFunc) this._config.allowAccessFunc(context);
         return common_AccessBehave.doNothing;
     }
     errorDecision(context, decision) {
-        if (this._config.errorDecisionFunc) {
-            this._config.errorDecisionFunc(context, decision);
-            return;
-        }
+        if (this._config.errorDecisionFunc) return void this._config.errorDecisionFunc(context, decision);
         if (decision === common_AccessDecision.notSignature) return;
         switch(decision){
             case common_AccessDecision.notResource:
                 this.accessDenied(context);
                 break;
             case common_AccessDecision.notAuthentication:
-                throw new Error('没有认证的错误决策，请检查！');
+                throw new Error("\u6CA1\u6709\u8BA4\u8BC1\u7684\u9519\u8BEF\u51B3\u7B56\uFF0C\u8BF7\u68C0\u67E5\uFF01");
             case common_AccessDecision.invalidAuthentication:
                 this.notAuthentication(context);
                 break;
@@ -697,7 +692,7 @@ class BehaveHandler {
                 break;
             case common_AccessDecision.accessDenied:
             default:
-                throw new Error('拒绝访问的错误决策，请检查！');
+                throw new Error("\u62D2\u7EDD\u8BBF\u95EE\u7684\u9519\u8BEF\u51B3\u7B56\uFF0C\u8BF7\u68C0\u67E5\uFF01");
         }
     }
 }
@@ -1121,7 +1116,7 @@ class AccessNavigatorBuilder {
         return this;
     }
     build() {
-        if (!this._navigate) throw new Error('导航函数是必须设置的，请检查！');
+        if (!this._navigate) throw new Error("\u5BFC\u822A\u51FD\u6570\u662F\u5FC5\u987B\u8BBE\u7F6E\u7684\uFF0C\u8BF7\u68C0\u67E5\uFF01");
         return new SimpleNavigator(this._navigate);
     }
 }
@@ -1210,7 +1205,7 @@ class AccessHandlerBuilder {
         return this;
     }
     build() {
-        if (!this._config) throw new Error('行为配置是必须设置，请检查！');
+        if (!this._config) throw new Error("\u884C\u4E3A\u914D\u7F6E\u662F\u5FC5\u987B\u8BBE\u7F6E\uFF0C\u8BF7\u68C0\u67E5\uFF01");
         return new BehaveHandler(this._config);
     }
 }
@@ -1307,7 +1302,7 @@ class AccessGuarderBuilder {
 const SecurityContext = /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react__.createContext)(null);
 const useSecurityContext = ()=>{
     const sc = (0, __WEBPACK_EXTERNAL_MODULE_react__.useContext)(SecurityContext);
-    if (!sc) throw new Error('安全上下文为空，必须使用安全提供者包裹组件来设置安全上下文');
+    if (!sc) throw new Error("\u5B89\u5168\u4E0A\u4E0B\u6587\u4E3A\u7A7A\uFF0C\u5FC5\u987B\u4F7F\u7528\u5B89\u5168\u63D0\u4F9B\u8005\u5305\u88F9\u7EC4\u4EF6\u6765\u8BBE\u7F6E\u5B89\u5168\u4E0A\u4E0B\u6587");
     return sc;
 };
 function SecurityProvider({ children, bundler }) {
@@ -1331,74 +1326,76 @@ function SecurityBlocker({ children }) {
     const [nextPath, setNextPath] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)((0, __WEBPACK_EXTERNAL_MODULE_react_router_dom_5358f3fe__.useLocation)());
     const [firstAccess, setFirstAccess] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(true);
     const [firstHandle, setFirstHandle] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(true);
-    const [firstSignature, setFirstSignature] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(1);
-    const [handleDecision, setHandleDecision] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(false);
+    const [countSignature, setCountSignature] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(1);
+    const [handledDecision, setHandledDecision] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(false);
     const [beforeDecision, setBeforeDecision] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(void 0);
     const [currentDecision, setCurrentDecision] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(void 0);
-    const [executeBlock, setExecuteBlock] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(false);
+    const [securityBlock, setSecurityBlock] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(false);
+    const [executableBlocked, setExecutableBlocked] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(true);
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>{
-        if ('blocked' === blocker.state) {
+        if ('blocked' === blocker.state && executableBlocked) {
+            let isProceed;
             const recorder = context.getRecorder();
             const stayPath = recorder.getAllowPath();
             const blockPath = blocker.location;
             let guardBlocked = false;
-            if (executeBlock) guardBlocked = guarder.guardBlock(blockPath);
+            if (securityBlock) guardBlocked = guarder.guardBlock(blockPath);
             if (guardBlocked) {
-                blocker.reset();
-                setNextPath(blockPath);
-                setHandleDecision(false);
+                setHandledDecision(false);
                 setCurrentDecision(void 0);
+                isProceed = false;
             } else {
                 if (!beforeDecision) guarder.guardBefore(blockPath);
                 const blockedDecision = guarder.guardDecision(blockPath);
-                if (blockedDecision === common_AccessDecision.allowAccess) {
-                    const isDiff = !!stayPath && stayPath.pathname !== blockPath.pathname;
-                    if (isDiff) guarder.permitBefore(stayPath, blockPath);
-                    blocker.proceed();
-                    if (isDiff) guarder.permitAfter(stayPath, blockPath);
-                } else blocker.reset();
-                setNextPath(blockPath);
-                setHandleDecision(true);
+                setHandledDecision(true);
                 setCurrentDecision(blockedDecision);
+                isProceed = blockedDecision === common_AccessDecision.allowAccess;
             }
+            setNextPath(blockPath);
+            setExecutableBlocked(false);
+            if (isProceed) {
+                const isDiff = !!stayPath && stayPath.pathname !== blockPath.pathname;
+                if (isDiff) guarder.permitBefore(stayPath, blockPath);
+                blocker.proceed();
+                if (isDiff) guarder.permitAfter(stayPath, blockPath);
+            } else blocker.reset();
         } else if ('unblocked' === blocker.state) {
-            if (handleDecision && currentDecision) {
+            if (handledDecision && currentDecision) {
                 let navNext;
                 const behave = guarder.guardHandle(currentDecision, beforeDecision);
                 switch(behave){
                     case common_AccessBehave.reDecision:
                         setBeforeDecision(currentDecision);
-                        setExecuteBlock(false);
+                        setSecurityBlock(false);
                         navNext = true;
                         break;
                     case common_AccessBehave.goNavigate:
                         setBeforeDecision(void 0);
                         navNext = false;
-                        setExecuteBlock(false);
+                        setSecurityBlock(false);
                         break;
                     case common_AccessBehave.doNothing:
                     default:
                         setBeforeDecision(void 0);
                         navNext = false;
-                        setExecuteBlock(true);
+                        setSecurityBlock(true);
                         break;
                 }
-                if (firstHandle && currentDecision === common_AccessDecision.notSignature && behave === common_AccessBehave.reDecision) {
-                    if (firstSignature >= 3) {
-                        setFirstHandle(false);
-                        setBeforeDecision(common_AccessDecision.notSignature);
-                        setHandleDecision(true);
-                        setCurrentDecision(common_AccessDecision.accessDenied);
-                    } else {
-                        const signDecision = guarder.guardDecision(nextPath);
-                        setHandleDecision(true);
-                        setBeforeDecision(void 0);
-                        setCurrentDecision(signDecision);
-                        setFirstSignature(firstSignature + 1);
-                    }
+                if (firstHandle && currentDecision === common_AccessDecision.notSignature && behave === common_AccessBehave.reDecision) if (countSignature >= 3) {
+                    setFirstHandle(false);
+                    setBeforeDecision(common_AccessDecision.notSignature);
+                    setHandledDecision(true);
+                    setCurrentDecision(common_AccessDecision.accessDenied);
                 } else {
+                    const signDecision = guarder.guardDecision(nextPath);
+                    setHandledDecision(true);
+                    setBeforeDecision(void 0);
+                    setCurrentDecision(signDecision);
+                    setCountSignature(countSignature + 1);
+                }
+                else {
                     setFirstHandle(false);
-                    setHandleDecision(false);
+                    setHandledDecision(false);
                     setCurrentDecision(void 0);
                     if (navNext) context.getNavigator().navigate(nextPath);
                     else {
@@ -1410,9 +1407,10 @@ function SecurityBlocker({ children }) {
                 guarder.guardBefore(nextPath);
                 const firstDecision = guarder.guardDecision(nextPath);
                 setFirstAccess(false);
-                setHandleDecision(true);
+                setHandledDecision(true);
                 setCurrentDecision(firstDecision);
             }
+            if (!executableBlocked) setExecutableBlocked(true);
         }
     }, [
         blocker,
@@ -1421,11 +1419,12 @@ function SecurityBlocker({ children }) {
         nextPath,
         firstAccess,
         firstHandle,
-        firstSignature,
-        handleDecision,
+        countSignature,
+        handledDecision,
         beforeDecision,
         currentDecision,
-        executeBlock
+        securityBlock,
+        executableBlocked
     ]);
     if (!guarded) return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(__WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.Fragment, {});
     return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(__WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.Fragment, {
@@ -1559,10 +1558,8 @@ const useSaveSignature = (navigate = true, redirect = '/')=>{
         let target;
         target = path ? path : recorder.getOriginPath();
         if (target) storer.saveSignature(recorder, target);
-        if (navigate) {
-            if (target) navigator.navigate(target);
-            else navigator.navigate(redirect);
-        }
+        if (navigate) if (target) navigator.navigate(target);
+        else navigator.navigate(redirect);
     };
 };
 const useDeleteSignature = ()=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lanaqi/rsr",
-  "version": "0.0.1-rc.0",
+  "version": "0.0.1",
   "type": "module",
   "exports": {
     ".": {
@@ -49,18 +49,18 @@
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@rsbuild/plugin-react": "^1.1.1",
-    "@rslib/core": "^0.5.5",
-    "@types/react": "^18.3.19",
-    "@types/react-dom": "^18.3.5",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-router-dom": "^6.30.0",
+    "@rslib/core": "^0.6.8",
+    "@types/react": "^19.1.3",
+    "@types/react-dom": "^19.1.3",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
+    "react-router-dom": "^7.5.3",
     "typescript": "^5.8.2"
   },
   "peerDependencies": {
     "react": ">=17.0.0",
     "react-dom": ">=17.0.0",
-    "react-router-dom": "^6.0.0"
+    "react-router-dom": "^6.0.0 || ^7.0.0"
   },
   "private": false,
   "publishConfig": {