wrap request cancelled error in isUserCancelledError

Author: tomzu

packages/core/src/shared/errors.ts

@@ -16,6 +16,7 @@ import { CodeWhispererStreamingServiceException } from '@amzn/codewhisperer-stre
 import { driveLetterRegex } from './utilities/pathUtils'
 import { getLogger } from './logger/logger'
 import { crashMonitoringDirName } from './constants'
+import { RequestCancelledError } from './request'
 
 let _username = 'unknown-user'
 let _isAutomation = false
@@ -618,7 +619,11 @@ function hasTime(error: Error): error is typeof error & { time: Date } {
 }
 
 export function isUserCancelledError(error: unknown): boolean {
-    return CancellationError.isUserCancelled(error) || (error instanceof ToolkitError && error.cancelled)
+    return (
+        CancellationError.isUserCancelled(error) ||
+        (error instanceof ToolkitError && error.cancelled) ||
+        error instanceof RequestCancelledError
+    )
 }
 
 /**

packages/core/src/shared/lsp/lspResolver.ts

@@ -15,8 +15,7 @@ import { createHash } from '../crypto'
 import { lspSetupStage, StageResolver, tryStageResolvers } from './utils/setupStage'
 import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
 import { showMessageWithCancel } from '../../shared/utilities/messages'
-import { CancellationError, Timeout } from '../utilities/timeoutUtils'
-import { RequestCancelledError } from '../request'
+import { Timeout } from '../utilities/timeoutUtils'
 
 // max timeout for downloading remote LSP assets progress, the lowest possible is 3000, bounded by httpResourceFetcher's waitUntil
 const remoteDownloadTimeout = 5000
@@ -114,11 +113,6 @@ export class LanguageServerResolver {
             } else {
                 throw new ToolkitError('Failed to download server from remote', { code: 'RemoteDownloadFailed' })
             }
-        } catch (err) {
-            if (err instanceof RequestCancelledError) {
-                throw new CancellationError('user')
-            }
-            throw err
         } finally {
             timeout.dispose()
         }

packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts

@@ -7,7 +7,8 @@ import { VSCODE_EXTENSION_ID } from '../extensions'
 import { getLogger, Logger } from '../logger/logger'
 import { ResourceFetcher } from './resourcefetcher'
 import { Timeout, CancelEvent, waitUntil } from '../utilities/timeoutUtils'
-import request, { RequestCancelledError, RequestError } from '../request'
+import request, { RequestError } from '../request'
+import { isUserCancelledError } from '../errors'
 
 type RequestHeaders = { eTag?: string; gZip?: boolean }
 
@@ -120,8 +121,8 @@ export class HttpResourceFetcher implements ResourceFetcher<Response> {
                 interval: 100,
                 backoff: 2,
                 retryOnFail: (error: Error) => {
-                    // retry unless we got an user cancellation error
-                    return !(error instanceof RequestCancelledError)
+                    // Retry unless the user intentionally canceled the operation.
+                    return !isUserCancelledError(error)
                 },
             }
         )