single-file-core 1.0.14 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.0.14",
+  "version": "1.0.17",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/processors/hooks/content/content-hooks-frames.js

@@ -41,7 +41,6 @@ const NEW_FONT_FACE_EVENT = "single-file-new-font-face";
 const DELETE_FONT_EVENT = "single-file-delete-font";
 const CLEAR_FONTS_EVENT = "single-file-clear-fonts";
 
-const browser = globalThis.browser;
 const addEventListener = (type, listener, options) => globalThis.addEventListener(type, listener, options);
 const dispatchEvent = event => { try { globalThis.dispatchEvent(event); } catch (error) {  /* ignored */ } };
 const CustomEvent = globalThis.CustomEvent;
@@ -69,17 +68,6 @@ if (document instanceof Document) {
 		fontFaces.delete(JSON.stringify(key));
 	});
 	addEventListener(CLEAR_FONTS_EVENT, () => fontFaces = new Map());
-	let scriptElement = document.createElement("script");
-	scriptElement.src = "data:," + "(" + injectedScript.toString() + ")()";
-	(document.documentElement || document).appendChild(scriptElement);
-	scriptElement.remove();
-	if (browser && browser.runtime && browser.runtime.getURL) {
-		scriptElement = document.createElement("script");
-		scriptElement.src = browser.runtime.getURL("/lib/single-file-hooks-frames.js");
-		scriptElement.async = false;
-		(document.documentElement || document).appendChild(scriptElement);
-		scriptElement.remove();
-	}
 }
 
 export {
@@ -135,80 +123,4 @@ function loadDeferredImagesResetZoomLevel(options) {
 	} else {
 		dispatchEvent(new CustomEvent(LOAD_DEFERRED_IMAGES_RESET_EVENT));
 	}
-}
-
-function injectedScript() {
-	if (typeof globalThis == "undefined") {
-		window.globalThis = window;
-	}
-	const document = globalThis.document;
-	const console = globalThis.console;
-	const dispatchEvent = event => globalThis.dispatchEvent(event);
-	const CustomEvent = globalThis.CustomEvent;
-	const FileReader = globalThis.FileReader;
-	const Blob = globalThis.Blob;
-	const warn = (console && console.warn && ((...args) => console.warn(...args))) || (() => { });
-	const NEW_FONT_FACE_EVENT = "single-file-new-font-face";
-	const DELETE_FONT_EVENT = "single-file-delete-font";
-	const CLEAR_FONTS_EVENT = "single-file-clear-fonts";
-	const FONT_STYLE_PROPERTIES = {
-		family: "font-family",
-		style: "font-style",
-		weight: "font-weight",
-		stretch: "font-stretch",
-		unicodeRange: "unicode-range",
-		variant: "font-variant",
-		featureSettings: "font-feature-settings"
-	};
-
-	if (globalThis.FontFace) {
-		const FontFace = globalThis.FontFace;
-		let warningFontFaceDisplayed;
-		globalThis.FontFace = function () {
-			if (!warningFontFaceDisplayed) {
-				warn("SingleFile is hooking the FontFace constructor, document.fonts.delete and document.fonts.clear to handle dynamically loaded fonts.");
-				warningFontFaceDisplayed = true;
-			}
-			getDetailObject(...arguments).then(detail => dispatchEvent(new CustomEvent(NEW_FONT_FACE_EVENT, { detail })));
-			return new FontFace(...arguments);
-		};
-		globalThis.FontFace.toString = function () { return "function FontFace() { [native code] }"; };
-		const deleteFont = document.fonts.delete;
-		document.fonts.delete = function (fontFace) {
-			getDetailObject(fontFace.family).then(detail => dispatchEvent(new CustomEvent(DELETE_FONT_EVENT, { detail })));
-			return deleteFont.call(document.fonts, fontFace);
-		};
-		document.fonts.delete.toString = function () { return "function delete() { [native code] }"; };
-		const clearFonts = document.fonts.clear;
-		document.fonts.clear = function () {
-			dispatchEvent(new CustomEvent(CLEAR_FONTS_EVENT));
-			return clearFonts.call(document.fonts);
-		};
-		document.fonts.clear.toString = function () { return "function clear() { [native code] }"; };
-	}
-
-	async function getDetailObject(fontFamily, src, descriptors) {
-		const detail = {};
-		detail["font-family"] = fontFamily;
-		detail.src = src;
-		if (descriptors) {
-			Object.keys(descriptors).forEach(descriptor => {
-				if (FONT_STYLE_PROPERTIES[descriptor]) {
-					detail[FONT_STYLE_PROPERTIES[descriptor]] = descriptors[descriptor];
-				}
-			});
-		}
-		return new Promise(resolve => {
-			if (detail.src instanceof ArrayBuffer) {
-				const reader = new FileReader();
-				reader.readAsDataURL(new Blob([detail.src]));
-				reader.addEventListener("load", () => {
-					detail.src = "url(" + reader.result + ")";
-					resolve(detail);
-				});
-			} else {
-				resolve(detail);
-			}
-		});
-	}
 }

package/processors/index.js

@@ -22,13 +22,11 @@
  */
 
 import * as frameTree from "./frame-tree/content/content-frame-tree.js";
-import * as hooks from "./hooks/content/content-hooks.js";
 import * as hooksFrames from "./hooks/content/content-hooks-frames.js";
 import * as lazy from "./lazy/content/content-lazy-loader.js";
 
 export {
 	frameTree,
-	hooks,
 	hooksFrames,
 	lazy
 };

package/single-file-core.js

@@ -533,7 +533,7 @@ class Processor {
 		if (!this.options.backgroundSave) {
 			filename = filename.replace(/\//g, replacementCharacter);
 		}
-		if (!this.options.saveToGDrive && !this.options.saveToGitHub && !this.options.saveWithCompanion &&
+		if (!this.options.saveToGDrive && !this.options.saveToGitHub && !this.options.saveWithCompanion && !this.options.saveWithWebDAV &&
 			((this.options.filenameMaxLengthUnit == "bytes" && util.getContentSize(filename) > this.options.filenameMaxLength) || (filename.length > this.options.filenameMaxLength))) {
 			const extensionMatch = filename.match(/(\.[^.]{3,4})$/);
 			const extension = extensionMatch && extensionMatch[0] && extensionMatch[0].length > 1 ? extensionMatch[0] : "";
@@ -1016,10 +1016,14 @@ class Processor {
 
 	resolveStyleAttributeURLs() {
 		this.doc.querySelectorAll("[style]").forEach(element => {
-			const styleContent = element.getAttribute("style");
-			const declarationList = cssTree.parse(styleContent, { context: "declarationList", parseCustomProperty: true });
-			ProcessorHelper.resolveStylesheetURLs(declarationList, this.baseURI, this.workStyleElement);
-			this.styles.set(element, declarationList);
+			if (this.options.blockStylesheets) {
+				element.removeAttribute("style");
+			} else {
+				const styleContent = element.getAttribute("style");
+				const declarationList = cssTree.parse(styleContent, { context: "declarationList", parseCustomProperty: true });
+				ProcessorHelper.resolveStylesheetURLs(declarationList, this.baseURI, this.workStyleElement);
+				this.styles.set(element, declarationList);
+			}
 		});
 	}
 
@@ -1030,10 +1034,11 @@ class Processor {
 			if (element.media) {
 				mediaText = element.media.toLowerCase();
 			}
-			const stylesheetInfo = { mediaText };
-			if (element.closest("[" + SHADOWROOT_ATTRIBUTE_NAME + "]")) {
-				stylesheetInfo.scoped = true;
-			}
+			const scoped = Boolean(element.closest("[" + SHADOWROOT_ATTRIBUTE_NAME + "]"));
+			const stylesheetInfo = {
+				mediaText,
+				scoped
+			};
 			if (element.tagName == "LINK" && element.charset) {
 				options.charset = element.charset;
 			}
@@ -1043,32 +1048,19 @@ class Processor {
 			const newResources = Object.keys(this.options.updatedResources).filter(url => this.options.updatedResources[url].type == "stylesheet" && !this.options.updatedResources[url].retrieved).map(url => this.options.updatedResources[url]);
 			await Promise.all(newResources.map(async resource => {
 				resource.retrieved = true;
-				const stylesheetInfo = {};
-				const element = this.doc.createElement("style");
-				this.doc.body.appendChild(element);
-				element.textContent = resource.content;
-				await processElement(element, stylesheetInfo, this.stylesheets, this.baseURI, this.options, this.workStyleElement);
+				if (!this.options.blockStylesheets) {
+					const stylesheetInfo = {};
+					const element = this.doc.createElement("style");
+					this.doc.body.appendChild(element);
+					element.textContent = resource.content;
+					await processElement(element, stylesheetInfo, this.stylesheets, this.baseURI, this.options, this.workStyleElement);
+				}
 			}));
 		}
 
 		async function processElement(element, stylesheetInfo, stylesheets, baseURI, options, workStyleElement) {
 			let stylesheet;
 			stylesheets.set(element, stylesheetInfo);
-			if (!options.blockStylesheets) {
-				stylesheet = await getStylesheet(element, baseURI, options, workStyleElement);
-			}
-			if (stylesheet && stylesheet.children) {
-				if (options.compressCSS) {
-					ProcessorHelper.removeSingleLineCssComments(stylesheet);
-				}
-				stylesheetInfo.stylesheet = stylesheet;
-			} else {
-				stylesheets.delete(element);
-			}
-		}
-
-		async function getStylesheet(element, baseURI, options, workStyleElement) {
-			let stylesheet;
 			if (!options.blockStylesheets) {
 				if (element.tagName == "LINK") {
 					stylesheet = await ProcessorHelper.resolveLinkStylesheetURLs(element.href, baseURI, options, workStyleElement);
@@ -1080,7 +1072,14 @@ class Processor {
 					}
 				}
 			}
-			return stylesheet;
+			if (stylesheet && stylesheet.children) {
+				if (options.compressCSS) {
+					ProcessorHelper.removeSingleLineCssComments(stylesheet);
+				}
+				stylesheetInfo.stylesheet = stylesheet;
+			} else {
+				stylesheets.delete(element);
+			}
 		}
 	}
 
@@ -1809,7 +1808,8 @@ class ProcessorHelper {
 					let { content, indexResource, duplicate } = await batchRequest.addURL(resourceURL,
 						{ asBinary: true, expectedType: "image", groupDuplicates: options.groupDuplicateImages });
 					if (!originalResourceURL.startsWith("#")) {
-						if (duplicate && options.groupDuplicateImages && util.getContentSize(content) < SINGLE_FILE_VARIABLE_MAX_SIZE) {
+						const maxSizeDuplicateImages = options.maxSizeDuplicateImages || SINGLE_FILE_VARIABLE_MAX_SIZE;
+						if (duplicate && options.groupDuplicateImages && util.getContentSize(content) < maxSizeDuplicateImages) {
 							const varNode = cssTree.parse("var(" + SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource + ")", { context: "value" });
 							for (let keyName of Object.keys(varNode.children.head.data)) {
 								urlNode[keyName] = varNode.children.head.data[keyName];
@@ -1882,7 +1882,8 @@ class ProcessorHelper {
 									const forbiddenPrefixFound = PREFIXES_FORBIDDEN_DATA_URI.filter(prefixDataURI => content.startsWith(prefixDataURI)).length;
 									if (!forbiddenPrefixFound) {
 										const isSVG = content.startsWith(PREFIX_DATA_URI_IMAGE_SVG);
-										if (expectedType == "image" && processDuplicates && duplicate && !isSVG && util.getContentSize(content) < SINGLE_FILE_VARIABLE_MAX_SIZE) {
+										const maxSizeDuplicateImages = options.maxSizeDuplicateImages || SINGLE_FILE_VARIABLE_MAX_SIZE;
+										if (expectedType == "image" && processDuplicates && duplicate && !isSVG && util.getContentSize(content) < maxSizeDuplicateImages) {
 											if (ProcessorHelper.replaceImageSource(resourceElement, SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource, options)) {
 												cssVariables.set(indexResource, { content, url: originURL });
 												const declarationList = cssTree.parse(resourceElement.getAttribute("style"), { context: "declarationList", parseCustomProperty: true });

package/{processors/hooks/content/content-hooks.js → single-file-frames.js}

@@ -21,19 +21,4 @@
  *   Source.
  */
 
-/* global globalThis */
-
-const browser = globalThis.browser;
-const document = globalThis.document;
-const Document = globalThis.Document;
-
-if (document instanceof Document) {
-	const scriptElement = document.createElement("script");
-	scriptElement.async = false;
-	if (browser && browser.runtime && browser.runtime.getURL) {
-		scriptElement.src = browser.runtime.getURL("/lib/single-file-hooks.js");
-		scriptElement.async = false;
-	}
-	(document.documentElement || document).appendChild(scriptElement);
-	scriptElement.remove();
-}
+export * from "./processors/frame-tree/content/content-frame-tree.js";

package/{processors/hooks/content/content-hooks-web.js → single-file-hooks-frames.js}

@@ -21,28 +21,4 @@
  *   Source.
  */
 
-/* global window, globalThis */
-
-(globalThis => {
-
-	const FETCH_REQUEST_EVENT = "single-file-request-fetch";
-	const FETCH_RESPONSE_EVENT = "single-file-response-fetch";	
-
-	const CustomEvent = globalThis.CustomEvent;
-	const fetch = globalThis.fetch;
-	const addEventListener = (type, listener, options) => globalThis.addEventListener(type, listener, options);
-	const dispatchEvent = event => { try { globalThis.dispatchEvent(event); } catch (error) {  /* ignored */ } };
-
-	addEventListener(FETCH_REQUEST_EVENT, async event => {
-		const url = event.detail;
-		let detail;
-		try {
-			const response = await fetch(url, { cache: "force-cache" });
-			detail = { url, response: await response.arrayBuffer(), headers: [...response.headers], status: response.status };
-		} catch (error) {
-			detail = { url, error: error && error.toString() };
-		}
-		dispatchEvent(new CustomEvent(FETCH_RESPONSE_EVENT, { detail }));
-	});
-
-})(typeof globalThis == "object" ? globalThis : window);
+import "./processors/hooks/content/content-hooks-frames-web.js";

package/single-file-infobar.js

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2022 Gildas Lormeau
+ * contact : gildas.lormeau <at> gmail.com
+ * 
+ * This file is part of SingleFile.
+ *
+ *   The code in this file is free software: you can redistribute it and/or 
+ *   modify it under the terms of the GNU Affero General Public License 
+ *   (GNU AGPL) as published by the Free Software Foundation, either version 3
+ *   of the License, or (at your option) any later version.
+ * 
+ *   The code in this file is distributed in the hope that it will be useful, 
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero 
+ *   General Public License for more details.
+ *
+ *   As additional permission under GNU AGPL version 3 section 7, you may 
+ *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU 
+ *   AGPL normally required by section 4, provided you include this license 
+ *   notice and a URL through which recipients can access the Corresponding 
+ *   Source.
+ */
+
+import "./common/content-infobar-web.js";