single-file-core 1.0.17 → 1.0.20

package/package.json

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

package/processors/lazy/content/content-lazy-loader.js

@@ -125,7 +125,7 @@ function triggerLazyLoading(options) {
 					clearAsyncTimeout("idleTimeout");
 					await setIdleTimeout(Math.max(500, delay / 2));
 				}
-			}, delay);
+			}, delay, options.loadDeferredImageNativeTimeout);
 		}
 
 		function onResourceLoad(event) {
@@ -162,14 +162,14 @@ function triggerLazyLoading(options) {
 }
 
 async function deferLazyLoadEnd(observer, options, resolve) {
-	await setAsyncTimeout("loadTimeout", () => lazyLoadEnd(observer, options, resolve), options.loadDeferredImagesMaxIdleTime);
+	await setAsyncTimeout("loadTimeout", () => lazyLoadEnd(observer, options, resolve), options.loadDeferredImagesMaxIdleTime, options.loadDeferredImageNativeTimeout);
 }
 
 async function deferForceLazyLoadEnd(observer, options, resolve) {
 	await setAsyncTimeout("maxTimeout", async () => {
 		await clearAsyncTimeout("loadTimeout");
 		await lazyLoadEnd(observer, options, resolve);
-	}, options.loadDeferredImagesMaxIdleTime * 10);
+	}, options.loadDeferredImagesMaxIdleTime * 10, options.loadDeferredImageNativeTimeout);
 }
 
 async function lazyLoadEnd(observer, options, resolve) {
@@ -178,12 +178,12 @@ async function lazyLoadEnd(observer, options, resolve) {
 	await setAsyncTimeout("endTimeout", async () => {
 		await clearAsyncTimeout("maxTimeout");
 		resolve();
-	}, options.loadDeferredImagesMaxIdleTime / 2);
+	}, options.loadDeferredImagesMaxIdleTime / 2, options.loadDeferredImageNativeTimeout);
 	observer.disconnect();
 }
 
-async function setAsyncTimeout(type, callback, delay) {
-	if (browser && browser.runtime && browser.runtime.sendMessage) {
+async function setAsyncTimeout(type, callback, delay, forceNativeTimeout) {
+	if (browser && browser.runtime && browser.runtime.sendMessage && !forceNativeTimeout) {
 		if (!timeouts.get(type) || !timeouts.get(type).pending) {
 			const timeoutData = { callback, pending: true };
 			timeouts.set(type, timeoutData);

package/single-file-core.js

@@ -1620,33 +1620,35 @@ class ProcessorHelper {
 		const imports = getImportFunctions(stylesheet);
 		await Promise.all(imports.map(async node => {
 			const urlNode = cssTree.find(node, node => node.type == "Url") || cssTree.find(node, node => node.type == "String");
-			let resourceURL = normalizeURL(urlNode.value);
-			if (!testIgnoredPath(resourceURL) && testValidPath(resourceURL)) {
-				urlNode.value = util.EMPTY_RESOURCE;
-				try {
-					resourceURL = util.resolveURL(resourceURL, baseURI);
-				} catch (error) {
-					// ignored
-				}
-				if (testValidURL(resourceURL) && !importedStyleSheets.has(resourceURL)) {
-					const content = await getStylesheetContent(resourceURL);
-					resourceURL = content.resourceURL;
-					content.data = getUpdatedResourceContent(resourceURL, content, options);
-					if (content.data && content.data.match(/^<!doctype /i)) {
-						content.data = "";
-					}
-					const mediaQueryListNode = cssTree.find(node, node => node.type == "MediaQueryList");
-					if (mediaQueryListNode) {
-						content.data = wrapMediaQuery(content.data, cssTree.generate(mediaQueryListNode));
+			if (urlNode) {
+				let resourceURL = normalizeURL(urlNode.value);
+				if (!testIgnoredPath(resourceURL) && testValidPath(resourceURL)) {
+					urlNode.value = util.EMPTY_RESOURCE;
+					try {
+						resourceURL = util.resolveURL(resourceURL, baseURI);
+					} catch (error) {
+						// ignored
 					}
-					const importedStylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
-					const ancestorStyleSheets = new Set(importedStyleSheets);
-					ancestorStyleSheets.add(resourceURL);
-					await ProcessorHelper.resolveImportURLs(importedStylesheet, resourceURL, options, workStylesheet, ancestorStyleSheets);
-					for (let keyName of Object.keys(importedStylesheet)) {
-						node[keyName] = importedStylesheet[keyName];
+					if (testValidURL(resourceURL) && !importedStyleSheets.has(resourceURL)) {
+						const content = await getStylesheetContent(resourceURL);
+						resourceURL = content.resourceURL;
+						content.data = getUpdatedResourceContent(resourceURL, content, options);
+						if (content.data && content.data.match(/^<!doctype /i)) {
+							content.data = "";
+						}
+						const mediaQueryListNode = cssTree.find(node, node => node.type == "MediaQueryList");
+						if (mediaQueryListNode) {
+							content.data = wrapMediaQuery(content.data, cssTree.generate(mediaQueryListNode));
+						}
+						const importedStylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
+						const ancestorStyleSheets = new Set(importedStyleSheets);
+						ancestorStyleSheets.add(resourceURL);
+						await ProcessorHelper.resolveImportURLs(importedStylesheet, resourceURL, options, workStylesheet, ancestorStyleSheets);
+						for (let keyName of Object.keys(importedStylesheet)) {
+							node[keyName] = importedStylesheet[keyName];
+						}
+						importFound = true;
 					}
-					importFound = true;
 				}
 			}
 		}));

package/single-file-helper.js

@@ -48,7 +48,7 @@ const SELECTED_CONTENT_ATTRIBUTE_NAME = "data-single-file-selected-content";
 const INVALID_ELEMENT_ATTRIBUTE_NAME = "data-single-file-invalid-element";
 const ASYNC_SCRIPT_ATTRIBUTE_NAME = "data-single-file-async-script";
 const FLOW_ELEMENTS_SELECTOR = "*:not(base):not(link):not(meta):not(noscript):not(script):not(style):not(template):not(title)";
-const KEPT_TAG_NAMES = ["NOSCRIPT", "DISABLED-NOSCRIPT", "META", "LINK", "STYLE", "TITLE", "TEMPLATE", "SOURCE", "OBJECT", "SCRIPT", "HEAD"];
+const KEPT_TAG_NAMES = ["NOSCRIPT", "DISABLED-NOSCRIPT", "META", "LINK", "STYLE", "TITLE", "TEMPLATE", "SOURCE", "OBJECT", "SCRIPT", "HEAD", "BODY"];
 const REGEXP_SIMPLE_QUOTES_STRING = /^'(.*?)'$/;
 const REGEXP_DOUBLE_QUOTES_STRING = /^"(.*?)"$/;
 const FONT_WEIGHTS = {

package/single-file.js

@@ -42,7 +42,9 @@ export {
 };
 
 function init(initOptions) {
-	SingleFile = core.getClass(util.getInstance(initOptions), vendor.cssTree);
+	if (typeof SingleFile == "undefined") {
+		SingleFile = core.getClass(util.getInstance(initOptions), vendor.cssTree);
+	}
 }
 
 async function getPageData(options = {}, initOptions, doc = globalThis.document, win = globalThis) {