@das-fed/utils 7.0.7-hot.52 → 7.0.7-hot.53

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

@@ -16,4 +16,4 @@ export declare const jmcLogout: () => any;
  * 根据第三方登录来源调用对应的退出方法。
  * @param redirctToUrl 平台退出地址
  */
-export declare const thirdLogout: (redirctToUrl: string) => any;
+export declare const thirdLogout: (redirctToUrl?: string) => any;

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

@@ -1,10 +1,10 @@
 import { getConfig as nt } from "@das-fed/utils/config";
-function Ue(e, t) {
+function _e(e, t) {
   return function() {
     return e.apply(t, arguments);
   };
 }
-const { toString: rt } = Object.prototype, { getPrototypeOf: de } = Object, { iterator: G, toStringTag: _e } = Symbol, Q = /* @__PURE__ */ ((e) => (t) => {
+const { toString: rt } = Object.prototype, { getPrototypeOf: de } = Object, { iterator: G, toStringTag: Ue } = Symbol, Q = /* @__PURE__ */ ((e) => (t) => {
   const n = rt.call(t);
   return e[n] || (e[n] = n.slice(8, -1).toLowerCase());
 })(/* @__PURE__ */ Object.create(null)), x = (e) => (e = e.toLowerCase(), (t) => Q(t) === e), Z = (e) => (t) => typeof t === e, { isArray: B } = Array, I = Z("undefined");
@@ -20,7 +20,7 @@ const ot = Z("string"), A = Z("function"), Fe = Z("number"), M = (e) => e !== nu
   if (Q(e) !== "object")
     return !1;
   const t = de(e);
-  return (t === null || t === Object.prototype || Object.getPrototypeOf(t) === null) && !(_e in e) && !(G in e);
+  return (t === null || t === Object.prototype || Object.getPrototypeOf(t) === null) && !(Ue in e) && !(G in e);
 }, at = (e) => {
   if (!M(e) || q(e))
     return !1;
@@ -72,7 +72,7 @@ function oe() {
   return t;
 }
 const Et = (e, t, n, { allOwnKeys: r } = {}) => (H(t, (s, i) => {
-  n && A(s) ? e[i] = Ue(s, n) : e[i] = s;
+  n && A(s) ? e[i] = _e(s, n) : e[i] = s;
 }, { allOwnKeys: r }), e), Rt = (e) => (e.charCodeAt(0) === 65279 && (e = e.slice(1)), e), St = (e, t, n, r) => {
   e.prototype = Object.create(t.prototype, r), e.prototype.constructor = e, Object.defineProperty(e, "super", {
     value: t.prototype
@@ -113,12 +113,12 @@ const Et = (e, t, n, { allOwnKeys: r } = {}) => (H(t, (s, i) => {
   for (; (n = e.exec(t)) !== null; )
     r.push(n);
   return r;
-}, Pt = x("HTMLFormElement"), Ut = (e) => e.toLowerCase().replace(
+}, Pt = x("HTMLFormElement"), _t = (e) => e.toLowerCase().replace(
   /[-_\s]([a-z\d])(\w*)/g,
   function(n, r, s) {
     return r.toUpperCase() + s;
   }
-), ye = (({ hasOwnProperty: e }) => (t, n) => e.call(t, n))(Object.prototype), _t = x("RegExp"), De = (e, t) => {
+), ye = (({ hasOwnProperty: e }) => (t, n) => e.call(t, n))(Object.prototype), Ut = x("RegExp"), De = (e, t) => {
   const n = Object.getOwnPropertyDescriptors(e), r = {};
   H(n, (s, i) => {
     let o;
@@ -149,7 +149,7 @@ const Et = (e, t, n, { allOwnKeys: r } = {}) => (H(t, (s, i) => {
 }, kt = () => {
 }, Bt = (e, t) => e != null && Number.isFinite(e = +e) ? e : t;
 function Dt(e) {
-  return !!(e && A(e.append) && e[_e] === "FormData" && e[G]);
+  return !!(e && A(e.append) && e[Ue] === "FormData" && e[G]);
 }
 const jt = (e) => {
   const t = new Array(10), n = (r, s) => {
@@ -197,7 +197,7 @@ const jt = (e) => {
   isDate: ct,
   isFile: ut,
   isBlob: lt,
-  isRegExp: _t,
+  isRegExp: Ut,
   isFunction: A,
   isStream: dt,
   isURLSearchParams: ht,
@@ -223,7 +223,7 @@ const jt = (e) => {
   reduceDescriptors: De,
   freezeMethods: Lt,
   toObjectSet: Ft,
-  toCamelCase: Ut,
+  toCamelCase: _t,
   noop: kt,
   toFiniteNumber: Bt,
   findKey: ke,
@@ -1042,10 +1042,10 @@ const Ke = (e) => {
         config: e,
         request: h
       };
-      Ve(function(_) {
-        n(_), y();
-      }, function(_) {
-        r(_), y();
+      Ve(function(U) {
+        n(U), y();
+      }, function(U) {
+        r(U), y();
       }, T), h = null;
     }
     "onloadend" in h ? h.onloadend = g : h.onreadystatechange = function() {
@@ -1225,13 +1225,13 @@ const Cn = async (e) => {
         method: "POST",
         body: r,
         duplex: "half"
-      }), U;
-      if (a.isFormData(r) && (U = T.headers.get("content-type")) && u.setContentType(U), T.body) {
-        const [_, $] = Re(
+      }), _;
+      if (a.isFormData(r) && (_ = T.headers.get("content-type")) && u.setContentType(_), T.body) {
+        const [U, $] = Re(
           h,
           K(Se(f))
         );
-        r = Te(T.body, Ae, _, $);
+        r = Te(T.body, Ae, U, $);
       }
     }
     a.isString(d) || (d = d ? "include" : "omit");
@@ -1252,12 +1252,12 @@ const Cn = async (e) => {
       ["status", "statusText", "headers"].forEach((me) => {
         T[me] = R[me];
       });
-      const U = a.toFiniteNumber(R.headers.get("content-length")), [_, $] = c && Re(
-        U,
+      const _ = a.toFiniteNumber(R.headers.get("content-length")), [U, $] = c && Re(
+        _,
         K(Se(c), !0)
       ) || [];
       R = new Response(
-        Te(R.body, Ae, _, () => {
+        Te(R.body, Ae, U, () => {
           $ && $(), y && y();
         }),
         T
@@ -1265,8 +1265,8 @@ const Cn = async (e) => {
     }
     l = l || "text";
     let P = await X[a.findKey(X, l) || "text"](R, e);
-    return !S && y && y(), await new Promise((T, U) => {
-      Ve(T, U, {
+    return !S && y && y(), await new Promise((T, _) => {
+      Ve(T, _, {
         data: P,
         headers: C.from(R.headers),
         status: R.status,
@@ -1373,7 +1373,7 @@ te.transitional = function(t, n, r) {
 te.spelling = function(t) {
   return (n, r) => !0;
 };
-function Un(e, t, n) {
+function _n(e, t, n) {
   if (typeof e != "object")
     throw new m("options must be an object", m.ERR_BAD_OPTION_VALUE);
   const r = Object.keys(e);
@@ -1391,7 +1391,7 @@ function Un(e, t, n) {
   }
 }
 const W = {
-  assertOptions: Un,
+  assertOptions: _n,
   validators: te
 }, N = W.validators;
 let F = class {
@@ -1518,7 +1518,7 @@ a.forEach(["post", "put", "patch"], function(t) {
   }
   F.prototype[t] = n(), F.prototype[t + "Form"] = n(!0);
 });
-let _n = class Ye {
+let Un = class Ye {
   constructor(t) {
     if (typeof t != "function")
       throw new TypeError("executor must be a function.");
@@ -1668,7 +1668,7 @@ Object.entries(le).forEach(([e, t]) => {
   le[t] = e;
 });
 function et(e) {
-  const t = new F(e), n = Ue(F.prototype.request, t);
+  const t = new F(e), n = _e(F.prototype.request, t);
   return a.extend(n, F.prototype, t, { allOwnKeys: !0 }), a.extend(n, t, null, { allOwnKeys: !0 }), n.create = function(s) {
     return et(k(e, s));
   }, n;
@@ -1676,7 +1676,7 @@ function et(e) {
 const b = et(z);
 b.Axios = F;
 b.CanceledError = D;
-b.CancelToken = _n;
+b.CancelToken = Un;
 b.isCancel = Je;
 b.VERSION = Ze;
 b.toFormData = Y;
@@ -1694,22 +1694,22 @@ b.getAdapter = Qe.getAdapter;
 b.HttpStatusCode = le;
 b.default = b;
 const {
-  Axios: zn,
-  AxiosError: $n,
-  CanceledError: vn,
-  isCancel: Jn,
-  CancelToken: Vn,
-  VERSION: Wn,
-  all: Kn,
-  Cancel: Xn,
-  isAxiosError: Gn,
-  spread: Qn,
-  toFormData: Zn,
-  AxiosHeaders: Yn,
-  HttpStatusCode: er,
-  formToJSON: tr,
-  getAdapter: nr,
-  mergeConfig: rr
+  Axios: $n,
+  AxiosError: vn,
+  CanceledError: Jn,
+  isCancel: Vn,
+  CancelToken: Wn,
+  VERSION: Kn,
+  all: Xn,
+  Cancel: Gn,
+  isAxiosError: Qn,
+  spread: Zn,
+  toFormData: Yn,
+  AxiosHeaders: er,
+  HttpStatusCode: tr,
+  formToJSON: nr,
+  getAdapter: rr,
+  mergeConfig: sr
 } = b;
 /*! js-cookie v3.0.5 | MIT */
 function v(e) {
@@ -1784,15 +1784,15 @@ function fe(e, t) {
 var Pe = fe(kn, { path: "/" });
 const Bn = "/api/justauth/client/v1/visitor/sso-param", Dn = {
   uat: "https://sso-uat.jmc.com.cn"
-}, sr = () => {
-  const e = localStorage.getItem("thirdLogouSource");
-  return e === "zhongshen" || e === "jmc";
+}, jn = () => {
+  const e = localStorage.getItem("thirdLogouSource"), t = localStorage.getItem("loginType");
+  return e === "jmc" && t === "das" ? !1 : e === "zhongshen" || e === "jmc";
 }, tt = (e) => {
-  localStorage.removeItem("thirdLogouSource"), location.href = e;
-}, jn = (e) => {
+  localStorage.removeItem("thirdLogouSource"), window.__isAutoCloseApp = !1, location.href = e;
+}, In = (e) => {
   const n = `https://iam.shenyejituan.com:443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=${encodeURIComponent(e)}&entityId=AIoT&redirectToLogin=true`;
   tt(n);
-}, In = async () => {
+}, qn = async () => {
   let e = "";
   try {
     const { baseURL: s } = nt();
@@ -1818,17 +1818,18 @@ const Bn = "/api/justauth/client/v1/visitor/sso-param", Dn = {
   } catch {
   }
   tt(e);
-}, or = async (e) => {
+}, or = async (e = "") => {
+  if (!jn()) return;
   const t = localStorage.getItem("thirdLogouSource");
   if (t === "zhongshen") {
-    jn(e);
+    In(e);
     return;
   }
-  t === "jmc" && await In();
+  t === "jmc" && await qn();
 };
 export {
-  sr as isThirdLogin,
-  In as jmcLogout,
+  jn as isThirdLogin,
+  qn as jmcLogout,
   or as thirdLogout,
-  jn as zhongshenLogout
+  In as zhongshenLogout
 };

package/create-api-service/unauthorized-recovery/index.d.ts

@@ -14,6 +14,12 @@ export interface UnauthorizedRecoveryContext {
 }
 /** 项目可注册的 401 恢复处理器。 */
 export type UnauthorizedRecoveryHandler = (context: UnauthorizedRecoveryContext) => Promise<UnauthorizedRecoveryResult | null>;
+/**
+ * 判断当前是否已经注册项目级 401 恢复处理器。
+ * 预请求阶段需要据此跳过框架默认续签，避免自定义续签尚未接管时就触发登出。
+ * @returns 是否存在项目级恢复处理器
+ */
+export declare const hasUnauthorizedRecovery: () => boolean;
 /**
  * 注册项目自定义的 401 恢复处理器。
  * 后注册的处理器会覆盖之前的处理器，避免不同项目逻辑同时接管认证流程。

package/create-api-service/unauthorized-recovery/index.js

@@ -1,10 +1,11 @@
 let e = null, l = null;
-const n = (r) => (e = r, () => {
+const n = () => e !== null, o = (r) => (e = r, () => {
   e === r && (e = null);
-}), o = async (r) => e ? (l || (l = Promise.resolve(e(r)).finally(() => {
+}), t = async (r) => e ? (l || (l = Promise.resolve(e(r)).finally(() => {
   l = null;
 })), l) : null;
 export {
-  o as recoverUnauthorized,
-  n as registerUnauthorizedRecovery
+  n as hasUnauthorizedRecovery,
+  t as recoverUnauthorized,
+  o as registerUnauthorizedRecovery
 };

package/curring-http/type.d.ts

@@ -1,95 +1,95 @@
 import { AxiosInstance, AxiosRequestConfig, AxiosError } from 'axios';
 import { Ref } from 'vue';
-
-
-/** 请求工具配置项 */
-export type CurringConfig = AxiosRequestConfig & {
-  /** 请求实例 */
-  axiosInstance?: AxiosInstance
-
-  /** 请求方法 */
-  method?: Method
-
-  /** 请求的body数据 */
-  data?: any
-
-  /** 请求的query数据 */
-  params?: any
-
-  /** 接口地址前缀 */
-  urlPrefix?: string
-
-  /** 标记为公共接口，不需要鉴权，默认为false */
-  public?: boolean
-
-  /** 请求成功执行的回调 */
-  onSuccess?: (res: any, config: CurringConfig) => Promise<any>
-
-  /** 请求失败执行的回调 */
-  onError?: (error: any, config: CurringConfig) => Promise<any>
-
-  /** 自定义处理请求失败执行的回调 */
-  onCustomError?: (error: any, config: CurringConfig) => Promise<any>
-
-  /** 不管请求成功或失败都会执行的回调 */
-  finally?: (config: CurringConfig) => any
-
-  /** 每次请求之前都会执行的函数 */
-  beforeRun?: (config: CurringConfig) => Promise<CurringConfig>
-
-  /** 自定义错误信息 */
-  customErrorMessage?: (
-    /** 原始错误信息 */
-    message: string,
-
-    /** 原始错误对象 */
-    error: any,
-  ) => string | null | undefined
-
-  /** 忽略错误提示 */
-  ignoreErrorMessage?: boolean
-
-  /** 接口401是否重定向到登录页 */
-  noRedireLogin?: boolean
-
-  /** 是否跳过项目注册的401恢复逻辑 */
-  skipUnauthorizedRecovery?: boolean
-
-  /** 标记当前请求已完成一次401恢复重试，防止重复续签 */
-  _unauthorizedRecoveryRetried?: boolean
-
-  /** 开启CSRF安全选项 */
-  csrf?: boolean
-}
-
-export type Method = 'get' | 'post' | 'put' | 'delete' | 'patch'
-
-export type CurringConfigFun = (config: CurringConfig) => CurringConfig | Promise<CurringConfig>
-
-export type CurringRes = {
-  /** 请求时返回的接口数据 */
-  data: Ref<any>
-
-  /** 请求时的错误信息 */
-  error: Ref<any>
-
-  /** 请求时的loading */
-  loading: Ref<boolean>
-
-  /** 发起请求 返回格式 [ error, data ] */
-  run: (payload?: any, config?: CurringConfig) => CurringRunRes
-
-  /** 取消请求控制器 */
-  abortController: Ref<AbortController | null>
-}
-
-/** 返回为数组 [error, data], 请求成功error为null，请求失败data为null */
-export type CurringRunRes = Promise<
-  [
-    /** 请求返回的错误信息，请求成功时为null，请求失败时为错误信息 */
-    error: { code: string | number; msg: string; error: AxiosError } | null,
-
-    /** 请求返回的接口数据，请求成功时为后端数据，请求失败时为null */
-    data: any | null,
-  ]
->
+
+
+/** 请求工具配置项 */
+export type CurringConfig = AxiosRequestConfig & {
+  /** 请求实例 */
+  axiosInstance?: AxiosInstance
+
+  /** 请求方法 */
+  method?: Method
+
+  /** 请求的body数据 */
+  data?: any
+
+  /** 请求的query数据 */
+  params?: any
+
+  /** 接口地址前缀 */
+  urlPrefix?: string
+
+  /** 标记为公共接口，不需要鉴权，默认为false */
+  public?: boolean
+
+  /** 请求成功执行的回调 */
+  onSuccess?: (res: any, config: CurringConfig) => Promise<any>
+
+  /** 请求失败执行的回调 */
+  onError?: (error: any, config: CurringConfig) => Promise<any>
+
+  /** 自定义处理请求失败执行的回调 */
+  onCustomError?: (error: any, config: CurringConfig) => Promise<any>
+
+  /** 不管请求成功或失败都会执行的回调 */
+  finally?: (config: CurringConfig) => any
+
+  /** 每次请求之前都会执行的函数 */
+  beforeRun?: (config: CurringConfig) => Promise<CurringConfig>
+
+  /** 自定义错误信息 */
+  customErrorMessage?: (
+    /** 原始错误信息 */
+    message: string,
+
+    /** 原始错误对象 */
+    error: any,
+  ) => string | null | undefined
+
+  /** 忽略错误提示 */
+  ignoreErrorMessage?: boolean
+
+  /** 接口401是否重定向到登录页 */
+  noRedireLogin?: boolean
+
+  /** 是否跳过项目注册的401恢复逻辑 */
+  skipUnauthorizedRecovery?: boolean
+
+  /** 标记当前请求已完成一次401恢复重试，防止重复续签 */
+  _unauthorizedRecoveryRetried?: boolean
+
+  /** 开启CSRF安全选项 */
+  csrf?: boolean
+}
+
+export type Method = 'get' | 'post' | 'put' | 'delete' | 'patch'
+
+export type CurringConfigFun = (config: CurringConfig) => CurringConfig | Promise<CurringConfig>
+
+export type CurringRes = {
+  /** 请求时返回的接口数据 */
+  data: Ref<any>
+
+  /** 请求时的错误信息 */
+  error: Ref<any>
+
+  /** 请求时的loading */
+  loading: Ref<boolean>
+
+  /** 发起请求 返回格式 [ error, data ] */
+  run: (payload?: any, config?: CurringConfig) => CurringRunRes
+
+  /** 取消请求控制器 */
+  abortController: Ref<AbortController | null>
+}
+
+/** 返回为数组 [error, data], 请求成功error为null，请求失败data为null */
+export type CurringRunRes = Promise<
+  [
+    /** 请求返回的错误信息，请求成功时为null，请求失败时为错误信息 */
+    error: { code: string | number; msg: string; error: AxiosError } | null,
+
+    /** 请求返回的接口数据，请求成功时为后端数据，请求失败时为null */
+    data: any | null,
+  ]
+>

package/esm-map.json

@@ -151,5 +151,6 @@
   "zhongshenLogout": "/create-api-service/thirdLogout/index",
   "jmcLogout": "/create-api-service/thirdLogout/index",
   "registerUnauthorizedRecovery": "/create-api-service/unauthorized-recovery/index",
-  "recoverUnauthorized": "/create-api-service/unauthorized-recovery/index"
+  "recoverUnauthorized": "/create-api-service/unauthorized-recovery/index",
+  "hasUnauthorizedRecovery": "/create-api-service/unauthorized-recovery/index"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.0.7-hot.52",
+  "version": "7.0.7-hot.53",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.0.7-hot.52",
+    "@das-fed/utils": "7.0.7-hot.53",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,8 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.0.7-hot.52",
-    "@das-fed/web": "7.0.7-hot.52",
+    "@das-fed/cli": "7.0.7-hot.53",
+    "@das-fed/web": "7.0.7-hot.53",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",