@arcblock/did-connect-react 3.1.34 → 3.1.36

package/lib/Session/index.js

@@ -1,61 +1,61 @@
 import { jsx as g, jsxs as j, Fragment as Mo } from "react/jsx-runtime";
 import S from "prop-types";
 import zo from "lodash/omit";
-import Go from "lodash/pick";
-import Ce from "lodash/cloneDeep";
+import Vo from "lodash/pick";
+import Te from "lodash/cloneDeep";
 import J from "lodash/isFunction";
 import w from "lodash/isUndefined";
-import Vo from "lodash/defaultsDeep";
-import jo from "js-cookie";
-import Ko from "eventemitter3";
-import $o from "p-wait-for";
-import { useTheme as qo, Typography as Xo, Box as K, CircularProgress as Qo } from "@mui/material";
-import { getVisitorId as $, isUrl as Yo, ensureVisitorId as Jo, setVisitorId as Te } from "@arcblock/ux/lib/Util";
-import ae, { ToastProvider as ke } from "@arcblock/ux/lib/Toast";
-import Zo from "@arcblock/ux/lib/Center";
-import { useReactive as ye, useCreation as Ie, useMemoizedFn as f, usePrevious as ei, useLatest as Le, useUpdateEffect as le, useMount as oi } from "ahooks";
+import jo from "lodash/defaultsDeep";
+import Ko from "js-cookie";
+import $o from "eventemitter3";
+import qo from "p-wait-for";
+import { useTheme as Xo, Typography as Qo, Box as K, CircularProgress as Yo } from "@mui/material";
+import { getVisitorId as $, isUrl as Jo, ensureVisitorId as Zo, setVisitorId as ke } from "@arcblock/ux/lib/Util";
+import ae, { ToastProvider as ye } from "@arcblock/ux/lib/Toast";
+import ei from "@arcblock/ux/lib/Center";
+import { useReactive as Ie, useCreation as Le, useMemoizedFn as f, usePrevious as oi, useLatest as De, useUpdateEffect as le, useMount as ii } from "ahooks";
 import { joinURL as H } from "ufo";
-import { Icon as ii } from "@iconify/react";
-import ti from "@iconify-icons/material-symbols/keyboard-double-arrow-right-rounded";
-import ri from "@arcblock/react-hooks/lib/useBrowser";
-import ni from "@arcblock/ux/lib/Dialog/use-confirm";
-import De from "@arcblock/ux/lib/DID";
-import _e from "@arcblock/ux/lib/Avatar";
-import { getCurrentAppPid as si } from "@arcblock/ux/lib/SessionUser/libs/utils";
-import { translate as ci } from "@arcblock/ux/lib/Locale/util";
-import { getBlockletSDK as ai, BlockletSDK as li } from "@blocklet/js-sdk";
+import { Icon as ti } from "@iconify/react";
+import ri from "@iconify-icons/material-symbols/keyboard-double-arrow-right-rounded";
+import ni from "@arcblock/react-hooks/lib/useBrowser";
+import si from "@arcblock/ux/lib/Dialog/use-confirm";
+import _e from "@arcblock/ux/lib/DID";
+import Ee from "@arcblock/ux/lib/Avatar";
+import { getCurrentAppPid as ci } from "@arcblock/ux/lib/SessionUser/libs/utils";
+import { translate as ai } from "@arcblock/ux/lib/Locale/util";
+import { getBlockletSDK as li, BlockletSDK as di } from "@blocklet/js-sdk";
 import P from "@arcblock/bridge";
-import { getFederatedEnabled as di } from "@arcblock/ux/lib/Util/federated";
-import pi from "lodash/noop";
-import fi from "lodash/isNil";
-import { ReactGA as ui } from "@arcblock/ux/lib/withTracker";
-import { useState as wi, useEffect as hi } from "react";
-import Ee from "../Storage/index.js";
-import { formatCacheTtl as mi, getBrowserLang as gi, debug as h, decodeUrlParams as ve, sleep as E, updateConnectedInfo as Z, getAppId as ee, logger as xe } from "../utils.js";
-import Oe from "./window-focus-aware.js";
-import { OAuthContext as Si, OAuthConsumer as Ai, OAuthProvider as Re, useOAuth as Pi } from "../OAuth/context.js";
-import { PasskeyContext as bi, PasskeyConsumer as Ci, PasskeyProvider as Ne, usePasskey as Ti } from "../Passkey/context.js";
+import { getFederatedEnabled as pi } from "@arcblock/ux/lib/Util/federated";
+import fi from "lodash/noop";
+import ui from "lodash/isNil";
+import { ReactGA as wi } from "@arcblock/ux/lib/withTracker";
+import { useState as hi, useEffect as mi } from "react";
+import de from "../Storage/index.js";
+import { formatCacheTtl as gi, getBrowserLang as Si, debug as m, decodeUrlParams as ve, sleep as E, updateConnectedInfo as Z, getAppId as ee, logger as Oe } from "../utils.js";
+import xe from "./window-focus-aware.js";
+import { OAuthContext as Ai, OAuthConsumer as Pi, OAuthProvider as Re, useOAuth as bi } from "../OAuth/context.js";
+import { PasskeyContext as Ci, PasskeyConsumer as Ti, PasskeyProvider as Ne, usePasskey as ki } from "../Passkey/context.js";
 import "../Passkey/actions.js";
-import ki, { getWalletDid as yi } from "../User/use-did.js";
-import Ii from "../User/wrap-did.js";
-import Li from "./hooks/use-federated.js";
-import Di from "./hooks/use-session-token.js";
-import _i from "./hooks/use-protected-routes.js";
+import yi, { getWalletDid as Ii } from "../User/use-did.js";
+import Li from "../User/wrap-did.js";
+import Di from "./hooks/use-federated.js";
+import _i from "./hooks/use-session-token.js";
+import Ei from "./hooks/use-protected-routes.js";
 import { SessionContext as qe } from "./context.js";
-import Ei from "../Connect/use-connect.js";
-import { EVENTS as c } from "./libs/constants.js";
+import vi from "../Connect/use-connect.js";
+import { EVENTS as a } from "./libs/constants.js";
 import { translations as F } from "./libs/locales.js";
-import { NotOpenError as vi } from "../error.js";
-import { SESSION_TOKEN_STORAGE_KEY as Xe, REFRESH_TOKEN_STORAGE_KEY as Qe, API_DID_PREFIX as xi, DEFAULT_TIMEOUT as Oi, BLOCKLET_SERVICE_PATH_PREFIX as M, DID_SPACES_BASE_URL as Ri } from "../constant.js";
-import { getMobileVisitorId as Ni, checkEnableAutoLogin as Wi, login as Fi } from "./libs/login-mobile.js";
-import Bi from "../Connect/hooks/use-quick-connect.js";
+import { NotOpenError as Oi } from "../error.js";
+import { SESSION_TOKEN_STORAGE_KEY as Xe, REFRESH_TOKEN_STORAGE_KEY as Qe, CSRF_TOKEN_STORAGE_KEY as xi, API_DID_PREFIX as Ri, DEFAULT_TIMEOUT as Ni, BLOCKLET_SERVICE_PATH_PREFIX as G, DID_SPACES_BASE_URL as Wi } from "../constant.js";
+import { getMobileVisitorId as Fi, checkEnableAutoLogin as Bi, login as Ui } from "./libs/login-mobile.js";
+import Hi from "../Connect/hooks/use-quick-connect.js";
 import { didSpacesIsRequired as We } from "./libs/did-spaces.js";
-import Ui from "./did-spaces-guide.js";
-import { FederatedProvider as Hi, useFederatedContext as Mi } from "../Federated/context.js";
-import zi from "./hooks/use-verify.js";
-import { gaLoginSuccessHandler as Fe, gaLoginFailedHandler as Be, gaSwitchPassportSuccessHandler as Ue, gaSwitchPassportFailedHandler as He, gaBindWalletSuccessHandler as Me, gaBindWalletFailedHandler as ze } from "./handler.js";
-import { loginFederatedMaster as Xt, mountFederatedIframe as Qt } from "./libs/federated.js";
-const Ge = ai(), { Provider: Gi, Consumer: Ve } = qe, je = {
+import Gi from "./did-spaces-guide.js";
+import { FederatedProvider as Mi, useFederatedContext as zi } from "../Federated/context.js";
+import Vi from "./hooks/use-verify.js";
+import { gaLoginSuccessHandler as Fe, gaLoginFailedHandler as Be, gaSwitchPassportSuccessHandler as Ue, gaSwitchPassportFailedHandler as He, gaBindWalletSuccessHandler as Ge, gaBindWalletFailedHandler as Me } from "./handler.js";
+import { loginFederatedMaster as Yt, mountFederatedIframe as Jt } from "./libs/federated.js";
+const ze = li(), { Provider: ji, Consumer: Ve } = qe, je = {
   en: "DID Connect timeout, please reopen DID Connect popup",
   zh: "DID Connect 超时, 请重新打开 DID Connect"
 }, Ke = {
@@ -67,13 +67,13 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
   globalThis?.blocklet?.prefix && (D = globalThis.blocklet.prefix), typeof T == "boolean" && (T = {
     appendAuthServicePrefix: T,
     extraParams: {}
-  }), Vo(T, {
+  }), jo(T, {
     rolling: !0,
     appendAuthServicePrefix: !1,
     extraParams: {},
     refreshTokenStorageKey: Qe
   });
-  function x(I) {
+  function O(I) {
     if (globalThis.blocklet)
       if (I?.user) {
         const r = {
@@ -84,15 +84,18 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           sourceAppPid: I.user.sourceAppPid,
           fullName: I.user.fullName
         };
-        h("bridge callArc: onLogin", r), P.callArc("onLogin", { ...r, user: r });
+        m("bridge callArc: onLogin", r), P.callArc("onLogin", { ...r, user: r });
       } else
-        P.callArc("onLogin", { error: "no user", code: 400 }), h("notifyBridge failed", { sessionState: I });
+        P.callArc("onLogin", { error: "no user", code: 400 }), m("notifyBridge failed", { sessionState: I });
   }
-  const Q = Ee(q, X, oe), z = Ee(T.refreshTokenStorageKey, "ls");
-  function de({ ...I }) {
+  const Q = de(q, X, oe), M = de(xi, "cookie", {
+    secure: !0,
+    sameSite: "strict"
+  }), Ye = de(T.refreshTokenStorageKey, "ls");
+  function pe({ ...I }) {
     const r = Object.assign({}, I);
-    w(r.serviceHost) && (r.serviceHost = D), w(r.locale) && (r.locale = ""), w(r.action) && (r.action = "login"), w(r.prefix) && (r.prefix = xi), w(r.appendAuthServicePrefix) && (r.appendAuthServicePrefix = !1), w(r.extraParams) && (r.extraParams = {}), w(r.options) && (r.options = {}), w(r.autoConnect) && (r.autoConnect = !1), w(r.autoDisconnect) && (r.autoDisconnect = !0), w(r.useSocket) && (r.useSocket = !0), w(r.timeout) && (r.timeout = Oi * 1e3), w(r.webWalletUrl) && (r.webWalletUrl = void 0), w(r.protectedRoutes) && (r.protectedRoutes = ["*"]), w(r.apiOptions) && (r.apiOptions = {}), w(r.lazyRefreshToken) && (r.lazyRefreshToken = !1);
-    const { connectApi: k, connectHolder: ie } = Ei(), [Je, pe] = wi(0), y = ri(), { requestStorageAccess: Ze } = Mi(), { palette: eo } = qo(), B = new URLSearchParams(window.location.search), s = ye({
+    w(r.serviceHost) && (r.serviceHost = D), w(r.locale) && (r.locale = ""), w(r.action) && (r.action = "login"), w(r.prefix) && (r.prefix = Ri), w(r.appendAuthServicePrefix) && (r.appendAuthServicePrefix = !1), w(r.extraParams) && (r.extraParams = {}), w(r.options) && (r.options = {}), w(r.autoConnect) && (r.autoConnect = !1), w(r.autoDisconnect) && (r.autoDisconnect = !0), w(r.useSocket) && (r.useSocket = !0), w(r.timeout) && (r.timeout = Ni * 1e3), w(r.webWalletUrl) && (r.webWalletUrl = void 0), w(r.protectedRoutes) && (r.protectedRoutes = ["*"]), w(r.apiOptions) && (r.apiOptions = {}), w(r.lazyRefreshToken) && (r.lazyRefreshToken = !1);
+    const { connectApi: k, connectHolder: ie } = vi(), [Ze, fe] = hi(0), y = ni(), { requestStorageAccess: eo } = zi(), { palette: oo } = Xo(), B = new URLSearchParams(window.location.search), s = Ie({
       extraParams: {},
       options: {},
       currentLocale: r.locale,
@@ -102,13 +105,13 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         return typeof r.autoConnect == "boolean" ? r.autoConnect : !!r.autoLogin;
       },
       get prefix() {
-        return T.appendAuthServicePrefix || r.appendAuthServicePrefix ? H(M, r.prefix) : r.prefix;
+        return T.appendAuthServicePrefix || r.appendAuthServicePrefix ? H(G, r.prefix) : r.prefix;
       },
       get notificationPrefix() {
         const e = "/api/notifications";
-        return T.appendAuthServicePrefix || r.appendAuthServicePrefix ? H(M, e) : e;
+        return T.appendAuthServicePrefix || r.appendAuthServicePrefix ? H(G, e) : e;
       }
-    }), t = ye({
+    }), t = Ie({
       action: r.action,
       error: "",
       initialized: !1,
@@ -120,25 +123,25 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
       baseUrl: "",
       unReadCount: 0
       // 不可以直接个性 props.autoConnect (readonly)
-    }), b = Ie(() => r.locale || s.currentLocale || gi(), [r.locale, s.currentLocale]), { confirmApi: oo, confirmHolder: io } = ni(), O = f(() => {
+    }), b = Le(() => r.locale || s.currentLocale || Si(), [r.locale, s.currentLocale]), { confirmApi: io, confirmHolder: to } = si(), x = f(() => {
       if (t.open && !y.arcSphere) {
         const e = Ke[b] || Ke.en;
         throw ae.warning(e), new Error(e);
       }
-    }), d = Ie(() => new Ko(), []);
-    hi(() => (d.on(c.LOGIN, Fe), d.on(c.LOGIN_FAILED, Be), d.on(c.SWITCH_PASSPORT, Ue), d.on(c.SWITCH_PASSPORT_FAILED, He), d.on(c.BIND_WALLET, Me), d.on(c.BIND_WALLET_FAILED, ze), () => {
-      d.off(c.LOGIN, Fe), d.off(c.LOGIN_FAILED, Be), d.off(c.SWITCH_PASSPORT, Ue), d.off(c.SWITCH_PASSPORT_FAILED, He), d.off(c.BIND_WALLET, Me), d.off(c.BIND_WALLET_FAILED, ze);
+    }), d = Le(() => new $o(), []);
+    mi(() => (d.on(a.LOGIN, Fe), d.on(a.LOGIN_FAILED, Be), d.on(a.SWITCH_PASSPORT, Ue), d.on(a.SWITCH_PASSPORT_FAILED, He), d.on(a.BIND_WALLET, Ge), d.on(a.BIND_WALLET_FAILED, Me), () => {
+      d.off(a.LOGIN, Fe), d.off(a.LOGIN_FAILED, Be), d.off(a.SWITCH_PASSPORT, Ue), d.off(a.SWITCH_PASSPORT_FAILED, He), d.off(a.BIND_WALLET, Ge), d.off(a.BIND_WALLET_FAILED, Me);
     }), [d]);
     const U = f((e, o, i) => {
       const n = {
-        login: [c.LOGIN, c.CANCEL_LOGIN],
-        "bind-wallet": [c.BIND_WALLET, c.CANCEL_BIND_WALLET],
-        "switch-passport": [c.SWITCH_PASSPORT, c.CANCEL_SWITCH_PASSPORT],
-        "switch-profile": [c.SWITCH_PROFILE, c.CANCEL_SWITCH_PROFILE],
+        login: [a.LOGIN, a.CANCEL_LOGIN],
+        "bind-wallet": [a.BIND_WALLET, a.CANCEL_BIND_WALLET],
+        "switch-passport": [a.SWITCH_PASSPORT, a.CANCEL_SWITCH_PASSPORT],
+        "switch-profile": [a.SWITCH_PROFILE, a.CANCEL_SWITCH_PROFILE],
         // HACK: 对于内部来说，switch-did 就是 login，所以内部的监听事件仍然是 login
-        "switch-did": [c.LOGIN, c.CANCEL_LOGIN],
+        "switch-did": [a.LOGIN, a.CANCEL_LOGIN],
         // @FIXME: @zhanghan 整个事件发射的机制需要重构，目前的实现不是很优雅，对于用户来说不是很好用。 https://github.com/ArcBlock/ux/pull/1414#discussion_r1904830954
-        "did-space-connected": [c.DID_SPACE_CONNECTED]
+        "did-space-connected": [a.DID_SPACE_CONNECTED]
       };
       if (!Object.keys(n).includes(e))
         return;
@@ -148,29 +151,30 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
       d.once(n[e][0], l), d.once(n[e][1], async (...u) => {
         J(l) && d.off(n[e][0], l), J(i) && await i(...u), d.emit(`cancel-${e}`, ...u);
       });
-    }), to = ei(t.initialized, (e, o) => e !== o || e === !0 && o === !0), {
-      syncSessionSate: ro,
+    }), ro = oi(t.initialized, (e, o) => e !== o || e === !0 && o === !0), {
+      syncSessionSate: no,
       handleRefreshUser: C,
-      handleRefreshToken: no,
-      renewToken: so,
-      clearSession: fe,
+      handleRefreshToken: so,
+      renewToken: co,
+      clearSession: ue,
       handleLoginResult: v,
       decrypt: _,
-      service: co,
-      getSessionToken: ao,
-      getRefreshToken: lo,
-      setRefreshToken: po,
-      setSessionToken: fo
-    } = Di({
+      service: ao,
+      getSessionToken: lo,
+      getRefreshToken: po,
+      setRefreshToken: fo,
+      setSessionToken: uo
+    } = _i({
       state: t,
       pageState: s,
       sessionTokenStorage: Q,
-      refreshTokenStorage: z,
+      refreshTokenStorage: Ye,
+      csrfTokenStorage: M,
       serviceHost: r.serviceHost,
       apiOptions: r.apiOptions,
       lazyRefreshToken: r.lazyRefreshToken,
       onRefresh({ type: e, sessionToken: o, refreshToken: i, user: n }) {
-        if (h("onRefresh", { type: e, user: n }), globalThis.blocklet) {
+        if (m("onRefresh", { type: e, user: n }), globalThis.blocklet) {
           const l = {
             did: n.did,
             host: window.location.host,
@@ -179,28 +183,28 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
             sourceAppPid: n.sourceAppPid,
             fullName: n.fullName
           };
-          e === "refreshToken" ? (h("bridge callArc: onRefreshToken"), P.callArc("onRefreshToken", {
+          e === "refreshToken" ? (m("bridge callArc: onRefreshToken"), P.callArc("onRefreshToken", {
             sessionToken: o,
             refreshToken: i,
             user: l
-          })) : e === "refreshUser" && (h("bridge callArc: onRefreshUser"), P.callArc("onRefreshUser", {
+          })) : e === "refreshUser" && (m("bridge callArc: onRefreshUser"), P.callArc("onRefreshUser", {
             sessionToken: o,
             refreshToken: i,
             user: l
           }));
         }
       }
-    }), uo = zi({ state: t, connectApi: k }), ue = f((e, o = {}, i = {}) => {
-      O();
+    }), wo = Vi({ state: t, connectApi: k }), we = f((e, o = {}, i = {}) => {
+      x();
       const n = e;
       typeof n == "object" && (e = n.onSuccess, o = n.extraParams || {}, i = n.options || {}, i.origin = n.origin || ""), (!t.user || i.origin === "switch-did") && (i.origin === "switch-did" ? U("switch-did", e, n?.onCancel) : U("login", e, n?.onCancel), s.extraParams = o, s.options = i, t.action = "login", W());
-    }), wo = f((e, o = {}) => {
+    }), ho = f((e, o = {}) => {
       const i = e;
       return function(...l) {
         const u = this;
         return (async () => {
           try {
-            const p = await uo(o);
+            const p = await wo(o);
             if (!p.sessionId)
               throw new Error("Authentication failed");
             return await i.call(u, p, ...l);
@@ -210,24 +214,24 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         })();
       };
     }), te = f(async (e, o = {}, i = {}) => {
-      O();
+      x();
       const n = e;
       typeof n == "object" && (e = n.onSuccess, o = n.extraParams || {}, i = n.options || {}), w(o?.inviter) && window.localStorage.getItem("inviter") && (o.inviter = window.localStorage.getItem("inviter"));
       const { params: l } = await ve();
       if (w(o?.forceConnected) && l?.forceConnected && (o.forceConnected = l.forceConnected, w(i.showQuickConnect) && (i.showQuickConnect = !1)), w(o?.sourceAppPid) && !w(l?.sourceAppPid) && (o.sourceAppPid = l.sourceAppPid), o?.openMode === "redirect") {
-        const m = o?.redirect || "/", L = new URL(`${M}/login`, window.location.origin);
-        L.searchParams.set("redirect", m), o?.forceConnected && L.searchParams.set("forceConnected", o?.forceConnected), w(o?.sourceAppPid) || L.searchParams.set("sourceAppPid", o?.sourceAppPid), w(o?.inviter) || L.searchParams.set("inviter", o?.inviter), i?.origin && L.searchParams.set("origin", i.origin), window.location.href = L.href;
+        const h = o?.redirect || "/", L = new URL(`${G}/login`, window.location.origin);
+        L.searchParams.set("redirect", h), o?.forceConnected && L.searchParams.set("forceConnected", o?.forceConnected), w(o?.sourceAppPid) || L.searchParams.set("sourceAppPid", o?.sourceAppPid), w(o?.inviter) || L.searchParams.set("inviter", o?.inviter), i?.origin && L.searchParams.set("origin", i.origin), window.location.href = L.href;
         return;
       }
       let u = o?.sourceAppPid;
-      w(u) && xo && (u = Oo.appPid), await $o(() => t.initialized), typeof i == "string" && (i = { origin: i });
-      const p = Ce(o);
+      w(u) && xo && (u = Ro.appPid), await qo(() => t.initialized), typeof i == "string" && (i = { origin: i });
+      const p = Te(o);
       p.passkeyBehavior = "both", s.allowWallet = void 0;
-      const a = p?.openMode || r?.extraParams?.openMode;
-      w(a) ? u ? u !== globalThis.blocklet.appPid && di(globalThis.blocklet) && (s.openMode = "window") : s.openMode = "popup" : s.openMode = a, s.openMode === "window" && !y.arcSphere && !y.wallet && await Ze() && (s.openMode = "popup"), u ? t.baseUrl = globalThis.blocklet.appUrl : t.baseUrl = "", ue(e, p, i);
-    }), we = f(async (e) => {
+      const c = p?.openMode || r?.extraParams?.openMode;
+      w(c) ? u ? u !== globalThis.blocklet.appPid && pi(globalThis.blocklet) && (s.openMode = "window") : s.openMode = "popup" : s.openMode = c, s.openMode === "window" && !y.arcSphere && !y.wallet && await eo() && (s.openMode = "popup"), u ? t.baseUrl = globalThis.blocklet.appUrl : t.baseUrl = "", we(e, p, i);
+    }), he = f(async (e) => {
       const o = $();
-      if (globalThis.blocklet && (Ge.user.logout({ visitorId: o }).catch((i) => {
+      if (globalThis.blocklet && (ze.user.logout({ visitorId: o }).catch((i) => {
         console.warn("Failed to logout remote", i);
       }), await E(100)), globalThis.blocklet) {
         const i = {
@@ -235,18 +239,18 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           appPid: globalThis.blocklet.appPid,
           userDid: t.user.did
         };
-        h("bridge callArc: onLogout", i), P.callArc("onLogout", i);
+        m("bridge callArc: onLogout", i), P.callArc("onLogout", i);
       }
-      fe(), V(), t.user = null, t.provider = "", t.walletOS = "", t.error = "", t.loading = !1, d.emit("logout"), ui.set({
+      ue(), V(), t.user = null, t.provider = "", t.walletOS = "", t.error = "", t.loading = !1, d.emit("logout"), wi.set({
         user_id: void 0
       }), typeof e == "function" && e();
     }), {
-      userSessions: ho,
-      refresh: mo,
-      loaded: go,
+      userSessions: mo,
+      refresh: go,
+      loaded: So,
       loginUserSession: re
-    } = Bi({
-      appPid: si(t.user),
+    } = Hi({
+      appPid: ci(t.user),
       loginAppPid: globalThis?.blocklet?.appPid,
       sourceAppPid: t?.user?.sourceAppPid,
       autoFetch: !1,
@@ -258,7 +262,7 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         });
       });
     }), ne = f((e, o = {}, i = {}) => {
-      O();
+      x();
       const n = e;
       typeof n == "object" && (e = n.onSuccess, o = n.extraParams || {}, i = n.options || {}), typeof i == "string" && (i = { origin: i }), i?.userSession ? re(i.userSession).then((l) => {
         Z(
@@ -270,24 +274,24 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           },
           !0
         ), U("switch-did", e), v({ ...l, encrypted: !1 }), C({ showProgress: !0 }).then(async () => {
-          await E(200), d.emit(c.LOGIN, l, _, A.current), x(A.current), await N();
+          await E(200), d.emit(a.LOGIN, l, _, A.current), O(A.current), await N();
         }).catch((u) => {
-          throw d.emit(c.LOGIN_FAILED, u), u;
+          throw d.emit(a.LOGIN_FAILED, u), u;
         });
       }) : (w(o?.forceConnected) && (o.forceConnected = !1), o.passkeyBehavior = "both", te(e, o, { ...i, origin: "switch-did" }));
-    }), So = f(async () => {
-      await Ge.user.refreshProfile();
-    }), Ao = f(async (e, o = {}) => {
-      await R(), O();
+    }), Ao = f(async () => {
+      await ze.user.refreshProfile();
+    }), Po = f(async (e, o = {}) => {
+      await R(), x();
       const i = e;
       typeof i == "object" && (e = i.onSuccess, o = i.extraParams || {}), U("switch-profile", e, i?.onCancel), s.extraParams = o, s.options = {}, t.action = "switch-profile", W();
-    }), Po = f(async (e, o = {}) => {
-      await R(), O();
+    }), bo = f(async (e, o = {}) => {
+      await R(), x();
       const i = e;
       typeof i == "object" && (e = i.onSuccess, o = i.extraParams || {}), U("switch-passport", e, i?.onCancel), s.extraParams = o, s.options = {}, t.action = "switch-passport", W();
-    }), bo = f(async ({ extraParams: e = {}, onSuccess: o = () => {
+    }), Co = f(async ({ extraParams: e = {}, onSuccess: o = () => {
     }, ...i } = {}) => {
-      await R(), O(), s.extraParams = {
+      await R(), x(), s.extraParams = {
         referrer: window.location.href,
         purpose: "authorize-for-import",
         ...e,
@@ -298,8 +302,8 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         onSuccess: o,
         ...i
       });
-    }), he = f(async ({ extraParams: e = {}, onSuccess: o = {} } = {}) => {
-      await R(), bo({
+    }), me = f(async ({ extraParams: e = {}, onSuccess: o = {} } = {}) => {
+      await R(), Co({
         extraParams: {
           // service 交互
           purpose: "authorize-for-import",
@@ -308,11 +312,11 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         onSuccess: o,
         hideCloseButton: !1
       });
-    }), { didSpacesGuideApi: Y, DidSpacesGuideView: Co } = Ui({
+    }), { didSpacesGuideApi: Y, DidSpacesGuideView: To } = Gi({
       autoClose: !1
     }), N = async ({ extraParams: e = {}, onSuccess: o = () => {
     } } = {}) => {
-      await R(), await We(t?.user) && (Y.open(), Y.onConnect((i = pi) => {
+      await R(), await We(t?.user) && (Y.open(), Y.onConnect((i = fi) => {
         const n = {
           prefix: "/connect-to-did-space",
           custom: !0,
@@ -329,7 +333,7 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           },
           onSuccess: async (l, u) => {
             const p = u ? u(l.spaceGateway) : l.spaceGateway;
-            await new li().user.updateDidSpace({ spaceGateway: p }), await C({ showProgress: !0 }), await o(l, u), await Y.close(), d.emit(c.DID_SPACE_CONNECTED, l, u), globalThis.blocklet && (h("bridge callArc: onDidSpaceConnected"), P.callArc("onDidSpaceConnected")), i(!0);
+            await new di().user.updateDidSpace({ spaceGateway: p }), await C({ showProgress: !0 }), await o(l, u), await Y.close(), d.emit(a.DID_SPACE_CONNECTED, l, u), globalThis.blocklet && (m("bridge callArc: onDidSpaceConnected"), P.callArc("onDidSpaceConnected")), i(!0);
           },
           onError: (l) => {
             console.error(l), ae.error(l.message), Y.close(), i(!1);
@@ -339,78 +343,78 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           }
         };
         k.openPopup(n, {
-          baseUrl: Ri
+          baseUrl: Wi
         });
       }));
-    }, me = f(async (e, o = {}) => {
-      if (await R(), yi(t.user)) {
+    }, ge = f(async (e, o = {}) => {
+      if (await R(), Ii(t.user)) {
         e({}, _, A.current);
         return;
       }
-      O();
+      x();
       const i = e;
       typeof i == "object" && (e = i.onSuccess), U("bind-wallet", e, i?.onCancel), s.extraParams = o, s.options = {}, t.action = "bind-wallet", W();
     }), se = f(async (e) => {
-      h("onSwitchPassport", { result: e }), s.extraParams = {}, s.options = {}, v(e), t.loading = !1, await C({ showProgress: !0 }), await E(200), d.emit(c.SWITCH_PASSPORT, e, _, A.current), globalThis.blocklet && (h("bridge callArc: onSwitchPassport"), P.callArc("onSwitchPassport"));
-    }), To = f((e) => {
-      d.emit(c.SWITCH_PASSPORT_FAILED, e);
-    }), G = f(async (e) => {
+      m("onSwitchPassport", { result: e }), s.extraParams = {}, s.options = {}, v(e), t.loading = !1, await C({ showProgress: !0 }), await E(200), d.emit(a.SWITCH_PASSPORT, e, _, A.current), globalThis.blocklet && (m("bridge callArc: onSwitchPassport"), P.callArc("onSwitchPassport"));
+    }), ko = f((e) => {
+      d.emit(a.SWITCH_PASSPORT_FAILED, e);
+    }), z = f(async (e) => {
       if (t.action === "switch-passport") {
         se(e);
         return;
       }
-      h("onLogin", { result: e }), s.extraParams = {}, s.options = {}, v(e), t.loading = !1, await C({ showProgress: !0 }), await E(200), t.action === "login" && (h("onLogin: emit LOGIN event", { result: e }), d.emit(c.LOGIN, e, _, A.current), x(A.current), N());
-    }), ko = f((e) => {
-      d.emit(c.LOGIN_FAILED, e);
+      m("onLogin", { result: e }), s.extraParams = {}, s.options = {}, v(e), t.loading = !1, await C({ showProgress: !0 }), await E(200), t.action === "login" && (m("onLogin: emit LOGIN event", { result: e }), d.emit(a.LOGIN, e, _, A.current), O(A.current), N());
     }), yo = f((e) => {
+      d.emit(a.LOGIN_FAILED, e);
+    }), Io = f((e) => {
       s.extraParams = {}, s.options = {}, v(e), t.loading = !1, C({ showProgress: !0 }).then(async () => {
-        await E(100), d.emit(c.BIND_WALLET, e, _, A.current), globalThis.blocklet && (h("bridge callArc: onBindWallet"), P.callArc("onBindWallet"));
+        await E(100), d.emit(a.BIND_WALLET, e, _, A.current), globalThis.blocklet && (m("bridge callArc: onBindWallet"), P.callArc("onBindWallet"));
       });
-    }), Io = f((e) => {
-      d.emit(c.BIND_WALLET_FAILED, e, A);
     }), Lo = f((e) => {
-      h("onSwitchProfile", { result: e }), s.extraParams = {}, s.options = {}, t.loading = !1, C({ showProgress: !0 }).then(async () => {
-        await E(100), d.emit(c.SWITCH_PROFILE, e, _, A.current), globalThis.blocklet && (h("bridge callArc: onSwitchProfile"), P.callArc("onSwitchProfile"));
-      });
+      d.emit(a.BIND_WALLET_FAILED, e, A);
     }), Do = f((e) => {
+      m("onSwitchProfile", { result: e }), s.extraParams = {}, s.options = {}, t.loading = !1, C({ showProgress: !0 }).then(async () => {
+        await E(100), d.emit(a.SWITCH_PROFILE, e, _, A.current), globalThis.blocklet && (m("bridge callArc: onSwitchProfile"), P.callArc("onSwitchProfile"));
+      });
+    }), _o = f((e) => {
       s.extraParams = {}, s.options = {}, V();
       const o = {
-        login: c.CANCEL_LOGIN,
-        "switch-profile": c.CANCEL_SWITCH_PROFILE,
-        "switch-passport": c.CANCEL_SWITCH_PASSPORT,
-        "bind-wallet": c.CANCEL_BIND_WALLET
+        login: a.CANCEL_LOGIN,
+        "switch-profile": a.CANCEL_SWITCH_PROFILE,
+        "switch-passport": a.CANCEL_SWITCH_PASSPORT,
+        "bind-wallet": a.CANCEL_BIND_WALLET
       }, i = {
         login: "offLogin",
         "switch-profile": "offSwitchProfile",
         "switch-passport": "offSwitchPassport",
         "bind-wallet": "offBindWallet"
       };
-      d.emit(o[e]), globalThis.blocklet && (h(`bridge callArc: ${i[e]}`), P.callArc(`${i[e]}`));
-    }), _o = f((e, ...o) => {
+      d.emit(o[e]), globalThis.blocklet && (m(`bridge callArc: ${i[e]}`), P.callArc(`${i[e]}`));
+    }), Eo = f((e, ...o) => {
       try {
         ce[e](...o);
       } catch (i) {
-        xe.error("Catch error in onSuccess", {
+        Oe.error("Catch error in onSuccess", {
           action: e,
           args: o,
           err: i
         }), ce[`${e}-failed`]?.(i, ...o);
       }
-    }), Eo = f((e, o, ...i) => {
+    }), vo = f((e, o, ...i) => {
       ce[`${e}-failed`]?.(o, ...i);
     }), {
-      federatedMaster: vo,
+      federatedMaster: Oo,
       federatedEnabled: xo,
-      master: Oo
-    } = Li({
+      master: Ro
+    } = Di({
       locale: b,
       decrypt: _,
-      login: ue,
+      login: we,
       handleLoginResult: v,
       handleRefreshUser: C,
-      setRefreshToken: po,
-      setSessionToken: fo
-    }), { checkMatch: Ro } = _i({ protectedRoutes: r.protectedRoutes || [] }), No = Le(ho), ge = f(async () => (go || (await mo(), await E(100)), No.current)), V = f(() => {
+      setRefreshToken: fo,
+      setSessionToken: uo
+    }), { checkMatch: No } = Ei({ protectedRoutes: r.protectedRoutes || [] }), Wo = De(mo), Se = f(async () => (So || (await go(), await E(100)), Wo.current)), V = f(() => {
       t.open = !1, k.close();
     }), W = async (e = {}) => {
       let o = t.action;
@@ -423,7 +427,7 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         email: t?.user?.email
       };
       if (o === "switch-did" && l?.forceConnected) {
-        const p = (a, m = {}) => ci(F["switch-specified-did"], a, b, "en", m);
+        const p = (c, h = {}) => ai(F["switch-specified-did"], c, b, "en", h);
         n.title = p("title"), n.scan = p("scan", { did: l.forceConnected }), n.confirm = p("confirm"), n.success = p("success");
       }
       delete l?.openMode;
@@ -456,7 +460,7 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           "protectedRoutes"
         ]),
         // 允许 login/switchProfile/switchDid 的时候传入自定义参数
-        ...Go(s.extraParams || {}, [
+        ...Vo(s.extraParams || {}, [
           "autoConnect",
           "forceConnected",
           "saveConnect",
@@ -468,13 +472,13 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         prefix: s.prefix,
         allowWallet: w(s.allowWallet) ? t.action !== "login" || ["1", "true", void 0, null].includes(globalThis.blocklet?.DID_CONNECT_ALLOW_WALLET) : s.allowWallet,
         onSuccess: async (...p) => {
-          _o(t.action, ...p), J(e?.onSuccess) && await e.onSuccess(...p), t.open = !1;
+          Eo(t.action, ...p), J(e?.onSuccess) && await e.onSuccess(...p), t.open = !1;
         },
         onClose(...p) {
-          Do(t.action, ...p);
+          _o(t.action, ...p);
         },
         onError(p) {
-          console.error(t.action, p), Eo(t.action, p, A.current);
+          console.error(t.action, p), vo(t.action, p, A.current);
         }
       };
       if (t.open = !0, ["login"].includes(t.action) && s.openMode === "window" && !(y.wallet || y.arcSphere))
@@ -483,13 +487,13 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
             ...u,
             baseUrl: window.location.origin
           };
-          Yo(s.prefix) || (p.prefix = H(window.location.origin, r.serviceHost, s.prefix)), p.extraParams?.provider || (p.extraParams.provider = t?.user?.provider || "wallet"), await k.openPopup(p, { locale: b });
+          Jo(s.prefix) || (p.prefix = H(window.location.origin, r.serviceHost, s.prefix)), p.extraParams?.provider || (p.extraParams.provider = t?.user?.provider || "wallet"), await k.openPopup(p, { locale: b });
         } catch (p) {
-          p instanceof vi && V(), p.message === "Timeout" ? ae.error(je[b] || je.en) : console.error(p);
+          p instanceof Oi && V(), p.message === "Timeout" ? ae.error(je[b] || je.en) : console.error(p);
         }
       else
         k.open(u);
-    }, Se = f(async () => {
+    }, Ae = f(async () => {
       const { params: e, url: o } = await ve();
       if (e) {
         const { switchBehavior: i, forceConnected: n, sourceAppPid: l, showClose: u } = e;
@@ -499,10 +503,10 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           redirect: o,
           sourceAppPid: l,
           forceConnected: n
-        }) : i === "disabled" ? window.history.replaceState(null, "trim", o) : oo.open({
+        }) : i === "disabled" ? window.history.replaceState(null, "trim", o) : io.open({
           title: F.switchAccountDialog[b].title,
           content: /* @__PURE__ */ j(Mo, { children: [
-            /* @__PURE__ */ g(Xo, { variant: "body1", sx: { textAlign: "center", mb: 2 }, children: F.switchAccountDialog[b].description }),
+            /* @__PURE__ */ g(Qo, { variant: "body1", sx: { textAlign: "center", mb: 2 }, children: F.switchAccountDialog[b].description }),
             /* @__PURE__ */ j(K, { sx: { display: "flex", alignItems: "center", color: "grey.A700" }, children: [
               /* @__PURE__ */ j(
                 K,
@@ -515,8 +519,8 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
                     lineHeight: 1
                   },
                   children: [
-                    /* @__PURE__ */ g(_e, { did: t.user.did, shape: "circle", variant: "circle", size: 80 }),
-                    /* @__PURE__ */ g(De, { did: t.user.did, showAvatar: !1, compact: !0, responsive: !1 }),
+                    /* @__PURE__ */ g(Ee, { did: t.user.did, shape: "circle", variant: "circle", size: 80 }),
+                    /* @__PURE__ */ g(_e, { did: t.user.did, showAvatar: !1, compact: !0, responsive: !1 }),
                     F.switchAccountDialog[b].currentAccount
                   ]
                 }
@@ -524,11 +528,11 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
               /* @__PURE__ */ g(K, { sx: { display: "flex", justifyContent: "center", px: 2 }, children: /* @__PURE__ */ g(
                 K,
                 {
-                  component: ii,
-                  icon: ti,
+                  component: ti,
+                  icon: ri,
                   sx: {
                     fontSize: 24,
-                    color: eo.grey[400],
+                    color: oo.grey[400],
                     animation: "right 2.5s linear infinite",
                     "@keyframes right": {
                       "0%": {
@@ -559,8 +563,8 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
                     fontWeight: 500
                   },
                   children: [
-                    /* @__PURE__ */ g(_e, { did: n, shape: "circle", variant: "circle", size: 80 }),
-                    /* @__PURE__ */ g(De, { did: n, showAvatar: !1, compact: !0, responsive: !1 }),
+                    /* @__PURE__ */ g(Ee, { did: n, shape: "circle", variant: "circle", size: 80 }),
+                    /* @__PURE__ */ g(_e, { did: n, showAvatar: !1, compact: !0, responsive: !1 }),
                     F.switchAccountDialog[b].nextAccount
                   ]
                 }
@@ -571,21 +575,21 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           showCancelButton: !1,
           confirmButtonText: F.switchAccountDialog[b].confirm,
           async onConfirm(p) {
-            const m = (await ge()).find((L) => L.userDid === n);
-            if (m) {
-              re(m).then((L) => {
+            const h = (await Se()).find((L) => L.userDid === n);
+            if (h) {
+              re(h).then((L) => {
                 Z(
                   {
-                    connected_did: m.user.did,
-                    connected_pk: m.user.pk,
-                    connected_wallet_os: m.extra.walletOS,
+                    connected_did: h.user.did,
+                    connected_pk: h.user.pk,
+                    connected_wallet_os: h.extra.walletOS,
                     connected_app: ee()
                   },
                   !0
                 ), v({ ...L, encrypted: !1 }), C({ showProgress: !0 }).then(async () => {
-                  await E(200), d.emit(c.LOGIN, L, _, A.current), x(A.current), await N();
-                }).catch((be) => {
-                  throw d.emit(c.LOGIN_FAILED, be), be;
+                  await E(200), d.emit(a.LOGIN, L, _, A.current), O(A.current), await N();
+                }).catch((Ce) => {
+                  throw d.emit(a.LOGIN_FAILED, Ce), Ce;
                 });
               }), p();
               return;
@@ -600,7 +604,7 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           }
         });
       }
-    }), Wo = f(async (e, o) => {
+    }), Fo = f(async (e, o) => {
       const i = Object.assign(
         {
           login: !0,
@@ -610,7 +614,7 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         o?.requirements
       ), n = o?.openMode || "popup";
       i.login && await R(), i.bindWallet && await new Promise((l) => {
-        me(() => {
+        ge(() => {
           l();
         });
       }), i.bindDidSpaces && (await We(t?.user) || await new Promise((l) => {
@@ -618,7 +622,7 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
           onSuccess() {
             l();
           }
-        }) : i.bindDidSpaces === "read" && he({
+        }) : i.bindDidSpaces === "read" && me({
           onSuccess() {
             l();
           }
@@ -627,11 +631,11 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
     });
     le(() => {
       const e = Number(t.unReadCount || 0);
-      pe(e);
+      fe(e);
     }, [t.unReadCount]);
-    const Fo = f(() => {
+    const Bo = f(() => {
       B.get("magicToken") && B.delete("magicToken"), B.toString() && window.history.replaceState({}, "", `${window.location.pathname}?${B.toString()}`);
-    }), Ae = f((e) => new Promise((o, i) => {
+    }), Pe = f((e) => new Promise((o, i) => {
       k.open({
         action: "login",
         locale: b,
@@ -642,44 +646,44 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         },
         magicToken: e,
         onSuccess(...n) {
-          G(...n), Fo(), o();
+          z(...n), Bo(), o();
         },
         onError(n) {
-          d.emit(c.LOGIN_FAILED, n), i(n);
+          d.emit(a.LOGIN_FAILED, n), i(n);
         }
       });
-    })), Bo = {
+    })), Uo = {
       ...t,
       loading: s.autoConnect && !t.user || t.loading,
-      openDidConnect: Wo,
+      openDidConnect: Fo,
       login: te,
-      logout: we,
+      logout: he,
       switchDid: ne,
-      autoSwitchDid: Se,
-      refreshProfile: So,
-      switchProfile: Ao,
-      switchPassport: Po,
-      connectToDidSpaceForImport: he,
+      autoSwitchDid: Ae,
+      refreshProfile: Ao,
+      switchProfile: Po,
+      switchPassport: bo,
+      connectToDidSpaceForImport: me,
       connectToDidSpaceForFullAccess: N,
-      bindWallet: me,
+      bindWallet: ge,
       refresh: C,
       updateConnectedInfo: Z,
       // federated relates
-      federatedMaster: vo,
+      federatedMaster: Oo,
       // oauth relates
-      useOAuth: Pi,
+      useOAuth: bi,
       OAuthProvider: Re,
-      OAuthConsumer: Ai,
-      OAuthContext: Si,
+      OAuthConsumer: Pi,
+      OAuthContext: Ai,
       // passkey relates
-      usePasskey: Ti,
+      usePasskey: ki,
       PasskeyProvider: Ne,
-      PasskeyConsumer: Ci,
-      PasskeyContext: bi,
+      PasskeyConsumer: Ti,
+      PasskeyContext: Ci,
       // user related
-      useDid: ki,
-      WrapDid: Ii,
-      getUserSessions: ge,
+      useDid: yi,
+      WrapDid: Li,
+      getUserSessions: Se,
       async loginUserSession(e) {
         try {
           const o = await re(e);
@@ -691,35 +695,35 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
               connected_app: ee()
             },
             !0
-          ), v({ ...o, encrypted: !1 }), await C({ showProgress: !0 }), await E(200), d.emit(c.LOGIN, o, _, A.current), x(A.current), await N();
+          ), v({ ...o, encrypted: !1 }), await C({ showProgress: !0 }), await E(200), d.emit(a.LOGIN, o, _, A.current), O(A.current), await N();
         } catch (o) {
-          throw d.emit(c.LOGIN_FAILED, o), o;
+          throw d.emit(a.LOGIN_FAILED, o), o;
         }
       },
-      unReadCount: Je,
-      setUnReadCount: pe,
-      verifyMagicToken: Ae,
+      unReadCount: Ze,
+      setUnReadCount: fe,
+      verifyMagicToken: Pe,
       // 二次认证相关方法
-      withSecondaryAuth: wo
-    }, A = Le(Bo), Uo = {
-      api: co,
+      withSecondaryAuth: ho
+    }, A = De(Uo), Ho = {
+      api: ao,
       events: d,
       storage: Q,
       connectApi: k,
       session: A.current
     }, ce = {
-      login: G,
-      "switch-profile": Lo,
+      login: z,
+      "switch-profile": Do,
       "switch-passport": se,
-      "switch-passport-failed": To,
-      "bind-wallet": yo,
-      "bind-wallet-failed": Io,
-      "login-failed": ko
+      "switch-passport-failed": ko,
+      "bind-wallet": Io,
+      "bind-wallet-failed": Lo,
+      "login-failed": yo
     };
     le(() => {
       if (t.initialized) {
-        const e = !to;
-        if (d.emit("change", { user: Ce(t.user), isFirst: e }), t.user && globalThis.blocklet) {
+        const e = !ro;
+        if (d.emit("change", { user: Te(t.user), isFirst: e }), t.user && globalThis.blocklet) {
           const o = {
             did: t.user.did,
             host: window.location.host,
@@ -728,7 +732,7 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
             sourceAppPid: t.user.sourceAppPid,
             fullName: t.user.fullName
           };
-          h("bridge callArc: onChange", {
+          m("bridge callArc: onChange", {
             isFirst: e,
             user: o
           }), P.callArc("onChange", {
@@ -739,51 +743,52 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
         }
       }
     }, [t.user, t.initialized, d]), le(() => {
-      t.initialized && t.user && Se();
-    }, [t.initialized]), oi(async () => {
-      const e = (a) => {
-        fi(a.encrypted) && (a.encrypted = !1), window.temporaryDIDConnectOnSuccess instanceof Function ? (h("bridgeOnLogin: temporaryDIDConnectOnSuccess", { result: a }), window.temporaryDIDConnectOnSuccess(a, (m) => m)) : (h("bridgeOnLogin: onLogin", { result: a }), G(a));
+      t.initialized && t.user && Ae();
+    }, [t.initialized]), ii(async () => {
+      const e = (c) => {
+        ui(c.encrypted) && (c.encrypted = !1), window.temporaryDIDConnectOnSuccess instanceof Function ? (m("bridgeOnLogin: temporaryDIDConnectOnSuccess", { result: c }), window.temporaryDIDConnectOnSuccess(c, (h) => h)) : (m("bridgeOnLogin: onLogin", { result: c }), z(c));
       };
-      if (P.registerBlocklet("callLoginOAuth", (a) => {
-        h("bridge registerBlocklet: callLoginOAuth", a), k.loginOAuth({
-          ...a,
+      if (P.registerBlocklet("callLoginOAuth", (c) => {
+        m("bridge registerBlocklet: callLoginOAuth", c), k.loginOAuth({
+          ...c,
           onLogin: e
         });
-      }), P.registerBlocklet("logout", we), P.registerBlocklet("login", (a) => {
-        h("bridge registerBlocklet: login", a), e(a);
-      }), Jo(), !$()) {
+      }), P.registerBlocklet("logout", he), P.registerBlocklet("login", (c) => {
+        m("bridge registerBlocklet: login", c), e(c);
+      }), Zo(), !$()) {
         if (y.arcSphere) {
-          h("bridge callArc: getVisitorId");
-          const a = await P.callArc("getVisitorId");
-          h("bridge callArc: getVisitorId result", { walletVisitorId: a }), Te(a);
+          m("bridge callArc: getVisitorId");
+          const c = await P.callArc("getVisitorId");
+          m("bridge callArc: getVisitorId result", { walletVisitorId: c }), ke(c);
         } else if (y.wallet) {
-          const a = await Ni();
-          Te(a);
+          const c = await Fi();
+          ke(c);
         }
       }
-      const i = jo.get("connected_app"), n = ee();
+      const i = Ko.get("connected_app"), n = ee();
       if (r.autoDisconnect && i && n && i !== n) {
-        fe(), t.initialized = !0, s.autoConnect ? W() : V();
+        ue(), t.initialized = !0, s.autoConnect ? W() : V();
         return;
       }
-      const l = ao();
+      const l = lo();
       if (window?.self === window?.parent) {
-        let a = "web";
-        if (y.mobile.apple.device ? a = "ios" : y.mobile.android.device && (a = "android"), y.wallet && Wi({ version: y.walletVersion, platform: a }) && !l)
+        let c = "web";
+        if (y.mobile.apple.device ? c = "ios" : y.mobile.android.device && (c = "android"), y.wallet && Bi({ version: y.walletVersion, platform: c }) && !l)
           try {
             t.loading = !0;
-            const m = await Fi();
-            if (m) {
-              await G({
-                sessionToken: m.sessionToken,
-                refreshToken: m.refreshToken,
-                visitorId: m.visitorId,
+            const h = await Ui();
+            if (h) {
+              await z({
+                sessionToken: h.sessionToken,
+                refreshToken: h.refreshToken,
+                csrfToken: h.csrfToken,
+                visitorId: h.visitorId,
                 encrypted: !1
               }), t.initialized = !0;
               return;
             }
-          } catch (m) {
-            throw d.emit(c.LOGIN_FAILED, m), m;
+          } catch (h) {
+            throw d.emit(a.LOGIN_FAILED, h), h;
           } finally {
             t.loading = !1;
           }
@@ -791,48 +796,49 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
       const u = B.get("magicToken");
       if (u)
         try {
-          t.initialized = !0, await Ae(u);
-        } catch (a) {
-          console.error("verifyMagicToken failed", a);
+          t.initialized = !0, await Pe(u);
+        } catch (c) {
+          console.error("verifyMagicToken failed", c);
         }
       if (l) {
         await C({ showProgress: !0 }), t.initialized = !0, t.user && await N();
         return;
       }
       if (typeof window < "u") {
-        const a = new URL(window.location.href), m = a.searchParams.get("loginToken");
-        if (m) {
-          v({ loginToken: m, encrypted: !1 }), a.searchParams.delete("loginToken"), window.history.replaceState({}, window.title, a.href);
+        const c = new URL(window.location.href), h = c.searchParams.get("loginToken");
+        if (h) {
+          v({ loginToken: h, encrypted: !1 }), c.searchParams.delete("loginToken"), window.history.replaceState({}, window.title, c.href);
           return;
         }
       }
-      if (lo()) {
-        await no(!0), t.initialized = !0;
+      if (po()) {
+        await so(!0), t.initialized = !0;
         return;
       }
       if (t.initialized = !0, s.autoConnect ? W() : V(), y.arcSphere && ![
         // 不应该唤起自动登录的路由
-        H(M, "login"),
-        H(M, "connect"),
-        H(M, "lost-passport")
+        H(G, "login"),
+        H(G, "connect"),
+        H(G, "lost-passport")
       ].includes(window.location.pathname) && !l)
         try {
-          h("bridge callArc: autoLogin");
-          const a = await P.callArc("autoLogin");
-          h("bridgecallArc: autoLogin result", a), a && await G({
-            sessionToken: a.sessionToken,
-            refreshToken: a.refreshToken,
-            visitorId: a.visitorId,
+          m("bridge callArc: autoLogin");
+          const c = await P.callArc("autoLogin");
+          m("bridgecallArc: autoLogin result", c), c && await z({
+            sessionToken: c.sessionToken,
+            refreshToken: c.refreshToken,
+            csrfToken: c.csrfToken,
+            visitorId: c.visitorId,
             encrypted: !1
           });
-        } catch (a) {
-          d.emit(c.LOGIN_FAILED, a), xe.error("Failed to autoLogin ArcSphere", a);
+        } catch (c) {
+          d.emit(a.LOGIN_FAILED, c), Oe.error("Failed to autoLogin ArcSphere", c);
         }
     });
-    const Ho = B.has("popup");
-    if (Ro() && !t.initialized)
-      return /* @__PURE__ */ g(Zo, { children: Ho ? null : /* @__PURE__ */ g(Qo, {}) });
-    const Pe = {
+    const Go = B.has("popup");
+    if (No() && !t.initialized)
+      return /* @__PURE__ */ g(ei, { children: Go ? null : /* @__PURE__ */ g(Yo, {}) });
+    const be = {
       locale: b,
       onSwitchPassport: ({ sessionToken: e, refreshToken: o }) => se({ sessionToken: e, refreshToken: o, encrypted: !1 }),
       onUnbindOAuth: () => C(),
@@ -841,16 +847,16 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
       onRemovePasskey: () => C(),
       session: A.current
     };
-    return /* @__PURE__ */ g(Gi, { value: Uo, children: /* @__PURE__ */ g(Ne, { ...Pe, children: /* @__PURE__ */ j(Re, { ...Pe, children: [
+    return /* @__PURE__ */ g(ji, { value: Ho, children: /* @__PURE__ */ g(Ne, { ...be, children: /* @__PURE__ */ j(Re, { ...be, children: [
       !t.open && typeof r.children == "function" ? r.children(t) : r.children,
       ie,
-      io,
-      Co,
-      T.rolling && /* @__PURE__ */ g(Oe, { callback: () => so() }),
-      /* @__PURE__ */ g(Oe, { callback: ro })
+      to,
+      To,
+      T.rolling && /* @__PURE__ */ g(xe, { callback: () => co() }),
+      /* @__PURE__ */ g(xe, { callback: no })
     ] }) }) });
   }
-  de.propTypes = {
+  pe.propTypes = {
     children: S.any.isRequired,
     serviceHost: S.string,
     action: S.string,
@@ -871,26 +877,26 @@ function $e(q = Xe, X = "ls", oe = {}, T = {}) {
     apiOptions: S.object,
     lazyRefreshToken: S.bool
   };
-  function Ye(I) {
+  function Je(I) {
     return function(k) {
-      return /* @__PURE__ */ g(ke, { children: /* @__PURE__ */ g(Ve, { children: (ie) => /* @__PURE__ */ g(I, { ...k, ...ie }) }) });
+      return /* @__PURE__ */ g(ye, { children: /* @__PURE__ */ g(Ve, { children: (ie) => /* @__PURE__ */ g(I, { ...k, ...ie }) }) });
     };
   }
   return {
-    SessionProvider: (I) => /* @__PURE__ */ g(ke, { children: /* @__PURE__ */ g(Hi, { children: /* @__PURE__ */ g(de, { ...I }) }) }),
+    SessionProvider: (I) => /* @__PURE__ */ g(ye, { children: /* @__PURE__ */ g(Mi, { children: /* @__PURE__ */ g(pe, { ...I }) }) }),
     SessionConsumer: Ve,
     SessionContext: qe,
-    withSession: Ye
+    withSession: Je
   };
 }
-function Kt({ storageEngine: q = "cookie" } = {}) {
+function qt({ storageEngine: q = "cookie" } = {}) {
   const X = Xe, oe = Qe;
   let T = null;
   if (typeof window < "u" && (T = (globalThis.blocklet || {}).componentId), q === "cookie") {
-    let D = "/", x = 1;
+    let D = "/", O = 1;
     if (typeof window < "u") {
-      const Q = window.env || {}, z = window.blocklet || {};
-      D = Q.groupPathPrefix || z.groupPrefix || z.prefix || "", D = D.replace(/\/+$/, ""), D = D || "/", z.serverVersion && (x = mi(window.blocklet?.settings?.session?.cacheTtl, 1 / 24));
+      const Q = window.env || {}, M = window.blocklet || {};
+      D = Q.groupPathPrefix || M.groupPrefix || M.prefix || "", D = D.replace(/\/+$/, ""), D = D || "/", M.serverVersion && (O = gi(window.blocklet?.settings?.session?.cacheTtl, 1 / 24));
     }
     return $e(
       X,
@@ -898,7 +904,7 @@ function Kt({ storageEngine: q = "cookie" } = {}) {
       {
         path: D,
         returnDomain: !1,
-        expireInDays: x
+        expireInDays: O
       },
       {
         appendAuthServicePrefix: !0,
@@ -912,16 +918,16 @@ function Kt({ storageEngine: q = "cookie" } = {}) {
   throw new Error("storageEngine must be cookie or localStorage");
 }
 export {
-  c as EVENTS,
+  a as EVENTS,
   qe as SessionContext,
-  Wi as checkEnableAutoLogin,
-  Kt as createAuthServiceSessionContext,
+  Bi as checkEnableAutoLogin,
+  qt as createAuthServiceSessionContext,
   $e as createSessionContext,
   $e as default,
   We as didSpacesIsRequired,
-  Ni as getMobileVisitorId,
-  Fi as login,
-  Xt as loginFederatedMaster,
-  Qt as mountFederatedIframe,
+  Fi as getMobileVisitorId,
+  Ui as login,
+  Yt as loginFederatedMaster,
+  Jt as mountFederatedIframe,
   F as translations
 };