Change SW to module, portabilize defaults

Author: machawk1

mink-plugin/MinkDefaults.js

@@ -1,10 +1,7 @@
 
-function MinkDefaults () {
-  this.defaultAggregators = [
+const defaultAggregators = [
     'https://memgator.cs.odu.edu',
     'https://aggregator.matkelly.com'
   ]
 
-}
-
-export {MinkDefaults}
+export {defaultAggregators}

mink-plugin/manifest.json

@@ -7,7 +7,8 @@
   "homepage_url": "https://matkelly.com/mink",
   "author": "Mat Kelly <[email protected]>",
   "background": {
-    "service_worker": "mink.js"
+    "service_worker": "mink.js",
+    "type": "module"
   },
   "action": {
     "default_title": "Mink - Integrating the Live and Archived Web",

mink-plugin/mink.js

@@ -1,5 +1,10 @@
 /* global chrome, $, Timemap */
 
+import {defaultAggregators} from './MinkDefaults.js'
+
+console.log(defaultAggregators)
+
+
 const debug = false
 let tmData
 const maxBadgeDisplay = '> 1k'
@@ -10,11 +15,6 @@ const browserActionTitleNormal = 'Mink - Integrating the Live and Archived Web'
 const browserActionTitleNoMementos = 'Mink - No Mementos Available'
 const browserActionTitleIgnorelisted = 'Mink - Viewing Ignored Site'
 
-const defaultAggregators = [ // TODO: pull this in from the MinkDefaults module
-  'https://memgator.cs.odu.edu',
-  'https://aggregator.matkelly.com'
-]
-
 const badgeImagesDisabled = {
   38: chrome.runtime.getURL('images/minkLogo38_disabled.png'),
   19: chrome.runtime.getURL('images/minkLogo19_disabled.png')
@@ -787,6 +787,7 @@ chrome.runtime.onInstalled.addListener(({ reason }) => {
   if (reason === 'install') {
     console.log('extension installed, reported via SW registration')
     console.log('setting default aggregators')
+    console.log(defaultAggregators)
     chrome.storage.local.set({'aggregators': defaultAggregators})
     //chrome.storage.local.set({
     //  apiSuggestions: ['tabs', 'storage', 'scripting']

mink-plugin/options.js

@@ -5,7 +5,7 @@ var debug = true
 const tmDropdownString = '<option>&nbsp;&nbsp;&darr; Mink has TimeMaps for... &darr;</option>'
 const tmDropdownNoTimemapsString = '<option>--- No TimeMaps available ---</option>'
 
-import {MinkDefaults} from './MinkDefaults.js'
+import {defaultAggregators} from './MinkDefaults.js'
 
 function restoreOptions () {
   chrome.storage.local.get('ignorelist').then(function (items) {
@@ -292,7 +292,7 @@ function clearAggregatorListInLocalStorage () {
 }
 
 function resetDefaultAggregators () {
-  chrome.storage.local.set({'aggregators': MinkDefaults.defaultAggregators})
+  chrome.storage.local.set({'aggregators': defaultAggregators})
 }
 
 function updateAggregatorsUIBasedOnLocalStorage () {
@@ -349,15 +349,18 @@ function populateDropdownWithAggregatorsInStorage (arrayOfAggregators) {
 function setAggregatorsInStorage (arrayOfAggregatorHostnames, cb) {
   // Returns a promise
   return chrome.storage.local.set({ 'aggregators': arrayOfAggregatorHostnames }).then(() => {
-    console.log('Attempting to invoke the callback')
+    console.log('Attempting to invoke the callback, this is failing w/ reload')
     console.log(cb)
     cb()
+  }, function writeFailed () {
+    console.log("Failed to write to localstorage")
+    console.log(arrayOfAggregatorHostnames)
   })
 }
 
 function test_writeToLocalStorageAndReload () {
   let testAggregators = ['https://memento.example.com', 'https://aggregator.somehostname.net']
-  setAggregatorsInStorage(testAggregators, window.location.reload)
+  setAggregatorsInStorage(defaultAggregators)//, window.location.reload)
 }