Unit tests for registry clients

src/errors/InvalidPackageError.ts

@@ -1,5 +1,8 @@
 export class InvalidPackageError extends Error {
-  constructor(public packagePath: string, public reason: string) {
+  constructor(
+    public packagePath: string,
+    public reason: string
+  ) {
     super(`The package at ${packagePath} is not a valid FHIR package: ${reason}.`);
   }
 }

src/errors/InvalidResourceError.ts

@@ -1,5 +1,8 @@
 export class InvalidResourceError extends Error {
-  constructor(public resourcePath: string, public reason: string) {
+  constructor(
+    public resourcePath: string,
+    public reason: string
+  ) {
     super(`The resource at ${resourcePath} is not a valid FHIR resource: ${reason}.`);
   }
 }

src/registry/NPMRegistryClient.ts

@@ -14,9 +14,14 @@ export class NPMRegistryClient implements RegistryClient {
 
   async download(name: string, version: string): Promise<Readable> {
     // Get the manifest information about the package from the registry
-    const manifestRes = await axiosGet(`${this.endpoint}/${name}`);
-    // Find the NPM tarball location in the manifest
-    let url = manifestRes.data?.versions?.[version]?.dist?.tarball;
+    let url;
+    try {
+      const manifestRes = await axiosGet(`${this.endpoint}/${name}`);
+      // Find the NPM tarball location in the manifest
+      url = manifestRes.data?.versions?.[version]?.dist?.tarball;
+    } catch {
+      // Do nothing. Undefined url handled below.
+    }
     // If tarball URL is not found, fallback to standard NPM approach per
     // https://docs.fire.ly/projects/Simplifier/features/api.html#package-server-api
     if (!url) {

src/registry/RedundantRegistryClient.ts

@@ -4,7 +4,10 @@ import { RegistryClient, RegistryClientOptions } from './RegistryClient';
 
 export class RedundantRegistryClient implements RegistryClient {
   protected log: LogFunction;
-  constructor(private clients: RegistryClient[], options: RegistryClientOptions = {}) {
+  constructor(
+    public clients: RegistryClient[],
+    options: RegistryClientOptions = {}
+  ) {
     this.log = options.log ?? (() => {});
   }
 

test/cache/DiskBasedPackageCache.test.ts

@@ -170,7 +170,7 @@ describe('DiskBasedPackageCache', () => {
       expect(loggerSpy.getAllLogs()).toHaveLength(0);
     });
 
-    it('should return undefined for a package with different version in the cache', () => {
+    it('should return empty array for a package with different version in the cache', () => {
       const potentials = cache.getPotentialResourcePaths('fhir.small', '0.2.0');
       expect(potentials).toHaveLength(0);
       expect(loggerSpy.getAllLogs()).toHaveLength(0);
@@ -231,6 +231,21 @@ describe('DiskBasedPackageCache', () => {
   });
 
   describe('#getResourceAtPath', () => {
-    // tests go here
+    it('should return a resource with a given resource path', () => {
+      const rootPath = path.resolve(cacheFolder, 'fhir.small#0.1.0', 'package');
+      const totalPath = path.resolve(rootPath, 'StructureDefinition-MyPatient.json');
+      const resource = cache.getResourceAtPath(totalPath);
+      expect(resource).toBeDefined();
+      expect(resource.id).toBe('MyPatient');
+      expect(loggerSpy.getAllLogs('error')).toHaveLength(0);
+    });
+    it('should return a resource with an xml path where xml was converted to a resource', () => {
+      const totalPath = path.resolve(local1Folder, 'StructureDefinition-true-false.xml');
+      const resource = cache.getResourceAtPath(totalPath);
+      expect(resource).toBeDefined();
+      expect(resource.id).toBe('true-false');
+      expect(resource.xml).toBeUndefined();
+      expect(loggerSpy.getAllLogs('error')).toHaveLength(0);
+    });
   });
 });

test/registry/DefaultRegistryClient.test.ts

@@ -0,0 +1,56 @@
+import { loggerSpy } from '../testhelpers';
+import { DefaultRegistryClient } from '../../src/registry/DefaultRegistryClient';
+import { NPMRegistryClient } from '../../src/registry/NPMRegistryClient';
+import { FHIRRegistryClient } from '../../src/registry/FHIRRegistryClient';
+
+describe('DefaultRegistryClient', () => {
+  describe('#constructor', () => {
+    beforeEach(() => {
+      loggerSpy.reset();
+      delete process.env.FPL_REGISTRY;
+    });
+
+    it('should make a client with custom registry when it has been specified', () => {
+      process.env.FPL_REGISTRY = 'https://custom-registry.example.org';
+      const defaultClient = new DefaultRegistryClient({ log: loggerSpy.log });
+      expect(defaultClient.clients).toHaveLength(1);
+      expect(defaultClient.clients[0]).toHaveProperty(
+        'endpoint',
+        'https://custom-registry.example.org'
+      );
+      expect(defaultClient.clients[0]).toBeInstanceOf(NPMRegistryClient);
+      expect(loggerSpy.getLastMessage('info')).toBe(
+        'Using custom registry specified by FPL_REGISTRY environment variable: https://custom-registry.example.org'
+      );
+    });
+
+    it('should make a client with fhir registries if no custom registry specified', () => {
+      const defaultClient = new DefaultRegistryClient({ log: loggerSpy.log });
+      expect(defaultClient.clients).toHaveLength(2);
+      expect(defaultClient.clients[0]).toHaveProperty('endpoint', 'https://packages.fhir.org');
+      expect(defaultClient.clients[0]).toBeInstanceOf(FHIRRegistryClient);
+      expect(defaultClient.clients[1]).toHaveProperty(
+        'endpoint',
+        'https://packages2.fhir.org/packages'
+      );
+      expect(defaultClient.clients[1]).toBeInstanceOf(FHIRRegistryClient);
+    });
+
+    it('should make a client by using the first custom client specified if multiple defined', () => {
+      process.env.FPL_REGISTRY = 'https://custom-registry.example.org';
+      const defaultClient = new DefaultRegistryClient({ log: loggerSpy.log });
+      expect(defaultClient.clients).toHaveLength(1);
+      expect(defaultClient.clients[0]).toHaveProperty(
+        'endpoint',
+        'https://custom-registry.example.org'
+      );
+      expect(defaultClient.clients[0]).toBeInstanceOf(NPMRegistryClient);
+      // expect(loggerSpy.getLastMessage('info')).toBe(
+      //   'Using custom registry specified by FPL_REGISTRY environment variable: https://custom-registry.example.org'
+      // );
+      process.env.FPL_REGISTRY = 'https://custom-second-registry.example.org';
+
+      // when hasLoggedCustomRegistry = true ?
+    });
+  });
+});