invert dependency

extension/core/bg/requests.js

@@ -23,14 +23,15 @@
 
 /* global browser */
 
-const REQUEST_ID_HEADER_NAME = "x-single-file-request-id";
-const referrers = new Map();
+import {
+	REQUEST_ID_HEADER_NAME,
+	referrers
+} from "../../lib/single-file/fetch/bg/fetch.js";
+
 let referrerOnErrorEnabled = false;
 
 export {
-	REQUEST_ID_HEADER_NAME,
 	onMessage,
-	setReferrer,
 	enableReferrerOnError
 };
 
@@ -45,10 +46,6 @@ function onMessage(message) {
 	}
 }
 
-function setReferrer(requestId, referrer) {
-	referrers.set(requestId, referrer);
-}
-
 function injectRefererHeader(details) {
 	if (referrerOnErrorEnabled) {
 		let requestIdHeader = details.requestHeaders.find(header => header.name === REQUEST_ID_HEADER_NAME);

extension/lib/single-file/fetch/bg/fetch.js

@@ -23,7 +23,12 @@
 
 /* global browser, XMLHttpRequest */
 
-import * as requests from "./../../../../core/bg/requests.js";
+const referrers = new Map();
+const REQUEST_ID_HEADER_NAME = "x-single-file-request-id";
+export {
+	REQUEST_ID_HEADER_NAME,
+	referrers
+};
 
 browser.runtime.onMessage.addListener((message, sender) => {
 	if (message.method && message.method.startsWith("singlefile.fetch")) {
@@ -71,9 +76,13 @@ function fetchResource(url, options, includeRequestId) {
 		xhrRequest.open("GET", url, true);
 		if (includeRequestId) {
 			const randomId = String(Math.random()).substring(2);
-			requests.setReferrer(randomId, options.referrer);
-			xhrRequest.setRequestHeader(requests.REQUEST_ID_HEADER_NAME, randomId);
+			setReferrer(randomId, options.referrer);
+			xhrRequest.setRequestHeader(REQUEST_ID_HEADER_NAME, randomId);
 		}
 		xhrRequest.send();
 	});
+}
+
+function setReferrer(requestId, referrer) {
+	referrers.set(requestId, referrer);
 }