single-file-core 1.5.39 → 1.5.41

package/core/helper.js

@@ -76,6 +76,9 @@ const COMMENT_HEADER_LEGACY = "Archive processed by SingleFile";
 const SINGLE_FILE_UI_ELEMENT_CLASS = "single-file-ui-element";
 const INFOBAR_TAGNAME = infobar.INFOBAR_TAGNAME;
 const EMPTY_RESOURCE = "data:,";
+const DEFAULT_REPLACED_CHARACTERS = ["~", "+", "?", "%", "*", ":", "|", "\"", "<", ">", "\\\\", "\x00-\x1f", "\x7F"];
+const DEFAULT_REPLACEMENT_CHARACTER = "_";
+const DEFAULT_REPLACEMENT_CHARACTERS = ["～", "＋", "？", "％", "＊", "：", "｜", "＂", "＜", "＞", "＼"];
 const addEventListener = (type, listener, options) => globalThis.addEventListener(type, listener, options);
 const dispatchEvent = event => { try { globalThis.dispatchEvent(event); } catch (error) {  /* ignored */ } };
 const JSON = globalThis.JSON;
@@ -100,6 +103,7 @@ export {
 	appendInfobar,
 	getContentSize,
 	digest,
+	getValidFilename,
 	ON_BEFORE_CAPTURE_EVENT_NAME,
 	ON_AFTER_CAPTURE_EVENT_NAME,
 	WIN_ID_ATTRIBUTE_NAME,
@@ -718,4 +722,18 @@ function getComputedStyle(win, element, pseudoElement) {
 	} catch (error) {
 		// ignored
 	}
+}
+
+function getValidFilename(filename, replacedCharacters = DEFAULT_REPLACED_CHARACTERS, replacementCharacter = DEFAULT_REPLACEMENT_CHARACTER, replacementCharacters = DEFAULT_REPLACEMENT_CHARACTERS) {
+	replacementCharacters.forEach((_, index) => filename = filename.replace(new RegExp("[" + replacedCharacters[index] + "]+", "g"), replacementCharacters[index]));
+	replacedCharacters.forEach(replacedCharacter => filename = filename.replace(new RegExp("[" + replacedCharacter + "]+", "g"), replacementCharacter));
+	filename = filename
+		.replace(/\.\.\//g, "")
+		.replace(/^\/+/, "")
+		.replace(/\/+/g, "/")
+		.replace(/\/$/, "")
+		.replace(/\.$/, "")
+		.replace(/\.\//g, "." + replacementCharacter)
+		.replace(/\/\./g, "/" + replacementCharacter);
+	return filename;
 }

package/core/index.js

@@ -383,7 +383,7 @@ class BatchRequest {
 				});
 				await onloadListener({ url: resourceURL });
 				if (!this.cancelled) {
-					const extension = util.getContentTypeExtension(content.contentType) || util.getFilenameExtension(resourceURL, options.filenameReplacedCharacters, options.filenameReplacementCharacter);
+					const extension = util.getContentTypeExtension(content.contentType) || util.getFilenameExtension(resourceURL, options.filenameReplacedCharacters, options.filenameReplacementCharacter, options.filenameReplacementCharacters);
 					resourceRequests.forEach(callbacks => {
 						const duplicateCallbacks = this.duplicates.get(requestKey);
 						const duplicate = duplicateCallbacks && duplicateCallbacks.length > 1 && duplicateCallbacks.includes(callbacks);
@@ -678,6 +678,7 @@ class Processor {
 				filenameTemplate: this.options.filenameTemplate,
 				filenameReplacedCharacters: this.options.filenameReplacedCharacters,
 				filenameReplacementCharacter: this.options.filenameReplacementCharacter,
+				filenameReplacementCharacters: this.options.filenameReplacementCharacters,
 				filenameMaxLengthUnit: this.options.filenameMaxLengthUnit,
 				filenameMaxLength: this.options.filenameMaxLength,
 				replaceEmojisInFilename: this.options.replaceEmojisInFilename,

package/core/util.js

@@ -30,8 +30,6 @@ import * as helper from "./helper.js";
 const DEBUG = false;
 const ONE_MB = 1024 * 1024;
 const PREFIX_CONTENT_TYPE_TEXT = "text/";
-const DEFAULT_REPLACED_CHARACTERS = ["~", "+", "\\\\", "?", "%", "*", ":", "|", "\"", "<", ">", "\x00-\x1f", "\x7F"];
-const DEFAULT_REPLACEMENT_CHARACTER = "_";
 const CONTENT_TYPE_EXTENSIONS = {
 	"image/svg+xml": ".svg",
 	"image/png": ".png",
@@ -89,14 +87,14 @@ function getInstance(utilOptions) {
 	utilOptions.frameFetch = utilOptions.frameFetch || utilOptions.fetch || fetch;
 	return {
 		getDoctypeString,
-		getFilenameExtension(resourceURL, replacedCharacters, replacementCharacter) {
+		getFilenameExtension(resourceURL, replacedCharacters, replacementCharacter, replacementCharacters) {
 			let matchExtension;
 			try {
 				matchExtension = new URL(resourceURL).pathname.match(/(\.[^\\/.]*)$/);
 			} catch (error) {
 				// ignored
 			}
-			return ((matchExtension && matchExtension[1] && this.getValidFilename(matchExtension[1], replacedCharacters, replacementCharacter)) || "").toLowerCase();
+			return ((matchExtension && matchExtension[1] && this.getValidFilename(matchExtension[1], replacedCharacters, replacementCharacter, replacementCharacters)) || "").toLowerCase();
 		},
 		getContentTypeExtension(contentType) {
 			return CONTENT_TYPE_EXTENSIONS[contentType] || "";
@@ -115,17 +113,8 @@ function getInstance(utilOptions) {
 		getSearchParams(searchParams) {
 			return Array.from(new URLSearchParams(searchParams));
 		},
-		getValidFilename(filename, replacedCharacters = DEFAULT_REPLACED_CHARACTERS, replacementCharacter = DEFAULT_REPLACEMENT_CHARACTER) {
-			replacedCharacters.forEach(replacedCharacter => filename = filename.replace(new RegExp("[" + replacedCharacter + "]+", "g"), replacementCharacter));
-			filename = filename
-				.replace(/\.\.\//g, "")
-				.replace(/^\/+/, "")
-				.replace(/\/+/g, "/")
-				.replace(/\/$/, "")
-				.replace(/\.$/, "")
-				.replace(/\.\//g, "." + replacementCharacter)
-				.replace(/\/\./g, "/" + replacementCharacter);
-			return filename;
+		getValidFilename(filename, replacedCharacters, replacementCharacter, replacementCharacters) {
+			return helper.getValidFilename(filename, replacedCharacters, replacementCharacter, replacementCharacters);
 		},
 		parseDocContent(content, baseURI) {
 			const doc = (new DOMParser()).parseFromString(content, "text/html");

package/modules/template-formatter.js

@@ -24,7 +24,7 @@
 /* global globalThis */
 
 import { parse } from "./template-parser.js";
-import { getContentSize, digest } from "./../core/helper.js";
+import { getContentSize, digest, getValidFilename } from "./../core/helper.js";
 
 const Blob = globalThis.Blob;
 const FileReader = globalThis.FileReader;
@@ -34,8 +34,6 @@ const URLSearchParams = globalThis.URLSearchParams;
 const navigator = globalThis.navigator;
 
 // eslint-disable-next-line quotes
-const DEFAULT_REPLACED_CHARACTERS = ["~", "+", "\\\\", "?", "%", "*", ":", "|", '"', "<", ">", "\x00-\x1f", "\x7F"];
-const DEFAULT_REPLACEMENT_CHARACTER = "_";
 const REGEXP_ESCAPE = /([{}()^$&.*?/+|[\\\\]|\]|-)/g;
 
 const EMOJI_NAMES = {
@@ -16879,8 +16877,8 @@ async function formatFilename(content, doc, options) {
 	if (options.replaceEmojisInFilename) {
 		EMOJIS.forEach(emoji => (filename = replaceAll(filename, emoji, " _" + EMOJI_NAMES[emoji] + "_ ")));
 	}
-	const replacementCharacter = options.filenameReplacementCharacter;
-	filename = getValidFilename(filename, options.filenameReplacedCharacters, replacementCharacter);
+	const { replacementCharacter, filenameReplacedCharacters, replacementCharacters } = options.filenameReplacementCharacter;
+	filename = getValidFilename(filename, filenameReplacedCharacters, replacementCharacter, replacementCharacters);
 	if (!options.backgroundSave) {
 		filename = filename.replace(/\//g, replacementCharacter);
 	}
@@ -16946,6 +16944,7 @@ async function evalTemplate(template = "", options, content, doc, context = {})
 		"url-protocol": { getter: () => url.protocol },
 		"url-search": { getter: () => url.search.substring(1) },
 		"url-username": { getter: () => url.username },
+		"url-original": { getter: () => options.originalUrl },
 		"tab-id": { getter: () => String(options.tabId) },
 		"tab-index": { getter: () => String(options.tabIndex) },
 		"url-last-segment": { getter: () => decode(getLastSegment(url, options.filenameReplacementCharacter)) },
@@ -17212,19 +17211,6 @@ function getLastSegment(url, replacementCharacter) {
 	return lastSegment;
 }
 
-function getValidFilename(filename, replacedCharacters = DEFAULT_REPLACED_CHARACTERS, replacementCharacter = DEFAULT_REPLACEMENT_CHARACTER) {
-	replacedCharacters.forEach(replacedCharacter => (filename = filename.replace(new RegExp("[" + replacedCharacter + "]+", "g"), replacementCharacter)));
-	filename = filename
-		.replace(/\.\.\//g, "")
-		.replace(/^\/+/, "")
-		.replace(/\/+/g, "/")
-		.replace(/\/$/, "")
-		.replace(/\.$/, "")
-		.replace(/\.\//g, "." + replacementCharacter)
-		.replace(/\/\./g, "/" + replacementCharacter);
-	return filename;
-}
-
 function truncateText(content, maxSize) {
 	const blob = new Blob([content]);
 	const reader = new FileReader();

package/package.json

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