@swiftcrab/request 1.0.2 → 1.0.4

package/README.md

@@ -1,80 +1,81 @@
-## 使用示例
-
-- 安装: pnpm add @swiftcrab/request
-
-#### 创建 overFetch.ts
-
-```typescript
-import {
-  RequestClient,
-  formatToken,
-  defaultResponseInterceptor,
-  authenticateResponseInterceptor,
-  errorMessageResponseInterceptor,
-} from '@swiftcrab/request'
-
-const baseURL = '/api'
-
-function createRequestClient(baseURL: string) {
-  const client = new RequestClient({
-    baseURL,
-  })
-
-  /** 处理重新认证,常用于回到登录页 */
-  async function doReAuthenticate() {}
-
-  /** 处理刷新令牌 */
-  async function doRefreshToken() {
-    return ''
-  }
-
-  // 处理请求头处理
-  client.addRequestInterceptor({
-    fulfilled: config => {
-      return config
-    },
-  })
-
-  // 返回数据格式 { data: any, info: { code: number, message: string, status: boolean } }
-  client.addResponseInterceptor(
-    defaultResponseInterceptor({
-      /** 响应数据中代表访问结果的字段名 */
-      codeField: 'code',
-      /** 响应数据中装载实际数据的字段名，或者提供一个函数从响应数据中解析需要返回的数据 */
-      dataField: 'data',
-      /** 当codeField所指定的字段值与successCode相同时，代表接口访问成功。如果提供一个函数，则返回true代表接口访问成功 */
-      successCode: 200,
-    }),
-  )
-
-  client.addResponseInterceptor(
-    authenticateResponseInterceptor({
-      client,
-      doReAuthenticate,
-      doRefreshToken,
-      /** 是否启用刷新令牌 */
-      enableRefreshToken: true,
-    }),
-  )
-
-  client.addResponseInterceptor(
-    errorMessageResponseInterceptor((msg: string, error) => {
-      /** 处理错误消息 */
-    }),
-  )
-
-  return client
-}
-
-export const requestClient = createRequestClient(baseURL)
-export const baseRequestClient = new RequestClient({ baseURL })
-```
-
-#### 使用 requestClient
-
-```typescript
-import { requestClient } from './request'
-requestClient.get('/user').then(res => {
-  console.log(res)
-})
-```
+## 使用示例
+
+- 安装: pnpm add @swiftcrab/request
+
+#### 创建 overFetch.ts
+
+```typescript
+import {
+  RequestClient,
+  formatToken,
+  defaultResponseInterceptor,
+  authenticateResponseInterceptor,
+  errorMessageResponseInterceptor,
+} from '@swiftcrab/request'
+
+const baseURL = '/api'
+
+function createRequestClient() {
+  const client = new RequestClient({
+    baseURL,
+  })
+
+  /** 处理重新认证, 常用于回到登录页 */
+  async function doReAuthenticate() {}
+
+  /** 处理刷新token */
+  async function doRefreshToken() {
+    return ''
+  }
+
+  // 请求头处理
+  client.addRequestInterceptor({
+    fulfilled: config => {
+      return config
+    },
+  })
+
+  // 返回数据格式 { data: any, info: { code: number, message: string, status: boolean } }
+  client.addResponseInterceptor(
+    defaultResponseInterceptor({
+      /** 响应数据中代表访问结果的字段名 */
+      codeField: 'code',
+      /** 响应数据中装载实际数据的字段名，或者提供一个函数从响应数据中解析需要返回的数据 */
+      dataField: 'data',
+      /** 当codeField所指定的字段值与successCode相同时，代表接口访问成功。如果提供一个函数，则返回true代表接口访问成功 */
+      successCode: 200,
+    }),
+  )
+
+  client.addResponseInterceptor(
+    authenticateResponseInterceptor({
+      client,
+      doReAuthenticate,
+      doRefreshToken,
+      /** 是否启用刷新令牌 */
+      enableRefreshToken: true,
+    }),
+  )
+
+  client.addResponseInterceptor(
+    errorMessageResponseInterceptor((msg: string, error) => {
+      /** 处理错误消息 */
+    }),
+  )
+
+  return client
+}
+
+export const requestClient = createRequestClient()
+
+export const baseRequestClient = new RequestClient({ baseURL })
+```
+
+#### 使用 requestClient
+
+```typescript
+import { requestClient } from './request'
+requestClient.get('/user').then(res => {
+  console.log(res)
+})
+```

package/dist/index.cjs

@@ -0,0 +1 @@
+var e=Object.create,t=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,i=Object.getPrototypeOf,a=Object.prototype.hasOwnProperty,o=(e,i,o,s)=>{if(i&&typeof i==`object`||typeof i==`function`)for(var c=r(i),l=0,u=c.length,d;l<u;l++)d=c[l],!a.call(e,d)&&d!==o&&t(e,d,{get:(e=>i[e]).bind(null,d),enumerable:!(s=n(i,d))||s.enumerable});return e},s=(n,r,a)=>(a=n==null?{}:e(i(n)),o(r||!n||!n.__esModule?t(a,`default`,{value:n,enumerable:!0}):a,n));let c=require(`axios`);c=s(c);let l=require(`defu`);var u=class{client;constructor(e){this.client=e}async download(e,t){let n={...t,responseType:`blob`};return await this.client.get(e,n)}};const d={fulfilled:e=>e,rejected:e=>Promise.reject(e)},f={fulfilled:e=>e,rejected:e=>Promise.reject(e)};var p=class{axiosInstance;constructor(e){this.axiosInstance=e}addRequestInterceptor({fulfilled:e,rejected:t}=d){this.axiosInstance.interceptors.request.use(e,t)}addResponseInterceptor({fulfilled:e,rejected:t}=f){this.axiosInstance.interceptors.response.use(e,t)}},m=class{client;constructor(e){this.client=e}async upload(e,t,n){let r=new FormData;Object.entries(t).forEach(([e,t])=>{r.append(e,t)});let i={...n,headers:{"Content-Type":`multipart/form-data`,...n?.headers}};return this.client.post(e,r,i)}},h=class{instance;addRequestInterceptor;addResponseInterceptor;download;isRefreshing=!1;refreshTokenQueue=[];upload;constructor(e={}){let t={headers:{"Content-Type":`application/json;charset=utf-8`},timeout:1e4},{...n}=e,r=(0,l.defu)(n,t);this.instance=c.default.create(r);let i=new p(this.instance);this.addRequestInterceptor=i.addRequestInterceptor.bind(i),this.addResponseInterceptor=i.addResponseInterceptor.bind(i);let a=new m(this);this.upload=a.upload.bind(a);let o=new u(this);this.download=o.download.bind(o)}delete(e,t){return this.request(e,{...t,method:`DELETE`})}get(e,t){return this.request(e,{...t,method:`GET`})}post(e,t,n){return this.request(e,{...n,data:t,method:`POST`})}put(e,t,n){return this.request(e,{...n,data:t,method:`PUT`})}setDefaultHeader(e,t){this.instance.defaults.headers.common[e]=t}async request(e,t){try{return await this.instance({url:e,...t})}catch(e){throw e.response?e.response.data:e}}};const g=e=>typeof e==`function`;function _(e){return e?`Bearer ${e}`:null}const v=({token:e})=>({fulfilled:t=>(t.headers.authorization=_(e),t)}),y=({codeField:e=`code`,dataField:t=`data`,successCode:n=200})=>({fulfilled:r=>{let{config:i,data:a,status:o}=r;if(i.responseReturn===`raw`)return r;if(o>=200&&o<400){if(i.responseReturn===`body`)return a;if(g(n)?n(a[e]):a.info[e]===n)return g(t)?t(a):a[t]}throw Object.assign({},r,{response:r})}}),b=({client:e,doReAuthenticate:t,doRefreshToken:n,enableRefreshToken:r})=>({rejected:async i=>{let{config:a,response:o}=i;if(o?.status!==401)throw i;if(!r||a.__isRetryRequest)throw await t(),i;if(e.isRefreshing)return new Promise(t=>{e.refreshTokenQueue.push(n=>{a.headers.Authorization=_(n),t(e.request(a.url,{...a}))})});e.isRefreshing=!0,a.__isRetryRequest=!0;try{let t=await n();return e.refreshTokenQueue.forEach(e=>e(t)),e.refreshTokenQueue=[],e.request(i.config.url,{...i.config})}catch(n){throw console.log(`object`,n),e.refreshTokenQueue.forEach(e=>e(``)),e.refreshTokenQueue=[],await t(),n}finally{e.isRefreshing=!1}}}),x=e=>({rejected:t=>{if(c.default.isCancel(t))return Promise.reject(t);let n=t?.toString?.()??``,r=``;if(n?.includes(`Network Error`)?r=`网络异常，请检查您的网络连接后重试。`:t?.message?.includes?.(`timeout`)&&(r=`请求超时，请稍后再试。`),r)return e?.(r,t),Promise.reject(t);let i=``;switch(t?.response?.status){case 400:i=`请求错误。请检查您的输入并重试。`;break;case 401:i=`登录认证过期，请重新登录后继续。`;break;case 403:i=`禁止访问, 您没有权限访问此资源。`;break;case 404:i=`未找到, 请求的资源不存在。`;break;case 408:i=`请求超时，请稍后再试。`;break;default:i=`内部服务器错误，请稍后再试。`}return e?.(i,t),Promise.reject(t)}});exports.RequestClient=h,exports.authenticateResponseInterceptor=b,exports.defaultRequestInterceptor=v,exports.defaultResponseInterceptor=y,exports.errorMessageResponseInterceptor=x,exports.formatToken=_;

package/dist/index.d.cts

@@ -0,0 +1,110 @@
+import { AxiosInstance, AxiosRequestConfig, AxiosRequestConfig as AxiosRequestConfig$1, AxiosResponse, CreateAxiosDefaults, InternalAxiosRequestConfig } from "axios";
+
+//#region src/types.d.ts
+type ExtendOptions<T = any> = {
+  paramsSerializer?: 'brackets' | 'comma' | 'indices' | 'repeat' | AxiosRequestConfig<T>['paramsSerializer'];
+  responseReturn?: 'body' | 'data' | 'raw';
+};
+type RequestClientConfig<T = any> = AxiosRequestConfig<T> & ExtendOptions<T>;
+type RequestResponse<T = any> = AxiosResponse<T> & {
+  config: RequestClientConfig<T>;
+};
+type RequestContentType = 'application/json;charset=utf-8' | 'application/octet-stream;charset=utf-8' | 'application/x-www-form-urlencoded;charset=utf-8' | 'multipart/form-data;charset=utf-8';
+type RequestClientOptions = CreateAxiosDefaults & ExtendOptions;
+interface SseRequestOptions extends RequestInit {
+  onMessage?: (message: string) => void;
+  onEnd?: () => void;
+}
+interface RequestInterceptorConfig {
+  fulfilled?: (config: ExtendOptions & InternalAxiosRequestConfig) => (ExtendOptions & InternalAxiosRequestConfig<any>) | Promise<ExtendOptions & InternalAxiosRequestConfig<any>>;
+  rejected?: (error: any) => any;
+}
+interface ResponseInterceptorConfig<T = any> {
+  fulfilled?: (response: RequestResponse<T>) => Promise<RequestResponse> | RequestResponse;
+  rejected?: (error: any) => any;
+}
+type MakeErrorMessageFn = (message: string, error: any) => void;
+interface HttpResponse<T = any> {
+  code: number;
+  data: T;
+  message: string;
+}
+//#endregion
+//#region src/modules/downloader.d.ts
+declare class FileDownloader {
+  private client;
+  constructor(client: RequestClient);
+  download(url: string, config?: AxiosRequestConfig$1): Promise<RequestResponse<Blob>>;
+}
+//#endregion
+//#region src/modules/interceptor.d.ts
+declare class InterceptorManager {
+  private axiosInstance;
+  constructor(instance: AxiosInstance);
+  addRequestInterceptor({
+    fulfilled,
+    rejected
+  }?: RequestInterceptorConfig): void;
+  addResponseInterceptor<T = any>({
+    fulfilled,
+    rejected
+  }?: ResponseInterceptorConfig<T>): void;
+}
+//#endregion
+//#region src/modules/uploader.d.ts
+declare class FileUploader {
+  private client;
+  constructor(client: RequestClient);
+  upload(url: string, data: {
+    file: Blob | File;
+  } & Record<string, any>, config?: AxiosRequestConfig$1): Promise<AxiosResponse>;
+}
+//#endregion
+//#region src/request-client.d.ts
+declare class RequestClient {
+  private readonly instance;
+  addRequestInterceptor: InterceptorManager['addRequestInterceptor'];
+  addResponseInterceptor: InterceptorManager['addResponseInterceptor'];
+  download: FileDownloader['download'];
+  isRefreshing: boolean;
+  refreshTokenQueue: ((token: string) => void)[];
+  upload: FileUploader['upload'];
+  constructor(options?: RequestClientOptions);
+  delete<T = any>(url: string, config?: AxiosRequestConfig$1): Promise<T>;
+  get<T = any>(url: string, config?: AxiosRequestConfig$1): Promise<T>;
+  post<T = any>(url: string, data?: any, config?: AxiosRequestConfig$1): Promise<T>;
+  put<T = any>(url: string, data?: any, config?: AxiosRequestConfig$1): Promise<T>;
+  setDefaultHeader(name: string, value: string): void;
+  request<T>(url: string, config: AxiosRequestConfig$1): Promise<T>;
+}
+//#endregion
+//#region src/preset-interceptors.d.ts
+declare function formatToken(token: null | string): string | null;
+declare const defaultRequestInterceptor: ({
+  token
+}: {
+  token: string;
+}) => RequestInterceptorConfig;
+declare const defaultResponseInterceptor: ({
+  codeField,
+  dataField,
+  successCode
+}: {
+  codeField: string;
+  dataField: ((response: any) => any) | string;
+  successCode: ((code: any) => boolean) | number | string;
+}) => ResponseInterceptorConfig;
+declare const authenticateResponseInterceptor: ({
+  client,
+  doReAuthenticate,
+  doRefreshToken,
+  enableRefreshToken
+}: {
+  client: RequestClient;
+  doReAuthenticate: () => Promise<void>;
+  doRefreshToken: () => Promise<string>;
+  enableRefreshToken: boolean;
+}) => ResponseInterceptorConfig;
+declare const errorMessageResponseInterceptor: (makeErrorMessage?: MakeErrorMessageFn) => ResponseInterceptorConfig;
+//#endregion
+export { type AxiosRequestConfig, type HttpResponse, type MakeErrorMessageFn, RequestClient, type RequestClientConfig, type RequestClientOptions, type RequestContentType, type RequestInterceptorConfig, type RequestResponse, type ResponseInterceptorConfig, type SseRequestOptions, authenticateResponseInterceptor, defaultRequestInterceptor, defaultResponseInterceptor, errorMessageResponseInterceptor, formatToken };

package/dist/index.d.mts

@@ -1,89 +1,110 @@
-import { AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse, CreateAxiosDefaults, AxiosInstance } from 'axios';
-export { AxiosRequestConfig } from 'axios';
+import { AxiosInstance, AxiosRequestConfig, AxiosRequestConfig as AxiosRequestConfig$1, AxiosResponse, CreateAxiosDefaults, InternalAxiosRequestConfig } from "axios";
 
+//#region src/types.d.ts
 type ExtendOptions<T = any> = {
-    paramsSerializer?: 'brackets' | 'comma' | 'indices' | 'repeat' | AxiosRequestConfig<T>['paramsSerializer'];
-    responseReturn?: 'body' | 'data' | 'raw';
+  paramsSerializer?: 'brackets' | 'comma' | 'indices' | 'repeat' | AxiosRequestConfig<T>['paramsSerializer'];
+  responseReturn?: 'body' | 'data' | 'raw';
 };
 type RequestClientConfig<T = any> = AxiosRequestConfig<T> & ExtendOptions<T>;
 type RequestResponse<T = any> = AxiosResponse<T> & {
-    config: RequestClientConfig<T>;
+  config: RequestClientConfig<T>;
 };
 type RequestContentType = 'application/json;charset=utf-8' | 'application/octet-stream;charset=utf-8' | 'application/x-www-form-urlencoded;charset=utf-8' | 'multipart/form-data;charset=utf-8';
 type RequestClientOptions = CreateAxiosDefaults & ExtendOptions;
 interface SseRequestOptions extends RequestInit {
-    onMessage?: (message: string) => void;
-    onEnd?: () => void;
+  onMessage?: (message: string) => void;
+  onEnd?: () => void;
 }
 interface RequestInterceptorConfig {
-    fulfilled?: (config: ExtendOptions & InternalAxiosRequestConfig) => (ExtendOptions & InternalAxiosRequestConfig<any>) | Promise<ExtendOptions & InternalAxiosRequestConfig<any>>;
-    rejected?: (error: any) => any;
+  fulfilled?: (config: ExtendOptions & InternalAxiosRequestConfig) => (ExtendOptions & InternalAxiosRequestConfig<any>) | Promise<ExtendOptions & InternalAxiosRequestConfig<any>>;
+  rejected?: (error: any) => any;
 }
 interface ResponseInterceptorConfig<T = any> {
-    fulfilled?: (response: RequestResponse<T>) => Promise<RequestResponse> | RequestResponse;
-    rejected?: (error: any) => any;
+  fulfilled?: (response: RequestResponse<T>) => Promise<RequestResponse> | RequestResponse;
+  rejected?: (error: any) => any;
 }
 type MakeErrorMessageFn = (message: string, error: any) => void;
 interface HttpResponse<T = any> {
-    code: number;
-    data: T;
-    message: string;
+  code: number;
+  data: T;
+  message: string;
 }
-
+//#endregion
+//#region src/modules/downloader.d.ts
 declare class FileDownloader {
-    private client;
-    constructor(client: RequestClient);
-    download(url: string, config?: AxiosRequestConfig): Promise<RequestResponse<Blob>>;
+  private client;
+  constructor(client: RequestClient);
+  download(url: string, config?: AxiosRequestConfig$1): Promise<RequestResponse<Blob>>;
 }
-
+//#endregion
+//#region src/modules/interceptor.d.ts
 declare class InterceptorManager {
-    private axiosInstance;
-    constructor(instance: AxiosInstance);
-    addRequestInterceptor({ fulfilled, rejected, }?: RequestInterceptorConfig): void;
-    addResponseInterceptor<T = any>({ fulfilled, rejected, }?: ResponseInterceptorConfig<T>): void;
+  private axiosInstance;
+  constructor(instance: AxiosInstance);
+  addRequestInterceptor({
+    fulfilled,
+    rejected
+  }?: RequestInterceptorConfig): void;
+  addResponseInterceptor<T = any>({
+    fulfilled,
+    rejected
+  }?: ResponseInterceptorConfig<T>): void;
 }
-
+//#endregion
+//#region src/modules/uploader.d.ts
 declare class FileUploader {
-    private client;
-    constructor(client: RequestClient);
-    upload(url: string, data: {
-        file: Blob | File;
-    } & Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse>;
+  private client;
+  constructor(client: RequestClient);
+  upload(url: string, data: {
+    file: Blob | File;
+  } & Record<string, any>, config?: AxiosRequestConfig$1): Promise<AxiosResponse>;
 }
-
+//#endregion
+//#region src/request-client.d.ts
 declare class RequestClient {
-    private readonly instance;
-    addRequestInterceptor: InterceptorManager['addRequestInterceptor'];
-    addResponseInterceptor: InterceptorManager['addResponseInterceptor'];
-    download: FileDownloader['download'];
-    isRefreshing: boolean;
-    refreshTokenQueue: ((token: string) => void)[];
-    upload: FileUploader['upload'];
-    constructor(options?: RequestClientOptions);
-    delete<T = any>(url: string, config?: AxiosRequestConfig): Promise<T>;
-    get<T = any>(url: string, config?: AxiosRequestConfig): Promise<T>;
-    post<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<T>;
-    put<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<T>;
-    setDefaultHeader(name: string, value: string): void;
-    request<T>(url: string, config: AxiosRequestConfig): Promise<T>;
+  private readonly instance;
+  addRequestInterceptor: InterceptorManager['addRequestInterceptor'];
+  addResponseInterceptor: InterceptorManager['addResponseInterceptor'];
+  download: FileDownloader['download'];
+  isRefreshing: boolean;
+  refreshTokenQueue: ((token: string) => void)[];
+  upload: FileUploader['upload'];
+  constructor(options?: RequestClientOptions);
+  delete<T = any>(url: string, config?: AxiosRequestConfig$1): Promise<T>;
+  get<T = any>(url: string, config?: AxiosRequestConfig$1): Promise<T>;
+  post<T = any>(url: string, data?: any, config?: AxiosRequestConfig$1): Promise<T>;
+  put<T = any>(url: string, data?: any, config?: AxiosRequestConfig$1): Promise<T>;
+  setDefaultHeader(name: string, value: string): void;
+  request<T>(url: string, config: AxiosRequestConfig$1): Promise<T>;
 }
-
+//#endregion
+//#region src/preset-interceptors.d.ts
 declare function formatToken(token: null | string): string | null;
-declare const defaultRequestInterceptor: ({ token }: {
-    token: string;
+declare const defaultRequestInterceptor: ({
+  token
+}: {
+  token: string;
 }) => RequestInterceptorConfig;
-declare const defaultResponseInterceptor: ({ codeField, dataField, successCode, }: {
-    codeField: string;
-    dataField: ((response: any) => any) | string;
-    successCode: ((code: any) => boolean) | number | string;
+declare const defaultResponseInterceptor: ({
+  codeField,
+  dataField,
+  successCode
+}: {
+  codeField: string;
+  dataField: ((response: any) => any) | string;
+  successCode: ((code: any) => boolean) | number | string;
 }) => ResponseInterceptorConfig;
-declare const authenticateResponseInterceptor: ({ client, doReAuthenticate, doRefreshToken, enableRefreshToken, }: {
-    client: RequestClient;
-    doReAuthenticate: () => Promise<void>;
-    doRefreshToken: () => Promise<string>;
-    enableRefreshToken: boolean;
+declare const authenticateResponseInterceptor: ({
+  client,
+  doReAuthenticate,
+  doRefreshToken,
+  enableRefreshToken
+}: {
+  client: RequestClient;
+  doReAuthenticate: () => Promise<void>;
+  doRefreshToken: () => Promise<string>;
+  enableRefreshToken: boolean;
 }) => ResponseInterceptorConfig;
 declare const errorMessageResponseInterceptor: (makeErrorMessage?: MakeErrorMessageFn) => ResponseInterceptorConfig;
-
-export { RequestClient, authenticateResponseInterceptor, defaultRequestInterceptor, defaultResponseInterceptor, errorMessageResponseInterceptor, formatToken };
-export type { HttpResponse, MakeErrorMessageFn, RequestClientConfig, RequestClientOptions, RequestContentType, RequestInterceptorConfig, RequestResponse, ResponseInterceptorConfig, SseRequestOptions };
+//#endregion
+export { type AxiosRequestConfig, type HttpResponse, type MakeErrorMessageFn, RequestClient, type RequestClientConfig, type RequestClientOptions, type RequestContentType, type RequestInterceptorConfig, type RequestResponse, type ResponseInterceptorConfig, type SseRequestOptions, authenticateResponseInterceptor, defaultRequestInterceptor, defaultResponseInterceptor, errorMessageResponseInterceptor, formatToken };

package/dist/index.mjs

@@ -1,273 +1 @@
-import axios from 'axios';
-import { defu } from 'defu';
-
-class FileDownloader {
-  client;
-  constructor(client) {
-    this.client = client;
-  }
-  async download(url, config) {
-    const finalConfig = {
-      ...config,
-      responseType: "blob"
-    };
-    const response = await this.client.get(
-      url,
-      finalConfig
-    );
-    return response;
-  }
-}
-
-const defaultRequestInterceptorConfig = {
-  fulfilled: (response) => response,
-  rejected: (error) => Promise.reject(error)
-};
-const defaultResponseInterceptorConfig = {
-  fulfilled: (response) => response,
-  rejected: (error) => Promise.reject(error)
-};
-class InterceptorManager {
-  axiosInstance;
-  constructor(instance) {
-    this.axiosInstance = instance;
-  }
-  addRequestInterceptor({
-    fulfilled,
-    rejected
-  } = defaultRequestInterceptorConfig) {
-    this.axiosInstance.interceptors.request.use(fulfilled, rejected);
-  }
-  addResponseInterceptor({
-    fulfilled,
-    rejected
-  } = defaultResponseInterceptorConfig) {
-    this.axiosInstance.interceptors.response.use(fulfilled, rejected);
-  }
-}
-
-class FileUploader {
-  client;
-  constructor(client) {
-    this.client = client;
-  }
-  async upload(url, data, config) {
-    const formData = new FormData();
-    Object.entries(data).forEach(([key, value]) => {
-      formData.append(key, value);
-    });
-    const finalConfig = {
-      ...config,
-      headers: {
-        "Content-Type": "multipart/form-data",
-        ...config?.headers
-      }
-    };
-    return this.client.post(url, formData, finalConfig);
-  }
-}
-
-class RequestClient {
-  instance;
-  addRequestInterceptor;
-  addResponseInterceptor;
-  download;
-  // 是否正在刷新token
-  isRefreshing = false;
-  // 刷新token队列
-  refreshTokenQueue = [];
-  upload;
-  /**
-   * 构造函数，用于创建Axios实例
-   * @param options - Axios请求配置，可选
-   */
-  constructor(options = {}) {
-    const defaultConfig = {
-      headers: {
-        "Content-Type": "application/json;charset=utf-8"
-      },
-      // 默认超时时间
-      timeout: 1e4
-    };
-    const { ...axiosConfig } = options;
-    const requestConfig = defu(axiosConfig, defaultConfig);
-    this.instance = axios.create(requestConfig);
-    const interceptorManager = new InterceptorManager(this.instance);
-    this.addRequestInterceptor = interceptorManager.addRequestInterceptor.bind(interceptorManager);
-    this.addResponseInterceptor = interceptorManager.addResponseInterceptor.bind(interceptorManager);
-    const fileUploader = new FileUploader(this);
-    this.upload = fileUploader.upload.bind(fileUploader);
-    const fileDownloader = new FileDownloader(this);
-    this.download = fileDownloader.download.bind(fileDownloader);
-  }
-  /**
-   * DELETE请求方法
-   */
-  delete(url, config) {
-    return this.request(url, { ...config, method: "DELETE" });
-  }
-  /**
-   * GET请求方法
-   */
-  get(url, config) {
-    return this.request(url, { ...config, method: "GET" });
-  }
-  /**
-   * POST请求方法
-   */
-  post(url, data, config) {
-    return this.request(url, { ...config, data, method: "POST" });
-  }
-  /**
-   * PUT请求方法
-   */
-  put(url, data, config) {
-    return this.request(url, { ...config, data, method: "PUT" });
-  }
-  setDefaultHeader(name, value) {
-    this.instance.defaults.headers.common[name] = value;
-  }
-  /**
-   * 通用的请求方法
-   */
-  async request(url, config) {
-    try {
-      const response = await this.instance({
-        url,
-        ...config
-      });
-      return response;
-    } catch (error) {
-      throw error.response ? error.response.data : error;
-    }
-  }
-}
-
-const isFunction = (val) => typeof val === "function";
-function formatToken(token) {
-  return token ? `Bearer ${token}` : null;
-}
-const defaultRequestInterceptor = ({ token }) => {
-  return {
-    fulfilled: (config) => {
-      config.headers.authorization = formatToken(token);
-      return config;
-    }
-  };
-};
-const defaultResponseInterceptor = ({
-  codeField = "code",
-  dataField = "data",
-  successCode = 200
-}) => {
-  return {
-    fulfilled: (response) => {
-      const { config, data: responseData, status } = response;
-      if (config.responseReturn === "raw") {
-        return response;
-      }
-      if (status >= 200 && status < 400) {
-        if (config.responseReturn === "body") {
-          return responseData;
-        } else if (isFunction(successCode) ? successCode(responseData[codeField]) : responseData["info"][codeField] === successCode) {
-          return isFunction(dataField) ? dataField(responseData) : responseData[dataField];
-        }
-      }
-      throw Object.assign({}, response, { response });
-    }
-  };
-};
-const authenticateResponseInterceptor = ({
-  client,
-  doReAuthenticate,
-  doRefreshToken,
-  enableRefreshToken
-}) => {
-  return {
-    rejected: async (error) => {
-      const { config, response } = error;
-      if (response?.status !== 401) {
-        throw error;
-      }
-      if (!enableRefreshToken || config.__isRetryRequest) {
-        await doReAuthenticate();
-        throw error;
-      }
-      if (client.isRefreshing) {
-        return new Promise((resolve) => {
-          client.refreshTokenQueue.push((newToken) => {
-            config.headers.Authorization = formatToken(newToken);
-            resolve(client.request(config.url, { ...config }));
-          });
-        });
-      }
-      client.isRefreshing = true;
-      config.__isRetryRequest = true;
-      try {
-        const newToken = await doRefreshToken();
-        client.refreshTokenQueue.forEach((callback) => callback(newToken));
-        client.refreshTokenQueue = [];
-        return client.request(error.config.url, { ...error.config });
-      } catch (refreshError) {
-        console.log("object", refreshError);
-        client.refreshTokenQueue.forEach((callback) => callback(""));
-        client.refreshTokenQueue = [];
-        await doReAuthenticate();
-        throw refreshError;
-      } finally {
-        client.isRefreshing = false;
-      }
-    }
-  };
-};
-const errorMessageResponseInterceptor = (makeErrorMessage) => {
-  return {
-    rejected: (error) => {
-      if (axios.isCancel(error)) {
-        return Promise.reject(error);
-      }
-      const err = error?.toString?.() ?? "";
-      let errMsg = "";
-      if (err?.includes("Network Error")) {
-        errMsg = "\u7F51\u7EDC\u5F02\u5E38\uFF0C\u8BF7\u68C0\u67E5\u60A8\u7684\u7F51\u7EDC\u8FDE\u63A5\u540E\u91CD\u8BD5\u3002";
-      } else if (error?.message?.includes?.("timeout")) {
-        errMsg = "\u8BF7\u6C42\u8D85\u65F6\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002";
-      }
-      if (errMsg) {
-        makeErrorMessage?.(errMsg, error);
-        return Promise.reject(error);
-      }
-      let errorMessage = "";
-      const status = error?.response?.status;
-      switch (status) {
-        case 400: {
-          errorMessage = "\u8BF7\u6C42\u9519\u8BEF\u3002\u8BF7\u68C0\u67E5\u60A8\u7684\u8F93\u5165\u5E76\u91CD\u8BD5\u3002";
-          break;
-        }
-        case 401: {
-          errorMessage = "\u767B\u5F55\u8BA4\u8BC1\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u540E\u7EE7\u7EED\u3002";
-          break;
-        }
-        case 403: {
-          errorMessage = "\u7981\u6B62\u8BBF\u95EE, \u60A8\u6CA1\u6709\u6743\u9650\u8BBF\u95EE\u6B64\u8D44\u6E90\u3002";
-          break;
-        }
-        case 404: {
-          errorMessage = "\u672A\u627E\u5230, \u8BF7\u6C42\u7684\u8D44\u6E90\u4E0D\u5B58\u5728\u3002";
-          break;
-        }
-        case 408: {
-          errorMessage = "\u8BF7\u6C42\u8D85\u65F6\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002";
-          break;
-        }
-        default: {
-          errorMessage = "\u5185\u90E8\u670D\u52A1\u5668\u9519\u8BEF\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002";
-        }
-      }
-      makeErrorMessage?.(errorMessage, error);
-      return Promise.reject(error);
-    }
-  };
-};
-
-export { RequestClient, authenticateResponseInterceptor, defaultRequestInterceptor, defaultResponseInterceptor, errorMessageResponseInterceptor, formatToken };
+import e from"axios";import{defu as t}from"defu";var n=class{client;constructor(e){this.client=e}async download(e,t){let n={...t,responseType:`blob`};return await this.client.get(e,n)}};const r={fulfilled:e=>e,rejected:e=>Promise.reject(e)},i={fulfilled:e=>e,rejected:e=>Promise.reject(e)};var a=class{axiosInstance;constructor(e){this.axiosInstance=e}addRequestInterceptor({fulfilled:e,rejected:t}=r){this.axiosInstance.interceptors.request.use(e,t)}addResponseInterceptor({fulfilled:e,rejected:t}=i){this.axiosInstance.interceptors.response.use(e,t)}},o=class{client;constructor(e){this.client=e}async upload(e,t,n){let r=new FormData;Object.entries(t).forEach(([e,t])=>{r.append(e,t)});let i={...n,headers:{"Content-Type":`multipart/form-data`,...n?.headers}};return this.client.post(e,r,i)}},s=class{instance;addRequestInterceptor;addResponseInterceptor;download;isRefreshing=!1;refreshTokenQueue=[];upload;constructor(r={}){let i={headers:{"Content-Type":`application/json;charset=utf-8`},timeout:1e4},{...s}=r,c=t(s,i);this.instance=e.create(c);let l=new a(this.instance);this.addRequestInterceptor=l.addRequestInterceptor.bind(l),this.addResponseInterceptor=l.addResponseInterceptor.bind(l);let u=new o(this);this.upload=u.upload.bind(u);let d=new n(this);this.download=d.download.bind(d)}delete(e,t){return this.request(e,{...t,method:`DELETE`})}get(e,t){return this.request(e,{...t,method:`GET`})}post(e,t,n){return this.request(e,{...n,data:t,method:`POST`})}put(e,t,n){return this.request(e,{...n,data:t,method:`PUT`})}setDefaultHeader(e,t){this.instance.defaults.headers.common[e]=t}async request(e,t){try{return await this.instance({url:e,...t})}catch(e){throw e.response?e.response.data:e}}};const c=e=>typeof e==`function`;function l(e){return e?`Bearer ${e}`:null}const u=({token:e})=>({fulfilled:t=>(t.headers.authorization=l(e),t)}),d=({codeField:e=`code`,dataField:t=`data`,successCode:n=200})=>({fulfilled:r=>{let{config:i,data:a,status:o}=r;if(i.responseReturn===`raw`)return r;if(o>=200&&o<400){if(i.responseReturn===`body`)return a;if(c(n)?n(a[e]):a.info[e]===n)return c(t)?t(a):a[t]}throw Object.assign({},r,{response:r})}}),f=({client:e,doReAuthenticate:t,doRefreshToken:n,enableRefreshToken:r})=>({rejected:async i=>{let{config:a,response:o}=i;if(o?.status!==401)throw i;if(!r||a.__isRetryRequest)throw await t(),i;if(e.isRefreshing)return new Promise(t=>{e.refreshTokenQueue.push(n=>{a.headers.Authorization=l(n),t(e.request(a.url,{...a}))})});e.isRefreshing=!0,a.__isRetryRequest=!0;try{let t=await n();return e.refreshTokenQueue.forEach(e=>e(t)),e.refreshTokenQueue=[],e.request(i.config.url,{...i.config})}catch(n){throw console.log(`object`,n),e.refreshTokenQueue.forEach(e=>e(``)),e.refreshTokenQueue=[],await t(),n}finally{e.isRefreshing=!1}}}),p=t=>({rejected:n=>{if(e.isCancel(n))return Promise.reject(n);let r=n?.toString?.()??``,i=``;if(r?.includes(`Network Error`)?i=`网络异常，请检查您的网络连接后重试。`:n?.message?.includes?.(`timeout`)&&(i=`请求超时，请稍后再试。`),i)return t?.(i,n),Promise.reject(n);let a=``;switch(n?.response?.status){case 400:a=`请求错误。请检查您的输入并重试。`;break;case 401:a=`登录认证过期，请重新登录后继续。`;break;case 403:a=`禁止访问, 您没有权限访问此资源。`;break;case 404:a=`未找到, 请求的资源不存在。`;break;case 408:a=`请求超时，请稍后再试。`;break;default:a=`内部服务器错误，请稍后再试。`}return t?.(a,n),Promise.reject(n)}});export{s as RequestClient,f as authenticateResponseInterceptor,u as defaultRequestInterceptor,d as defaultResponseInterceptor,p as errorMessageResponseInterceptor,l as formatToken};

package/package.json

@@ -1,25 +1,30 @@
 {
   "name": "@swiftcrab/request",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "license": "MIT",
   "type": "module",
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "exports": {
     ".": {
-      "default": "./dist/index.mjs"
-    },
-    "./package.json": "./package.json"
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    }
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "defu": "^6.1.4",
-    "axios": "^1.9.0"
+    "axios": "^1.9.0",
+    "defu": "^6.1.4"
   },
   "devDependencies": {
-    "unbuild": "^3.5.0",
+    "tsdown": "^0.17.0-beta.6",
     "typescript": "^5.8.3",
     "@swiftcrab/tsconfig": "1.0.1"
   },
@@ -28,6 +33,6 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "pnpm unbuild"
+    "build": "pnpm tsdown"
   }
 }

package/dist/index.d.ts

@@ -1,89 +0,0 @@
-import { AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse, CreateAxiosDefaults, AxiosInstance } from 'axios';
-export { AxiosRequestConfig } from 'axios';
-
-type ExtendOptions<T = any> = {
-    paramsSerializer?: 'brackets' | 'comma' | 'indices' | 'repeat' | AxiosRequestConfig<T>['paramsSerializer'];
-    responseReturn?: 'body' | 'data' | 'raw';
-};
-type RequestClientConfig<T = any> = AxiosRequestConfig<T> & ExtendOptions<T>;
-type RequestResponse<T = any> = AxiosResponse<T> & {
-    config: RequestClientConfig<T>;
-};
-type RequestContentType = 'application/json;charset=utf-8' | 'application/octet-stream;charset=utf-8' | 'application/x-www-form-urlencoded;charset=utf-8' | 'multipart/form-data;charset=utf-8';
-type RequestClientOptions = CreateAxiosDefaults & ExtendOptions;
-interface SseRequestOptions extends RequestInit {
-    onMessage?: (message: string) => void;
-    onEnd?: () => void;
-}
-interface RequestInterceptorConfig {
-    fulfilled?: (config: ExtendOptions & InternalAxiosRequestConfig) => (ExtendOptions & InternalAxiosRequestConfig<any>) | Promise<ExtendOptions & InternalAxiosRequestConfig<any>>;
-    rejected?: (error: any) => any;
-}
-interface ResponseInterceptorConfig<T = any> {
-    fulfilled?: (response: RequestResponse<T>) => Promise<RequestResponse> | RequestResponse;
-    rejected?: (error: any) => any;
-}
-type MakeErrorMessageFn = (message: string, error: any) => void;
-interface HttpResponse<T = any> {
-    code: number;
-    data: T;
-    message: string;
-}
-
-declare class FileDownloader {
-    private client;
-    constructor(client: RequestClient);
-    download(url: string, config?: AxiosRequestConfig): Promise<RequestResponse<Blob>>;
-}
-
-declare class InterceptorManager {
-    private axiosInstance;
-    constructor(instance: AxiosInstance);
-    addRequestInterceptor({ fulfilled, rejected, }?: RequestInterceptorConfig): void;
-    addResponseInterceptor<T = any>({ fulfilled, rejected, }?: ResponseInterceptorConfig<T>): void;
-}
-
-declare class FileUploader {
-    private client;
-    constructor(client: RequestClient);
-    upload(url: string, data: {
-        file: Blob | File;
-    } & Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse>;
-}
-
-declare class RequestClient {
-    private readonly instance;
-    addRequestInterceptor: InterceptorManager['addRequestInterceptor'];
-    addResponseInterceptor: InterceptorManager['addResponseInterceptor'];
-    download: FileDownloader['download'];
-    isRefreshing: boolean;
-    refreshTokenQueue: ((token: string) => void)[];
-    upload: FileUploader['upload'];
-    constructor(options?: RequestClientOptions);
-    delete<T = any>(url: string, config?: AxiosRequestConfig): Promise<T>;
-    get<T = any>(url: string, config?: AxiosRequestConfig): Promise<T>;
-    post<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<T>;
-    put<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<T>;
-    setDefaultHeader(name: string, value: string): void;
-    request<T>(url: string, config: AxiosRequestConfig): Promise<T>;
-}
-
-declare function formatToken(token: null | string): string | null;
-declare const defaultRequestInterceptor: ({ token }: {
-    token: string;
-}) => RequestInterceptorConfig;
-declare const defaultResponseInterceptor: ({ codeField, dataField, successCode, }: {
-    codeField: string;
-    dataField: ((response: any) => any) | string;
-    successCode: ((code: any) => boolean) | number | string;
-}) => ResponseInterceptorConfig;
-declare const authenticateResponseInterceptor: ({ client, doReAuthenticate, doRefreshToken, enableRefreshToken, }: {
-    client: RequestClient;
-    doReAuthenticate: () => Promise<void>;
-    doRefreshToken: () => Promise<string>;
-    enableRefreshToken: boolean;
-}) => ResponseInterceptorConfig;
-declare const errorMessageResponseInterceptor: (makeErrorMessage?: MakeErrorMessageFn) => ResponseInterceptorConfig;
-
-export { RequestClient, authenticateResponseInterceptor, defaultRequestInterceptor, defaultResponseInterceptor, errorMessageResponseInterceptor, formatToken };
-export type { HttpResponse, MakeErrorMessageFn, RequestClientConfig, RequestClientOptions, RequestContentType, RequestInterceptorConfig, RequestResponse, ResponseInterceptorConfig, SseRequestOptions };