resolved merge conflict

Author: ejahnGithub

package-lock.json

@@ -1,5 +1,5 @@
 import nock from 'nock';
-import { Fetcher } from '../requestsFetcher';
+import { Fetcher } from '../fetcher';
 
 describe('Fetcher Test', () => {
   const baseURL = 'http://localhost:8080';

src/__tests__/fetcher.test.ts

@@ -1,6 +1,7 @@
-import { DownloadLengthMismatchError } from './error';
+import fetch from 'make-fetch-happen';
+import { DownloadHTTPError, DownloadLengthMismatchError } from './error';
 
-export abstract class FetcherInterface {
+export abstract class BaseFetcher {
   protected timeout?: number;
 
   constructor(timeout?: number) {
@@ -30,3 +31,19 @@ export abstract class FetcherInterface {
     return Buffer.concat(chunks);
   }
 }
+
+export class Fetcher extends BaseFetcher {
+  constructor(timeout?: number) {
+    super(timeout);
+  }
+
+  public override async fetch(url: string): Promise<NodeJS.ReadableStream> {
+    const response = await fetch(url, { timeout: this.timeout });
+
+    if (!response.ok || !response?.body) {
+      throw new DownloadHTTPError('Failed to download', response.status);
+    }
+
+    return response.body;
+  }
+}

src/fetcher.ts

@@ -1,2 +1,2 @@
-export { FetcherInterface } from './fetcher';
+export { BaseFetcher } from './fetcher';
 export { Updater } from './updater';

src/index.ts

@@ -15,7 +15,7 @@ type TrustedSet = {
   targets?: Metadata<Targets>;
 } & { [key: string]: Metadata<Targets> };
 
-export class TrustedMetadataSet {
+export class TrustedMetadataStore {
   private trustedSet: TrustedSet = {};
   private referenceTime: Date;
 

src/requestsFetcher.ts

@@ -1,11 +1,10 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { EqualVersionError, ValueError } from './error';
-import { FetcherInterface } from './fetcher';
+import { BaseFetcher, Fetcher } from './fetcher';
 import { Metadata, Targets } from './models';
 import { TargetFile } from './models/file';
-import { Fetcher } from './requestsFetcher';
-import { TrustedMetadataSet } from './trusted_metadata_set';
+import { TrustedMetadataStore } from './store';
 import { Config, defaultConfig } from './utils/config';
 import { MetadataKind } from './utils/types';
 
@@ -14,7 +13,7 @@ interface UpdaterOptions {
   metadataBaseUrl: string;
   targetDir?: string;
   targetBaseUrl?: string;
-  fetcher?: FetcherInterface;
+  fetcher?: BaseFetcher;
   config?: Config;
 }
 
@@ -28,9 +27,9 @@ export class Updater {
   private metadataBaseUrl: string;
   private targetDir?: string;
   private targetBaseUrl?: string;
-  private trustedSet: TrustedMetadataSet;
+  private trustedSet: TrustedMetadataStore;
   private config: Config;
-  private fetcher: FetcherInterface;
+  private fetcher: BaseFetcher;
 
   constructor(options: UpdaterOptions) {
     const {
@@ -49,8 +48,8 @@ export class Updater {
     this.targetBaseUrl = targetBaseUrl;
 
     const data = this.loadLocalMetadata(MetadataKind.Root);
-    this.trustedSet = new TrustedMetadataSet(data);
 
+    this.trustedSet = new TrustedMetadataStore(data);
     this.config = { ...defaultConfig, ...config };
     this.fetcher = fetcher || new Fetcher(this.config.fetchTimeout);
   }
@@ -212,34 +211,12 @@ export class Updater {
     return this.trustedSet.getRole(role);
   }
 
+  // Returns the TargetFile instance with information for the given target path.
+  //
+  // Implicitly calls refresh if it hasn't already been called.
   public async getTargetInfo(
     targetPath: string
   ): Promise<TargetFile | undefined> {
-    /***
-     * Returns ``TargetFile`` instance with information for ``target_path``.
-
-    The return value can be used as an argument to
-    ``download_target()`` and ``find_cached_target()``.
-
-    If ``refresh()`` has not been called before calling
-    ``get_targetinfo()``, the refresh will be done implicitly.
-
-    As a side-effect this method downloads all the additional (delegated
-    targets) metadata it needs to return the target information.
-
-    Args:
-        target_path: `path-relative-URL string
-            <https://url.spec.whatwg.org/#path-relative-url-string>`_
-            that uniquely identifies the target within the repository.
-
-    Raises:
-        OSError: New metadata could not be written to disk
-        RepositoryError: Metadata failed to verify in some way
-        DownloadError: Download of a metadata file failed in some way
-
-    Returns:
-        ``TargetFile`` instance or ``None``.
-    ***/
     if (!this.trustedSet.targets) {
       this.refresh();
     }