single-file-core 1.6.2 → 1.6.3

package/core/filename.js

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2022 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.
+ */
+
+const DEFAULT_REPLACED_CHARACTERS = ["~", "+", "?", "%", "*", ":", "|", "\"", "<", ">", "\\\\", "\x00-\x1f", "\x7F"];
+const DEFAULT_REPLACEMENT_CHARACTER = "_";
+const DEFAULT_REPLACEMENT_CHARACTERS = ["～", "＋", "？", "％", "＊", "：", "｜", "＂", "＜", "＞", "＼"];
+const CHARACTER_CLASS_SPECIAL_CHARACTERS = ["[", "]", "^", "-", "\\"];
+
+export {
+	getValidFilename,
+	DEFAULT_REPLACED_CHARACTERS,
+	DEFAULT_REPLACEMENT_CHARACTER,
+	DEFAULT_REPLACEMENT_CHARACTERS
+};
+
+function getValidFilename(filename, replacedCharacters = DEFAULT_REPLACED_CHARACTERS, replacementCharacter = DEFAULT_REPLACEMENT_CHARACTER, replacementCharacters = DEFAULT_REPLACEMENT_CHARACTERS) {
+	replacementCharacters.forEach((indexReplacementCharacter, index) => {
+		if (indexReplacementCharacter && replacedCharacters[index] !== undefined && indexReplacementCharacter != replacedCharacters[index]) {
+			// no "+" here, unlike the fallback below: a lookalike replaces its character one for
+			// one, so collapsing a run would drop characters the name needs ("C++" -> "C＋")
+			filename = filename.replace(new RegExp("[" + getCharacterClassContent(replacedCharacters[index]) + "]", "g"), indexReplacementCharacter);
+		}
+	});
+	replacedCharacters.forEach((replacedCharacter, index) => {
+		if (!replacementCharacters[index]) {
+			filename = filename.replace(new RegExp("[" + getCharacterClassContent(replacedCharacter) + "]+", "g"), replacementCharacter);
+		}
+	});
+	filename = filename
+		.replace(/\.\.\//g, "")
+		.replace(/^\/+/, "")
+		.replace(/\/+/g, "/")
+		.replace(/\/$/, "")
+		.replace(/\.$/, "")
+		.replace(/\.\//g, "." + replacementCharacter)
+		.replace(/\/\./g, "/" + replacementCharacter);
+	return filename;
+}
+
+function getCharacterClassContent(characters) {
+	return characters.length == 1 && CHARACTER_CLASS_SPECIAL_CHARACTERS.includes(characters) ? "\\" + characters : characters;
+}

package/core/helper.js

@@ -32,6 +32,12 @@ import {
 	MESSAGE_PREFIX,
 	NO_SCRIPT_PROPERTY_NAME
 } from "./constants.js";
+import {
+	getValidFilename,
+	DEFAULT_REPLACED_CHARACTERS,
+	DEFAULT_REPLACEMENT_CHARACTER,
+	DEFAULT_REPLACEMENT_CHARACTERS
+} from "./filename.js";
 
 const ON_BEFORE_CAPTURE_EVENT_NAME = SINGLE_FILE_PREFIX + "on-before-capture";
 const ON_AFTER_CAPTURE_EVENT_NAME = SINGLE_FILE_PREFIX + "on-after-capture";
@@ -77,10 +83,6 @@ const INFOBAR_TAGNAME = infobar.INFOBAR_TAGNAME;
 const EMPTY_RESOURCE = "data:,";
 const POSTER_CONTENT_TYPES = ["image/webp", "image/jpeg"];
 const POSTER_QUALITY = 0.8;
-const DEFAULT_REPLACED_CHARACTERS = ["~", "+", "?", "%", "*", ":", "|", "\"", "<", ">", "\\\\", "\x00-\x1f", "\x7F"];
-const DEFAULT_REPLACEMENT_CHARACTER = "_";
-const DEFAULT_REPLACEMENT_CHARACTERS = ["～", "＋", "？", "％", "＊", "：", "｜", "＂", "＜", "＞", "＼"];
-const CHARACTER_CLASS_SPECIAL_CHARACTERS = ["[", "]", "^", "-", "\\"];
 const NESTING_TRACK_ID_ATTRIBUTE_NAME = "data-sf-nesting-track-id";
 const DEPRECATED_OPTION_NAMES = {
 	loadDeferredImages: "loadDeferredContent",
@@ -927,34 +929,6 @@ function getComputedStyle(win, element, pseudoElement) {
 	}
 }
 
-function getValidFilename(filename, replacedCharacters = DEFAULT_REPLACED_CHARACTERS, replacementCharacter = DEFAULT_REPLACEMENT_CHARACTER, replacementCharacters = DEFAULT_REPLACEMENT_CHARACTERS) {
-	replacementCharacters.forEach((indexReplacementCharacter, index) => {
-		if (indexReplacementCharacter && replacedCharacters[index] !== undefined && indexReplacementCharacter != replacedCharacters[index]) {
-			// no "+" here, unlike the fallback below: a lookalike replaces its character one for
-			// one, so collapsing a run would drop characters the name needs ("C++" -> "C＋")
-			filename = filename.replace(new RegExp("[" + getCharacterClassContent(replacedCharacters[index]) + "]", "g"), indexReplacementCharacter);
-		}
-	});
-	replacedCharacters.forEach((replacedCharacter, index) => {
-		if (!replacementCharacters[index]) {
-			filename = filename.replace(new RegExp("[" + getCharacterClassContent(replacedCharacter) + "]+", "g"), replacementCharacter);
-		}
-	});
-	filename = filename
-		.replace(/\.\.\//g, "")
-		.replace(/^\/+/, "")
-		.replace(/\/+/g, "/")
-		.replace(/\/$/, "")
-		.replace(/\.$/, "")
-		.replace(/\.\//g, "." + replacementCharacter)
-		.replace(/\/\./g, "/" + replacementCharacter);
-	return filename;
-}
-
-function getCharacterClassContent(characters) {
-	return characters.length == 1 && CHARACTER_CLASS_SPECIAL_CHARACTERS.includes(characters) ? "\\" + characters : characters;
-}
-
 function parseDocContent(content, baseURI) {
 	const doc = (new DOMParser()).parseFromString(content, "text/html");
 	if (!doc.head) {

package/package.json

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

package/processors/compression/compression-constants.js

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2022 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.
+ */
+
+const DEFAULT_MAX_APPENDED_DATA_LENGTH = 16361;
+
+export {
+	DEFAULT_MAX_APPENDED_DATA_LENGTH
+};

package/processors/compression/compression.js

@@ -39,6 +39,9 @@ import {
 import {
 	router
 } from "./compression-router.js";
+import {
+	DEFAULT_MAX_APPENDED_DATA_LENGTH
+} from "./compression-constants.js";
 
 const { Blob, fetch, TextEncoder, DOMParser } = globalThis;
 
@@ -89,7 +92,6 @@ const PNG_SIGNATURE_LENGTH = 8;
 const PNG_IHDR_LENGTH = 25;
 const COMMENT_LENGTH_FIELD_LENGTH = 2;
 const MAX_ZIP_COMMENT_LENGTH = 65535;
-const DEFAULT_MAX_APPENDED_DATA_LENGTH = 16361;
 const PDF_ENTRY_FILENAME = "page.pdf";
 const PRESCAN_WINDOW_LENGTH = 1024;
 const PNG_TEXT_CHUNK_HEADER_LENGTH = 12;