remove webrequest and webrequestBlocking

SanderRonde · SanderRonde · commit b370d81b23cf · 2020-03-03T19:01:36.000+01:00
diff --git a/app/_locales/i18n-keys.js b/app/_locales/i18n-keys.js
@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/app/js/background/crm.ts b/app/js/background/crm.ts
@@ -944,18 +944,6 @@ export namespace CRMNodes.Script.Updating {
 			});
 		}
 
-		(anonymousLibs as {
-			url: string;
-			name: null;
-		}[]).forEach(anonymousLib => {
-			modules.Resources.Anonymous.handle({
-				type: 'register',
-				name: anonymousLib.url,
-				url: anonymousLib.url,
-				scriptId: scriptNode.id
-			});
-		});
-
 		const { libraries } = await browserAPI.storage.local.get('libraries');
 
 		//Install all libraries
@@ -1128,22 +1116,6 @@ export namespace CRMNodes.Script.Updating {
 			//Allowed permissions
 			node.permissions = allowedPermissions || [];
 
-			//Resources
-			if (metaTags['resource']) {
-				//Register resources
-				const resources: string[] = metaTags['resource'];
-				resources.forEach(resource => {
-					const resourceSplit = resource.split(/(\s*)/);
-					const [resourceName, resourceUrl] = resourceSplit;
-					modules.Resources.Resource.handle({
-						type: 'register',
-						name: resourceName,
-						url: resourceUrl,
-						scriptId: node.id as CRM.NodeId<CRM.ScriptNode>
-					});
-				});
-			}
-
 			const { requestPermissions = [] } = await browserAPI.storage.local.get<CRM.StorageLocal>();
 			const allPermissions = browserAPI.permissions ? await browserAPI.permissions.getAll() : {
 				permissions: []
diff --git a/app/js/background/global-declarations.ts b/app/js/background/global-declarations.ts
@@ -667,17 +667,6 @@ export namespace GlobalDeclarations {
 			});
 		}
 
-		function setupResourceProxy() {
-			browserAPI.webRequest.onBeforeRequest.addListener((details) => {
-				window.info('Redirecting', details);
-				return {
-					redirectUrl: `${location.protocol}//${browserAPI.runtime.id}/fonts/fonts.css`
-				}
-			}, {
-				urls: ['*://fonts.googleapis.com/', '*://fonts.gstatic.com/']
-			});
-		}
-
 		function onTabUpdated(_id: TabId, changeInfo: {
 			status?: 'loading'|'complete';
 			url?: string;
@@ -807,20 +796,8 @@ export namespace GlobalDeclarations {
 		browserAPI.tabs.onUpdated.addListener(onTabUpdated);
 		browserAPI.tabs.onRemoved.addListener(onTabsRemoved);
 		browserAPI.tabs.onHighlighted && browserAPI.tabs.onHighlighted.addListener(tabChangeListener);
-		browserAPI.webRequest.onBeforeRequest.addListener((details) => {
-			const split = details.url
-				.split(`https://www.localhost.io/resource/`)[1].split('/');
-			const name = split[0];
-			const scriptId = ~~split[1] as CRM.NodeId<CRM.ScriptNode>;
-			return {
-				redirectUrl: getResourceData(name, scriptId)
-			};
-		}, {
-			urls: [`https://www.localhost.io/resource/*`]
-		}, ['blocking']);
 		listenNotifications();
 		listenKeyCommands();
-		setupResourceProxy();
 	}
 
 	export function runAlwaysRunNodes(tab: _browser.tabs.Tab) {
diff --git a/app/js/background/resources.ts b/app/js/background/resources.ts
@@ -40,9 +40,6 @@ export namespace Resources {
 		scriptId: CRM.NodeId<CRM.ScriptNode>;
 	}, name: string) {
 		switch (message.type) {
-			case 'register':
-				registerResource(name, message.url, message.scriptId);
-				break;
 			case 'remove':
 				removeResource(name, message.scriptId);
 				break;
@@ -56,50 +53,6 @@ export namespace Resources {
 		}
 	}
 
-	function getUrlData(scriptId: CRM.NodeId<CRM.ScriptNode>, url: string, callback: (dataURI: string,
-		dataString: string) => void) {
-		//First check if the data has already been fetched
-		if (modules.storages.urlDataPairs.get(url)) {
-			const dataPairs = modules.storages.urlDataPairs.get(url);
-			if (dataPairs.refs.indexOf(scriptId) === -1) {
-				dataPairs.refs.push(scriptId);
-			}
-			callback(dataPairs.dataURI, dataPairs.dataString);
-		} else {
-			modules.Util.convertFileToDataURI(url, (dataURI, dataString) => {
-				//Write the data away to the url-data-pairs object
-				modules.storages.urlDataPairs.set(url, {
-					dataURI: dataURI,
-					dataString: dataString,
-					refs: [scriptId]
-				});
-				callback(dataURI, dataString);
-			});
-		}
-	}
-	function getHashes(url: string): {
-		algorithm: string;
-		hash: string;
-	}[] {
-		const hashes: {
-			algorithm: string;
-			hash: string;
-		}[] = [];
-		const hashString = url.split('#')[1];
-		if (!hashString) {
-			return [];
-		}
-
-		const hashStrings = hashString.split(/[,|;]/g);
-		hashStrings.forEach((hash) => {
-			const split = hash.split('=');
-			hashes.push({
-				algorithm: split[0],
-				hash: split[1]
-			});
-		});
-		return hashes;
-	}
 	function doAlgorithm(name: string, data: any, lastMatchingHash: {
 		algorithm: string;
 		hash: string;
@@ -161,45 +114,6 @@ export namespace Resources {
 		}
 		return false;
 	}
-	function registerResource(name: string, url: string, scriptId: CRM.NodeId<CRM.ScriptNode>) {
-		const registerHashes = getHashes(url);
-		if (window.navigator.onLine) {
-			getUrlData(scriptId, url, (dataURI, dataString) => {
-				const resources = modules.storages.resources;
-				modules.Util.setMapDefault(resources, scriptId, {});
-				resources.get(scriptId)[name] = {
-					name: name,
-					sourceUrl: url,
-					dataURI: dataURI,
-					dataString: dataString,
-					hashes: registerHashes,
-					matchesHashes: matchesHashes(registerHashes, dataString),
-					crmUrl: `https://www.localhost.io/resource/${scriptId}/${name}`
-				};
-				browserAPI.storage.local.set({
-					resources: modules.Util.fromMap(resources),
-					urlDataPairs: modules.Util.fromMap(modules.storages.urlDataPairs)
-				});
-			});
-		}
-
-		const resourceKeys = modules.storages.resourceKeys;
-		for (const resourceKey of resourceKeys) {
-			if (resourceKey.name === name && 
-				resourceKey.scriptId === scriptId) {
-					return;
-				}
-		}
-		resourceKeys.push({
-			name: name,
-			sourceUrl: url,
-			hashes: registerHashes,
-			scriptId: scriptId
-		});
-		browserAPI.storage.local.set({
-			resourceKeys: resourceKeys
-		});
-	}
 	function removeResource(name: string, scriptId: CRM.NodeId<CRM.ScriptNode>) {
 		for (let i = 0; i < modules.storages.resourceKeys.length; i++) {
 			if (modules.storages.resourceKeys[i].name === name &&
diff --git a/app/manifest.chrome.json b/app/manifest.chrome.json
@@ -43,9 +43,7 @@
 		"contextMenus",
 		"storage",
 		"tabs",
-		"unlimitedStorage",
-		"webRequest",
-		"webRequestBlocking"
+		"unlimitedStorage"
 	],
 
 	"web_accessible_resources": [
@@ -83,7 +81,9 @@
 		"topSites",
 		"tabCapture",
 		"tts",
-		"webNavigation"
+		"webNavigation",
+		"webRequest",
+		"webRequestBlocking"
 	],
 
 	"commands": {
diff --git a/app/manifest.edge.json b/app/manifest.edge.json
@@ -44,9 +44,7 @@
 		"contextMenus",
 		"storage",
 		"tabs",
-		"unlimitedStorage",
-		"webRequest",
-		"webRequestBlocking"
+		"unlimitedStorage"
 	],
 
 	"web_accessible_resources": [
@@ -84,7 +82,9 @@
 		"topSites",
 		"tabCapture",
 		"tts",
-		"webNavigation"
+		"webNavigation",
+		"webRequest",
+		"webRequestBlocking"
 	],
 
 	"commands": {
diff --git a/app/manifest.firefox.json b/app/manifest.firefox.json
@@ -51,9 +51,7 @@
 		"contextMenus",
 		"storage",
 		"tabs",
-		"unlimitedStorage",
-		"webRequest",
-		"webRequestBlocking"
+		"unlimitedStorage"
 	],
 
 	"web_accessible_resources": [
@@ -73,7 +71,9 @@
 		"management",
 		"notifications",
 		"topSites",
-		"webNavigation"
+		"webNavigation",
+		"webRequest",
+		"webRequestBlocking"
 	],
 
 	"commands": {
diff --git a/app/manifest.opera.json b/app/manifest.opera.json
@@ -43,9 +43,7 @@
 		"contextMenus",
 		"storage",
 		"tabs",
-		"unlimitedStorage",
-		"webRequest",
-		"webRequestBlocking"
+		"unlimitedStorage"
 	],
 
 	"web_accessible_resources": [
@@ -82,7 +80,9 @@
 		"topSites",
 		"tabCapture",
 		"tts",
-		"webNavigation"
+		"webNavigation",
+		"webRequest",
+		"webRequestBlocking"
 	],
 
 	"commands": {
diff --git a/test/UI/browser-api-dummy.ts b/test/UI/browser-api-dummy.ts
@@ -1242,8 +1242,6 @@ testWindow.chrome = {
 					"activeTab",
 					"notifications",
 					"storage",
-					"webRequest",
-					"webRequestBlocking",
 					"contextMenus",
 					"unlimitedStorage"
 				]

Original file line number	Diff line number	Diff line change
`@@ -1,2 +0,0 @@`
`1`		`-"use strict";`
`2`		`-Object.defineProperty(exports, "__esModule", { value: true });`
Original file line number	Diff line number	Diff line change
`@@ -1242,8 +1242,6 @@ testWindow.chrome = {`
`1242`	`1242`	`"activeTab",`
`1243`	`1243`	`"notifications",`
`1244`	`1244`	`"storage",`
`1245`		`- "webRequest",`
`1246`		`- "webRequestBlocking",`
`1247`	`1245`	`"contextMenus",`
`1248`	`1246`	`"unlimitedStorage"`
`1249`	`1247`	`]`