single-file-core 1.0.67 → 1.0.69

package/common/infobar.js

@@ -193,27 +193,9 @@ function appendInfobar(doc, options, useShadowRoot) {
 			infobarContainer.appendChild(shadowRootContent);
 		} else {
 			const scriptElement = doc.createElement("script");
-			let scriptContent = (refreshInfobarInfo.toString());
-			scriptContent += (extractInfobarData.toString());
-			scriptContent += "refreshInfobarInfo(document, extractInfobarData(document))";
-			scriptContent = scriptContent
-				.replace(/ == /g, "==")
-				.replace(/ > /g, ">")
-				.replace(/ < /g, "<")
-				.replace(/ \+ /g, "+")
-				.replace(/ - /g, "-")
-				.replace(/ = /g, "=")
-				.replace(/ \+= /g, "+=")
-				.replace(/ && /g, "&&")
-				.replace(/ \|\| /g, "||")
-				.replace(/{ /g, "{")
-				.replace(/ }/g, "}")
-				.replace(/, /g, ",")
-				.replace(/; /g, ";")
-				.replace(/ \(/g, "(")
-				.replace(/ \)/g, ")")
-				.replace(/\t/g, "")
-				.replace(/\n/g, "");
+			let scriptContent = refreshInfobarInfo.toString();
+			scriptContent += extractInfobarData.toString();
+			scriptContent += "(" + initInfobar.toString() + ")(document)";
 			scriptElement.textContent = scriptContent;
 			shadowRootContent.appendChild(scriptElement);
 			infobarContainer.innerHTML = shadowRootContent.outerHTML;
@@ -269,6 +251,13 @@ function displayIcon(doc, useShadowRoot) {
 	}
 }
 
+function initInfobar(doc) {
+	const infoData = extractInfobarData(doc);
+	if (infoData && infoData.saveUrl) {
+		refreshInfobarInfo(doc, infoData);
+	}
+}
+
 function createElement(doc, tagName, parentElement) {
 	const element = doc.createElement(tagName);
 	parentElement.appendChild(element);

package/package.json

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

package/processors/frame-tree/content/content-frame-tree.js

@@ -173,7 +173,7 @@ function initRequestSync(message) {
 		if (message.options.userScriptEnabled && waitForUserScript) {
 			waitForUserScript(helper.ON_BEFORE_CAPTURE_EVENT_NAME);
 		}
-		sendInitResponse({ frames: [getFrameData(document, globalThis, windowId, message.options)], sessionId, requestedFrameId: document.documentElement.dataset.requestedFrameId && windowId });
+		sendInitResponse({ frames: [getFrameData(document, globalThis, windowId, message.options, message.scrolling)], sessionId, requestedFrameId: document.documentElement.dataset.requestedFrameId && windowId });
 		if (message.options.userScriptEnabled && waitForUserScript) {
 			waitForUserScript(helper.ON_AFTER_CAPTURE_EVENT_NAME);
 		}
@@ -193,7 +193,7 @@ async function initRequestAsync(message) {
 		if (message.options.userScriptEnabled && waitForUserScript) {
 			await waitForUserScript(helper.ON_BEFORE_CAPTURE_EVENT_NAME);
 		}
-		sendInitResponse({ frames: [getFrameData(document, globalThis, windowId, message.options)], sessionId, requestedFrameId: document.documentElement.dataset.requestedFrameId && windowId });
+		sendInitResponse({ frames: [getFrameData(document, globalThis, windowId, message.options, message.scrolling)], sessionId, requestedFrameId: document.documentElement.dataset.requestedFrameId && windowId });
 		if (message.options.userScriptEnabled && waitForUserScript) {
 			await waitForUserScript(helper.ON_AFTER_CAPTURE_EVENT_NAME);
 		}
@@ -236,6 +236,8 @@ function initResponse(message) {
 				frameData.usedFonts = messageFrameData.usedFonts;
 				frameData.shadowRoots = messageFrameData.shadowRoots;
 				frameData.processed = messageFrameData.processed;
+				frameData.scrollPosition = messageFrameData.scrollPosition;
+				frameData.scrolling = messageFrameData.scrolling;
 			}
 		});
 		const remainingFrames = windowData.frames.filter(frameData => !frameData.processed).length;
@@ -280,7 +282,7 @@ function processFramesAsync(doc, frameElements, options, parentWindowId, session
 	frameElements.forEach((frameElement, frameIndex) => {
 		const windowId = parentWindowId + WINDOW_ID_SEPARATOR + frameIndex;
 		try {
-			sendMessage(frameElement.contentWindow, { method: INIT_REQUEST_MESSAGE, windowId, sessionId, options });
+			sendMessage(frameElement.contentWindow, { method: INIT_REQUEST_MESSAGE, windowId, sessionId, options, scrolling: frameElement.scrolling });
 		} catch (error) {
 			// ignored
 		}
@@ -305,7 +307,7 @@ function processFramesSync(doc, frameElements, options, parentWindowId, sessionI
 				frameWindow.stop();
 				clearFrameTimeout("requestTimeouts", sessionId, windowId);
 				processFrames(frameDoc, options, windowId, sessionId);
-				frames.push(getFrameData(frameDoc, frameWindow, windowId, options));
+				frames.push(getFrameData(frameDoc, frameWindow, windowId, options, frameElement.scrolling));
 			} catch (error) {
 				frames.push({ windowId, processed: true });
 			}
@@ -384,7 +386,7 @@ function sendMessage(targetWindow, message, useChannel) {
 	}
 }
 
-function getFrameData(document, globalThis, windowId, options) {
+function getFrameData(document, globalThis, windowId, options, scrolling) {
 	const docData = helper.preProcessDoc(document, globalThis, options);
 	const content = helper.serialize(document);
 	helper.postProcessDoc(document, docData.markedElements, docData.invalidElements);
@@ -403,6 +405,8 @@ function getFrameData(document, globalThis, windowId, options) {
 		videos: docData.videos,
 		usedFonts: docData.usedFonts,
 		shadowRoots: docData.shadowRoots,
+		scrollPosition: docData.scrollPosition,
+		scrolling,
 		processed: true
 	};
 }

package/single-file-core.js

@@ -114,6 +114,7 @@ const STAGES = [{
 		{ option: "removeFrames", action: "removeFrames" },
 		{ action: "removeDiscardedResources" },
 		{ option: "removeHiddenElements", action: "removeHiddenElements" },
+		{ action: "saveScrollPosition" },
 		{ action: "resolveHrefs" },
 		{ action: "resolveStyleAttributeURLs" }
 	],
@@ -494,6 +495,10 @@ class Processor {
 			);
 			this.doc.documentElement.insertBefore(commentNode, this.doc.documentElement.firstChild);
 		}
+		const legacyInfobarElement = this.doc.querySelector("singlefile-infobar");
+		if (legacyInfobarElement) {
+			legacyInfobarElement.remove();
+		}
 		if (this.options.includeInfobar) {
 			util.appendInfobar(this.doc, this.options);
 		}
@@ -880,6 +885,14 @@ class Processor {
 		this.doc.head.appendChild(faviconElement);
 	}
 
+	saveScrollPosition() {
+		if (this.options.scrollPosition && this.options.scrolling == "no" && (this.options.scrollPosition.x || this.options.scrollPosition.y)) {
+			const scriptElement = this.doc.createElement("script");
+			scriptElement.textContent = "document.currentScript.remove();addEventListener(\"load\",()=>scrollTo(" + this.options.scrollPosition.x + "," + this.options.scrollPosition.y + "))";
+			this.doc.body.appendChild(scriptElement);
+		}
+	}
+
 	replaceCanvasElements() {
 		if (this.options.canvases) {
 			this.doc.querySelectorAll("canvas").forEach(canvasElement => {
@@ -1130,6 +1143,7 @@ class Processor {
 			options.insertCanonicalLink = false;
 			options.insertMetaNoIndex = false;
 			options.saveFavicon = false;
+			options.includeInfobar = false;
 			options.url = frameData.baseURI;
 			options.windowId = frameWindowId;
 			if (frameData.content) {
@@ -1142,6 +1156,8 @@ class Processor {
 				options.videos = frameData.videos;
 				options.usedFonts = frameData.usedFonts;
 				options.shadowRoots = frameData.shadowRoots;
+				options.scrollPosition = frameData.scrollPosition;
+				options.scrolling = frameData.scrolling;
 				frameData.runner = new Runner(options);
 				frameData.frameElement = frameElement;
 				await frameData.runner.loadPage();

package/single-file-helper.js

@@ -182,7 +182,8 @@ function preProcessDoc(doc, win, options) {
 		shadowRoots: elementsInfo.shadowRoots,
 		referrer: doc.referrer,
 		markedElements: elementsInfo.markedElements,
-		invalidElements
+		invalidElements,
+		scrollPosition: { x: win.scrollX, y: win.scrollY }
 	};
 }