added namespace to method names

Former-commit-id: 9f64a3daca8728028a513b5740b4a03f7c35794f

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

@@ -30,7 +30,7 @@ singlefile.extension.lib.fetch.bg.resources = (() => {
 	let requestId = 1;
 
 	browser.runtime.onMessage.addListener((message, sender) => {
-		if (message.method && message.method.startsWith("fetch")) {
+		if (message.method && message.method.startsWith("singlefile.fetch")) {
 			return new Promise(resolve => {
 				onRequest(message, sender)
 					.then(resolve)
@@ -41,14 +41,14 @@ singlefile.extension.lib.fetch.bg.resources = (() => {
 	return {};
 
 	async function onRequest(message, sender) {
-		if (message.method == "fetch") {
+		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 == "fetch.array") {
+		} else if (message.method == "singlefile.fetch.array") {
 			const response = responses.get(message.requestId);
 			responses.delete(response.requestId);
 			return new Promise((resolve, reject) => {
@@ -59,7 +59,7 @@ singlefile.extension.lib.fetch.bg.resources = (() => {
 					response.xhrRequest.onload = () => resolve(getResponse(response.xhrRequest));
 				}
 			});
-		} else if (message.method == "fetch.frame") {
+		} 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);

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

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

@@ -28,7 +28,7 @@ singlefile.extension.lib.frameTree.bg.main = (() => {
 	"use strict";
 
 	browser.runtime.onMessage.addListener((message, sender) => {
-		if (message.method == "frameTree.initResponse") {
+		if (message.method == "singlefile.frameTree.initResponse") {
 			browser.tabs.sendMessage(sender.tab.id, message, { frameId: 0 });
 			return Promise.resolve({});
 		}

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

@@ -28,17 +28,17 @@ singlefile.extension.lib.lazy.bg.main = (() => {
 	"use strict";
 
 	browser.runtime.onMessage.addListener((message, sender) => {
-		if (message.method == "lazyTimeout.setTimeout") {
+		if (message.method == "singlefile.lazyTimeout.setTimeout") {
 			const timeoutId = setTimeout(async () => {
 				try {
-					await browser.tabs.sendMessage(sender.tab.id, { method: "content.onLazyTimeout", id: timeoutId });
+					await browser.tabs.sendMessage(sender.tab.id, { method: "singlefile.lazyTimeout.onTimeout", id: timeoutId });
 				} catch (error) {
 					// ignored
 				}
 			}, message.delay);
 			return Promise.resolve(timeoutId);
 		}
-		if (message.method == "lazyTimeout.clearTimeout") {
+		if (message.method == "singlefile.lazyTimeout.clearTimeout") {
 			clearTimeout(message.id);
 			return Promise.resolve({ id: message.id });
 		}

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

@@ -30,9 +30,9 @@ this.singlefile.lib.frameTree.content.frames = this.singlefile.lib.frameTree.con
 	const MESSAGE_PREFIX = "__frameTree__::";
 	const FRAMES_CSS_SELECTOR = "iframe, frame, object[type=\"text/html\"][data]";
 	const ALL_ELEMENTS_CSS_SELECTOR = "*";
-	const INIT_REQUEST_MESSAGE = "initRequest";
-	const CLEANUP_REQUEST_MESSAGE = "cleanupRequest";
-	const INIT_RESPONSE_MESSAGE = "frameTree.initResponse";
+	const INIT_REQUEST_MESSAGE = "singlefile.frameTree.initRequest";
+	const CLEANUP_REQUEST_MESSAGE = "singlefile.frameTree.cleanupRequest";
+	const INIT_RESPONSE_MESSAGE = "singlefile.frameTree.initResponse";
 	const TARGET_ORIGIN = "*";
 	const TIMEOUT_INIT_REQUEST_MESSAGE = 750;
 	const TOP_WINDOW_ID = "0";

lib/lazy/content/content-lazy-loader.js

@@ -137,9 +137,9 @@ this.singlefile.lib.lazy.content.loader = this.singlefile.lib.lazy.content.loade
 
 	async function setAsyncTimeout(callback, delay) {
 		if (browser && browser.runtime && browser.runtime.sendMessage) {
-			const timeoutId = await browser.runtime.sendMessage({ method: "lazyTimeout.setTimeout", delay });
+			const timeoutId = await browser.runtime.sendMessage({ method: "singlefile.lazyTimeout.setTimeout", delay });
 			const timeoutCallback = message => {
-				if (message.method == "content.onLazyTimeout" && message.id == timeoutId) {
+				if (message.method == "singlefile.lazyTimeout.onTimeout" && message.id == timeoutId) {
 					browser.runtime.onMessage.removeListener(timeoutCallback);
 					callback();
 					return Promise.resolve({});
@@ -154,7 +154,7 @@ this.singlefile.lib.lazy.content.loader = this.singlefile.lib.lazy.content.loade
 
 	async function clearAsyncTimeout(timeoutId) {
 		if (browser && browser.runtime && browser.runtime.sendMessage) {
-			await browser.runtime.sendMessage({ method: "lazyTimeout.clearTimeout", id: timeoutId });
+			await browser.runtime.sendMessage({ method: "singlefile.lazyTimeout.clearTimeout", id: timeoutId });
 		} else {
 			return clearTimeout.call(window, timeoutId);
 		}