@das-fed/utils 7.1.0-dev.11 → 7.1.0-dev.12

package/common-tools/platform-tools/index.d.ts

@@ -5,12 +5,17 @@
  */
 export declare const isRelativeOrSameDomain: (url: string) => boolean;
 /**
- * 自动拼接上showLayout=false参数
+ * 自动拼接上showLayout=false 和 ignoreAuth = true
  * @param url
  * @returns
  */
 export declare const setShowLayout: (url: string) => any;
-export declare const setShowWatermark: (url: string) => string;
+/**
+ * 设置水印显示参数
+ * @param url
+ * @returns
+ */
+export declare const setShowWatermark: (url: string) => any;
 /**
  * url携带token
  * @param url

package/common-tools/platform-tools/index.js

@@ -1,26 +1,38 @@
-import { getToken as n } from "@das-fed/utils/common-info";
-const o = (t) => {
+import { getToken as r } from "@das-fed/utils/common-info";
+const s = (t) => {
   try {
     return new URL(t, location.origin).origin === location.origin;
   } catch {
     return !0;
   }
-}, r = (t) => {
+}, h = (t) => {
   if (!t) return "";
-  if (!o(t)) return t;
-  const e = new URL(t, location.origin);
-  return e.searchParams.has("showLayout") || e.searchParams.set("showLayout", "false"), e.toString();
-}, s = (t) => {
+  if (!s(t)) return t;
+  try {
+    const e = new URL(t, location.origin);
+    return e.searchParams.has("showLayout") || e.searchParams.set("showLayout", "false"), e.searchParams.has("ignoreAuth") || e.searchParams.set("ignoreAuth", "true"), e.toString();
+  } catch {
+    const e = /([?&])showLayout=/.test(t), a = /([?&])ignoreAuth=/.test(t), o = [];
+    if (e || o.push("showLayout=false"), a || o.push("ignoreAuth=true"), o.length === 0) return t;
+    const n = t.includes("?") ? "&" : "?";
+    return t + n + o.join("&");
+  }
+}, c = (t) => {
   if (!t) return "";
-  let e = "";
-  return o(t) && !t.includes("showWatermark=false") ? e = t.indexOf("?") !== -1 ? t + "&showWatermark=false" : t + "?showWatermark=false" : e = t, e;
-}, i = (t) => {
-  const e = n();
+  if (!s(t)) return t;
+  try {
+    const e = new URL(t, location.origin);
+    return e.searchParams.get("showWatermark") !== "false" && e.searchParams.set("showWatermark", "false"), e.toString();
+  } catch {
+    return t.includes("showWatermark=false") ? t : t.indexOf("?") !== -1 ? t + "&showWatermark=false" : t + "?showWatermark=false";
+  }
+}, f = (t) => {
+  const e = r();
   return t.includes("?") ? `${t}&token=${e}` : `${t}?token=${e}`;
 };
 export {
-  o as isRelativeOrSameDomain,
-  r as setShowLayout,
-  s as setShowWatermark,
-  i as withToken
+  s as isRelativeOrSameDomain,
+  h as setShowLayout,
+  c as setShowWatermark,
+  f as withToken
 };

package/create-api-service/sso/index.d.ts

@@ -8,12 +8,13 @@ declare const login: (_params: any) => any;
 declare const tokenStorage: () => {
     getData: () => {
         accessToken: any;
-        accessTokenExpiredAt: any;
+        exp: any;
         refreshToken: any;
     };
     save: (data: {
         accessToken?: string | null;
-        accessTokenExpiredAt?: string | number | null;
+        exp?: number;
+        accessTokenExpiredAt?: number;
         refreshToken?: string | null;
         info?: any;
     }) => void;

package/create-api-service/sso/index.js

@@ -321,10 +321,10 @@ function ue(e, t, n) {
   }, !1, function(y, h) {
     return !c.isUndefined(h[y]);
   });
-  const r = n.metaTokens, o = n.visitor || u, s = n.dots, i = n.indexes, f = (n.Blob || typeof Blob < "u" && Blob) && c.isSpecCompliantForm(t);
+  const r = n.metaTokens, o = n.visitor || l, s = n.dots, i = n.indexes, f = (n.Blob || typeof Blob < "u" && Blob) && c.isSpecCompliantForm(t);
   if (!c.isFunction(o))
     throw new TypeError("visitor must be a function");
-  function l(p) {
+  function u(p) {
     if (p === null) return "";
     if (c.isDate(p))
       return p.toISOString();
@@ -334,7 +334,7 @@ function ue(e, t, n) {
       throw new w("Blob is not supported. Use a Buffer instead.");
     return c.isArrayBuffer(p) || c.isTypedArray(p) ? f && typeof Blob == "function" ? new Blob([p]) : Buffer.from(p) : p;
   }
-  function u(p, y, h) {
+  function l(p, y, h) {
     let E = p;
     if (p && !h && typeof p == "object") {
       if (c.endsWith(y, "{}"))
@@ -344,15 +344,15 @@ function ue(e, t, n) {
           !(c.isUndefined(S) || S === null) && t.append(
             // eslint-disable-next-line no-nested-ternary
             i === !0 ? De([y], k, s) : i === null ? y : y + "[]",
-            l(S)
+            u(S)
           );
         }), !1;
     }
-    return ge(p) ? !0 : (t.append(De(h, y, s), l(p)), !1);
+    return ge(p) ? !0 : (t.append(De(h, y, s), u(p)), !1);
   }
   const d = [], m = Object.assign(Nn, {
-    defaultVisitor: u,
-    convertValue: l,
+    defaultVisitor: l,
+    convertValue: u,
     isVisitable: ge
   });
   function g(p, y) {
@@ -683,24 +683,24 @@ let _ = class {
   }
   set(t, n, r) {
     const o = this;
-    function s(a, f, l) {
-      const u = H(f);
-      if (!u)
+    function s(a, f, u) {
+      const l = H(f);
+      if (!l)
         throw new Error("header name must be a non-empty string");
-      const d = c.findKey(o, u);
-      (!d || o[d] === void 0 || l === !0 || l === void 0 && o[d] !== !1) && (o[d || f] = ee(a));
+      const d = c.findKey(o, l);
+      (!d || o[d] === void 0 || u === !0 || u === void 0 && o[d] !== !1) && (o[d || f] = ee(a));
     }
-    const i = (a, f) => c.forEach(a, (l, u) => s(l, u, f));
+    const i = (a, f) => c.forEach(a, (u, l) => s(u, l, f));
     if (c.isPlainObject(t) || t instanceof this.constructor)
       i(t, n);
     else if (c.isString(t) && (t = t.trim()) && !Xn(t))
       i(Kn(t), n);
     else if (c.isObject(t) && c.isIterable(t)) {
-      let a = {}, f, l;
-      for (const u of t) {
-        if (!c.isArray(u))
+      let a = {}, f, u;
+      for (const l of t) {
+        if (!c.isArray(l))
           throw TypeError("Object iterator must return a key-value pair");
-        a[l = u[0]] = (f = a[l]) ? c.isArray(f) ? [...f, u[1]] : [f, u[1]] : u[1];
+        a[u = l[0]] = (f = a[u]) ? c.isArray(f) ? [...f, l[1]] : [f, l[1]] : l[1];
       }
       i(a, n);
     } else
@@ -849,25 +849,25 @@ function er(e, t) {
   const n = new Array(e), r = new Array(e);
   let o = 0, s = 0, i;
   return t = t !== void 0 ? t : 1e3, function(f) {
-    const l = Date.now(), u = r[s];
-    i || (i = l), n[o] = f, r[o] = l;
+    const u = Date.now(), l = r[s];
+    i || (i = u), n[o] = f, r[o] = u;
     let d = s, m = 0;
     for (; d !== o; )
       m += n[d++], d = d % e;
-    if (o = (o + 1) % e, o === s && (s = (s + 1) % e), l - i < t)
+    if (o = (o + 1) % e, o === s && (s = (s + 1) % e), u - i < t)
       return;
-    const g = u && l - u;
+    const g = l && u - l;
     return g ? Math.round(m * 1e3 / g) : void 0;
   };
 }
 function tr(e, t) {
   let n = 0, r = 1e3 / t, o, s;
-  const i = (l, u = Date.now()) => {
-    n = u, o = null, s && (clearTimeout(s), s = null), e(...l);
+  const i = (u, l = Date.now()) => {
+    n = l, o = null, s && (clearTimeout(s), s = null), e(...u);
   };
-  return [(...l) => {
-    const u = Date.now(), d = u - n;
-    d >= r ? i(l, u) : (o = l, s || (s = setTimeout(() => {
+  return [(...u) => {
+    const l = Date.now(), d = l - n;
+    d >= r ? i(u, l) : (o = u, s || (s = setTimeout(() => {
       s = null, i(o);
     }, r - d)));
   }, () => o && i(o)];
@@ -876,15 +876,15 @@ const re = (e, t, n = 3) => {
   let r = 0;
   const o = er(50, 250);
   return tr((s) => {
-    const i = s.loaded, a = s.lengthComputable ? s.total : void 0, f = i - r, l = o(f), u = i <= a;
+    const i = s.loaded, a = s.lengthComputable ? s.total : void 0, f = i - r, u = o(f), l = i <= a;
     r = i;
     const d = {
       loaded: i,
       total: a,
       progress: a ? i / a : void 0,
       bytes: f,
-      rate: l || void 0,
-      estimated: l && a && u ? (a - i) / l : void 0,
+      rate: u || void 0,
+      estimated: u && a && l ? (a - i) / u : void 0,
       event: s,
       lengthComputable: a != null,
       [t ? "download" : "upload"]: !0
@@ -942,30 +942,30 @@ const Me = (e) => e instanceof _ ? { ...e } : e;
 function B(e, t) {
   t = t || {};
   const n = {};
-  function r(l, u, d, m) {
-    return c.isPlainObject(l) && c.isPlainObject(u) ? c.merge.call({ caseless: m }, l, u) : c.isPlainObject(u) ? c.merge({}, u) : c.isArray(u) ? u.slice() : u;
+  function r(u, l, d, m) {
+    return c.isPlainObject(u) && c.isPlainObject(l) ? c.merge.call({ caseless: m }, u, l) : c.isPlainObject(l) ? c.merge({}, l) : c.isArray(l) ? l.slice() : l;
   }
-  function o(l, u, d, m) {
-    if (c.isUndefined(u)) {
-      if (!c.isUndefined(l))
-        return r(void 0, l, d, m);
-    } else return r(l, u, d, m);
+  function o(u, l, d, m) {
+    if (c.isUndefined(l)) {
+      if (!c.isUndefined(u))
+        return r(void 0, u, d, m);
+    } else return r(u, l, d, m);
   }
-  function s(l, u) {
-    if (!c.isUndefined(u))
-      return r(void 0, u);
+  function s(u, l) {
+    if (!c.isUndefined(l))
+      return r(void 0, l);
   }
-  function i(l, u) {
-    if (c.isUndefined(u)) {
-      if (!c.isUndefined(l))
-        return r(void 0, l);
-    } else return r(void 0, u);
+  function i(u, l) {
+    if (c.isUndefined(l)) {
+      if (!c.isUndefined(u))
+        return r(void 0, u);
+    } else return r(void 0, l);
   }
-  function a(l, u, d) {
+  function a(u, l, d) {
     if (d in t)
-      return r(l, u);
+      return r(u, l);
     if (d in e)
-      return r(void 0, l);
+      return r(void 0, u);
   }
   const f = {
     url: s,
@@ -996,11 +996,11 @@ function B(e, t) {
     socketPath: i,
     responseEncoding: i,
     validateStatus: a,
-    headers: (l, u, d) => o(Me(l), Me(u), d, !0)
+    headers: (u, l, d) => o(Me(u), Me(l), d, !0)
   };
-  return c.forEach(Object.keys({ ...e, ...t }), function(u) {
-    const d = f[u] || o, m = d(e[u], t[u], u);
-    c.isUndefined(m) && d !== a || (n[u] = m);
+  return c.forEach(Object.keys({ ...e, ...t }), function(l) {
+    const d = f[l] || o, m = d(e[l], t[l], l);
+    c.isUndefined(m) && d !== a || (n[l] = m);
   }), n;
 }
 const Ot = (e) => {
@@ -1015,13 +1015,13 @@ const Ot = (e) => {
     if (T.hasStandardBrowserEnv || T.hasStandardBrowserWebWorkerEnv)
       i.setContentType(void 0);
     else if ((f = i.getContentType()) !== !1) {
-      const [l, ...u] = f ? f.split(";").map((d) => d.trim()).filter(Boolean) : [];
-      i.setContentType([l || "multipart/form-data", ...u].join("; "));
+      const [u, ...l] = f ? f.split(";").map((d) => d.trim()).filter(Boolean) : [];
+      i.setContentType([u || "multipart/form-data", ...l].join("; "));
     }
   }
   if (T.hasStandardBrowserEnv && (r && c.isFunction(r) && (r = r(t)), r || r !== !1 && nr(t.url))) {
-    const l = o && s && rr.read(s);
-    l && i.set(o, l);
+    const u = o && s && rr.read(s);
+    u && i.set(o, u);
   }
   return t;
 }, ir = typeof XMLHttpRequest < "u", ar = ir && function(e) {
@@ -1029,9 +1029,9 @@ const Ot = (e) => {
     const o = Ot(e);
     let s = o.data;
     const i = _.from(o.headers).normalize();
-    let { responseType: a, onUploadProgress: f, onDownloadProgress: l } = o, u, d, m, g, p;
+    let { responseType: a, onUploadProgress: f, onDownloadProgress: u } = o, l, d, m, g, p;
     function y() {
-      g && g(), p && p(), o.cancelToken && o.cancelToken.unsubscribe(u), o.signal && o.signal.removeEventListener("abort", u);
+      g && g(), p && p(), o.cancelToken && o.cancelToken.unsubscribe(l), o.signal && o.signal.removeEventListener("abort", l);
     }
     let h = new XMLHttpRequest();
     h.open(o.method.toUpperCase(), o.url, !0), h.timeout = o.timeout;
@@ -1071,9 +1071,9 @@ const Ot = (e) => {
       )), h = null;
     }, s === void 0 && i.setContentType(null), "setRequestHeader" in h && c.forEach(i.toJSON(), function(k, O) {
       h.setRequestHeader(O, k);
-    }), c.isUndefined(o.withCredentials) || (h.withCredentials = !!o.withCredentials), a && a !== "json" && (h.responseType = o.responseType), l && ([m, p] = re(l, !0), h.addEventListener("progress", m)), f && h.upload && ([d, g] = re(f), h.upload.addEventListener("progress", d), h.upload.addEventListener("loadend", g)), (o.cancelToken || o.signal) && (u = (S) => {
+    }), c.isUndefined(o.withCredentials) || (h.withCredentials = !!o.withCredentials), a && a !== "json" && (h.responseType = o.responseType), u && ([m, p] = re(u, !0), h.addEventListener("progress", m)), f && h.upload && ([d, g] = re(f), h.upload.addEventListener("progress", d), h.upload.addEventListener("loadend", g)), (o.cancelToken || o.signal) && (l = (S) => {
       h && (r(!S || S.type ? new M(null, e, h) : S), h.abort(), h = null);
-    }, o.cancelToken && o.cancelToken.subscribe(u), o.signal && (o.signal.aborted ? u() : o.signal.addEventListener("abort", u)));
+    }, o.cancelToken && o.cancelToken.subscribe(l), o.signal && (o.signal.aborted ? l() : o.signal.addEventListener("abort", l)));
     const R = Yn(o.url);
     if (R && T.protocols.indexOf(R) === -1) {
       r(new w("Unsupported protocol " + R + ":", w.ERR_BAD_REQUEST, e));
@@ -1085,22 +1085,22 @@ const Ot = (e) => {
   const { length: n } = e = e ? e.filter(Boolean) : [];
   if (t || n) {
     let r = new AbortController(), o;
-    const s = function(l) {
+    const s = function(u) {
       if (!o) {
         o = !0, a();
-        const u = l instanceof Error ? l : this.reason;
-        r.abort(u instanceof w ? u : new M(u instanceof Error ? u.message : u));
+        const l = u instanceof Error ? u : this.reason;
+        r.abort(l instanceof w ? l : new M(l instanceof Error ? l.message : l));
       }
     };
     let i = t && setTimeout(() => {
       i = null, s(new w(`timeout ${t} of ms exceeded`, w.ETIMEDOUT));
     }, t);
     const a = () => {
-      e && (i && clearTimeout(i), i = null, e.forEach((l) => {
-        l.unsubscribe ? l.unsubscribe(s) : l.removeEventListener("abort", s);
+      e && (i && clearTimeout(i), i = null, e.forEach((u) => {
+        u.unsubscribe ? u.unsubscribe(s) : u.removeEventListener("abort", s);
       }), e = null);
     };
-    e.forEach((l) => l.addEventListener("abort", s));
+    e.forEach((u) => u.addEventListener("abort", s));
     const { signal: f } = r;
     return f.unsubscribe = () => c.asap(a), f;
   }
@@ -1140,19 +1140,19 @@ const Ot = (e) => {
   return new ReadableStream({
     async pull(f) {
       try {
-        const { done: l, value: u } = await o.next();
-        if (l) {
+        const { done: u, value: l } = await o.next();
+        if (u) {
           a(), f.close();
           return;
         }
-        let d = u.byteLength;
+        let d = l.byteLength;
         if (n) {
           let m = s += d;
           n(m);
         }
-        f.enqueue(new Uint8Array(u));
-      } catch (l) {
-        throw a(l), l;
+        f.enqueue(new Uint8Array(l));
+      } catch (u) {
+        throw a(u), u;
       }
     },
     cancel(f) {
@@ -1214,25 +1214,25 @@ const hr = async (e) => {
     timeout: i,
     onDownloadProgress: a,
     onUploadProgress: f,
-    responseType: l,
-    headers: u,
+    responseType: u,
+    headers: l,
     withCredentials: d = "same-origin",
     fetchOptions: m
   } = Ot(e);
-  l = l ? (l + "").toLowerCase() : "text";
+  u = u ? (u + "").toLowerCase() : "text";
   let g = cr([o, s && s.toAbortSignal()], i), p;
   const y = g && g.unsubscribe && (() => {
     g.unsubscribe();
   });
   let h;
   try {
-    if (f && pr && n !== "get" && n !== "head" && (h = await mr(u, r)) !== 0) {
+    if (f && pr && n !== "get" && n !== "head" && (h = await mr(l, r)) !== 0) {
       let O = new Request(t, {
         method: "POST",
         body: r,
         duplex: "half"
       }), P;
-      if (c.isFormData(r) && (P = O.headers.get("content-type")) && u.setContentType(P), O.body) {
+      if (c.isFormData(r) && (P = O.headers.get("content-type")) && l.setContentType(P), O.body) {
         const [F, X] = je(
           h,
           re(qe(f))
@@ -1246,13 +1246,13 @@ const hr = async (e) => {
       ...m,
       signal: g,
       method: n.toUpperCase(),
-      headers: u.normalize().toJSON(),
+      headers: l.normalize().toJSON(),
       body: r,
       duplex: "half",
       credentials: E ? d : void 0
     });
     let R = await fetch(p, m);
-    const S = Ee && (l === "stream" || l === "response");
+    const S = Ee && (u === "stream" || u === "response");
     if (Ee && (a || S && y)) {
       const O = {};
       ["status", "statusText", "headers"].forEach((Ne) => {
@@ -1269,8 +1269,8 @@ const hr = async (e) => {
         O
       );
     }
-    l = l || "text";
-    let k = await oe[c.findKey(oe, l) || "text"](R, e);
+    u = u || "text";
+    let k = await oe[c.findKey(oe, u) || "text"](R, e);
     return !S && y && y(), await new Promise((O, P) => {
       St(O, P, {
         data: k,
@@ -1463,16 +1463,16 @@ let I = class {
     this.interceptors.request.forEach(function(y) {
       typeof y.runWhen == "function" && y.runWhen(n) === !1 || (f = f && y.synchronous, a.unshift(y.fulfilled, y.rejected));
     });
-    const l = [];
+    const u = [];
     this.interceptors.response.forEach(function(y) {
-      l.push(y.fulfilled, y.rejected);
+      u.push(y.fulfilled, y.rejected);
     });
-    let u, d = 0, m;
+    let l, d = 0, m;
     if (!f) {
       const p = [Je.bind(this), void 0];
-      for (p.unshift(...a), p.push(...l), m = p.length, u = Promise.resolve(n); d < m; )
-        u = u.then(p[d++], p[d++]);
-      return u;
+      for (p.unshift(...a), p.push(...u), m = p.length, l = Promise.resolve(n); d < m; )
+        l = l.then(p[d++], p[d++]);
+      return l;
     }
     m = a.length;
     let g = n;
@@ -1486,13 +1486,13 @@ let I = class {
       }
     }
     try {
-      u = Je.call(this, g);
+      l = Je.call(this, g);
     } catch (p) {
       return Promise.reject(p);
     }
-    for (d = 0, m = l.length; d < m; )
-      u = u.then(l[d++], l[d++]);
-    return u;
+    for (d = 0, m = u.length; d < m; )
+      l = l.then(u[d++], u[d++]);
+    return l;
   }
   getUri(t) {
     t = B(this.defaults, t);
@@ -1750,10 +1750,10 @@ function Te(e, t) {
   function r(o) {
     if (!(typeof document > "u" || arguments.length && !o)) {
       for (var s = document.cookie ? document.cookie.split("; ") : [], i = {}, a = 0; a < s.length; a++) {
-        var f = s[a].split("="), l = f.slice(1).join("=");
+        var f = s[a].split("="), u = f.slice(1).join("=");
         try {
-          var u = decodeURIComponent(f[0]);
-          if (i[u] = e.read(l, u), o === u)
+          var l = decodeURIComponent(f[0]);
+          if (i[l] = e.read(u, l), o === l)
             break;
         } catch {
         }
@@ -1804,14 +1804,14 @@ function Ar(e, t) {
 }
 function _r(e, t = !0, n = !0, r = !1) {
   let o = 0, s, i = !0, a = Oe, f;
-  const l = () => {
+  const u = () => {
     s && (clearTimeout(s), s = void 0, a(), a = Oe);
   };
   return (d) => {
     const m = Ue(e), g = Date.now() - o, p = () => f = d();
-    return l(), m <= 0 ? (o = Date.now(), p()) : (g > m && (n || !i) ? (o = Date.now(), p()) : t && (f = new Promise((y, h) => {
+    return u(), m <= 0 ? (o = Date.now(), p()) : (g > m && (n || !i) ? (o = Date.now(), p()) : t && (f = new Promise((y, h) => {
       a = r ? h : y, s = setTimeout(() => {
-        o = Date.now(), i = !0, y(p()), l();
+        o = Date.now(), i = !0, y(p()), u();
       }, Math.max(0, m - g));
     })), !n && !s && (s = setTimeout(() => i = !0, m)), i = !1, f);
   };
@@ -1834,13 +1834,13 @@ function Qe(...e) {
     return Oe;
   Array.isArray(n) || (n = [n]), Array.isArray(r) || (r = [r]);
   const s = [], i = () => {
-    s.forEach((u) => u()), s.length = 0;
-  }, a = (u, d, m, g) => (u.addEventListener(d, m, g), () => u.removeEventListener(d, m, g)), f = xe(() => [kr(t), Ue(o)], ([u, d]) => {
-    i(), u && s.push(...n.flatMap((m) => r.map((g) => a(u, m, g, d))));
-  }, { immediate: !0, flush: "post" }), l = () => {
+    s.forEach((l) => l()), s.length = 0;
+  }, a = (l, d, m, g) => (l.addEventListener(d, m, g), () => l.removeEventListener(d, m, g)), f = xe(() => [kr(t), Ue(o)], ([l, d]) => {
+    i(), l && s.push(...n.flatMap((m) => r.map((g) => a(l, m, g, d))));
+  }, { immediate: !0, flush: "post" }), u = () => {
     f(), i();
   };
-  return Cr(l), l;
+  return Cr(u), u;
 }
 const Xe = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {}, Ge = "__vueuse_ssr_handlers__";
 Xe[Ge] = Xe[Ge] || {};
@@ -1853,19 +1853,19 @@ function Ur(e = Lr, t = {}) {
     window: s = Ut,
     eventFilter: i = _r(50)
   } = t, a = ne(n), f = ne(Ke());
-  let l;
-  const u = Ar(i, () => {
-    a.value = !1, f.value = Ke(), clearTimeout(l), l = setTimeout(() => a.value = !0, e);
+  let u;
+  const l = Ar(i, () => {
+    a.value = !1, f.value = Ke(), clearTimeout(u), u = setTimeout(() => a.value = !0, e);
   });
   if (s) {
     const d = s.document;
     for (const m of o)
-      Qe(s, m, u, { passive: !0 });
+      Qe(s, m, l, { passive: !0 });
     r && Qe(d, "visibilitychange", () => {
-      d.hidden || u();
+      d.hidden || l();
     });
   }
-  return l = setTimeout(() => a.value = !0, e), { idle: a, lastActive: f };
+  return u = setTimeout(() => a.value = !0, e), { idle: a, lastActive: f };
 }
 var Ze;
 (function(e) {
@@ -1960,7 +1960,7 @@ const L = (e) => new URL(location.href).searchParams.get(e), _e = (e) => {
     return new Promise(async (r) => {
       const o = async (a) => {
         try {
-          const f = nt.feishu.login, l = Ce(t, { ignoreAuth: !0 }), d = (await b.create().get(f, { baseURL: tt, params: { code: a, _redirect_url: l } })).request.responseURL;
+          const f = nt.feishu.login, u = Ce(t, { ignoreAuth: !0 }), d = (await b.create().get(f, { baseURL: tt, params: { code: a, _redirect_url: u } })).request.responseURL;
           location.replace(d), r();
         } catch {
           v({ ...N, redirect_uri: U }), r();
@@ -2051,14 +2051,15 @@ const Hr = async () => {
         }
       }
     );
-    const { access_token: a = "", expires_in: f = 0, refresh_token: l = "", refresh_exp: u = 0 } = s.data, d = {
+    const { access_token: a = "", refresh_token: f = "", exp: u = 0, refresh_exp: l = 0 } = s.data, d = {
       accessToken: a,
-      accessTokenExpiredAt: +/* @__PURE__ */ new Date() + Number(f) * 1e3,
-      refreshToken: l,
+      exp: Number(u),
+      accessTokenExpiredAt: Number(u),
+      refreshToken: f,
       info: s.data
     };
     J().save(d), await st(a);
-    const m = Number(u) - (/* @__PURE__ */ new Date()).getTime();
+    const m = Number(l) - (/* @__PURE__ */ new Date()).getTime();
     return m && m > 0 && (It(m), m && localStorage.setItem("idelTime", m.toString())), t && (window.__isAutoCloseApp = !1, window.location.replace(decodeURIComponent(t))), a;
   } catch {
     return v({ ...N, redirect_uri: U });
@@ -2080,11 +2081,18 @@ const Hr = async () => {
       );
     });
   let t = $();
-  const { accessTokenExpiredAt: n } = J().getData();
+  const { exp: n = 0 } = J().getData();
   Z.value = !0;
   try {
     const r = L("code") || "";
-    (L("authorizer") || "") === "feishu" ? await qr() : r ? t = await Hr() : typeof n == "number" && n > 0 && +/* @__PURE__ */ new Date() + 6e4 > n && (t = await Jr(N));
+    if ((L("authorizer") || "") === "feishu")
+      await qr();
+    else if (r)
+      t = await Hr();
+    else {
+      const s = Date.now() + 6e4;
+      n > 0 && s > n && (t = await Jr(N));
+    }
   } catch {
   } finally {
     Z.value = !1;
@@ -2110,8 +2118,8 @@ const v = (e) => {
       if (Ae) return Ae(t);
       t.logout = "true", o && (t.locale = "locale");
       const s = new URLSearchParams();
-      Object.entries(t).forEach(([f, l]) => {
-        f !== "client_secret" && s.set(f, String(l));
+      Object.entries(t).forEach(([f, u]) => {
+        f !== "client_secret" && s.set(f, String(u));
       });
       const i = s.toString(), a = `${r}${j.oauth}?${i}`;
       if (localStorage.removeItem("idelTime"), sessionStorage.clear(), J().remove(), $r())
@@ -2150,10 +2158,11 @@ const Jr = async (e) => {
           nonce: Ft()
         }
       }
-    ), { access_token: o = "", expires_in: s = 0, refresh_token: i = "" } = r.data, a = {
+    ), { access_token: o = "", refresh_token: s = "", exp: i = 0 } = r.data, a = {
       accessToken: o,
-      accessTokenExpiredAt: +/* @__PURE__ */ new Date() + Number(s) * 1e3,
-      refreshToken: i,
+      exp: Number(i),
+      accessTokenExpiredAt: Number(i),
+      refreshToken: s,
       info: r.data
     };
     return J().save(a), await st(o), o;
@@ -2163,11 +2172,12 @@ const Jr = async (e) => {
 }, J = () => ({
   getData: () => ({
     accessToken: $(),
-    accessTokenExpiredAt: de("accessTokenExpiredAt") ? Number(de("accessTokenExpiredAt")) : "",
+    exp: de("exp") ? Number(de("exp")) : 0,
     refreshToken: de("refreshToken")
   }),
   save: (e) => {
     Ht(e.accessToken ?? "", {
+      exp: e.exp,
       accessTokenExpiredAt: e.accessTokenExpiredAt,
       refreshToken: e.refreshToken
     }), zt(e);