openxiangda 1.0.123 → 1.0.124

package/packages/sdk/dist/runtime/react.cjs

@@ -34562,10 +34562,18 @@ var OpenXiangdaProvider = ({
   const [accessToken, setAccessTokenState] = (0, import_react216.useState)(null);
   const accessTokenRef = (0, import_react216.useRef)(null);
   const setAccessToken = (0, import_react216.useCallback)(
-    (nextAccessToken) => {
+    (nextAccessToken, options = {}) => {
+      if (!nextAccessToken && options.clearIfToken && accessTokenRef.current?.token !== options.clearIfToken) {
+        return;
+      }
       const normalizedAccessToken = nextAccessToken || null;
-      accessTokenRef.current = normalizedAccessToken;
-      setAccessTokenState(normalizedAccessToken);
+      const nextState = normalizedAccessToken ? {
+        token: normalizedAccessToken,
+        scope: options.scope || "default",
+        path: options.path || null
+      } : null;
+      accessTokenRef.current = nextState;
+      setAccessTokenState(nextState);
     },
     []
   );
@@ -34591,7 +34599,13 @@ var OpenXiangdaProvider = ({
       return;
     }
     setState((prev) => ({ ...prev, loading: true, error: null }));
-    const requestFetch = options.accessToken !== void 0 ? createAuthorizedFetch(resolvedFetch, options.accessToken || null) : createAuthorizedFetch(resolvedFetch, accessTokenRef.current);
+    const requestFetch = options.accessToken !== void 0 ? createAuthorizedFetch(
+      resolvedFetch,
+      createAccessTokenState(
+        options.accessToken || null,
+        options.accessTokenOptions
+      )
+    ) : createAuthorizedFetch(resolvedFetch, accessTokenRef.current);
     try {
       const response = await requestFetch(
         buildServiceUrl2(
@@ -35001,9 +35015,11 @@ var buildServiceUrl2 = (servicePrefix, path) => {
 var createAuthorizedFetch = (baseFetch, accessToken) => {
   if (!accessToken) return baseFetch;
   return ((input, init = {}) => {
+    const token = resolveAccessTokenForCurrentRoute(accessToken);
+    if (!token) return baseFetch(input, init);
     const headers = new Headers(init.headers || {});
     if (!headers.has("authorization")) {
-      headers.set("authorization", `Bearer ${accessToken}`);
+      headers.set("authorization", `Bearer ${token}`);
     }
     return baseFetch(input, {
       ...init,
@@ -35011,6 +35027,34 @@ var createAuthorizedFetch = (baseFetch, accessToken) => {
     });
   });
 };
+var createAccessTokenState = (accessToken, options = {}) => accessToken ? {
+  token: accessToken,
+  scope: options.scope || "default",
+  path: options.path || null
+} : null;
+var resolveAccessTokenForCurrentRoute = (accessToken) => {
+  if (accessToken.scope !== "public") return accessToken.token;
+  const scopedPath = normalizeRoutePath(accessToken.path);
+  const currentPath = normalizeRoutePath(getCurrentPathname());
+  if (!scopedPath) {
+    return isPublicRoutePath(currentPath) ? accessToken.token : null;
+  }
+  if (currentPath === scopedPath || isPublicRoutePath(currentPath) && currentPath.startsWith(`${scopedPath}/`)) {
+    return accessToken.token;
+  }
+  return null;
+};
+var normalizeRoutePath = (path) => {
+  const text = String(path || "").trim();
+  if (!text) return "";
+  try {
+    const base = typeof window !== "undefined" ? window.location.origin : "http://localhost";
+    return new URL(text, base).pathname.replace(/\/+$/, "") || "/";
+  } catch {
+    return text.split(/[?#]/, 1)[0].replace(/\/+$/, "") || "/";
+  }
+};
+var isPublicRoutePath = (path) => /\/public(?:\/|$)/.test(path);
 var readJsonPayload = async (response) => {
   try {
     return await response.json();
@@ -35111,6 +35155,7 @@ var attachCallback = (loginUrl, callback) => {
   }
 };
 var getCurrentHref4 = () => typeof window === "undefined" ? "" : window.location.href;
+var getCurrentPathname = () => typeof window === "undefined" ? "" : window.location.pathname;
 var getCurrentHostname2 = () => typeof window === "undefined" ? "" : window.location.hostname;
 var getRuntimeEnv = (key) => {
   const env = typeof process !== "undefined" ? process.env : void 0;
@@ -35208,7 +35253,7 @@ var createPublicAccessClient = ({
   const request = async (input = {}) => {
     const body = {
       ...input,
-      path: input.path || getCurrentPathname(),
+      path: input.path || getCurrentPathname2(),
       domain: input.domain || getCurrentDomain(),
       userAgent: input.userAgent || getCurrentUserAgent(),
       guestIdentifier: input.guestIdentifier || getOrCreatePublicGuestIdentifier(normalizedAppType)
@@ -35276,7 +35321,7 @@ var isSuccessCode6 = (code) => {
   const normalized = Number(code);
   return Number.isFinite(normalized) ? normalized === 0 || normalized >= 200 && normalized < 300 : false;
 };
-var getCurrentPathname = () => typeof window === "undefined" ? void 0 : window.location.pathname;
+var getCurrentPathname2 = () => typeof window === "undefined" ? void 0 : window.location.pathname;
 var getCurrentDomain = () => typeof window === "undefined" ? void 0 : window.location.host;
 var getCurrentUserAgent = () => typeof navigator === "undefined" ? void 0 : navigator.userAgent;
 var getOrCreatePublicGuestIdentifier = (appType) => {
@@ -35319,6 +35364,8 @@ var usePublicAccess = (options = {}) => {
   const [session, setSession] = (0, import_react217.useState)(null);
   const [error, setError] = (0, import_react217.useState)(null);
   const [loading, setLoading] = (0, import_react217.useState)(Boolean(autoStart));
+  const activeSessionRef = (0, import_react217.useRef)(null);
+  const mountedRef = (0, import_react217.useRef)(true);
   const sessionInputKey = JSON.stringify(sessionInput);
   const stableSessionInput = (0, import_react217.useMemo)(() => sessionInput, [sessionInputKey]);
   const client = (0, import_react217.useMemo)(
@@ -35334,15 +35381,31 @@ var usePublicAccess = (options = {}) => {
       setLoading(true);
       setError(null);
       try {
+        const resolvedPath = input.path || stableSessionInput.path || readPathFromLocation();
         const data = await client.startSession({
           ...stableSessionInput,
           ...input,
           ticket: input.ticket || stableSessionInput.ticket || readTicketFromLocation(),
-          path: input.path || stableSessionInput.path || readPathFromLocation()
+          path: resolvedPath
         });
+        if (!mountedRef.current) return data;
+        activeSessionRef.current = {
+          accessToken: data.accessToken,
+          path: resolvedPath
+        };
         setSession(data);
-        setAccessToken(data.accessToken);
-        await reloadRuntime({ accessToken: data.accessToken });
+        setAccessToken(data.accessToken, {
+          scope: "public",
+          path: resolvedPath
+        });
+        await reloadRuntime({
+          accessToken: data.accessToken,
+          accessTokenOptions: {
+            scope: "public",
+            path: resolvedPath
+          }
+        });
+        if (!mountedRef.current) return data;
         setLoading(false);
         return data;
       } catch (caught) {
@@ -35350,8 +35413,10 @@ var usePublicAccess = (options = {}) => {
           caught instanceof Error ? caught.message : "\u516C\u5F00\u8BBF\u95EE\u4F1A\u8BDD\u521B\u5EFA\u5931\u8D25",
           { payload: caught }
         );
-        setError(nextError);
-        setLoading(false);
+        if (mountedRef.current) {
+          setError(nextError);
+          setLoading(false);
+        }
         throw nextError;
       }
     },
@@ -35361,6 +35426,20 @@ var usePublicAccess = (options = {}) => {
     if (!autoStart) return;
     void startSession().catch(() => void 0);
   }, [autoStart, startSession]);
+  (0, import_react217.useEffect)(
+    () => {
+      mountedRef.current = true;
+      return () => {
+        mountedRef.current = false;
+        const activeSession = activeSessionRef.current;
+        if (!activeSession) return;
+        activeSessionRef.current = null;
+        setAccessToken(null, { clearIfToken: activeSession.accessToken });
+        void reloadRuntime({ accessToken: null });
+      };
+    },
+    [reloadRuntime, setAccessToken]
+  );
   return {
     loading,
     error,