@utogether/udp-core 1.0.1-beta.1 → 1.0.1-beta.11

package/src/utils/{http → udp/http}/index.ts

@@ -1,297 +1,283 @@
-import Axios, { type AxiosInstance, type AxiosRequestConfig } from 'axios';
-import type { SuHttpError, RequestMethods, SuHttpResponse, SuHttpRequestConfig } from './types.d';
-import { has } from 'xe-utils';
-import { NProgress, cookies, errorMessage } from '@utogether/utils';
-import { isRef } from 'vue';
-
-const kTOKENKEY = 'authorized-token';
-const defaultConfig: AxiosRequestConfig = {
-  timeout: 180000,
-  headers: {
-    Accept: 'application/json, text/plain, */*',
-    'Content-Type': 'application/json',
-    'X-Requested-With': 'XMLHttpRequest'
-  }
-};
-class SuHttp {
-  constructor() {
-    this.httpInterceptorsRequest();
-    this.httpInterceptorsResponse();
-  }
-  baseUrl = null;
-  router = null;
-  /** token过期后，暂存待执行的请求 */
-  private static requests = [];
-
-  /** 防止重复刷新token */
-  private static isRefreshing = false;
-
-  /** 设置router调整 */
-  setRouter(router) {
-    this.router = router;
-  }
-
-  setBaseUrl(baseUrl) {
-    this.baseUrl = baseUrl;
-  }
-  // 初始化配置对象
-  private static initConfig: SuHttpRequestConfig = {};
-
-  // 保存当前Axios实例对象
-  private static axiosInstance: AxiosInstance = Axios.create(defaultConfig);
-
-  /** 重连原始请求 */
-  private static retryOriginalRequest(config: SuHttpRequestConfig) {
-    return new Promise(resolve => {
-      // @ts-ignore
-      SuHttp.requests.push((token: string) => {
-        config.headers!['Authorization'] = 'Bearer ' + token;
-        resolve(config);
-      });
-    });
-  }
-
-  // 请求拦截
-  private httpInterceptorsRequest(): void {
-    SuHttp.axiosInstance.interceptors.request.use(
-      (config: any) => {
-        if (has(config, 'loading') && isRef(config.loading)) {
-          config.loading.value = true;
-        }
-        // 开启进度条动画
-        NProgress.start();
-        // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
-        if (typeof config.beforeRequestCallback === 'function') {
-          config.beforeRequestCallback(config);
-          return config;
-        }
-        if (SuHttp.initConfig.beforeRequestCallback) {
-          SuHttp.initConfig.beforeRequestCallback(config);
-          return config;
-        }
-        const whiteList = ['/refreshToken', '/login'];
-        if (whiteList.some(v => config.url.indexOf(v) > -1)) return config;
-        return new Promise(resolve => {
-          const token = cookies.get(kTOKENKEY);
-          if (token) {
-            const data = JSON.parse(token);
-            const now = new Date().getTime();
-            const expired = data.expires - now <= 0;
-            if (expired) {
-              if (!SuHttp.isRefreshing) {
-                SuHttp.isRefreshing = true;
-                // requests.push(() => SuHttp.axiosInstance(config));
-
-                this.get(this.baseUrl + '/uath/refreshToken', {
-                  refreshToken: data.refreshToken
-                })
-                  .then((res: any) => {
-                    // 替换token
-                    this.setToken(res);
-                    config.headers['Authorization'] = 'Bearer ' + res.access_token;
-                    // token 刷新后将数组的方法重新执行
-                    // @ts-ignore
-                    SuHttp.requests.forEach(cb => cb(res.access_token));
-                    SuHttp.requests = []; // 重新请求完清空
-                  })
-                  .finally(() => {
-                    SuHttp.isRefreshing = false;
-                  });
-              }
-              // @ts-ignore
-              resolve(SuHttp.retryOriginalRequest(config));
-            } else {
-              config.headers['Authorization'] = 'Bearer ' + data.accessToken;
-              resolve(config);
-            }
-          } else {
-            const sessionKey = cookies.get('kCookies_token') as string;
-            if (sessionKey) {
-              config.headers['X-Token'] = sessionKey;
-            }
-            resolve(config);
-          }
-        });
-      },
-      error => {
-        return Promise.reject(error);
-      }
-    );
-  }
-
-  private setToken(token) {
-    const { access_token, expires_in, refresh_token } = token;
-    const cache = {
-      accessToken: access_token,
-      refreshToken: refresh_token,
-      expires: Date.now() + expires_in * 1000
-    };
-    cookies.set(kTOKENKEY, JSON.stringify(cache));
-    // cookies.set(kTOKENKEY, JSON.stringify(cache), { expires: expires_in });
-  }
-
-  // 响应拦截
-  private httpInterceptorsResponse(): void {
-    const instance = SuHttp.axiosInstance;
-    instance.interceptors.response.use(
-      (response: SuHttpResponse) => {
-        const $config = response.config;
-        if (has($config, 'loading') && isRef($config.loading)) {
-          $config.loading.value = false;
-        }
-        // 关闭进度条动画
-        NProgress.done();
-        // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
-        if (typeof $config.beforeResponseCallback === 'function') {
-          $config.beforeResponseCallback(response);
-          return response.data;
-        }
-        if (SuHttp.initConfig.beforeResponseCallback) {
-          SuHttp.initConfig.beforeResponseCallback(response);
-          return response.data;
-        }
-        return response.data;
-      },
-      (error: SuHttpError) => {
-        // @ts-ignore
-        if (has(error.config, 'loading') && isRef(error.config.loading)) {
-          // @ts-ignore
-          error.config.loading.value = false;
-        }
-        const $error = error;
-        $error.isCancelRequest = Axios.isCancel($error);
-        // 关闭进度条动画
-        NProgress.done();
-        // 所有的响应异常 区分来源为取消请求/非取消请求
-        return Promise.reject($error);
-      }
-    );
-  }
-
-  private transformConfigByMethod(params: any, config: SuHttpRequestConfig): SuHttpRequestConfig {
-    const { method } = config;
-    const methods = ['get'];
-    const m = method!.toLocaleLowerCase();
-    const props = methods.includes(m) ? 'params' : 'data';
-    return {
-      ...config,
-      [props]: params
-    };
-  }
-
-  // 通用请求工具函数
-  public request<T>(
-    method: RequestMethods,
-    url: string,
-    param?: AxiosRequestConfig,
-    axiosConfig?: SuHttpRequestConfig
-  ): Promise<T> {
-    const config = this.transformConfigByMethod(param, {
-      method,
-      url,
-      ...axiosConfig
-    } as SuHttpRequestConfig);
-    // 单独处理自定义请求/响应回掉
-    return new Promise((resolve, reject) => {
-      SuHttp.axiosInstance
-        .request(config)
-        .then((res: any) => {
-          if (res && res?.code === '0') {
-            resolve(res.data);
-          } else if (res.code === '500') {
-            errorMessage(res.msg, { duration: 8000 });
-            if (config.method === 'get') {
-              resolve(res);
-            } else {
-              reject(res.msg);
-            }
-          } else if (res?.code !== '-1') {
-            resolve(res);
-          } else {
-            const msg = res?.msg || '服务异常';
-            errorMessage(msg, { duration: 8000 });
-            // const code = res.code;
-            // if (
-            //   code === "000001" ||
-            //   (code === "-1" && msg.includes("请重新登陆"))
-            // ) {
-            //   // session过期
-            //   cookies.remove("kCookies_token");
-            //   // @ts-ignore
-            //   this.router?.push({
-            //     path: "/login",
-            //     query: { tokenExpire: "Y" },
-            //   });
-            // }
-            reject(msg);
-          }
-        })
-        .catch(e => {
-          debugger;
-          if (e?.response?.data?.path === '/refreshToken') {
-            this.router?.push('/login');
-          } else if (e?.code) {
-            if (e?.response?.status === 401) {
-              // @ts-ignore
-              return this.router?.push({ path: '/login' });
-            }
-            errorMessage(this.getNetworkError(e?.response?.status) || e?.message, { duration: 8000 });
-          }
-          if (e.config.method === 'get') {
-            resolve(e);
-          } else {
-            reject(e);
-          }
-        });
-    });
-  }
-
-  getNetworkError = code => {
-    if (!code) return null;
-    const msgMap = {
-      400: '错误的请求',
-      401: '服务未授权,请重新登录',
-      403: '拒绝访问',
-      404: '请求错误,未找到该资源',
-      408: '请求超时',
-      500: '服务器端出差',
-      502: '网络超时',
-      503: '服务不可用',
-      504: '网络超时'
-    };
-    return msgMap[code];
-  };
-
-  // 单独抽离的post工具函数
-  public post<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
-    // @ts-ignore
-    return this.request<P>('post', url, params, config);
-  }
-
-  // 单独抽离的delete工具函数
-  public delete<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
-    // @ts-ignore
-    return this.request<P>('delete', url, params, config);
-  }
-
-  // 单独抽离的put工具函数
-  public put<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
-    // @ts-ignore
-    return this.request<P>('put', url, params, config);
-  }
-
-  // 单独抽离的get工具函数
-  public get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
-    for (const key in params) {
-      if (!params[key]) delete params[key];
-    }
-    // @ts-ignore
-    return this.request<P>('get', url, params, config);
-  }
-
-  public postRouter<T>(params?: any): Promise<T> {
-    return this.request<T>('post', 'route/service', params);
-  }
-}
-
-export const http = new SuHttp();
+import Axios, { type AxiosInstance, type AxiosRequestConfig } from 'axios';
+import type { SuHttpError, RequestMethods, SuHttpResponse, SuHttpRequestConfig } from './types.d';
+
+import { errorMessage, cookies, NProgress } from '@utogether/utils';
+import { isRef } from 'vue';
+import { has } from 'xe-utils';
+
+const kTOKENKEY = 'authorized-token';
+const defaultConfig: AxiosRequestConfig = {
+  timeout: 180000,
+  headers: {
+    Accept: 'application/json, text/plain, */*',
+    'Content-Type': 'application/json',
+    'X-Requested-With': 'XMLHttpRequest'
+  }
+};
+class SuHttp {
+  constructor() {
+    this.httpInterceptorsRequest();
+    this.httpInterceptorsResponse();
+  }
+  router = undefined;
+  baseUrl = null;
+  /** token过期后，暂存待执行的请求 */
+  private static requests = [];
+
+  /** 防止重复刷新token */
+  private static isRefreshing = false;
+
+  /** 设置router调整 */
+  setRouter(router) {
+    this.router = router;
+  }
+
+  setBaseUrl(baseUrl) {
+    this.baseUrl = baseUrl;
+  }
+  // 初始化配置对象
+  private static initConfig: SuHttpRequestConfig = {};
+
+  // 保存当前Axios实例对象
+  private static axiosInstance: AxiosInstance = Axios.create(defaultConfig);
+
+  /** 重连原始请求 */
+  private static retryOriginalRequest(config: SuHttpRequestConfig) {
+    return new Promise(resolve => {
+      // @ts-ignore
+      SuHttp.requests.push((token: string) => {
+        config.headers!['Authorization'] = 'Bearer ' + token;
+        resolve(config);
+      });
+    });
+  }
+
+  // 请求拦截
+  private httpInterceptorsRequest(): void {
+    SuHttp.axiosInstance.interceptors.request.use(
+      (config: any) => {
+        if (has(config, 'loading') && isRef(config.loading)) {
+          config.loading.value = true;
+        }
+        // 开启进度条动画
+        NProgress.start();
+        // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
+        if (typeof config.beforeRequestCallback === 'function') {
+          config.beforeRequestCallback(config);
+          return config;
+        }
+        if (SuHttp.initConfig.beforeRequestCallback) {
+          SuHttp.initConfig.beforeRequestCallback(config);
+          return config;
+        }
+        const whiteList = ['/refreshToken', '/login'];
+        if (whiteList.some(v => config.url.indexOf(v) > -1)) return config;
+        return new Promise(resolve => {
+          const token = cookies.get(kTOKENKEY);
+          debugger;
+          if (token) {
+            const data = JSON.parse(token);
+            const now = new Date().getTime();
+            const expired = data.expires - now <= 0;
+            if (expired) {
+              if (!SuHttp.isRefreshing) {
+                SuHttp.isRefreshing = true;
+                // requests.push(() => SuHttp.axiosInstance(config));
+                this.get((this.baseUrl || '') + '/uath/refreshToken', {
+                  refreshToken: data.refreshToken
+                })
+                  .then((res: any) => {
+                    // 替换token
+                    this.setToken(res);
+                    config.headers['Authorization'] = 'Bearer ' + res.access_token;
+                    // token 刷新后将数组的方法重新执行
+                    // @ts-ignore
+                    SuHttp.requests.forEach(cb => cb(res.access_token));
+                    SuHttp.requests = []; // 重新请求完清空
+                  })
+                  .finally(() => {
+                    SuHttp.isRefreshing = false;
+                    this.router.push({ name: 'login' });
+                  });
+              }
+              // @ts-ignore
+              resolve(SuHttp.retryOriginalRequest(config));
+            } else {
+              config.headers['Authorization'] = 'Bearer ' + data.accessToken;
+              resolve(config);
+            }
+          } else {
+            const sessionKey = cookies.get('kCookies_token') as string;
+            if (sessionKey) {
+              config.headers['X-Token'] = sessionKey;
+            }
+            resolve(config);
+          }
+        });
+      },
+      error => {
+        return Promise.reject(error);
+      }
+    );
+  }
+
+  private setToken(token) {
+    const { access_token, expires_in, refresh_token } = token;
+    const cache = {
+      accessToken: access_token,
+      refreshToken: refresh_token,
+      expires: Date.now() + expires_in * 1000
+    };
+    cookies.set(kTOKENKEY, JSON.stringify(cache));
+    // cookies.set(kTOKENKEY, JSON.stringify(cache), { expires: expires_in });
+  }
+
+  // 响应拦截
+  private httpInterceptorsResponse(): void {
+    const instance = SuHttp.axiosInstance;
+    instance.interceptors.response.use(
+      (response: SuHttpResponse) => {
+        const $config = response.config;
+        if (has($config, 'loading') && isRef($config.loading)) {
+          $config.loading.value = false;
+        }
+        // 关闭进度条动画
+        NProgress.done();
+        // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
+        if (typeof $config.beforeResponseCallback === 'function') {
+          $config.beforeResponseCallback(response);
+          return response.data;
+        }
+        if (SuHttp.initConfig.beforeResponseCallback) {
+          SuHttp.initConfig.beforeResponseCallback(response);
+          return response.data;
+        }
+        return response.data;
+      },
+      (error: SuHttpError) => {
+        const $error = error;
+        // @ts-ignore
+        if (has(error.config, 'loading') && isRef(error?.config?.loading)) {
+          // @ts-ignore
+          error.config.loading.value = false;
+        }
+        $error.isCancelRequest = Axios.isCancel($error);
+        // 关闭进度条动画
+        NProgress.done();
+        // 所有的响应异常 区分来源为取消请求/非取消请求
+        return Promise.reject($error);
+      }
+    );
+  }
+
+  private transformConfigByMethod(params: any, config: SuHttpRequestConfig): SuHttpRequestConfig {
+    const { method } = config;
+    const methods = ['get'];
+    const m = method!.toLocaleLowerCase();
+    const props = methods.includes(m) ? 'params' : 'data';
+    return {
+      ...config,
+      [props]: params
+    };
+  }
+
+  // 通用请求工具函数
+  public request<T>(
+    method: RequestMethods,
+    url: string,
+    param?: AxiosRequestConfig,
+    axiosConfig?: SuHttpRequestConfig
+  ): Promise<T> {
+    const config = this.transformConfigByMethod(param, {
+      method,
+      url,
+      ...axiosConfig
+    } as SuHttpRequestConfig);
+    // 单独处理自定义请求/响应回掉
+    return new Promise((resolve, reject) => {
+      SuHttp.axiosInstance
+        .request(config)
+        .then((res: any) => {
+          if (res && res?.code === '0') {
+            resolve(res.data);
+          } else if (res.code === '500') {
+            errorMessage(res.msg, { duration: 8000 });
+            if (config.method === 'get') {
+              resolve(res);
+            } else {
+              reject(res.msg);
+            }
+          } else if (res?.code !== '-1') {
+            resolve(res);
+          } else {
+            const msg = res?.msg || '服务异常';
+            errorMessage(msg, { duration: 8000 });
+            reject(msg);
+          }
+        })
+        .catch(e => {
+          if (e?.code) {
+            if (e?.response?.status === 401) {
+              // @ts-ignore
+              return this.router?.push({ path: '/login' });
+            }
+            errorMessage(this.getNetworkError(e?.response?.status) || e?.message, { duration: 8000 });
+          }
+          if (e.config.method === 'get') {
+            resolve(e);
+          } else {
+            reject(e);
+          }
+        });
+    });
+  }
+
+  getNetworkError = code => {
+    if (!code) return null;
+    const msgMap = {
+      400: '错误的请求',
+      401: '服务未授权,请重新登录',
+      403: '拒绝访问',
+      404: '请求错误,未找到该资源',
+      408: '请求超时',
+      500: '服务器端出差',
+      502: '网络超时',
+      503: '服务不可用',
+      504: '网络超时'
+    };
+    return msgMap[code];
+  };
+
+  // 单独抽离的post工具函数
+  public post<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+    // @ts-ignore
+    return this.request<P>('post', url, params, config);
+  }
+
+  // 单独抽离的delete工具函数
+  public delete<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+    // @ts-ignore
+    return this.request<P>('delete', url, params, config);
+  }
+
+  // 单独抽离的put工具函数
+  public put<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+    // @ts-ignore
+    return this.request<P>('put', url, params, config);
+  }
+
+  // 单独抽离的get工具函数
+  public get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+    for (const key in params) {
+      if (!params[key]) delete params[key];
+    }
+    // @ts-ignore
+    return this.request<P>('get', url, params, config);
+  }
+
+  public postRouter<T>(params?: any): Promise<T> {
+    return this.request<T>('post', 'route/service', params);
+  }
+}
+
+export const http = new SuHttp();

package/src/utils/{http → udp/http}/types.d.ts

@@ -2,10 +2,10 @@
  * @Author: wei.li
  * @Date: 2022-03-08 15:17:39
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2023-12-01 11:59:12
+ * @LastEditTime: 2023-12-01 13:55:46
  * @Description: SuHttp Axios 类型定义文件
  */
-import type { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from 'axios';
+import { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from "axios";
 
 export type resultType = {
   access_token: string;
@@ -15,12 +15,11 @@ export type resultType = {
 
 export type RequestMethods = Extract<
   Method,
-  'get' | 'post' | 'put' | 'delete' | 'patch' | 'option' | 'head'
+  "get" | "post" | "put" | "delete" | "patch" | "option" | "head"
 >;
 
 export interface SuHttpError extends AxiosError {
   isCancelRequest?: boolean;
-  loading?: boolean;
 }
 
 export interface SuHttpResponse extends AxiosResponse {
@@ -41,6 +40,10 @@ export default class SuHttp {
     axiosConfig?: SuHttpRequestConfig
   ): Promise<T>;
   post<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
-  postRouter<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
+  postRouter<T, P>(
+    url: string,
+    params?: T,
+    config?: SuHttpRequestConfig
+  ): Promise<P>;
   get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
 }