Update Mink to MV3

.jshintrc

@@ -1,5 +1,5 @@
 {
-  "esversion": 6,
+  "esversion": 8,
   "debug" : true,
   "loopfunc" : true,
   "latedef" : false,

mink-plugin/MinkDefaults.js

@@ -0,0 +1,7 @@
+
+const defaultAggregators = [
+    //'https://memgator.cs.odu.edu',
+    'https://aggregator.matkelly.com'
+  ]
+
+export {defaultAggregators}

mink-plugin/content.js

@@ -40,6 +40,7 @@ function log (...messages) {
     for (const msg of messages) {
       console.log(msg)
     }
+    // console.log(new Error().stack)
   }
   // console.trace()
 }
@@ -86,6 +87,7 @@ function setActiveBasedOnIgnorelistedProperty (cb) {
   })
 }
 
+// TODO: refine the acronym in this function's signature. Beware the axe murderer.
 function normalDisplayUIBC (items) {
   const hasATimeMapInCache = items.timemaps && items.timemaps[document.URL]
 
@@ -97,8 +99,8 @@ function normalDisplayUIBC (items) {
         method: 'setBadge',
         text: '',
         iconPath: {
-          38: chrome.extension.getURL('images/mLogo38_isAMemento.png'),
-          19: chrome.extension.getURL('images/mLogo19_isAMemento.png')
+          38: chrome.runtime.getURL('images/mLogo38_isAMemento.png'),
+          19: chrome.runtime.getURL('images/mLogo19_isAMemento.png')
         }
       })
     } else { // Live web page revisited w/ a TM in cache
@@ -138,15 +140,33 @@ function checkAggregatorHealthAndSet (aggregatorIndex) {
 
   const options = { mode: 'no-cors', signal }
 
+  console.log(`Checking the health of aggregator #${aggregatorIndex} at ${memgatorHosts[aggregatorIndex]}`)
+
   return window.fetch(url, options)
-    .then(setTimeout(() => { aborter.abort() }, timeout))
+    .then(setTimeout(() => { aborter.abort(`The request to ${url} timed out and has been aborted`) }, timeout))
+    .then(() => {
+      log(`Aggregator at ${memgatorHosts[aggregatorIndex]} was accessible\nSet as default`)
+      // TODO: set as default in the options
+      setDefaultAggregator(aggregatorIndex)
+     })
     .catch(error => {
       log(`${url} appears to be down, incrementing host counter`)
       log(error)
       hostI += 1
     })
 }
 
+function setDefaultAggregator (indexOfNewDefault) {
+  chrome.storage.local.get('aggregators', function (ls) {
+    log(ls)
+    let aggregatorsArray = ls.aggregators
+    const newDefault = ls[indexOfNewDefault]
+    aggregatorsArray.splice(indexOfNewDefault, 1)
+    aggregatorsArray.unshift(newDefault)
+    chrome.storage.local.set({ 'aggregators': aggregatorsArray })
+  })
+}
+
 function displayUIBasedOnContext () {
   log('displayUIBasedOnContext()', document.URL)
 
@@ -324,12 +344,21 @@ function addToIgnorelist (currentIgnorelist, uriIn) {
 chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
   log(`in listener with ${request.method}`)
 
+  if (request.method === 'tryNextAggregator') {
+    ++hostI
+    checkAggregatorHealthAndSet(hostI)
+    console.log(`trying again with aggregator ${hostI}`)
+    getMementos(request.uri)
+    return
+  }
+
   if (request.method === 'addToIgnorelist') {
     getIgnorelist(addToIgnorelist, request.uri) // And add uri
     return
   }
 
   if (request.method === 'stopAnimatingBrowserActionIcon') {
+    // Stopping the browser action icon animation
     clearTimeout(animationTimer)
     animateBrowserActionIcon = false
     return
@@ -342,8 +371,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
   }
 
   if (request.method === 'startTimer') {
-    log('Got startTimer')
-
     chrome.runtime.sendMessage({
       method: 'setBadge',
       text: '',
@@ -358,12 +385,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
     setTimeout(animatePageActionIcon, 500)
   }
 
-  if (request.method === 'stopAnimatingBrowserActionIcon') {
-    clearTimeout(animationTimer)
-    animateBrowserActionIcon = false
-    return
-  }
-
   if (request.method === 'showArchiveNowUI') {
     return
   }
@@ -377,7 +398,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
       }, function (response) {
         log('We have a response!') // This will not occur due to async exec in mink.js
       })
-      return
     }
     return
   }
@@ -410,6 +430,10 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
       chrome.storage.local.set(storedHeaders, displayUIBasedOnContext)
     })
   }
+
+  if (request.method === 'setDefaultAggregators') {
+    console.log('TODO: set default aggregators from content.js')
+  }
 })
 
 function getMementos (uri) {
@@ -431,36 +455,38 @@ function getMementos (uri) {
 
   setTimeout(animatePageActionIcon, 500)
 
-  log('in getMementos, sending "fetchTimeMap" message')
+  log(`in getMementos, sending "fetchTimeMap" message to service worker using ${timemapLocation}`)
   chrome.runtime.sendMessage({
     method: 'fetchTimeMap',
-    value: timemapLocation
+    value: timemapLocation,
+    urir: uri
   })
 }
 
-const clockIcons38 = [chrome.extension.getURL('images/mementoLogos/mLogo38_7.5.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo38_15.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo38_22.5.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo38_30.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo38_37.5.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo38_45.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo38_52.5.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo38_60.png')]
-const clockIcons19 = [chrome.extension.getURL('images/mementoLogos/mLogo19_7.5.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo19_15.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo19_22.5.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo19_30.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo19_37.5.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo19_45.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo19_52.5.png'),
-  chrome.extension.getURL('images/mementoLogos/mLogo19_60.png')]
+const clockIcons38 = [chrome.runtime.getURL('images/mementoLogos/mLogo38_7.5.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo38_15.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo38_22.5.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo38_30.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo38_37.5.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo38_45.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo38_52.5.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo38_60.png')]
+const clockIcons19 = [chrome.runtime.getURL('images/mementoLogos/mLogo19_7.5.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo19_15.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo19_22.5.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo19_30.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo19_37.5.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo19_45.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo19_52.5.png'),
+  chrome.runtime.getURL('images/mementoLogos/mLogo19_60.png')]
 let iteration = clockIcons38.length - 1
 
 function animatePageActionIcon () {
   if (!animateBrowserActionIcon) {
     clearTimeout(animationTimer)
     return
   }
+
   chrome.runtime.sendMessage({
     method: 'setBadge',
     text: '',

mink-plugin/js/displayMinkUI.js

@@ -1,6 +1,7 @@
 /* global chrome, $, Timemap, tmData */
 
 var MAX_MEMENTOS_IN_DROPDOWN = 500
+var tmData
 
 function createShadowDOM (cb) {
   const selector = '#minkuiX'
@@ -19,7 +20,8 @@ function setupDrilldownInteractions () {
 }
 
 function appendHTMLToShadowDOM () {
-  $.ajax(chrome.extension.getURL('minkui.html'))
+  tmData = arguments[0].tmData
+  $.ajax(chrome.runtime.getURL('minkui.html')) // There has to be a more native way to do this
     .done(function (data) {
     // TODO: before invoking any further, check to verify that some mementos exist (the aggregator query has returned).
 
@@ -123,6 +125,7 @@ function appendHTMLToShadowDOM () {
         appendCSSToShadowDOM(cb)
       })
     })
+    chrome.runtime.onMessage.removeListener(appendHTMLToShadowDOM)
 }
 
 // In some places, getting addZ has already been declared, thus var for now
@@ -157,7 +160,7 @@ function switchToArchiveNowInterface () {
 }
 
 function appendCSSToShadowDOM (cb) {
-  $.ajax(chrome.extension.getURL('css/minkui.css'))
+  $.ajax(chrome.runtime.getURL('css/minkui.css'))
     .done(function (data) {
       const styleElement = `<style type="text/css">\n${data}\n</style>\n`
       $('#minkuiX').prepend(styleElement)
@@ -567,11 +570,11 @@ function setupUI () {
 }
 
 function replaceContentScriptImagesWithChromeExtensionImages () {
-  document.getElementById('minkLogo').src = chrome.extension.getURL('images/mink_marvel_80.png')
+  document.getElementById('minkLogo').src = chrome.runtime.getURL('images/mink_marvel_80.png')
 
-  document.getElementById('archivelogo_ia').src = chrome.extension.getURL('images/archives/iaLogo.png')
-  document.getElementById('archivelogo_ais').src = chrome.extension.getURL('images/archives/archiveisLogo.png')
-  document.getElementById('archivelogo_ala').src = chrome.extension.getURL('images/archives/allListedArchives.png')
+  document.getElementById('archivelogo_ia').src = chrome.runtime.getURL('images/archives/iaLogo.png')
+  document.getElementById('archivelogo_ais').src = chrome.runtime.getURL('images/archives/archiveisLogo.png')
+  document.getElementById('archivelogo_ala').src = chrome.runtime.getURL('images/archives/allListedArchives.png')
 }
 
 function bindSteps () {
@@ -750,7 +753,7 @@ function bindArchiveLogos () {
 
     const that = this
     const newSrc = $(this).attr('src').replace('.png', '_success.png')
-    $(this).attr('src', chrome.extension.getURL('./images/spinner.gif'))
+    $(this).attr('src', chrome.runtime.getURL('./images/spinner.gif'))
 
     const archiveLogoID = $(this).attr('id')
 
@@ -782,8 +785,8 @@ function bindArchiveLogos () {
         changeArchiveAllIconWhenComplete(alaLogo)
       }
 
-      $(iaLogo).attr('src', chrome.extension.getURL('./images/spinner.gif'))
-      $(aisLogo).attr('src', chrome.extension.getURL('./images/spinner.gif'))
+      $(iaLogo).attr('src', chrome.runtime.getURL('./images/spinner.gif'))
+      $(aisLogo).attr('src', chrome.runtime.getURL('./images/spinner.gif'))
 
       openInNewTab = true
       archiveURIArchiveOrg(iaCb, openInNewTab)
@@ -797,7 +800,7 @@ var archivesFinished = 0 /* TOFIX This is doubly declared if 'let' */
 function changeArchiveAllIconWhenComplete (iconObj) {
   archivesFinished++
   if (archivesFinished >= 2) {
-    $(iconObj).attr('src', chrome.extension.getURL('./images/archives/allListedArchives_success.png'))
+    $(iconObj).attr('src', chrome.runtime.getURL('./images/archives/allListedArchives_success.png'))
     $(iconObj).unbind()
     $(iconObj).removeClass('archiveLogo')
   }
@@ -819,8 +822,13 @@ function bindNavigationButtons () {
   })
 }
 
-if ($('#minkWrapper').length === 0) {
-  appendHTMLToShadowDOM()
+function echoTMDataForMV3 (tmData) {
+  console.log('Echoing TM Data For MV3')
+  console.log(tmData)
+}
+
+if (document.getElementById('minkWrapper') === null) {
+  chrome.runtime.onMessage.addListener(appendHTMLToShadowDOM)
 } else {
   $('#minkWrapper').toggle()
 }