@das-fed/utils 7.1.0-dev.3 → 7.1.0-dev.30

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

@@ -0,0 +1,36 @@
+import { CurringConfig } from '../../curring-http/type';
+
+/** 401 恢复成功后的结果。 */
+export interface UnauthorizedRecoveryResult {
+    /** 恢复后用于重试原请求的平台访问令牌。 */
+    accessToken: string;
+}
+/** 401 恢复处理器接收的上下文。 */
+export interface UnauthorizedRecoveryContext {
+    /** Axios 返回的原始错误。 */
+    error: any;
+    /** 发生 401 的原始请求配置。 */
+    config: CurringConfig;
+}
+/** 项目可注册的 401 恢复处理器。 */
+export type UnauthorizedRecoveryHandler = (context: UnauthorizedRecoveryContext) => Promise<UnauthorizedRecoveryResult | null>;
+/**
+ * 判断当前是否已经注册项目级 401 恢复处理器。
+ * 框架默认刷新返回 401 后据此判断是否交由项目恢复，避免直接触发退出登录。
+ * @returns 是否存在项目级恢复处理器
+ */
+export declare const hasUnauthorizedRecovery: () => boolean;
+/**
+ * 注册项目自定义的 401 恢复处理器。
+ * 后注册的处理器会覆盖之前的处理器，避免不同项目逻辑同时接管认证流程。
+ * @param handler 项目自定义恢复处理器
+ * @returns 注销当前处理器的方法
+ */
+export declare const registerUnauthorizedRecovery: (handler: UnauthorizedRecoveryHandler) => () => void;
+/**
+ * 尝试恢复 401 请求。
+ * 并发 401 共用同一个恢复任务，避免短时间内重复续签 Token。
+ * @param context 401 请求上下文
+ * @returns 恢复成功后的新 Token；无法恢复时返回 null
+ */
+export declare const recoverUnauthorized: (context: UnauthorizedRecoveryContext) => unknown;

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

@@ -0,0 +1,16 @@
+const n = Symbol.for("@das-fed/utils/unauthorized-recovery-state"), o = () => {
+  const r = globalThis;
+  return r[n] || (r[n] = {
+    handler: null,
+    promise: null
+  }), r[n];
+}, e = o(), l = () => e.handler !== null, t = (r) => (e.handler = r, () => {
+  e.handler === r && (e.handler = null);
+}), s = async (r) => e.handler ? (e.promise || (e.promise = Promise.resolve(e.handler(r)).finally(() => {
+  e.promise = null;
+})), e.promise) : null;
+export {
+  l as hasUnauthorizedRecovery,
+  s as recoverUnauthorized,
+  t as registerUnauthorizedRecovery
+};

package/curring-http/type.d.ts

@@ -1,89 +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
-
-  /** 开启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

@@ -143,5 +143,14 @@
   "calcTextWidth": "/common-tools/calc-text-width/index",
   "getFileExtension": "/common-tools/get-file-extension/index",
   "getLanguages": "/common-info/index",
-  "appendQueryParams": "/common-tools/get-url-params/index"
+  "appendQueryParams": "/common-tools/get-url-params/index",
+  "refreshToken": "/create-api-service/sso/index",
+  "isThirdLogin": "/create-api-service/thirdLogout/index",
+  "thirdLogout": "/create-api-service/thirdLogout/index",
+  "oauthClient": "/api-services/modules/justauth/index",
+  "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",
+  "hasUnauthorizedRecovery": "/create-api-service/unauthorized-recovery/index"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "7.1.0-dev.3",
+  "version": "7.1.0-dev.30",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "7.1.0-dev.3",
+    "@das-fed/utils": "7.1.0-dev.30",
     "@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.1.0-dev.3",
-    "@das-fed/web": "7.1.0-dev.3",
+    "@das-fed/cli": "7.1.0-dev.30",
+    "@das-fed/web": "7.1.0-dev.30",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",

package/token-tools/index.d.ts

@@ -10,7 +10,8 @@ export declare const getAccessToken: () => string;
 /**
  * 获取tokenInfo相关信息
  */
-export declare const getAccessTokenInfo: (key: typeof accessTokenExpiredAtKey | typeof refreshTokenKey | typeof redirectUriKey | typeof accessTokenInfoKey) => any;
+type TokenInfoKey = typeof accessTokenExpiredAtKey | typeof refreshTokenKey | typeof redirectUriKey | typeof accessTokenInfoKey;
+export declare const getAccessTokenInfo: (key: TokenInfoKey) => any;
 /**
  * 存入token、tokenInfo
  * @param token

package/token-tools/index.js

@@ -71,7 +71,7 @@ function d(e, t) {
 var p = d(k, { path: "/" });
 const a = "accessToken", m = "accessTokenExpiredAt", v = "refreshToken", u = "redirectUri", S = "csrf-token", h = () => localStorage.getItem(a) ?? p.get(a) ?? sessionStorage.getItem(a) ?? "", C = (e) => localStorage.getItem(e) ?? p.get(e) ?? sessionStorage.getItem(e) ?? "", x = (e, t = {}) => {
   var n;
-  (n = window.webConfig) != null && n.disableSaveToken || (localStorage.setItem(a, e), localStorage.setItem(m, t.accessTokenExpiredAt ?? "0"), localStorage.setItem(v, t.refreshToken ?? ""), t.redirectUri && localStorage.setItem(u, t.redirectUri));
+  (n = window.webConfig) != null && n.disableSaveToken || (localStorage.setItem(a, e), localStorage.setItem(m, t.accessTokenExpiredAt ?? 0), localStorage.setItem(v, t.refreshToken ?? 0), t.redirectUri && localStorage.setItem(u, t.redirectUri));
 }, U = () => {
   localStorage.removeItem(a), localStorage.removeItem(m), localStorage.removeItem(v), localStorage.removeItem(u), localStorage.removeItem(S);
 };