Merge remote-tracking branch 'origin/master' into HEAD

Author: jpinkney-aws

packages/core/src/dev/activation.ts

@@ -24,6 +24,7 @@ import { getSessionId } from '../shared/telemetry/util'
 import { NotificationsController } from '../notifications/controller'
 import { DevNotificationsState } from '../notifications/types'
 import { QuickPickItem } from 'vscode'
+import { ChildProcess } from '../shared/utilities/processUtils'
 
 interface MenuOption {
     readonly label: string
@@ -44,6 +45,7 @@ export type DevFunction =
     | 'editAuthConnections'
     | 'notificationsSend'
     | 'forceIdeCrash'
+    | 'startChildProcess'
 
 export type DevOptions = {
     context: vscode.ExtensionContext
@@ -126,6 +128,11 @@ const menuOptions: () => Record<DevFunction, MenuOption> = () => {
             detail: `Will SIGKILL ExtHost, { pid: ${process.pid}, sessionId: '${getSessionId().slice(0, 8)}-...' }, but the IDE itself will not crash.`,
             executor: forceQuitIde,
         },
+        startChildProcess: {
+            label: 'ChildProcess: Start child process',
+            detail: 'Start ChildProcess from our utility wrapper for testing',
+            executor: startChildProcess,
+        },
     }
 }
 
@@ -578,3 +585,15 @@ async function editNotifications() {
         await targetNotificationsController.pollForEmergencies()
     })
 }
+
+async function startChildProcess() {
+    const result = await createInputBox({
+        title: 'Enter a command',
+    }).prompt()
+    if (result) {
+        const [command, ...args] = result?.toString().split(' ') ?? []
+        getLogger().info(`Starting child process: '${command}'`)
+        const processResult = await ChildProcess.run(command, args, { collect: true })
+        getLogger().info(`Child process exited with code ${processResult.exitCode}`)
+    }
+}

packages/core/src/lambda/commands/downloadLambda.ts

@@ -14,7 +14,7 @@ import { LaunchConfiguration, getReferencedHandlerPaths } from '../../shared/deb
 import { makeTemporaryToolkitFolder, fileExists, tryRemoveFolder } from '../../shared/filesystemUtilities'
 import * as localizedText from '../../shared/localizedText'
 import { getLogger } from '../../shared/logger'
-import { HttpResourceFetcher } from '../../shared/resourcefetcher/httpResourceFetcher'
+import { HttpResourceFetcher } from '../../shared/resourcefetcher/node/httpResourceFetcher'
 import { createCodeAwsSamDebugConfig } from '../../shared/sam/debugger/awsSamDebugConfiguration'
 import * as pathutils from '../../shared/utilities/pathUtils'
 import { localize } from '../../shared/utilities/vsCodeUtils'

packages/core/src/shared/logger/logger.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 
-export type LogTopic = 'crashMonitoring' | 'dev/beta' | 'notifications' | 'test' | 'unknown' | 'lsp'
+export type LogTopic = 'crashMonitoring' | 'dev/beta' | 'notifications' | 'test' | 'childProcess' | 'lsp' | 'unknown'
 
 class ErrorLog {
     constructor(

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

@@ -3,40 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs' // eslint-disable-line no-restricted-imports
-import * as http from 'http'
-import * as https from 'https'
-import * as stream from 'stream'
-import got, { Response, RequestError, CancelError } from 'got'
-import urlToOptions from 'got/dist/source/core/utils/url-to-options'
-import Request from 'got/dist/source/core'
 import { VSCODE_EXTENSION_ID } from '../extensions'
 import { getLogger, Logger } from '../logger'
 import { ResourceFetcher } from './resourcefetcher'
-import { Timeout, CancellationError, CancelEvent } from '../utilities/timeoutUtils'
-import { isCloud9 } from '../extensionUtilities'
-import { Headers } from 'got/dist/source/core'
+import { Timeout, CancelEvent } from '../utilities/timeoutUtils'
+import request, { RequestError } from '../request'
 import { withRetries } from '../utilities/functionUtils'
 
-// XXX: patched Got module for compatability with older VS Code versions (e.g. Cloud9)
-// `got` has also deprecated `urlToOptions`
-const patchedGot = got.extend({
-    request: (url, options, callback) => {
-        if (url.protocol === 'https:') {
-            return https.request({ ...options, ...urlToOptions(url) }, callback)
-        }
-        return http.request({ ...options, ...urlToOptions(url) }, callback)
-    },
-})
-
-/** Promise that resolves/rejects when all streams close. Can also access streams directly. */
-type FetcherResult = Promise<void> & {
-    /** Download stream piped to `fsStream`. */
-    requestStream: Request // `got` doesn't add the correct types to 'on' for some reason
-    /** Stream writing to the file system. */
-    fsStream: fs.WriteStream
-}
-
 type RequestHeaders = { eTag?: string; gZip?: boolean }
 
 export class HttpResourceFetcher implements ResourceFetcher {
@@ -66,20 +39,8 @@ export class HttpResourceFetcher implements ResourceFetcher {
      *
      * @param pipeLocation Optionally pipe the download to a file system location
      */
-    public get(): Promise<string | undefined>
-    public get(pipeLocation: string): FetcherResult
-    public get(pipeLocation?: string): Promise<string | undefined> | FetcherResult {
+    public get(): Promise<string | undefined> {
         this.logger.verbose(`downloading: ${this.logText()}`)
-
-        if (pipeLocation) {
-            const result = this.pipeGetRequest(pipeLocation, this.params.timeout)
-            result.fsStream.on('exit', () => {
-                this.logger.verbose(`downloaded: ${this.logText()}`)
-            })
-
-            return result
-        }
-
         return this.downloadRequest()
     }
 
@@ -95,15 +56,15 @@ export class HttpResourceFetcher implements ResourceFetcher {
     public async getNewETagContent(eTag?: string): Promise<{ content?: string; eTag: string }> {
         const response = await this.getResponseFromGetRequest(this.params.timeout, { eTag, gZip: true })
 
-        const eTagResponse = response.headers.etag
+        const eTagResponse = response.headers.get('etag')
         if (!eTagResponse) {
             throw new Error(`This URL does not support E-Tags. Cannot use this function for: ${this.url.toString()}`)
         }
 
         // NOTE: Even with use of `gzip` encoding header, the response content is uncompressed.
         // Most likely due to the http request library uncompressing it for us.
-        let contents: string | undefined = response.body.toString()
-        if (response.statusCode === 304) {
+        let contents: string | undefined = await response.text()
+        if (response.status === 304) {
             // Explanation: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-None-Match
             contents = undefined
             this.logger.verbose(`E-Tag, ${eTagResponse}, matched. No content downloaded from: ${this.url}`)
@@ -120,7 +81,8 @@ export class HttpResourceFetcher implements ResourceFetcher {
     private async downloadRequest(): Promise<string | undefined> {
         try {
             // HACK(?): receiving JSON as a string without `toString` makes it so we can't deserialize later
-            const contents = (await this.getResponseFromGetRequest(this.params.timeout)).body.toString()
+            const resp = await this.getResponseFromGetRequest(this.params.timeout)
+            const contents = (await resp.text()).toString()
             if (this.params.onSuccess) {
                 this.params.onSuccess(contents)
             }
@@ -129,10 +91,10 @@ export class HttpResourceFetcher implements ResourceFetcher {
 
             return contents
         } catch (err) {
-            const error = err as CancelError | RequestError
+            const error = err as RequestError
             this.logger.verbose(
                 `Error downloading ${this.logText()}: %s`,
-                error.message ?? error.code ?? error.response?.statusMessage ?? error.response?.statusCode
+                error.message ?? error.code ?? error.response.statusText ?? error.response.status
             )
             return undefined
         }
@@ -146,56 +108,30 @@ export class HttpResourceFetcher implements ResourceFetcher {
         getLogger().debug(`Download for "${this.logText()}" ${event.agent === 'user' ? 'cancelled' : 'timed out'}`)
     }
 
-    // TODO: make pipeLocation a vscode.Uri
-    private pipeGetRequest(pipeLocation: string, timeout?: Timeout): FetcherResult {
-        const requester = isCloud9() ? patchedGot : got
-        const requestStream = requester.stream(this.url, { headers: this.buildRequestHeaders() })
-        const fsStream = fs.createWriteStream(pipeLocation)
-
-        const done = new Promise<void>((resolve, reject) => {
-            const pipe = stream.pipeline(requestStream, fsStream, (err) => {
-                if (err instanceof RequestError) {
-                    return reject(Object.assign(new Error('Failed to download file'), { code: err.code }))
-                }
-                err ? reject(err) : resolve()
-            })
-
-            const cancelListener = timeout?.token.onCancellationRequested((event) => {
-                this.logCancellation(event)
-                pipe.destroy(new CancellationError(event.agent))
-            })
-
-            pipe.on('close', () => cancelListener?.dispose())
-        })
-
-        return Object.assign(done, { requestStream, fsStream })
-    }
-
-    private async getResponseFromGetRequest(timeout?: Timeout, headers?: RequestHeaders): Promise<Response<string>> {
-        const requester = isCloud9() ? patchedGot : got
-        const promise = requester(this.url, {
+    private async getResponseFromGetRequest(timeout?: Timeout, headers?: RequestHeaders): Promise<Response> {
+        const req = request.fetch('GET', this.url, {
             headers: this.buildRequestHeaders(headers),
         })
 
         const cancelListener = timeout?.token.onCancellationRequested((event) => {
             this.logCancellation(event)
-            promise.cancel(new CancellationError(event.agent).message)
+            req.cancel()
         })
 
-        return promise.finally(() => cancelListener?.dispose())
+        return req.response.finally(() => cancelListener?.dispose())
     }
 
     private buildRequestHeaders(requestHeaders?: RequestHeaders): Headers {
-        const headers: Headers = {}
+        const headers = new Headers()
 
-        headers['User-Agent'] = VSCODE_EXTENSION_ID.awstoolkit
+        headers.set('User-Agent', VSCODE_EXTENSION_ID.awstoolkit)
 
         if (requestHeaders?.eTag !== undefined) {
-            headers['If-None-Match'] = requestHeaders.eTag
+            headers.set('If-None-Match', requestHeaders.eTag)
         }
 
         if (requestHeaders?.gZip) {
-            headers['Accept-Encoding'] = 'gzip'
+            headers.set('Accept-Encoding', 'gzip')
         }
 
         return headers

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

@@ -0,0 +1,129 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import * as http from 'http'
+import * as https from 'https'
+import * as stream from 'stream'
+import got, { RequestError } from 'got'
+import urlToOptions from 'got/dist/source/core/utils/url-to-options'
+import Request from 'got/dist/source/core'
+import { VSCODE_EXTENSION_ID } from '../../extensions'
+import { getLogger, Logger } from '../../logger'
+import { Timeout, CancellationError, CancelEvent } from '../../utilities/timeoutUtils'
+import { isCloud9 } from '../../extensionUtilities'
+import { Headers } from 'got/dist/source/core'
+
+// XXX: patched Got module for compatability with older VS Code versions (e.g. Cloud9)
+// `got` has also deprecated `urlToOptions`
+const patchedGot = got.extend({
+    request: (url, options, callback) => {
+        if (url.protocol === 'https:') {
+            return https.request({ ...options, ...urlToOptions(url) }, callback)
+        }
+        return http.request({ ...options, ...urlToOptions(url) }, callback)
+    },
+})
+
+/** Promise that resolves/rejects when all streams close. Can also access streams directly. */
+type FetcherResult = Promise<void> & {
+    /** Download stream piped to `fsStream`. */
+    requestStream: Request // `got` doesn't add the correct types to 'on' for some reason
+    /** Stream writing to the file system. */
+    fsStream: fs.WriteStream
+}
+
+type RequestHeaders = { eTag?: string; gZip?: boolean }
+
+/**
+ * Legacy HTTP Resource Fetcher used specifically for streaming information.
+ * Only kept around until web streams are compatible with node streams
+ */
+export class HttpResourceFetcher {
+    private readonly logger: Logger = getLogger()
+
+    /**
+     *
+     * @param url URL to fetch a response body from via the `get` call
+     * @param params Additional params for the fetcher
+     * @param {boolean} params.showUrl Whether or not to the URL in log statements.
+     * @param {string} params.friendlyName If URL is not shown, replaces the URL with this text.
+     * @param {function} params.onSuccess Function to execute on successful request. No effect if piping to a location.
+     * @param {Timeout} params.timeout Timeout token to abort/cancel the request. Similar to `AbortSignal`.
+     */
+    public constructor(
+        private readonly url: string,
+        private readonly params: {
+            showUrl: boolean
+            friendlyName?: string
+            timeout?: Timeout
+        }
+    ) {}
+
+    /**
+     * Returns the contents of the resource, or undefined if the resource could not be retrieved.
+     *
+     * @param pipeLocation Optionally pipe the download to a file system location
+     */
+    public get(pipeLocation: string): FetcherResult {
+        this.logger.verbose(`downloading: ${this.logText()}`)
+
+        const result = this.pipeGetRequest(pipeLocation, this.params.timeout)
+        result.fsStream.on('exit', () => {
+            this.logger.verbose(`downloaded: ${this.logText()}`)
+        })
+
+        return result
+    }
+
+    private logText(): string {
+        return this.params.showUrl ? this.url : (this.params.friendlyName ?? 'resource from URL')
+    }
+
+    private logCancellation(event: CancelEvent) {
+        getLogger().debug(`Download for "${this.logText()}" ${event.agent === 'user' ? 'cancelled' : 'timed out'}`)
+    }
+
+    // TODO: make pipeLocation a vscode.Uri
+    private pipeGetRequest(pipeLocation: string, timeout?: Timeout): FetcherResult {
+        const requester = isCloud9() ? patchedGot : got
+        const requestStream = requester.stream(this.url, { headers: this.buildRequestHeaders() })
+        const fsStream = fs.createWriteStream(pipeLocation)
+
+        const done = new Promise<void>((resolve, reject) => {
+            const pipe = stream.pipeline(requestStream, fsStream, (err) => {
+                if (err instanceof RequestError) {
+                    return reject(Object.assign(new Error('Failed to download file'), { code: err.code }))
+                }
+                err ? reject(err) : resolve()
+            })
+
+            const cancelListener = timeout?.token.onCancellationRequested((event) => {
+                this.logCancellation(event)
+                pipe.destroy(new CancellationError(event.agent))
+            })
+
+            pipe.on('close', () => cancelListener?.dispose())
+        })
+
+        return Object.assign(done, { requestStream, fsStream })
+    }
+
+    private buildRequestHeaders(requestHeaders?: RequestHeaders): Headers {
+        const headers: Headers = {}
+
+        headers['User-Agent'] = VSCODE_EXTENSION_ID.awstoolkit
+
+        if (requestHeaders?.eTag !== undefined) {
+            headers['If-None-Match'] = requestHeaders.eTag
+        }
+
+        if (requestHeaders?.gZip) {
+            headers['Accept-Encoding'] = 'gzip'
+        }
+
+        return headers
+    }
+}

packages/core/src/shared/utilities/cliUtils.ts

@@ -11,7 +11,7 @@ import * as vscode from 'vscode'
 import { getIdeProperties } from '../extensionUtilities'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../filesystemUtilities'
 import { getLogger } from '../logger'
-import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
+import { HttpResourceFetcher } from '../resourcefetcher/node/httpResourceFetcher'
 import { ChildProcess } from './processUtils'
 
 import * as nls from 'vscode-nls'

packages/core/src/shared/utilities/pollingSet.ts

@@ -44,9 +44,14 @@ export class PollingSet<T> extends Set<T> {
             this.clearTimer()
         }
     }
-
+    // TODO(hkobew): Overwrite the add method instead of adding seperate method. If we add item to set, timer should always start.
     public start(id: T): void {
         this.add(id)
         this.pollTimer = this.pollTimer ?? globals.clock.setInterval(() => this.poll(), this.interval)
     }
+
+    public override clear(): void {
+        this.clearTimer()
+        super.clear()
+    }
 }