From b4e125300e22765c3c997de4b969e2b70cd8aab0 Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Sat, 19 Jul 2025 02:24:14 +0800
Subject: [PATCH] refactor(request)!: remove cancelRequest method and related
 logic from request instances

---
 packages/axios/src/index.ts       | 21 ++-------------------
 packages/axios/src/type.ts        |  8 --------
 packages/hooks/src/use-request.ts |  1 -
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/packages/axios/src/index.ts b/packages/axios/src/index.ts
index b9866b6c..0d91ebe3 100644
--- a/packages/axios/src/index.ts
+++ b/packages/axios/src/index.ts
@@ -81,14 +81,6 @@ function createCommonRequest<
     }
   );
 
-  function cancelRequest(requestId: string) {
-    const abortController = abortControllerMap.get(requestId);
-    if (abortController) {
-      abortController.abort();
-      abortControllerMap.delete(requestId);
-    }
-  }
-
   function cancelAllRequest() {
     abortControllerMap.forEach(abortController => {
       abortController.abort();
@@ -99,7 +91,6 @@ function createCommonRequest<
   return {
     instance,
     opts,
-    cancelRequest,
     cancelAllRequest
   };
 }
@@ -114,10 +105,7 @@ export function createRequest<ResponseData, ApiData, State extends Record<string
   axiosConfig?: CreateAxiosDefaults,
   options?: Partial<RequestOption<ResponseData, ApiData, State>>
 ) {
-  const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(
-    axiosConfig,
-    options
-  );
+  const { instance, opts, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(axiosConfig, options);
 
   const request: RequestInstance<ApiData, State> = async function request<
     T extends ApiData = ApiData,
@@ -134,7 +122,6 @@ export function createRequest<ResponseData, ApiData, State extends Record<string
     return response.data as MappedType<R, T>;
   } as RequestInstance<ApiData, State>;
 
-  request.cancelRequest = cancelRequest;
   request.cancelAllRequest = cancelAllRequest;
   request.state = {} as State;
 
@@ -153,10 +140,7 @@ export function createFlatRequest<ResponseData, ApiData, State extends Record<st
   axiosConfig?: CreateAxiosDefaults,
   options?: Partial<RequestOption<ResponseData, ApiData, State>>
 ) {
-  const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(
-    axiosConfig,
-    options
-  );
+  const { instance, opts, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(axiosConfig, options);
 
   const flatRequest: FlatRequestInstance<ResponseData, ApiData, State> = async function flatRequest<
     T extends ApiData = ApiData,
@@ -179,7 +163,6 @@ export function createFlatRequest<ResponseData, ApiData, State extends Record<st
     }
   } as FlatRequestInstance<ResponseData, ApiData, State>;
 
-  flatRequest.cancelRequest = cancelRequest;
   flatRequest.cancelAllRequest = cancelAllRequest;
   flatRequest.state = {
     ...opts.defaultState
diff --git a/packages/axios/src/type.ts b/packages/axios/src/type.ts
index bc0bcd9f..ebc50e3b 100644
--- a/packages/axios/src/type.ts
+++ b/packages/axios/src/type.ts
@@ -79,14 +79,6 @@ export type CustomAxiosRequestConfig<R extends ResponseType = 'json'> = Omit<Axi
 };
 
 export interface RequestInstanceCommon<State extends Record<string, unknown>> {
-  /**
-   * cancel the request by request id
-   *
-   * if the request provide abort controller sign from config, it will not collect in the abort controller map
-   *
-   * @param requestId
-   */
-  cancelRequest: (requestId: string) => void;
   /**
    * cancel all request
    *
diff --git a/packages/hooks/src/use-request.ts b/packages/hooks/src/use-request.ts
index 50d0e9e4..219ac07f 100644
--- a/packages/hooks/src/use-request.ts
+++ b/packages/hooks/src/use-request.ts
@@ -73,7 +73,6 @@ export default function createHookRequest<ResponseData, ApiData, State extends R
     };
   } as HookRequestInstance<ResponseData, ApiData, State>;
 
-  hookRequest.cancelRequest = request.cancelRequest;
   hookRequest.cancelAllRequest = request.cancelAllRequest;
 
   return hookRequest;