From 4d3558e1b5293d1b14fab5bf08bf0d3beab9ef91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=27rysiek=27=20Wo=C5=BAniak?=
 <rysiek@hackerspace.pl>
Date: Sun, 19 Sep 2021 10:04:19 +0000
Subject: [PATCH] cleanups and bugfixes related to the new plugin loader (ref.
 #15)

---
 __tests__/service-worker.test.js |  2 ++
 service-worker.js                | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/__tests__/service-worker.test.js b/__tests__/service-worker.test.js
index 5c140f4..9868161 100644
--- a/__tests__/service-worker.test.js
+++ b/__tests__/service-worker.test.js
@@ -33,7 +33,9 @@ describe("service-worker", () => {
             require('../' + url);
         } catch(e) {}
     })
+    // TODO: pretty ugly, but necessary for some reason...
     global.LibResilientPluginConstructors = new Map()
+    self.LibResilientPluginConstructors = global.LibResilientPluginConstructors
   })
   
   test("basic set-up: LibResilientPlugins", async () => {
diff --git a/service-worker.js b/service-worker.js
index e4365de..103f7f2 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -64,10 +64,6 @@ if (typeof self.LibResilientConfig !== 'object' || self.LibResilientConfig === n
                 name: 'fetch'
             },{
                 name: 'cache'
-            },{
-                name: 'alt-fetch'
-            },{
-                name: 'gun-ipfs'
             }
         ],
         // which components should be logged?
@@ -79,9 +75,7 @@ if (typeof self.LibResilientConfig !== 'object' || self.LibResilientConfig === n
         loggedComponents: [
             'service-worker',
             'fetch',
-            'cache',
-            'alt-fetch',
-            'gun-ipfs'
+            'cache'
         ]
     }
 }
@@ -107,15 +101,19 @@ self.log = function(component, ...items) {
 // everything in a try-catch block
 // so that we get an informative message if there's an error
 try {
-    
+
     // get the config
-    self.importScripts("./config.js")
-    self.log('service-worker', 'config loaded.')
+    try {
+        self.importScripts("./config.js")
+        self.log('service-worker', 'config loaded.')
+    } catch (e) {
+        self.log('service-worker', 'config loading failed, using defaults')
+    }
     
     // create the LibResilientPluginConstructors map
     // the global... hack is here so that we can run tests; not the most elegant
     // TODO: find a better way
-    var LibResilientPluginConstructors = global.LibResilientPluginConstructors || new Map()
+    var LibResilientPluginConstructors = self.LibResilientPluginConstructors || new Map()
     
     // this is the stash for plugins that need dependencies instantiated first
     var dependentPlugins = new Array()