From 8ae039b77eec04a52a178ca715ddc6d64992961c Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 7 Oct 2018 14:00:34 -0400
Subject: [PATCH 01/32] Added markup for HTTP proxy option

---
 src/popup.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/popup.html b/src/popup.html
index 4cd8219..08ffbd1 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -183,6 +183,10 @@
           <fieldset id="edit-container-panel-choose-icon" class="radio-choice">
             <legend>Choose an icon</legend>
           </fieldset>
+          <fieldset>
+            <legend>HTTP Proxy (Optional)</legend>
+            <input type="text" name="container-proxy" id="edit-container-panel-proxy" maxlength="15" placeholder="IP:PORT or USER:PASS@IP:PORT"/>         
+          </fieldset>
         </form>
         <div id="edit-sites-assigned" class="scrollable" hidden>
           <h3>Sites assigned to this container</h3>

From a688fde76944c8fed9dcb7ad02ad5c40f0529e39 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 7 Oct 2018 14:02:31 -0400
Subject: [PATCH 02/32] Added new JS file to seamlessly store and retrieve list
 of proxified containers from browser local storage

---
 src/js/proxified-containers.js | 88 ++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 src/js/proxified-containers.js

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
new file mode 100644
index 0000000..1fb77f8
--- /dev/null
+++ b/src/js/proxified-containers.js
@@ -0,0 +1,88 @@
+//This object allows other scripts to access the list mapping containers to their proxies
+window.proxifiedContainers = {
+  //Resolves to a proxy object which can be used in the return of the listener required for browser.proxy.onRequest.addListener
+  retrieve: function(cookieStoreId = null) {
+    return new Promise((resolve, reject) => {
+      browser.storage.local.get("proxifiedContainersKey").then((results) => {
+          //Steps to test:
+          //1. Is result empty? If so we must inform the caller to intialize proxifiedContainersStore with some initial info.
+          //2. Is cookieStoreId null? This means the caller probably wants everything currently in the proxifiedContainersStore object store
+          //3. If there doesn't exist an entry for the associated cookieStoreId, inform the caller of this
+          //4. Normal operation - if the cookieStoreId exists in the map, we can simply resolve with the correct proxy value
+
+          var results_array = results["proxifiedContainersKey"];
+
+          if (Object.getOwnPropertyNames(results).length == 0) {
+            reject({error: "uninitialized", message: ""});
+          }
+          
+          else if(cookieStoreId == null) {
+            resolve(results_array);
+          }          
+
+
+          else {
+            var val = results_array.find(o => o.cookieStoreId === cookieStoreId);
+            if(val == null) {
+              reject({error: "doesnotexist", message: ""});
+            }
+            else {
+              resolve(val);
+            }
+          }
+
+        }, (error) => {
+          reject({error: "internal", message: error});
+        }
+      );
+    });
+  },
+  set: function(cookieStoreId, proxy, initialize = false) {
+    return new Promise((resolve, reject) => {
+      if(initialize === true) {
+        var proxifiedContainersStore = [];
+        browser.storage.local.set({proxifiedContainersKey: proxifiedContainersStore});
+      }
+
+      //Assumes proxy is a properly formatted object
+      window.proxifiedContainers.retrieve().then((proxifiedContainersStore) => {
+
+        var index = proxifiedContainersStore.findIndex(i => i.cookieStoreId === cookieStoreId);
+        if(index === -1)
+        {
+          proxifiedContainersStore.push({cookieStoreId: cookieStoreId, proxy: proxy});
+          index = proxifiedContainersStore.length - 1;
+        }
+        else
+        {
+          proxifiedContainersStore[index] = {cookieStoreId: cookieStoreId, proxy: proxy};
+        }
+        
+        browser.storage.local.set({proxifiedContainersKey: proxifiedContainersStore});
+        resolve(proxifiedContainersStore[index]);
+      }, (errorObj) => {
+        reject(errorObj);
+      });
+    });
+  },
+  parseProxy: function(proxy_str) {
+    var regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
+    if(regexp.test(proxy_str) !== true)
+      return false;
+
+    else
+    {
+      var matches = regexp.exec(proxy_str);
+
+      var result = {
+        type: "http",
+        host: matches[4],
+        port: parseInt(matches[11]) || 8080,
+        username: matches[2] || "",
+        password: matches[3] || ""
+      };
+
+      return result;
+    }
+  }
+};

From 067843c4b9f37f57e32dc06f2a4cde3c246a7bec Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 7 Oct 2018 14:12:18 -0400
Subject: [PATCH 03/32] Integrated the proxified-containers.js logic into
 relevant files without direct proxifying yet

---
 src/js/background/backgroundLogic.js |  2 +
 src/js/background/index.html         |  1 +
 src/js/popup.js                      | 93 ++++++++++++++++++----------
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 52d61a2..a27d199 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -42,6 +42,8 @@ const backgroundLogic = {
         this.cookieStoreId(options.userContextId),
         options.params
       );
+
+      window.proxifiedContainers.set(this.cookieStoreId(options.userContextId), options.proxy);
     } else {
       donePromise = browser.contextualIdentities.create(options.params);
     }
diff --git a/src/js/background/index.html b/src/js/background/index.html
index e167f0b..86bccf1 100644
--- a/src/js/background/index.html
+++ b/src/js/background/index.html
@@ -13,6 +13,7 @@
       "js/background/messageHandler.js",
     ]
 -->
+    <script type="text/javascript" src="../proxified-containers.js"></script>
     <script type="text/javascript" src="backgroundLogic.js"></script>
     <script type="text/javascript" src="assignManager.js"></script>
     <script type="text/javascript" src="badge.js"></script>
diff --git a/src/js/popup.js b/src/js/popup.js
index 80986a2..8507cce 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 const CONTAINER_HIDE_SRC = "/img/container-hide.svg";
 const CONTAINER_UNHIDE_SRC = "/img/container-unhide.svg";
 
 const DEFAULT_COLOR = "blue";
 const DEFAULT_ICON = "circle";
 const NEW_CONTAINER_ID = "new";
+const DEFAULT_PROXY = {type: "direct"};
 
 const ONBOARDING_STORAGE_KEY = "onboarding-stage";
 
@@ -214,27 +214,6 @@ const Logic = {
     return false;
   },
 
-  async numTabs() {
-    const activeTabs = await browser.tabs.query({windowId: browser.windows.WINDOW_ID_CURRENT});
-    return activeTabs.length;
-  },
-
-  _disableMoveTabs(message) {
-    const moveTabsEl = document.querySelector("#container-info-movetabs");
-    const fragment = document.createDocumentFragment();
-    const incompatEl = document.createElement("div");
-
-    moveTabsEl.classList.remove("clickable");
-    moveTabsEl.setAttribute("title", message);
-
-    fragment.appendChild(incompatEl);
-    incompatEl.setAttribute("id", "container-info-movetabs-incompat");
-    incompatEl.textContent = message;
-    incompatEl.classList.add("container-info-tab-row");
-
-    moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling);
-  },
-
   async refreshIdentities() {
     const [identities, state] = await Promise.all([
       browser.contextualIdentities.query({}),
@@ -321,6 +300,10 @@ const Logic = {
     return Logic.userContextId(identity.cookieStoreId);
   },
 
+  cookieStoreId(userContextId) {
+    return `firefox-container-${userContextId}`;
+  },
+
   currentCookieStoreId() {
     const identity = Logic.currentIdentity();
     return identity.cookieStoreId;
@@ -732,14 +715,38 @@ Logic.registerPanel(P_CONTAINER_INFO, {
     });
 
     // Check if the user has incompatible add-ons installed
-    let incompatible = false;
     try {
-      incompatible = await browser.runtime.sendMessage({
+      const incompatible = await browser.runtime.sendMessage({
         method: "checkIncompatibleAddons"
       });
+      const moveTabsEl = document.querySelector("#container-info-movetabs");
+      if (incompatible) {
+        const fragment = document.createDocumentFragment();
+        const incompatEl = document.createElement("div");
+
+        moveTabsEl.classList.remove("clickable");
+        moveTabsEl.setAttribute("title", "Moving container tabs is incompatible with Pulse, PageShot, and SnoozeTabs.");
+
+        fragment.appendChild(incompatEl);
+        incompatEl.setAttribute("id", "container-info-movetabs-incompat");
+        incompatEl.textContent = "Incompatible with other Experiments.";
+        incompatEl.classList.add("container-info-tab-row");
+
+        moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling);
+      } else {
+        Logic.addEnterHandler(moveTabsEl, async function () {
+          await browser.runtime.sendMessage({
+            method: "moveTabsToWindow",
+            windowId: browser.windows.WINDOW_ID_CURRENT,
+            cookieStoreId: Logic.currentIdentity().cookieStoreId,
+          });
+          window.close();
+        });
+      }
     } catch (e) {
       throw new Error("Could not check for incompatible add-ons.");
     }
+<<<<<<< HEAD
     const moveTabsEl = document.querySelector("#container-info-movetabs");
     const numTabs = await Logic.numTabs();
     if (incompatible) {
@@ -757,6 +764,8 @@ Logic.registerPanel(P_CONTAINER_INFO, {
       });
       window.close();
     });
+=======
+>>>>>>> Integrated the proxified-containers.js logic into relevant files without direct proxifying yet
   },
 
   // This method is called when the panel is shown.
@@ -944,8 +953,6 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     this._editForm.addEventListener("submit", () => {
       this._submitForm();
     });
-
-
   },
 
   async _submitForm() {
@@ -958,8 +965,9 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
           params: {
             name: document.getElementById("edit-container-panel-name-input").value || Logic.generateIdentityName(),
             icon: formValues.get("container-icon") || DEFAULT_ICON,
-            color: formValues.get("container-color") || DEFAULT_COLOR,
-          }
+            color: formValues.get("container-color") || DEFAULT_COLOR
+          },
+          proxy: window.proxifiedContainers.parseProxy(document.getElementById("edit-container-panel-proxy").value) || DEFAULT_PROXY
         }
       });
       await Logic.refreshIdentities();
@@ -1054,11 +1062,6 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
 
     document.querySelector("#edit-container-panel-name-input").value = identity.name || "";
     document.querySelector("#edit-container-panel-usercontext-input").value = userContextId || NEW_CONTAINER_ID;
-    const containerName = document.querySelector("#edit-container-panel-name-input");
-    window.requestAnimationFrame(() => {
-      containerName.select();
-      containerName.focus();
-    });
     [...document.querySelectorAll("[name='container-color']")].forEach(colorInput => {
       colorInput.checked = colorInput.value === identity.color;
     });
@@ -1066,6 +1069,28 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       iconInput.checked = iconInput.value === identity.icon;
     });
 
+    var edit_proxy_dom = function(result) {
+      if(result.type == "http")
+        document.querySelector('#edit-container-panel-proxy').value = result.host.toString() + ":" + result.port.toString();
+      else if(result.type == "direct")
+        document.querySelector('#edit-container-panel-proxy').value = "";
+    }
+
+    window.proxifiedContainers.retrieve(identity.cookieStoreId).then((result) => {
+      edit_proxy_dom(result.proxy);
+    }, (error) => {
+      if(error.error == "uninitialized" || error.error == "doesnotexist") {
+        window.proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error == "uninitialized").then((result) => {
+          edit_proxy_dom(result.proxy);
+        }, (error) => {
+          browser.extension.getBackgroundPage().console.log(error);
+        });
+      }
+      else {
+        browser.extension.getBackgroundPage().console.log(error);
+      }
+    });
+
     return Promise.resolve(null);
   },
 
@@ -1154,4 +1179,4 @@ window.addEventListener("resize", function () {
     root.style.setProperty("--overflow-size", difference + "px");
     root.style.setProperty("--icon-fit", "12");
   }
-});
\ No newline at end of file
+});

From 78330a4d20d287583bf4b89ac4f331df56533766 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 7 Oct 2018 14:24:12 -0400
Subject: [PATCH 04/32] Forgot to add include of new JS file

---
 src/popup.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/popup.html b/src/popup.html
index 08ffbd1..59c3ed5 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -185,7 +185,7 @@
           </fieldset>
           <fieldset>
             <legend>HTTP Proxy (Optional)</legend>
-            <input type="text" name="container-proxy" id="edit-container-panel-proxy" maxlength="15" placeholder="IP:PORT or USER:PASS@IP:PORT"/>         
+            <input type="text" name="container-proxy" id="edit-container-panel-proxy" maxlength="15" placeholder="IP:PORT or USER:PASS@IP:PORT"/>
           </fieldset>
         </form>
         <div id="edit-sites-assigned" class="scrollable" hidden>
@@ -217,6 +217,7 @@
   </div>
 
   <script src="js/utils.js"></script>
+  <script src="js/proxified-containers.js"></script>
   <script src="js/popup.js"></script>
 </body>
 </html>

From 790a9273f90314c0f4bae12389ba3bcd803242f1 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 7 Oct 2018 15:32:28 -0400
Subject: [PATCH 05/32] Integrated proxy.onRequest functionality

---
 src/js/background/assignManager.js | 14 ++++++++++++++
 src/js/proxified-containers.js     | 18 +++++++++++++++---
 src/manifest.json                  |  3 ++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index dc9e991..6d34cfa 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -117,6 +117,16 @@ const assignManager = {
     return true;
   },
 
+  async handleProxifiedRequest(requestInfo) {
+    if(requestInfo.tabId === -1)
+      return {type: "direct"};
+
+    var tab = await browser.tabs.get(requestInfo.tabId);
+    var proxy = await window.proxifiedContainers.retrieveFromBackground(tab.cookieStoreId);
+
+    return proxy;
+  },
+
   // Before a request is handled by the browser we decide if we should route through a different container
   async onBeforeRequest(options) {
     if (options.frameId !== 0 || options.tabId === -1) {
@@ -224,6 +234,10 @@ const assignManager = {
       this._onClickedHandler(info, tab);
     });
 
+    // Before anything happens we decide if the request should be proxified
+    browser.extension.getBackgroundPage().console.log('[SAMUEL CODE] Adding proxy.onRequest listener');
+    browser.proxy.onRequest.addListener(this.handleProxifiedRequest, {urls: ["<all_urls>"]});
+
     // Before a request is handled by the browser we decide if we should route through a different container
     this.canceledRequests = {};
     browser.webRequest.onBeforeRequest.addListener((options) => {
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 1fb77f8..e56589e 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -1,5 +1,17 @@
 //This object allows other scripts to access the list mapping containers to their proxies
 window.proxifiedContainers = {
+
+  //Slightly modified version of 'retrieve' which returns a direct proxy whenever an error is met.
+  retrieveFromBackground: function(cookieStoreId = null) {
+    return new Promise((resolve, reject) => {
+      window.proxifiedContainers.retrieve(cookieStoreId).then((success) => {
+        resolve(success.proxy);
+      }, (error) => {
+        resolve({type: "direct"});
+      });
+    });
+  },
+
   //Resolves to a proxy object which can be used in the return of the listener required for browser.proxy.onRequest.addListener
   retrieve: function(cookieStoreId = null) {
     return new Promise((resolve, reject) => {
@@ -15,10 +27,10 @@ window.proxifiedContainers = {
           if (Object.getOwnPropertyNames(results).length == 0) {
             reject({error: "uninitialized", message: ""});
           }
-          
+
           else if(cookieStoreId == null) {
             resolve(results_array);
-          }          
+          }
 
 
           else {
@@ -57,7 +69,7 @@ window.proxifiedContainers = {
         {
           proxifiedContainersStore[index] = {cookieStoreId: cookieStoreId, proxy: proxy};
         }
-        
+
         browser.storage.local.set({proxifiedContainersKey: proxifiedContainersStore});
         resolve(proxifiedContainersStore[index]);
       }, (errorObj) => {
diff --git a/src/manifest.json b/src/manifest.json
index bab033b..06627bd 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -30,7 +30,8 @@
     "storage",
     "tabs",
     "webRequestBlocking",
-    "webRequest"
+    "webRequest",
+    "proxy"
   ],
 
   "commands": {

From e3531fb7b54b14dbbf3385e03f1c8a3667c012c1 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Tue, 9 Oct 2018 12:39:18 -0400
Subject: [PATCH 06/32] Fixed lint JS errors

---
 src/js/background/assignManager.js |   5 +-
 src/js/popup.js                    |  26 ++++---
 src/js/proxified-containers.js     | 117 +++++++++++++++++------------
 3 files changed, 87 insertions(+), 61 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 6d34cfa..1d48609 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -121,8 +121,8 @@ const assignManager = {
     if(requestInfo.tabId === -1)
       return {type: "direct"};
 
-    var tab = await browser.tabs.get(requestInfo.tabId);
-    var proxy = await window.proxifiedContainers.retrieveFromBackground(tab.cookieStoreId);
+    const tab = await browser.tabs.get(requestInfo.tabId);
+    const proxy = await window.proxifiedContainers.retrieveFromBackground(tab.cookieStoreId);
 
     return proxy;
   },
@@ -235,7 +235,6 @@ const assignManager = {
     });
 
     // Before anything happens we decide if the request should be proxified
-    browser.extension.getBackgroundPage().console.log('[SAMUEL CODE] Adding proxy.onRequest listener');
     browser.proxy.onRequest.addListener(this.handleProxifiedRequest, {urls: ["<all_urls>"]});
 
     // Before a request is handled by the browser we decide if we should route through a different container
diff --git a/src/js/popup.js b/src/js/popup.js
index 8507cce..2d63395 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1069,26 +1069,32 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       iconInput.checked = iconInput.value === identity.icon;
     });
 
-    var edit_proxy_dom = function(result) {
-      if(result.type == "http")
-        document.querySelector('#edit-container-panel-proxy').value = result.host.toString() + ":" + result.port.toString();
-      else if(result.type == "direct")
-        document.querySelector('#edit-container-panel-proxy').value = "";
-    }
+    const edit_proxy_dom = function(result) {
+      if(result.type === "http")
+        document.querySelector("#edit-container-panel-proxy").value = result.host.toString() + ":" + result.port.toString();
+      else if(result.type === "direct")
+        document.querySelector("#edit-container-panel-proxy").value = "";
+    };
+
+
 
     window.proxifiedContainers.retrieve(identity.cookieStoreId).then((result) => {
       edit_proxy_dom(result.proxy);
     }, (error) => {
-      if(error.error == "uninitialized" || error.error == "doesnotexist") {
-        window.proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error == "uninitialized").then((result) => {
+      if(error.error === "uninitialized" || error.error === "doesnotexist") {
+        window.proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error === "uninitialized").then((result) => {
           edit_proxy_dom(result.proxy);
         }, (error) => {
-          browser.extension.getBackgroundPage().console.log(error);
+          window.proxifiedContainers.report_proxy_error(error);
+        }).catch((error) => {
+          window.proxifiedContainers.report_proxy_error(error);
         });
       }
       else {
-        browser.extension.getBackgroundPage().console.log(error);
+        window.proxifiedContainers.report_proxy_error(error);
       }
+    }).catch((error) => {
+      window.proxifiedContainers.report_proxy_error(error);
     });
 
     return Promise.resolve(null);
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index e56589e..0d2fbe9 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -6,90 +6,111 @@ window.proxifiedContainers = {
     return new Promise((resolve, reject) => {
       window.proxifiedContainers.retrieve(cookieStoreId).then((success) => {
         resolve(success.proxy);
-      }, (error) => {
-        resolve({type: "direct"});
+      }, function() {
+        resolve({
+          type: "direct"
+        });
+      }).catch((error) => {
+        reject(error);
       });
     });
   },
 
+  report_proxy_error: function(error) {
+    //Currently I print to console but this is inefficient
+    browser.extension.getBackgroundPage().console.log("proxifiedContainers error occured: " + JSON.Stringify(error));
+  },
+
   //Resolves to a proxy object which can be used in the return of the listener required for browser.proxy.onRequest.addListener
   retrieve: function(cookieStoreId = null) {
     return new Promise((resolve, reject) => {
       browser.storage.local.get("proxifiedContainersKey").then((results) => {
-          //Steps to test:
-          //1. Is result empty? If so we must inform the caller to intialize proxifiedContainersStore with some initial info.
-          //2. Is cookieStoreId null? This means the caller probably wants everything currently in the proxifiedContainersStore object store
-          //3. If there doesn't exist an entry for the associated cookieStoreId, inform the caller of this
-          //4. Normal operation - if the cookieStoreId exists in the map, we can simply resolve with the correct proxy value
+        //Steps to test:
+        //1. Is result empty? If so we must inform the caller to intialize proxifiedContainersStore with some initial info.
+        //2. Is cookieStoreId null? This means the caller probably wants everything currently in the proxifiedContainersStore object store
+        //3. If there doesn't exist an entry for the associated cookieStoreId, inform the caller of this
+        //4. Normal operation - if the cookieStoreId exists in the map, we can simply resolve with the correct proxy value
 
-          var results_array = results["proxifiedContainersKey"];
+        const results_array = results["proxifiedContainersKey"];
 
-          if (Object.getOwnPropertyNames(results).length == 0) {
-            reject({error: "uninitialized", message: ""});
+        if (Object.getOwnPropertyNames(results).length === 0) {
+          reject({
+            error: "uninitialized",
+            message: ""
+          });
+        } else if (cookieStoreId === null) {
+          resolve(results_array);
+        } else {
+          const val = results_array.find(o => o.cookieStoreId === cookieStoreId);
+          if (val === null) {
+            reject({
+              error: "doesnotexist",
+              message: ""
+            });
+          } else {
+            resolve(val);
           }
-
-          else if(cookieStoreId == null) {
-            resolve(results_array);
-          }
-
-
-          else {
-            var val = results_array.find(o => o.cookieStoreId === cookieStoreId);
-            if(val == null) {
-              reject({error: "doesnotexist", message: ""});
-            }
-            else {
-              resolve(val);
-            }
-          }
-
-        }, (error) => {
-          reject({error: "internal", message: error});
         }
-      );
+
+      }, (error) => {
+        reject({
+          error: "internal",
+          message: error
+        });
+      }).catch((error) => {
+        window.proxifiedContainers.report_proxy_error(error);
+      });
     });
   },
   set: function(cookieStoreId, proxy, initialize = false) {
     return new Promise((resolve, reject) => {
-      if(initialize === true) {
-        var proxifiedContainersStore = [];
-        browser.storage.local.set({proxifiedContainersKey: proxifiedContainersStore});
+      if (initialize === true) {
+        const proxifiedContainersStore = [];
+        browser.storage.local.set({
+          proxifiedContainersKey: proxifiedContainersStore
+        });
       }
 
       //Assumes proxy is a properly formatted object
       window.proxifiedContainers.retrieve().then((proxifiedContainersStore) => {
 
-        var index = proxifiedContainersStore.findIndex(i => i.cookieStoreId === cookieStoreId);
-        if(index === -1)
-        {
-          proxifiedContainersStore.push({cookieStoreId: cookieStoreId, proxy: proxy});
+        let index = proxifiedContainersStore.findIndex(i => i.cookieStoreId === cookieStoreId);
+        if (index === -1) {
+          proxifiedContainersStore.push({
+            cookieStoreId: cookieStoreId,
+            proxy: proxy
+          });
           index = proxifiedContainersStore.length - 1;
-        }
-        else
-        {
-          proxifiedContainersStore[index] = {cookieStoreId: cookieStoreId, proxy: proxy};
+        } else {
+          proxifiedContainersStore[index] = {
+            cookieStoreId: cookieStoreId,
+            proxy: proxy
+          };
         }
 
-        browser.storage.local.set({proxifiedContainersKey: proxifiedContainersStore});
+        browser.storage.local.set({
+          proxifiedContainersKey: proxifiedContainersStore
+        });
         resolve(proxifiedContainersStore[index]);
       }, (errorObj) => {
         reject(errorObj);
+      }).catch((error) => {
+        throw error;
       });
     });
   },
   parseProxy: function(proxy_str) {
-    var regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
-    if(regexp.test(proxy_str) !== true)
+    const regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
+    if (regexp.test(proxy_str) !== true)
       return false;
 
-    else
-    {
-      var matches = regexp.exec(proxy_str);
+    else {
+      const matches = regexp.exec(proxy_str);
 
-      var result = {
+      const result = {
         type: "http",
         host: matches[4],
-        port: parseInt(matches[11]) || 8080,
+        port: parseInt(matches[11], 10) || 8080,
         username: matches[2] || "",
         password: matches[3] || ""
       };

From 768ae66a646c870b84264c26f4fd4f783e26c66b Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Tue, 9 Oct 2018 12:56:17 -0400
Subject: [PATCH 07/32] Fixed typo

---
 src/js/proxified-containers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 0d2fbe9..eb94519 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -18,7 +18,7 @@ window.proxifiedContainers = {
 
   report_proxy_error: function(error) {
     //Currently I print to console but this is inefficient
-    browser.extension.getBackgroundPage().console.log("proxifiedContainers error occured: " + JSON.Stringify(error));
+    browser.extension.getBackgroundPage().console.log("proxifiedContainers error occured: " + JSON.stringify(error));
   },
 
   //Resolves to a proxy object which can be used in the return of the listener required for browser.proxy.onRequest.addListener

From 0a864f0cf35386f13feb4ec33422d28ef0bbffc9 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Wed, 10 Oct 2018 15:54:33 -0400
Subject: [PATCH 08/32] Fixed weird problem after code lint modifications

---
 src/js/popup.js                | 10 +++++-----
 src/js/proxified-containers.js | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 2d63395..6e8fa1e 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1085,16 +1085,16 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
         window.proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error === "uninitialized").then((result) => {
           edit_proxy_dom(result.proxy);
         }, (error) => {
-          window.proxifiedContainers.report_proxy_error(error);
+          window.proxifiedContainers.report_proxy_error(error, "popup.js: occurence 1");
         }).catch((error) => {
-          window.proxifiedContainers.report_proxy_error(error);
+          window.proxifiedContainers.report_proxy_error(error, "popup.js: occurence 2");
         });
       }
       else {
-        window.proxifiedContainers.report_proxy_error(error);
+        window.proxifiedContainers.report_proxy_error(error, "popup.js: occurence 3");
       }
-    }).catch((error) => {
-      window.proxifiedContainers.report_proxy_error(error);
+    }).catch((err) => {
+      window.proxifiedContainers.report_proxy_error(err, "popup.js: occurence 4");
     });
 
     return Promise.resolve(null);
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index eb94519..a6bd6b6 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -16,9 +16,10 @@ window.proxifiedContainers = {
     });
   },
 
-  report_proxy_error: function(error) {
+  report_proxy_error: function(error, identifier = null) {
     //Currently I print to console but this is inefficient
-    browser.extension.getBackgroundPage().console.log("proxifiedContainers error occured: " + JSON.stringify(error));
+    const relevant_id_str = identifier === null ? "" : " call supplied with id: " + identifier.toString() + " ";
+    browser.extension.getBackgroundPage().console.log("proxifiedContainers error occured" + relevant_id_str + ": " + JSON.stringify(error));
   },
 
   //Resolves to a proxy object which can be used in the return of the listener required for browser.proxy.onRequest.addListener
@@ -42,7 +43,8 @@ window.proxifiedContainers = {
           resolve(results_array);
         } else {
           const val = results_array.find(o => o.cookieStoreId === cookieStoreId);
-          if (val === null) {
+
+          if (typeof val !== "object" ) {
             reject({
               error: "doesnotexist",
               message: ""
@@ -58,7 +60,7 @@ window.proxifiedContainers = {
           message: error
         });
       }).catch((error) => {
-        window.proxifiedContainers.report_proxy_error(error);
+        window.proxifiedContainers.report_proxy_error(error, "5");
       });
     });
   },

From 34bde8306727b781be12d1e69f032bc952c0d59f Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Thu, 11 Oct 2018 17:54:51 -0400
Subject: [PATCH 09/32] Fixed problem where creating a new container did not
 correctly associate the proxy entered with it

---
 src/js/background/backgroundLogic.js |  5 +++++
 src/js/popup.js                      | 13 +++++++-----
 src/js/proxified-containers.js       | 31 +++++++++++++++++++++++++---
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index a27d199..a2d2120 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -46,6 +46,11 @@ const backgroundLogic = {
       window.proxifiedContainers.set(this.cookieStoreId(options.userContextId), options.proxy);
     } else {
       donePromise = browser.contextualIdentities.create(options.params);
+
+      //We cannot yet access the new cookieStoreId via this.cookieStoreId(...), so we take this from the resolved promise
+      donePromise.then((identity) => {
+        window.proxifiedContainers.set(identity.cookieStoreId, options.proxy);
+      });
     }
     await donePromise;
     browser.runtime.sendMessage({
diff --git a/src/js/popup.js b/src/js/popup.js
index 6e8fa1e..38e80da 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1069,6 +1069,9 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       iconInput.checked = iconInput.value === identity.icon;
     });
 
+    //Clear the proxy field before doing the retrieval requests below
+    document.querySelector("#edit-container-panel-proxy").value = "";
+
     const edit_proxy_dom = function(result) {
       if(result.type === "http")
         document.querySelector("#edit-container-panel-proxy").value = result.host.toString() + ":" + result.port.toString();
@@ -1083,18 +1086,18 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     }, (error) => {
       if(error.error === "uninitialized" || error.error === "doesnotexist") {
         window.proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error === "uninitialized").then((result) => {
-          edit_proxy_dom(result.proxy);
+          edit_proxy_dom(result);
         }, (error) => {
-          window.proxifiedContainers.report_proxy_error(error, "popup.js: occurence 1");
+          window.proxifiedContainers.report_proxy_error(error, "popup.js: error 1");
         }).catch((error) => {
-          window.proxifiedContainers.report_proxy_error(error, "popup.js: occurence 2");
+          window.proxifiedContainers.report_proxy_error(error, "popup.js: error 2");
         });
       }
       else {
-        window.proxifiedContainers.report_proxy_error(error, "popup.js: occurence 3");
+        window.proxifiedContainers.report_proxy_error(error, "popup.js: error 3");
       }
     }).catch((err) => {
-      window.proxifiedContainers.report_proxy_error(err, "popup.js: occurence 4");
+      window.proxifiedContainers.report_proxy_error(err, "popup.js: error 4");
     });
 
     return Promise.resolve(null);
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index a6bd6b6..4ab2751 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -1,3 +1,20 @@
+//Below lets us print errors, huge thanks to Jonothan @ https://stackoverflow.com/questions/18391212/is-it-not-possible-to-stringify-an-error-using-json-stringify
+if (!('toJSON' in Error.prototype))
+Object.defineProperty(Error.prototype, 'toJSON', {
+    value: function () {
+        var alt = {};
+
+        Object.getOwnPropertyNames(this).forEach(function (key) {
+            alt[key] = this[key];
+        }, this);
+
+        return alt;
+    },
+    configurable: true,
+    writable: true
+});
+
+
 //This object allows other scripts to access the list mapping containers to their proxies
 window.proxifiedContainers = {
 
@@ -60,7 +77,7 @@ window.proxifiedContainers = {
           message: error
         });
       }).catch((error) => {
-        window.proxifiedContainers.report_proxy_error(error, "5");
+        window.proxifiedContainers.report_proxy_error(error, "proxified-containers.js: error 1");
       });
     });
   },
@@ -68,15 +85,22 @@ window.proxifiedContainers = {
     return new Promise((resolve, reject) => {
       if (initialize === true) {
         const proxifiedContainersStore = [];
+        proxifiedContainersStore.push({
+          cookieStoreId: cookieStoreId,
+          proxy: proxy
+        });
+
         browser.storage.local.set({
           proxifiedContainersKey: proxifiedContainersStore
         });
+
+        resolve(proxy);
       }
 
       //Assumes proxy is a properly formatted object
       window.proxifiedContainers.retrieve().then((proxifiedContainersStore) => {
-
         let index = proxifiedContainersStore.findIndex(i => i.cookieStoreId === cookieStoreId);
+
         if (index === -1) {
           proxifiedContainersStore.push({
             cookieStoreId: cookieStoreId,
@@ -93,6 +117,7 @@ window.proxifiedContainers = {
         browser.storage.local.set({
           proxifiedContainersKey: proxifiedContainersStore
         });
+
         resolve(proxifiedContainersStore[index]);
       }, (errorObj) => {
         reject(errorObj);
@@ -100,7 +125,7 @@ window.proxifiedContainers = {
         throw error;
       });
     });
-  },
+   },
   parseProxy: function(proxy_str) {
     const regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
     if (regexp.test(proxy_str) !== true)

From 2a78aceac62edb9022379c2c903e30704979f294 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Thu, 11 Oct 2018 18:00:12 -0400
Subject: [PATCH 10/32] Minor lint fixes

---
 src/js/proxified-containers.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 4ab2751..be538c9 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -1,18 +1,18 @@
 //Below lets us print errors, huge thanks to Jonothan @ https://stackoverflow.com/questions/18391212/is-it-not-possible-to-stringify-an-error-using-json-stringify
-if (!('toJSON' in Error.prototype))
-Object.defineProperty(Error.prototype, 'toJSON', {
-    value: function () {
-        var alt = {};
+if (!("toJSON" in Error.prototype))
+  Object.defineProperty(Error.prototype, "toJSON", {
+    value: function() {
+      let alt = {};
 
-        Object.getOwnPropertyNames(this).forEach(function (key) {
-            alt[key] = this[key];
-        }, this);
+      Object.getOwnPropertyNames(this).forEach(function(key) {
+        alt[key] = this[key];
+      }, this);
 
-        return alt;
+      return alt;
     },
     configurable: true,
     writable: true
-});
+  });
 
 
 //This object allows other scripts to access the list mapping containers to their proxies
@@ -61,7 +61,7 @@ window.proxifiedContainers = {
         } else {
           const val = results_array.find(o => o.cookieStoreId === cookieStoreId);
 
-          if (typeof val !== "object" ) {
+          if (typeof val !== "object" || val === null) {
             reject({
               error: "doesnotexist",
               message: ""
@@ -125,7 +125,7 @@ window.proxifiedContainers = {
         throw error;
       });
     });
-   },
+  },
   parseProxy: function(proxy_str) {
     const regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
     if (regexp.test(proxy_str) !== true)

From 7f252c75b81f41fb0629868916193ed08618f4dd Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Thu, 11 Oct 2018 18:10:13 -0400
Subject: [PATCH 11/32] Final lint fixes

---
 src/js/background/backgroundLogic.js | 2 ++
 src/js/proxified-containers.js       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index a2d2120..1b2f6ac 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -50,6 +50,8 @@ const backgroundLogic = {
       //We cannot yet access the new cookieStoreId via this.cookieStoreId(...), so we take this from the resolved promise
       donePromise.then((identity) => {
         window.proxifiedContainers.set(identity.cookieStoreId, options.proxy);
+      }).catch(() => {
+        //Empty because this should never happen theoretically.
       });
     }
     await donePromise;
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index be538c9..cdea00a 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -2,12 +2,12 @@
 if (!("toJSON" in Error.prototype))
   Object.defineProperty(Error.prototype, "toJSON", {
     value: function() {
-      let alt = {};
+      const alt = {};
 
       Object.getOwnPropertyNames(this).forEach(function(key) {
         alt[key] = this[key];
       }, this);
-
+      
       return alt;
     },
     configurable: true,

From 70511e27221e41e56c82e8f9e52c5b72af52e490 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Mon, 15 Oct 2018 17:21:56 -0400
Subject: [PATCH 12/32] Added space after // everywhere where relevant

---
 src/js/background/backgroundLogic.js |  6 +++---
 src/js/popup.js                      |  2 +-
 src/js/proxified-containers.js       | 32 ++++++++++++++--------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 1b2f6ac..30ec3d5 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -47,11 +47,11 @@ const backgroundLogic = {
     } else {
       donePromise = browser.contextualIdentities.create(options.params);
 
-      //We cannot yet access the new cookieStoreId via this.cookieStoreId(...), so we take this from the resolved promise
+      // We cannot yet access the new cookieStoreId via this.cookieStoreId(...), so we take this from the resolved promise
       donePromise.then((identity) => {
         window.proxifiedContainers.set(identity.cookieStoreId, options.proxy);
       }).catch(() => {
-        //Empty because this should never happen theoretically.
+        // Empty because this should never happen theoretically.
       });
     }
     await donePromise;
@@ -165,7 +165,7 @@ const backgroundLogic = {
         index: -1
       });
     } else {
-      //As we get a blank tab here we will need to await the tabs creation
+      // As we get a blank tab here we will need to await the tabs creation
       newWindowObj = await browser.windows.create({
       });
       hiddenDefaultTabToClose = true;
diff --git a/src/js/popup.js b/src/js/popup.js
index 38e80da..7b72eb1 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1069,7 +1069,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       iconInput.checked = iconInput.value === identity.icon;
     });
 
-    //Clear the proxy field before doing the retrieval requests below
+    // Clear the proxy field before doing the retrieval requests below
     document.querySelector("#edit-container-panel-proxy").value = "";
 
     const edit_proxy_dom = function(result) {
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index cdea00a..51bcf7d 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -1,4 +1,4 @@
-//Below lets us print errors, huge thanks to Jonothan @ https://stackoverflow.com/questions/18391212/is-it-not-possible-to-stringify-an-error-using-json-stringify
+// Below lets us print errors, huge thanks to Jonothan @ https://stackoverflow.com/questions/18391212/is-it-not-possible-to-stringify-an-error-using-json-stringify
 if (!("toJSON" in Error.prototype))
   Object.defineProperty(Error.prototype, "toJSON", {
     value: function() {
@@ -7,7 +7,7 @@ if (!("toJSON" in Error.prototype))
       Object.getOwnPropertyNames(this).forEach(function(key) {
         alt[key] = this[key];
       }, this);
-      
+
       return alt;
     },
     configurable: true,
@@ -15,10 +15,10 @@ if (!("toJSON" in Error.prototype))
   });
 
 
-//This object allows other scripts to access the list mapping containers to their proxies
-window.proxifiedContainers = {
+// This object allows other scripts to access the list mapping containers to their proxies
+proxifiedContainers = {
 
-  //Slightly modified version of 'retrieve' which returns a direct proxy whenever an error is met.
+  // Slightly modified version of 'retrieve' which returns a direct proxy whenever an error is met.
   retrieveFromBackground: function(cookieStoreId = null) {
     return new Promise((resolve, reject) => {
       window.proxifiedContainers.retrieve(cookieStoreId).then((success) => {
@@ -34,20 +34,20 @@ window.proxifiedContainers = {
   },
 
   report_proxy_error: function(error, identifier = null) {
-    //Currently I print to console but this is inefficient
-    const relevant_id_str = identifier === null ? "" : " call supplied with id: " + identifier.toString() + " ";
-    browser.extension.getBackgroundPage().console.log("proxifiedContainers error occured" + relevant_id_str + ": " + JSON.stringify(error));
+    // Currently I print to console but this is inefficient
+    const relevant_id_str = identifier === null ? "" : ` call supplied with id: ${identifier.toString()}`;
+    browser.extension.getBackgroundPage().console.log(`proxifiedContainers error occured ${relevant_id_str}: ${JSON.stringify(error)}`);
   },
 
-  //Resolves to a proxy object which can be used in the return of the listener required for browser.proxy.onRequest.addListener
+  // Resolves to a proxy object which can be used in the return of the listener required for browser.proxy.onRequest.addListener
   retrieve: function(cookieStoreId = null) {
     return new Promise((resolve, reject) => {
       browser.storage.local.get("proxifiedContainersKey").then((results) => {
-        //Steps to test:
-        //1. Is result empty? If so we must inform the caller to intialize proxifiedContainersStore with some initial info.
-        //2. Is cookieStoreId null? This means the caller probably wants everything currently in the proxifiedContainersStore object store
-        //3. If there doesn't exist an entry for the associated cookieStoreId, inform the caller of this
-        //4. Normal operation - if the cookieStoreId exists in the map, we can simply resolve with the correct proxy value
+        // Steps to test:
+        // 1. Is result empty? If so we must inform the caller to intialize proxifiedContainersStore with some initial info.
+        // 2. Is cookieStoreId null? This means the caller probably wants everything currently in the proxifiedContainersStore object store
+        // 3. If there doesn't exist an entry for the associated cookieStoreId, inform the caller of this
+        // 4. Normal operation - if the cookieStoreId exists in the map, we can simply resolve with the correct proxy value
 
         const results_array = results["proxifiedContainersKey"];
 
@@ -97,8 +97,8 @@ window.proxifiedContainers = {
         resolve(proxy);
       }
 
-      //Assumes proxy is a properly formatted object
-      window.proxifiedContainers.retrieve().then((proxifiedContainersStore) => {
+      // Assumes proxy is a properly formatted object
+      proxifiedContainers.retrieve().then((proxifiedContainersStore) => {
         let index = proxifiedContainersStore.findIndex(i => i.cookieStoreId === cookieStoreId);
 
         if (index === -1) {

From 3a0af389007c044668a7821515292de76b9988e2 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Mon, 15 Oct 2018 17:27:07 -0400
Subject: [PATCH 13/32] Replaced window with global and modified eslintrc

---
 .eslintrc.js                         |  3 ++-
 src/js/background/assignManager.js   |  2 +-
 src/js/background/backgroundLogic.js |  4 ++--
 src/js/popup.js                      | 14 +++++++-------
 src/js/proxified-containers.js       |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1b0e906..037d812 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -18,7 +18,8 @@ module.exports = {
     "XPCOMUtils": true,
     "OS": true,
     "ADDON_UNINSTALL": true,
-    "ADDON_DISABLE": true
+    "ADDON_DISABLE": true,
+    "proxifiedContainers": true
   },
   "plugins": [
     "promise",
diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 1d48609..dd1fc5e 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -122,7 +122,7 @@ const assignManager = {
       return {type: "direct"};
 
     const tab = await browser.tabs.get(requestInfo.tabId);
-    const proxy = await window.proxifiedContainers.retrieveFromBackground(tab.cookieStoreId);
+    const proxy = await proxifiedContainers.retrieveFromBackground(tab.cookieStoreId);
 
     return proxy;
   },
diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 30ec3d5..6eef30e 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -43,13 +43,13 @@ const backgroundLogic = {
         options.params
       );
 
-      window.proxifiedContainers.set(this.cookieStoreId(options.userContextId), options.proxy);
+      proxifiedContainers.set(this.cookieStoreId(options.userContextId), options.proxy);
     } else {
       donePromise = browser.contextualIdentities.create(options.params);
 
       // We cannot yet access the new cookieStoreId via this.cookieStoreId(...), so we take this from the resolved promise
       donePromise.then((identity) => {
-        window.proxifiedContainers.set(identity.cookieStoreId, options.proxy);
+        proxifiedContainers.set(identity.cookieStoreId, options.proxy);
       }).catch(() => {
         // Empty because this should never happen theoretically.
       });
diff --git a/src/js/popup.js b/src/js/popup.js
index 7b72eb1..9523371 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -967,7 +967,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
             icon: formValues.get("container-icon") || DEFAULT_ICON,
             color: formValues.get("container-color") || DEFAULT_COLOR
           },
-          proxy: window.proxifiedContainers.parseProxy(document.getElementById("edit-container-panel-proxy").value) || DEFAULT_PROXY
+          proxy: proxifiedContainers.parseProxy(document.getElementById("edit-container-panel-proxy").value) || DEFAULT_PROXY
         }
       });
       await Logic.refreshIdentities();
@@ -1081,23 +1081,23 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
 
 
 
-    window.proxifiedContainers.retrieve(identity.cookieStoreId).then((result) => {
+    proxifiedContainers.retrieve(identity.cookieStoreId).then((result) => {
       edit_proxy_dom(result.proxy);
     }, (error) => {
       if(error.error === "uninitialized" || error.error === "doesnotexist") {
-        window.proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error === "uninitialized").then((result) => {
+        proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error === "uninitialized").then((result) => {
           edit_proxy_dom(result);
         }, (error) => {
-          window.proxifiedContainers.report_proxy_error(error, "popup.js: error 1");
+          proxifiedContainers.report_proxy_error(error, "popup.js: error 1");
         }).catch((error) => {
-          window.proxifiedContainers.report_proxy_error(error, "popup.js: error 2");
+          proxifiedContainers.report_proxy_error(error, "popup.js: error 2");
         });
       }
       else {
-        window.proxifiedContainers.report_proxy_error(error, "popup.js: error 3");
+        proxifiedContainers.report_proxy_error(error, "popup.js: error 3");
       }
     }).catch((err) => {
-      window.proxifiedContainers.report_proxy_error(err, "popup.js: error 4");
+      proxifiedContainers.report_proxy_error(err, "popup.js: error 4");
     });
 
     return Promise.resolve(null);
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 51bcf7d..1333759 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -21,7 +21,7 @@ proxifiedContainers = {
   // Slightly modified version of 'retrieve' which returns a direct proxy whenever an error is met.
   retrieveFromBackground: function(cookieStoreId = null) {
     return new Promise((resolve, reject) => {
-      window.proxifiedContainers.retrieve(cookieStoreId).then((success) => {
+      proxifiedContainers.retrieve(cookieStoreId).then((success) => {
         resolve(success.proxy);
       }, function() {
         resolve({
@@ -77,7 +77,7 @@ proxifiedContainers = {
           message: error
         });
       }).catch((error) => {
-        window.proxifiedContainers.report_proxy_error(error, "proxified-containers.js: error 1");
+        proxifiedContainers.report_proxy_error(error, "proxified-containers.js: error 1");
       });
     });
   },

From bcc8747305543707727eec2d1b0bc112cdc28984 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 28 Oct 2018 15:16:09 -0400
Subject: [PATCH 14/32] Changed function declaration syntax in
 proxified-containers.js per review

---
 src/js/proxified-containers.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 1333759..717f3bb 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -19,7 +19,7 @@ if (!("toJSON" in Error.prototype))
 proxifiedContainers = {
 
   // Slightly modified version of 'retrieve' which returns a direct proxy whenever an error is met.
-  retrieveFromBackground: function(cookieStoreId = null) {
+  retrieveFromBackground(cookieStoreId = null) {
     return new Promise((resolve, reject) => {
       proxifiedContainers.retrieve(cookieStoreId).then((success) => {
         resolve(success.proxy);
@@ -33,14 +33,14 @@ proxifiedContainers = {
     });
   },
 
-  report_proxy_error: function(error, identifier = null) {
+  report_proxy_error(error, identifier = null) {
     // Currently I print to console but this is inefficient
     const relevant_id_str = identifier === null ? "" : ` call supplied with id: ${identifier.toString()}`;
     browser.extension.getBackgroundPage().console.log(`proxifiedContainers error occured ${relevant_id_str}: ${JSON.stringify(error)}`);
   },
 
   // Resolves to a proxy object which can be used in the return of the listener required for browser.proxy.onRequest.addListener
-  retrieve: function(cookieStoreId = null) {
+  retrieve(cookieStoreId = null) {
     return new Promise((resolve, reject) => {
       browser.storage.local.get("proxifiedContainersKey").then((results) => {
         // Steps to test:
@@ -81,7 +81,7 @@ proxifiedContainers = {
       });
     });
   },
-  set: function(cookieStoreId, proxy, initialize = false) {
+  set(cookieStoreId, proxy, initialize = false) {
     return new Promise((resolve, reject) => {
       if (initialize === true) {
         const proxifiedContainersStore = [];
@@ -126,7 +126,7 @@ proxifiedContainers = {
       });
     });
   },
-  parseProxy: function(proxy_str) {
+  parseProxy(proxy_str) {
     const regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
     if (regexp.test(proxy_str) !== true)
       return false;

From ef036c107aa75047cc3cfe6da075ff5a1860c1eb Mon Sep 17 00:00:00 2001
From: Jonathan Kingston <jonathan@jooped.co.uk>
Date: Sun, 28 Oct 2018 15:27:33 -0400
Subject: [PATCH 15/32] Update assignment of panel proxy DOM element to use
 templates

Co-Authored-By: samuel-crypto <33577612+samuel-crypto@users.noreply.github.com>
---
 src/js/popup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 9523371..89a777c 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1074,7 +1074,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
 
     const edit_proxy_dom = function(result) {
       if(result.type === "http")
-        document.querySelector("#edit-container-panel-proxy").value = result.host.toString() + ":" + result.port.toString();
+        document.querySelector("#edit-container-panel-proxy").value = `${result.host}:${result.port}`;
       else if(result.type === "direct")
         document.querySelector("#edit-container-panel-proxy").value = "";
     };

From 196079700a41087801b3ef1cddfcfd43377e7088 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 28 Oct 2018 15:28:52 -0400
Subject: [PATCH 16/32] Corrected name typo, appologies

---
 src/js/proxified-containers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 717f3bb..0853bc7 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -1,4 +1,4 @@
-// Below lets us print errors, huge thanks to Jonothan @ https://stackoverflow.com/questions/18391212/is-it-not-possible-to-stringify-an-error-using-json-stringify
+// Below lets us print errors, huge thanks to Jonathan @ https://stackoverflow.com/questions/18391212/is-it-not-possible-to-stringify-an-error-using-json-stringify
 if (!("toJSON" in Error.prototype))
   Object.defineProperty(Error.prototype, "toJSON", {
     value: function() {

From 0e8653129a2a821fc6c982d9929ee0749012d8f5 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 28 Oct 2018 15:31:30 -0400
Subject: [PATCH 17/32] Added mildly useful error messages for console in
 popup.js

---
 src/js/popup.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 89a777c..8dd3ff7 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1088,16 +1088,16 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
         proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error === "uninitialized").then((result) => {
           edit_proxy_dom(result);
         }, (error) => {
-          proxifiedContainers.report_proxy_error(error, "popup.js: error 1");
+          proxifiedContainers.report_proxy_error(error, "popup.js: unexpected set(...) error");
         }).catch((error) => {
-          proxifiedContainers.report_proxy_error(error, "popup.js: error 2");
+          proxifiedContainers.report_proxy_error(error, "popup.js: unexpected set(...) exception");
         });
       }
       else {
-        proxifiedContainers.report_proxy_error(error, "popup.js: error 3");
+        proxifiedContainers.report_proxy_error(error, "popup.js: unknown error");
       }
     }).catch((err) => {
-      proxifiedContainers.report_proxy_error(err, "popup.js: error 4");
+      proxifiedContainers.report_proxy_error(err, "popup.js: unexpected retrieve error");
     });
 
     return Promise.resolve(null);

From f2118727969261964889e01a5c724e0f0160386e Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 28 Oct 2018 15:33:35 -0400
Subject: [PATCH 18/32] comment explaining proxified-container.js:parseProxy

---
 src/js/proxified-containers.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 0853bc7..431b70d 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -126,6 +126,8 @@ proxifiedContainers = {
       });
     });
   },
+
+  //Parses a proxy description string of the format host[:port] or username:password@[host:port] (port is optional)
   parseProxy(proxy_str) {
     const regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
     if (regexp.test(proxy_str) !== true)

From b6f4ac9b5f1c6deb302263201aa7f92ecb02fd18 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 28 Oct 2018 15:38:02 -0400
Subject: [PATCH 19/32] Minor typo in comment

---
 src/js/proxified-containers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 431b70d..85a1ed4 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -127,7 +127,7 @@ proxifiedContainers = {
     });
   },
 
-  //Parses a proxy description string of the format host[:port] or username:password@[host:port] (port is optional)
+  //Parses a proxy description string of the format host[:port] or username:password@host[:port] (port is optional)
   parseProxy(proxy_str) {
     const regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
     if (regexp.test(proxy_str) !== true)

From fc2c7ff4be685dc06091caa83791afd6ac60ef76 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Sun, 28 Oct 2018 15:50:09 -0400
Subject: [PATCH 20/32] Added DEFAULT_PROXY constant to utils

---
 src/js/utils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/js/utils.js b/src/js/utils.js
index 804e9d9..86e18f0 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -18,6 +18,7 @@ window.Utils = {
     imageElement.addEventListener("error", errorListener);
     imageElement.addEventListener("load", loadListener);
     return imageElement;
-  }
+  },
+  DEFAULT_PROXY: Object.freeze({type: "direct"})
 
 };

From 8ee45a38f0bc9891cc704bf36917f6294945c62d Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Thu, 1 Nov 2018 10:57:42 -0400
Subject: [PATCH 21/32] proxifiedContainers.delete routine added and loosely
 tested

---
 src/js/proxified-containers.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 85a1ed4..1cd0b01 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -146,5 +146,31 @@ proxifiedContainers = {
 
       return result;
     }
+  },
+
+  //Deletes the proxy information object for a specified cookieStoreId [useful for cleaning]
+  delete(cookieStoreId) {
+    return new Promise((resolve, reject) => {
+      // Assumes proxy is a properly formatted object
+      proxifiedContainers.retrieve().then((proxifiedContainersStore) => {
+        let index = proxifiedContainersStore.findIndex(i => i.cookieStoreId === cookieStoreId);
+
+        if (index === -1) {
+          reject({error: "not-found", message: `Container '${cookieStoreId}' not found.`});
+        } else {
+          delete proxifiedContainersStore[index];
+        }
+
+        browser.storage.local.set({
+          proxifiedContainersKey: proxifiedContainersStore
+        });
+
+        resolve();
+      }, (errorObj) => {
+        reject(errorObj);
+      }).catch((error) => {
+        throw error;
+      });
+    });
   }
 };

From f47b4c8f6c37b1c9bc0dfb01530d8e2df5cfda2e Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Fri, 2 Nov 2018 07:47:29 -0400
Subject: [PATCH 22/32] Added clean up of proxy association after container
 deletion

---
 src/js/background/backgroundLogic.js | 4 ++++
 src/js/proxified-containers.js       | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 6eef30e..30d0d55 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -32,6 +32,10 @@ const backgroundLogic = {
       await browser.contextualIdentities.remove(this.cookieStoreId(userContextId));
     }
     assignManager.deleteContainer(userContextId);
+
+    // Now remove the identity->proxy association in proxifiedContainers also
+    proxifiedContainers.delete(this.cookieStoreId(userContextId));
+
     return {done: true, userContextId};
   },
 
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 1cd0b01..909996a 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -148,17 +148,17 @@ proxifiedContainers = {
     }
   },
 
-  //Deletes the proxy information object for a specified cookieStoreId [useful for cleaning]
+  // Deletes the proxy information object for a specified cookieStoreId [useful for cleaning]
   delete(cookieStoreId) {
     return new Promise((resolve, reject) => {
       // Assumes proxy is a properly formatted object
       proxifiedContainers.retrieve().then((proxifiedContainersStore) => {
-        let index = proxifiedContainersStore.findIndex(i => i.cookieStoreId === cookieStoreId);
+        const index = proxifiedContainersStore.findIndex(i => i.cookieStoreId === cookieStoreId);
 
         if (index === -1) {
           reject({error: "not-found", message: `Container '${cookieStoreId}' not found.`});
         } else {
-          delete proxifiedContainersStore[index];
+          proxifiedContainersStore.splice(index, 1);
         }
 
         browser.storage.local.set({

From 66cde0713543d3c549dec2abecc403b06119c1fc Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Fri, 2 Nov 2018 08:07:31 -0400
Subject: [PATCH 23/32] Created Utils.DEFAULT_PROXY and referenced it
 everywhere

---
 src/js/background/assignManager.js |  2 +-
 src/js/background/index.html       |  1 +
 src/js/popup.js                    |  5 ++---
 src/js/utils.js                    | 13 +++++++++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index dd1fc5e..93d4790 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -119,7 +119,7 @@ const assignManager = {
 
   async handleProxifiedRequest(requestInfo) {
     if(requestInfo.tabId === -1)
-      return {type: "direct"};
+      return Utils.DEFAULT_PROXY;
 
     const tab = await browser.tabs.get(requestInfo.tabId);
     const proxy = await proxifiedContainers.retrieveFromBackground(tab.cookieStoreId);
diff --git a/src/js/background/index.html b/src/js/background/index.html
index 86bccf1..cdbd82e 100644
--- a/src/js/background/index.html
+++ b/src/js/background/index.html
@@ -13,6 +13,7 @@
       "js/background/messageHandler.js",
     ]
 -->
+    <script type="text/javascript" src="../utils.js"></script>
     <script type="text/javascript" src="../proxified-containers.js"></script>
     <script type="text/javascript" src="backgroundLogic.js"></script>
     <script type="text/javascript" src="assignManager.js"></script>
diff --git a/src/js/popup.js b/src/js/popup.js
index 8dd3ff7..bdb2b87 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -7,7 +7,6 @@ const CONTAINER_UNHIDE_SRC = "/img/container-unhide.svg";
 const DEFAULT_COLOR = "blue";
 const DEFAULT_ICON = "circle";
 const NEW_CONTAINER_ID = "new";
-const DEFAULT_PROXY = {type: "direct"};
 
 const ONBOARDING_STORAGE_KEY = "onboarding-stage";
 
@@ -967,7 +966,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
             icon: formValues.get("container-icon") || DEFAULT_ICON,
             color: formValues.get("container-color") || DEFAULT_COLOR
           },
-          proxy: proxifiedContainers.parseProxy(document.getElementById("edit-container-panel-proxy").value) || DEFAULT_PROXY
+          proxy: proxifiedContainers.parseProxy(document.getElementById("edit-container-panel-proxy").value) || Utils.DEFAULT_PROXY
         }
       });
       await Logic.refreshIdentities();
@@ -1085,7 +1084,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       edit_proxy_dom(result.proxy);
     }, (error) => {
       if(error.error === "uninitialized" || error.error === "doesnotexist") {
-        proxifiedContainers.set(identity.cookieStoreId, DEFAULT_PROXY, error.error === "uninitialized").then((result) => {
+        proxifiedContainers.set(identity.cookieStoreId, Utils.DEFAULT_PROXY, error.error === "uninitialized").then((result) => {
           edit_proxy_dom(result);
         }, (error) => {
           proxifiedContainers.report_proxy_error(error, "popup.js: unexpected set(...) error");
diff --git a/src/js/utils.js b/src/js/utils.js
index 86e18f0..b027824 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -18,7 +18,16 @@ window.Utils = {
     imageElement.addEventListener("error", errorListener);
     imageElement.addEventListener("load", loadListener);
     return imageElement;
-  },
-  DEFAULT_PROXY: Object.freeze({type: "direct"})
+  }
 
 };
+
+// The following creates a fake (but convincing) constant Utils.DEFAULT_PROXY
+Object.defineProperty(window.Utils, "DEFAULT_PROXY", {
+  value: Object.freeze({type: "direct"}),
+  writable: false,
+  enumerable: true,
+
+  // Setting configurable to false avoids deletion of Utils.DEFAULT_PROXY
+  configurable: false
+});

From ca47c103f17ff356025de4f693e31e9165bfa8e2 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Fri, 2 Nov 2018 08:09:32 -0400
Subject: [PATCH 24/32] Fixed final ommision of Utils.DEFAULT_PROXY

---
 src/js/proxified-containers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 909996a..7ceabb6 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -25,7 +25,7 @@ proxifiedContainers = {
         resolve(success.proxy);
       }, function() {
         resolve({
-          type: "direct"
+          Utils.DEFAULT_PROXY
         });
       }).catch((error) => {
         reject(error);

From 15d8f31b260b3e76b877e9a12b84f87b06e7c460 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Fri, 2 Nov 2018 08:11:18 -0400
Subject: [PATCH 25/32] Typo fix

---
 src/js/proxified-containers.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 7ceabb6..d52b4de 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -24,9 +24,7 @@ proxifiedContainers = {
       proxifiedContainers.retrieve(cookieStoreId).then((success) => {
         resolve(success.proxy);
       }, function() {
-        resolve({
-          Utils.DEFAULT_PROXY
-        });
+        resolve(Utils.DEFAULT_PROXY);
       }).catch((error) => {
         reject(error);
       });

From 1ae63bc489e98ea8b386073b851088c71e8f3da9 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Thu, 1 Aug 2019 13:30:35 -0400
Subject: [PATCH 26/32] Fix of privacy leaks caused by non-page requests

---
 src/js/background/assignManager.js |  4 +++-
 src/js/utils.js                    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 93d4790..d24ed50 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -118,8 +118,10 @@ const assignManager = {
   },
 
   async handleProxifiedRequest(requestInfo) {
+
+    // The following blocks potentially dangerous requests for privacy that come without a tabId
     if(requestInfo.tabId === -1)
-      return Utils.DEFAULT_PROXY;
+      return Utils.getBogusProxy();
 
     const tab = await browser.tabs.get(requestInfo.tabId);
     const proxy = await proxifiedContainers.retrieveFromBackground(tab.cookieStoreId);
diff --git a/src/js/utils.js b/src/js/utils.js
index b027824..d8c49c8 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -18,6 +18,22 @@ window.Utils = {
     imageElement.addEventListener("error", errorListener);
     imageElement.addEventListener("load", loadListener);
     return imageElement;
+  },
+
+  // See comment in PR #313 - so far the (hacky) method being used to block proxies is to produce a sufficiently long random address
+  getBogusProxy() {
+    const bogusFailover = 1;
+    if(typeof window.Utils.pregeneratedString !== 'undefined')
+    {
+      return {type:"socks4", host:"w.${window.Utils.pregeneratedString}.coo", port:9999, username:"foo", failoverTimeout:bogusFailover};
+    }
+    else
+    {
+      const bogusLength = 8;
+      let array = new Uint8Array(bogusLength);
+      window.crypto.getRandomValues(array);
+      window.Utils.pregeneratedString = array.toString('hex');
+    }
   }
 
 };

From 9e4d215191984ff44f52a51bb4b2e76842a4d150 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Fri, 2 Aug 2019 13:32:44 -0400
Subject: [PATCH 27/32] Small fixes and finalization of the getBogusProxy
 method

---
 src/js/utils.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/js/utils.js b/src/js/utils.js
index d8c49c8..4d5a8d7 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -23,16 +23,34 @@ window.Utils = {
   // See comment in PR #313 - so far the (hacky) method being used to block proxies is to produce a sufficiently long random address
   getBogusProxy() {
     const bogusFailover = 1;
+    const bogusType = "socks4";
+    const bogusPort = 9999;
+    const bogusUsername = "foo";
+    const bogusPassword = "foo";
     if(typeof window.Utils.pregeneratedString !== 'undefined')
     {
-      return {type:"socks4", host:"w.${window.Utils.pregeneratedString}.coo", port:9999, username:"foo", failoverTimeout:bogusFailover};
+      return {type:bogusType, host:`w.${window.Utils.pregeneratedString}.coo`, port:bogusPort, username:bogusUsername, failoverTimeout:bogusFailover};
     }
     else
     {
+      // Initialize Utils.pregeneratedString
+      window.Utils.pregeneratedString = "";
+
+      // We generate a cryptographically random string (of length specified in bogusLength), but we only do so once - thus negating any time delay caused
       const bogusLength = 8;
       let array = new Uint8Array(bogusLength);
       window.crypto.getRandomValues(array);
-      window.Utils.pregeneratedString = array.toString('hex');
+      for(let i = 0; i < bogusLength; i++)
+      {
+        let s = array[i].toString(16);
+        if(s.length == 1)
+          window.Utils.pregeneratedString += `0${s}`;
+        else
+          window.Utils.pregeneratedString += s;
+      }
+
+      // The only issue with this approach is that if (for some unknown reason) pregeneratedString is not saved, it will result in an infinite loop - but better than a privacy leak!
+      return getBogusProxy();
     }
   }
 

From 1a825ac5074750bc20fc1959ee85a6059e21c328 Mon Sep 17 00:00:00 2001
From: Samuel Crypto <work@samuelallan.info>
Date: Fri, 4 Oct 2019 12:25:31 -0400
Subject: [PATCH 28/32] little modification

---
 src/js/popup.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index bdb2b87..f1b97a4 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -745,7 +745,6 @@ Logic.registerPanel(P_CONTAINER_INFO, {
     } catch (e) {
       throw new Error("Could not check for incompatible add-ons.");
     }
-<<<<<<< HEAD
     const moveTabsEl = document.querySelector("#container-info-movetabs");
     const numTabs = await Logic.numTabs();
     if (incompatible) {
@@ -763,8 +762,6 @@ Logic.registerPanel(P_CONTAINER_INFO, {
       });
       window.close();
     });
-=======
->>>>>>> Integrated the proxified-containers.js logic into relevant files without direct proxifying yet
   },
 
   // This method is called when the panel is shown.

From a457c60f32bc40a3919a407e1393eac2ae1727f2 Mon Sep 17 00:00:00 2001
From: luke crouch <lcrouch@mozilla.com>
Date: Thu, 12 Nov 2020 10:26:48 -0600
Subject: [PATCH 29/32] update proxy code to support more types

---
 package.json                   |  4 ++--
 src/js/popup.js                | 36 ++++++-------------------------
 src/js/proxified-containers.js | 39 ++++++----------------------------
 src/js/utils.js                |  6 +++---
 src/manifest.json              |  2 +-
 src/popup.html                 |  4 ++--
 6 files changed, 21 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index 47aaeb6..74113d1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "testpilot-containers",
   "title": "Multi-Account Containers",
   "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
   "bugs": {
     "url": "https://github.com/mozilla/multi-account-containers/issues"
@@ -22,9 +22,9 @@
     "nyc": "^15.0.0",
     "sinon": "^7.5.0",
     "sinon-chai": "^3.3.0",
-    "stylelint-order": "^4.0.0",
     "stylelint": "^13.5.0",
     "stylelint-config-standard": "^20.0.0",
+    "stylelint-order": "^4.0.0",
     "web-ext": "^2.9.3",
     "webextensions-jsdom": "^1.2.1"
   },
diff --git a/src/js/popup.js b/src/js/popup.js
index 79a28d4..c242e12 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -743,33 +743,9 @@ Logic.registerPanel(P_CONTAINER_INFO, {
     // Note: this is not implemented in messageHandler.js
     let incompatible = false;
     try {
-      const incompatible = await browser.runtime.sendMessage({
+      incompatible = await browser.runtime.sendMessage({
         method: "checkIncompatibleAddons"
       });
-      const moveTabsEl = document.querySelector("#container-info-movetabs");
-      if (incompatible) {
-        const fragment = document.createDocumentFragment();
-        const incompatEl = document.createElement("div");
-
-        moveTabsEl.classList.remove("clickable");
-        moveTabsEl.setAttribute("title", "Moving container tabs is incompatible with Pulse, PageShot, and SnoozeTabs.");
-
-        fragment.appendChild(incompatEl);
-        incompatEl.setAttribute("id", "container-info-movetabs-incompat");
-        incompatEl.textContent = "Incompatible with other Experiments.";
-        incompatEl.classList.add("container-info-tab-row");
-
-        moveTabsEl.parentNode.insertBefore(fragment, moveTabsEl.nextSibling);
-      } else {
-        Logic.addEnterHandler(moveTabsEl, async function () {
-          await browser.runtime.sendMessage({
-            method: "moveTabsToWindow",
-            windowId: browser.windows.WINDOW_ID_CURRENT,
-            cookieStoreId: Logic.currentIdentity().cookieStoreId,
-          });
-          window.close();
-        });
-      }
     } catch (e) {
       throw new Error("Could not check for incompatible add-ons.");
     }
@@ -1391,10 +1367,12 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     document.querySelector("#edit-container-panel-proxy").value = "";
 
     const edit_proxy_dom = function(result) {
-      if(result.type === "http")
-        document.querySelector("#edit-container-panel-proxy").value = `${result.host}:${result.port}`;
-      else if(result.type === "direct")
-        document.querySelector("#edit-container-panel-proxy").value = "";
+      const proxyInput = document.querySelector("#edit-container-panel-proxy");
+      if (result.type === "direct" || typeof result.type === "undefined") {
+        proxyInput.value = "";
+        return;
+      }
+      proxyInput.value = `${result.type}://${result.host}:${result.port}`;
     };
 
     proxifiedContainers.retrieve(identity.cookieStoreId).then((result) => {
diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index d52b4de..795ae8e 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -1,20 +1,3 @@
-// Below lets us print errors, huge thanks to Jonathan @ https://stackoverflow.com/questions/18391212/is-it-not-possible-to-stringify-an-error-using-json-stringify
-if (!("toJSON" in Error.prototype))
-  Object.defineProperty(Error.prototype, "toJSON", {
-    value: function() {
-      const alt = {};
-
-      Object.getOwnPropertyNames(this).forEach(function(key) {
-        alt[key] = this[key];
-      }, this);
-
-      return alt;
-    },
-    configurable: true,
-    writable: true
-  });
-
-
 // This object allows other scripts to access the list mapping containers to their proxies
 proxifiedContainers = {
 
@@ -79,6 +62,7 @@ proxifiedContainers = {
       });
     });
   },
+
   set(cookieStoreId, proxy, initialize = false) {
     return new Promise((resolve, reject) => {
       if (initialize === true) {
@@ -125,25 +109,14 @@ proxifiedContainers = {
     });
   },
 
-  //Parses a proxy description string of the format host[:port] or username:password@host[:port] (port is optional)
+  //Parses a proxy description string of the format type://host[:port] or type://username:password@host[:port] (port is optional)
   parseProxy(proxy_str) {
-    const regexp = /(\b(\w+):(\w+)@)?(((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(\d+))?/;
-    if (regexp.test(proxy_str) !== true)
+    const proxyRegexp = /(?<type>(https?)|(socks4?)):\/\/(\b(?<username>\w+):(?<password>\w+)@)?(?<host>((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(?<port>\d+))?/;
+    if (proxyRegexp.test(proxy_str) !== true) {
       return false;
-
-    else {
-      const matches = regexp.exec(proxy_str);
-
-      const result = {
-        type: "http",
-        host: matches[4],
-        port: parseInt(matches[11], 10) || 8080,
-        username: matches[2] || "",
-        password: matches[3] || ""
-      };
-
-      return result;
     }
+    const matches = proxyRegexp.exec(proxy_str);
+    return matches.groups;
   },
 
   // Deletes the proxy information object for a specified cookieStoreId [useful for cleaning]
diff --git a/src/js/utils.js b/src/js/utils.js
index fdb4a23..2a045db 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -52,7 +52,7 @@ const Utils = {
       // The only issue with this approach is that if (for some unknown reason) pregeneratedString is not saved, it will result in an infinite loop - but better than a privacy leak!
       return getBogusProxy();
     }
-  }
+  },
 
   /**
  * Escapes any occurances of &, ", <, > or / with XML entities.
@@ -167,6 +167,8 @@ const Utils = {
   }
 };
 
+window.Utils = Utils;
+
 // The following creates a fake (but convincing) constant Utils.DEFAULT_PROXY
 Object.defineProperty(window.Utils, "DEFAULT_PROXY", {
   value: Object.freeze({type: "direct"}),
@@ -176,5 +178,3 @@ Object.defineProperty(window.Utils, "DEFAULT_PROXY", {
   // Setting configurable to false avoids deletion of Utils.DEFAULT_PROXY
   configurable: false
 });
-
-window.Utils = Utils;
diff --git a/src/manifest.json b/src/manifest.json
index 2d0de71..e2bbc1e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Firefox Multi-Account Containers",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "incognito": "not_allowed",
   "description": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
   "icons": {
diff --git a/src/popup.html b/src/popup.html
index 2ba6b55..878e4ef 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -300,8 +300,8 @@
           <legend class="form-header">Icon</legend>
         </fieldset>
         <fieldset>
-          <legend>HTTP Proxy (Optional)</legend>
-          <input type="text" name="container-proxy" id="edit-container-panel-proxy" maxlength="15" placeholder="IP:PORT or USER:PASS@IP:PORT"/>
+          <legend>Proxy (Optional)</legend>
+          <input type="text" name="container-proxy" id="edit-container-panel-proxy" maxlength="50" placeholder="type://host:port"/>
         </fieldset>
       </form>
       <div id="edit-container-options">

From ff3c31637c065da42137d455501e7cea000bcf99 Mon Sep 17 00:00:00 2001
From: luke crouch <lcrouch@mozilla.com>
Date: Wed, 10 Feb 2021 15:35:14 -0600
Subject: [PATCH 30/32] eslint fixes

---
 .eslintrc.js      |  2 +-
 src/js/utils.js   | 11 ++++++-----
 test/.eslintrc.js | 22 +++++++++++-----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 88975d9..467a3a6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   "parserOptions": {
-    "ecmaVersion": 8
+    "ecmaVersion": 2018
   },
   "env": {
     "browser": true,
diff --git a/src/js/utils.js b/src/js/utils.js
index 2a045db..0ea538f 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -1,3 +1,5 @@
+/*global getBogusProxy */
+
 const DEFAULT_FAVICON = "/img/blank-favicon.svg";
 
 // TODO use export here instead of globals
@@ -26,8 +28,7 @@ const Utils = {
     const bogusType = "socks4";
     const bogusPort = 9999;
     const bogusUsername = "foo";
-    const bogusPassword = "foo";
-    if(typeof window.Utils.pregeneratedString !== 'undefined')
+    if(typeof window.Utils.pregeneratedString !== "undefined")
     {
       return {type:bogusType, host:`w.${window.Utils.pregeneratedString}.coo`, port:bogusPort, username:bogusUsername, failoverTimeout:bogusFailover};
     }
@@ -38,12 +39,12 @@ const Utils = {
 
       // We generate a cryptographically random string (of length specified in bogusLength), but we only do so once - thus negating any time delay caused
       const bogusLength = 8;
-      let array = new Uint8Array(bogusLength);
+      const array = new Uint8Array(bogusLength);
       window.crypto.getRandomValues(array);
       for(let i = 0; i < bogusLength; i++)
       {
-        let s = array[i].toString(16);
-        if(s.length == 1)
+        const s = array[i].toString(16);
+        if(s.length === 1)
           window.Utils.pregeneratedString += `0${s}`;
         else
           window.Utils.pregeneratedString += s;
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
index 6d733f0..6c7a326 100644
--- a/test/.eslintrc.js
+++ b/test/.eslintrc.js
@@ -1,12 +1,12 @@
 module.exports = {
-    env: {
-      "node": true,
-      "mocha": true
-    },
-    "parserOptions": {
-      "ecmaVersion": 2018
-    },
-    "rules": {
-      "no-restricted-globals": ["error", "browser"]
-    }
-}
+  env: {
+    "node": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018
+  },
+  "rules": {
+    "no-restricted-globals": ["error", "browser"]
+  }
+};

From 6168275e17f973685baeda8cb600729a9a938749 Mon Sep 17 00:00:00 2001
From: luke crouch <lcrouch@mozilla.com>
Date: Tue, 28 Sep 2021 17:26:41 -0500
Subject: [PATCH 31/32] proxy hosts can have '-' characters

---
 src/js/proxified-containers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/proxified-containers.js b/src/js/proxified-containers.js
index 795ae8e..4008df2 100644
--- a/src/js/proxified-containers.js
+++ b/src/js/proxified-containers.js
@@ -111,7 +111,7 @@ proxifiedContainers = {
 
   //Parses a proxy description string of the format type://host[:port] or type://username:password@host[:port] (port is optional)
   parseProxy(proxy_str) {
-    const proxyRegexp = /(?<type>(https?)|(socks4?)):\/\/(\b(?<username>\w+):(?<password>\w+)@)?(?<host>((?:\d{1,3}\.){3}\d{1,3}\b)|(\b(\w+)(\.(\w+))+))(:(?<port>\d+))?/;
+    const proxyRegexp = /(?<type>(https?)|(socks4?)):\/\/(\b(?<username>\w+):(?<password>\w+)@)?(?<host>((?:\d{1,3}\.){3}\d{1,3}\b)|(\b([\w.-]+)(\.([\w.-]+))+))(:(?<port>\d+))?/;
     if (proxyRegexp.test(proxy_str) !== true) {
       return false;
     }

From 34be1a19becef68ef7dae108ff344c0edbf80b56 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <maxx.crawford@gmail.com>
Date: Wed, 29 Sep 2021 10:05:27 -0500
Subject: [PATCH 32/32] Add UI tweaks

---
 src/css/popup.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/css/popup.css b/src/css/popup.css
index 4dfb8dc..ff7e083 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -586,7 +586,7 @@ manage things like container crud */
 }
 
 .edit-container-panel fieldset:last-of-type {
-  margin-block-end: 0;
+  margin-block-start: 16px;
 }
 
 .edit-container-panel input[type="text"] {
@@ -886,12 +886,11 @@ input {
 
 .site-isolation {
   inset-block-end: auto;
-  position: fixed;
 }
 
 .options-label {
   cursor: pointer;
-  padding-inline-start: 25px;
+  padding-inline-start: 4px;
 }
 
 .manage-assigned-sites-list {