From db2fa44a9320eb916c6f435f099197cbc96415b4 Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Tue, 26 Apr 2022 21:27:48 -0400
Subject: [PATCH 01/12] First steps towards manifest v3 migration

Known issues: WebRTC is currently not available in background scripts of browser extensions (due to them being service workers)
---
 README.txt                                    |  14 +
 .../scripts/backgroundPortManager.js          |   2 +-
 app/manifest.json                             |  36 +-
 app/scripts.babel/background.js               | 256 ++++++++-
 app/scripts.babel/chat.js                     |   2 +-
 app/scripts.babel/inject.js                   |   2 +-
 app/scripts.babel/logger.js                   |   2 +-
 app/scripts.babel/popup.js                    |   2 +-
 gulpfile.js                                   |   4 +-
 package-lock.json                             | 519 +++++++++++++++++-
 package.json                                  |   2 +
 patches/signalhub+4.9.0.patch                 |  29 +
 promotion/IF Window.PNG                       | Bin 0 -> 10384 bytes
 promotion/hi 1280x800.png                     | Bin 0 -> 4198 bytes
 promotion/hi 440x280.png                      | Bin 0 -> 2633 bytes
 promotion/hi 920x680.png                      | Bin 0 -> 3726 bytes
 promotion/hi grab.PNG                         | Bin 0 -> 1727 bytes
 promotion/hi.psd                              | Bin 0 -> 237276 bytes
 18 files changed, 829 insertions(+), 41 deletions(-)
 create mode 100644 README.txt
 create mode 100644 patches/signalhub+4.9.0.patch
 create mode 100644 promotion/IF Window.PNG
 create mode 100644 promotion/hi 1280x800.png
 create mode 100644 promotion/hi 440x280.png
 create mode 100644 promotion/hi 920x680.png
 create mode 100644 promotion/hi grab.PNG
 create mode 100644 promotion/hi.psd

diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..aeb3c37
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,14 @@
+Requires npm and gulp to build
+
+Versions used to build v1.0.0 of Internet Friends:
+
+npm v8.4.1
+gulp CLI v2.3.0
+gulp Local v4.0.2
+
+To build:
+
+1) cd to the root directory
+2) run 'npm install'
+3) run 'gulp'
+4) run 'gulp package'
\ No newline at end of file
diff --git a/app/extension/scripts/backgroundPortManager.js b/app/extension/scripts/backgroundPortManager.js
index 9fd73a9..0caa1cf 100644
--- a/app/extension/scripts/backgroundPortManager.js
+++ b/app/extension/scripts/backgroundPortManager.js
@@ -152,7 +152,7 @@ var backgroundPortManager = function (messageCallback, roomDisconnectCallback){
 		
 		// Loop through all tabs that are associated with the given room code
 		for (var tabId in _rooms[roomCode]) {
-			chrome.browserAction.setBadgeText(
+			chrome.action.setBadgeText(
 				{
 					text: peers > 0 ? peers.toString() : '',
 					tabId: parseInt(tabId)
diff --git a/app/manifest.json b/app/manifest.json
index 4bebfd0..e2dec59 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_appName__",
     "version": "1.0.0",
-    "manifest_version": 2,
+    "manifest_version": 3,
     "description": "__MSG_appDescription__",
     "icons": {
         "16": "images/icon-16.png",
@@ -10,11 +10,12 @@
     "default_locale": "en",
     "incognito": "split",
     "background": {
-        "page": "html/background.html"
+        "service_worker": "scripts/bundle.js"
     },
     "permissions": [
         "storage",
-        "activeTab"
+        "activeTab",
+        "tabs"
     ],
     "content_scripts": [{
         "matches": [
@@ -42,19 +43,24 @@
         "run_at": "document_start"
     }],
     "web_accessible_resources": [
-        "scripts/logger.js",
-        "scripts/settings.js",
-        "scripts/backgroundPortManager.js",
-        "scripts/bundle.js",
-        "scripts/popup.js",
-        "html/iframe/chat.html",
-        "scripts/chat.js",
-        "styles/core.css",
-        "styles/chat.css",
-        "styles/slider.css",
-        "styles/popup.css"
+        {
+            "resources": [
+                "scripts/logger.js",
+                "scripts/settings.js",
+                "scripts/backgroundPortManager.js",
+                "scripts/bundle.js",
+                "scripts/popup.js",
+                "html/iframe/chat.html",
+                "scripts/chat.js",
+                "styles/core.css",
+                "styles/chat.css",
+                "styles/slider.css",
+                "styles/popup.css"
+            ],
+            "matches": ["*://*/*"]
+        }
     ],
-    "browser_action": {
+    "action": {
         "default_popup": "html/popup.html",
         "default_icon": {
             "19": "images/icon-19.png",
diff --git a/app/scripts.babel/background.js b/app/scripts.babel/background.js
index d3c6389..ae27d3d 100644
--- a/app/scripts.babel/background.js
+++ b/app/scripts.babel/background.js
@@ -1,5 +1,251 @@
-'use strict';
+var debug = true;
+var Logger = {
+    log: debug ? console.log.bind(console) : function(){}
+};
 
+var IFSettings;
+var IFEvents = new EventTarget();
+
+// wrap in a self-invoking function to use define private variables & functions
+(function () {
+    // define 'init' event
+    var initEvent = new Event('settings.init');
+
+    // define default combo
+    var _defaultCombo = {
+        ctrlKey: true,
+        shiftKey: true,
+        altKey: false,
+        key: "Enter"
+    };
+
+    // define function for getting a random color
+    function getRandomIroColor () {
+        var iroColor = new iro.Color('{a: 1, h: 0, s: 70, v: 90}');
+        iroColor.hue += Math.random() * 360;
+        return iroColor.hslaString;
+    }
+
+    // if chrome is available
+    if (chrome && chrome.storage) {
+        // retrieve settings
+        chrome.storage.sync.get(null, function(result) {
+            var storedSettings = result;
+
+            // set IFSettings based on storedSettings, get default values if necessary
+            IFSettings = {
+                combo: storedSettings?.combo || _defaultCombo,
+                disabledSites: storedSettings?.disabledSites || {},
+                enableChat: storedSettings?.enableChat === true || storedSettings?.enableChat === undefined,
+                userColor: storedSettings?.userColor || getRandomIroColor()
+            }
+
+            // set new settings
+            chrome.storage.sync.set(IFSettings);
+
+            Logger.log('Settings initialized:')
+            Logger.log(IFSettings);
+            IFEvents.dispatchEvent(initEvent);
+        });
+
+        // listen for changes to settings
+        chrome.storage.onChanged.addListener(function (changes, namespace) {
+            for (let [key, { newValue }] of Object.entries(changes)) {
+                Logger.log(`Storage key "${key}" in namespace "${namespace}" changed.`);
+
+                // update settings
+                IFSettings[key] = newValue;
+                IFEvents.dispatchEvent(new Event('settings.change.' + key));
+
+                Logger.log(IFSettings);
+            }
+        });
+    }
+    // otherwise this is loaded outside an extension
+    else
+    {
+        // set IFSettings with default values
+        IFSettings = {
+            combo: _defaultCombo,
+            disabledSites: {},
+            enableChat: true,
+            userColor: getRandomIroColor()
+        }
+        
+        IFEvents.dispatchEvent(initEvent);
+    }
+}());
+
+var backgroundPortManager = function (messageCallback, roomDisconnectCallback){
+	// variables ----------------------------------------------------------------
+	var _this 				    = {},
+        _openTabs 			    = {},
+		_rooms					= {},
+		_messageCallback	    = null,
+		_roomDisconnectCallback	= null;
+	
+	// initialize ---------------------------------------------------------------
+	_this.init = function (messageCallback, roomDisconnectCallback){
+		_messageCallback = messageCallback;
+		_roomDisconnectCallback = roomDisconnectCallback;
+
+		// send messages from "background.js"
+    	chrome.runtime.onConnect.addListener(processTabPortConnected);
+
+		Logger.log('Internet Friends Background Port Manager Initialized');
+	};
+	
+	// private functions --------------------------------------------------------
+	function getUrl(port) {
+		let url;
+		
+		if (port.sender.tab.url) { // Chrome
+			url = new URL(port.sender.tab.url);
+		}
+		else // FireFox
+		{
+			var tabId = port.sender.tab.id;
+			var source = port.name;
+			if (source == 'InternetFriends-main') {
+				url = new URL(port.sender.tab.url);
+			} else if (_openTabs[tabId]['InternetFriends-main']) {
+				url = new URL(_openTabs[tabId]['InternetFriends-main'].sender.url);
+			}
+		}
+		
+		return url;
+	}
+
+	function getRoomCodeFromPort(port, url) {
+		// Room code is based on url and title
+		// e.g. 'www.google.com/search : test - Google Search'
+		// The goal is to group users based on the page they're currently on
+		// Ignoring url.search because many websites url.search values are unique to each user
+		var url = getUrl(port);
+		return url.host + url.pathname + " : " + port.sender.tab.title;
+	}
+
+    // events -------------------------------------------------------------------
+	function processTabPortConnected (port){
+		// Only process if site not disabled
+		var websiteUrl = getUrl(port);
+
+		// If websiteUrl is present in disabledSites, InternetFriends is disabled for this site, return
+		if (IFSettings.disabledSites[websiteUrl.host])
+			return;
+
+		var tabId = port.sender.tab.id;
+		var source = port.name;
+		var roomCode = getRoomCodeFromPort(port);
+		
+		Logger.log('Tab Connected RoomCode: ' + roomCode + ' ID: ' + tabId);
+
+		// Add port to tab
+		if(!_openTabs[tabId]) 
+			_openTabs[tabId] = {};
+
+		_openTabs[tabId][source] = port;
+		
+		// Create room
+		if (!_rooms[roomCode])
+			_rooms[roomCode] = {};
+
+		// Add tab to room
+		_rooms[roomCode][tabId] = true;
+
+		// After both sources have connected
+		if(_openTabs[tabId]['InternetFriends-chat'] &&
+			_openTabs[tabId]['InternetFriends-main'])
+		{
+			// Setup Listeners
+			_openTabs[tabId]['InternetFriends-chat'].onMessage.addListener(function (event) { processMessage(event, tabId, 'InternetFriends-chat', roomCode) });
+			_openTabs[tabId]['InternetFriends-main'].onMessage.addListener(function (event) { processMessage(event, tabId, 'InternetFriends-main', roomCode) });
+			_openTabs[tabId]['InternetFriends-chat'].onDisconnect.addListener(function () { processTabPortDisconnect(tabId, 'InternetFriends-chat', roomCode) });
+			_openTabs[tabId]['InternetFriends-main'].onDisconnect.addListener(function () { processTabPortDisconnect(tabId, 'InternetFriends-main', roomCode) });
+
+			// Post loaded messages
+			_openTabs[tabId]['InternetFriends-chat'].postMessage({event: 'loaded'});
+			_openTabs[tabId]['InternetFriends-main'].postMessage({event: 'loaded'});
+		}
+	};
+    
+    function processMessage (message, tabId, source, roomCode) {
+        _messageCallback(message, roomCode);
+
+        // Forward to iframe
+        if(source != 'InternetFriends-chat') {
+            message.data.userId = "localuser";
+            _this.tellByTabId(tabId, message);
+        }
+    }
+
+	function processTabPortDisconnect (tabId, source, roomCode){
+		// process the disconnect
+		if (_openTabs[tabId]) {
+			delete _openTabs[tabId][source];
+		}
+
+		if(source == 'InternetFriends-main') {
+			delete _openTabs[tabId];
+			delete _rooms[roomCode][tabId];
+
+			let tabIds = Object.keys(_rooms[roomCode]);
+
+			// If there are no other tabs associated with this room code, disconnect
+			if (tabIds.length === 0)
+                _roomDisconnectCallback(roomCode);
+		}
+	};
+
+	// public functions ---------------------------------------------------------	
+	_this.tellByRoomCode = function (roomCode, data){
+		if (!_rooms[roomCode])
+			return false;
+
+		let success = false;
+		
+		// Loop through all tabs that are associated with the given room code
+		for (var tabId in _rooms[roomCode]) {
+        	success ||= _this.tellByTabId(tabId, data);
+		}
+
+		// If any tabs were found, this should return true
+		return success;
+    };
+    
+    _this.tellByTabId = function (tabId, data){
+        if(_openTabs[tabId] && _openTabs[tabId]["InternetFriends-chat"]) {
+            _openTabs[tabId]["InternetFriends-chat"].postMessage(data);
+            return true;
+        }
+
+        return false;
+	};
+
+	_this.updateBadgeTextByRoomCode = function (roomCode, peers) {
+		if (!_rooms[roomCode])
+			return false;
+		
+		// Loop through all tabs that are associated with the given room code
+		for (var tabId in _rooms[roomCode]) {
+			chrome.action.setBadgeText(
+				{
+					text: peers > 0 ? peers.toString() : '',
+					tabId: parseInt(tabId)
+				}
+			);
+		}
+
+		return true;
+	};
+
+	// messages -----------------------------------------------------------------	
+	_this.init(messageCallback, roomDisconnectCallback);
+	
+	return _this;
+};
+
+import { v4 as uuidv4 } from 'uuid';
 var swarm = require('webrtc-swarm')
 var signalhub = require('signalhub')
 
@@ -15,12 +261,12 @@ var Background = (function() {
         // receive post messages from 'inject.js' and any iframes
         _portManager = new backgroundPortManager(processMessageFromBrowser, processRoomDisconnect);
 
-        if (chrome && chrome.browserAction) {
-            chrome.browserAction.setBadgeBackgroundColor({ color: IFSettings.userColor });
+        if (chrome && chrome.action) {
+            chrome.action.setBadgeBackgroundColor({ color: IFSettings.userColor });
         
             // add listener for storage changes
             IFEvents.addEventListener('settings.change.userColor', function () {
-                chrome.browserAction.setBadgeBackgroundColor({color: IFSettings.userColor });
+                chrome.action.setBadgeBackgroundColor({color: IFSettings.userColor });
             });
         }
     
@@ -47,7 +293,7 @@ var Background = (function() {
         _portManager.tellByRoomCode(roomCode, userInfoMessage);
 
         var hub = signalhub(roomCode, _local ? ['localhost:8080'] : ['https://if-signalhub.herokuapp.com/'])
-        _swarms[roomCode] = swarm(hub)
+        _swarms[roomCode] = swarm(hub, { wrtc: require('wrtc'), uuid: uuidv4() })
 
         _swarms[roomCode].on('peer', function(peer, id) {
             Logger.log('connected to a new peer:', id)
diff --git a/app/scripts.babel/chat.js b/app/scripts.babel/chat.js
index bfcbd2f..109e058 100644
--- a/app/scripts.babel/chat.js
+++ b/app/scripts.babel/chat.js
@@ -27,7 +27,7 @@ var User = function(id, submitCallback) {
             _inputElement = $('<span contenteditable="true" class="input"></span>').appendTo(_userElement);
             setupInputElement();
         } else {
-            var cursorURL = typeof chrome !== "undefined" && chrome.extension ? chrome.extension.getURL('../../images/aero_arrow.png') : './images/aero_arrow.png';
+            var cursorURL = typeof chrome !== "undefined" && chrome.runtime ? chrome.runtime.getURL('../../images/aero_arrow.png') : './images/aero_arrow.png';
             _mouseElement = $('<div class="fakeMouse"></div>').appendTo(_userElement);
             _mouseBGElm = $('<div class="fakeMouseBackgroundColor"></div>').appendTo(_mouseElement);
             _mouseBGElm.css({ 'background-image': 'url(' + cursorURL + ')' });
diff --git a/app/scripts.babel/inject.js b/app/scripts.babel/inject.js
index cb0196c..a69f5c3 100644
--- a/app/scripts.babel/inject.js
+++ b/app/scripts.babel/inject.js
@@ -60,7 +60,7 @@ var Inject = (function() {
         if (_views[id]) return _views[id];
 
         // iframe initial details
-        var src = typeof chrome !== "undefined" && chrome.extension ? chrome.extension.getURL('html/iframe/' + id + '.html?view=' + id + '&_' + new Date().getTime()) : './html/iframe/chat.html',
+        var src = typeof chrome !== "undefined" && chrome.runtime ? chrome.runtime.getURL('html/iframe/' + id + '.html?view=' + id + '&_' + new Date().getTime()) : './html/iframe/chat.html',
             iframe = $('<iframe/>', { id: ID.IFRAME_PREFIX + id, src: src, scrolling: false });
 
         // view
diff --git a/app/scripts.babel/logger.js b/app/scripts.babel/logger.js
index 7806d6e..f44a864 100644
--- a/app/scripts.babel/logger.js
+++ b/app/scripts.babel/logger.js
@@ -1,4 +1,4 @@
-var debug = false;
+var debug = true;
 var Logger = {
     log: debug ? console.log.bind(console) : function(){}
 };
\ No newline at end of file
diff --git a/app/scripts.babel/popup.js b/app/scripts.babel/popup.js
index d1ccead..56ebbc3 100644
--- a/app/scripts.babel/popup.js
+++ b/app/scripts.babel/popup.js
@@ -64,7 +64,7 @@ var Popup = (function() {
         });
         
         var _mouseBGElm = document.getElementById('fakeMouse');
-        var cursorURL = typeof chrome !== "undefined" && chrome.extension ? chrome.extension.getURL('../../images/aero_arrow.png') : '../images/aero_arrow.png';
+        var cursorURL = typeof chrome !== "undefined" && chrome.runtime ? chrome.runtime.getURL('../../images/aero_arrow.png') : '../images/aero_arrow.png';
         _mouseBGElm.style.backgroundImage = "url(" + cursorURL + ")";
         let initColor = { h: 207, s: 86, v: 95 };
         let hsl = colorWheel.color.hsl;
diff --git a/gulpfile.js b/gulpfile.js
index 9229ff4..6cb619e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -64,7 +64,7 @@ function res(cb) {
   const manifest = require('./app/manifest.json');
   var log = require('fancy-log');
   var debug = require('gulp-debug');
-  return src(manifest.web_accessible_resources, { cwd: './app/', base: './app/', allowEmpty: true })
+  return src(manifest.web_accessible_resources[0].resources, { cwd: './app/', base: './app/', allowEmpty: true })
     .pipe(debug())
     .pipe($.if('*.css', $.cleanCss({compatibility: '*'})))
     .pipe(dest('dist'));
@@ -127,7 +127,7 @@ function websiteManifest(cb){
   const manifest = require('./app/manifest.json');
   return src([
       '!*.html',
-      ...manifest.web_accessible_resources,
+      ...manifest.web_accessible_resources[0].resources,
       ...manifest.content_scripts[0].css,
       ...manifest.content_scripts[0].js
     ], { cwd: './app/', base: './app/', allowEmpty: true })
diff --git a/package-lock.json b/package-lock.json
index e1a532c..f963d33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,9 @@
         "gulp-uglify": "^3.0.2",
         "gulp-useref": "^5.0.0",
         "gulp-zip": "^5.1.0",
+        "patch-package": "^6.4.7",
         "signalhub": "^4.9.0",
+        "uuid": "^8.3.2",
         "vinyl-source-stream": "^2.0.0",
         "webrtc-swarm": "github:tom-james-watson/webrtc-swarm",
         "wiredep": "^4.0.0",
@@ -1837,6 +1839,11 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
+    },
     "node_modules/acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -3520,6 +3527,11 @@
         "underscore.string": "^3.0.3"
       }
     },
+    "node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
     "node_modules/cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -5960,6 +5972,67 @@
         "node": ">=6"
       }
     },
+    "node_modules/find-yarn-workspace-root": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
+      "dependencies": {
+        "micromatch": "^4.0.2"
+      }
+    },
+    "node_modules/find-yarn-workspace-root/node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-yarn-workspace-root/node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-yarn-workspace-root/node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/find-yarn-workspace-root/node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/find-yarn-workspace-root/node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/findup-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
@@ -6117,6 +6190,19 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
       "optional": true
     },
+    "node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -8499,6 +8585,17 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
+    "node_modules/is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dependencies": {
+        "ci-info": "^2.0.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
     "node_modules/is-core-module": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
@@ -8534,6 +8631,20 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -8833,6 +8944,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -8959,6 +9081,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "node_modules/jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
@@ -9034,6 +9164,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/klaw-sync": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
+      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
+      "dependencies": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
     "node_modules/labeled-stream-splicer": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
@@ -10024,8 +10162,7 @@
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "optional": true
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "node_modules/no-case": {
       "version": "2.3.2",
@@ -10386,6 +10523,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -10698,6 +10850,101 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/patch-package": {
+      "version": "6.4.7",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz",
+      "integrity": "sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==",
+      "dependencies": {
+        "@yarnpkg/lockfile": "^1.1.0",
+        "chalk": "^2.4.2",
+        "cross-spawn": "^6.0.5",
+        "find-yarn-workspace-root": "^2.0.0",
+        "fs-extra": "^7.0.1",
+        "is-ci": "^2.0.0",
+        "klaw-sync": "^6.0.0",
+        "minimist": "^1.2.0",
+        "open": "^7.4.2",
+        "rimraf": "^2.6.3",
+        "semver": "^5.6.0",
+        "slash": "^2.0.0",
+        "tmp": "^0.0.33"
+      },
+      "bin": {
+        "patch-package": "index.js"
+      },
+      "engines": {
+        "npm": ">5"
+      }
+    },
+    "node_modules/patch-package/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/patch-package/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/patch-package/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/patch-package/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/patch-package/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/patch-package/node_modules/slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/patch-package/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
     "node_modules/path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -11628,6 +11875,15 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/request/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -11734,7 +11990,6 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "devOptional": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -13105,6 +13360,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/tempfile/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "optional": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/ternary-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
@@ -13234,6 +13499,17 @@
         "next-tick": "1"
       }
     },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -13618,6 +13894,14 @@
         "through2-filter": "^3.0.0"
       }
     },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -13779,12 +14063,11 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
@@ -15543,6 +15826,11 @@
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
       "optional": true
     },
+    "@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
+    },
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -16913,6 +17201,11 @@
         "underscore.string": "^3.0.3"
       }
     },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -18913,6 +19206,54 @@
         "semver-regex": "^2.0.0"
       }
     },
+    "find-yarn-workspace-root": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
+      "requires": {
+        "micromatch": "^4.0.2"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+        },
+        "micromatch": {
+          "version": "4.0.5",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+          "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+          "requires": {
+            "braces": "^3.0.2",
+            "picomatch": "^2.3.1"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
     "findup-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
@@ -19039,6 +19380,16 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
       "optional": true
     },
+    "fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
     "fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -20848,6 +21199,14 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "requires": {
+        "ci-info": "^2.0.0"
+      }
+    },
     "is-core-module": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
@@ -20874,6 +21233,11 @@
         "kind-of": "^6.0.2"
       }
     },
+    "is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
+    },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -21087,6 +21451,14 @@
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -21192,6 +21564,14 @@
         "minimist": "^1.2.5"
       }
     },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
@@ -21246,6 +21626,14 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
+    "klaw-sync": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
+      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
+      "requires": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
     "labeled-stream-splicer": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
@@ -22090,8 +22478,7 @@
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "optional": true
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "no-case": {
       "version": "2.3.2",
@@ -22371,6 +22758,15 @@
         "mimic-fn": "^2.1.0"
       }
     },
+    "open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "requires": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      }
+    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -22604,6 +23000,76 @@
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
+    "patch-package": {
+      "version": "6.4.7",
+      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz",
+      "integrity": "sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==",
+      "requires": {
+        "@yarnpkg/lockfile": "^1.1.0",
+        "chalk": "^2.4.2",
+        "cross-spawn": "^6.0.5",
+        "find-yarn-workspace-root": "^2.0.0",
+        "fs-extra": "^7.0.1",
+        "is-ci": "^2.0.0",
+        "klaw-sync": "^6.0.0",
+        "minimist": "^1.2.0",
+        "open": "^7.4.2",
+        "rimraf": "^2.6.3",
+        "semver": "^5.6.0",
+        "slash": "^2.0.0",
+        "tmp": "^0.0.33"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+        },
+        "slash": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -23324,6 +23790,11 @@
           "version": "6.5.3",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
           "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
         }
       }
     },
@@ -23404,7 +23875,6 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "devOptional": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -24485,6 +24955,14 @@
       "requires": {
         "temp-dir": "^1.0.0",
         "uuid": "^3.0.1"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "optional": true
+        }
       }
     },
     "ternary-stream": {
@@ -24603,6 +25081,14 @@
         "next-tick": "1"
       }
     },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
     "to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -24900,6 +25386,11 @@
         "through2-filter": "^3.0.0"
       }
     },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -25036,9 +25527,9 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",
diff --git a/package.json b/package.json
index 3c73997..37a46e0 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,9 @@
     "gulp-uglify": "^3.0.2",
     "gulp-useref": "^5.0.0",
     "gulp-zip": "^5.1.0",
+    "patch-package": "^6.4.7",
     "signalhub": "^4.9.0",
+    "uuid": "^8.3.2",
     "vinyl-source-stream": "^2.0.0",
     "webrtc-swarm": "github:tom-james-watson/webrtc-swarm",
     "wiredep": "^4.0.0",
diff --git a/patches/signalhub+4.9.0.patch b/patches/signalhub+4.9.0.patch
new file mode 100644
index 0000000..1d7d305
--- /dev/null
+++ b/patches/signalhub+4.9.0.patch
@@ -0,0 +1,29 @@
+diff --git a/node_modules/signalhub/index.js b/node_modules/signalhub/index.js
+index dffd175..3488910 100644
+--- a/node_modules/signalhub/index.js
++++ b/node_modules/signalhub/index.js
+@@ -103,16 +103,18 @@ SignalHub.prototype.close = function (cb) {
+   }
+ }
+ 
+-function broadcast (app, url, channel, message, cb) {
+-  return nets({
++async function broadcast (app, url, channel, message, cb) {
++  return await fetch(url + '/v1/' + app + '/' + channel, {
+     method: 'POST',
+-    json: message,
+-    url: url + '/v1/' + app + '/' + channel
+-  }, function (err, res) {
++    headers: {
++      'Content-Type': 'application/json'
++    },
++    body: JSON.stringify(message)
++  }).catch(function (err, res) {
+     if (err) return cb(err)
+     if (res.statusCode !== 200) return cb(new Error('Bad status: ' + res.statusCode))
+     cb()
+-  })
++  });
+ }
+ 
+ function noop () {}
diff --git a/promotion/IF Window.PNG b/promotion/IF Window.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..4ccac2132e9b050fbbca41a6ef81211845392d27
GIT binary patch
literal 10384
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
Ur9=J#0Fs=O9r#%F4?(H_2U<M3&;S4c

literal 0
HcmV?d00001

diff --git a/promotion/hi 1280x800.png b/promotion/hi 1280x800.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f33cacf5a9e936ee78a42bee47dce712d9c684f
GIT binary patch
literal 4198
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
RD6J0~j=Flf6db}Q{ue%S<nsUk

literal 0
HcmV?d00001

diff --git a/promotion/hi 440x280.png b/promotion/hi 440x280.png
new file mode 100644
index 0000000000000000000000000000000000000000..36cbf4d58cd1ef6f0f2c2b81fcaf7980d7f9f735
GIT binary patch
literal 2633
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
F{{;l0R(b#c

literal 0
HcmV?d00001

diff --git a/promotion/hi 920x680.png b/promotion/hi 920x680.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd8356bf8b16c649644c2807d4a1d476509aefb6
GIT binary patch
literal 3726
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
Z;-VeUw7LfqwV`uoJl)W)rOw}8`VaZDS_A+9

literal 0
HcmV?d00001

diff --git a/promotion/hi grab.PNG b/promotion/hi grab.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..d3ced6d8aa16356cc992b5071cc064ee134fcfef
GIT binary patch
literal 1727
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
Xbmo)x5Bl5B2LPBfHdPT2_v8Noc=YDm

literal 0
HcmV?d00001

diff --git a/promotion/hi.psd b/promotion/hi.psd
new file mode 100644
index 0000000000000000000000000000000000000000..8f2fbbb3d935e470eb2416f3894d391cd6bdab0a
GIT binary patch
literal 237276
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
P2mwNX5Fi9x34#9yo+oO`

literal 0
HcmV?d00001


From 809377ef8aa5fbc43836103525dda44627a32fb2 Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Mon, 2 May 2022 19:36:48 -0400
Subject: [PATCH 02/12] Moves swarm logic from background scripts into content
 scripts

---
 app/extension/html/background.html            |  15 -
 app/extension/html/iframe/chat.html           |   2 +-
 .../scripts/backgroundPortManager.js          | 170 -------
 app/manifest.json                             |   7 +-
 app/scripts.babel/background.js               | 190 +------
 app/scripts.babel/chat.js                     | 178 ++++++-
 app/scripts.babel/inject.js                   |  10 +-
 gulpfile.js                                   |   2 +-
 package-lock.json                             | 471 +-----------------
 package.json                                  |   1 -
 patches/signalhub+4.9.0.patch                 |  29 --
 11 files changed, 218 insertions(+), 857 deletions(-)
 delete mode 100644 app/extension/html/background.html
 delete mode 100644 app/extension/scripts/backgroundPortManager.js
 delete mode 100644 patches/signalhub+4.9.0.patch

diff --git a/app/extension/html/background.html b/app/extension/html/background.html
deleted file mode 100644
index c5f9f5d..0000000
--- a/app/extension/html/background.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-
-<head>
-    <script src="../libs/iro/iro.js"></script>
-    <script src="../scripts/logger.js"></script>
-    <script src="../scripts/settings.js"></script>
-    <script src="../scripts/backgroundPortManager.js"></script>
-    <script src="../scripts/bundle.js"></script>
-    <title>Internet Friends</title>
-</head>
-
-<body>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/app/extension/html/iframe/chat.html b/app/extension/html/iframe/chat.html
index d7f37fb..92a6612 100644
--- a/app/extension/html/iframe/chat.html
+++ b/app/extension/html/iframe/chat.html
@@ -7,7 +7,7 @@
     <script src="../../scripts/logger.js"></script>
     <script src="../../scripts/settings.js"></script>
     <script src="../../scripts/portManager.js"></script>
-    <script src="../../scripts/chat.js"></script>
+    <script src="../../scripts/bundle.js"></script>
     <title>Internet Friends</title>
 </head>
 <body>
diff --git a/app/extension/scripts/backgroundPortManager.js b/app/extension/scripts/backgroundPortManager.js
deleted file mode 100644
index 0caa1cf..0000000
--- a/app/extension/scripts/backgroundPortManager.js
+++ /dev/null
@@ -1,170 +0,0 @@
-'use strict';
-
-var backgroundPortManager = function (messageCallback, roomDisconnectCallback){
-	// variables ----------------------------------------------------------------
-	var _this 				    = {},
-        _openTabs 			    = {},
-		_rooms					= {},
-		_messageCallback	    = null,
-		_roomDisconnectCallback	= null;
-	
-	// initialize ---------------------------------------------------------------
-	_this.init = function (messageCallback, roomDisconnectCallback){
-		_messageCallback = messageCallback;
-		_roomDisconnectCallback = roomDisconnectCallback;
-
-		// send messages from "background.js"
-    	chrome.runtime.onConnect.addListener(processTabPortConnected);
-
-		Logger.log('Internet Friends Background Port Manager Initialized');
-	};
-	
-	// private functions --------------------------------------------------------
-	function getUrl(port) {
-		let url;
-		
-		if (port.sender.tab.url) { // Chrome
-			url = new URL(port.sender.tab.url);
-		}
-		else // FireFox
-		{
-			var tabId = port.sender.tab.id;
-			var source = port.name;
-			if (source == 'InternetFriends-main') {
-				url = new URL(port.sender.tab.url);
-			} else if (_openTabs[tabId]['InternetFriends-main']) {
-				url = new URL(_openTabs[tabId]['InternetFriends-main'].sender.url);
-			}
-		}
-		
-		return url;
-	}
-
-	function getRoomCodeFromPort(port, url) {
-		// Room code is based on url and title
-		// e.g. 'www.google.com/search : test - Google Search'
-		// The goal is to group users based on the page they're currently on
-		// Ignoring url.search because many websites url.search values are unique to each user
-		var url = getUrl(port);
-		return url.host + url.pathname + " : " + port.sender.tab.title;
-	}
-
-    // events -------------------------------------------------------------------
-	function processTabPortConnected (port){
-		// Only process if site not disabled
-		var websiteUrl = getUrl(port);
-
-		// If websiteUrl is present in disabledSites, InternetFriends is disabled for this site, return
-		if (IFSettings.disabledSites[websiteUrl.host])
-			return;
-
-		var tabId = port.sender.tab.id;
-		var source = port.name;
-		var roomCode = getRoomCodeFromPort(port);
-		
-		Logger.log('Tab Connected RoomCode: ' + roomCode + ' ID: ' + tabId);
-
-		// Add port to tab
-		if(!_openTabs[tabId]) 
-			_openTabs[tabId] = {};
-
-		_openTabs[tabId][source] = port;
-		
-		// Create room
-		if (!_rooms[roomCode])
-			_rooms[roomCode] = {};
-
-		// Add tab to room
-		_rooms[roomCode][tabId] = true;
-
-		// After both sources have connected
-		if(_openTabs[tabId]['InternetFriends-chat'] &&
-			_openTabs[tabId]['InternetFriends-main'])
-		{
-			// Setup Listeners
-			_openTabs[tabId]['InternetFriends-chat'].onMessage.addListener(function (event) { processMessage(event, tabId, 'InternetFriends-chat', roomCode) });
-			_openTabs[tabId]['InternetFriends-main'].onMessage.addListener(function (event) { processMessage(event, tabId, 'InternetFriends-main', roomCode) });
-			_openTabs[tabId]['InternetFriends-chat'].onDisconnect.addListener(function () { processTabPortDisconnect(tabId, 'InternetFriends-chat', roomCode) });
-			_openTabs[tabId]['InternetFriends-main'].onDisconnect.addListener(function () { processTabPortDisconnect(tabId, 'InternetFriends-main', roomCode) });
-
-			// Post loaded messages
-			_openTabs[tabId]['InternetFriends-chat'].postMessage({event: 'loaded'});
-			_openTabs[tabId]['InternetFriends-main'].postMessage({event: 'loaded'});
-		}
-	};
-    
-    function processMessage (message, tabId, source, roomCode) {
-        _messageCallback(message, roomCode);
-
-        // Forward to iframe
-        if(source != 'InternetFriends-chat') {
-            message.data.userId = "localuser";
-            _this.tellByTabId(tabId, message);
-        }
-    }
-
-	function processTabPortDisconnect (tabId, source, roomCode){
-		// process the disconnect
-		if (_openTabs[tabId]) {
-			delete _openTabs[tabId][source];
-		}
-
-		if(source == 'InternetFriends-main') {
-			delete _openTabs[tabId];
-			delete _rooms[roomCode][tabId];
-
-			let tabIds = Object.keys(_rooms[roomCode]);
-
-			// If there are no other tabs associated with this room code, disconnect
-			if (tabIds.length === 0)
-                _roomDisconnectCallback(roomCode);
-		}
-	};
-
-	// public functions ---------------------------------------------------------	
-	_this.tellByRoomCode = function (roomCode, data){
-		if (!_rooms[roomCode])
-			return false;
-
-		let success = false;
-		
-		// Loop through all tabs that are associated with the given room code
-		for (var tabId in _rooms[roomCode]) {
-        	success ||= _this.tellByTabId(tabId, data);
-		}
-
-		// If any tabs were found, this should return true
-		return success;
-    };
-    
-    _this.tellByTabId = function (tabId, data){
-        if(_openTabs[tabId] && _openTabs[tabId]["InternetFriends-chat"]) {
-            _openTabs[tabId]["InternetFriends-chat"].postMessage(data);
-            return true;
-        }
-
-        return false;
-	};
-
-	_this.updateBadgeTextByRoomCode = function (roomCode, peers) {
-		if (!_rooms[roomCode])
-			return false;
-		
-		// Loop through all tabs that are associated with the given room code
-		for (var tabId in _rooms[roomCode]) {
-			chrome.action.setBadgeText(
-				{
-					text: peers > 0 ? peers.toString() : '',
-					tabId: parseInt(tabId)
-				}
-			);
-		}
-
-		return true;
-	};
-
-	// messages -----------------------------------------------------------------	
-	_this.init(messageCallback, roomDisconnectCallback);
-	
-	return _this;
-};
diff --git a/app/manifest.json b/app/manifest.json
index e2dec59..a9c4553 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -10,7 +10,7 @@
     "default_locale": "en",
     "incognito": "split",
     "background": {
-        "service_worker": "scripts/bundle.js"
+        "service_worker": "scripts/background.js"
     },
     "permissions": [
         "storage",
@@ -47,11 +47,10 @@
             "resources": [
                 "scripts/logger.js",
                 "scripts/settings.js",
-                "scripts/backgroundPortManager.js",
-                "scripts/bundle.js",
+                "scripts/background.js",
                 "scripts/popup.js",
                 "html/iframe/chat.html",
-                "scripts/chat.js",
+                "scripts/bundle.js",
                 "styles/core.css",
                 "styles/chat.css",
                 "styles/slider.css",
diff --git a/app/scripts.babel/background.js b/app/scripts.babel/background.js
index ae27d3d..0a49687 100644
--- a/app/scripts.babel/background.js
+++ b/app/scripts.babel/background.js
@@ -1,8 +1,10 @@
+// ---------------------------------------- Logger ----------------------------------------
 var debug = true;
 var Logger = {
     log: debug ? console.log.bind(console) : function(){}
 };
 
+// ---------------------------------------- Settings ----------------------------------------
 var IFSettings;
 var IFEvents = new EventTarget();
 
@@ -76,19 +78,15 @@ var IFEvents = new EventTarget();
     }
 }());
 
-var backgroundPortManager = function (messageCallback, roomDisconnectCallback){
+// ---------------------------------------- Background Port Manager ----------------------------------------
+var backgroundPortManager = function (){
 	// variables ----------------------------------------------------------------
 	var _this 				    = {},
         _openTabs 			    = {},
-		_rooms					= {},
-		_messageCallback	    = null,
-		_roomDisconnectCallback	= null;
+		_rooms					= {};
 	
 	// initialize ---------------------------------------------------------------
-	_this.init = function (messageCallback, roomDisconnectCallback){
-		_messageCallback = messageCallback;
-		_roomDisconnectCallback = roomDisconnectCallback;
-
+	function init(){
 		// send messages from "background.js"
     	chrome.runtime.onConnect.addListener(processTabPortConnected);
 
@@ -116,7 +114,7 @@ var backgroundPortManager = function (messageCallback, roomDisconnectCallback){
 		return url;
 	}
 
-	function getRoomCodeFromPort(port, url) {
+	function getRoomCodeFromPort(port) {
 		// Room code is based on url and title
 		// e.g. 'www.google.com/search : test - Google Search'
 		// The goal is to group users based on the page they're currently on
@@ -164,18 +162,22 @@ var backgroundPortManager = function (messageCallback, roomDisconnectCallback){
 			_openTabs[tabId]['InternetFriends-main'].onDisconnect.addListener(function () { processTabPortDisconnect(tabId, 'InternetFriends-main', roomCode) });
 
 			// Post loaded messages
-			_openTabs[tabId]['InternetFriends-chat'].postMessage({event: 'loaded'});
-			_openTabs[tabId]['InternetFriends-main'].postMessage({event: 'loaded'});
+			_openTabs[tabId]['InternetFriends-chat'].postMessage({event: 'loaded', data: { roomCode: getRoomCodeFromPort(port) }});
+			_openTabs[tabId]['InternetFriends-main'].postMessage({event: 'loaded', data: { roomCode: getRoomCodeFromPort(port) }});
 		}
 	};
     
     function processMessage (message, tabId, source, roomCode) {
-        _messageCallback(message, roomCode);
-
-        // Forward to iframe
-        if(source != 'InternetFriends-chat') {
+        if (source === 'InternetFriends-main') {
+            // messages coming from main source (inject)
+            // forward to chat
             message.data.userId = "localuser";
             _this.tellByTabId(tabId, message);
+        } else if (source === 'InternetFriends-chat') {
+            // messages coming from chat
+            if (message.event === 'updateBadgeText') {
+                _this.updateBadgeTextByRoomCode(roomCode, message.data.peers);
+            }
         }
     }
 
@@ -185,34 +187,13 @@ var backgroundPortManager = function (messageCallback, roomDisconnectCallback){
 			delete _openTabs[tabId][source];
 		}
 
-		if(source == 'InternetFriends-main') {
+		if (source == 'InternetFriends-main') {
 			delete _openTabs[tabId];
 			delete _rooms[roomCode][tabId];
-
-			let tabIds = Object.keys(_rooms[roomCode]);
-
-			// If there are no other tabs associated with this room code, disconnect
-			if (tabIds.length === 0)
-                _roomDisconnectCallback(roomCode);
 		}
 	};
 
-	// public functions ---------------------------------------------------------	
-	_this.tellByRoomCode = function (roomCode, data){
-		if (!_rooms[roomCode])
-			return false;
-
-		let success = false;
-		
-		// Loop through all tabs that are associated with the given room code
-		for (var tabId in _rooms[roomCode]) {
-        	success ||= _this.tellByTabId(tabId, data);
-		}
-
-		// If any tabs were found, this should return true
-		return success;
-    };
-    
+	// public functions ---------------------------------------------------------	    
     _this.tellByTabId = function (tabId, data){
         if(_openTabs[tabId] && _openTabs[tabId]["InternetFriends-chat"]) {
             _openTabs[tabId]["InternetFriends-chat"].postMessage(data);
@@ -240,26 +221,22 @@ var backgroundPortManager = function (messageCallback, roomDisconnectCallback){
 	};
 
 	// messages -----------------------------------------------------------------	
-	_this.init(messageCallback, roomDisconnectCallback);
+	init();
 	
 	return _this;
 };
 
-import { v4 as uuidv4 } from 'uuid';
-var swarm = require('webrtc-swarm')
-var signalhub = require('signalhub')
+// ---------------------------------------- Background Script ----------------------------------------
 
 var Background = (function() {
     // variables ----------------------------------------------------------------
     var _this = {},
-        _local = false,
-        _portManager = null,
-        _swarms = {};
+        _portManager = null;
 
     // initialize ---------------------------------------------------------------
     _this.init = function() {
         // receive post messages from 'inject.js' and any iframes
-        _portManager = new backgroundPortManager(processMessageFromBrowser, processRoomDisconnect);
+        _portManager = new backgroundPortManager();
 
         if (chrome && chrome.action) {
             chrome.action.setBadgeBackgroundColor({ color: IFSettings.userColor });
@@ -274,129 +251,8 @@ var Background = (function() {
     };
 
     // private functions --------------------------------------------------------
-    function connectToSwarm(roomCode, callback) {
-        if (_swarms[roomCode])
-            return;
-
-        Logger.log('connecting to swarm ', roomCode);
-
-        // init user info message
-        var userInfoMessage = {
-            event: 'userInfo',
-            data: {
-                userId: 'localuser',
-                userColor: IFSettings.userColor,
-            }
-        }
-
-        // send user info message to front end
-        _portManager.tellByRoomCode(roomCode, userInfoMessage);
-
-        var hub = signalhub(roomCode, _local ? ['localhost:8080'] : ['https://if-signalhub.herokuapp.com/'])
-        _swarms[roomCode] = swarm(hub, { wrtc: require('wrtc'), uuid: uuidv4() })
-
-        _swarms[roomCode].on('peer', function(peer, id) {
-            Logger.log('connected to a new peer:', id)
-            Logger.log('total peers:', _swarms[roomCode].peers.length)
-
-            // setup data listener
-            peer.on('data', (payload) => {
-                const message = JSON.parse(payload.toString())
-                message.data.source = 'peer'
-                message.data.userId = id
-                Logger.log(message);
-
-                // Forward the message to the chat window
-                const foundRoom = _portManager.tellByRoomCode(roomCode, message);
-                if (!foundRoom) {
-                    disconnectFromSwarm(roomCode)
-                }
-            })
-
-            // update the badge based on the number of peers
-            _portManager.updateBadgeTextByRoomCode(roomCode, _swarms[roomCode].peers.length);
-
-            // send user info message to peers on connection
-            userInfoMessage.data.userColor = IFSettings.userColor;
-            peer.send(JSON.stringify(userInfoMessage));
-        })
-
-        _swarms[roomCode].on('disconnect', function(peer, id) {
-            Logger.log('disconnected from a peer:', id)
-            _portManager.tellByRoomCode(roomCode, {
-                event: 'disconnected',
-                data: {
-                    source: 'peer',
-                    userId: id
-                }
-            });
-            
-            // update the badge based on the number of peers
-            _portManager.updateBadgeTextByRoomCode(roomCode, _swarms[roomCode] ? _swarms[roomCode].peers.length : 0);
-        })
-
-        // Resend user info if the user color is changed
-        IFEvents.addEventListener('settings.change.userColor', function () {
-            userInfoMessage.data.userColor = IFSettings.userColor;
-
-            // send to the swarm
-            sendMessageToSwarm(userInfoMessage, roomCode);
-
-            // also send locally
-            _portManager.tellByRoomCode(roomCode, userInfoMessage);
-        });
-
-        if (callback)
-            callback();
-    };
-
-    function disconnectFromSwarm(roomCode) {
-        if (_swarms[roomCode]) {
-            Logger.log('disconnecting from swarm ', roomCode);
-
-            _swarms[roomCode].close()
-            delete _swarms[roomCode]
-            
-            Logger.log('disconnected');
-        }
-    };
-
-    function sendMessageToSwarm(message, roomCode) {
-        // if message if intended for a new swarm
-        if (!_swarms[roomCode]) {
-            // connect to the new swarm
-            connectToSwarm(roomCode, function () {
-                // once connected, send the message to the swarm
-                if (_swarms[roomCode]) {
-                    _swarms[roomCode].peers.forEach((peer) => {
-                        peer.send(JSON.stringify(message));
-                    });
-                }
-            });
-        }
-        // already connected, send the message to the swarm
-        else if (_swarms[roomCode]) {
-            _swarms[roomCode].peers.forEach((peer) => {
-                peer.send(JSON.stringify(message));
-            });
-        }
-    };
 
     // events -------------------------------------------------------------------
-    function processMessageFromBrowser(message, roomCode) {
-        if (message.event == 'pageHidden') {
-            disconnectFromSwarm(roomCode);
-        } else if (message.event == 'pageVisible') {
-            connectToSwarm(roomCode);
-        } else if (message.event != 'scroll') {
-            var wsMessage = JSON.parse(JSON.stringify(message));
-            sendMessageToSwarm(wsMessage, roomCode);
-        }
-    };
-
-    function processRoomDisconnect(roomCode) {
-        disconnectFromSwarm(roomCode);
-    };
 
     return _this;
 }());
diff --git a/app/scripts.babel/chat.js b/app/scripts.babel/chat.js
index 109e058..70b21e3 100644
--- a/app/scripts.babel/chat.js
+++ b/app/scripts.babel/chat.js
@@ -1,3 +1,110 @@
+//import { v4 as uuidv4 } from 'uuid';
+var swarm = require('webrtc-swarm')
+var signalhub = require('signalhub')
+
+var IFSwarm = function(roomCode, portManager, messageCallback) {
+    // variables ----------------------------------------------------------------
+    var _this = {},
+        _local = true,
+        _roomCode = roomCode,
+        _portManager = portManager,
+        _swarm = null,
+        _messageCallback = messageCallback,
+        _userInfoMessage = {
+            event: 'userInfo',
+            data: {}
+        };
+
+    
+    // initialize ---------------------------------------------------------------
+    function init() {
+        Logger.log(`new Swarm Initialized "${_roomCode}"`);
+    };
+    
+    // public functions --------------------------------------------------------
+    _this.connect = function() {
+        if (_swarm)
+            return;
+
+        Logger.log('connecting to swarm ', _roomCode);
+
+        var hub = signalhub(_roomCode, _local ? ['localhost:8080'] : ['https://if-signalhub.herokuapp.com/'])
+        _swarm = swarm(hub, { wrtc: require('wrtc') })
+
+        _swarm.on('peer', function(peer, id) {
+            Logger.log('connected to a new peer:', id)
+            Logger.log('total peers:', _swarm.peers.length)
+
+            // setup data listener
+            peer.on('data', (payload) => {
+                const message = JSON.parse(payload.toString())
+                message.data.source = 'peer'
+                message.data.userId = id
+                Logger.log(message);
+
+                // fire callback with the given message
+                _messageCallback(message);
+            })
+
+            // update the badge based on the number of peers
+            _portManager.tell('updateBadgeText', { peers: _swarm ? _swarm.peers.length : 0 });
+
+            // send user info message to peers on connection
+            _userInfoMessage.data.userColor = IFSettings.userColor;
+            peer.send(JSON.stringify(_userInfoMessage));
+        })
+
+        _swarm.on('disconnect', function(peer, id) {
+            Logger.log('disconnected from a peer:', id)
+            
+            // fire callback with the given message
+            _messageCallback({
+                event: 'disconnected',
+                data: {
+                    source: 'peer',
+                    userId: id
+                }
+            });
+            
+            // update the badge based on the number of peers
+            _portManager.tell('updateBadgeText', { peers: _swarm ? _swarm.peers.length : 0 });
+        })
+
+        // Resend user info if the user color is changed
+        IFEvents.addEventListener('settings.change.userColor', function () {
+            _userInfoMessage.data.userColor = IFSettings.userColor;
+
+            // send to the swarm
+            _this.sendMessage(_userInfoMessage);
+        });
+    };
+
+    _this.disconnect = function () {
+        if (!_swarm)
+            return;
+
+        Logger.log('disconnecting from swarm ', _roomCode);
+
+        _swarm.close()
+        _swarm = null;
+        
+        Logger.log('disconnected');
+    };
+
+    _this.sendMessage = function (message) {
+        if (!_swarm)
+            return;
+
+        _swarm.peers.forEach((peer) => {
+            peer.send(JSON.stringify(message));
+        });
+    };
+
+    init();
+	
+	return _this;
+};
+
 var User = function(id, submitCallback) {
     // variables ----------------------------------------------------------------
     var _this = {},
@@ -26,6 +133,12 @@ var User = function(id, submitCallback) {
         if (_id == "localuser") {
             _inputElement = $('<span contenteditable="true" class="input"></span>').appendTo(_userElement);
             setupInputElement();
+            _this.setColor(IFSettings.userColor);
+
+            // Add listener for color changes
+            IFEvents.addEventListener('settings.change.userColor', function () {
+                _this.setColor(IFSettings.userColor);
+            });
         } else {
             var cursorURL = typeof chrome !== "undefined" && chrome.runtime ? chrome.runtime.getURL('../../images/aero_arrow.png') : './images/aero_arrow.png';
             _mouseElement = $('<div class="fakeMouse"></div>').appendTo(_userElement);
@@ -138,7 +251,9 @@ var Chat = (function() {
         _portManager = null,
         _users = {},
         _scrollPosition = {},
-        _mouseVisible = true;
+        _mouseVisible = true,
+        _pageVisible = false,
+        _swarm = null;
 
     // initialize ---------------------------------------------------------------
     _this.init = function() {
@@ -150,7 +265,30 @@ var Chat = (function() {
     // events -------------------------------------------------------------------
     function onMessage(message) {
         Logger.log('got chat message', message)
+
+        // forward certain messages that didn't come from the swarm (from a peer)
+        if (_swarm && (!message.data.source || message.data.source != 'peer')) {
+            switch (message.event) {
+                case 'userInfo':
+                case 'mousemove':
+                case 'userchat':
+                case 'disconnected':
+                    _swarm.sendMessage(message);
+                    break;
+            }
+        }
+
+        // process messages
         switch (message.event) {
+            case 'loaded':
+                message_onLoaded(message.data);
+                break;
+            case 'pageVisible':
+                message_onPageVisible();
+                break;
+            case 'pageHidden':
+                message_onPageHidden();
+                break;
             case 'userInfo':
                 message_onUserInfo(message.data);
                 break;
@@ -182,8 +320,18 @@ var Chat = (function() {
 
     // private functions ---------------------------------------------------------
     function submitInput(message) {
-        var data = { message: message };
-        _portManager.tell('userchat', data);
+        // process locally
+        message_onUserchat({ userId: 'localuser', message: message })
+
+        // send to swarm
+        if (_swarm) {
+            _swarm.sendMessage({
+                event: 'userchat',
+                data: {
+                    message: message
+                }
+            });
+        }
     };
 
     function getUser(userId) {
@@ -194,6 +342,30 @@ var Chat = (function() {
     };
 
     // messages -----------------------------------------------------------------
+    function message_onLoaded({ roomCode }) {
+        // init swarm
+        _swarm = new IFSwarm(roomCode, _portManager, onMessage);
+        if (_pageVisible) {
+            _swarm.connect();
+        }
+    }
+
+    function message_onPageVisible() {
+        _pageVisible = true;
+
+        if (_swarm) {
+            _swarm.connect();
+        }
+    }
+    
+    function message_onPageHidden() {
+        _pageVisible = false;
+
+        if (_swarm) {
+            _swarm.disconnect();
+        }
+    }
+
     function message_onUserInfo(data) {
         var user = getUser(data.userId);
         user.setColor(data.userColor);
diff --git a/app/scripts.babel/inject.js b/app/scripts.babel/inject.js
index a69f5c3..0261d9d 100644
--- a/app/scripts.babel/inject.js
+++ b/app/scripts.babel/inject.js
@@ -113,10 +113,18 @@ var Inject = (function() {
 
     // messages -----------------------------------------------------------------
     function message_onLoaded() {
+        // Send init scroll info
         var data = { scrollX: window.scrollX, scrollY: window.scrollY };
 
-        if (_portManager)
+        if (_portManager) {
             _portManager.tell("scroll", data);
+            
+            if (isPageHidden()) {
+                _portManager.tell("pageHidden");
+            } else {
+                _portManager.tell("pageVisible");
+            }
+        }
     }
 
     // events -------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 6cb619e..5d97253 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -34,7 +34,7 @@ function jsBabel() {
 
 function jsBrowserify() {
   return browserify({
-    entries: 'app/scripts/background.js',
+    entries: 'app/scripts/chat.js',
     debug: false
   })
   .bundle()
diff --git a/package-lock.json b/package-lock.json
index f963d33..c4f9dba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,6 @@
         "gulp-uglify": "^3.0.2",
         "gulp-useref": "^5.0.0",
         "gulp-zip": "^5.1.0",
-        "patch-package": "^6.4.7",
         "signalhub": "^4.9.0",
         "uuid": "^8.3.2",
         "vinyl-source-stream": "^2.0.0",
@@ -1839,11 +1838,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/@yarnpkg/lockfile": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
-    },
     "node_modules/acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -3527,11 +3521,6 @@
         "underscore.string": "^3.0.3"
       }
     },
-    "node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-    },
     "node_modules/cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -5972,67 +5961,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/find-yarn-workspace-root": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
-      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
-      "dependencies": {
-        "micromatch": "^4.0.2"
-      }
-    },
-    "node_modules/find-yarn-workspace-root/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-yarn-workspace-root/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-yarn-workspace-root/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/find-yarn-workspace-root/node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/find-yarn-workspace-root/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/findup-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
@@ -6190,19 +6118,6 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
       "optional": true
     },
-    "node_modules/fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -8585,17 +8500,6 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
-    "node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/is-core-module": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
@@ -8631,20 +8535,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -8944,17 +8834,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -9081,14 +8960,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
     "node_modules/jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
@@ -9164,14 +9035,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/klaw-sync": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
-      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
-      "dependencies": {
-        "graceful-fs": "^4.1.11"
-      }
-    },
     "node_modules/labeled-stream-splicer": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
@@ -10162,7 +10025,8 @@
     "node_modules/nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "optional": true
     },
     "node_modules/no-case": {
       "version": "2.3.2",
@@ -10523,21 +10387,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -10850,101 +10699,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/patch-package": {
-      "version": "6.4.7",
-      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz",
-      "integrity": "sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==",
-      "dependencies": {
-        "@yarnpkg/lockfile": "^1.1.0",
-        "chalk": "^2.4.2",
-        "cross-spawn": "^6.0.5",
-        "find-yarn-workspace-root": "^2.0.0",
-        "fs-extra": "^7.0.1",
-        "is-ci": "^2.0.0",
-        "klaw-sync": "^6.0.0",
-        "minimist": "^1.2.0",
-        "open": "^7.4.2",
-        "rimraf": "^2.6.3",
-        "semver": "^5.6.0",
-        "slash": "^2.0.0",
-        "tmp": "^0.0.33"
-      },
-      "bin": {
-        "patch-package": "index.js"
-      },
-      "engines": {
-        "npm": ">5"
-      }
-    },
-    "node_modules/patch-package/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/patch-package/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/patch-package/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/patch-package/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/patch-package/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/patch-package/node_modules/slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/patch-package/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -11990,6 +11744,7 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "devOptional": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -13499,17 +13254,6 @@
         "next-tick": "1"
       }
     },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -13894,14 +13638,6 @@
         "through2-filter": "^3.0.0"
       }
     },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -15826,11 +15562,6 @@
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
       "optional": true
     },
-    "@yarnpkg/lockfile": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
-    },
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -17201,11 +16932,6 @@
         "underscore.string": "^3.0.3"
       }
     },
-    "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -19206,54 +18932,6 @@
         "semver-regex": "^2.0.0"
       }
     },
-    "find-yarn-workspace-root": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
-      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
-      "requires": {
-        "micromatch": "^4.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-        },
-        "micromatch": {
-          "version": "4.0.5",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-          "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-          "requires": {
-            "braces": "^3.0.2",
-            "picomatch": "^2.3.1"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
-      }
-    },
     "findup-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
@@ -19380,16 +19058,6 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
       "optional": true
     },
-    "fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
     "fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -21199,14 +20867,6 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
-    "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "requires": {
-        "ci-info": "^2.0.0"
-      }
-    },
     "is-core-module": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
@@ -21233,11 +20893,6 @@
         "kind-of": "^6.0.2"
       }
     },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
-    },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -21451,14 +21106,6 @@
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -21564,14 +21211,6 @@
         "minimist": "^1.2.5"
       }
     },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
     "jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
@@ -21626,14 +21265,6 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
-    "klaw-sync": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
-      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
-      "requires": {
-        "graceful-fs": "^4.1.11"
-      }
-    },
     "labeled-stream-splicer": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
@@ -22478,7 +22109,8 @@
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "optional": true
     },
     "no-case": {
       "version": "2.3.2",
@@ -22758,15 +22390,6 @@
         "mimic-fn": "^2.1.0"
       }
     },
-    "open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-      "requires": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      }
-    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -23000,76 +22623,6 @@
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
-    "patch-package": {
-      "version": "6.4.7",
-      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.4.7.tgz",
-      "integrity": "sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==",
-      "requires": {
-        "@yarnpkg/lockfile": "^1.1.0",
-        "chalk": "^2.4.2",
-        "cross-spawn": "^6.0.5",
-        "find-yarn-workspace-root": "^2.0.0",
-        "fs-extra": "^7.0.1",
-        "is-ci": "^2.0.0",
-        "klaw-sync": "^6.0.0",
-        "minimist": "^1.2.0",
-        "open": "^7.4.2",
-        "rimraf": "^2.6.3",
-        "semver": "^5.6.0",
-        "slash": "^2.0.0",
-        "tmp": "^0.0.33"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-        },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
     "path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -23875,6 +23428,7 @@
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "devOptional": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -25081,14 +24635,6 @@
         "next-tick": "1"
       }
     },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
     "to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -25386,11 +24932,6 @@
         "through2-filter": "^3.0.0"
       }
     },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
diff --git a/package.json b/package.json
index 37a46e0..bee0a71 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,6 @@
     "gulp-uglify": "^3.0.2",
     "gulp-useref": "^5.0.0",
     "gulp-zip": "^5.1.0",
-    "patch-package": "^6.4.7",
     "signalhub": "^4.9.0",
     "uuid": "^8.3.2",
     "vinyl-source-stream": "^2.0.0",
diff --git a/patches/signalhub+4.9.0.patch b/patches/signalhub+4.9.0.patch
deleted file mode 100644
index 1d7d305..0000000
--- a/patches/signalhub+4.9.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/node_modules/signalhub/index.js b/node_modules/signalhub/index.js
-index dffd175..3488910 100644
---- a/node_modules/signalhub/index.js
-+++ b/node_modules/signalhub/index.js
-@@ -103,16 +103,18 @@ SignalHub.prototype.close = function (cb) {
-   }
- }
- 
--function broadcast (app, url, channel, message, cb) {
--  return nets({
-+async function broadcast (app, url, channel, message, cb) {
-+  return await fetch(url + '/v1/' + app + '/' + channel, {
-     method: 'POST',
--    json: message,
--    url: url + '/v1/' + app + '/' + channel
--  }, function (err, res) {
-+    headers: {
-+      'Content-Type': 'application/json'
-+    },
-+    body: JSON.stringify(message)
-+  }).catch(function (err, res) {
-     if (err) return cb(err)
-     if (res.statusCode !== 200) return cb(new Error('Bad status: ' + res.statusCode))
-     cb()
--  })
-+  });
- }
- 
- function noop () {}

From 851929f73408594d5ed45abe29e8410e27922475 Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Mon, 2 May 2022 20:56:00 -0400
Subject: [PATCH 03/12] Removes unused files

---
 .bowerrc    |  3 ---
 .yo-rc.json |  6 ------
 bower.json  | 10 ----------
 3 files changed, 19 deletions(-)
 delete mode 100644 .bowerrc
 delete mode 100644 .yo-rc.json
 delete mode 100644 bower.json

diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index 5773025..0000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "directory": "app/bower_components"
-}
diff --git a/.yo-rc.json b/.yo-rc.json
deleted file mode 100644
index c6bb600..0000000
--- a/.yo-rc.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "generator-mocha": {
-    "ui": "bdd",
-    "rjs": false
-  }
-}
\ No newline at end of file
diff --git a/bower.json b/bower.json
deleted file mode 100644
index 3173391..0000000
--- a/bower.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "internetfriends",
-  "private": true,
-  "version": "0.0.0",
-  "dependencies": {},
-  "devDependencies": {
-    "chai": "^4.2.0",
-    "mocha": "^8.0.1"
-  }
-}

From c76b0964901d429660c21a285a751bde9dc80687 Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Sat, 7 May 2022 13:20:35 -0400
Subject: [PATCH 04/12] Refactor message routing from inject script to chat
 iframe

---
 app/extension/scripts/portManager.js |  37 +++---
 app/scripts.babel/background.js      | 175 +++------------------------
 app/scripts.babel/chat.js            |  52 ++++----
 app/scripts.babel/inject.js          | 149 ++++++++---------------
 4 files changed, 112 insertions(+), 301 deletions(-)

diff --git a/app/extension/scripts/portManager.js b/app/extension/scripts/portManager.js
index 2e2ccc9..854aabb 100644
--- a/app/extension/scripts/portManager.js
+++ b/app/extension/scripts/portManager.js
@@ -4,6 +4,7 @@ var portManager = function (source, messageCallback, disconnectCallback){
 		_source				= "",
 		_port				= null,
 		_messageListener	= null,
+		_connectListener 	= null,
 		_disconnectListener	= null;
 	
 	// initialize ---------------------------------------------------------------
@@ -12,26 +13,9 @@ var portManager = function (source, messageCallback, disconnectCallback){
 		_messageListener = messageCallback;
 		_disconnectListener = disconnectCallback;
 
-		// receive messages from "background.js"
-		_port = chrome.runtime.connect({name: "InternetFriends-" + source});
-		_port.onMessage.addListener(port_onMessage);	
-		_port.onDisconnect.addListener(port_onDisconnect);
-
 		Logger.log(`PortManager Initialized in "${source}"`);
 	};
 	
-	// private functions --------------------------------------------------------
-
-	// events -------------------------------------------------------------------
-	function port_onMessage (message){
-		// call the listener callback
-		if (_messageListener) _messageListener(message);
-	};
-
-	function port_onDisconnect (){
-		if (_disconnectListener) _disconnectListener();
-	};
-
 	// public functions ---------------------------------------------------------	
 	_this.tell = function (event, data){
 		var data = data || {};
@@ -43,6 +27,25 @@ var portManager = function (source, messageCallback, disconnectCallback){
 			});
 		}
 	};
+	
+	_this.connect = function () {
+		Logger.log("Connecting to Background Script...");
+
+		_port = chrome.runtime.connect({name: "InternetFriends-" + source});
+
+		if (_messageListener) _port.onMessage.addListener(_messageListener);	
+		if (_disconnectListener) _port.onDisconnect.addListener(_disconnectListener);
+	}
+
+	_this.disconnect = function () {
+		if (!_port)
+			return;
+			
+		Logger.log("Disconnecting from Background Script...");
+
+		_port.disconnect();
+		_port = null;
+	}
 
 	// messages -----------------------------------------------------------------	
 	_this.init(source, messageCallback, disconnectCallback);
diff --git a/app/scripts.babel/background.js b/app/scripts.babel/background.js
index 0a49687..d8a10b9 100644
--- a/app/scripts.babel/background.js
+++ b/app/scripts.babel/background.js
@@ -23,9 +23,7 @@ var IFEvents = new EventTarget();
 
     // define function for getting a random color
     function getRandomIroColor () {
-        var iroColor = new iro.Color('{a: 1, h: 0, s: 70, v: 90}');
-        iroColor.hue += Math.random() * 360;
-        return iroColor.hslaString;
+        return 'hsla(' + Math.round(Math.random() * 360) + ', 70%, 66%, 1)';
     }
 
     // if chrome is available
@@ -78,165 +76,24 @@ var IFEvents = new EventTarget();
     }
 }());
 
-// ---------------------------------------- Background Port Manager ----------------------------------------
-var backgroundPortManager = function (){
-	// variables ----------------------------------------------------------------
-	var _this 				    = {},
-        _openTabs 			    = {},
-		_rooms					= {};
-	
-	// initialize ---------------------------------------------------------------
-	function init(){
-		// send messages from "background.js"
-    	chrome.runtime.onConnect.addListener(processTabPortConnected);
-
-		Logger.log('Internet Friends Background Port Manager Initialized');
-	};
-	
-	// private functions --------------------------------------------------------
-	function getUrl(port) {
-		let url;
-		
-		if (port.sender.tab.url) { // Chrome
-			url = new URL(port.sender.tab.url);
-		}
-		else // FireFox
-		{
-			var tabId = port.sender.tab.id;
-			var source = port.name;
-			if (source == 'InternetFriends-main') {
-				url = new URL(port.sender.tab.url);
-			} else if (_openTabs[tabId]['InternetFriends-main']) {
-				url = new URL(_openTabs[tabId]['InternetFriends-main'].sender.url);
-			}
-		}
-		
-		return url;
-	}
-
-	function getRoomCodeFromPort(port) {
-		// Room code is based on url and title
-		// e.g. 'www.google.com/search : test - Google Search'
-		// The goal is to group users based on the page they're currently on
-		// Ignoring url.search because many websites url.search values are unique to each user
-		var url = getUrl(port);
-		return url.host + url.pathname + " : " + port.sender.tab.title;
-	}
-
-    // events -------------------------------------------------------------------
-	function processTabPortConnected (port){
-		// Only process if site not disabled
-		var websiteUrl = getUrl(port);
-
-		// If websiteUrl is present in disabledSites, InternetFriends is disabled for this site, return
-		if (IFSettings.disabledSites[websiteUrl.host])
-			return;
-
-		var tabId = port.sender.tab.id;
-		var source = port.name;
-		var roomCode = getRoomCodeFromPort(port);
-		
-		Logger.log('Tab Connected RoomCode: ' + roomCode + ' ID: ' + tabId);
-
-		// Add port to tab
-		if(!_openTabs[tabId]) 
-			_openTabs[tabId] = {};
-
-		_openTabs[tabId][source] = port;
-		
-		// Create room
-		if (!_rooms[roomCode])
-			_rooms[roomCode] = {};
-
-		// Add tab to room
-		_rooms[roomCode][tabId] = true;
-
-		// After both sources have connected
-		if(_openTabs[tabId]['InternetFriends-chat'] &&
-			_openTabs[tabId]['InternetFriends-main'])
-		{
-			// Setup Listeners
-			_openTabs[tabId]['InternetFriends-chat'].onMessage.addListener(function (event) { processMessage(event, tabId, 'InternetFriends-chat', roomCode) });
-			_openTabs[tabId]['InternetFriends-main'].onMessage.addListener(function (event) { processMessage(event, tabId, 'InternetFriends-main', roomCode) });
-			_openTabs[tabId]['InternetFriends-chat'].onDisconnect.addListener(function () { processTabPortDisconnect(tabId, 'InternetFriends-chat', roomCode) });
-			_openTabs[tabId]['InternetFriends-main'].onDisconnect.addListener(function () { processTabPortDisconnect(tabId, 'InternetFriends-main', roomCode) });
-
-			// Post loaded messages
-			_openTabs[tabId]['InternetFriends-chat'].postMessage({event: 'loaded', data: { roomCode: getRoomCodeFromPort(port) }});
-			_openTabs[tabId]['InternetFriends-main'].postMessage({event: 'loaded', data: { roomCode: getRoomCodeFromPort(port) }});
-		}
-	};
-    
-    function processMessage (message, tabId, source, roomCode) {
-        if (source === 'InternetFriends-main') {
-            // messages coming from main source (inject)
-            // forward to chat
-            message.data.userId = "localuser";
-            _this.tellByTabId(tabId, message);
-        } else if (source === 'InternetFriends-chat') {
-            // messages coming from chat
-            if (message.event === 'updateBadgeText') {
-                _this.updateBadgeTextByRoomCode(roomCode, message.data.peers);
-            }
-        }
-    }
-
-	function processTabPortDisconnect (tabId, source, roomCode){
-		// process the disconnect
-		if (_openTabs[tabId]) {
-			delete _openTabs[tabId][source];
-		}
-
-		if (source == 'InternetFriends-main') {
-			delete _openTabs[tabId];
-			delete _rooms[roomCode][tabId];
-		}
-	};
-
-	// public functions ---------------------------------------------------------	    
-    _this.tellByTabId = function (tabId, data){
-        if(_openTabs[tabId] && _openTabs[tabId]["InternetFriends-chat"]) {
-            _openTabs[tabId]["InternetFriends-chat"].postMessage(data);
-            return true;
-        }
-
-        return false;
-	};
-
-	_this.updateBadgeTextByRoomCode = function (roomCode, peers) {
-		if (!_rooms[roomCode])
-			return false;
-		
-		// Loop through all tabs that are associated with the given room code
-		for (var tabId in _rooms[roomCode]) {
-			chrome.action.setBadgeText(
-				{
-					text: peers > 0 ? peers.toString() : '',
-					tabId: parseInt(tabId)
-				}
-			);
-		}
-
-		return true;
-	};
-
-	// messages -----------------------------------------------------------------	
-	init();
-	
-	return _this;
-};
-
 // ---------------------------------------- Background Script ----------------------------------------
 
 var Background = (function() {
     // variables ----------------------------------------------------------------
-    var _this = {},
-        _portManager = null;
+    var _this = {};
 
     // initialize ---------------------------------------------------------------
     _this.init = function() {
-        // receive post messages from 'inject.js' and any iframes
-        _portManager = new backgroundPortManager();
+        // receive post messages from 'inject.js' and any iframes        
+        if (chrome && chrome.runtime) {
+            chrome.runtime.onMessage.addListener(
+                function(request, sender) {
+                    if (request.event === 'updateBadgeText') {
+                        updateBadgeTextByTabId(sender.tab.id, request.data.peers);
+                    }
+                }
+            );
+        }
 
         if (chrome && chrome.action) {
             chrome.action.setBadgeBackgroundColor({ color: IFSettings.userColor });
@@ -251,6 +108,14 @@ var Background = (function() {
     };
 
     // private functions --------------------------------------------------------
+	function updateBadgeTextByTabId (tabId, peers) {
+		chrome.action.setBadgeText(
+            {
+                text: peers > 0 ? peers.toString() : '',
+                tabId: tabId
+            }
+        );
+	};
 
     // events -------------------------------------------------------------------
 
diff --git a/app/scripts.babel/chat.js b/app/scripts.babel/chat.js
index 70b21e3..ae5ec5f 100644
--- a/app/scripts.babel/chat.js
+++ b/app/scripts.babel/chat.js
@@ -2,12 +2,11 @@
 var swarm = require('webrtc-swarm')
 var signalhub = require('signalhub')
 
-var IFSwarm = function(roomCode, portManager, messageCallback) {
+var IFSwarm = function(roomCode, messageCallback) {
     // variables ----------------------------------------------------------------
     var _this = {},
         _local = true,
-        _roomCode = roomCode,
-        _portManager = portManager,
+        _roomCode = null,
         _swarm = null,
         _messageCallback = messageCallback,
         _userInfoMessage = {
@@ -18,9 +17,9 @@ var IFSwarm = function(roomCode, portManager, messageCallback) {
     
     // initialize ---------------------------------------------------------------
     function init() {
-        Logger.log(`new Swarm Initialized "${_roomCode}"`);
+        _roomCode = roomCode;
     };
-    
+
     // public functions --------------------------------------------------------
     _this.connect = function() {
         if (_swarm)
@@ -47,7 +46,7 @@ var IFSwarm = function(roomCode, portManager, messageCallback) {
             })
 
             // update the badge based on the number of peers
-            _portManager.tell('updateBadgeText', { peers: _swarm ? _swarm.peers.length : 0 });
+            chrome.runtime.sendMessage({ event: 'updateBadgeText', data: { peers: _swarm ? _swarm.peers.length : 0 }});
 
             // send user info message to peers on connection
             _userInfoMessage.data.userColor = IFSettings.userColor;
@@ -67,7 +66,7 @@ var IFSwarm = function(roomCode, portManager, messageCallback) {
             });
             
             // update the badge based on the number of peers
-            _portManager.tell('updateBadgeText', { peers: _swarm ? _swarm.peers.length : 0 });
+            chrome.runtime.sendMessage({ event: 'updateBadgeText', data: { peers: _swarm ? _swarm.peers.length : 0 }});
         })
 
         // Resend user info if the user color is changed
@@ -248,18 +247,20 @@ var User = function(id, submitCallback) {
 var Chat = (function() {
     // variables ----------------------------------------------------------------
     var _this = {},
-        _portManager = null,
+        _roomCode = null,
         _users = {},
-        _scrollPosition = {},
+        _scrollPosition = { x: 0, y: 0 },
         _mouseVisible = true,
-        _pageVisible = false,
         _swarm = null;
 
     // initialize ---------------------------------------------------------------
     _this.init = function() {
         Logger.log('Chat View Initialized')
-        _portManager = new portManager("chat", onMessage);
-        _scrollPosition = { x: 0, y: 0 };
+
+        window.addEventListener("message", (event) => {
+            event.data.data.userId = 'localuser';
+            onMessage(event.data);
+        });
     };
 
     // events -------------------------------------------------------------------
@@ -280,8 +281,8 @@ var Chat = (function() {
 
         // process messages
         switch (message.event) {
-            case 'loaded':
-                message_onLoaded(message.data);
+            case 'init':
+                message_onInit(message.data);
                 break;
             case 'pageVisible':
                 message_onPageVisible();
@@ -342,28 +343,17 @@ var Chat = (function() {
     };
 
     // messages -----------------------------------------------------------------
-    function message_onLoaded({ roomCode }) {
-        // init swarm
-        _swarm = new IFSwarm(roomCode, _portManager, onMessage);
-        if (_pageVisible) {
-            _swarm.connect();
-        }
+    function message_onInit(data) {
+        _roomCode = data.roomCode;
+        _swarm = new IFSwarm(_roomCode, onMessage);
     }
 
     function message_onPageVisible() {
-        _pageVisible = true;
-
-        if (_swarm) {
-            _swarm.connect();
-        }
+        _swarm.connect();
     }
-    
-    function message_onPageHidden() {
-        _pageVisible = false;
 
-        if (_swarm) {
-            _swarm.disconnect();
-        }
+    function message_onPageHidden() {
+        _swarm.disconnect();
     }
 
     function message_onUserInfo(data) {
diff --git a/app/scripts.babel/inject.js b/app/scripts.babel/inject.js
index 0261d9d..780676a 100644
--- a/app/scripts.babel/inject.js
+++ b/app/scripts.babel/inject.js
@@ -9,7 +9,8 @@ var Inject = (function() {
     var _this = {},
         _views = {},
         _container = null,
-        _portManager = null,
+        _iframe = null,
+        //_portManager = null,
         _comboDown = false;
 
     // initialize ---------------------------------------------------------------
@@ -26,124 +27,76 @@ var Inject = (function() {
         // create the main container
         _container = $('<div />', { id: ID.CONTAINER });
         _container.appendTo(document.body);
-
+        
         // add the "chat" iframe
-        getView('chat', _container);
-
-        // setup port manager to communicate with background.js
-        _portManager = new portManager("main", onMessage, onDisconnect);
-        _portManager.tell("tabInit");
-
-        // add event listeners
-        document.addEventListener("scroll", dom_onScroll, false);
-        document.addEventListener("mouseover", dom_onMousemove, false);
-        document.addEventListener("mousemove", dom_onMousemove, false);
-        document.addEventListener("mouseenter", dom_onMouseenter, false);
-        document.addEventListener("mouseleave", dom_onMouseleave, false);
-        document.addEventListener("webkitvisibilitychange", dom_onVisibilityChange, false);
-        document.addEventListener("msvisibilitychange", dom_onVisibilityChange, false);
-
-        // if chat is not enabled, return
-        if (!IFSettings.enableChat) {
-            Logger.log('Chat disabled. Disabling Key Combo Listeners.');
-            return;
-        }
-
-        // only detect key presses if chat is enabled
-        document.addEventListener("keydown", dom_onKeydown, false);
-        document.addEventListener("keyup", dom_onKeyup, false);
-    };
+        _iframe = document.createElement('iframe');
+        _iframe.onload = function () {
+            sendMessage('init', { roomCode: getRoomCode() });
+
+            // send visible if visible
+            if (!isPageHidden())
+                sendMessage('pageVisible');
+
+            // add event listeners
+            document.addEventListener("scroll", dom_onScroll, false);
+            document.addEventListener("mouseover", dom_onMousemove, false);
+            document.addEventListener("mousemove", dom_onMousemove, false);
+            document.addEventListener("mouseenter", dom_onMouseenter, false);
+            document.addEventListener("mouseleave", dom_onMouseleave, false);
+
+            // if chat is not enabled, return
+            if (!IFSettings.enableChat) {
+                Logger.log('Chat disabled. Disabling Key Combo Listeners.');
+                return;
+            }
 
-    // private functions --------------------------------------------------------
-    function getView(id) {
-        // return the view if it's already created
-        if (_views[id]) return _views[id];
-
-        // iframe initial details
-        var src = typeof chrome !== "undefined" && chrome.runtime ? chrome.runtime.getURL('html/iframe/' + id + '.html?view=' + id + '&_' + new Date().getTime()) : './html/iframe/chat.html',
-            iframe = $('<iframe/>', { id: ID.IFRAME_PREFIX + id, src: src, scrolling: false });
-
-        // view
-        _views[id] = {
-            isLoaded: false,
-            iframe: iframe
+            // only detect key presses if chat is enabled
+            document.addEventListener("keydown", dom_onKeydown, false);
+            document.addEventListener("keyup", dom_onKeyup, false);
+            document.addEventListener("webkitvisibilitychange", dom_onVisibilityChange, false);
+            document.addEventListener("msvisibilitychange", dom_onVisibilityChange, false);
         };
 
-        // add to the container
-        _container.append(iframe);
-
-        return _views[id];
+        _iframe.src = typeof chrome !== "undefined" && chrome.runtime ? chrome.runtime.getURL('html/iframe/chat.html?view=chat&_' + new Date().getTime()) : './html/iframe/chat.html';
+        _container.append(_iframe);
     };
 
-    // messages coming from "background.js"
-    function onMessage(request) {
-        Logger.log(request);
-
-        switch (request.event) {
-            case 'loaded':
-                message_onLoaded();
-                break;
-        }
-    };
+    // private functions --------------------------------------------------------
+    function getRoomCode() {
+		// Room code is based on url and title
+		// e.g. 'www.google.com/search : test - Google Search'
+		// The goal is to group users based on the page they're currently on
+		// Ignoring url.search because many websites url.search values are unique to each user
+        return document.location.host + document.location.pathname + ':' + document.title;
+    }
 
-    function onDisconnect() {
-        Logger.log("Tab Disconnected from Background Scripts");
-
-        // remove related elements
-        getView('chat', _container).iframe.remove();
-        _container.remove();
-
-        // remove event listeners
-        document.removeEventListener("scroll", dom_onScroll, false);
-        document.removeEventListener("mouseover", dom_onMousemove, false);
-        document.removeEventListener("mousemove", dom_onMousemove, false);
-        document.removeEventListener("mouseenter", dom_onMouseenter, false);
-        document.removeEventListener("mouseleave", dom_onMouseleave, false);
-        document.removeEventListener("keydown", dom_onKeydown, false);
-        document.removeEventListener("keyup", dom_onKeyup, false);
-        document.removeEventListener("webkitvisibilitychange", dom_onVisibilityChange, false);
-        document.removeEventListener("msvisibilitychange", dom_onVisibilityChange, false);
-
-        _portManager = null;
-    };
+    function sendMessage(event, data) {
+        // chrome-extension://namkigeilfgjhccknbahjkdolfbapckn ?
+        // Failed to execute 'postMessage' on 'DOMWindow': The target origin provided ('chrome-extension://namkigeilfgjhccknbahjkdolfbapckn') does not match the recipient window's origin ('https://www.youtube.com').
+        _iframe.contentWindow.postMessage({ event, data: data || {} }, 'chrome-extension://namkigeilfgjhccknbahjkdolfbapckn');
+    }
 
     function isPageHidden() {
         return document.hidden || document.msHidden || document.webkitHidden;
     }
 
-    // messages -----------------------------------------------------------------
-    function message_onLoaded() {
-        // Send init scroll info
-        var data = { scrollX: window.scrollX, scrollY: window.scrollY };
-
-        if (_portManager) {
-            _portManager.tell("scroll", data);
-            
-            if (isPageHidden()) {
-                _portManager.tell("pageHidden");
-            } else {
-                _portManager.tell("pageVisible");
-            }
-        }
-    }
-
     // events -------------------------------------------------------------------
     function dom_onScroll() {
         var data = { scrollX: window.scrollX, scrollY: window.scrollY };
-        _portManager.tell("scroll", data);
+        sendMessage("scroll", data);
     };
 
     function dom_onMousemove(event) {
         var data = { x: event.pageX, y: event.pageY, vw: ((event.pageX / document.documentElement.clientWidth) * 100) };
-        _portManager.tell("mousemove", data);
+        sendMessage("mousemove", data);
     };
 
     function dom_onMouseenter(event) {
-        _portManager.tell("mouseenter");
+        sendMessage("mouseenter");
     };
 
     function dom_onMouseleave(event) {
-        _portManager.tell("mouseleave");
+        sendMessage("mouseleave");
     };
 
     function dom_onKeydown(event) {
@@ -166,17 +119,17 @@ var Inject = (function() {
         // Detect combo release
         if (event.ctrlKey == combo.ctrlKey && event.shiftKey == combo.shiftKey && event.altKey == combo.altKey && key === combo.key && _comboDown) {
             Logger.log('Key Combo Detected. Opening Chat.');
-            _portManager.tell("openchat");
+            sendMessage("openchat");
             _comboDown = false;
             event.preventDefault();
         }
     };
 
     function dom_onVisibilityChange(event) {
-        if (isPageHidden()) {
-            _portManager.tell("pageHidden");
+        if (!isPageHidden()) {
+            sendMessage("pageVisible");
         } else {
-            _portManager.tell("pageVisible");
+            sendMessage("pageHidden");
         }
     }
 

From 3b59b223d700f9c3f969e11dde21bad6946480dd Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Mon, 9 May 2022 22:02:15 -0400
Subject: [PATCH 05/12] Encrypt room codes to hide webpages from signaling
 server

Alters calculation for assigning initial random color
Adds logic to reduce potential race conditions
---
 app/scripts.babel/background.js |  9 ++--
 app/scripts.babel/chat.js       | 12 ++++--
 app/scripts.babel/inject.js     | 73 +++++++++++++++++++++------------
 3 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/app/scripts.babel/background.js b/app/scripts.babel/background.js
index d8a10b9..c38a40e 100644
--- a/app/scripts.babel/background.js
+++ b/app/scripts.babel/background.js
@@ -22,8 +22,8 @@ var IFEvents = new EventTarget();
     };
 
     // define function for getting a random color
-    function getRandomIroColor () {
-        return 'hsla(' + Math.round(Math.random() * 360) + ', 70%, 66%, 1)';
+    function getRandomColor () {
+        return 'hsla(' + Math.round(Math.random() * 360) + ', 78%, 54%, 1)';
     }
 
     // if chrome is available
@@ -37,7 +37,7 @@ var IFEvents = new EventTarget();
                 combo: storedSettings?.combo || _defaultCombo,
                 disabledSites: storedSettings?.disabledSites || {},
                 enableChat: storedSettings?.enableChat === true || storedSettings?.enableChat === undefined,
-                userColor: storedSettings?.userColor || getRandomIroColor()
+                userColor: storedSettings?.userColor || getRandomColor()
             }
 
             // set new settings
@@ -69,7 +69,7 @@ var IFEvents = new EventTarget();
             combo: _defaultCombo,
             disabledSites: {},
             enableChat: true,
-            userColor: getRandomIroColor()
+            userColor: getRandomColor()
         }
         
         IFEvents.dispatchEvent(initEvent);
@@ -91,6 +91,7 @@ var Background = (function() {
                     if (request.event === 'updateBadgeText') {
                         updateBadgeTextByTabId(sender.tab.id, request.data.peers);
                     }
+                    return true;
                 }
             );
         }
diff --git a/app/scripts.babel/chat.js b/app/scripts.babel/chat.js
index ae5ec5f..53d8e31 100644
--- a/app/scripts.babel/chat.js
+++ b/app/scripts.babel/chat.js
@@ -1,12 +1,13 @@
-//import { v4 as uuidv4 } from 'uuid';
 var swarm = require('webrtc-swarm')
 var signalhub = require('signalhub')
+const { createHash } = require('crypto');
 
 var IFSwarm = function(roomCode, messageCallback) {
     // variables ----------------------------------------------------------------
     var _this = {},
-        _local = true,
+        _local = false,
         _roomCode = null,
+        _encodedRoomCode = null,
         _swarm = null,
         _messageCallback = messageCallback,
         _userInfoMessage = {
@@ -18,6 +19,9 @@ var IFSwarm = function(roomCode, messageCallback) {
     // initialize ---------------------------------------------------------------
     function init() {
         _roomCode = roomCode;
+        _encodedRoomCode = createHash('sha256').update(roomCode).digest('hex');
+        
+        window.parent.postMessage('roomCodeLoaded', '*');
     };
 
     // public functions --------------------------------------------------------
@@ -27,7 +31,7 @@ var IFSwarm = function(roomCode, messageCallback) {
 
         Logger.log('connecting to swarm ', _roomCode);
 
-        var hub = signalhub(_roomCode, _local ? ['localhost:8080'] : ['https://if-signalhub.herokuapp.com/'])
+        var hub = signalhub(_encodedRoomCode, _local ? ['localhost:8080'] : ['https://if-signalhub.herokuapp.com/'])
         _swarm = swarm(hub, { wrtc: require('wrtc') })
 
         _swarm.on('peer', function(peer, id) {
@@ -261,6 +265,8 @@ var Chat = (function() {
             event.data.data.userId = 'localuser';
             onMessage(event.data);
         });
+
+        window.parent.postMessage('iFrameLoaded', '*');
     };
 
     // events -------------------------------------------------------------------
diff --git a/app/scripts.babel/inject.js b/app/scripts.babel/inject.js
index 780676a..c25c618 100644
--- a/app/scripts.babel/inject.js
+++ b/app/scripts.babel/inject.js
@@ -24,44 +24,63 @@ var Inject = (function() {
             return;
         }
 
+        // add message listener
+        window.addEventListener("message", (event) => {
+            switch (event.data) {
+                case 'iFrameLoaded':
+                    onIFrameLoaded();
+                    break;
+                case 'roomCodeLoaded':
+                    onRoomCodeLoaded();
+                    break;
+            }
+        });
+
         // create the main container
         _container = $('<div />', { id: ID.CONTAINER });
         _container.appendTo(document.body);
         
         // add the "chat" iframe
         _iframe = document.createElement('iframe');
-        _iframe.onload = function () {
-            sendMessage('init', { roomCode: getRoomCode() });
-
-            // send visible if visible
-            if (!isPageHidden())
-                sendMessage('pageVisible');
-
-            // add event listeners
-            document.addEventListener("scroll", dom_onScroll, false);
-            document.addEventListener("mouseover", dom_onMousemove, false);
-            document.addEventListener("mousemove", dom_onMousemove, false);
-            document.addEventListener("mouseenter", dom_onMouseenter, false);
-            document.addEventListener("mouseleave", dom_onMouseleave, false);
-
-            // if chat is not enabled, return
-            if (!IFSettings.enableChat) {
-                Logger.log('Chat disabled. Disabling Key Combo Listeners.');
-                return;
-            }
-
-            // only detect key presses if chat is enabled
-            document.addEventListener("keydown", dom_onKeydown, false);
-            document.addEventListener("keyup", dom_onKeyup, false);
-            document.addEventListener("webkitvisibilitychange", dom_onVisibilityChange, false);
-            document.addEventListener("msvisibilitychange", dom_onVisibilityChange, false);
-        };
-
         _iframe.src = typeof chrome !== "undefined" && chrome.runtime ? chrome.runtime.getURL('html/iframe/chat.html?view=chat&_' + new Date().getTime()) : './html/iframe/chat.html';
         _container.append(_iframe);
     };
 
     // private functions --------------------------------------------------------
+    function onIFrameLoaded() {
+        Logger.log('iFrame loaded, sendMessage/postMessage is now available');
+
+        sendMessage('init', { roomCode: getRoomCode() });
+    }
+
+    function onRoomCodeLoaded() {
+        Logger.log('room code loaded, events for swarm now available');
+        
+        // add event listeners
+        document.addEventListener("scroll", dom_onScroll, false);
+        document.addEventListener("mouseover", dom_onMousemove, false);
+        document.addEventListener("mousemove", dom_onMousemove, false);
+        document.addEventListener("mouseenter", dom_onMouseenter, false);
+        document.addEventListener("mouseleave", dom_onMouseleave, false);
+
+        // if chat is not enabled, return
+        if (!IFSettings.enableChat) {
+            Logger.log('Chat disabled. Disabling Key Combo Listeners.');
+            return;
+        }
+
+        // only detect key presses if chat is enabled
+        document.addEventListener("keydown", dom_onKeydown, false);
+        document.addEventListener("keyup", dom_onKeyup, false);
+        document.addEventListener("webkitvisibilitychange", dom_onVisibilityChange, false);
+        document.addEventListener("msvisibilitychange", dom_onVisibilityChange, false);
+
+        // send visible if visible
+        if (!isPageHidden()) {
+            sendMessage('pageVisible');
+        }
+    }
+
     function getRoomCode() {
 		// Room code is based on url and title
 		// e.g. 'www.google.com/search : test - Google Search'

From e83023868c1259912d29fbb8e834e4e4ab205754 Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Tue, 10 May 2022 19:27:35 -0400
Subject: [PATCH 06/12] Improves performance

Simplifies background script
Simplifies communication between inject and chat frames
Adds timeout before connection to increase performance
Adds ability to change rooms without specifically navigating to a new page (for websites like YouTube)
---
 app/scripts.babel/background.js | 128 ++++++++------------------------
 app/scripts.babel/chat.js       |  78 +++++++++++--------
 app/scripts.babel/inject.js     |  64 +++++++---------
 app/scripts.babel/popup.js      |   1 +
 4 files changed, 105 insertions(+), 166 deletions(-)

diff --git a/app/scripts.babel/background.js b/app/scripts.babel/background.js
index c38a40e..98159a7 100644
--- a/app/scripts.babel/background.js
+++ b/app/scripts.babel/background.js
@@ -1,3 +1,26 @@
+// ---------------------------------------- Badge Text Listener ----------------------------------------
+chrome.runtime.onMessage.addListener(
+    function(request, sender) {
+        if (request.event === 'updateBadgeText')
+        {
+            let peers = request.data.peers;
+
+            chrome.action.setBadgeText(
+                {
+                    text: peers > 0 ? peers.toString() : '',
+                    tabId: sender.tab.id
+                }
+            );
+        }
+        else if (request.event === 'updateBadgeColor')
+        {
+            chrome.action.setBadgeBackgroundColor({ color: request.data.userColor });
+        }
+
+        return true;
+    }
+);
+
 // ---------------------------------------- Logger ----------------------------------------
 var debug = true;
 var Logger = {
@@ -5,14 +28,8 @@ var Logger = {
 };
 
 // ---------------------------------------- Settings ----------------------------------------
-var IFSettings;
-var IFEvents = new EventTarget();
-
 // wrap in a self-invoking function to use define private variables & functions
 (function () {
-    // define 'init' event
-    var initEvent = new Event('settings.init');
-
     // define default combo
     var _defaultCombo = {
         ctrlKey: true,
@@ -28,107 +45,22 @@ var IFEvents = new EventTarget();
 
     // if chrome is available
     if (chrome && chrome.storage) {
-        // retrieve settings
+        // retrieve settings from storage
         chrome.storage.sync.get(null, function(result) {
             var storedSettings = result;
 
-            // set IFSettings based on storedSettings, get default values if necessary
-            IFSettings = {
+            // set settings based on storedSettings, get default values if necessary
+            var settings = {
                 combo: storedSettings?.combo || _defaultCombo,
                 disabledSites: storedSettings?.disabledSites || {},
                 enableChat: storedSettings?.enableChat === true || storedSettings?.enableChat === undefined,
                 userColor: storedSettings?.userColor || getRandomColor()
             }
 
-            // set new settings
-            chrome.storage.sync.set(IFSettings);
+            // store new settings
+            chrome.storage.sync.set(settings);
 
-            Logger.log('Settings initialized:')
-            Logger.log(IFSettings);
-            IFEvents.dispatchEvent(initEvent);
+            Logger.log('Settings initialized:', settings);
         });
-
-        // listen for changes to settings
-        chrome.storage.onChanged.addListener(function (changes, namespace) {
-            for (let [key, { newValue }] of Object.entries(changes)) {
-                Logger.log(`Storage key "${key}" in namespace "${namespace}" changed.`);
-
-                // update settings
-                IFSettings[key] = newValue;
-                IFEvents.dispatchEvent(new Event('settings.change.' + key));
-
-                Logger.log(IFSettings);
-            }
-        });
-    }
-    // otherwise this is loaded outside an extension
-    else
-    {
-        // set IFSettings with default values
-        IFSettings = {
-            combo: _defaultCombo,
-            disabledSites: {},
-            enableChat: true,
-            userColor: getRandomColor()
-        }
-        
-        IFEvents.dispatchEvent(initEvent);
     }
-}());
-
-// ---------------------------------------- Background Script ----------------------------------------
-
-var Background = (function() {
-    // variables ----------------------------------------------------------------
-    var _this = {};
-
-    // initialize ---------------------------------------------------------------
-    _this.init = function() {
-        // receive post messages from 'inject.js' and any iframes        
-        if (chrome && chrome.runtime) {
-            chrome.runtime.onMessage.addListener(
-                function(request, sender) {
-                    if (request.event === 'updateBadgeText') {
-                        updateBadgeTextByTabId(sender.tab.id, request.data.peers);
-                    }
-                    return true;
-                }
-            );
-        }
-
-        if (chrome && chrome.action) {
-            chrome.action.setBadgeBackgroundColor({ color: IFSettings.userColor });
-        
-            // add listener for storage changes
-            IFEvents.addEventListener('settings.change.userColor', function () {
-                chrome.action.setBadgeBackgroundColor({color: IFSettings.userColor });
-            });
-        }
-    
-        Logger.log('Internet Friends Background Script Initialized');
-    };
-
-    // private functions --------------------------------------------------------
-	function updateBadgeTextByTabId (tabId, peers) {
-		chrome.action.setBadgeText(
-            {
-                text: peers > 0 ? peers.toString() : '',
-                tabId: tabId
-            }
-        );
-	};
-
-    // events -------------------------------------------------------------------
-
-    return _this;
-}());
-
-// If IFSettings have not been initialized, wait for init event to be dispatched
-if (!IFSettings) {
-    IFEvents.addEventListener('settings.init', function () {
-        Background.init();
-    });
-} else {
-    // else, init now
-    Background.init();
-}
\ No newline at end of file
+}());
\ No newline at end of file
diff --git a/app/scripts.babel/chat.js b/app/scripts.babel/chat.js
index 53d8e31..ec473a6 100644
--- a/app/scripts.babel/chat.js
+++ b/app/scripts.babel/chat.js
@@ -2,12 +2,10 @@ var swarm = require('webrtc-swarm')
 var signalhub = require('signalhub')
 const { createHash } = require('crypto');
 
-var IFSwarm = function(roomCode, messageCallback) {
+var IFSwarm = function(messageCallback) {
     // variables ----------------------------------------------------------------
     var _this = {},
         _local = false,
-        _roomCode = null,
-        _encodedRoomCode = null,
         _swarm = null,
         _messageCallback = messageCallback,
         _userInfoMessage = {
@@ -18,20 +16,19 @@ var IFSwarm = function(roomCode, messageCallback) {
     
     // initialize ---------------------------------------------------------------
     function init() {
-        _roomCode = roomCode;
-        _encodedRoomCode = createHash('sha256').update(roomCode).digest('hex');
-        
-        window.parent.postMessage('roomCodeLoaded', '*');
     };
 
     // public functions --------------------------------------------------------
-    _this.connect = function() {
+    _this.connect = function(roomCode) {
         if (_swarm)
             return;
 
-        Logger.log('connecting to swarm ', _roomCode);
+        let encodedRoomCode = createHash('sha256').update(roomCode).digest('hex');
+
+        Logger.log('connecting to swarm ', roomCode);
+        Logger.log('encoded room code: ', encodedRoomCode);
 
-        var hub = signalhub(_encodedRoomCode, _local ? ['localhost:8080'] : ['https://if-signalhub.herokuapp.com/'])
+        var hub = signalhub(encodedRoomCode, _local ? ['localhost:8080'] : ['https://if-signalhub.herokuapp.com/'])
         _swarm = swarm(hub, { wrtc: require('wrtc') })
 
         _swarm.on('peer', function(peer, id) {
@@ -86,7 +83,7 @@ var IFSwarm = function(roomCode, messageCallback) {
         if (!_swarm)
             return;
 
-        Logger.log('disconnecting from swarm ', _roomCode);
+        Logger.log('disconnecting from swarm');
 
         _swarm.close()
         _swarm = null;
@@ -178,8 +175,10 @@ var User = function(id, submitCallback) {
     };
 
     function repositionElements() {
-        _userElement.css('top', _mousePosition.y + 'px');
-        _userElement.css('left', _mousePosition.x + 'px');
+        _userElement.css({
+            'top': _mousePosition.y + 'px',
+            'left': _mousePosition.x + 'px'
+        });
 
         if (!_flipped && _mousePosition.x > document.documentElement.clientWidth / 2) {
             _flipped = true;
@@ -252,6 +251,7 @@ var Chat = (function() {
     // variables ----------------------------------------------------------------
     var _this = {},
         _roomCode = null,
+        _connectionTimeout = null,
         _users = {},
         _scrollPosition = { x: 0, y: 0 },
         _mouseVisible = true,
@@ -260,13 +260,18 @@ var Chat = (function() {
     // initialize ---------------------------------------------------------------
     _this.init = function() {
         Logger.log('Chat View Initialized')
+        Logger.log('Chat Init Visibility State: ', document.visibilityState);
+
+        _swarm = new IFSwarm(onMessage);
 
         window.addEventListener("message", (event) => {
             event.data.data.userId = 'localuser';
             onMessage(event.data);
         });
 
-        window.parent.postMessage('iFrameLoaded', '*');
+        document.addEventListener("visibilitychange", onVisibilityStateChanged, false);
+
+        window.parent.postMessage('iframeInitialized', '*');
     };
 
     // events -------------------------------------------------------------------
@@ -287,14 +292,8 @@ var Chat = (function() {
 
         // process messages
         switch (message.event) {
-            case 'init':
-                message_onInit(message.data);
-                break;
-            case 'pageVisible':
-                message_onPageVisible();
-                break;
-            case 'pageHidden':
-                message_onPageHidden();
+            case 'roomCodeChanged':
+                message_onRoomCodeChanged(message.data);
                 break;
             case 'userInfo':
                 message_onUserInfo(message.data);
@@ -347,19 +346,38 @@ var Chat = (function() {
 
         return _users[userId];
     };
-
-    // messages -----------------------------------------------------------------
-    function message_onInit(data) {
-        _roomCode = data.roomCode;
-        _swarm = new IFSwarm(_roomCode, onMessage);
+    
+    function onVisibilityStateChanged() {
+        Logger.log('Visiblility Changed: ', document.visibilityState);
+        tryConnect();
     }
 
-    function message_onPageVisible() {
-        _swarm.connect();
+    function tryConnect() {
+        // wait one second before connecting in case multiple changes are made in rapid succession
+        clearTimeout(_connectionTimeout);
+        _connectionTimeout = setTimeout(function () {
+            if (document.visibilityState === 'visible') {
+                _swarm.connect(_roomCode);
+            } else {
+                _swarm.disconnect();
+            }
+        }, 1000);
     }
 
-    function message_onPageHidden() {
+    // messages -----------------------------------------------------------------
+    function message_onRoomCodeChanged(data) {
+        // if the room code is the same, return
+        if (data.roomCode === _roomCode)
+            return;
+
+        // disconnect from the current room
         _swarm.disconnect();
+        
+        // set the new room code
+        _roomCode = data.roomCode;
+        
+        // reconnect to the swarm
+        tryConnect();
     }
 
     function message_onUserInfo(data) {
diff --git a/app/scripts.babel/inject.js b/app/scripts.babel/inject.js
index c25c618..844ca0a 100644
--- a/app/scripts.babel/inject.js
+++ b/app/scripts.babel/inject.js
@@ -2,15 +2,14 @@ var Inject = (function() {
     // constants ----------------------------------------------------------------
     var ID = {
         CONTAINER: 'internetFriends-container',
-        IFRAME_PREFIX: 'internetFriends-iframe-'
+        IFRAME: 'internetFriends-iframe'
     };
 
     // variables ----------------------------------------------------------------
     var _this = {},
-        _views = {},
         _container = null,
         _iframe = null,
-        //_portManager = null,
+        _roomCode = null,
         _comboDown = false;
 
     // initialize ---------------------------------------------------------------
@@ -27,34 +26,40 @@ var Inject = (function() {
         // add message listener
         window.addEventListener("message", (event) => {
             switch (event.data) {
-                case 'iFrameLoaded':
-                    onIFrameLoaded();
-                    break;
-                case 'roomCodeLoaded':
-                    onRoomCodeLoaded();
+                case 'iframeInitialized':
+                    onIframeInitialized();
                     break;
             }
         });
 
         // create the main container
-        _container = $('<div />', { id: ID.CONTAINER });
-        _container.appendTo(document.body);
+        _container = document.createElement('div');
+        _container.id = ID.CONTAINER;
+        document.body.append(_container);
         
         // add the "chat" iframe
         _iframe = document.createElement('iframe');
+        _iframe.id = ID.IFRAME;
         _iframe.src = typeof chrome !== "undefined" && chrome.runtime ? chrome.runtime.getURL('html/iframe/chat.html?view=chat&_' + new Date().getTime()) : './html/iframe/chat.html';
         _container.append(_iframe);
     };
 
     // private functions --------------------------------------------------------
-    function onIFrameLoaded() {
-        Logger.log('iFrame loaded, sendMessage/postMessage is now available');
-
-        sendMessage('init', { roomCode: getRoomCode() });
-    }
-
-    function onRoomCodeLoaded() {
-        Logger.log('room code loaded, events for swarm now available');
+    function onIframeInitialized() {
+        Logger.log('iFrame initialized, sendMessage and swarm events are now available');
+
+        // update the room code
+        _roomCode = getRoomCode();
+        onRoomCodeChanged();
+
+        // add listener to detect room code changes that occur without page refresh
+        new MutationObserver(() => {
+            let roomCode = getRoomCode();
+            if (_roomCode !== roomCode) {
+                _roomCode = roomCode;
+                onRoomCodeChanged();
+            }
+        }).observe(document, {subtree: true, childList: true});
         
         // add event listeners
         document.addEventListener("scroll", dom_onScroll, false);
@@ -72,13 +77,10 @@ var Inject = (function() {
         // only detect key presses if chat is enabled
         document.addEventListener("keydown", dom_onKeydown, false);
         document.addEventListener("keyup", dom_onKeyup, false);
-        document.addEventListener("webkitvisibilitychange", dom_onVisibilityChange, false);
-        document.addEventListener("msvisibilitychange", dom_onVisibilityChange, false);
+    }
 
-        // send visible if visible
-        if (!isPageHidden()) {
-            sendMessage('pageVisible');
-        }
+    function onRoomCodeChanged() {
+        sendMessage('roomCodeChanged', { roomCode: _roomCode });
     }
 
     function getRoomCode() {
@@ -90,15 +92,9 @@ var Inject = (function() {
     }
 
     function sendMessage(event, data) {
-        // chrome-extension://namkigeilfgjhccknbahjkdolfbapckn ?
-        // Failed to execute 'postMessage' on 'DOMWindow': The target origin provided ('chrome-extension://namkigeilfgjhccknbahjkdolfbapckn') does not match the recipient window's origin ('https://www.youtube.com').
         _iframe.contentWindow.postMessage({ event, data: data || {} }, 'chrome-extension://namkigeilfgjhccknbahjkdolfbapckn');
     }
 
-    function isPageHidden() {
-        return document.hidden || document.msHidden || document.webkitHidden;
-    }
-
     // events -------------------------------------------------------------------
     function dom_onScroll() {
         var data = { scrollX: window.scrollX, scrollY: window.scrollY };
@@ -144,14 +140,6 @@ var Inject = (function() {
         }
     };
 
-    function dom_onVisibilityChange(event) {
-        if (!isPageHidden()) {
-            sendMessage("pageVisible");
-        } else {
-            sendMessage("pageHidden");
-        }
-    }
-
     return _this;
 }());
 
diff --git a/app/scripts.babel/popup.js b/app/scripts.babel/popup.js
index 56ebbc3..f60aa36 100644
--- a/app/scripts.babel/popup.js
+++ b/app/scripts.babel/popup.js
@@ -107,6 +107,7 @@ var Popup = (function() {
     // private functions --------------------------------------------------------
     function updateUserColor () {
         chrome.storage.sync.set({'userColor': _userColor});
+        chrome.runtime.sendMessage({ event: 'updateBadgeColor', data: { userColor: _userColor }});
     }
 
     function setComplementaryColors (iroColor) {

From f3ea0e205dbce4c36f78ec67acada9a6d7100fec Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Tue, 17 May 2022 15:40:02 -0400
Subject: [PATCH 07/12] Adds null check

---
 app/scripts.babel/chat.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/scripts.babel/chat.js b/app/scripts.babel/chat.js
index ec473a6..3653321 100644
--- a/app/scripts.babel/chat.js
+++ b/app/scripts.babel/chat.js
@@ -265,7 +265,9 @@ var Chat = (function() {
         _swarm = new IFSwarm(onMessage);
 
         window.addEventListener("message", (event) => {
-            event.data.data.userId = 'localuser';
+            if (event.data.data)
+                event.data.data.userId = 'localuser';
+                
             onMessage(event.data);
         });
 

From 3a1e4143ca6119c4ffda0f3416b9a170d51e0f43 Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Tue, 17 May 2022 15:48:03 -0400
Subject: [PATCH 08/12] Delete hosting.d2Vic2l0ZQ.cache

---
 .firebase/hosting.d2Vic2l0ZQ.cache | 50 ------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 .firebase/hosting.d2Vic2l0ZQ.cache

diff --git a/.firebase/hosting.d2Vic2l0ZQ.cache b/.firebase/hosting.d2Vic2l0ZQ.cache
deleted file mode 100644
index bff5691..0000000
--- a/.firebase/hosting.d2Vic2l0ZQ.cache
+++ /dev/null
@@ -1,50 +0,0 @@
-styles/core.css,1595840369786,46b50c321b39e89a491b6727a01628c34245605a30beb3e7414c5e01cff90e6e
-index.html,1595840369867,ba089e47ba60710123d3517bf8af48f1002704b40af6ee456c339a786564e0ae
-html/iframe/chat.html,1595840369933,a671af0cddbeaef30f863717873e11ff6f295aed5ffbaa043494ebe0ec4a33ca
-images/icons/android-icon-192x192.png,1595840369917,ae586a4518a08bfae8f6ed29b180967bb1023b7dcc890d4a0eabf3a8f459c46c
-fonts/Open_Sans/LICENSE.txt,1595840369905,17f0f0a955b32272a4f41fd44841f95b2a7333f1641116547d4231e7b7af8361
-images/icons/android-icon-36x36.png,1595840369919,a14f796d3294bceef60489787316f6e97e9dbccd169f45d0d46b7415929b08ce
-images/icons/android-icon-48x48.png,1595840369921,415ac75bc2875ba8069b75b80a0fd03cf9e90b3b2a53a3f36355f63fcbc2b32a
-images/icons/android-icon-72x72.png,1595840369924,d87db46d6c8b5ce3210179935c731aa1a4e5bc9b4108ca8b52568e05340fb1d7
-images/icons/apple-icon-114x114.png,1595840369926,13b631bfe93beb1a578868b62e7001999a9732b31a340d480f57f4f1f5fd94f7
-images/icons/android-icon-96x96.png,1595840369925,065c26131ab232ba1253d61443df311930b9e4e8aab335858b7f8b66c6ea5533
-images/icons/apple-icon-120x120.png,1595840369926,66c4bfc967303dbac393aa40a04bdf8c952687339d42eeba6ac873e517f2ecfe
-images/icons/apple-icon-144x144.png,1595840369927,16d9acef18c051e16244a5a512d1c6469c4a5535ce387d07474586856e636b45
-images/icons/android-icon-144x144.png,1595840369914,16d9acef18c051e16244a5a512d1c6469c4a5535ce387d07474586856e636b45
-images/icons/apple-icon-152x152.png,1595840369927,903f37828f64d5a757084e3da808acb0d6143d5ae2f3bca602e3c301c3ec5f97
-images/icons/apple-icon-57x57.png,1595840369928,cb824f469da8903eb7fba95090612cd0bb534eb006fa95bfcabc3b3b430fb371
-images/icons/apple-icon-60x60.png,1595840369928,8f6b95268d1983217ad44978347bd892f7d37a17e9f48bf7d3192ab8a1160d3a
-images/icons/apple-icon-72x72.png,1595840369928,d87db46d6c8b5ce3210179935c731aa1a4e5bc9b4108ca8b52568e05340fb1d7
-images/icons/browserconfig.xml,1595840369930,cd6445d8fe791d1cae6328c3eee28a97d3e7e1bf501c62d8f2108f5087e7d730
-images/icons/apple-icon-180x180.png,1595840369927,9c1f053db53ee1c7c99cd795b261928a0f9b620ac74c74784968c5eec651bbe6
-images/icons/favicon-16x16.png,1595840369930,e2df1c109d2f44227cb4bff99c28a9958bbda1148db94c3a9792ec25f4f6e1d1
-images/icons/favicon-32x32.png,1595840369930,036accd70b5ce09dc6039d986e44736038261482d5d2742383494a9d389a3768
-images/icons/apple-icon.png,1595840369929,df258a3d133440aedb709977dd6fe387a0aed22617411a5560ac5b10dce6bad1
-images/icons/apple-icon-76x76.png,1595840369928,afa18b3b753e1d78323403a205ce94239e84f1da677bcf1e03248a04092cc83b
-images/icons/favicon-96x96.png,1595840369930,065c26131ab232ba1253d61443df311930b9e4e8aab335858b7f8b66c6ea5533
-images/icons/apple-icon-precomposed.png,1595840369929,df258a3d133440aedb709977dd6fe387a0aed22617411a5560ac5b10dce6bad1
-images/icons/manifest.json,1595840369931,46e7f5e409f1e10cb0007bcdd51eb6031ff1bd4a61d07513a4d2b80f6cc5381f
-images/icons/ms-icon-144x144.png,1595840369931,16d9acef18c051e16244a5a512d1c6469c4a5535ce387d07474586856e636b45
-images/icons/ms-icon-150x150.png,1595840369932,b0d8b457a7a60a064472bdfa5c7c83110ccc1defe296184468bc75756e5d4540
-images/icons/ms-icon-310x310.png,1595840369932,ad87c2f970d82d2f57add11fa0750eb135459b158bf0f8b8ce4839e92cbb31b9
-scripts/backgroundPortManager.js,1595840369901,341513c3258d73a2c170f280d015206404e8e4ab1269dc794d6957b36d9a4b79
-images/icons/favicon.ico,1595840369931,637008d0ad07668fa8f0251760e4c71dc0b9649d8d8098fa35abce8c562cf011
-scripts/backgroundPortManager.js.map,1595840369837,be6470ef1384147836c2f2c0334f7735e2e95516c1534fff1ac1eb18162ef167
-scripts/chat.js,1595840369786,9955a95b2ef9ff07630c1124bdfe9355950d5672d50fa83c9bedce42db7a81b1
-scripts/chat.js.map,1595840369783,3b52c180214bf3a858c85ca6b727605046dba44e67e77de44b3bcb9f51eb301d
-scripts/inject.js,1595840369789,ce9d5502c41c85e883e02dc1fd4123d494c4750c9862b322c8b1f525d15e87e7
-images/icons/ms-icon-70x70.png,1595840369932,703d7e1c795ddf09ee426e60fc3edde9e69a663aa7ea1a464addbe1972f0b635
-scripts/logger.js,1595840369750,8531df21fded5c2b7c0c28b2548e5d4cd2437c57f10d52802d821095a48741ea
-scripts/logger.js.map,1595840369749,082250fe83e2fe9aee688ad427ff3d7a50c6ec2a81f039a0dc2eca9140164451
-scripts/portManager.js,1595840369903,eb655c910f173e6ebb2ec3b402804573963eac626b183331d8cacebe34ad94c5
-styles/chat.css,1595840369787,243f520009fdb00e153908a2b3a57eea6853981e250775cefef18f476906cc48
-styles/inject.css,1595840369787,b4434f3afb87583142913b017f9092ff0723fec77e50c16d1fd880c4e26bf7bb
-scripts/portManager.js.map,1595840369838,af571486e2042c3f2c14ed4b87846a10bb4840467814ceb390bc5a13982e604d
-scripts/inject.js.map,1595840369789,80faf7b5ee6729bfc7fc7624a2b77853da00761ed14b556cd4cbdea8c469cb53
-libs/jquery-3.5.1.min.js,1595840369788,a6c14aef7ed02ef768bcdbb789322eea70b6a860e467cdbcc1238429e3274c5f
-images/aero_arrow.cur,1595840369888,4b93b0fd38f2201b3516f4ebbaf8132ae23207c246fac2755ad3f794b5bcd37b
-fonts/Open_Sans/OpenSans-ExtraBold.ttf,1595840369908,0b790194f0e2d1f5665624f990a7ea11cc76b90670691bf54a4e654e4f9be595
-fonts/Open_Sans/OpenSans-Regular.ttf,1595840369911,966d538f2bd817920517cb7db6439d226be602c95ec4919483737fd74c198089
-libs/jquery-3.5.1.min.js.map,1595840369788,5d5f9d57069201811da9ec14bd1398f3b9fec24fb13e179e39b2562dc36f1a9d
-scripts/bundle.js,1595840369781,5bf85cc6b943a420b9a13f4d7cde5dc53ddd6146cc3c07802d340b146f054805
-scripts/bundle.js.map,1595840369772,dedc40529e52ab54731d6331a5d7da99a3ee9fe4dc1e2307c39ffe1cbc222372

From 886812cc0f6fc4665ee99af1c43e35744420d903 Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Tue, 17 May 2022 15:50:53 -0400
Subject: [PATCH 09/12] Remove unnecessary files

---
 .gitignore                         | 1 +
 permissions.txt                    | 1 -
 requirements before submission.txt | 4 ----
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 permissions.txt
 delete mode 100644 requirements before submission.txt

diff --git a/.gitignore b/.gitignore
index d47ba66..c874f0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ temp
 .tmp
 .firebase
 dist
+notes
 .sass-cache
 app/bower_components
 website
diff --git a/permissions.txt b/permissions.txt
deleted file mode 100644
index f443f57..0000000
--- a/permissions.txt
+++ /dev/null
@@ -1 +0,0 @@
-This extension is designed to allow users to connect to each other while browsing online. It works by connecting users who are browsing on the same website at the same time. A chat room for each website a user is browsing. When browsing a website with other users, other users cursors and chat messages will be displayed on the associated tab.
\ No newline at end of file
diff --git a/requirements before submission.txt b/requirements before submission.txt
deleted file mode 100644
index 6c90f49..0000000
--- a/requirements before submission.txt	
+++ /dev/null
@@ -1,4 +0,0 @@
-Step-by-step build instructions to create an exact copy of the add-on code.
-A build script that executes all necessary technical steps.
-Operating system and build environment requirements.
-Details (including required version and installation instructions), of any programs used in the build process (for example: node and npm version used).
\ No newline at end of file

From a3622a924717103418588e94221d009a6146b96d Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Tue, 17 May 2022 17:42:28 -0400
Subject: [PATCH 10/12] Minor bug fixes

Removes unused line
Updates chrome runtime id
Fixes bug related to sending responses from background
---
 app/extension/scripts/portManager.js | 1 -
 app/scripts.babel/background.js      | 5 +++--
 app/scripts.babel/inject.js          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/extension/scripts/portManager.js b/app/extension/scripts/portManager.js
index 854aabb..e0605d2 100644
--- a/app/extension/scripts/portManager.js
+++ b/app/extension/scripts/portManager.js
@@ -4,7 +4,6 @@ var portManager = function (source, messageCallback, disconnectCallback){
 		_source				= "",
 		_port				= null,
 		_messageListener	= null,
-		_connectListener 	= null,
 		_disconnectListener	= null;
 	
 	// initialize ---------------------------------------------------------------
diff --git a/app/scripts.babel/background.js b/app/scripts.babel/background.js
index 98159a7..6024be9 100644
--- a/app/scripts.babel/background.js
+++ b/app/scripts.babel/background.js
@@ -1,6 +1,6 @@
 // ---------------------------------------- Badge Text Listener ----------------------------------------
 chrome.runtime.onMessage.addListener(
-    function(request, sender) {
+    function(request, sender, sendResponse) {
         if (request.event === 'updateBadgeText')
         {
             let peers = request.data.peers;
@@ -17,7 +17,8 @@ chrome.runtime.onMessage.addListener(
             chrome.action.setBadgeBackgroundColor({ color: request.data.userColor });
         }
 
-        return true;
+        // dummy response due to bug: https://stackoverflow.com/questions/71520198/manifestv3-new-promise-error-the-message-port-closed-before-a-response-was-rece/71520415#71520415
+        sendResponse();
     }
 );
 
diff --git a/app/scripts.babel/inject.js b/app/scripts.babel/inject.js
index 844ca0a..89205c6 100644
--- a/app/scripts.babel/inject.js
+++ b/app/scripts.babel/inject.js
@@ -92,7 +92,7 @@ var Inject = (function() {
     }
 
     function sendMessage(event, data) {
-        _iframe.contentWindow.postMessage({ event, data: data || {} }, 'chrome-extension://namkigeilfgjhccknbahjkdolfbapckn');
+        _iframe.contentWindow.postMessage({ event, data: data || {} }, 'chrome-extension://' + chrome.runtime.id);
     }
 
     // events -------------------------------------------------------------------

From b9b6fdcc111da99d941870c378e1a0d8e7271e3b Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Tue, 17 May 2022 18:21:24 -0400
Subject: [PATCH 11/12] Update manifest.json

---
 app/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/manifest.json b/app/manifest.json
index a9c4553..f03761b 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "__MSG_appName__",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "manifest_version": 3,
     "description": "__MSG_appDescription__",
     "icons": {

From 66b8d8a772ea139df758433318eff8108c2e64f5 Mon Sep 17 00:00:00 2001
From: Mike Singleton <MS1674@gmail.com>
Date: Tue, 17 May 2022 19:29:33 -0400
Subject: [PATCH 12/12] Disable debug

---
 app/manifest.json               | 3 +--
 app/scripts.babel/background.js | 2 +-
 app/scripts.babel/logger.js     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/manifest.json b/app/manifest.json
index f03761b..f05ac43 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "__MSG_appName__",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "manifest_version": 3,
     "description": "__MSG_appDescription__",
     "icons": {
@@ -8,7 +8,6 @@
         "128": "images/icon-128.png"
     },
     "default_locale": "en",
-    "incognito": "split",
     "background": {
         "service_worker": "scripts/background.js"
     },
diff --git a/app/scripts.babel/background.js b/app/scripts.babel/background.js
index 6024be9..595a012 100644
--- a/app/scripts.babel/background.js
+++ b/app/scripts.babel/background.js
@@ -23,7 +23,7 @@ chrome.runtime.onMessage.addListener(
 );
 
 // ---------------------------------------- Logger ----------------------------------------
-var debug = true;
+var debug = false;
 var Logger = {
     log: debug ? console.log.bind(console) : function(){}
 };
diff --git a/app/scripts.babel/logger.js b/app/scripts.babel/logger.js
index f44a864..7806d6e 100644
--- a/app/scripts.babel/logger.js
+++ b/app/scripts.babel/logger.js
@@ -1,4 +1,4 @@
-var debug = true;
+var debug = false;
 var Logger = {
     log: debug ? console.log.bind(console) : function(){}
 };
\ No newline at end of file