single-file-core 1.5.29 → 1.5.31

package/core/helper.js

@@ -215,6 +215,14 @@ function preProcessDoc(doc, win, options) {
 			markedElements: []
 		};
 	}
+	let referrer = "";
+	if (doc.referrer) {
+		try {
+			referrer = new URL("/", new URL(doc.referrer).origin).href;
+		} catch (error) {
+			// ignored
+		}
+	}
 	return {
 		canvases: elementsInfo.canvases,
 		fonts: getFontsData(),
@@ -225,7 +233,7 @@ function preProcessDoc(doc, win, options) {
 		videos: elementsInfo.videos,
 		usedFonts: Array.from(elementsInfo.usedFonts.values()),
 		shadowRoots: elementsInfo.shadowRoots,
-		referrer: doc.referrer ? new URL("/", new URL(doc.referrer).origin).href : "",
+		referrer,
 		markedElements: elementsInfo.markedElements,
 		invalidElements,
 		scrollPosition: { x: win.scrollX, y: win.scrollY },

package/core/index.js

@@ -1391,7 +1391,7 @@ class Processor {
 	}
 
 	removeAlternativeMedias() {
-		const stats = util.minifyMedias(this.stylesheets);
+		const stats = util.minifyMedias(this.stylesheets, { keepPrintStyleSheets: this.options.keepPrintStyleSheets });
 		this.stats.set("processed", "medias", stats.processed);
 		this.stats.set("discarded", "medias", stats.discarded);
 	}

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

@@ -85,7 +85,7 @@ function getProcessorHelperClass(utilInstance) {
 			let stylesheet;
 			stylesheets.set(element, stylesheetInfo);
 			if (!options.inlineStylesheetsRefs.has(element)) {
-				if (!options.blockStylesheets) {
+				if (!options.blockStylesheets || (options.keepPrintStyleSheets && stylesheetInfo.mediaText == "print")) {
 					if (element.tagName.toUpperCase() == "LINK") {
 						stylesheet = await this.resolveLinkStylesheetURLs(element.href, baseURI, options, workStyleElement);
 					} else {

package/core/lib/processor-helper.js

@@ -76,7 +76,7 @@ function getProcessorHelperClass(utilInstance) {
 		}
 
 		async resolveStylesheetElement(element, stylesheetInfo, stylesheets, baseURI, options, workStyleElement, resources) {
-			if (!options.blockStylesheets) {
+			if (!options.blockStylesheets || (options.keepPrintStyleSheets && stylesheetInfo.mediaText == "print")) {
 				stylesheets.set({ element }, stylesheetInfo);
 				if (!options.inlineStylesheetsRefs.has(element)) {
 					if (element.tagName.toUpperCase() == "LINK") {

package/core/util.js

@@ -184,8 +184,8 @@ function getInstance(utilOptions) {
 		compressCSS(content, options) {
 			return vendor.cssMinifier.processString(content, options);
 		},
-		minifyMedias(stylesheets) {
-			return modules.mediasAltMinifier.process(stylesheets);
+		minifyMedias(stylesheets, options) {
+			return modules.mediasAltMinifier.process(stylesheets, options);
 		},
 		removeAlternativeImages(doc) {
 			return modules.imagesAltMinifier.process(doc);

package/modules/css-fonts-minifier.js

@@ -423,14 +423,14 @@ function testUnicodeRange(docCharCodes, unicodeRange) {
 					range[0] = transformRange(firstRange.replace(REGEXP_QUESTION_MARK, "0"));
 					range[1] = transformRange(secondRange.replace(REGEXP_QUESTION_MARK, "F"));
 				} else if (range[0]) {
-					range[0] = transformRange(range[0]);
+					range[0] = range[1] = transformRange(range[0]);
 				}
 			}
 			if (!range[0] || docCharCodes.find(charCode => charCode >= range[0] && charCode <= range[1])) {
 				return true;
 			}
 		});
-		return (!unicodeRanges.length || result.length);
+		return Boolean(!unicodeRanges.length || result.length);
 	}
 	return true;
 }

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

@@ -31,17 +31,18 @@ const helper = {
 
 const MEDIA_ALL = "all";
 const MEDIA_SCREEN = "screen";
+const MEDIA_PRINT = "print";
 
 export {
 	process
 };
 
-function process(stylesheets) {
+function process(stylesheets, { keepPrintStyleSheets } = {}) {
 	const stats = { processed: 0, discarded: 0 };
 	stylesheets.forEach((stylesheetInfo, key) => {
 		if (stylesheetInfo.stylesheet) {
-			if (matchesMediaType(stylesheetInfo.mediaText || MEDIA_ALL) && stylesheetInfo.stylesheet.children) {
-				const removedRules = processRules(stylesheetInfo.stylesheet.children, stats);
+			if (matchesMediaType(stylesheetInfo.mediaText || MEDIA_ALL, keepPrintStyleSheets) && stylesheetInfo.stylesheet.children) {
+				const removedRules = processRules(stylesheetInfo.stylesheet.children, stats, keepPrintStyleSheets);
 				removedRules.forEach(({ cssRules, cssRule }) => cssRules.remove(cssRule));
 			} else {
 				stylesheets.delete(key);
@@ -54,13 +55,13 @@ function process(stylesheets) {
 	return stats;
 }
 
-function processRules(cssRules, stats, removedRules = []) {
+function processRules(cssRules, stats, keepPrintStyleSheets, removedRules = []) {
 	for (let cssRule = cssRules.head; cssRule; cssRule = cssRule.next) {
 		const ruleData = cssRule.data;
 		if (ruleData.type == "Atrule" && ruleData.name == "media" && ruleData.block && ruleData.block.children && ruleData.prelude && ruleData.prelude.children) {
 			stats.processed++;
-			if (matchesMediaType(cssTree.generate(ruleData.prelude))) {
-				processRules(ruleData.block.children, stats, removedRules);
+			if (matchesMediaType(cssTree.generate(ruleData.prelude), keepPrintStyleSheets)) {
+				processRules(ruleData.block.children, stats, keepPrintStyleSheets, removedRules);
 			} else {
 				removedRules.push({ cssRules, cssRule });
 				stats.discarded++;
@@ -70,10 +71,10 @@ function processRules(cssRules, stats, removedRules = []) {
 	return removedRules;
 }
 
-function matchesMediaType(mediaText) {
+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)) ||
+		(!mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_SCREEN || mediaTypeInfo.value == MEDIA_ALL || (keepPrintStyleSheets && mediaTypeInfo.value == MEDIA_PRINT))) ||
 		(mediaTypeInfo.not && (mediaTypeInfo.value != MEDIA_SCREEN)));
 }
 

package/package.json

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

package/processors/compression/compression.js

@@ -111,6 +111,10 @@ async function process(pageData, options, lastModDate = new Date()) {
 			const hmtlData = new Uint8Array([...getLength(htmlArray.length + 4), ...[0x74, 0x45, 0x58, 0x74, 0x50, 0x4e, 0x47, 0], ...htmlArray]);
 			await writeData(zipDataWriter.writable, hmtlData);
 			await writeData(zipDataWriter.writable, getCRC32(hmtlData, 4));
+		} else if (options.embeddedPdf) {
+			const data = new Uint8Array([...getLength(options.embeddedPdf.length + 4), ...[0x74, 0x45, 0x58, 0x74, 0x50, 0x44, 0x46, 0], ...new Uint8Array(options.embeddedPdf)]);
+			await writeData(zipDataWriter.writable, data);
+			await writeData(zipDataWriter.writable, getCRC32(data, 4));
 		}
 		await writeData(zipDataWriter.writable, embeddedImageData);
 		await writeData(zipDataWriter.writable, new Uint8Array(4));
@@ -122,6 +126,8 @@ async function process(pageData, options, lastModDate = new Date()) {
 	}
 	if (options.selfExtractingArchive) {
 		extraDataOffset = await prependHTMLData(pageData, zipDataWriter, script, options);
+	} else if (!options.embeddedImage && options.embeddedPdf) {
+		await writeData(zipDataWriter.writable, new Uint8Array(options.embeddedPdf));
 	}
 	const zipWriter = new ZipWriter(zipDataWriter, { bufferedWrite: true, keepOrder: false, lastModDate });
 	const startOffset = zipDataWriter.offset;