@arcblock/did-connect-react 3.3.9 → 3.3.10

package/lib/Connect/hooks/token.js

@@ -1,5 +1,5 @@
-import { useRef as I, useEffect as S } from "react";
-import W from "lodash/get";
+import { useRef as I, useEffect as C } from "react";
+import T from "lodash/get";
 import ue from "js-cookie";
 import B from "lodash/omitBy";
 import M from "lodash/isNil";
@@ -9,71 +9,63 @@ import { useReactive as H, useCreation as pe, useMemoizedFn as E } from "ahooks"
 import ke from "@arcblock/react-hooks/lib/useInterval";
 import me from "@arcblock/react-hooks/lib/useBrowser";
 import { getVisitorId as he, stringifyQuery as $, isUrl as ge } from "@arcblock/ux/lib/Util";
-import { WsClient as we } from "@arcblock/ws";
-import { sleep as q, getConnectedInfo as be, updateConnectedInfo as Ce, parseNextWorkflow as Q, createAxios as z, decodeConnectUrl as Se, parseTokenFromConnectUrl as xe } from "../../utils.js";
+import { WsClient as be } from "@arcblock/ws";
+import { sleep as q, getExtraHeaders as x, getConnectedInfo as we, updateConnectedInfo as Ce, parseNextWorkflow as Q, createAxios as z, decodeConnectUrl as Se, parseTokenFromConnectUrl as Ie } from "../../utils.js";
 import V from "../assets/locale.js";
-import Ie from "./security.js";
-import $e from "./page-show.js";
+import $e from "./security.js";
+import xe from "./page-show.js";
 import { RELAY_SOCKET_PREFIX as G } from "../../constant.js";
 function ve(o) {
-  const a = o || window.location.href;
-  return new URL(a).host;
+  const l = o || window.location.href;
+  return new URL(l).host;
 }
-function v(o) {
-  const a = {}, d = o || window.location.href;
-  if (d) {
-    const { hostname: w, protocol: i, port: p } = new URL(d);
-    a["x-real-hostname"] = w, a["x-real-port"] = p, a["x-real-protocol"] = i.endsWith(":") ? i.substring(0, i.length - 1) : i;
-  }
-  return a;
-}
-const R = {};
-function Ue({ action: o, prefix: a, checkFn: d, extraParams: w, baseUrl: i }) {
-  const p = `${a}/token?${$(w)}`;
-  return R[p] || (R[p] = async function() {
-    const k = +/* @__PURE__ */ new Date(), h = await d(p, { headers: v(i) }), g = +/* @__PURE__ */ new Date();
-    if (g - k < 500 && await q(500 - (g - k)), h?.data?.token)
+const P = {};
+function Ue({ action: o, prefix: l, checkFn: k, extraParams: v, baseUrl: m }) {
+  const d = `${l}/token?${$(v)}`;
+  return P[d] || (P[d] = async function() {
+    const f = +/* @__PURE__ */ new Date(), h = await k(d, { headers: x(m) }), g = +/* @__PURE__ */ new Date();
+    if (g - f < 500 && await q(500 - (g - f)), h?.data?.token)
       return h.data;
     if (h?.data?.error)
       throw new Error(h.data.error);
-    const U = ge(a) ? a : `${i}${a}`;
+    const U = ge(l) ? l : `${m}${l}`;
     throw new Error(`Error generating ${o} QR Code from: ${U}`);
-  }), R[p];
+  }), P[d];
 }
 const Ae = () => {
   try {
-    const a = new URL(window.location.href).searchParams.get("__connect_url__");
-    if (!a)
+    const l = new URL(window.location.href).searchParams.get("__connect_url__");
+    if (!l)
       return null;
-    const d = Se(a);
+    const k = Se(l);
     return {
-      token: xe(d),
-      url: d
+      token: Ie(k),
+      url: k
     };
   } catch (o) {
     return {
       error: o
     };
   }
-}, J = () => W(globalThis, "blocklet.appPid") || W(globalThis, "blocklet.appId") || W(globalThis, "env.appId") || "", ye = () => (W(globalThis, "env.apiPrefix") || "/").replace(/\/$/, "").replace(G, ""), P = (o) => `relay:${J()}:${o}`, Ee = () => window.location.protocol === "https:" ? "wss:" : "ws:", X = (o) => !o || new URL(o).origin === window.location.origin, Y = (o) => ["succeed", "error", "timeout", "busy"].includes(o);
+}, J = () => T(globalThis, "blocklet.appPid") || T(globalThis, "blocklet.appId") || T(globalThis, "env.appId") || "", ye = () => (T(globalThis, "env.apiPrefix") || "/").replace(/\/$/, "").replace(G, ""), R = (o) => `relay:${J()}:${o}`, Ee = () => window.location.protocol === "https:" ? "wss:" : "ws:", X = (o) => !o || new URL(o).origin === window.location.origin, Y = (o) => ["succeed", "error", "timeout", "busy"].includes(o);
 function Xe({
   action: o,
-  checkFn: a,
-  checkInterval: d,
-  checkTimeout: w,
-  extraParams: i,
-  locale: p,
+  checkFn: l,
+  checkInterval: k,
+  checkTimeout: v,
+  extraParams: m,
+  locale: d,
   prefix: _,
-  tokenKey: k,
+  tokenKey: f,
   encKey: h,
   onError: g,
   onSuccess: U,
   baseUrl: Z,
   autoConnect: K = !0,
   forceConnected: ee = !0,
-  saveConnect: te = !0,
+  saveConnect: re = !0,
   // FIXME: @zhanghan 将来需要设置为默认 false，仅在需要的时候进行保存 login, switch/role/profile
-  useSocket: re = !0,
+  useSocket: te = !0,
   provider: ne = "wallet"
 }) {
   const e = H({
@@ -94,41 +86,41 @@ function Xe({
     nextWorkflow: "",
     baseUrl: Z,
     prefix: `${_}/${o}`,
-    extraParams: B(i, M),
-    checkFn: a,
+    extraParams: B(m, M),
+    checkFn: l,
     results: {},
     action: o,
     provider: ne,
     reset() {
       this.error = "", this.status = "created";
     }
-  }), F = I(null), x = V[p] || V.en, f = pe(() => Ae(), []), oe = Math.ceil(w / d), l = H({
+  }), F = I(null), S = V[d] || V.en, u = pe(() => Ae(), []), oe = Math.ceil(v / k), c = H({
     onSuccessCalled: !1,
     cancelWhenScannedCounter: 0,
     isSocketAvailable: !1
-  }), { encryptKey: se, decrypt: A } = Ie(), D = me(), O = he(), c = I(null), m = I(null), b = {
+  }), { encryptKey: se, decrypt: A } = $e(), D = me(), O = he(), a = I(null), p = I(null), b = {
     ...e.extraParams,
-    locale: p,
-    [k]: e.token || f?.token,
+    locale: d,
+    [f]: e.token || u?.token,
     provider: e.provider
   }, L = async () => {
-    if (!(f?.token && f?.token === e.token)) {
+    if (!(u?.token && u?.token === e.token)) {
       try {
-        b[k] && e.status === "created" && await e.checkFn(`${e.prefix}/timeout?${$(b)}`, {
-          headers: v(e.baseUrl)
+        b[f] && e.status === "created" && await e.checkFn(`${e.prefix}/timeout?${$(b)}`, {
+          headers: x(e.baseUrl)
         });
       } catch {
       }
       try {
-        e.token && m.current && (await c.current.unsubscribe(P(e.token)), m.current = null);
+        e.token && p.current && (await a.current.unsubscribe(R(e.token)), p.current = null);
       } catch {
       }
     }
-  }, ae = E((...r) => {
-    const t = {
+  }, ae = E((...t) => {
+    const r = {
       [h]: se,
       ...e.extraParams,
-      locale: p,
+      locale: d,
       forceConnected: ee,
       // - autoConnect 请求参数用于控制服务端是否给钱包应用发送自动连接通知
       // - 使用 connect 组件时明确传入了 autoConnect = false, 则 autoConnect 请求参数 为 false
@@ -136,97 +128,97 @@ function Xe({
       //   (避免 "无限自动连接问题")
       // - 如果上次连接设备 (connected_wallet_os) 不是 ios/android, 则禁用自动连接
       autoConnect: K && // 如果是 wallet webview 环境, 不发送通知, 避免 wallet 连续弹出 auth 窗口 2 次 (#341)
-      !(D.wallet || D.arcSphere) && !l.cancelWhenScannedCounter && ["ios", "android"].includes(ue.get("connected_wallet_os")),
+      !(D.wallet || D.arcSphere) && !c.cancelWhenScannedCounter && ["ios", "android"].includes(ue.get("connected_wallet_os")),
       provider: e.provider
     };
-    O && (t.visitorId = O);
+    O && (r.visitorId = O);
     const n = fe(F.current || {}, ["sourceAppPid", "verbose"]);
     return Object.keys(n).forEach((s) => {
-      (!t[s] || s === h && n[s]) && (t[s] = n[s]);
-    }), f?.token && !t.sourceToken && (t.sourceToken = f?.token), Ue({
+      (!r[s] || s === h && n[s]) && (r[s] = n[s]);
+    }), u?.token && !r.sourceToken && (r.sourceToken = u?.token), Ue({
       action: o,
       prefix: e.prefix,
       baseUrl: e.baseUrl,
       checkFn: e.checkFn,
-      extraParams: t
-    })(...r);
-  }), y = E(async (r = !0) => {
-    r && L();
+      extraParams: r
+    })(...t);
+  }), y = E(async (t = !0) => {
+    t && L();
     try {
-      e.loading = !0, e.token = "", e.url = "", e.store = null, e.extraParams = B(i, M), await q();
-      const t = await ae(), n = t.extra || {};
-      e.loading = !1, e.token = t.token, e.url = t.url, e.status = "created", e.error = "", e.checkCount = 0, e.appInfo = t.appInfo, e.memberAppInfo = t.memberAppInfo, e.connectedDid = n.connectedDid, e.saveConnect = n.saveConnect;
-    } catch (t) {
-      e.loading = !1, e.status = "error", e.error = `${x.generateError}: ${t.message}`;
+      e.loading = !0, e.token = "", e.url = "", e.store = null, e.extraParams = B(m, M), await q();
+      const r = await ae(), n = r.extra || {};
+      e.loading = !1, e.token = r.token, e.url = r.url, e.status = "created", e.error = "", e.checkCount = 0, e.appInfo = r.appInfo, e.memberAppInfo = r.memberAppInfo, e.connectedDid = n.connectedDid, e.saveConnect = n.saveConnect;
+    } catch (r) {
+      e.loading = !1, e.status = "error", e.error = `${S.generateError}: ${r.message}`;
     }
   }), ce = E(() => {
-    l.cancelWhenScannedCounter++;
+    c.cancelWhenScannedCounter++;
   });
-  S(() => {
-    l.cancelWhenScannedCounter > 0 && (i.nw ? g(new Error(x.retryForbidden)) : y());
-  }, [l.cancelWhenScannedCounter]), S(() => (!(/^((?!chrome|android).)*safari/i.test(globalThis.navigator.userAgent) || Object.hasOwn(globalThis?.blocklet || {}, "DID_CONNECT_DISABLE_SOCKET")) && re && X(e.baseUrl) && J() ? (!c.current || c.current.isConnected() === !1 || c.current.baseUrl !== e.baseUrl) && (c.current = new we(
+  C(() => {
+    c.cancelWhenScannedCounter > 0 && (m.nw ? g(new Error(S.retryForbidden)) : y());
+  }, [c.cancelWhenScannedCounter]), C(() => (!(/^((?!chrome|android).)*safari/i.test(globalThis.navigator.userAgent) || Object.hasOwn(globalThis?.blocklet || {}, "DID_CONNECT_DISABLE_SOCKET")) && te && X(e.baseUrl) && J() ? (!a.current || a.current.isConnected() === !1 || a.current.baseUrl !== e.baseUrl) && (a.current = new be(
     `${Ee()}//${ve(e.baseUrl)}${ye()}${G}/relay`,
     {
       longpollerTimeout: 5e3,
       // connection timeout
       heartbeatIntervalMs: 30 * 1e3
     }
-  ), c.current.baseUrl = e.baseUrl, c.current.onOpen(() => {
-    l.isSocketAvailable = !0;
-  }), c.current.connect()) : l.isSocketAvailable && (l.isSocketAvailable = !1), () => {
-    c.current && (c.current.disconnect(), c.current = null);
+  ), a.current.baseUrl = e.baseUrl, a.current.onOpen(() => {
+    c.isSocketAvailable = !0;
+  }), a.current.connect()) : c.isSocketAvailable && (c.isSocketAvailable = !1), () => {
+    a.current && (a.current.disconnect(), a.current = null);
   }), [e.baseUrl]);
-  const ie = () => !e.token || e.loading || Y(e.status) ? null : d, j = I(null);
-  S(() => {
+  const ie = () => !e.token || e.loading || Y(e.status) ? null : k, j = I(null);
+  C(() => {
     j.current = { state: e, params: b };
-  }), S(() => () => {
-    const { state: r, params: t } = j.current;
-    r.status === "created" && t[k] && r.checkFn(`${r.prefix}/timeout?${$(t)}`, {
-      headers: v(r.baseUrl)
+  }), C(() => () => {
+    const { state: t, params: r } = j.current;
+    t.status === "created" && r[f] && t.checkFn(`${t.prefix}/timeout?${$(r)}`, {
+      headers: x(t.baseUrl)
     });
   }, []);
-  const C = E(async (r = !1) => {
-    if ((e.checking || document.hidden) && !r || (e.status === "created" && e.checkCount++, l.isSocketAvailable && !r))
+  const w = E(async (t = !1) => {
+    if ((e.checking || document.hidden) && !t || (e.status === "created" && e.checkCount++, c.isSocketAvailable && !t))
       return null;
     try {
       e.checking = !0;
-      const t = await e.checkFn(`${e.prefix}/status?${$(b)}`, {
-        headers: v(e.baseUrl)
-      }), { status: n, error: u, mfaCode: s = 0 } = t.data;
-      if (e.store = t.data, e.mfaCode = s, e.checking = !1, e.status === "scanned" && n === "created" || (e.status = n), n === "error" && u) {
-        const N = new Error(u);
-        throw N.response = t, N;
+      const r = await e.checkFn(`${e.prefix}/status?${$(b)}`, {
+        headers: x(e.baseUrl)
+      }), { status: n, error: i, mfaCode: s = 0 } = r.data;
+      if (e.store = r.data, e.mfaCode = s, e.checking = !1, e.status === "scanned" && n === "created" || (e.status = n), n === "error" && i) {
+        const N = new Error(i);
+        throw N.response = r, N;
       }
-      return t.data;
-    } catch (t) {
-      const { response: n } = t;
+      return r.data;
+    } catch (r) {
+      const { response: n } = r;
       if (n?.status) {
-        b[k] && e.checkFn(`${e.prefix}/timeout?${$(b)}`, {
-          headers: v(e.baseUrl)
+        b[f] && e.checkFn(`${e.prefix}/timeout?${$(b)}`, {
+          headers: x(e.baseUrl)
         });
-        const u = n?.data?.error ? n.data.error : t.message, s = new Error(u);
-        s.code = n.status, e.status = "error", e.checking = !1, e.error = u, g(s, e?.store, A);
+        const i = n?.data?.error ? n.data.error : r.message, s = new Error(i);
+        s.code = n.status, e.status = "error", e.checking = !1, e.error = i, g(s, e?.store, A);
       } else
-        e.status = "error", e.checking = !1, e.error = x.generateError;
+        e.status = "error", e.checking = !1, e.error = S.generateError;
     }
     return null;
   }), le = async () => {
     try {
-      if (f.error)
-        throw f.error;
-      e.loading = !0, e.token = f.token, e.url = f.url, e.inExistingSession = !0;
-      let r = await C();
-      if ((["scanned"].includes(r?.status) || r?.sourceToken === f?.token) && (await y(!1), r = await C()), F.current = r?.extraParams || null, r?.status && !["created"].includes(r?.status))
-        throw new Error(`${x.invalidSessionStatus} [${r.status}]`);
-    } catch (r) {
-      e.status = "error", e.error = r.message, g(r, e?.store, A);
+      if (u.error)
+        throw u.error;
+      e.loading = !0, e.token = u.token, e.url = u.url, e.inExistingSession = !0;
+      let t = await w();
+      if ((["scanned"].includes(t?.status) || t?.sourceToken === u?.token) && (await y(!1), t = await w()), F.current = t?.extraParams || null, t?.status && !["created"].includes(t?.status))
+        throw new Error(`${S.invalidSessionStatus} [${t.status}]`);
+    } catch (t) {
+      e.status = "error", e.error = t.message, g(t, e?.store, A);
     } finally {
       e.loading = !1;
     }
   };
-  S(() => {
+  C(() => {
     if (!e.token && !e.store && !e.loading && !e.error)
-      if (f)
+      if (u)
         le();
       else {
         y(!1);
@@ -236,67 +228,67 @@ function Xe({
       e.status = "timeout", L();
       return;
     }
-    if (e.status === "succeed" && !l.onSuccessCalled) {
-      const r = be({
+    if (e.status === "succeed" && !c.onSuccessCalled) {
+      const t = we({
         ...e.store,
         appInfo: e.appInfo,
         memberAppInfo: e.memberAppInfo
       });
-      if (X(e.baseUrl) && te && e.saveConnect && e.store.did && Ce(r, !0), e.store) {
-        const { nextWorkflow: t } = e.store;
-        if (t)
+      if (X(e.baseUrl) && re && e.saveConnect && e.store.did && Ce(t, !0), e.store) {
+        const { nextWorkflow: r } = e.store;
+        if (r)
           try {
-            const n = Q(t, k);
-            e.nextWorkflow = n?.nextWorkflow || t, Object.assign(e, n), e.store = null, e.error = "", e.url = "", e.appInfo = null, e.memberAppInfo = null, e.checkCount = 0, e.status = "scanned", e.results = {
+            const n = Q(r, f);
+            e.nextWorkflow = n?.nextWorkflow || r, Object.assign(e, n), e.store = null, e.error = "", e.url = "", e.appInfo = null, e.memberAppInfo = null, e.checkCount = 0, e.status = "scanned", e.results = {
               ...e.results,
               [e.token]: e.store
-            }, e.checkFn = z({ baseURL: n.baseUrl, timeout: 8e3 }).get, C();
+            }, e.checkFn = z({ baseURL: n.baseUrl, timeout: 8e3 }).get, w();
           } catch (n) {
-            console.error(`Invalid nextWorkflow: ${t}`, n), e.status = "error", e.error = `Invalid nextWorkflow: ${t}: ${n.message}`;
+            console.error(`Invalid nextWorkflow: ${r}`, n), e.status = "error", e.error = `Invalid nextWorkflow: ${r}: ${n.message}`;
           }
         else if (e.nextWorkflow && (e.nextWorkflow = "", e.url = ""), typeof U == "function") {
           const n = Object.values({ ...e.results, [e.token]: e.store });
-          l.onSuccessCalled = !0;
-          const u = n.length > 1 ? n : n[0], s = de(u);
+          c.onSuccessCalled = !0;
+          const i = n.length > 1 ? n : n[0], s = de(i);
           U(s, A, {
-            sourceAppPid: i?.sourceAppPid,
-            ...r
+            sourceAppPid: m?.sourceAppPid,
+            ...t
           });
         }
       }
       return;
     }
     if (e.store?.nextWorkflow) {
-      const { nextWorkflow: r } = e.store;
+      const { nextWorkflow: t } = e.store;
       try {
-        const t = Q(r, k);
-        e.nextWorkflow = t?.nextWorkflow || r, Object.assign(e, t), e.store = null, e.error = "", e.url = "", e.appInfo = null, e.memberAppInfo = null, e.checkCount = 0, e.status = "scanned", e.results = {
+        const r = Q(t, f);
+        e.nextWorkflow = r?.nextWorkflow || t, Object.assign(e, r), e.store = null, e.error = "", e.url = "", e.appInfo = null, e.memberAppInfo = null, e.checkCount = 0, e.status = "scanned", e.results = {
           ...e.results,
           [e.token]: e.store
-        }, e.checkFn = z({ baseURL: t.baseUrl, timeout: 8e3 }).get, C();
-      } catch (t) {
-        console.error(`Invalid nextWorkflow: ${r}`, t), e.status = "error", e.error = `Invalid nextWorkflow: ${r}: ${t.message}`;
+        }, e.checkFn = z({ baseURL: r.baseUrl, timeout: 8e3 }).get, w();
+      } catch (r) {
+        console.error(`Invalid nextWorkflow: ${t}`, r), e.status = "error", e.error = `Invalid nextWorkflow: ${t}: ${r.message}`;
       }
     }
   });
-  const T = I(0);
-  return S(() => {
-    if (e.token && l.isSocketAvailable && c.current) {
-      let r = !1;
-      m.current ? m.current.token !== e.token && (c.current.unsubscribe(P(m.current.token)), r = !0) : r = !0, r && (m.current = c.current.subscribe(P(e.token)), T.current = 0, m.current.token = e.token, m.current.on("updated", ({ response: t }) => {
-        const n = +new Date(t.updatedAt);
-        if (n <= T.current) {
-          console.warn("Ignore outdated message", t);
+  const W = I(0);
+  return C(() => {
+    if (e.token && c.isSocketAvailable && a.current) {
+      let t = !1;
+      p.current ? p.current.token !== e.token && (a.current.unsubscribe(R(p.current.token)), t = !0) : t = !0, t && (p.current = a.current.subscribe(R(e.token)), W.current = 0, p.current.token = e.token, p.current.on("updated", ({ response: r }) => {
+        const n = +new Date(r.updatedAt);
+        if (n <= W.current) {
+          console.warn("Ignore outdated message", r);
           return;
         }
-        T.current = n;
-        let { status: u, error: s } = t;
-        u === "forbidden" && (s = x.forbidden, u = "error"), e.status = u, e.mfaCode = t.mfaCode || 0, e.store = t, e.error = s, s && g(new Error(s), e?.store, A);
+        W.current = n;
+        let { status: i, error: s } = r;
+        i === "forbidden" && (s = S.forbidden, i = "error"), e.status = i, e.mfaCode = r.mfaCode || 0, e.store = r, e.error = s, s && g(new Error(s), e?.store, A);
       }));
     }
-  }, [e.token, l.isSocketAvailable, c.current]), ke(C, ie()), $e(() => {
+  }, [e.token, c.isSocketAvailable, a.current]), ke(w, ie()), xe(() => {
     e.token && Y(e.status) === !1 && (e.checking = !1, setTimeout(() => {
-      C(!0);
+      w(!0);
     }, 100));
   }), { state: e, generate: y, cancelWhenScanned: ce };
 }

package/lib/index.js

@@ -1,41 +1,41 @@
 import { default as t, default as r, default as s } from "./Connect/index.js";
 import { default as n, default as d } from "./Button/index.js";
 import { default as f, default as p } from "@arcblock/ux/lib/DIDLogo";
-import { createSessionContext as _, createAuthServiceSessionContext as m, createSessionContext as x } from "./Session/index.js";
+import { createSessionContext as _, createAuthServiceSessionContext as x, createSessionContext as m } from "./Session/index.js";
 import { OAuthConsumer as C, OAuthContext as T, OAuthProvider as i, useOAuth as I } from "./OAuth/context.js";
-import { PasskeyConsumer as S, PasskeyContext as c, PasskeyProvider as O, usePasskey as D } from "./Passkey/context.js";
+import { PasskeyConsumer as S, PasskeyContext as c, PasskeyProvider as O, usePasskey as g } from "./Passkey/context.js";
 import { default as R } from "./Passkey/actions.js";
 import { default as N } from "./User/use-did.js";
 import { default as F } from "./User/wrap-did.js";
 import { FederatedConsumer as K, FederatedContext as M, FederatedProvider as y, useFederatedContext as h } from "./Federated/context.js";
-import { API_DID_PREFIX as V, BLOCKLET_SERVICE_PATH_PREFIX as v, BUSY_STATUS as b, CHECK_INTERVAL_TIME as B, CHECK_STATUS_INTERVAL as W, CSRF_TOKEN_STORAGE_KEY as Y, DEFAULT_NAME as G, DEFAULT_TIMEOUT as H, DEFAULT_WINDOW_TIMEOUT as X, DID_CONNECT_URL_PARAMS_NAME as w, DID_SPACES_BASE_URL as q, EXT_DOWNLOAD_URL as j, LANG_COOKIE_NAME as z, REFRESH_TOKEN_STORAGE_KEY as J, RELAY_SOCKET_PREFIX as Q, SESSION_TOKEN_STORAGE_KEY as Z, VERIFY_CODE_LENGTH as $ } from "./constant.js";
-import { createAxios as oe, debug as te, debugTmp as re, debugTmpInterval as se, decodeConnectUrl as ae, decodeKey as ne, decodeUrlParams as de, decrypt as Ee, encodeConnectUrl as fe, encodeKey as pe, encrypt as ue, formatCacheTtl as _e, getApiErrorMessage as me, getAppId as xe, getBrowserLang as Ae, getConnectedInfo as Ce, getWebAuthnErrorMessage as Te, logger as ie, openPopup as Ie, parseNextWorkflow as le, parseTokenFromConnectUrl as Se, runPopup as ce, sleep as Oe, updateConnectedInfo as De, version as ge } from "./utils.js";
-import { NotOpenError as Le } from "./error.js";
-import { default as Pe } from "@arcblock/ux/lib/SessionManager";
-import { default as Ue } from "@arcblock/ux/lib/Address";
-import { default as Me } from "@arcblock/ux/lib/Avatar";
-import { default as he } from "./Connect/use-connect.js";
-import { EVENTS as Ve } from "./Session/libs/constants.js";
-import { didSpacesIsRequired as be } from "./Session/libs/did-spaces.js";
+import { API_DID_PREFIX as V, BLOCKLET_SERVICE_PATH_PREFIX as v, BUSY_STATUS as b, CHECK_INTERVAL_TIME as B, CHECK_STATUS_INTERVAL as H, CSRF_TOKEN_STORAGE_KEY as W, DEFAULT_NAME as Y, DEFAULT_TIMEOUT as G, DEFAULT_WINDOW_TIMEOUT as X, DID_CONNECT_URL_PARAMS_NAME as w, DID_SPACES_BASE_URL as q, EXT_DOWNLOAD_URL as j, LANG_COOKIE_NAME as z, REFRESH_TOKEN_STORAGE_KEY as J, RELAY_SOCKET_PREFIX as Q, SESSION_TOKEN_STORAGE_KEY as Z, VERIFY_CODE_LENGTH as $ } from "./constant.js";
+import { createAxios as oe, debug as te, debugTmp as re, debugTmpInterval as se, decodeConnectUrl as ae, decodeKey as ne, decodeUrlParams as de, decrypt as Ee, encodeConnectUrl as fe, encodeKey as pe, encrypt as ue, formatCacheTtl as _e, getApiErrorMessage as xe, getAppId as me, getBrowserLang as Ae, getConnectedInfo as Ce, getExtraHeaders as Te, getWebAuthnErrorMessage as ie, logger as Ie, openPopup as le, parseNextWorkflow as Se, parseTokenFromConnectUrl as ce, runPopup as Oe, sleep as ge, updateConnectedInfo as De, version as Re } from "./utils.js";
+import { NotOpenError as Ne } from "./error.js";
+import { default as Fe } from "@arcblock/ux/lib/SessionManager";
+import { default as Ke } from "@arcblock/ux/lib/Address";
+import { default as ye } from "@arcblock/ux/lib/Avatar";
+import { default as ke } from "./Connect/use-connect.js";
+import { EVENTS as ve } from "./Session/libs/constants.js";
+import { didSpacesIsRequired as Be } from "./Session/libs/did-spaces.js";
 import { loginFederatedMaster as We, mountFederatedIframe as Ye } from "./Session/libs/federated.js";
-import { translations as He } from "./Session/libs/locales.js";
-import { checkEnableAutoLogin as we, getMobileVisitorId as qe, login as je } from "./Session/libs/login-mobile.js";
-import { SessionContext as Je } from "./Session/context.js";
+import { translations as Xe } from "./Session/libs/locales.js";
+import { checkEnableAutoLogin as qe, getMobileVisitorId as je, login as ze } from "./Session/libs/login-mobile.js";
+import { SessionContext as Qe } from "./Session/context.js";
 export * from "@arcblock/ux/lib/Util/wallet";
-import { getVisitorId as $e, setVisitorId as eo } from "@arcblock/ux/lib/Util";
+import { getVisitorId as eo, setVisitorId as oo } from "@arcblock/ux/lib/Util";
 export {
   V as API_DID_PREFIX,
-  Ue as Address,
-  Me as Avatar,
+  Ke as Address,
+  ye as Avatar,
   v as BLOCKLET_SERVICE_PATH_PREFIX,
   b as BUSY_STATUS,
   n as Button,
   B as CHECK_INTERVAL_TIME,
-  W as CHECK_STATUS_INTERVAL,
-  Y as CSRF_TOKEN_STORAGE_KEY,
+  H as CHECK_STATUS_INTERVAL,
+  W as CSRF_TOKEN_STORAGE_KEY,
   t as Connect,
-  G as DEFAULT_NAME,
-  H as DEFAULT_TIMEOUT,
+  Y as DEFAULT_NAME,
+  G as DEFAULT_TIMEOUT,
   X as DEFAULT_WINDOW_TIMEOUT,
   d as DIDButton,
   r as DIDConnect,
@@ -43,14 +43,14 @@ export {
   w as DID_CONNECT_URL_PARAMS_NAME,
   q as DID_SPACES_BASE_URL,
   s as DidConnect,
-  Ve as EVENTS,
+  ve as EVENTS,
   j as EXT_DOWNLOAD_URL,
   K as FederatedConsumer,
   M as FederatedContext,
   y as FederatedProvider,
   z as LANG_COOKIE_NAME,
   p as Logo,
-  Le as NotOpenError,
+  Ne as NotOpenError,
   C as OAuthConsumer,
   T as OAuthContext,
   i as OAuthProvider,
@@ -62,14 +62,14 @@ export {
   Q as RELAY_SOCKET_PREFIX,
   Z as SESSION_TOKEN_STORAGE_KEY,
   _ as Session,
-  Je as SessionContext,
-  Pe as SessionManager,
+  Qe as SessionContext,
+  Fe as SessionManager,
   $ as VERIFY_CODE_LENGTH,
   F as WrapDid,
-  we as checkEnableAutoLogin,
-  m as createAuthServiceSessionContext,
+  qe as checkEnableAutoLogin,
+  x as createAuthServiceSessionContext,
   oe as createAxios,
-  x as createSessionContext,
+  m as createSessionContext,
   te as debug,
   re as debugTmp,
   se as debugTmpInterval,
@@ -77,34 +77,35 @@ export {
   ne as decodeKey,
   de as decodeUrlParams,
   Ee as decrypt,
-  be as didSpacesIsRequired,
+  Be as didSpacesIsRequired,
   fe as encodeConnectUrl,
   pe as encodeKey,
   ue as encrypt,
   _e as formatCacheTtl,
-  me as getApiErrorMessage,
-  xe as getAppId,
+  xe as getApiErrorMessage,
+  me as getAppId,
   Ae as getBrowserLang,
   Ce as getConnectedInfo,
-  qe as getMobileVisitorId,
-  $e as getVisitorId,
-  Te as getWebAuthnErrorMessage,
-  ie as logger,
-  je as login,
+  Te as getExtraHeaders,
+  je as getMobileVisitorId,
+  eo as getVisitorId,
+  ie as getWebAuthnErrorMessage,
+  Ie as logger,
+  ze as login,
   We as loginFederatedMaster,
   Ye as mountFederatedIframe,
-  Ie as openPopup,
-  le as parseNextWorkflow,
-  Se as parseTokenFromConnectUrl,
-  ce as runPopup,
-  eo as setVisitorId,
-  Oe as sleep,
-  He as translations,
+  le as openPopup,
+  Se as parseNextWorkflow,
+  ce as parseTokenFromConnectUrl,
+  Oe as runPopup,
+  oo as setVisitorId,
+  ge as sleep,
+  Xe as translations,
   De as updateConnectedInfo,
-  he as useConnect,
+  ke as useConnect,
   N as useDid,
   h as useFederatedContext,
   I as useOAuth,
-  D as usePasskey,
-  ge as version
+  g as usePasskey,
+  Re as version
 };

package/lib/package.json.js

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

package/lib/utils.js

@@ -1,31 +1,31 @@
 import { Buffer as a } from "buffer";
 import h from "tweetnacl-sealedbox-js";
-import { getCookieOptions as A, getVisitorId as U } from "@arcblock/ux/lib/Util";
-import { getVisitorId as ke, setVisitorId as ye } from "@arcblock/ux/lib/Util";
+import { isUrl as U, getCookieOptions as A, getVisitorId as E } from "@arcblock/ux/lib/Util";
+import { getVisitorId as Ue, setVisitorId as Ae } from "@arcblock/ux/lib/Util";
 import c from "js-cookie";
-import d from "lodash/isNil";
+import l from "lodash/isNil";
 import T from "lodash/isString";
 import m from "lodash/isUndefined";
-import { createAxios as E, BlockletSDK as P } from "@blocklet/js-sdk";
+import { createAxios as P, BlockletSDK as x } from "@blocklet/js-sdk";
 import { withQuery as L } from "ufo";
 import { isValid as w, isFromPublicKey as S } from "@arcblock/did";
-import { getSafeUrl as x } from "@arcblock/ux/lib/Util/security";
-import { createDebug as u, createLogger as C } from "@arcblock/ux/lib/Util/logger";
-import I from "./package.json.js";
-import { DID_CONNECT_URL_PARAMS_NAME as f, DEFAULT_WINDOW_TIMEOUT as N } from "./constant.js";
-import { NotOpenError as D } from "./error.js";
+import { getSafeUrl as C } from "@arcblock/ux/lib/Util/security";
+import { createDebug as u, createLogger as I } from "@arcblock/ux/lib/Util/logger";
+import N from "./package.json.js";
+import { DID_CONNECT_URL_PARAMS_NAME as f, DEFAULT_WINDOW_TIMEOUT as D } from "./constant.js";
+import { NotOpenError as W } from "./error.js";
 export * from "@arcblock/ux/lib/Util/wallet";
-const { version: O } = I, Z = u("did-connect"), ee = u("did-connect:tmp"), re = u("did-connect:tmp-interval"), oe = C("did-connect");
+const { version: O } = N, re = u("did-connect"), oe = u("did-connect:tmp"), te = u("did-connect:tmp-interval"), ne = I("did-connect");
 function b(e) {
   return (e + "===".slice((e.length + 3) % 4)).replace(/-/g, "+").replace(/_/g, "/");
 }
 function _(e) {
   return e.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
 }
-const ne = (e) => _(window.btoa(e)), te = (e) => window.atob(b(e)), se = (e) => {
+const se = (e) => _(window.btoa(e)), ie = (e) => window.atob(b(e)), ae = (e) => {
   const o = new URL(e), r = decodeURIComponent(o.searchParams.get("url"));
   return new URL(r).searchParams.get("_t_");
-}, W = (e, o) => {
+}, R = (e, o) => {
   let r = o?.publisher;
   if (!r) {
     if (e?.agentDid)
@@ -37,40 +37,40 @@ const ne = (e) => _(window.btoa(e)), te = (e) => window.atob(b(e)), se = (e) =>
   const o = {
     connected_did: e.did || "",
     connected_pk: e.pk || "",
-    connected_app: W(e.appInfo, e.memberAppInfo)
+    connected_app: R(e.appInfo, e.memberAppInfo)
   };
   return e?.connectedWallet?.os && (o.connected_wallet_os = e.connectedWallet.os), o;
-}, ie = (e, o = !1) => {
+}, ce = (e, o = !1) => {
   if (!e) return;
   o || (e = z(e));
   const r = A({
     expireInDays: 7,
     returnDomain: !1
   });
-  !d(e.connected_did) && !d(e.connected_pk) && w(e.connected_did) && S(e.connected_did, e.connected_pk) && (c.set("connected_did", e.connected_did, r), c.set("connected_pk", e.connected_pk, r)), !d(e.connected_app) && w(e.connected_app) && c.set("connected_app", e.connected_app, r), e.connected_wallet_os && c.set("connected_wallet_os", e.connected_wallet_os, r);
-}, ae = (e) => _(a.from(e).toString("base64")), l = (e) => Uint8Array.from(a.from(b(e), "base64")), ce = (e, o, r) => {
-  const n = h.open(
+  !l(e.connected_did) && !l(e.connected_pk) && w(e.connected_did) && S(e.connected_did, e.connected_pk) && (c.set("connected_did", e.connected_did, r), c.set("connected_pk", e.connected_pk, r)), !l(e.connected_app) && w(e.connected_app) && c.set("connected_app", e.connected_app, r), e.connected_wallet_os && c.set("connected_wallet_os", e.connected_wallet_os, r);
+}, pe = (e) => _(a.from(e).toString("base64")), d = (e) => Uint8Array.from(a.from(b(e), "base64")), le = (e, o, r) => {
+  const t = h.open(
     Uint8Array.from(a.from(e, "base64")),
-    l(o),
-    l(r)
+    d(o),
+    d(r)
   );
-  return JSON.parse(a.from(n).toString("utf8"));
-}, pe = (e, o) => a.from(h.seal(Uint8Array.from(a.from(e)), l(o))).toString("base64"), de = (e, o = "_t_") => {
-  const r = new URL(e), n = {
+  return JSON.parse(a.from(t).toString("utf8"));
+}, de = (e, o) => a.from(h.seal(Uint8Array.from(a.from(e)), d(o))).toString("base64"), ue = (e, o = "_t_") => {
+  const r = new URL(e), t = {
     baseUrl: r.origin,
     prefix: r.pathname.replace(/\/auth$/, ""),
     token: r.searchParams.get(o) || ""
   };
-  if (!n.baseUrl)
+  if (!t.baseUrl)
     throw new Error("Invalid next workflow: origin empty");
-  if (!n.token)
+  if (!t.token)
     throw new Error("Invalid next workflow: token not found");
-  return n;
+  return t;
 }, g = (e, o) => {
   let r = e.message;
-  const { response: n } = e;
-  return n && (r = n.data?.error || n.data?.message || n.data || o, r = typeof r == "object" ? o : r), r;
-}, le = (e, o, r) => {
+  const { response: t } = e;
+  return t && (r = t.data?.error || t.data?.message || t.data || o, r = typeof r == "object" ? o : r), r;
+}, me = (e, o, r) => {
   if (!e)
     return e;
   if (!e.name)
@@ -87,27 +87,35 @@ const ne = (e) => _(window.btoa(e)), te = (e) => window.atob(b(e)), se = (e) =>
     default:
       return console.warn("Unhandled WebAuthn error type:", e.name), g(e, o);
   }
-}, ue = (e = {}, { lazy: o = !1, lazyTime: r = 300 } = {}) => {
-  const n = {
+}, M = (e) => {
+  const o = {}, r = U(e) ? e : window.location.href;
+  if (r) {
+    const { hostname: t, protocol: n, port: s } = new URL(r);
+    o["x-real-hostname"] = t, o["x-real-port"] = s, o["x-real-protocol"] = n.endsWith(":") ? n.substring(0, n.length - 1) : n;
+  }
+  return o;
+}, we = (e = {}, { lazy: o = !1, lazyTime: r = 300 } = {}) => {
+  const t = {
+    ...M(e.baseURL),
     ...e.headers,
     "x-did-connect-version": O
-  }, i = E(
+  }, n = P(
     {
       ...e,
-      headers: n
+      headers: t
     },
     { lazy: o, lazyTime: r }
   );
-  return i.interceptors.request.use((t) => {
-    const s = U();
-    return s && (t.headers["x-blocklet-visitor-id"] = s), t;
-  }), i;
-}, me = (e = 0) => new Promise((o) => {
+  return n.interceptors.request.use((s) => {
+    const i = E();
+    return i && (s.headers["x-blocklet-visitor-id"] = i), s;
+  }), n;
+}, fe = (e = 0) => new Promise((o) => {
   setTimeout(() => {
     o();
   }, e);
 });
-function we() {
+function ge() {
   if (typeof window > "u")
     return null;
   const e = window.navigator.languages && window.navigator.languages[0] || window.navigator.language || window.navigator.browserLanguage || window.navigator.userLanguage || window.navigator.systemLanguage || null;
@@ -118,22 +126,22 @@ function we() {
     en: "en"
   }[e] || "en";
 }
-function fe(e, o) {
+function he(e, o) {
   return [void 0, null, ""].includes(e) ? o : e / 86400;
 }
-async function ge() {
+async function be() {
   const e = window.location.href;
   try {
     const o = new URL(e), r = o.searchParams.get(f);
     if (r) {
       o.searchParams.delete(f);
-      const n = JSON.parse(a.from(r, "base64").toString("utf-8"));
-      if (T(n.forceConnected) && m(n.sourceAppPid)) {
-        const t = await new P().user.getUserPublicInfo({ did: n.forceConnected });
-        m(t?.sourceAppPid) || (n.sourceAppPid = t.sourceAppPid);
+      const t = JSON.parse(a.from(r, "base64").toString("utf-8"));
+      if (T(t.forceConnected) && m(t.sourceAppPid)) {
+        const s = await new x().user.getUserPublicInfo({ did: t.forceConnected });
+        m(s?.sourceAppPid) || (t.sourceAppPid = s.sourceAppPid);
       }
       return {
-        params: n,
+        params: t,
         url: o.href
       };
     }
@@ -145,8 +153,8 @@ async function ge() {
     url: e
   };
 }
-const he = (e, { width: o = 680, height: r = 720, name: n = "did-connect:popup", offsetX: i = 0, offsetY: t = 0 } = {}) => {
-  const s = x(e, { allowDomains: null }), v = window.screenX + (window.innerWidth - o) / 2 + i, k = window.screenY + (window.innerHeight - r) / 2 + t, y = [
+const _e = (e, { width: o = 680, height: r = 720, name: t = "did-connect:popup", offsetX: n = 0, offsetY: s = 0 } = {}) => {
+  const i = C(e, { allowDomains: null }), v = window.screenX + (window.innerWidth - o) / 2 + n, k = window.screenY + (window.innerHeight - r) / 2 + s, y = [
     `left=${v}`,
     `top=${k}`,
     `width=${o}`,
@@ -156,61 +164,62 @@ const he = (e, { width: o = 680, height: r = 720, name: n = "did-connect:popup",
     "scrollbars=yes",
     "status=yes",
     "popup=yes"
-  ], p = window.open("", n, y.join(","));
+  ], p = window.open("", t, y.join(","));
   if (p === null)
-    throw new D();
-  return p.location.href = L(s, {
+    throw new W();
+  return p.location.href = L(i, {
     // NOTICE: 携带当前页面的 origin，用于在 popup 中通过该参数判断是否可以发送 postMessage，即使该参数被伪造，最终也只有该域名能接收到消息，所以没有关系
     opener: window.location.origin
   }), p;
-}, be = (e) => new Promise((o, r) => {
-  let n, i;
-  const t = ({ data: s }) => {
-    if (s && s.type === "authorization_response") {
-      if (s?.error) {
-        console.error(s.error);
+}, ve = (e) => new Promise((o, r) => {
+  let t, n;
+  const s = ({ data: i }) => {
+    if (i && i.type === "authorization_response") {
+      if (i?.error) {
+        console.error(i.error);
         return;
       }
       setTimeout(() => {
-        e.popup?.close(), clearTimeout(i), clearInterval(n), window.removeEventListener("message", t, !1);
-      }, e.closeTimeout || 0), o(s);
+        e.popup?.close(), clearTimeout(n), clearInterval(t), window.removeEventListener("message", s, !1);
+      }, e.closeTimeout || 0), o(i);
     }
   };
-  i = setTimeout(
+  n = setTimeout(
     () => {
-      clearInterval(n), r(new Error("Timeout")), window.removeEventListener("message", t, !1);
+      clearInterval(t), r(new Error("Timeout")), window.removeEventListener("message", s, !1);
     },
-    (e.timeoutInSeconds || N) * 1e3
-  ), n = setInterval(() => {
-    e.popup?.closed && (clearInterval(n), clearTimeout(i), window.removeEventListener("message", t, !1), r(new Error("Popup closed")));
-  }, 1e3), window.addEventListener("message", t);
+    (e.timeoutInSeconds || D) * 1e3
+  ), t = setInterval(() => {
+    e.popup?.closed && (clearInterval(t), clearTimeout(n), window.removeEventListener("message", s, !1), r(new Error("Popup closed")));
+  }, 1e3), window.addEventListener("message", s);
 });
 export {
-  ue as createAxios,
-  Z as debug,
-  ee as debugTmp,
-  re as debugTmpInterval,
-  te as decodeConnectUrl,
-  l as decodeKey,
-  ge as decodeUrlParams,
-  ce as decrypt,
-  ne as encodeConnectUrl,
-  ae as encodeKey,
-  pe as encrypt,
-  fe as formatCacheTtl,
+  we as createAxios,
+  re as debug,
+  oe as debugTmp,
+  te as debugTmpInterval,
+  ie as decodeConnectUrl,
+  d as decodeKey,
+  be as decodeUrlParams,
+  le as decrypt,
+  se as encodeConnectUrl,
+  pe as encodeKey,
+  de as encrypt,
+  he as formatCacheTtl,
   g as getApiErrorMessage,
-  W as getAppId,
-  we as getBrowserLang,
+  R as getAppId,
+  ge as getBrowserLang,
   z as getConnectedInfo,
-  ke as getVisitorId,
-  le as getWebAuthnErrorMessage,
-  oe as logger,
-  he as openPopup,
-  de as parseNextWorkflow,
-  se as parseTokenFromConnectUrl,
-  be as runPopup,
-  ye as setVisitorId,
-  me as sleep,
-  ie as updateConnectedInfo,
+  M as getExtraHeaders,
+  Ue as getVisitorId,
+  me as getWebAuthnErrorMessage,
+  ne as logger,
+  _e as openPopup,
+  ue as parseNextWorkflow,
+  ae as parseTokenFromConnectUrl,
+  ve as runPopup,
+  Ae as setVisitorId,
+  fe as sleep,
+  ce as updateConnectedInfo,
   O as version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "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.3.9",
+    "@arcblock/bridge": "3.3.10",
     "@arcblock/did": "^1.27.16",
-    "@arcblock/icons": "3.3.9",
-    "@arcblock/react-hooks": "3.3.9",
+    "@arcblock/icons": "3.3.10",
+    "@arcblock/react-hooks": "3.3.10",
     "@arcblock/ws": "^1.27.16",
     "@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": "c7a122040ee66c92cb979d185ad4a30cb80ef3fa"
+  "gitHead": "6c98492b766cb7f7486f3a81f3d4e4b0936af163"
 }

package/src/Connect/hooks/token.js

@@ -19,6 +19,7 @@ import {
   createAxios,
   sleep,
   getConnectedInfo,
+  getExtraHeaders,
 } from '../../utils';
 
 import translations from '../assets/locale';
@@ -31,19 +32,6 @@ function getSocketHost(baseUrl) {
   return new URL(targetUrl).host;
 }
 
-function getExtraHeaders(baseUrl) {
-  const headers = {};
-  const authUrl = baseUrl || window.location.href;
-
-  if (authUrl) {
-    const { hostname, protocol, port } = new URL(authUrl);
-    headers['x-real-hostname'] = hostname;
-    headers['x-real-port'] = port;
-    headers['x-real-protocol'] = protocol.endsWith(':') ? protocol.substring(0, protocol.length - 1) : protocol;
-  }
-  return headers;
-}
-
 const fns = {};
 function createTokenFn({ action, prefix, checkFn, extraParams, baseUrl }) {
   const key = `${prefix}/token?${stringifyQuery(extraParams)}`;

package/src/utils.js

@@ -1,6 +1,6 @@
 import { Buffer } from 'buffer';
 import SealedBox from 'tweetnacl-sealedbox-js';
-import { getCookieOptions, setVisitorId, getVisitorId } from '@arcblock/ux/lib/Util';
+import { getCookieOptions, setVisitorId, getVisitorId, isUrl } from '@arcblock/ux/lib/Util';
 import Cookie from 'js-cookie';
 import isNil from 'lodash/isNil';
 import isString from 'lodash/isString';
@@ -202,8 +202,24 @@ export const getWebAuthnErrorMessage = (err, defaultMessage, t) => {
   }
 };
 
+export const getExtraHeaders = (baseUrl) => {
+  const headers = {};
+  // 如果 baseUrl 是有效的 url，则使用 baseUrl，否则使用当前页面的 url
+  // 避免传入的 baseUrl 是相对路径，导致 new URL 失败
+  const authUrl = isUrl(baseUrl) ? baseUrl : window.location.href;
+
+  if (authUrl) {
+    const { hostname, protocol, port } = new URL(authUrl);
+    headers['x-real-hostname'] = hostname;
+    headers['x-real-port'] = port;
+    headers['x-real-protocol'] = protocol.endsWith(':') ? protocol.substring(0, protocol.length - 1) : protocol;
+  }
+  return headers;
+};
+
 export const createAxios = (options = {}, { lazy = false, lazyTime = 300 } = {}) => {
   const mergedHeaders = {
+    ...getExtraHeaders(options.baseURL),
     ...options.headers,
     'x-did-connect-version': version,
   };