single-file-core 1.5.34 → 1.5.36

package/core/helper.js

@@ -131,7 +131,7 @@ export {
 };
 
 function initUserScriptHandler() {
-	addEventListener(ON_INIT_USERSCRIPT_EVENT, () => globalThis[WAIT_FOR_USERSCRIPT_PROPERTY_NAME] = async (eventPrefixName, options) => {
+	addEventListener(ON_INIT_USERSCRIPT_EVENT, ({ detail }) => globalThis[WAIT_FOR_USERSCRIPT_PROPERTY_NAME] = async (eventPrefixName, options) => {
 		const userScriptOptions = Object.assign({}, options);
 		delete userScriptOptions.win;
 		delete userScriptOptions.doc;
@@ -140,13 +140,26 @@ function initUserScriptHandler() {
 		delete userScriptOptions.taskId;
 		delete userScriptOptions._migratedTemplateFormat;
 		delete userScriptOptions.woleetKey;
-		const event = new CustomEvent(eventPrefixName + "-request", { cancelable: true, detail: { options: userScriptOptions } });
+		let detailUserScript;
+		try {
+			detailUserScript = detail == "jsonDetail" ? JSON.stringify({ options: userScriptOptions }) : { options: userScriptOptions };
+		} catch (error) {
+			// ignored
+		}
+		const event = new CustomEvent(eventPrefixName + "-request", { cancelable: true, detail: detailUserScript });
 		let resolvePromiseResponse;
 		const promiseResponse = new Promise(resolve => {
 			resolvePromiseResponse = resolve;
 			addEventListener(eventPrefixName + "-response", event => {
-				if (event.detail && event.detail.options) {
-					Object.assign(options, event.detail.options);
+				if (event.detail) {
+					try {
+						const detail = typeof event.detail == "string" ? JSON.parse(event.detail) : event.detail;
+						if (detail.options) {
+							Object.assign(options, detail.options);
+						}
+					} catch (error) {
+						// ignored
+					}
 				}
 				resolve();
 			});

package/core/index.js

@@ -179,7 +179,7 @@ class Runner {
 		this.options.url = this.options.url || (rootDocDefined && this.options.doc.documentURI);
 		const matchResourceReferrer = this.options.url.match(/^.*\//);
 		this.options.resourceReferrer = this.options.passReferrerOnError && matchResourceReferrer && matchResourceReferrer[0];
-		this.options.baseURI = rootDocDefined && this.options.doc.baseURI;
+		this.options.baseURI = rootDocDefined && (testValidURL(this.options.doc.baseURI) ? this.options.doc.baseURI : this.options.url);
 		this.options.rootDocument = root;
 		this.options.updatedResources = this.options.updatedResources || {};
 		this.options.fontTests = new Map();
@@ -788,7 +788,7 @@ class Processor {
 			const attributeValue = videoElement.getAttribute(util.VIDEO_ATTRIBUTE_NAME);
 			if (attributeValue) {
 				const videoData = this.options.videos[Number(attributeValue)];
-				const src = videoData.src || videoElement.src;
+				const src = (videoData && videoData.src) || videoElement.src;
 				if (videoElement && src) {
 					const linkElement = this.doc.createElement("a");
 					const imgElement = this.doc.createElement("img");
@@ -956,7 +956,11 @@ class Processor {
 			this.doc.querySelectorAll("input, textarea").forEach(input => {
 				const value = input.getAttribute(util.INPUT_VALUE_ATTRIBUTE_NAME);
 				if (value != null) {
-					input.setAttribute("value", value);
+					if (input.tagName.toUpperCase() == "TEXTAREA") {
+						input.textContent = value;
+					} else {
+						input.setAttribute("value", value);
+					}
 				} else {
 					input.removeAttribute("value");
 				}

package/core/lib/processor-helper-inline.js

@@ -239,9 +239,9 @@ function getProcessorHelperClass(utilInstance) {
 		}
 
 		async processFrame(frameElement, pageData, options) {
-			let sandbox = "allow-popups allow-top-navigation allow-top-navigation-by-user-activation";
+			let sandbox = "allow-popups allow-top-navigation-by-user-activation";
 			if (pageData.content.match(NOSCRIPT_TAG_FOUND) || pageData.content.match(CANVAS_TAG_FOUND) || pageData.content.match(SCRIPT_TAG_FOUND) || options.saveRawPage) {
-				sandbox += " allow-scripts allow-same-origin allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
+				sandbox += " allow-scripts allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
 			}
 			frameElement.setAttribute("sandbox", sandbox);
 			if (frameElement.tagName.toUpperCase() == "OBJECT") {
@@ -445,7 +445,7 @@ function getProcessorHelperClass(utilInstance) {
 				if (imageData && imageData.replaceable) {
 					imgElement.setAttribute("src", `${PREFIX_DATA_URI_IMAGE_SVG},<svg xmlns="http://www.w3.org/2000/svg" width="${imageData.size.pxWidth}" height="${imageData.size.pxHeight}"><rect fill-opacity="0"/></svg>`);
 					const backgroundStyle = {};
-					const backgroundSize = (imageData.objectFit == "content" || imageData.objectFit == "cover") && imageData.objectFit;
+					const backgroundSize = (imageData.objectFit == "content" || imageData.objectFit == "cover" || imageData.objectFit == "contain") && imageData.objectFit;
 					if (backgroundSize) {
 						backgroundStyle["background-size"] = imageData.objectFit;
 					}

package/core/lib/processor-helper.js

@@ -235,9 +235,9 @@ function getProcessorHelperClass(utilInstance) {
 
 		async processFrame(frameElement, pageData, options, resources, frameWindowId, frameData) {
 			const name = "frames/" + resources.frames.size + "/";
-			let sandbox = "allow-popups allow-top-navigation allow-top-navigation-by-user-activation";
+			let sandbox = "allow-popups allow-top-navigation-by-user-activation";
 			if (pageData.content.match(NOSCRIPT_TAG_FOUND) || pageData.content.match(CANVAS_TAG_FOUND) || pageData.content.match(SCRIPT_TAG_FOUND) || options.saveRawPage) {
-				sandbox += " allow-scripts allow-same-origin allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
+				sandbox += " allow-scripts allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
 			}
 			frameElement.setAttribute("sandbox", sandbox);
 			if (frameElement.tagName.toUpperCase() == "OBJECT") {

package/modules/css-medias-alt-minifier.js

@@ -75,7 +75,7 @@ function matchesMediaType(mediaText, keepPrintStyleSheets) {
 	const foundMediaTypes = helper.flatten(mediaQueryParser.parseMediaList(mediaText).map(node => getMediaTypes(node)));
 	return foundMediaTypes.find(mediaTypeInfo =>
 		(!mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_SCREEN || mediaTypeInfo.value == MEDIA_ALL || (keepPrintStyleSheets && mediaTypeInfo.value == MEDIA_PRINT))) ||
-		(mediaTypeInfo.not && (mediaTypeInfo.value != MEDIA_SCREEN)));
+		(mediaTypeInfo.not && (mediaTypeInfo.value != MEDIA_SCREEN || mediaText.includes(" and "))));
 }
 
 function getMediaTypes(parentNode, mediaTypes = []) {

package/package.json

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

package/processors/compression/compression-display.js

@@ -50,8 +50,7 @@ async function display(document, docContent, { disableFramePointerEvents } = {})
 		element.parentElement.replaceChild(noscriptElement, element);
 	});
 	document.documentElement.setAttribute("data-sfz", "");
-	document.querySelectorAll("link[rel*=icon]").forEach(element => element.parentElement.replaceChild(element, element));
-
+	document.querySelectorAll("link[rel*=icon]").forEach(element => element.replaceWith(element.cloneNode(true)));
 	function getDoctypeString(doc) {
 		const docType = doc.doctype;
 		let docTypeString = "";

package/single-file.js

@@ -48,7 +48,13 @@ function init(initOptions) {
 	}
 }
 
-async function getPageData(options = {}, initOptions, doc = globalThis.document, win = globalThis) {
+async function getPageData(options = {}, initOptions, doc, win) {
+	if (doc === undefined) {
+		doc = globalThis.document;
+	}
+	if (win === undefined) {
+		win = globalThis;
+	}
 	const frames = processors.frameTree;
 	let framesSessionId;
 	init(initOptions);