finished normalization of message passing implementation

lib/fetch/bg/fetch.js

@@ -26,26 +26,26 @@
 
 	let requestId = 1;
 
-	browser.runtime.onMessage.addListener(request => {
-		if (request.method && request.method.startsWith("fetch")) {
+	browser.runtime.onMessage.addListener(message => {
+		if (message.method.startsWith("fetch")) {
 			return new Promise(resolve => {
-				onRequest(request)
+				onRequest(message)
 					.then(resolve)
 					.catch(error => resolve({ error: error.toString() }));
 			});
 		}
 	});
 
-	async function onRequest(request) {
-		if (request.method == "fetch") {
+	async function onRequest(message) {
+		if (message.method == "fetch") {
 			const responseId = requestId;
 			requestId = requestId + 1;
-			const response = await superFetch(request.url);
+			const response = await superFetch(message.url);
 			responses.set(responseId, response);
 			response.responseId = responseId;
 			return { responseId, headers: response.headers };
-		} else if (request.method == "fetch.array") {
-			const response = responses.get(request.requestId);
+		} else if (message.method == "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));

lib/frame-tree/bg/bg-frame-tree.js

@@ -25,7 +25,7 @@ this.frameTree = (() => {
 	"use strict";
 
 	browser.runtime.onMessage.addListener((message, sender) => {
-		if (message.method == "initResponse") {
+		if (message.method == "frameTree.initResponse") {
 			browser.tabs.sendMessage(sender.tab.id, message, { frameId: 0 });
 		}
 	});

lib/frame-tree/content/content-frame-tree.js

@@ -26,7 +26,7 @@ this.frameTree = this.frameTree || (() => {
 	const FRAMES_CSS_SELECTOR = "iframe, frame, object[type=\"text/html\"][data]";
 	const INIT_REQUEST_MESSAGE = "initRequest";
 	const CLEANUP_REQUEST_MESSAGE = "cleanupRequest";
-	const INIT_RESPONSE_MESSAGE = "initResponse";
+	const INIT_RESPONSE_MESSAGE = "frameTree.initResponse";
 	const TARGET_ORIGIN = "*";
 	const TIMEOUT_INIT_REQUEST_MESSAGE = 750;
 	const TOP_WINDOW_ID = "0";
@@ -57,7 +57,7 @@ this.frameTree = this.frameTree || (() => {
 				}
 			} else if (message.method == CLEANUP_REQUEST_MESSAGE) {
 				cleanupRequest(message);
-			} else if (message.method == INIT_RESPONSE_MESSAGE) {
+			} else if (!browser.runtime && message.method == INIT_RESPONSE_MESSAGE) {
 				const port = event.ports[0];
 				port.onmessage = event => initResponse(event.data);
 			}

lib/lazy/bg/bg-lazy-timeout.js

@@ -24,13 +24,13 @@ this.lazyTimeout = (() => {
 
 	"use strict";
 
-	browser.runtime.onMessage.addListener((request, sender) => {
-		if (request.method == "lazyTimeout.setTimeout") {
-			const timeoutId = setTimeout(() => browser.tabs.sendMessage(sender.tab.id, { method: "content.onLazyTimeout", id: timeoutId }), request.delay);
+	browser.runtime.onMessage.addListener((message, sender) => {
+		if (message.method == "lazyTimeout.setTimeout") {
+			const timeoutId = setTimeout(() => browser.tabs.sendMessage(sender.tab.id, { method: "content.onLazyTimeout", id: timeoutId }), message.delay);
 			return Promise.resolve(timeoutId);
 		}
-		if (request.method == "lazyTimeout.clearTimeout") {
-			clearTimeout(request.id);
+		if (message.method == "lazyTimeout.clearTimeout") {
+			clearTimeout(message.id);
 		}
 	});