From e8716657e43c46a97d80783593a8f90786a24558 Mon Sep 17 00:00:00 2001
From: hackademix
Date: Tue, 28 Aug 2018 01:23:27 +0200
Subject: Reordered startup sequence to be more friendly with embedders like
 the Tor Browser.

---
 src/bg/main.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'src/bg/main.js')

diff --git a/src/bg/main.js b/src/bg/main.js
index 72ef5de..58e7aef 100644
--- a/src/bg/main.js
+++ b/src/bg/main.js
@@ -23,8 +23,7 @@
   }
 
   async function init() {
-    await include("/bg/defaults.js");
-    await ns.defaults;
+    await Defaults.init();
     
     let policyData = (await Storage.get("sync", "policy")).policy;
     if (policyData && policyData.DEFAULT) {
@@ -35,16 +34,22 @@
       ns.policy = await Legacy.createOrMigratePolicy();
       ns.savePolicy();
     }
-    
-    
-    
-    await include("/bg/RequestGuard.js");
+
     await RequestGuard.start();
     await XSS.start(); // we must start it anyway to initialize sub-objects
     if (!ns.sync.xss) {
       XSS.stop();
     }
-    Commands.install();
+
+    Messages.addHandler(messageHandler);
+
+    try {
+      await Messages.send("started");
+    } catch (e) {
+      // no embedder to answer us
+    }
+    log("STARTED");
+
   };
 
   let Commands = {
@@ -65,8 +70,6 @@
 
     togglePermissions() {},
     install() {
-
-
       if ("command" in browser) {
         // keyboard shortcuts
         browser.commands.onCommand.addListener(cmd => {
@@ -182,13 +185,8 @@
 
       deferWebTraffic(init(), 
         async () => {
-
-          await include("/bg/Settings.js");
-          Messages.addHandler(messageHandler);
-
-          await Messages.send("started");
-          log("STARTED");
-
+          Commands.install();
+            
           this.devMode = (await browser.management.getSelf()).installType === "development";
           if (this.local.debug) {
             if (this.devMode) {
-- 
cgit v1.2.3