Replace axios cancel tokens with standard abortcontroller across API requests and upgrade axios version

- [Pasted text]

Author: robertpiosik

apps/editor/package.json

@@ -1251,7 +1251,7 @@
     "@mozilla/readability": "^0.6.0",
     "@svgr/webpack": "^8.1.0",
     "@vscode/codicons": "^0.0.45",
-    "axios": "^1.10.0",
+    "axios": "^1.18.1",
     "bufferutil": "^4.0.9",
     "classnames": "^2.5.1",
     "dayjs": "^1.11.10",

apps/editor/src/commands/apply-response-command/handlers/active-editor-intelligent-update-handler.ts

@@ -102,9 +102,9 @@ export const handle_active_editor_intelligent_update = async (params: {
     return null
   }
 
-  const cancel_token_source = axios.CancelToken.source()
+  const abort_controller = new AbortController()
   if (params.panel_provider) {
-    params.panel_provider.api_call_cancel_token_source = cancel_token_source
+    params.panel_provider.api_call_abort_controller = abort_controller
     params.panel_provider.send_message({
       command: 'SHOW_PROGRESS',
       title: 'Thinking...',
@@ -133,7 +133,7 @@ export const handle_active_editor_intelligent_update = async (params: {
       file_path: target_file_path,
       file_content: original_content,
       instruction: file_item.content,
-      cancel_token: cancel_token_source.token,
+      abort_signal: abort_controller.signal,
       on_chunk: (tokens_per_second, total_tokens) => {
         if (params.panel_provider) {
           const estimated_total = Math.ceil(original_content.length / 4)
@@ -221,7 +221,7 @@ export const handle_active_editor_intelligent_update = async (params: {
       params.panel_provider.send_message({
         command: 'HIDE_PROGRESS'
       })
-      params.panel_provider.api_call_cancel_token_source = null
+      params.panel_provider.api_call_abort_controller = null
     }
   }
 }

apps/editor/src/commands/code-at-cursor-command/utils/perform-code-at-cursor.ts

@@ -108,7 +108,7 @@ export const perform_code_at_cursor = async (params: {
         )
         return
       }
-      const cancel_token_source = axios.CancelToken.source()
+      const abort_controller = new AbortController()
       const document = editor.document
       const position = editor.selection.active
 
@@ -170,7 +170,7 @@ export const perform_code_at_cursor = async (params: {
 
       const cursor_listener = vscode.window.onDidChangeTextEditorSelection(
         () => {
-          cancel_token_source.cancel(
+          abort_controller.abort(
             t('command.code-at-cursor.cancel.cursor-moved')
           )
         }
@@ -185,9 +185,7 @@ export const perform_code_at_cursor = async (params: {
           },
           async (progress, token) => {
             token.onCancellationRequested(() => {
-              cancel_token_source.cancel(
-                t('command.code-at-cursor.cancel.user')
-              )
+              abort_controller.abort(t('command.code-at-cursor.cancel.user'))
             })
 
             progress.report({
@@ -198,7 +196,7 @@ export const perform_code_at_cursor = async (params: {
               endpoint_url,
               api_key: model_provider.api_key,
               body,
-              cancellation_token: cancel_token_source.token,
+              abort_signal: abort_controller.signal,
               on_chunk: () => {
                 progress.report({ message: t('common.progress.receiving') })
               },

apps/editor/src/features/commit-messages/utils/generate-commit-message-with-api.ts

@@ -36,7 +36,7 @@ export const generate_commit_message_with_api = async (params: {
 
   const token_count = Math.ceil(params.message.length / 4)
 
-  const cancel_token_source = axios.CancelToken.source()
+  const abort_controller = new AbortController()
 
   return await vscode.window.withProgress(
     {
@@ -46,7 +46,7 @@ export const generate_commit_message_with_api = async (params: {
     },
     async (progress, token) => {
       token.onCancellationRequested(() => {
-        cancel_token_source.cancel('Operation cancelled by user')
+        abort_controller.abort('Operation cancelled by user')
       })
 
       progress.report({
@@ -60,7 +60,7 @@ export const generate_commit_message_with_api = async (params: {
           endpoint_url: params.endpoint_url,
           api_key: params.model_provider.api_key,
           body,
-          cancellation_token: cancel_token_source.token,
+          abort_signal: abort_controller.signal,
           on_chunk: () => {
             progress.report({ message: t('common.progress.receiving') })
           },

apps/editor/src/features/search-files/utils/fetch-relevant-files-from-api.ts

@@ -52,7 +52,7 @@ export const fetch_relevant_files_from_api = async (
     reasoning_effort: selected_config.reasoning_effort
   })
 
-  const cancel_token_source = axios.CancelToken.source()
+  const abort_controller = new AbortController()
 
   try {
     const completion_result = await vscode.window.withProgress(
@@ -63,14 +63,14 @@ export const fetch_relevant_files_from_api = async (
       },
       async (progress, token) => {
         token.onCancellationRequested(() => {
-          cancel_token_source.cancel(t('feature.search-files.cancel.user'))
+          abort_controller.abort(t('feature.search-files.cancel.user'))
         })
         progress.report({ message: t('common.progress.waiting-for-server') })
         return await make_api_request({
           endpoint_url: model_provider.base_url,
           api_key: model_provider.api_key,
           body,
-          cancellation_token: cancel_token_source.token,
+          abort_signal: abort_controller.signal,
           on_chunk: () =>
             progress.report({ message: t('common.progress.receiving') }),
           on_thinking_chunk: () =>

apps/editor/src/services/api-manager.ts

@@ -1,14 +1,14 @@
 import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import { ApiManagerProvider } from '@/views/api-manager/backend/api-manager-provider'
 import { make_api_request } from '@/utils/make-api-request'
-import axios, { CancelTokenSource } from 'axios'
+import axios from 'axios'
 import { randomUUID, createHash } from 'crypto'
 import { Logger } from '@shared/utils/logger'
 
 const CHAIN_RESOLUTION_DELAY_MS = 5000
 
 export class ApiManager {
-  private cancel_token_sources: Map<string, CancelTokenSource> = new Map()
+  private abort_controllers: Map<string, AbortController> = new Map()
   private next_allowed_finish_time = 0
   private waiting_chain: Map<
     string,
@@ -35,8 +35,8 @@ export class ApiManager {
     reasoning_effort?: string
   }): Promise<{ response: string; thoughts?: string } | null> {
     const request_id = params.request_id || randomUUID()
-    const cancel_token_source = axios.CancelToken.source()
-    this.cancel_token_sources.set(request_id, cancel_token_source)
+    const abort_controller = new AbortController()
+    this.abort_controllers.set(request_id, abort_controller)
 
     const body_to_hash = JSON.parse(JSON.stringify(params.body))
     delete body_to_hash.reasoning_effort
@@ -91,13 +91,21 @@ export class ApiManager {
       })
 
       if (is_queued) {
-        if (cancel_token_source.token.reason) {
-          throw cancel_token_source.token.reason
+        if (abort_controller.signal.aborted) {
+          throw abort_controller.signal.reason
         }
-        await Promise.race([
-          previous_waiting.promise,
-          cancel_token_source.token.promise.then((c) => Promise.reject(c))
-        ])
+
+        const abort_promise = new Promise<void>((_, reject) => {
+          abort_controller.signal.addEventListener(
+            'abort',
+            () => {
+              reject(abort_controller.signal.reason)
+            },
+            { once: true }
+          )
+        })
+
+        await Promise.race([previous_waiting.promise, abort_promise])
 
         this.broadcast_message({
           command: 'SHOW_API_MANAGER_PROGRESS',
@@ -113,7 +121,7 @@ export class ApiManager {
         endpoint_url: params.endpoint_url,
         api_key: params.api_key,
         body: params.body,
-        cancellation_token: cancel_token_source.token,
+        abort_signal: abort_controller.signal,
         on_thinking_chunk: () => {
           schedule_chain_resolution()
           this.broadcast_message({
@@ -162,7 +170,7 @@ export class ApiManager {
         command: 'HIDE_API_MANAGER_PROGRESS',
         id: request_id
       })
-      this.cancel_token_sources.delete(request_id)
+      this.abort_controllers.delete(request_id)
 
       const now = Date.now()
       const wait_until = Math.max(now, this.next_allowed_finish_time)
@@ -176,17 +184,17 @@ export class ApiManager {
   }
 
   public cancel_api_call(request_id: string) {
-    const source = this.cancel_token_sources.get(request_id)
-    if (source) {
-      source.cancel('Cancelled by user.')
-      this.cancel_token_sources.delete(request_id)
+    const controller = this.abort_controllers.get(request_id)
+    if (controller) {
+      controller.abort('Cancelled by user.')
+      this.abort_controllers.delete(request_id)
     }
   }
 
   public cancel_all_requests() {
-    this.cancel_token_sources.forEach((source) => {
-      source.cancel('Cancelled by user.')
+    this.abort_controllers.forEach((controller) => {
+      controller.abort('Cancelled by user.')
     })
-    this.cancel_token_sources.clear()
+    this.abort_controllers.clear()
   }
 }

apps/editor/src/utils/intelligent-update-utils.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import axios, { CancelToken } from 'axios'
+import axios from 'axios'
 import {
   ModelProvidersManager,
   ApiConfiguration,
@@ -108,7 +108,7 @@ export const process_file = async (params: {
   file_path: string
   file_content: string
   instruction: string
-  cancel_token?: CancelToken
+  abort_signal?: AbortSignal
   on_chunk?: (tokens_per_second: number, total_tokens: number) => void
   on_thinking_chunk?: (text: string) => void
 }): Promise<string> => {
@@ -144,7 +144,7 @@ export const process_file = async (params: {
       endpoint_url: params.endpoint_url,
       api_key: params.api_key,
       body,
-      cancellation_token: params.cancel_token,
+      abort_signal: params.abort_signal,
       on_chunk: params.on_chunk,
       on_thinking_chunk: params.on_thinking_chunk,
       rethrow_error: true

apps/editor/src/utils/make-api-request.ts

@@ -72,7 +72,7 @@ export const make_api_request = async (params: {
   endpoint_url: string
   api_key?: string
   body: any
-  cancellation_token: any
+  abort_signal?: AbortSignal
   on_chunk?: StreamCallback
   on_thinking_chunk?: ThinkingStreamCallback
   rethrow_error?: boolean
@@ -257,7 +257,7 @@ export const make_api_request = async (params: {
       try {
         response = await axios.post(request_url, request_body, {
           headers,
-          cancelToken: params.cancellation_token,
+          signal: params.abort_signal,
           responseType: 'stream'
         })
         break
@@ -398,8 +398,8 @@ export const make_api_request = async (params: {
       })
     })
   } catch (error) {
-    if (params.cancellation_token?.reason) {
-      throw params.cancellation_token.reason
+    if (params.abort_signal?.aborted) {
+      throw error
     }
 
     if (axios.isCancel(error)) {

apps/editor/src/views/panel/backend/message-handlers/handle-cancel-intelligent-update-file-in-preview.ts

@@ -10,17 +10,17 @@ export const handle_cancel_intelligent_update_file_in_preview = (
   const { file_path, workspace_name } = message
 
   const source_index =
-    panel_provider.intelligent_update_cancel_token_sources.findIndex(
+    panel_provider.intelligent_update_abort_controllers.findIndex(
       (s) => s.file_path === file_path && s.workspace_name === workspace_name
     )
 
   if (source_index > -1) {
-    const { source } =
-      panel_provider.intelligent_update_cancel_token_sources[source_index]
+    const { controller } =
+      panel_provider.intelligent_update_abort_controllers[source_index]
 
-    source.cancel('User cancelled the operation')
+    controller.abort('User cancelled the operation')
 
-    panel_provider.intelligent_update_cancel_token_sources.splice(
+    panel_provider.intelligent_update_abort_controllers.splice(
       source_index,
 
       1

apps/editor/src/views/panel/backend/message-handlers/handle-fix-all-failed-files.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import axios, { CancelTokenSource } from 'axios'
+import axios from 'axios'
 import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import {
   LAST_APPLIED_CHANGES_STATE_KEY,
@@ -126,7 +126,7 @@ export const handle_fix_all_failed_files = async (params: {
     })
     .filter((item) => item.instructions && item.safe_path)
 
-  const batch_cancel_sources: CancelTokenSource[] = []
+  const batch_abort_controllers: AbortController[] = []
 
   try {
     await Promise.all(
@@ -136,11 +136,11 @@ export const handle_fix_all_failed_files = async (params: {
         const file_path = file_state.file_path
         const workspace_name = file_state.workspace_name
 
-        const cancel_token_source = axios.CancelToken.source()
-        batch_cancel_sources.push(cancel_token_source)
+        const abort_controller = new AbortController()
+        batch_abort_controllers.push(abort_controller)
 
-        params.panel_provider.intelligent_update_cancel_token_sources.push({
-          source: cancel_token_source,
+        params.panel_provider.intelligent_update_abort_controllers.push({
+          controller: abort_controller,
           file_path,
           workspace_name
         })
@@ -198,7 +198,7 @@ export const handle_fix_all_failed_files = async (params: {
             file_path: file_path,
             file_content: file_state.content,
             instruction: instructions,
-            cancel_token: cancel_token_source.token,
+            abort_signal: abort_controller.signal,
             on_chunk,
             on_thinking_chunk
           })
@@ -253,8 +253,8 @@ export const handle_fix_all_failed_files = async (params: {
               data: { error, file_path }
             })
 
-            batch_cancel_sources.forEach((source) => {
-              source.cancel(
+            batch_abort_controllers.forEach((controller) => {
+              controller.abort(
                 'Batch operation failed, triggering configuration selection.'
               )
             })
@@ -276,11 +276,11 @@ export const handle_fix_all_failed_files = async (params: {
           })
 
           const index =
-            params.panel_provider.intelligent_update_cancel_token_sources.findIndex(
-              (s) => s.source === cancel_token_source
+            params.panel_provider.intelligent_update_abort_controllers.findIndex(
+              (s) => s.controller === abort_controller
             )
           if (index > -1) {
-            params.panel_provider.intelligent_update_cancel_token_sources.splice(
+            params.panel_provider.intelligent_update_abort_controllers.splice(
               index,
               1
             )