@tsingroc/tsingroc-components 5.0.0-alpha.24 → 5.0.0-alpha.26

package/dist/components/auth/LoginCheck.js

@@ -21,7 +21,20 @@ export function LoginCheck(props) {
     return () => sessionStore.addEventListener(onChange);
   }, () => sessionStore.session);
   const [status, setStatus] = useState(session ? "loaded" : "loading");
-  const onSessionStoreEvent = useEffectEvent(event => {
+  const startLoading = useEffectEvent(async () => {
+    try {
+      onBeforeGetSession?.();
+      void (await sessionStore.get());
+    } finally {
+      setStatus("loaded");
+    }
+  });
+  useEffect(() => {
+    if (status === "loading") {
+      startLoading();
+    }
+  }, [status]);
+  const onSessionStoreEvent = useEffectEvent(async event => {
     switch (event.type) {
       case "failed":
         onFailed?.(event.reason);
@@ -34,6 +47,8 @@ export function LoginCheck(props) {
         break;
       case "invalidated":
         onInvalidated?.(event.reason);
+        onBeforeGetSession?.();
+        void (await sessionStore.get());
         break;
     }
   });
@@ -41,18 +56,5 @@ export function LoginCheck(props) {
     sessionStore.addEventListener(onSessionStoreEvent);
     return () => sessionStore.removeEventListener(onSessionStoreEvent);
   }, [sessionStore]);
-  const startLoading = useEffectEvent(async () => {
-    try {
-      onBeforeGetSession?.();
-      void (await sessionStore.get());
-    } finally {
-      setStatus("loaded");
-    }
-  });
-  useEffect(() => {
-    if (status === "loading") {
-      startLoading();
-    }
-  }, [status]);
   return status === "loading" ? loading : session ? children : failed;
 }

package/dist/components/auth/SessionStore.d.ts

@@ -48,8 +48,8 @@ export declare class SessionStore {
  *
  * - validated：会话首次验证成功。
  * - revalidated：会话重新验证成功。
- * - failed: 会话创建或首次验证失败。
- * - invalidated：会话失效。
+ * - failed: 会话创建失败。
+ * - invalidated：会话验证失败或者被手动终止。
  */
 export type SessionStoreEvent = {
     type: "validated" | "revalidated";

package/dist/components/auth/SessionStore.js

@@ -72,7 +72,7 @@ export class SessionStore {
     let cancelled = false;
     const promise = this.#validate(state).catch(err => {
       this.#updateAndNotify(null, {
-        type: "failed",
+        type: "invalidated",
         reason: err
       });
       throw err;
@@ -189,6 +189,6 @@ export class SessionStore {
  *
  * - validated：会话首次验证成功。
  * - revalidated：会话重新验证成功。
- * - failed: 会话创建或首次验证失败。
- * - invalidated：会话失效。
+ * - failed: 会话创建失败。
+ * - invalidated：会话验证失败或者被手动终止。
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsingroc/tsingroc-components",
-  "version": "5.0.0-alpha.24",
+  "version": "5.0.0-alpha.26",
   "author": "",
   "license": "ISC",
   "description": "",