single-file-core 1.2.27 → 1.2.29

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

@@ -105,12 +105,12 @@ class ProcessorHelperCommon {
 			this.processXLinks(doc.querySelectorAll("use"), doc, baseURI, options, batchRequest),
 			this.processSrcset(doc.querySelectorAll("img[srcset], source[srcset]"), baseURI, options, resources, batchRequest)
 		]);
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("object[data*=\".pdf\"]"), "data", baseURI, options, null, resources, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("embed[src*=\".pdf\"]"), "src", baseURI, options, null, resources, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("audio[src], audio > source[src]"), "src", baseURI, options, "audio", resources, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("video[src], video > source[src]"), "src", baseURI, options, "video", resources, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("audio track[src], video track[src]"), "src", baseURI, options, null, resources, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc.querySelectorAll("model[src]"), "src", baseURI, options, null, resources, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc.querySelectorAll("object[data*=\".pdf\"]"), "data", baseURI, options, null, resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc.querySelectorAll("embed[src*=\".pdf\"]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc.querySelectorAll("audio[src], audio > source[src]"), "src", baseURI, options, "audio", resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc.querySelectorAll("video[src], video > source[src]"), "src", baseURI, options, "video", resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc.querySelectorAll("audio track[src], video track[src]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc.querySelectorAll("model[src]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
 		await Promise.all(resourcePromises);
 		if (options.saveFavicon) {
 			this.processShortcutIcons(doc);
@@ -443,10 +443,7 @@ class ProcessorHelperCommon {
 				const key = this.getFontKey(ruleData);
 				const fontInfo = fontsDetails.fonts.get(key);
 				if (fontInfo) {
-					const processed = await this.processFontFaceRule(ruleData, fontInfo, fonts, fontTests, stats);
-					if (processed) {
-						fontsDetails.fonts.delete(key);
-					}
+					await this.processFontFaceRule(ruleData, fontInfo, fonts, fontTests, stats);
 				} else {
 					removedRules.push(cssRule);
 				}
@@ -481,7 +478,12 @@ class ProcessorHelperCommon {
 				if (src) {
 					const fontSources = src.match(REGEXP_URL_FUNCTION);
 					if (fontSources) {
-						fontSources.forEach(source => fontInfo.unshift(source));
+						fontSources.forEach(source => {
+							if (fontInfo.includes(source)) {
+								fontInfo.splice(fontInfo.indexOf(source), 1);
+							}
+							fontInfo.unshift(source);
+						});
 					}
 				}
 			}

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

@@ -557,9 +557,6 @@ function getProcessorHelperClass(utilInstance) {
 				catch (error) {
 					// ignored
 				}
-				return true;
-			} else {
-				return false;
 			}
 		}
 	};

package/core/lib/processor-helper.js

@@ -485,7 +485,6 @@ function getProcessorHelperClass(utilInstance) {
 				catch (error) {
 					// ignored
 				}
-				return true;
 			}
 		}
 	};

package/package.json

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

package/processors/compression/compression-extract.js

@@ -80,7 +80,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 	const zipReader = new zip.ZipReader(blobReader);
 	const entries = await zipReader.getEntries();
 	const options = { password };
-	let docContent, origDocContent, url, resources = [];
+	let docContent, origDocContent, url, resources = [], indexPages = [];
 	await Promise.all(entries.map(async entry => {
 		const { filename } = entry;
 		let dataWriter, content, textContent, mimeType;
@@ -119,10 +119,18 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			}
 		}
 		const name = entry.filename.match(/^([0-9_]+\/)?(.*)$/)[2];
-		resources.push({ filename: entry.filename, name, url: entry.comment, content, mimeType, textContent, parentResources: [] });
+		const resourceInfo = { filename: entry.filename, name, url: entry.comment, content, mimeType, textContent, parentResources: [] };
+		if (filename.match(REGEXP_MATCH_INDEX)) {
+			indexPages.push(resourceInfo);
+		} else {
+			resources.push(resourceInfo);
+		}
 	}));
 	await zipReader.close();
-	resources = resources.sort((resourceLeft, resourceRight) => resourceRight.filename.length - resourceLeft.filename.length);
+	resources.sort(sortByFilenameLength);
+	indexPages.sort(sortByFilenameLength);
+	resources.sort((resourceLeft, resourceRight) => resourceRight.textContent ? -1 : resourceLeft.textContent ? 1 : 0);
+	resources = resources.concat(...indexPages);
 	for (const resource of resources) {
 		let { textContent, mimeType, filename } = resource;
 		if (textContent !== undefined) {
@@ -186,4 +194,8 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			return string.replace(searchRegExp, replacement);
 		}
 	}
+
+	function sortByFilenameLength(resourceLeft, resourceRight) {
+		return resourceRight.filename.length - resourceLeft.filename.length;
+	}
 }