@nihplod/sso-sdk 1.4.1 → 1.6.0

package/dist/react/index.mjs

@@ -101,6 +101,9 @@ function createMemoryStorageAdapter() {
     },
     remove(key) {
       store.delete(key);
+    },
+    keys() {
+      return [...store.keys()];
     }
   };
 }
@@ -109,26 +112,44 @@ function createSessionStorageAdapter() {
   const fallback = /* @__PURE__ */ new Map();
   return {
     get(key) {
-      if (typeof sessionStorage !== "undefined") {
-        return sessionStorage.getItem(STORAGE_PREFIX + key) ?? fallback.get(key) ?? null;
+      try {
+        if (typeof sessionStorage !== "undefined") {
+          return sessionStorage.getItem(STORAGE_PREFIX + key) ?? fallback.get(key) ?? null;
+        }
+      } catch {
       }
       return fallback.get(key) ?? null;
     },
     set(key, value) {
-      if (typeof sessionStorage === "undefined") {
-        fallback.set(key, value);
-        return;
-      }
       try {
-        sessionStorage.setItem(STORAGE_PREFIX + key, value);
+        if (typeof sessionStorage !== "undefined") {
+          sessionStorage.setItem(STORAGE_PREFIX + key, value);
+          return;
+        }
       } catch {
-        fallback.set(key, value);
       }
+      fallback.set(key, value);
     },
     remove(key) {
       fallback.delete(key);
-      if (typeof sessionStorage === "undefined") return;
-      sessionStorage.removeItem(STORAGE_PREFIX + key);
+      try {
+        if (typeof sessionStorage === "undefined") return;
+        sessionStorage.removeItem(STORAGE_PREFIX + key);
+      } catch {
+      }
+    },
+    keys() {
+      const result = new Set(fallback.keys());
+      try {
+        if (typeof sessionStorage !== "undefined") {
+          for (let i = 0; i < sessionStorage.length; i++) {
+            const key = sessionStorage.key(i);
+            if (key?.startsWith(STORAGE_PREFIX)) result.add(key.slice(STORAGE_PREFIX.length));
+          }
+        }
+      } catch {
+      }
+      return [...result];
     }
   };
 }
@@ -221,32 +242,58 @@ function clearAllSsoData(clientId) {
   removeReturnUrl();
   removeLogoutState();
   removeSilentProbe();
-  const prefix = STORAGE_PREFIX + VERIFIER_KEY_PREFIX;
-  const stores = [
-    typeof sessionStorage !== "undefined" ? sessionStorage : null,
-    typeof localStorage !== "undefined" ? localStorage : null
-  ];
+  const stores = [];
+  try {
+    if (typeof sessionStorage !== "undefined") stores.push(sessionStorage);
+  } catch {
+  }
+  try {
+    if (typeof localStorage !== "undefined") stores.push(localStorage);
+  } catch {
+  }
+  const abstractKeys = /* @__PURE__ */ new Set();
   for (const store of stores) {
-    if (!store) continue;
     const keys = [];
-    for (let i = 0; i < store.length; i++) {
-      const key = store.key(i);
-      if (key?.startsWith(prefix)) keys.push(key);
+    try {
+      for (let i = 0; i < store.length; i++) {
+        const key = store.key(i);
+        if (key?.startsWith(STORAGE_PREFIX)) keys.push(key);
+      }
+    } catch {
+      continue;
     }
     for (const key of keys) {
-      _transient.remove(key.slice(STORAGE_PREFIX.length));
-      store.removeItem(key);
+      abstractKeys.add(key.slice(STORAGE_PREFIX.length));
+      try {
+        store.removeItem(key);
+      } catch {
+      }
+    }
+  }
+  for (const store of [_transient, _storage]) {
+    try {
+      for (const key of store.keys?.() ?? []) abstractKeys.add(key);
+    } catch {
     }
   }
+  for (const key of abstractKeys) {
+    _transient.remove(key);
+    _storage.remove(key);
+  }
 }
 
 // src/core/security.ts
+var UNSAFE_URL_CHAR_PATTERN = /[\\\u0000-\u001F\u007F]/;
 function isTrustedReturnUrl(url, currentOrigin) {
   if (!url) return false;
-  if (url.includes("\\")) return false;
-  if (url.startsWith("/") && !url.startsWith("//")) return true;
+  if (UNSAFE_URL_CHAR_PATTERN.test(url)) return false;
+  if (url.startsWith("//")) return false;
+  if (url.startsWith("/")) return true;
   try {
-    return new URL(url).origin === currentOrigin;
+    const parsed = new URL(url);
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return false;
+    if (parsed.username || parsed.password) return false;
+    return parsed.origin === currentOrigin;
   } catch {
     return false;
   }
@@ -458,7 +505,10 @@ async function validateIdToken(idToken, accessToken, expectedIssuer, expectedCli
   if (Date.now() >= payload.exp * 1e3 + 6e4) {
     throw new SsoError("id_token_expired", "ID Token \u5DF2\u8FC7\u671F");
   }
-  if (typeof payload.iat === "number" && payload.iat * 1e3 > Date.now() + 6e4) {
+  if (typeof payload.iat !== "number") {
+    throw new SsoError("id_token_invalid", "ID Token \u7F3A\u5C11 iat \u58F0\u660E");
+  }
+  if (payload.iat * 1e3 > Date.now() + 6e4) {
     throw new SsoError("id_token_invalid", "ID Token iat \u5728\u672A\u6765\uFF0C\u7591\u4F3C\u4F2A\u9020\u6216\u65F6\u949F\u5F02\u5E38");
   }
   if (typeof payload.sub !== "string" || !payload.sub) {
@@ -475,11 +525,47 @@ async function validateIdToken(idToken, accessToken, expectedIssuer, expectedCli
     if (!tokenNonce || !timingSafeEqualString(expectedNonce, tokenNonce)) {
       throw new SsoError("id_token_nonce_mismatch", "ID Token nonce \u4E0D\u5339\u914D");
     }
+  } else if (typeof payload.nonce === "string" && payload.nonce) {
+    throw new SsoError(
+      "id_token_nonce_mismatch",
+      "ID Token \u643A\u5E26 nonce \u4F46\u672C\u5730\u65E0\u671F\u671B\u503C\uFF08\u53EF\u80FD\u975E\u672C\u6B21\u767B\u5F55\u4F1A\u8BDD\u7B7E\u53D1\uFF09"
+    );
   }
   return { sub: payload.sub };
 }
 
+// src/core/http.ts
+var REQUEST_TIMEOUT_MS = 1e4;
+async function fetchWithTimeout(input, init = {}, timeoutMs = REQUEST_TIMEOUT_MS) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetch(input, { ...init, signal: controller.signal });
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
 // src/core/SsoClient.ts
+var REVOKE_TIMEOUT_MS = 3e3;
+var EXPIRY_SKEW_MS = 1e4;
+function assertValidTokenResponse(data, requireRefreshToken) {
+  if (typeof data.access_token !== "string" || !data.access_token) {
+    throw new SsoError("token_request_failed", "Token \u54CD\u5E94\u7F3A\u5C11 access_token");
+  }
+  if (typeof data.expires_in !== "number" || !Number.isFinite(data.expires_in) || data.expires_in <= 0) {
+    throw new SsoError(
+      "token_request_failed",
+      `Token \u54CD\u5E94 expires_in \u975E\u6CD5: ${String(data.expires_in)}`
+    );
+  }
+  if (requireRefreshToken && (typeof data.refresh_token !== "string" || !data.refresh_token)) {
+    throw new SsoError(
+      "token_request_failed",
+      "Token \u54CD\u5E94\u7F3A\u5C11 refresh_token\uFF08authorization_code \u4EA4\u6362\u5FC5\u987B\u8FD4\u56DE\uFF09"
+    );
+  }
+}
 var SILENT_PROBE_ERRORS = /* @__PURE__ */ new Set([
   "login_required",
   "consent_required",
@@ -490,6 +576,8 @@ var _SsoClient = class _SsoClient {
     this._discovery = null;
     this._discoveryFetchedAt = 0;
     this._refreshLock = null;
+    /** Discovery 端点 origin 校验失败只告警一次（拒绝的文档不缓存，避免每次调用刷屏） */
+    this._discoveryOriginWarned = false;
     if (!config.clientId) throw new SsoError("invalid_config", "clientId \u4E0D\u80FD\u4E3A\u7A7A");
     if (!config.redirectUri) throw new SsoError("invalid_config", "redirectUri \u4E0D\u80FD\u4E3A\u7A7A");
     if (!config.ssoBaseUrl) throw new SsoError("invalid_config", "ssoBaseUrl \u4E0D\u80FD\u4E3A\u7A7A");
@@ -498,8 +586,67 @@ var _SsoClient = class _SsoClient {
     this._serverBase = (config.serverBaseUrl ?? base).replace(/\/+$/, "");
   }
   // ============================================
+  // 调试日志
+  // ============================================
+  /**
+   * 调试日志（config.debug=true 时输出，前缀 [SSO SDK]）：
+   * 覆盖登录发起 / 回调结果 / 刷新失败 / 登出等关键节点，便于接入方定位问题。
+   * 不会输出 token/授权码等敏感值。
+   */
+  debugLog(...args) {
+    if (this.config.debug) {
+      console.warn("[SSO SDK]", ...args);
+    }
+  }
+  // ============================================
   // 内部方法
   // ============================================
+  /**
+   * 校验 Discovery 文档端点 origin（防文档被篡改后 token/code 被导向攻击者服务器）：
+   * - authorization_endpoint 必须与 ssoBaseUrl 同源（浏览器跳转目标）；
+   * - token_endpoint / userinfo_endpoint 必须与 ssoBaseUrl 同源，
+   *   或（配置了 serverBaseUrl 时）与内网地址同源。
+   * 任一不匹配：告警并返回 null（上层回退到默认端点，fail-safe）。
+   * 可通过 config.allowCrossOriginDiscoveryEndpoints 关闭（见配置项警告）。
+   */
+  _sanitizeDiscovery(d) {
+    if (this.config.allowCrossOriginDiscoveryEndpoints) return d;
+    const allowedOrigins = /* @__PURE__ */ new Set();
+    try {
+      allowedOrigins.add(new URL(this.config.ssoBaseUrl).origin);
+      allowedOrigins.add(new URL(this._serverBase).origin);
+    } catch {
+      return null;
+    }
+    const sameOrigin = (endpoint) => {
+      try {
+        return allowedOrigins.has(new URL(endpoint).origin);
+      } catch {
+        return false;
+      }
+    };
+    const publicOrigin = new URL(this.config.ssoBaseUrl).origin;
+    let authorizationOk = false;
+    try {
+      authorizationOk = new URL(d.authorization_endpoint).origin === publicOrigin;
+    } catch {
+      authorizationOk = false;
+    }
+    const bad = [];
+    if (!authorizationOk) bad.push("authorization_endpoint");
+    if (!sameOrigin(d.token_endpoint)) bad.push("token_endpoint");
+    if (!sameOrigin(d.userinfo_endpoint)) bad.push("userinfo_endpoint");
+    if (bad.length > 0) {
+      if (!this._discoveryOriginWarned) {
+        this._discoveryOriginWarned = true;
+        console.warn(
+          `[SSO SDK] OIDC Discovery \u7AEF\u70B9 origin \u4E0E ssoBaseUrl/serverBaseUrl \u4E0D\u5339\u914D\uFF08${bad.join(", ")}\uFF09\uFF0C\u5DF2\u56DE\u9000\u5230\u9ED8\u8BA4\u7AEF\u70B9\u3002\u82E5 SSO \u4E2D\u5FC3\u786E\u5B9E\u6258\u7BA1\u8DE8\u6E90\u7AEF\u70B9\uFF0C\u8BF7\u8BBE\u7F6E allowCrossOriginDiscoveryEndpoints: true`
+        );
+      }
+      return null;
+    }
+    return d;
+  }
   /**
    * 获取 OIDC Discovery 文档（带缓存 + 超时）
    *
@@ -526,7 +673,10 @@ var _SsoClient = class _SsoClient {
         );
         return null;
       }
-      this._discovery = await res.json();
+      const doc = await res.json();
+      const sanitized = this._sanitizeDiscovery(doc);
+      if (!sanitized) return null;
+      this._discovery = sanitized;
       this._discoveryFetchedAt = now;
       return this._discovery;
     } catch (err) {
@@ -877,7 +1027,7 @@ var _SsoClient = class _SsoClient {
     }
     let res;
     try {
-      res = await fetch(tokenEndpoint, {
+      res = await fetchWithTimeout(tokenEndpoint, {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body: body.toString()
@@ -886,6 +1036,10 @@ var _SsoClient = class _SsoClient {
       throw new SsoError("network_error", "\u7F51\u7EDC\u8BF7\u6C42\u5931\u8D25", err);
     }
     if (!res.ok) {
+      removeOAuthState(this.config.clientId);
+      removeOAuthNonce(this.config.clientId);
+      removePkceVerifier(this.config.clientId);
+      removeSilentProbe(this.config.clientId);
       let errData = {};
       try {
         errData = await res.json();
@@ -898,6 +1052,19 @@ var _SsoClient = class _SsoClient {
       );
     }
     const data = await res.json();
+    assertValidTokenResponse(data, true);
+    const requestedScopes = (this.config.scopes || "openid profile").split(" ").filter(Boolean);
+    if (requestedScopes.includes("openid") && !data.id_token) {
+      removeOAuthState(this.config.clientId);
+      removeOAuthNonce(this.config.clientId);
+      removePkceVerifier(this.config.clientId);
+      removeSilentProbe(this.config.clientId);
+      removeTokenData(this.config.clientId);
+      throw new SsoError(
+        "id_token_invalid",
+        "Token \u54CD\u5E94\u7F3A\u5C11 id_token\uFF08scope \u542B openid \u65F6\u5FC5\u9700\uFF09"
+      );
+    }
     if (data.id_token) {
       try {
         await validateIdToken(
@@ -927,6 +1094,7 @@ var _SsoClient = class _SsoClient {
       expires_at: now + data.expires_in * 1e3
     };
     saveTokenData(tokenData, this.config.clientId);
+    this.debugLog("handleCallback: token \u4EA4\u6362\u6210\u529F", { clientId: this.config.clientId });
     return tokenData;
   }
   /**
@@ -962,7 +1130,7 @@ var _SsoClient = class _SsoClient {
     let lastErr;
     for (let attempt = 0; attempt < 2; attempt++) {
       try {
-        res = await fetch(tokenEndpoint, {
+        res = await fetchWithTimeout(tokenEndpoint, {
           method: "POST",
           headers: { "Content-Type": "application/x-www-form-urlencoded" },
           body: body.toString()
@@ -984,15 +1152,20 @@ var _SsoClient = class _SsoClient {
       } catch {
       }
       const errorCode = errData.error || "";
-      if (errorCode === "invalid_grant" || res.status === 401) {
+      if (errorCode === "invalid_grant") {
         removeTokenData(this.config.clientId);
       }
+      this.debugLog("refreshToken: \u5237\u65B0\u5931\u8D25", { status: res.status, error: errorCode });
+      if (!errorCode && res.status === 401) {
+        throw new SsoError("sso_server_error", "\u5237\u65B0 Token \u5931\u8D25\uFF08\u7F51\u5173\u5F02\u5E38\uFF09\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5");
+      }
       throw new SsoError(
         mapOAuthErrorToSsoCode(errorCode, "refresh"),
         errData.error_description || `\u5237\u65B0 Token \u5931\u8D25: HTTP ${res.status}`
       );
     }
     const data = await res.json();
+    assertValidTokenResponse(data, false);
     if (data.id_token) {
       try {
         await validateIdToken(
@@ -1030,13 +1203,13 @@ var _SsoClient = class _SsoClient {
     if (!tokenData) {
       throw new SsoError("not_authenticated", "\u672A\u767B\u5F55");
     }
-    if (Date.now() >= tokenData.expires_at) {
+    if (Date.now() >= tokenData.expires_at - EXPIRY_SKEW_MS) {
       tokenData = await this.refreshToken();
     }
     const userinfoEndpoint = await this._getUserinfoEndpoint();
     let res;
     try {
-      res = await fetch(userinfoEndpoint, {
+      res = await fetchWithTimeout(userinfoEndpoint, {
         headers: {
           Authorization: `Bearer ${tokenData.access_token}`
         }
@@ -1065,7 +1238,7 @@ var _SsoClient = class _SsoClient {
   async getAccessToken() {
     let tokenData = getTokenData(this.config.clientId);
     if (!tokenData) return null;
-    if (Date.now() >= tokenData.expires_at) {
+    if (Date.now() >= tokenData.expires_at - EXPIRY_SKEW_MS) {
       tokenData = await this.refreshToken();
     }
     return tokenData.access_token;
@@ -1074,6 +1247,9 @@ var _SsoClient = class _SsoClient {
    * 检查是否已认证（不发起网络请求）
    *
    * 仅检查本地是否存在未过期的 access_token。
+   * 故意不做 EXPIRY_SKEW_MS 提前量：这是同步的 UI 提示判定（是否显示"已登录"），
+   * 提前 10s 翻转 false 会让调用方在 token 仍有效时误显示未登录；真正发请求的
+   * getAccessToken/getUserInfo 已带提前量。
    */
   isAuthenticated() {
     const tokenData = getTokenData(this.config.clientId);
@@ -1093,6 +1269,10 @@ var _SsoClient = class _SsoClient {
     const refreshToken = tokenData?.refresh_token;
     const idTokenHint = tokenData?.id_token;
     clearAllSsoData(this.config.clientId);
+    this.debugLog("logout: \u672C\u5730\u6570\u636E\u5DF2\u6E05\u9664", {
+      clientId: this.config.clientId,
+      redirectToSso
+    });
     if (refreshToken && this.config.clientId) {
       try {
         const discovery = this.config.serverBaseUrl ? null : await this._getDiscovery();
@@ -1105,11 +1285,15 @@ var _SsoClient = class _SsoClient {
         if (this.config.clientSecret) {
           revokeBody.set("client_secret", this.config.clientSecret);
         }
-        await fetch(revokeUrl, {
-          method: "POST",
-          headers: { "Content-Type": "application/x-www-form-urlencoded" },
-          body: revokeBody.toString()
-        });
+        await fetchWithTimeout(
+          revokeUrl,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/x-www-form-urlencoded" },
+            body: revokeBody.toString()
+          },
+          REVOKE_TIMEOUT_MS
+        );
       } catch {
       }
     }
@@ -1179,6 +1363,21 @@ var SsoClient = _SsoClient;
 var SsoContext = createContext(null);
 var REFRESH_LOCK_PREFIX = "nihplod_sso_refresh_lock:";
 var LOCK_TTL_MS = 5e3;
+var CHANNEL_PREFIX = "nihplod_sso_events:";
+var TAB_ID = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
+function broadcastSsoEvent(clientId, type, tokenData) {
+  if (typeof BroadcastChannel === "undefined") return;
+  try {
+    const channel = new BroadcastChannel(CHANNEL_PREFIX + clientId);
+    channel.postMessage({
+      type,
+      sourceTabId: TAB_ID,
+      ...type === "token" && tokenData ? { tokenData } : {}
+    });
+    channel.close();
+  } catch {
+  }
+}
 var ownedLocks = /* @__PURE__ */ new Map();
 function lockKey(clientId) {
   return REFRESH_LOCK_PREFIX + clientId;
@@ -1237,21 +1436,37 @@ function SsoProvider({
   config,
   children,
   refreshThreshold = 60,
-  onTokenRefreshed
+  onTokenRefreshed,
+  onSessionExpired
 }) {
   const [user, setUser] = useState(null);
   const [isLoading, setIsLoading] = useState(true);
   const [isAuthenticated, setIsAuthenticated] = useState(false);
   const [error, setError] = useState(null);
+  const [sessionExpired, setSessionExpired] = useState(false);
   const [client] = useState(() => new SsoClient(config));
   const refreshTimerRef = useRef(null);
   const loadedRef = useRef(false);
+  const onSessionExpiredRef = useRef(onSessionExpired);
+  useEffect(() => {
+    onSessionExpiredRef.current = onSessionExpired;
+  });
+  const sessionExpiredNotifiedRef = useRef(false);
+  const refreshFailureCountRef = useRef(0);
+  const MAX_REFRESH_FAILURES = 3;
+  const markSessionExpired = useCallback((error2) => {
+    setError(error2);
+    setSessionExpired(true);
+    if (!sessionExpiredNotifiedRef.current) {
+      sessionExpiredNotifiedRef.current = true;
+      onSessionExpiredRef.current?.(error2);
+    }
+  }, []);
   const loadUser = useCallback(async () => {
     const tokenData = getTokenData(client.config.clientId);
     if (!tokenData) {
       setUser(null);
       setIsAuthenticated(false);
-      setError(null);
       setIsLoading(false);
       return;
     }
@@ -1260,19 +1475,22 @@ function SsoProvider({
       setUser(u);
       setIsAuthenticated(true);
       setError(null);
+      setSessionExpired(false);
+      sessionExpiredNotifiedRef.current = false;
+      refreshFailureCountRef.current = 0;
     } catch (err) {
       setUser(null);
       setIsAuthenticated(false);
-      setError(
-        err instanceof SsoError ? err : new SsoError("userinfo_failed", err instanceof Error ? err.message : String(err))
-      );
-      if (err instanceof SsoError && (err.code === "not_authenticated" || err.code === "session_expired")) {
+      const errorObj = err instanceof SsoError ? err : new SsoError("userinfo_failed", err instanceof Error ? err.message : String(err));
+      setError(errorObj);
+      if (errorObj.code === "not_authenticated" || errorObj.code === "session_expired") {
         removeTokenData(client.config.clientId);
+        markSessionExpired(errorObj);
       }
     } finally {
       setIsLoading(false);
     }
-  }, [client]);
+  }, [client, markSessionExpired]);
   useEffect(() => {
     if (loadedRef.current) return;
     loadedRef.current = true;
@@ -1289,13 +1507,28 @@ function SsoProvider({
     const attemptRefresh = () => withRefreshLock(client.config.clientId, async () => {
       try {
         const td = await client.refreshToken();
+        refreshFailureCountRef.current = 0;
         onTokenRefreshed?.(td.access_token);
+        broadcastSsoEvent(client.config.clientId, "token", td);
         loadUser();
-      } catch {
+      } catch (err) {
+        if (err instanceof SsoError && (err.code === "session_expired" || err.code === "no_refresh_token" || err.code === "not_authenticated")) {
+          removeTokenData(client.config.clientId);
+          markSessionExpired(err);
+        } else {
+          refreshFailureCountRef.current += 1;
+          if (refreshFailureCountRef.current >= MAX_REFRESH_FAILURES) {
+            markSessionExpired(
+              err instanceof SsoError ? err : new SsoError("session_expired", "\u591A\u6B21\u5237\u65B0\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55")
+            );
+          }
+        }
         setTimeout(() => loadUser(), 500);
       }
+    }).finally(() => {
+      if (active) scheduleNextRefresh(5e3);
     });
-    const scheduleNextRefresh = () => {
+    const scheduleNextRefresh = (minDelayMs = 0) => {
       if (!active) return;
       if (refreshTimerRef.current) {
         clearTimeout(refreshTimerRef.current);
@@ -1304,26 +1537,27 @@ function SsoProvider({
       const tokenData = getTokenData(client.config.clientId);
       if (!tokenData) return;
       const remainingSec = (tokenData.expires_at - Date.now()) / 1e3;
-      if (remainingSec <= 0) {
-        void attemptRefresh();
-        return;
-      }
-      if (remainingSec <= refreshThreshold) {
-        void attemptRefresh();
+      if (remainingSec <= 0 || remainingSec <= refreshThreshold) {
+        refreshTimerRef.current = setTimeout(
+          () => {
+            if (active) void attemptRefresh();
+          },
+          Math.max(minDelayMs, 1e3)
+        );
         return;
       }
-      const delayMs = (remainingSec - refreshThreshold) * 1e3;
+      const delayMs = Math.max((remainingSec - refreshThreshold) * 1e3, minDelayMs, 1e3);
       refreshTimerRef.current = setTimeout(() => {
         if (!active) return;
         const td = getTokenData(client.config.clientId);
         if (!td) return;
         const secLeft = (td.expires_at - Date.now()) / 1e3;
         if (secLeft <= refreshThreshold) {
-          void attemptRefresh().then((didRefresh) => {
-            if (didRefresh) scheduleNextRefresh();
-          });
+          void attemptRefresh();
+        } else {
+          scheduleNextRefresh();
         }
-      }, Math.max(delayMs, 1e3));
+      }, delayMs);
     };
     scheduleNextRefresh();
     return () => {
@@ -1343,6 +1577,30 @@ function SsoProvider({
     window.addEventListener("storage", handleStorageChange);
     return () => window.removeEventListener("storage", handleStorageChange);
   }, [loadUser]);
+  useEffect(() => {
+    if (typeof BroadcastChannel === "undefined") return;
+    const channel = new BroadcastChannel(CHANNEL_PREFIX + client.config.clientId);
+    channel.onmessage = (event) => {
+      const data = event.data;
+      if (!data || data.sourceTabId === TAB_ID) return;
+      if (data.type === "logout") {
+        removeTokenData(client.config.clientId);
+        setUser(null);
+        setIsAuthenticated(false);
+        setError(null);
+        setSessionExpired(false);
+        sessionExpiredNotifiedRef.current = false;
+        refreshFailureCountRef.current = 0;
+      } else if (data.type === "token") {
+        const td = data.tokenData;
+        if (td && typeof td.access_token === "string" && typeof td.expires_at === "number" && typeof td.refresh_token === "string") {
+          saveTokenData(td, client.config.clientId);
+        }
+        loadUser();
+      }
+    };
+    return () => channel.close();
+  }, [client, loadUser]);
   const login = useCallback(
     async (returnUrl) => {
       await client.login(returnUrl);
@@ -1359,10 +1617,17 @@ function SsoProvider({
   );
   const logout = useCallback(
     async (redirectToSso = false) => {
-      await client.logout(redirectToSso);
       setUser(null);
       setIsAuthenticated(false);
       setError(null);
+      setSessionExpired(false);
+      sessionExpiredNotifiedRef.current = false;
+      refreshFailureCountRef.current = 0;
+      broadcastSsoEvent(client.config.clientId, "logout");
+      try {
+        await client.logout(redirectToSso);
+      } catch {
+      }
     },
     [client]
   );
@@ -1382,6 +1647,7 @@ function SsoProvider({
     logout,
     refreshUser,
     getAccessToken,
+    sessionExpired,
     client
   };
   return React.createElement(SsoContext.Provider, { value }, children);
@@ -1476,6 +1742,36 @@ function withAuth(Component) {
 
 // src/react/CallbackPage.tsx
 import React3, { useEffect as useEffect3, useRef as useRef3, useState as useState3 } from "react";
+var CALLBACK_ERROR_HINTS = {
+  state_mismatch: "\u767B\u5F55\u4F1A\u8BDD\u6821\u9A8C\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
+  pkce_required: "\u767B\u5F55\u4F1A\u8BDD\u4E0D\u5B8C\u6574\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
+  user_denied_authorization: "\u4F60\u5DF2\u53D6\u6D88\u767B\u5F55",
+  session_expired: "\u767B\u5F55\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
+  authorization_code_expired: "\u767B\u5F55\u4FE1\u606F\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
+  authorization_code_used: "\u767B\u5F55\u4FE1\u606F\u5DF2\u88AB\u4F7F\u7528\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
+  token_request_failed: "\u767B\u5F55\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
+  userinfo_failed: "\u767B\u5F55\u4FE1\u606F\u83B7\u53D6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5",
+  not_authenticated: "\u8BF7\u5148\u767B\u5F55\u540E\u518D\u8BBF\u95EE",
+  network_error: "\u7F51\u7EDC\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\u91CD\u8BD5",
+  rate_limited: "\u64CD\u4F5C\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",
+  popup_blocked: "\u767B\u5F55\u7A97\u53E3\u88AB\u6D4F\u89C8\u5668\u62E6\u622A\uFF0C\u8BF7\u5141\u8BB8\u5F39\u7A97\u540E\u91CD\u8BD5",
+  popup_closed: "\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
+  client_disabled: "\u8BE5\u5E94\u7528\u5DF2\u505C\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458",
+  account_disabled: "\u8D26\u53F7\u6682\u65F6\u65E0\u6CD5\u4F7F\u7528\uFF0C\u8BF7\u8054\u7CFB\u5BA2\u670D",
+  sso_server_error: "\u767B\u5F55\u670D\u52A1\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",
+  invalid_config: "\u5E94\u7528\u914D\u7F6E\u6709\u8BEF\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458",
+  no_refresh_token: "\u767B\u5F55\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55"
+};
+function getCallbackErrorMessage(err) {
+  if (err instanceof SsoError) {
+    const hint = CALLBACK_ERROR_HINTS[err.code];
+    if (hint) return hint;
+    if (err.code.startsWith("id_token")) return "\u767B\u5F55\u6821\u9A8C\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55";
+    if (/[\u4e00-\u9fff]/.test(err.description)) return err.description;
+    return "\u767B\u5F55\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55";
+  }
+  return "\u767B\u5F55\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5";
+}
 function DefaultCallbackError({ error }) {
   return React3.createElement(
     "div",
@@ -1486,18 +1782,54 @@ function DefaultCallbackError({ error }) {
         alignItems: "center",
         justifyContent: "center",
         minHeight: "100vh",
-        fontFamily: "system-ui, sans-serif"
+        fontFamily: "system-ui, sans-serif",
+        padding: "2rem",
+        textAlign: "center"
       }
     },
     React3.createElement(
       "p",
-      { style: { color: "#dc2626", marginBottom: "1rem" } },
+      { style: { color: "#dc2626", marginBottom: "1.5rem" } },
       error
     ),
     React3.createElement(
-      "a",
-      { href: "/", style: { color: "#2563eb", textDecoration: "underline" } },
-      "\u8FD4\u56DE\u9996\u9875"
+      "div",
+      { style: { display: "flex", gap: "0.75rem" } },
+      React3.createElement(
+        "a",
+        {
+          href: "/",
+          style: {
+            display: "inline-block",
+            padding: "0.6rem 1.4rem",
+            background: "#2c2c2c",
+            color: "#fff",
+            fontSize: "0.8125rem",
+            textDecoration: "none"
+          }
+        },
+        "\u91CD\u65B0\u767B\u5F55"
+      ),
+      React3.createElement(
+        "button",
+        {
+          type: "button",
+          onClick: () => {
+            if (window.history.length > 1) window.history.back();
+            else window.location.href = "/";
+          },
+          style: {
+            display: "inline-block",
+            padding: "0.6rem 1.4rem",
+            border: "1px solid rgba(44, 44, 44, 0.25)",
+            background: "transparent",
+            color: "#2c2c2c",
+            fontSize: "0.8125rem",
+            cursor: "pointer"
+          }
+        },
+        "\u8FD4\u56DE\u4E0A\u4E00\u9875"
+      )
     )
   );
 }
@@ -1512,9 +1844,13 @@ function CallbackPage({ onSuccess, onError, renderError } = {}) {
     onSuccessRef.current = onSuccess;
     onErrorRef.current = onError;
   });
+  const callbackPromiseRef = useRef3(null);
+  const postProcessedRef = useRef3(false);
+  const errorHandledRef = useRef3(false);
   useEffect3(() => {
-    if (window.opener && !window.opener.closed) {
-      const nonce = new URL(window.location.href).searchParams.get("popup_nonce");
+    const popupNonce = new URL(window.location.href).searchParams.get("popup_nonce");
+    if (window.opener && !window.opener.closed && popupNonce) {
+      const nonce = popupNonce;
       let targetOrigin = window.location.origin;
       try {
         targetOrigin = window.opener.location.origin;
@@ -1523,7 +1859,7 @@ function CallbackPage({ onSuccess, onError, renderError } = {}) {
       const message = {
         type: "nihplod_sso_popup_callback",
         callbackUrl: window.location.href,
-        nonce: nonce || void 0
+        nonce
       };
       let acked = false;
       const send = () => {
@@ -1538,9 +1874,10 @@ function CallbackPage({ onSuccess, onError, renderError } = {}) {
         setAwaitingManualClose(true);
       }, 1e4);
       const handleAck = (event) => {
+        if (event.source !== window.opener) return;
         if (event.origin !== targetOrigin) return;
         if (!event.data || event.data.type !== "nihplod_sso_popup_ack") return;
-        if (nonce && event.data.nonce !== nonce) return;
+        if (event.data.nonce !== nonce) return;
         acked = true;
         clearInterval(resendTimer);
         clearTimeout(ackTimeout);
@@ -1556,8 +1893,12 @@ function CallbackPage({ onSuccess, onError, renderError } = {}) {
     let cancelled = false;
     async function handleCallback() {
       try {
-        const tokenData = await client.handleCallback(window.location.href);
-        if (cancelled) return;
+        if (!callbackPromiseRef.current) {
+          callbackPromiseRef.current = client.handleCallback(window.location.href);
+        }
+        const tokenData = await callbackPromiseRef.current;
+        if (cancelled || postProcessedRef.current) return;
+        postProcessedRef.current = true;
         if (tokenData === null) {
           const clientId2 = client.config.clientId;
           const probeReturnUrl = getReturnUrl(clientId2);
@@ -1578,14 +1919,12 @@ function CallbackPage({ onSuccess, onError, renderError } = {}) {
         }
         window.location.href = returnUrl && isTrustedReturnUrl(returnUrl, window.location.origin) ? returnUrl : "/";
       } catch (err) {
-        if (cancelled) return;
+        if (cancelled || errorHandledRef.current) return;
+        errorHandledRef.current = true;
+        callbackPromiseRef.current = null;
         const errorObj = err instanceof Error ? err : new Error(String(err));
         onErrorRef.current?.(errorObj);
-        if (errorObj instanceof SsoError) {
-          setError(errorObj.description || `SSO \u9519\u8BEF (${errorObj.code})`);
-        } else {
-          setError(`\u767B\u5F55\u56DE\u8C03\u5904\u7406\u5931\u8D25: ${errorObj.message}`);
-        }
+        setError(getCallbackErrorMessage(errorObj));
         setProcessing(false);
       }
     }