4 files changed, 47 insertions, 38 deletions
diff --git a/mascara/server/index.js b/mascara/server/index.js
index 2ad8af242..2bc2441d0 100644
--- a/mascara/server/index.js
+++ b/mascara/server/index.js
@@ -23,7 +23,8 @@ function createMetamascaraServer () {
   serveBundle(server, '/metamascara.js', metamascaraBundle)
   serveBundle(server, '/scripts/ui.js', uiBundle)
   serveBundle(server, '/scripts/proxy.js', proxyBundle)
-  serveBundle(server, '/scripts/background.js', backgroundBuild)
+  // the serviceworker must be served from the root of the app
+  serveBundle(server, '/background.js', backgroundBuild)
 
   // serve assets
   server.use(express.static(path.join(__dirname, '/../ui/'), { setHeaders: (res) => res.set('X-Frame-Options', 'DENY') }))
diff --git a/mascara/src/background.js b/mascara/src/background.js
index 8aa1d8fe2..40a684f3d 100644
--- a/mascara/src/background.js
+++ b/mascara/src/background.js
@@ -30,15 +30,19 @@ global.addEventListener('activate', function (event) {
 
 log.debug('inside:open')
 
-
-// // state persistence
+// state persistence
 const dbController = new DbController({
   key: STORAGE_KEY,
 })
-loadStateFromPersistence()
-.then((initState) => setupController(initState))
-.then(() => log.debug('MetaMask initialization complete.'))
-.catch((err) => console.error('WHILE SETTING UP:', err))
+
+start().catch(log.error)
+
+async function start() {
+  log.debug('MetaMask initializing...')
+  const initState = await loadStateFromPersistence()
+  await setupController(initState)
+  log.debug('MetaMask initialization complete.')
+}
 
 //
 // State and Persistence
diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js
index 3958f7d50..80b4dc516 100644
--- a/mascara/src/proxy.js
+++ b/mascara/src/proxy.js
@@ -1,13 +1,13 @@
 const createParentStream = require('iframe-stream').ParentStream
-const SWcontroller = require('client-sw-ready-event/lib/sw-client.js')
+const SwController = require('sw-controller')
 const SwStream = require('sw-stream/lib/sw-stream.js')
 
-const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
-const background = new SWcontroller({
+const keepAliveDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
+const background = new SwController({
   fileName: './scripts/background.js',
-  letBeIdle: false,
-  wakeUpInterval: 30000,
-  intervalDelay,
+  keepAlive: true,
+  keepAliveInterval: 30000,
+  keepAliveDelay,
 })
 
 const pageStream = createParentStream()
diff --git a/mascara/src/ui.js b/mascara/src/ui.js
index 21e5f32a9..f35a11fc4 100644
--- a/mascara/src/ui.js
+++ b/mascara/src/ui.js
@@ -1,6 +1,6 @@
 const injectCss = require('inject-css')
-const SWcontroller = require('client-sw-ready-event/lib/sw-client.js')
-const SwStream = require('sw-stream/lib/sw-stream.js')
+const SwController = require('sw-controller')
+const SwStream = require('sw-stream')
 const MetaMaskUiCss = require('../../ui/css')
 const MetamascaraPlatform = require('../../app/scripts/platforms/window')
 const startPopup = require('../../app/scripts/popup-core')
@@ -8,27 +8,44 @@ const startPopup = require('../../app/scripts/popup-core')
 // create platform global
 global.platform = new MetamascaraPlatform()
 
-
 var css = MetaMaskUiCss()
 injectCss(css)
 const container = document.getElementById('app-content')
 
-var name = 'popup'
+const name = 'popup'
 window.METAMASK_UI_TYPE = name
 window.METAMASK_PLATFORM_TYPE = 'mascara'
 
-const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
+const keepAliveDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
 
-const background = new SWcontroller({
-  fileName: './scripts/background.js',
-  letBeIdle: false,
-  intervalDelay,
-  wakeUpInterval: 20000,
+const swController = new SwController({
+  fileName: './background.js',
+  keepAlive: true,
+  keepAliveDelay,
+  keepAliveInterval: 20000,
 })
+
+swController.once('updatefound', windowReload)
+swController.once('ready', async () => {
+  try {
+    swController.removeListener('updatefound', windowReload)
+    console.log('swController ready')
+    await timeout(1000)
+    console.log('connecting to app')
+    await connectApp()
+    console.log('app connected')
+  } catch (err) {
+    console.error(err)
+  }
+})
+
+console.log('starting service worker')
+swController.startWorker()
+
 // Setup listener for when the service worker is read
-const connectApp = function (readSw) {
+function connectApp() {
   const connectionStream = SwStream({
-    serviceWorker: background.controller,
+    serviceWorker: swController.getWorker(),
     context: name,
   })
   return new Promise((resolve, reject) => {
@@ -43,19 +60,6 @@ const connectApp = function (readSw) {
     })
   })
 }
-background.on('ready', async (sw) => {
-  try {
-    background.removeListener('updatefound', connectApp)
-    await timeout(1000)
-    await connectApp(sw)
-    console.log('hello from cb ready event!')
-  } catch (e) {
-    console.error(e)
-  }
-})
-background.on('updatefound', windowReload)
-
-background.startWorker()
 
 function windowReload () {
   if (window.METAMASK_SKIP_RELOAD) return