fix(plugin-request): 请求拦截器兼容方式支持异步写法

examples/max/app.ts

@@ -1,5 +1,4 @@
-// @ts-ignore
-import type { RequestConfig } from '@@/plugin-request';
+import type { RequestConfig, RequestInterceptorAxios } from '@umijs/max';
 import { message } from 'antd';
 import { notification } from 'antd/es';
 
@@ -62,12 +61,16 @@ interface ResponseStructure {
   showType?: number;
 }
 
+const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
 export const request: RequestConfig = {
   requestInterceptors: [
-    (config) => {
-      console.log('Interceptor：', config);
+    (async (config) => {
+      console.log('Async Interceptor before ：', config);
+      await sleep(500);
+      console.log('Async Interceptor after ：', config);
       return config;
-    },
+    }) satisfies RequestInterceptorAxios,
     (url, options) => {
       console.log(url, options);
       return { url, options };
@@ -78,6 +81,12 @@ export const request: RequestConfig = {
       console.log('responseInterceptor', res);
       return res;
     },
+    async (res) => {
+      console.log('Async responseInterceptor before', res);
+      await sleep(500);
+      console.log('Async responseInterceptor after', res);
+      return res;
+    },
   ],
   errorConfig: {
     errorHandler: (error: any, opts: any) => {

packages/plugins/src/request.ts

@@ -132,12 +132,13 @@ type RequestError = AxiosError | Error
 interface IErrorHandler {
   (error: RequestError, opts: IRequestOptions): void;
 }
-type IRequestInterceptorAxios = (config: RequestOptions) => RequestOptions;
-type IRequestInterceptorUmiRequest = (url: string, config : RequestOptions) => { url: string, options: RequestOptions };
+type WithPromise<T> = T | Promise<T>;
+type IRequestInterceptorAxios = (config: IRequestOptions) => WithPromise<IRequestOptions>;
+type IRequestInterceptorUmiRequest = (url: string, config : IRequestOptions) => WithPromise<{ url: string, options: IRequestOptions }>;
 type IRequestInterceptor = IRequestInterceptorAxios | IRequestInterceptorUmiRequest;
 type IErrorInterceptor = (error: Error) => Promise<Error>;
-type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosResponse<T> ;
-type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor
+type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => WithPromise<AxiosResponse<T>> ;
+type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [IRequestInterceptor] | IRequestInterceptor
 type IResponseInterceptorTuple = [IResponseInterceptor, IErrorInterceptor] | [IResponseInterceptor] | IResponseInterceptor
 
 export interface RequestConfig<T = any> extends AxiosRequestConfig {
@@ -168,19 +169,19 @@ const getRequestInstance = (): AxiosInstance => {
 
   config?.requestInterceptors?.forEach((interceptor) => {
     if(interceptor instanceof Array){
-      requestInstance.interceptors.request.use((config) => {
+      requestInstance.interceptors.request.use(async (config) => {
         const { url } = config;
         if(interceptor[0].length === 2){
-          const { url: newUrl, options } = interceptor[0](url, config);
+          const { url: newUrl, options } = await interceptor[0](url, config);
           return { ...options, url: newUrl };
         }
         return interceptor[0](config);
       }, interceptor[1]);
     } else {
-      requestInstance.interceptors.request.use((config) => {
+      requestInstance.interceptors.request.use(async (config) => {
         const { url } = config;
         if(interceptor.length === 2){
-          const { url: newUrl, options } = interceptor(url, config);
+          const { url: newUrl, options } = await interceptor(url, config);
           return { ...options, url: newUrl };
         }
         return interceptor(config);
@@ -211,19 +212,19 @@ const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
   const { getResponse = false, requestInterceptors, responseInterceptors } = opts;
   const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => {
     if(interceptor instanceof Array){
-      return requestInstance.interceptors.request.use((config) => {
+      return requestInstance.interceptors.request.use(async (config) => {
         const { url } = config;
         if(interceptor[0].length === 2){
-          const { url: newUrl, options } = interceptor[0](url, config);
+          const { url: newUrl, options } = await interceptor[0](url, config);
           return { ...options, url: newUrl };
         }
         return interceptor[0](config);
       }, interceptor[1]);
     } else {
-      return requestInstance.interceptors.request.use((config) => {
+      return requestInstance.interceptors.request.use(async (config) => {
         const { url } = config;
         if(interceptor.length === 2){
-          const { url: newUrl, options } = interceptor(url, config);
+          const { url: newUrl, options } = await interceptor(url, config);
           return { ...options, url: newUrl };
         }
         return interceptor(config);
@@ -280,6 +281,10 @@ export type {
   AxiosResponse,
   AxiosError,
   RequestError,
+  IRequestInterceptorAxios as RequestInterceptorAxios,
+  IRequestInterceptorUmiRequest as RequestInterceptorUmiRequest,
+  IRequestInterceptor as RequestInterceptor,
+  IErrorInterceptor as ErrorInterceptor,
   IResponseInterceptor as ResponseInterceptor,
   IRequestOptions as RequestOptions,
   IRequest as Request,
@@ -320,6 +325,10 @@ export type {
   AxiosResponse,
   AxiosError,
   RequestError,
+  RequestInterceptorAxios,
+  RequestInterceptorUmiRequest,
+  RequestInterceptor,
+  ErrorInterceptor,
   ResponseInterceptor,
   RequestOptions,
   Request } from './request';