[pull] master from gildas-lormeau:master

lib/single-file-extension-editor.js

@@ -2125,7 +2125,8 @@ pre code {
 							viewport: viewport ? viewport.content : null,
 							compressContent: true,
 							foregroundSave: message.foregroundSave,
-							sharePage: message.sharePage
+							sharePage: message.sharePage,
+							documentHeight: document.documentElement.offsetHeight
 						}), "*");
 					} else {
 						if (message.foregroundSave || message.sharePage) {
@@ -3018,14 +3019,26 @@ pre code {
 				containerElement.classList.add(className);
 				classesToPreserve.push(className);
 			});
+			const optionsElement = document.querySelector("script[type=\"application/json\"][" + SCRIPT_OPTIONS + "]");
 			const article = new Readability(document, { classesToPreserve }).parse();
+			const articleMetadata = Object.assign({}, article);
+			delete articleMetadata.content;
+			delete articleMetadata.textContent;
+			for (const key in articleMetadata) {
+				if (articleMetadata[key] == null) {
+					delete articleMetadata[key];
+				}
+			}
 			removedElements = [];
 			removedElementIndex = 0;
 			document.body.innerHTML = "";
 			const domParser = new DOMParser();
 			const doc = domParser.parseFromString(article.content, "text/html");
 			const contentEditable = document.body.contentEditable;
 			document.documentElement.replaceChild(doc.body, document.body);
+			if (optionsElement) {
+				document.body.appendChild(optionsElement);
+			}
 			document.querySelectorAll(NOTE_TAGNAME).forEach(containerElement => {
 				const noteId = (Array.from(containerElement.classList).find(className => /singlefile-note-id-\d+/.test(className))).split("singlefile-note-id-")[1];
 				containerElement.classList.remove("singlefile-note-id-" + noteId);
@@ -3057,6 +3070,15 @@ pre code {
 			titleElement.classList.add("reader-title");
 			titleElement.textContent = article.title;
 			document.body.insertBefore(titleElement, document.body.firstChild);
+			const existingMetaDataElement = document.querySelector("script[id=singlefile-readability-metadata]");
+			if (existingMetaDataElement) {
+				existingMetaDataElement.remove();
+			}
+			const metaDataElement = document.createElement("script");
+			metaDataElement.type = "application/json";
+			metaDataElement.id = "singlefile-readability-metadata";
+			metaDataElement.textContent = JSON.stringify(articleMetadata, null, 2);
+			document.head.appendChild(metaDataElement);
 			document.querySelectorAll("a[href]").forEach(element => {
 				const href = element.getAttribute("href").trim();
 				if (href.startsWith(document.baseURI + "#")) {

manifest.json

@@ -9,7 +9,7 @@
 		"64": "src/ui/resources/icon_64.png",
 		"128": "src/ui/resources/icon_128.png"
 	},
-	"version": "1.22.72",
+	"version": "1.22.73",
 	"description": "__MSG_extensionDescription__",
 	"content_scripts": [
 		{

package.json

@@ -10,7 +10,7 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"single-file-core": "1.5.36"
+		"single-file-core": "1.5.41"
 	},
 	"devDependencies": {
 		"rollup": "4.22.4",

src/core/bg/business.js

@@ -99,6 +99,7 @@ async function saveUrls(urls, options = {}) {
 		if (tabOptions.profileName != config.DISABLED_PROFILE_NAME) {
 			Object.keys(options).forEach(key => tabOptions[key] = options[key]);
 			tabOptions.autoClose = true;
+			tabOptions.originalUrl = url;
 			tabOptions.extensionScriptFiles = extensionScriptFiles;
 			if (tabOptions.passReferrerOnError) {
 				requests.enableReferrerOnError();

src/core/bg/config.js

@@ -70,8 +70,9 @@ const DEFAULT_CONFIG = {
 	filenameConflictAction: "uniquify",
 	filenameMaxLength: 192,
 	filenameMaxLengthUnit: "bytes",
-	filenameReplacedCharacters: ["~", "+", "\\\\", "?", "%", "*", ":", "|", "\"", "<", ">", "\x00-\x1f", "\x7F"],
+	filenameReplacedCharacters: ["~", "+", "?", "%", "*", ":", "|", "\"", "<", ">", "\\\\", "\x00-\x1f", "\x7F"],
 	filenameReplacementCharacter: "_",
+	filenameReplacementCharacters: ["～", "＋", "？", "％", "＊", "：", "｜", "＂", "＜", "＞", "＼"],
 	replaceEmojisInFilename: false,
 	saveFilenameTemplateData: false,
 	contextMenuEnabled: true,

src/lib/single-file/browser-polyfill/chrome-browser-polyfill.js

@@ -194,6 +194,7 @@ if (typeof globalThis == "undefined") {
 				})
 			},
 			i18n: {
+				getUILanguage: () => nativeAPI.i18n.getUILanguage(),
 				getMessage: (messageName, substitutions) => nativeAPI.i18n.getMessage(messageName, substitutions)
 			},
 			identity: {

src/ui/bg/ui-editor.js

@@ -274,7 +274,7 @@ function toolbarOnTouchEnd(event) {
 let updatedResources = {};
 
 addEventListener("resize", viewportSizeChange);
-addEventListener("message", event => {
+addEventListener("message", async event => {
 	const message = JSON.parse(event.data);
 	if (message.method == "setContent") {
 		tabData.options.openEditor = false;
@@ -290,35 +290,56 @@ addEventListener("message", event => {
 			if (tabData.insertTextBody !== undefined) {
 				tabData.options.insertTextBody = tabData.insertTextBody;
 			}
-			if (tabData.embeddedImage !== undefined) {
-				tabData.options.embeddedImage = tabData.embeddedImage;
+			if (tabData.embeddedImage !== undefined || tabData.options.insertEmbeddedScreenshotImage) {
+				if (tabData.options.insertEmbeddedScreenshotImage) {
+					toolbarElement.style.display = "none";
+					editorElement.style.height = message.documentHeight + "px";
+					document.documentElement.style.height = message.documentHeight + "px";
+					const infobarElement = document.querySelector(INFOBAR_TAGNAME);
+					if (infobarElement) {
+						infobarElement.style.display = "none";
+					}
+					const screenshotBlobURI = await browser.runtime.sendMessage({
+						method: "tabs.getScreenshot",
+						width: document.documentElement.scrollWidth,
+						height: document.documentElement.scrollHeight,
+						innerHeight: globalThis.innerHeight
+					});
+					tabData.options.embeddedImage = new Uint8Array(await (await fetch(screenshotBlobURI)).arrayBuffer());
+					editorElement.style.height = "";
+					document.documentElement.style.height = "";
+					toolbarElement.style.display = "";
+					if (infobarElement) {
+						infobarElement.style.display = "";
+					}
+				} else {
+					tabData.options.embeddedImage = tabData.embeddedImage;
+				}
 			}
 			if (tabData.insertMetaCSP !== undefined) {
 				tabData.options.insertMetaCSP = tabData.insertMetaCSP;
 			}
-			getContentPageData(tabData.content, message.content, { password: tabData.options.password })
-				.then(pageData => {
-					pageData.content = message.content;
-					pageData.title = message.title;
-					pageData.doctype = message.doctype;
-					pageData.viewport = message.viewport;
-					pageData.url = message.url;
-					pageData.filename = message.filename || tabData.filename;
-					pageData.mimeType = "text/html";
-					if (message.foregroundSave) {
-						tabData.options.backgroundSave = false;
-						tabData.options.foregroundSave = true;
-					}
-					return download.downloadPage(pageData, tabData.options);
-				});
+			const pageData = await getContentPageData(tabData.content, message.content, { password: tabData.options.password });
+			pageData.content = message.content;
+			pageData.title = message.title;
+			pageData.doctype = message.doctype;
+			pageData.viewport = message.viewport;
+			pageData.url = message.url;
+			pageData.filename = message.filename || tabData.filename;
+			pageData.mimeType = "text/html";
+			if (message.foregroundSave) {
+				tabData.options.backgroundSave = false;
+				tabData.options.foregroundSave = true;
+			}
+			await download.downloadPage(pageData, tabData.options);
 		} else {
 			const pageData = {
 				content: message.content,
 				filename: message.filename || tabData.filename,
 				mimeType: "text/html"
 			};
 			tabData.options.compressContent = false;
-			download.downloadPage(pageData, tabData.options);
+			await download.downloadPage(pageData, tabData.options);
 		}
 	}
 	if (message.method == "onUpdate") {
@@ -372,15 +393,37 @@ addEventListener("message", event => {
 });
 
 browser.runtime.onMessage.addListener(message => {
+	if (message.method == "devtools.resourceCommitted" ||
+		message.method == "content.save" ||
+		message.method == "editor.setTabData" ||
+		message.method == "options.refresh" ||
+		message.method == "content.error" ||
+		message.method == "content.download") {
+		return onMessage(message);
+	}
+});
+
+addEventListener("load", () => {
+	browser.runtime.sendMessage({ method: "editor.getTabData" });
+});
+
+addEventListener("beforeunload", event => {
+	if (tabData.options.warnUnsavedPage && !tabData.docSaved) {
+		event.preventDefault();
+		event.returnValue = "";
+	}
+});
+
+async function onMessage(message) {
 	if (message.method == "devtools.resourceCommitted") {
 		updatedResources[message.url] = { content: message.content, type: message.type, encoding: message.encoding };
-		return Promise.resolve({});
+		return {};
 	}
 	if (message.method == "content.save") {
 		tabData.options = message.options;
 		savePage();
-		browser.runtime.sendMessage({ method: "ui.processInit" });
-		return Promise.resolve({});
+		await browser.runtime.sendMessage({ method: "ui.processInit" });
+		return {};
 	}
 	if (message.method == "editor.setTabData") {
 		if (message.truncated) {
@@ -396,29 +439,21 @@ browser.runtime.onMessage.addListener(message => {
 			editorElement.contentWindow.focus();
 			setInterval(() => browser.runtime.sendMessage({ method: "ping" }), 15000);
 		}
-		return Promise.resolve({});
+		return {};
 	}
 	if (message.method == "options.refresh") {
-		return refreshOptions(message.profileName);
+		await refreshOptions(message.profileName);
+		return {};
 	}
 	if (message.method == "content.error") {
 		onError(message.error, message.link);
+		return {};
 	}
 	if (message.method == "content.download") {
-		return downloadContent(message);
+		await downloadContent(message);
+		return {};
 	}
-});
-
-addEventListener("load", () => {
-	browser.runtime.sendMessage({ method: "editor.getTabData" });
-});
-
-addEventListener("beforeunload", event => {
-	if (tabData.options.warnUnsavedPage && !tabData.docSaved) {
-		event.preventDefault();
-		event.returnValue = "";
-	}
-});
+}
 
 async function downloadContent(message) {
 	if (!downloadParser) {