single-file-core 1.5.112 → 1.5.114

package/core/lib/doctype.js

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2026 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.
+ */
+
+// this module is imported by the script embedded in self-extracting archives, it
+// must stay free of dependencies
+
+export {
+	getDoctypeString
+};
+
+function getDoctypeString(doc) {
+	const docType = doc.doctype;
+	let docTypeString = "";
+	if (docType) {
+		docTypeString = "<!DOCTYPE " + docType.nodeName;
+		if (docType.publicId) {
+			docTypeString += " PUBLIC \"" + docType.publicId + "\"";
+			if (docType.systemId) {
+				docTypeString += " \"" + docType.systemId + "\"";
+			}
+		} else if (docType.systemId) {
+			docTypeString += " SYSTEM \"" + docType.systemId + "\"";
+		}
+		if (docType.internalSubset) {
+			docTypeString += " [" + docType.internalSubset + "]";
+		}
+		docTypeString += ">";
+	}
+	return docTypeString;
+}

package/core/util.js

@@ -24,6 +24,7 @@
 import * as vendor from "./../vendor/index.js";
 import * as modules from "./../modules/index.js";
 import * as helper from "./helper.js";
+import { getDoctypeString } from "./lib/doctype.js";
 
 const DEBUG = false;
 const ONE_MB = 1024 * 1024;
@@ -489,24 +490,6 @@ function guessMIMEType(expectedType, buffer) {
 	}
 }
 
-function getDoctypeString(doc) {
-	const docType = doc.doctype;
-	let docTypeString = "";
-	if (docType) {
-		docTypeString = "<!DOCTYPE " + docType.nodeName;
-		if (docType.publicId) {
-			docTypeString += " PUBLIC \"" + docType.publicId + "\"";
-			if (docType.systemId)
-				docTypeString += " \"" + docType.systemId + "\"";
-		} else if (docType.systemId)
-			docTypeString += " SYSTEM \"" + docType.systemId + "\"";
-		if (docType.internalSubset)
-			docTypeString += " [" + docType.internalSubset + "]";
-		docTypeString += "> ";
-	}
-	return docTypeString;
-}
-
 function log(...args) {
 	console.log("S-File <browser>", ...args); // eslint-disable-line no-console
 }

package/package.json

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

package/processors/compression/compression-display.js

@@ -23,6 +23,8 @@
 
 /* global DOMParser, setTimeout */
 
+import { getDoctypeString } from "./../../core/lib/doctype.js";
+
 export {
 	display
 };
@@ -89,21 +91,4 @@ async function display(document, docContent, { disableFramePointerEvents, inPlac
 	});
 	document.documentElement.setAttribute("data-sfz", "");
 	document.querySelectorAll("link[rel*=icon]").forEach(element => element.replaceWith(element.cloneNode(true)));
-	function getDoctypeString(doc) {
-		const docType = doc.doctype;
-		let docTypeString = "";
-		if (docType) {
-			docTypeString = "<!DOCTYPE " + docType.nodeName;
-			if (docType.publicId) {
-				docTypeString += " PUBLIC \"" + docType.publicId + "\"";
-				if (docType.systemId)
-					docTypeString += " \"" + docType.systemId + "\"";
-			} else if (docType.systemId)
-				docTypeString += " SYSTEM \"" + docType.systemId + "\"";
-			if (docType.internalSubset)
-				docTypeString += " [" + docType.internalSubset + "]";
-			docTypeString += "> ";
-		}
-		return docTypeString;
-	}
 }

package/processors/compression/compression.js

@@ -113,7 +113,9 @@ const MAX_APPENDED_DATA_LENGTH = 65535;
 const PDF_ENTRY_FILENAME = "page.pdf";
 const PDF_HEADER_MAX_OFFSET = 1024;
 const MINIMAL_DOCTYPE = "<!DOCTYPE html>";
-const UNHIDDEN_FACE_WARNING_MESSAGE = "SingleFile: the archive was written without a face, its data names every wrapper tag:";
+const UNHIDDEN_FACE_WARNING_MESSAGE = "SingleFile: the page data contains every HTML tag that could hide an embedded file, the archive was written without its";
+const EMBEDDED_IMAGE_LABEL = "PNG image";
+const EMBEDDED_PDF_LABEL = "PDF document";
 const LOCAL_FILE_HEADER_SIGNATURE = 0x04034b50;
 const CENTRAL_FILE_HEADER_SIGNATURE = 0x02014b50;
 const END_OF_CENTRAL_DIR_SIGNATURE = 0x06054b50;
@@ -181,7 +183,7 @@ async function createArchive(pageData, options, script, writeEntries, lastModDat
 	if (options.embeddedImage && options.selfExtractingArchive) {
 		imageChunk = getImageHTMLChunk(pageData, options, lastModDate);
 		if (!imageChunk) {
-			dropUnhiddenFace(options, "embeddedImage");
+			dropUnhiddenFace(options, "embeddedImage", EMBEDDED_IMAGE_LABEL);
 		}
 	}
 	if (options.embeddedImage) {
@@ -582,7 +584,7 @@ function getStartHTMLArray(pageData, options, lastModDate, startTag = "") {
 		const embeddedPdfText = TEXT_DECODER.decode(localHeader) + TEXT_DECODER.decode(embeddedPdf);
 		const pdfTagIndex = findEmbeddedDataTagIndex(embeddedPdfText);
 		if (pdfTagIndex == -1) {
-			dropUnhiddenFace(options, "embeddedPdf");
+			dropUnhiddenFace(options, "embeddedPdf", EMBEDDED_PDF_LABEL);
 			pdfEntry = undefined;
 		} else {
 			const [pdfStartTag, pdfEndTag] = EMBEDDED_DATA_TAGS[pdfTagIndex];
@@ -704,9 +706,9 @@ function getEmbeddedImageData(embeddedImage) {
 	return embeddedImage.slice(PNG_SIGNATURE_LENGTH + PNG_IHDR_LENGTH, embeddedImage.length - PNG_IEND_LENGTH);
 }
 
-function dropUnhiddenFace(options, name) {
+function dropUnhiddenFace(options, name, label) {
 	delete options[name];
-	console.warn(UNHIDDEN_FACE_WARNING_MESSAGE, name); // eslint-disable-line no-console
+	console.warn(UNHIDDEN_FACE_WARNING_MESSAGE, label); // eslint-disable-line no-console
 }
 
 async function writeData(writable, array) {