single-file-core 1.5.22 → 1.5.24

package/core/helper.js

@@ -131,12 +131,31 @@ export {
 };
 
 function initUserScriptHandler() {
-	addEventListener(ON_INIT_USERSCRIPT_EVENT, () => globalThis[WAIT_FOR_USERSCRIPT_PROPERTY_NAME] = async eventPrefixName => {
-		const event = new CustomEvent(eventPrefixName + "-request", { cancelable: true });
-		const promiseResponse = new Promise(resolve => addEventListener(eventPrefixName + "-response", resolve));
+	addEventListener(ON_INIT_USERSCRIPT_EVENT, () => globalThis[WAIT_FOR_USERSCRIPT_PROPERTY_NAME] = async (eventPrefixName, options) => {
+		const userScriptOptions = Object.assign({}, options);
+		delete userScriptOptions.win;
+		delete userScriptOptions.doc;
+		delete userScriptOptions.onprogress;
+		delete userScriptOptions.frames;
+		delete userScriptOptions.taskId;
+		delete userScriptOptions._migratedTemplateFormat;
+		delete userScriptOptions.woleetKey;
+		const event = new CustomEvent(eventPrefixName + "-request", { cancelable: true, detail: { options: userScriptOptions } });
+		let resolvePromiseResponse;
+		const promiseResponse = new Promise(resolve => {
+			resolvePromiseResponse = resolve;
+			addEventListener(eventPrefixName + "-response", event => {
+				if (event.detail && event.detail.options) {
+					Object.assign(options, event.detail.options);
+				}
+				resolve();
+			});
+		});
 		dispatchEvent(event);
 		if (event.defaultPrevented) {
 			await promiseResponse;
+		} else {
+			resolvePromiseResponse();
 		}
 	});
 	new MutationObserver(initUserScriptHandler).observe(globalThis.document, { childList: true });

package/core/index.js

@@ -54,13 +54,13 @@ class SingleFileClass {
 	async run() {
 		const waitForUserScript = globalThis[util.WAIT_FOR_USERSCRIPT_PROPERTY_NAME];
 		if (this.options.userScriptEnabled && waitForUserScript) {
-			await waitForUserScript(util.ON_BEFORE_CAPTURE_EVENT_NAME);
+			await waitForUserScript(util.ON_BEFORE_CAPTURE_EVENT_NAME, this.options);
 		}
 		this.runner = new Runner(this.options, this.processorHelper, true);
 		await this.runner.loadPage();
 		await this.runner.initialize();
 		if (this.options.userScriptEnabled && waitForUserScript) {
-			await waitForUserScript(util.ON_AFTER_CAPTURE_EVENT_NAME);
+			await waitForUserScript(util.ON_AFTER_CAPTURE_EVENT_NAME, this.options);
 		}
 		await this.runner.run();
 	}
@@ -1277,13 +1277,13 @@ class Processor {
 				this.options.frames.push(frameData);
 				frameData.windowId = (this.options.windowId || "0") + "." + this.options.frames.length;
 				frameElement.setAttribute(util.WIN_ID_ATTRIBUTE_NAME, frameData.windowId);
-				await initializeProcessor(frameData, frameElement, null, this.batchRequest, Object.create(this.options));
+				await initializeProcessor(frameData, frameElement, null, this.batchRequest, Object.assign({}, this.options));
 			} else {
 				const frameWindowId = frameElement.getAttribute(util.WIN_ID_ATTRIBUTE_NAME);
 				if (this.options.frames && frameWindowId) {
 					const frameData = this.options.frames.find(frame => frame.windowId == frameWindowId);
 					if (frameData && frameData.content) {
-						await initializeProcessor(frameData, frameElement, frameWindowId, this.batchRequest, Object.create(this.options));
+						await initializeProcessor(frameData, frameElement, frameWindowId, this.batchRequest, Object.assign({}, this.options));
 					}
 				}
 			}

package/core/lib/processor-helper-inline.js

@@ -44,6 +44,7 @@ const SINGLE_FILE_VARIABLE_MAX_SIZE = 512 * 1024;
 const EMPTY_URL_SOURCE = /^url\(["']?data:[^,]*,?["']?\)/;
 const LOCAL_SOURCE = "local(";
 const FONT_MAX_LOAD_DELAY = 5000;
+const DUPLICATE_STYLESHEET_ATTRIBUTE_NAME = "data-sf-duplicate-stylesheet-ref";
 
 let util;
 
@@ -115,6 +116,16 @@ function getProcessorHelperClass(utilInstance) {
 					const styleSheetRefIndex = options.inlineStylesheetsRefs.get(styleElement);
 					if (styleSheetRefIndex === undefined) {
 						styleElement.textContent = this.generateStylesheetContent(stylesheetInfo.stylesheet, options);
+					} else if (options.groupDuplicateStylesheets) {
+						if (!doc.querySelector("style[" + DUPLICATE_STYLESHEET_ATTRIBUTE_NAME + "=\"" + styleSheetRefIndex + "\"]")) {
+							const styleElement = doc.createElement("style");
+							styleElement.textContent = options.inlineStylesheets.get(styleSheetRefIndex);
+							styleElement.setAttribute("media", "not all");
+							styleElement.setAttribute(DUPLICATE_STYLESHEET_ATTRIBUTE_NAME, styleSheetRefIndex);
+							doc.head.appendChild(styleElement);
+						}
+						styleElement.textContent = "/* */";
+						styleElement.setAttribute("onload", "this.textContent=document.querySelector('style[" + DUPLICATE_STYLESHEET_ATTRIBUTE_NAME + "=\"" + styleSheetRefIndex + "\"]').textContent;this.removeAttribute(\"onload\")");
 					} else {
 						styleElement.textContent = options.inlineStylesheets.get(styleSheetRefIndex);
 					}
@@ -125,6 +136,11 @@ function getProcessorHelperClass(utilInstance) {
 					styleElement.remove();
 				}
 			});
+			if (options.groupDuplicateStylesheets) {
+				const scriptElement = doc.createElement("script");
+				scriptElement.textContent = "document.currentScript.remove();addEventListener(\"load\",()=>document.querySelectorAll(\"style[" + DUPLICATE_STYLESHEET_ATTRIBUTE_NAME + "]\").forEach(e=>e.remove()))";
+				doc.body.appendChild(scriptElement);
+			}
 			doc.querySelectorAll("link[rel*=stylesheet]").forEach(linkElement => {
 				const stylesheetInfo = stylesheets.get(linkElement);
 				if (stylesheetInfo) {

package/package.json

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

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

@@ -179,11 +179,11 @@ function initRequestSync(message) {
 	processFrames(document, message.options, windowId, sessionId);
 	if (!TOP_WINDOW) {
 		if (message.options.userScriptEnabled && waitForUserScript) {
-			waitForUserScript(helper.ON_BEFORE_CAPTURE_EVENT_NAME);
+			waitForUserScript(helper.ON_BEFORE_CAPTURE_EVENT_NAME, message.options);
 		}
 		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);
+			waitForUserScript(helper.ON_AFTER_CAPTURE_EVENT_NAME, message.options);
 		}
 		delete document.documentElement.dataset.requestedFrameId;
 	}
@@ -199,11 +199,11 @@ async function initRequestAsync(message) {
 	processFrames(document, message.options, windowId, sessionId);
 	if (!TOP_WINDOW) {
 		if (message.options.userScriptEnabled && waitForUserScript) {
-			await waitForUserScript(helper.ON_BEFORE_CAPTURE_EVENT_NAME);
+			await waitForUserScript(helper.ON_BEFORE_CAPTURE_EVENT_NAME, message.options);
 		}
 		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);
+			await waitForUserScript(helper.ON_AFTER_CAPTURE_EVENT_NAME, message.options);
 		}
 		delete document.documentElement.dataset.requestedFrameId;
 	}