Remove duplicated code

lib/extension.js

@@ -176,5 +176,18 @@
 		}
 	};
 	
+	scope.waitSync = function waitSync(reason = "for no reason"){
+		logging.message(`Starting synchronous request ${reason}.`);
+		try {
+			let xhr = new XMLHttpRequest();
+			xhr.open("GET", "https://[::]", false);
+			xhr.send();
+			xhr = null;
+		}
+		catch (error){
+			logging.verbose("Error in XHR:", error);
+		}
+	};
+	
 	Object.seal(scope);
 }());

lib/modifiedAudioAPI.js

@@ -157,19 +157,22 @@
 	};
 	
 	const getChannelDataAlreadyFakedArrays = new WeakMap();
+	function fakeArrayCheckerCallback(array, fakeFunction, args, check){
+		const {prefs, notify, window, original} = check;
+		notify("fakedAudioReadout");
+		const ret = original.call(this, ...args);
+		fakeFunction(array, window, prefs);
+		return ret;
+	}
 	// changed functions and their fakes
 	scope.changedFunctions = {
 		getFloatFrequencyData: {
 			object: ["AnalyserNode"],
 			fakeGenerator: function(checker){
 				return function getFloatFrequencyData(array){
-					return checkerWrapper(checker, this, arguments, function(args, check){
+					return checkerWrapper(checker, this, arguments,
-						const {prefs, notify, window, original} = check;
+						fakeArrayCheckerCallback.bind(this, array, fakeFloat32Array)
-						notify("fakedAudioReadout");
+					);
-						const ret = original.call(this, ...args);
-						fakeFloat32Array(array, window, prefs);
-						return ret;
-					});
 				};
 			}
 		},
@@ -177,13 +180,9 @@
 			object: ["AnalyserNode"],
 			fakeGenerator: function(checker){
 				return function getByteFrequencyData(array){
-					return checkerWrapper(checker, this, arguments, function(args, check){
+					return checkerWrapper(checker, this, arguments,
-						const {prefs, notify, window, original} = check;
+						fakeArrayCheckerCallback.bind(this, array, fakeUint8Array)
-						notify("fakedAudioReadout");
+					);
-						const ret = original.call(this, ...args);
-						fakeUint8Array(array, window, prefs);
-						return ret;
-					});
 				};
 			}
 		},
@@ -191,13 +190,9 @@
 			object: ["AnalyserNode"],
 			fakeGenerator: function(checker){
 				return function getFloatTimeDomainData(array){
-					return checkerWrapper(checker, this, arguments, function(args, check){
+					return checkerWrapper(checker, this, arguments,
-						const {prefs, notify, window, original} = check;
+						fakeArrayCheckerCallback.bind(this, array, fakeFloat32Array)
-						notify("fakedAudioReadout");
+					);
-						const ret = original.call(this, ...args);
-						fakeFloat32Array(array, window, prefs);
-						return ret;
-					});
 				};
 			}
 		},
@@ -205,13 +200,9 @@
 			object: ["AnalyserNode"],
 			fakeGenerator: function(checker){
 				return function getByteTimeDomainData(array){
-					return checkerWrapper(checker, this, arguments, function(args, check){
+					return checkerWrapper(checker, this, arguments,
-						const {prefs, notify, window, original} = check;
+						fakeArrayCheckerCallback.bind(this, array, fakeUint8Array)
-						notify("fakedAudioReadout");
+					);
-						const ret = original.call(this, ...args);
-						fakeUint8Array(array, window, prefs);
-						return ret;
-					});
 				};
 			}
 		},

lib/modifiedNavigatorAPI.js

@@ -13,7 +13,7 @@
 	}
 	
 	const {checkerWrapper, setGetterProperties, getStatusByFlag} = require("./modifiedAPIFunctions");
-	const logging = require("./logging");
+	const extension = require("./extension");
 	const navigator = require("./navigator");
 	
 	let cookieStoreId = false;
@@ -27,16 +27,7 @@
 	};
 	function getCookieStoreId(){
 		while (cookieStoreId === false){
-			logging.message("Starting synchronous request to wait for cookie store id.");
+			extension.waitSync("to wait for cookie store id");
-			try {
-				let xhr = new XMLHttpRequest();
-				xhr.open("GET", "https://[::]", false);
-				xhr.send();
-				xhr = null;
-			}
-			catch (error){
-				logging.verbose("Error in XHR:", error);
-			}
 		}
 		return cookieStoreId;
 	}

lib/randomSupplies.js

@@ -123,16 +123,7 @@
 		
 		return function getPersistentRnd(window){
 			while (cookieStoreId === false){
-				logging.message("Starting synchronous request to wait for cookie store id.");
+				extension.waitSync("to wait for cookie store id");
-				try {
-					let xhr = new XMLHttpRequest();
-					xhr.open("GET", "https://[::]", false);
-					xhr.send();
-					xhr = null;
-				}
-				catch (error){
-					logging.verbose("Error in XHR:", error);
-				}
 			}
 			const domain = cookieStoreId + getDomain(window);
 			if (!persistentRnd[domain]){

lib/settings.js

@@ -13,6 +13,7 @@
 	}
 
 	const logging = require("./logging");
+	const extension = require("./extension");
 	const settingDefinitions = require("./settingDefinitions");
 	const settingContainers = require("./settingContainers");
 	const definitionsByName = {};
@@ -450,16 +451,7 @@
 	};
 	scope.forceLoad = function(){
 		while (settings.isStillDefault){
-			logging.message("Starting synchronous request to wait for settings.");
+			extension.waitSync("to wait for settings");
-			try {
-				let xhr = new XMLHttpRequest();
-				xhr.open("GET", "https://[::]", false);
-				xhr.send();
-				xhr = null;
-			}
-			catch (error){
-				logging.verbose("Error in XHR:", error);
-			}
 			logging.message("settings still default?", settings.isStillDefault);
 		}
 	};

lib/settingsMigration.js

@@ -41,43 +41,28 @@
 			};
 
 			const urlSettings = {};
-
+			
-			(oldStorage.blackList || "").split(",")
+			[
-				.map(function(url){return url.trim();})
+				{listName: "blackList", property: "blockMode", value: "block"},
-				.filter(function(url){return !!url;})
+				{listName: "whiteList", property: "blockMode", value: "allow"},
-				.forEach(function(url){
+				{listName: "ignoreList", property: "showNotifications", value: false}
-					let entry = urlSettings[url];
+			].forEach(function(listAction){
-					if (!entry){
+				(oldStorage[listAction.listName] || "").split(",")
-						entry = {url, blockMode: "block"};
+					.map(function(url){return url.trim();})
-						urlSettings[url] = entry;
+					.filter(function(url){return !!url;})
-						newStorage.urlSettings.push(entry);
+					.forEach(function(url){
-					}
+						let entry = urlSettings[url];
-				});
+						if (!entry){
-			(oldStorage.whiteList || "").split(",")
+							entry = {url, [listAction.property]: listAction.value};
-				.map(function(url){return url.trim();})
+							urlSettings[url] = entry;
-				.filter(function(url){return !!url;})
+							newStorage.urlSettings.push(entry);
-				.forEach(function(url){
+						}
-					let entry = urlSettings[url];
+						else {
-					if (!entry){
+							entry[listAction.property] = listAction.value;
-						entry = {url, blockMode: "allow"};
+						}
-						urlSettings[url] = entry;
+					});
-						newStorage.urlSettings.push(entry);
+			});
-					}
+			
-				});
-			(oldStorage.ignoreList || "").split(",")
-				.map(function(url){return url.trim();})
-				.filter(function(url){return !!url;})
-				.forEach(function(url){
-					let entry = urlSettings[url];
-					if (!entry){
-						entry = {url, showNotifications: false};
-						urlSettings[url] = entry;
-						newStorage.urlSettings.push(entry);
-					}
-					else {
-						entry.showNotifications = false;
-					}
-				});
 			["whiteList", "blackList", "ignoreList"].forEach(function(list){
 				if (oldStorage.hasOwnProperty(list)){
 					newStorage[list] = "";