@arcblock/did-connect-react 3.4.4 → 3.4.5

package/lib/Session/index.js

@@ -10,52 +10,52 @@ import qo from "js-cookie";
 import Xo from "eventemitter3";
 import Qo from "p-wait-for";
 import { useTheme as Yo, Typography as Jo, Box as $, CircularProgress as Zo } from "@mui/material";
-import { getVisitorId as q, isUrl as et, ensureVisitorId as ot, setVisitorId as ke } from "@arcblock/ux/lib/Util";
+import { getVisitorId as q, mergeIgnoreEmpty as et, isUrl as ot, ensureVisitorId as tt, setVisitorId as ke } from "@arcblock/ux/lib/Util";
 import ae, { ToastProvider as ye } from "@arcblock/ux/lib/Toast";
-import tt from "@arcblock/ux/lib/Center";
-import { useReactive as Ie, useCreation as Le, useMemoizedFn as f, usePrevious as it, useLatest as De, useUpdateEffect as le, useMount as rt } from "ahooks";
+import it from "@arcblock/ux/lib/Center";
+import { useReactive as Ie, useCreation as Le, useMemoizedFn as f, usePrevious as rt, useLatest as De, useUpdateEffect as le, useMount as nt } from "ahooks";
 import { joinURL as H } from "ufo";
-import { Icon as nt } from "@iconify/react";
-import st from "@iconify-icons/material-symbols/keyboard-double-arrow-right-rounded";
-import ct from "@arcblock/react-hooks/lib/useBrowser";
-import at from "@arcblock/ux/lib/Dialog/use-confirm";
+import { Icon as st } from "@iconify/react";
+import ct from "@iconify-icons/material-symbols/keyboard-double-arrow-right-rounded";
+import at from "@arcblock/react-hooks/lib/useBrowser";
+import lt from "@arcblock/ux/lib/Dialog/use-confirm";
 import _e from "@arcblock/ux/lib/DID";
 import Ee from "@arcblock/ux/lib/Avatar";
-import { getCurrentAppPid as lt } from "@arcblock/ux/lib/SessionUser/libs/utils";
-import { translate as dt } from "@arcblock/ux/lib/Locale/util";
-import { getBlockletSDK as pt } from "@blocklet/js-sdk";
+import { getCurrentAppPid as dt } from "@arcblock/ux/lib/SessionUser/libs/utils";
+import { translate as pt } from "@arcblock/ux/lib/Locale/util";
+import { getBlockletSDK as ft } from "@blocklet/js-sdk";
 import b from "@arcblock/bridge";
-import { getFederatedEnabled as ft } from "@arcblock/ux/lib/Util/federated";
-import ut from "lodash/noop";
-import wt from "lodash/isNil";
-import { ReactGA as ht } from "@arcblock/ux/lib/withTracker";
-import { useState as mt, useEffect as gt } from "react";
+import { getFederatedEnabled as ut } from "@arcblock/ux/lib/Util/federated";
+import wt from "lodash/noop";
+import ht from "lodash/isNil";
+import { ReactGA as mt } from "@arcblock/ux/lib/withTracker";
+import { useState as gt, useEffect as St } from "react";
 import de from "../Storage/index.js";
-import { formatCacheTtl as St, getBrowserLang as Pt, debug as h, decodeUrlParams as ve, sleep as E, debugTmp as xe, updateConnectedInfo as ee, getAppId as oe, logger as Oe } from "../utils.js";
+import { formatCacheTtl as Pt, getBrowserLang as At, debug as h, decodeUrlParams as ve, sleep as E, debugTmp as xe, updateConnectedInfo as ee, getAppId as oe, logger as Oe } from "../utils.js";
 import Re from "./window-focus-aware.js";
-import { OAuthContext as At, OAuthConsumer as bt, OAuthProvider as Ne, useOAuth as Ct } from "../OAuth/context.js";
-import { PasskeyContext as Tt, PasskeyConsumer as kt, PasskeyProvider as We, usePasskey as yt } from "../Passkey/context.js";
+import { OAuthContext as bt, OAuthConsumer as Ct, OAuthProvider as Ne, useOAuth as Tt } from "../OAuth/context.js";
+import { PasskeyContext as kt, PasskeyConsumer as yt, PasskeyProvider as We, usePasskey as It } from "../Passkey/context.js";
 import "../Passkey/actions.js";
-import It, { getWalletDid as Lt } from "../User/use-did.js";
-import Dt from "../User/wrap-did.js";
-import _t from "./hooks/use-federated.js";
-import Et from "./hooks/use-session-token.js";
-import vt from "./hooks/use-protected-routes.js";
+import Lt, { getWalletDid as Dt } from "../User/use-did.js";
+import _t from "../User/wrap-did.js";
+import Et from "./hooks/use-federated.js";
+import vt from "./hooks/use-session-token.js";
+import xt from "./hooks/use-protected-routes.js";
 import { SessionContext as qe } from "./context.js";
-import xt from "../Connect/use-connect.js";
+import Ot from "../Connect/use-connect.js";
 import { EVENTS as a } from "./libs/constants.js";
 import { translations as B } from "./libs/locales.js";
-import { NotOpenError as Ot } from "../error.js";
-import { SESSION_TOKEN_STORAGE_KEY as Xe, REFRESH_TOKEN_STORAGE_KEY as Qe, CSRF_TOKEN_STORAGE_KEY as Rt, API_DID_PREFIX as Nt, DEFAULT_TIMEOUT as Wt, BLOCKLET_SERVICE_PATH_PREFIX as G, DID_SPACES_BASE_URL as Ft } from "../constant.js";
-import { getMobileVisitorId as Bt, checkEnableAutoLogin as Ut, login as Mt } from "./libs/login-mobile.js";
-import Ht from "../Connect/hooks/use-quick-connect.js";
+import { NotOpenError as Rt } from "../error.js";
+import { SESSION_TOKEN_STORAGE_KEY as Xe, REFRESH_TOKEN_STORAGE_KEY as Qe, CSRF_TOKEN_STORAGE_KEY as Nt, API_DID_PREFIX as Wt, DEFAULT_TIMEOUT as Ft, BLOCKLET_SERVICE_PATH_PREFIX as G, DID_SPACES_BASE_URL as Bt } from "../constant.js";
+import { getMobileVisitorId as Ut, checkEnableAutoLogin as Mt, login as Ht } from "./libs/login-mobile.js";
+import Gt from "../Connect/hooks/use-quick-connect.js";
 import { didSpacesIsRequired as Fe } from "./libs/did-spaces.js";
-import Gt from "./did-spaces-guide.js";
-import { FederatedProvider as zt, useFederatedContext as Vt } from "../Federated/context.js";
-import jt from "./hooks/use-verify.js";
+import zt from "./did-spaces-guide.js";
+import { FederatedProvider as Vt, useFederatedContext as jt } from "../Federated/context.js";
+import Kt from "./hooks/use-verify.js";
 import { gaLoginSuccessHandler as Be, gaLoginFailedHandler as Ue, gaSwitchPassportSuccessHandler as Me, gaSwitchPassportFailedHandler as He, gaBindWalletSuccessHandler as Ge, gaBindWalletFailedHandler as ze } from "./handler.js";
-import { loginFederatedMaster as Ji, mountFederatedIframe as Zi } from "./libs/federated.js";
-const { Provider: Kt, Consumer: Ve } = qe, je = {
+import { loginFederatedMaster as Zi, mountFederatedIframe as er } from "./libs/federated.js";
+const { Provider: $t, Consumer: Ve } = qe, je = {
   en: "DID Connect timeout, please reopen DID Connect popup",
   zh: "DID Connect 超时, 请重新打开 DID Connect"
 }, Ke = {
@@ -88,14 +88,14 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       } else
         b.callArc("onLogin", { error: "no user", code: 400 }), h("notifyBridge failed", { sessionState: L });
   }
-  const Y = de(X, Q, te), z = de(Rt, "cookie", {
+  const Y = de(X, Q, te), z = de(Nt, "cookie", {
     secure: !0,
     sameSite: "strict"
   }), Ye = de(k.refreshTokenStorageKey, "ls");
   function pe({ ...L }) {
-    const v = pt(), n = Object.assign({}, L);
-    u(n.serviceHost) && (n.serviceHost = D), u(n.locale) && (n.locale = ""), u(n.action) && (n.action = "login"), u(n.prefix) && (n.prefix = Nt), u(n.appendAuthServicePrefix) && (n.appendAuthServicePrefix = !1), u(n.extraParams) && (n.extraParams = {}), u(n.options) && (n.options = {}), u(n.autoConnect) && (n.autoConnect = !1), u(n.autoDisconnect) && (n.autoDisconnect = !0), u(n.useSocket) && (n.useSocket = !0), u(n.timeout) && (n.timeout = Wt * 1e3), u(n.webWalletUrl) && (n.webWalletUrl = void 0), u(n.protectedRoutes) && (n.protectedRoutes = ["*"]), u(n.apiOptions) && (n.apiOptions = {}), u(n.lazyRefreshToken) && (n.lazyRefreshToken = !1);
-    const { connectApi: y, connectHolder: Ze } = xt(), [eo, fe] = mt(0), I = ct(), { requestStorageAccess: oo } = Vt(), { palette: to } = Yo(), U = new URLSearchParams(window.location.search), c = Ie({
+    const v = ft(), n = Object.assign({}, L);
+    u(n.serviceHost) && (n.serviceHost = D), u(n.locale) && (n.locale = ""), u(n.action) && (n.action = "login"), u(n.prefix) && (n.prefix = Wt), u(n.appendAuthServicePrefix) && (n.appendAuthServicePrefix = !1), u(n.extraParams) && (n.extraParams = {}), u(n.options) && (n.options = {}), u(n.autoConnect) && (n.autoConnect = !1), u(n.autoDisconnect) && (n.autoDisconnect = !0), u(n.useSocket) && (n.useSocket = !0), u(n.timeout) && (n.timeout = Ft * 1e3), u(n.webWalletUrl) && (n.webWalletUrl = void 0), u(n.protectedRoutes) && (n.protectedRoutes = ["*"]), u(n.apiOptions) && (n.apiOptions = {}), u(n.lazyRefreshToken) && (n.lazyRefreshToken = !1);
+    const { connectApi: y, connectHolder: Ze } = Ot(), [eo, fe] = gt(0), I = at(), { requestStorageAccess: oo } = jt(), { palette: to } = Yo(), U = new URLSearchParams(window.location.search), c = Ie({
       extraParams: {},
       options: {},
       currentLocale: n.locale,
@@ -123,13 +123,13 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       baseUrl: "",
       unReadCount: 0
       // 不可以直接个性 props.autoConnect (readonly)
-    }), P = Le(() => n.locale || c.currentLocale || Pt(), [n.locale, c.currentLocale]), { confirmApi: io, confirmHolder: ro } = at(), R = f(() => {
+    }), P = Le(() => n.locale || c.currentLocale || At(), [n.locale, c.currentLocale]), { confirmApi: io, confirmHolder: ro } = lt(), R = f(() => {
       if (i.open && !I.arcSphere) {
         const e = Ke[P] || Ke.en;
         throw ae.warning(e), new Error(e);
       }
     }), d = Le(() => new Xo(), []);
-    gt(() => (d.on(a.LOGIN, Be), d.on(a.LOGIN_FAILED, Ue), d.on(a.SWITCH_PASSPORT, Me), d.on(a.SWITCH_PASSPORT_FAILED, He), d.on(a.BIND_WALLET, Ge), d.on(a.BIND_WALLET_FAILED, ze), () => {
+    St(() => (d.on(a.LOGIN, Be), d.on(a.LOGIN_FAILED, Ue), d.on(a.SWITCH_PASSPORT, Me), d.on(a.SWITCH_PASSPORT_FAILED, He), d.on(a.BIND_WALLET, Ge), d.on(a.BIND_WALLET_FAILED, ze), () => {
       d.off(a.LOGIN, Be), d.off(a.LOGIN_FAILED, Ue), d.off(a.SWITCH_PASSPORT, Me), d.off(a.SWITCH_PASSPORT_FAILED, He), d.off(a.BIND_WALLET, Ge), d.off(a.BIND_WALLET_FAILED, ze);
     }), [d]);
     const M = f((e, o, t) => {
@@ -151,7 +151,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       d.once(s[e][0], l), d.once(s[e][1], async (...p) => {
         Z(l) && d.off(s[e][0], l), Z(t) && await t(...p), d.emit(`cancel-${e}`, ...p);
       });
-    }), no = it(i.initialized, (e, o) => e !== o || e === !0 && o === !0), {
+    }), no = rt(i.initialized, (e, o) => e !== o || e === !0 && o === !0), {
       syncSessionSate: so,
       handleRefreshUser: C,
       handleRefreshToken: co,
@@ -164,7 +164,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       getRefreshToken: fo,
       setRefreshToken: uo,
       setSessionToken: wo
-    } = Et({
+    } = vt({
       state: i,
       pageState: c,
       sessionTokenStorage: Y,
@@ -194,7 +194,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
           }));
         }
       }
-    }), ho = jt({ state: i, connectApi: y }), we = f((e, o = {}, t = {}) => {
+    }), ho = Kt({ state: i, connectApi: y }), we = f((e, o = {}, t = {}) => {
       R();
       const s = e;
       typeof s == "object" && (e = s.onSuccess, o = s.extraParams || {}, t = s.options || {}, t.origin = s.origin || ""), (!i.user || t.origin === "switch-did") && (t.origin === "switch-did" ? M("switch-did", e, s?.onCancel) : M("login", e, s?.onCancel), c.extraParams = o, c.options = t, i.action = "login", F());
@@ -228,7 +228,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       const g = Te(o);
       g.passkeyBehavior = "both", c.allowWallet = void 0;
       const r = g?.openMode || n?.extraParams?.openMode;
-      u(r) ? p ? p !== globalThis.blocklet.appPid && ft(globalThis.blocklet) && (c.openMode = "window") : c.openMode = "popup" : c.openMode = r, c.openMode === "window" && !I.arcSphere && !I.wallet && await oo() && (c.openMode = "popup"), p ? i.baseUrl = globalThis.blocklet.appUrl : i.baseUrl = "", we(e, g, t);
+      u(r) ? p ? p !== globalThis.blocklet.appPid && ut(globalThis.blocklet) && (c.openMode = "window") : c.openMode = "popup" : c.openMode = r, c.openMode === "window" && !I.arcSphere && !I.wallet && await oo() && (c.openMode = "popup"), p ? i.baseUrl = globalThis.blocklet.appUrl : i.baseUrl = "", we(e, g, t);
     }), he = f(async (e) => {
       const o = q();
       if (globalThis.blocklet && (v.user.logout({ visitorId: o }).catch((t) => {
@@ -241,7 +241,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
         };
         h("bridge callArc: onLogout", t), b.callArc("onLogout", t);
       }
-      xe("[clearSession] createSessionContext -> logout:"), ue(), j(), i.user = null, i.provider = "", i.walletOS = "", i.error = "", i.loading = !1, d.emit("logout"), ht.set({
+      xe("[clearSession] createSessionContext -> logout:"), ue(), j(), i.user = null, i.provider = "", i.walletOS = "", i.error = "", i.loading = !1, d.emit("logout"), mt.set({
         user_id: void 0
       }), typeof e == "function" && e();
     }), {
@@ -249,8 +249,8 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       refresh: So,
       loaded: Po,
       loginUserSession: re
-    } = Ht({
-      appPid: lt(i.user),
+    } = Gt({
+      appPid: dt(i.user),
       loginAppPid: globalThis?.blocklet?.appPid,
       sourceAppPid: i?.user?.sourceAppPid,
       autoFetch: !1,
@@ -316,11 +316,11 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
         onSuccess: o,
         hideCloseButton: !1
       });
-    }), { didSpacesGuideApi: J, DidSpacesGuideView: yo } = Gt({
+    }), { didSpacesGuideApi: J, DidSpacesGuideView: yo } = zt({
       autoClose: !1
     }), W = async ({ extraParams: e = {}, onSuccess: o = () => {
     } } = {}) => {
-      await N(), await Fe(i?.user) && (J.open(), J.onConnect((t = ut) => {
+      await N(), await Fe(i?.user) && (J.open(), J.onConnect((t = wt) => {
         const s = {
           prefix: "/connect-to-did-space",
           custom: !0,
@@ -347,11 +347,11 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
           }
         };
         y.openPopup(s, {
-          baseUrl: Ft
+          baseUrl: Bt
         });
       }));
     }, ge = f(async (e, o = {}) => {
-      if (await N(), Lt(i.user)) {
+      if (await N(), Dt(i.user)) {
         e({}, _, A.current);
         return;
       }
@@ -410,7 +410,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       federatedMaster: Ro,
       federatedEnabled: No,
       master: Wo
-    } = _t({
+    } = Et({
       locale: P,
       decrypt: _,
       login: we,
@@ -418,12 +418,12 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       handleRefreshUser: C,
       setRefreshToken: uo,
       setSessionToken: wo
-    }), { checkMatch: Fo } = vt({ protectedRoutes: n.protectedRoutes || [] }), Bo = De(go), Se = f(async () => (Po || (await So(), await E(100)), Bo.current)), j = f(() => {
+    }), { checkMatch: Fo } = xt({ protectedRoutes: n.protectedRoutes || [] }), Bo = De(go), Se = f(async () => (Po || (await So(), await E(100)), Bo.current)), j = f(() => {
       i.open = !1, y.close();
     }), F = async (e = {}) => {
       let o = i.action;
       c?.options?.origin === "switch-did" && (o = c?.options?.origin);
-      const t = B[o], l = Ao(o, P) || t[P] || t.en, p = {
+      const t = B[o], s = Ao(o, P), l = et(t[P] || t.en, s || {}), p = {
         ...k.extraParams,
         ...n.extraParams,
         ...c.extraParams,
@@ -431,7 +431,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
         email: i?.user?.email
       };
       if (o === "switch-did" && p?.forceConnected) {
-        const r = (w, T = {}) => dt(B["switch-specified-did"], w, P, "en", T);
+        const r = (w, T = {}) => pt(B["switch-specified-did"], w, P, "en", T);
         l.title = r("title"), l.scan = r("scan", { did: p.forceConnected }), l.confirm = r("confirm"), l.success = r("success");
       }
       delete p?.openMode;
@@ -491,9 +491,9 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
             ...g,
             baseUrl: window.location.origin
           };
-          et(c.prefix) || (r.prefix = H(window.location.origin, n.serviceHost, c.prefix)), r.extraParams?.provider || (r.extraParams.provider = i?.user?.provider || "wallet"), await y.openPopup(r, { locale: P });
+          ot(c.prefix) || (r.prefix = H(window.location.origin, n.serviceHost, c.prefix)), r.extraParams?.provider || (r.extraParams.provider = i?.user?.provider || "wallet"), await y.openPopup(r, { locale: P });
         } catch (r) {
-          r instanceof Ot && j(), r.message === "Timeout" ? ae.error(je[P] || je.en) : console.error(r);
+          r instanceof Rt && j(), r.message === "Timeout" ? ae.error(je[P] || je.en) : console.error(r);
         }
       else
         y.open(g);
@@ -532,8 +532,8 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
               /* @__PURE__ */ m($, { sx: { display: "flex", justifyContent: "center", px: 2 }, children: /* @__PURE__ */ m(
                 $,
                 {
-                  component: nt,
-                  icon: st,
+                  component: st,
+                  icon: ct,
                   sx: {
                     fontSize: 24,
                     color: to.grey[400],
@@ -675,18 +675,18 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       // federated relates
       federatedMaster: Ro,
       // oauth relates
-      useOAuth: Ct,
+      useOAuth: Tt,
       OAuthProvider: Ne,
-      OAuthConsumer: bt,
-      OAuthContext: At,
+      OAuthConsumer: Ct,
+      OAuthContext: bt,
       // passkey relates
-      usePasskey: yt,
+      usePasskey: It,
       PasskeyProvider: We,
-      PasskeyConsumer: kt,
-      PasskeyContext: Tt,
+      PasskeyConsumer: yt,
+      PasskeyContext: kt,
       // user related
-      useDid: It,
-      WrapDid: Dt,
+      useDid: Lt,
+      WrapDid: _t,
       getUserSessions: Se,
       async loginUserSession(e) {
         try {
@@ -748,9 +748,9 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       }
     }, [i.user, i.initialized, d]), le(() => {
       i.initialized && i.user && Pe();
-    }, [i.initialized]), rt(async () => {
+    }, [i.initialized]), nt(async () => {
       const e = (r) => {
-        wt(r.encrypted) && (r.encrypted = !1), window.temporaryDIDConnectOnSuccess instanceof Function ? (h("bridgeOnLogin: temporaryDIDConnectOnSuccess", { result: r }), window.temporaryDIDConnectOnSuccess(r, (w) => w)) : (h("bridgeOnLogin: onLogin", { result: r }), V(r));
+        ht(r.encrypted) && (r.encrypted = !1), window.temporaryDIDConnectOnSuccess instanceof Function ? (h("bridgeOnLogin: temporaryDIDConnectOnSuccess", { result: r }), window.temporaryDIDConnectOnSuccess(r, (w) => w)) : (h("bridgeOnLogin: onLogin", { result: r }), V(r));
       };
       if (b.registerBlocklet("callLoginOAuth", (r) => {
         h("bridge registerBlocklet: callLoginOAuth", r), y.loginOAuth({
@@ -759,13 +759,13 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
         });
       }), b.registerBlocklet("logout", he), b.registerBlocklet("login", (r) => {
         h("bridge registerBlocklet: login", r), e(r);
-      }), ot(), !q()) {
+      }), tt(), !q()) {
         if (I.arcSphere) {
           h("bridge callArc: getVisitorId");
           const r = await b.callArc("getVisitorId");
           h("bridge callArc: getVisitorId result", { walletVisitorId: r }), ke(r);
         } else if (I.wallet) {
-          const r = await Bt();
+          const r = await Ut();
           ke(r);
         }
       }
@@ -781,10 +781,10 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       const l = po();
       if (window?.self === window?.parent) {
         let r = "web";
-        if (I.mobile.apple.device ? r = "ios" : I.mobile.android.device && (r = "android"), I.wallet && Ut({ version: I.walletVersion, platform: r }) && !l)
+        if (I.mobile.apple.device ? r = "ios" : I.mobile.android.device && (r = "android"), I.wallet && Mt({ version: I.walletVersion, platform: r }) && !l)
           try {
             i.loading = !0;
-            const w = await Mt();
+            const w = await Ht();
             if (w) {
               await V({
                 sessionToken: w.sessionToken,
@@ -845,7 +845,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
     });
     const zo = U.has("popup");
     if (Fo() && !i.initialized)
-      return /* @__PURE__ */ m(tt, { children: zo ? null : /* @__PURE__ */ m(Zo, {}) });
+      return /* @__PURE__ */ m(it, { children: zo ? null : /* @__PURE__ */ m(Zo, {}) });
     const be = {
       locale: P,
       onSwitchPassport: ({ sessionToken: e, refreshToken: o, csrfToken: t }) => se({ sessionToken: e, refreshToken: o, csrfToken: t, encrypted: !1 }),
@@ -855,7 +855,7 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
       onRemovePasskey: () => C(),
       session: A.current
     };
-    return /* @__PURE__ */ m(Kt, { value: Go, children: /* @__PURE__ */ m(We, { ...be, children: /* @__PURE__ */ K(Ne, { ...be, children: [
+    return /* @__PURE__ */ m($t, { value: Go, children: /* @__PURE__ */ m(We, { ...be, children: /* @__PURE__ */ K(Ne, { ...be, children: [
       !i.open && typeof n.children == "function" ? n.children(i) : n.children,
       Ze,
       ro,
@@ -891,20 +891,20 @@ function $e(X = Xe, Q = "ls", te = {}, k = {}) {
     };
   }
   return {
-    SessionProvider: (L) => /* @__PURE__ */ m(ye, { children: /* @__PURE__ */ m(zt, { children: /* @__PURE__ */ m(pe, { ...L }) }) }),
+    SessionProvider: (L) => /* @__PURE__ */ m(ye, { children: /* @__PURE__ */ m(Vt, { children: /* @__PURE__ */ m(pe, { ...L }) }) }),
     SessionConsumer: Ve,
     SessionContext: qe,
     withSession: Je
   };
 }
-function Xi({ storageEngine: X = "cookie" } = {}) {
+function Qi({ storageEngine: X = "cookie" } = {}) {
   const Q = Xe, te = Qe;
   let k = null;
   if (typeof window < "u" && (k = (globalThis.blocklet || {}).componentId), X === "cookie") {
     let D = "/", O = 1;
     if (typeof window < "u") {
       const Y = window.env || {}, z = window.blocklet || {};
-      D = Y.groupPathPrefix || z.groupPrefix || z.prefix || "", D = D.replace(/\/+$/, ""), D = D || "/", z.serverVersion && (O = St(window.blocklet?.settings?.session?.cacheTtl, 1 / 24));
+      D = Y.groupPathPrefix || z.groupPrefix || z.prefix || "", D = D.replace(/\/+$/, ""), D = D || "/", z.serverVersion && (O = Pt(window.blocklet?.settings?.session?.cacheTtl, 1 / 24));
     }
     return $e(
       Q,
@@ -928,14 +928,14 @@ function Xi({ storageEngine: X = "cookie" } = {}) {
 export {
   a as EVENTS,
   qe as SessionContext,
-  Ut as checkEnableAutoLogin,
-  Xi as createAuthServiceSessionContext,
+  Mt as checkEnableAutoLogin,
+  Qi as createAuthServiceSessionContext,
   $e as createSessionContext,
   $e as default,
   Fe as didSpacesIsRequired,
-  Bt as getMobileVisitorId,
-  Mt as login,
-  Ji as loginFederatedMaster,
-  Zi as mountFederatedIframe,
+  Ut as getMobileVisitorId,
+  Ht as login,
+  Zi as loginFederatedMaster,
+  er as mountFederatedIframe,
   B as translations
 };

package/lib/package.json.js

@@ -1,4 +1,4 @@
-const o = "3.4.4", s = {
+const o = "3.4.5", s = {
   version: o
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "description": "Client side library to work with DID Connect by ArcBlock.",
   "keywords": [
     "react",
@@ -32,10 +32,10 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/bridge": "3.4.4",
+    "@arcblock/bridge": "3.4.5",
     "@arcblock/did": "^1.28.2",
-    "@arcblock/icons": "3.4.4",
-    "@arcblock/react-hooks": "3.4.4",
+    "@arcblock/icons": "3.4.5",
+    "@arcblock/react-hooks": "3.4.5",
     "@arcblock/ws": "^1.28.2",
     "@blocklet/constant": "^1.17.7",
     "@fontsource/lexend": "^5.2.9",
@@ -81,5 +81,5 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "89a650622cb03211e105d8d9ac7793ccf18aac4f"
+  "gitHead": "a944f14b25e2fd8cd0e7e32b3c3ce276961e6b64"
 }

package/src/Session/index.jsx

@@ -10,7 +10,7 @@ import Cookie from 'js-cookie';
 import EventEmitter from 'eventemitter3';
 import pWaitFor from 'p-wait-for';
 import { Box, CircularProgress, Typography, useTheme } from '@mui/material';
-import { getVisitorId, setVisitorId, ensureVisitorId, isUrl } from '@arcblock/ux/lib/Util';
+import { getVisitorId, setVisitorId, ensureVisitorId, isUrl, mergeIgnoreEmpty } from '@arcblock/ux/lib/Util';
 import Toast, { ToastProvider } from '@arcblock/ux/lib/Toast';
 import Center from '@arcblock/ux/lib/Center';
 import { useCreation, useLatest, useMemoizedFn, useMount, usePrevious, useReactive, useUpdateEffect } from 'ahooks';
@@ -1009,7 +1009,8 @@ function createSessionContext(
 
       const messages = getMessageByBlocklet(localeAction, currentLocale);
 
-      const connectMessage = messages || defaultMessages[currentLocale] || defaultMessages.en;
+      // 使用对象合并，确保即使前面的对象缺少某些key，也能从后面的对象中获取
+      const connectMessage = mergeIgnoreEmpty(defaultMessages[currentLocale] || defaultMessages.en, messages || {});
       const extraParams = {
         ...opts.extraParams,
         ...props.extraParams,