refactor(core): Manifest/LSP fetching should use httpResourceFetcher

Author: jpinkney-aws

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

@@ -12,7 +12,9 @@ import AdmZip from 'adm-zip'
 import { TargetContent, logger, LspResult, LspVersion, Manifest } from './types'
 import { getApplicationSupportFolder } from '../vscode/env'
 import { createHash } from '../crypto'
-import request from '../request'
+import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
+
+const lspFetchRetries = 3
 
 export class LanguageServerResolver {
     constructor(
@@ -165,9 +167,8 @@ export class LanguageServerResolver {
         }
 
         const downloadTasks = contents.map(async (content) => {
-            // TODO This should be using the retryable http library but it doesn't seem to support zips right now
-            const res = await request.fetch('GET', content.url).response
-            if (!res.ok || !res.body) {
+            const res = await new HttpResourceFetcher(content.url, { showUrl: true, retries: lspFetchRetries }).get()
+            if (!res || !res.ok || !res.body) {
                 return false
             }
 

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

@@ -5,10 +5,10 @@
 
 import { getLogger } from '../logger/logger'
 import { ToolkitError } from '../errors'
-import { RetryableResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
 import { Timeout } from '../utilities/timeoutUtils'
 import globals from '../extensionGlobals'
 import { Manifest } from './types'
+import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
 
 const logger = getLogger('lsp')
 
@@ -21,6 +21,7 @@ type ManifestStorage = Record<string, StorageManifest>
 
 const manifestStorageKey = 'aws.toolkit.lsp.manifest'
 const manifestTimeoutMs = 15000
+const manifestFetchRetries = 3
 
 export class ManifestResolver {
     constructor(
@@ -40,14 +41,12 @@ export class ManifestResolver {
     }
 
     private async fetchRemoteManifest(): Promise<Manifest> {
-        const resourceFetcher = new RetryableResourceFetcher({
-            resource: this.manifestURL,
-            params: {
-                timeout: new Timeout(manifestTimeoutMs),
-            },
-        })
+        const resp = await new HttpResourceFetcher(this.manifestURL, {
+            showUrl: true,
+            timeout: new Timeout(manifestTimeoutMs),
+            retries: manifestFetchRetries,
+        }).getNewETagContent(this.getEtag())
 
-        const resp = await resourceFetcher.getNewETagContent(this.getEtag())
         if (!resp.content) {
             throw new ToolkitError('New content was not downloaded; fallback to the locally stored manifest')
         }

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

@@ -134,50 +134,6 @@ export class HttpResourceFetcher implements ResourceFetcher<Response> {
     }
 }
 
-export class RetryableResourceFetcher extends HttpResourceFetcher {
-    private readonly retryNumber: number
-    private readonly retryIntervalMs: number
-    private readonly resource: string
-
-    constructor({
-        resource,
-        params: { retryNumber = 5, retryIntervalMs = 3000, showUrl = true, timeout = new Timeout(5000) },
-    }: {
-        resource: string
-        params: {
-            retryNumber?: number
-            retryIntervalMs?: number
-            showUrl?: boolean
-            timeout?: Timeout
-        }
-    }) {
-        super(resource, {
-            showUrl,
-            timeout,
-        })
-        this.retryNumber = retryNumber
-        this.retryIntervalMs = retryIntervalMs
-        this.resource = resource
-    }
-
-    fetch(versionTag?: string) {
-        return withRetries(
-            async () => {
-                try {
-                    return await this.getNewETagContent(versionTag)
-                } catch (err) {
-                    getLogger('lsp').error('Failed to fetch at endpoint: %s, err: %s', this.resource, err)
-                    throw err
-                }
-            },
-            {
-                maxRetries: this.retryNumber,
-                delay: this.retryIntervalMs,
-            }
-        )
-    }
-}
-
 /**
  * Retrieves JSON property value from a remote resource
  * @param property property to retrieve