Simplifying? Kinda?

Author: bwateratmsft

src/tree/images/imageChecker/OutdatedImageChecker.ts

@@ -107,10 +107,8 @@ export class OutdatedImageChecker {
     private async getLatestImageDigest(registry: ImageRegistry, repo: string, tag: string): Promise<string> {
         const manifestResponse = await httpRequest(`${registry.baseUrl}/${repo}/manifests/${tag}`, this.defaultRequestOptions, async (request) => {
             if (registry.signRequest) {
-                return registry.signRequest(request, `repository:library/${repo}:pull`);
+                await registry.signRequest(request, `repository:library/${repo}:pull`);
             }
-
-            return request;
         });
 
         return manifestResponse.headers.get('docker-content-digest') as string;

src/tree/images/imageChecker/registries.ts

@@ -6,13 +6,13 @@
 import { ImageNameInfo } from '@microsoft/vscode-container-client';
 import { URL } from 'url';
 import { ociClientId } from '../../../constants';
-import { HttpErrorResponse, IOAuthContext, RequestLike, RequestOptionsLike, bearerAuthHeader, getWwwAuthenticateContext, httpRequest } from '../../../utils/httpRequest';
+import { HttpErrorResponse, IOAuthContext, RequestOptionsLike, bearerAuthHeader, getWwwAuthenticateContext, httpRequest } from '../../../utils/httpRequest';
 import { NormalizedImageNameInfo } from '../NormalizedImageNameInfo';
 
 export interface ImageRegistry {
     isMatch: (imageNameInfo: ImageNameInfo) => boolean;
     baseUrl: string;
-    signRequest?(request: RequestLike, scope: string): Promise<RequestLike>;
+    signRequest?(request: RequestOptionsLike, scope: string): Promise<void>;
 }
 
 let dockerHubAuthContext: IOAuthContext | undefined;
@@ -24,7 +24,7 @@ export const registries: ImageRegistry[] = [
             return !!imageNameInfo.originalName && normalizedImageNameInfo.normalizedRegistry === 'docker.io' && normalizedImageNameInfo.normalizedNamespace === 'library';
         },
         baseUrl: 'https://registry-1.docker.io/v2/library',
-        signRequest: async (request: RequestLike, scope: string): Promise<RequestLike> => {
+        signRequest: async (request: RequestOptionsLike, scope: string): Promise<void> => {
             if (!dockerHubAuthContext) {
                 try {
                     const options: RequestOptionsLike = {
@@ -59,8 +59,7 @@ export const registries: ImageRegistry[] = [
             const tokenResponse = await httpRequest<{ token: string }>(url.toString(), authRequestOptions);
             const token = (await tokenResponse.json()).token;
 
-            request.headers.set('Authorization', bearerAuthHeader(token));
-            return request;
+            request.headers['Authorization'] = bearerAuthHeader(token);
         }
     },
     {

src/utils/httpRequest.ts

@@ -16,22 +16,25 @@ export const enum ErrorHandling {
 export async function httpRequest<T>(
     url: string,
     options?: RequestOptionsLike,
-    signRequest?: (request: RequestLike) => Promise<RequestLike>,
+    signRequest?: (request: RequestOptionsLike) => Promise<void>,
     errorHandling: ErrorHandling = ErrorHandling.ThrowOnError
 ): Promise<HttpResponse<T>> {
-    const requestOptions: RequestInit = options;
+    const requestOptions: RequestInit = { ...options };
     if (options?.form) {
         // URLSearchParams is a silly way to say "it's form data"
         requestOptions.body = new URLSearchParams(options.form);
     }
 
-    let request = new Request(url, requestOptions ?? {});
+    if (!!requestOptions.body && requestOptions.duplex === undefined) {
+        // node-fetch requires the "duplex" option to be set to "half" in order to send a body
+        requestOptions.duplex = 'half';
+    }
 
     if (signRequest) {
-        request = await signRequest(request) as Request;
+        await signRequest(requestOptions as RequestOptionsLike);
     }
 
-    const response = await fetch(request);
+    const response = await fetch(url, requestOptions);
 
     if (errorHandling === ErrorHandling.ReturnErrorResponse || response.ok) {
         return new HttpResponse(response, url);
@@ -105,18 +108,12 @@ export const enum HttpStatusCode {
 }
 
 export interface RequestOptionsLike {
-    headers?: { [key: string]: string };
+    headers?: { [key: string]: readonly string[] | string };
     method?: RequestMethod; // This is an enum type because it enforces the above valid options on callers (which do not directly use node-fetch's Request object)
     form?: { [key: string]: string };
     body?: string;
 }
 
-export interface RequestLike {
-    url: string;
-    headers: HeadersLike;
-    method: string; // This is a string because node-fetch's Request defines it as such
-}
-
 export interface HeadersLike {
     get(header: string): string | string[];
     set(header: string, value: string): void;