Merge branch 'main' into qa

lib/utils/nypl-source-mapper.js

@@ -1,4 +1,3 @@
-const axios = require('axios')
 class NyplSourceMapper {
   constructor (mapping) {
     this.nyplSourceMap = mapping
@@ -50,13 +49,45 @@ class NyplSourceMapper {
   }
 }
 
+/**
+* Create a NyplSourceMapper instance
+*/
+const createInstance = async () => {
+  const sourceMappingUrl = `https://raw.githubusercontent.com/NYPL/nypl-core/${process.env.NYPL_CORE_VERSION || 'master'}/mappings/recap-discovery/nypl-source-mapping.json`
+
+  // Retrieve json file:
+  const resp = await fetch(sourceMappingUrl)
+    .catch((e) => {
+      throw new Error(`Error retrieving ${sourceMappingUrl}: ${e}`)
+    })
+
+  // Assert 2xx status:
+  if (!resp?.ok) {
+    throw new Error(`Error retrieving ${sourceMappingUrl} - got status ${resp?.status}`)
+  }
+
+  // Parse JSON:
+  const data = await resp.json()
+    .catch((e) => {
+      throw new Error(`Error parsing ${sourceMappingUrl}: ${e}`)
+    })
+
+  // Check for invalid data structure:
+  if (!data || !data['sierra-nypl']) {
+    throw new Error(`Error parsing data at ${sourceMappingUrl}`)
+  }
+
+  return new NyplSourceMapper(data)
+}
+
 let sourceMapperInstance = null
 
+/**
+* Get singleton NyplSourceMapper instance
+*/
 NyplSourceMapper.instance = async () => {
   if (!sourceMapperInstance) {
-    sourceMapperInstance = await axios.get(`https://raw.githubusercontent.com/NYPL/nypl-core/${process.env.NYPL_CORE_VERSION || 'master'}/mappings/recap-discovery/nypl-source-mapping.json`).then((resp) => {
-      return new NyplSourceMapper(resp.data)
-    })
+    sourceMapperInstance = createInstance()
   }
   return sourceMapperInstance
 }