removed unnecessary code

Former-commit-id: c103148bacb0998876431248e97178a288915165

extension/lib/fetch/bg/fetch-resources.js

@@ -25,10 +25,6 @@
 
 singlefile.extension.lib.fetch.bg.resources = (() => {
 
-	const responses = new Map();
-
-	let requestId = 1;
-
 	browser.runtime.onMessage.addListener((message, sender) => {
 		if (message.method && message.method.startsWith("singlefile.fetch")) {
 			return new Promise(resolve => {
@@ -42,30 +38,9 @@ singlefile.extension.lib.fetch.bg.resources = (() => {
 
 	async function onRequest(message, sender) {
 		if (message.method == "singlefile.fetch") {
-			const responseId = requestId;
-			requestId = requestId + 1;
-			const response = await fetchResource(message.url);
-			responses.set(responseId, response);
-			response.responseId = responseId;
-			return { responseId, headers: response.headers };
-		} else if (message.method == "singlefile.fetch.array") {
-			const response = responses.get(message.requestId);
-			responses.delete(response.requestId);
-			return new Promise((resolve, reject) => {
-				response.xhrRequest.onerror = event => reject(new Error(event.detail));
-				if (response.xhrRequest.readyState == XMLHttpRequest.DONE) {
-					resolve(getResponse(response.xhrRequest));
-				} else {
-					response.xhrRequest.onload = () => resolve(getResponse(response.xhrRequest));
-				}
-			});
-		} else if (message.method == "singlefile.fetch.frame") {
-			const response = await browser.tabs.sendMessage(sender.tab.id, message);
-			if (response.error) {
-				throw new Error(response.error);
-			} else {
-				return response;
-			}
+			return fetchResource(message.url);
+		} else if (message.method == "singlefile.fetchFrame") {
+			return browser.tabs.sendMessage(sender.tab.id, message);
 		}
 	}
 
@@ -80,10 +55,11 @@ singlefile.extension.lib.fetch.bg.resources = (() => {
 			xhrRequest.responseType = "arraybuffer";
 			xhrRequest.onerror = event => reject(new Error(event.detail));
 			xhrRequest.onreadystatechange = () => {
-				if (xhrRequest.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
-					const headers = {};
-					headers["content-type"] = xhrRequest.getResponseHeader("Content-Type");
-					resolve({ xhrRequest, headers, status: xhrRequest.status });
+				if (xhrRequest.readyState == XMLHttpRequest.DONE) {
+					const response = getResponse(xhrRequest);
+					response.headers = { "content-type": xhrRequest.getResponseHeader("Content-Type") };
+					response.status = xhrRequest.status;
+					resolve(response);
 				}
 			};
 			xhrRequest.open("GET", url, true);

extension/lib/fetch/content/content-fetch-resources.js

@@ -29,7 +29,7 @@ this.singlefile.extension.lib.fetch.content.resources = this.singlefile.extensio
 	const FETCH_RESPONSE_EVENT = "single-file-response-fetch";
 
 	browser.runtime.onMessage.addListener(message => {
-		if (message.method == "singlefile.fetch.frame" && window.frameId && window.frameId == message.frameId) {
+		if (message.method == "singlefile.fetchFrame" && window.frameId && window.frameId == message.frameId) {
 			return onMessage(message);
 		}
 	});
@@ -62,19 +62,16 @@ this.singlefile.extension.lib.fetch.content.resources = this.singlefile.extensio
 				return response;
 			}
 			catch (error) {
-				const responseFetch = await sendMessage({ method: "singlefile.fetch", url });
+				const response = await sendMessage({ method: "singlefile.fetch", url });
 				return {
-					status: responseFetch.status,
-					headers: { get: headerName => responseFetch.headers[headerName] },
-					arrayBuffer: async () => {
-						const response = await sendMessage({ method: "singlefile.fetch.array", requestId: responseFetch.responseId });
-						return new Uint8Array(response.array).buffer;
-					}
+					status: response.status,
+					headers: { get: headerName => response.headers[headerName] },
+					arrayBuffer: async () => new Uint8Array(response.array).buffer
 				};
 			}
 		},
 		frameFetch: async (url, frameId) => {
-			const response = await sendMessage({ method: "singlefile.fetch.frame", url, frameId });
+			const response = await sendMessage({ method: "singlefile.fetchFrame", url, frameId });
 			return {
 				status: response.status,
 				headers: {