single-file-core 1.0.51 → 1.0.52

package/common/content-infobar-web.js

@@ -143,7 +143,7 @@
 		if (singleFileComment && isSingleFileComment(singleFileComment)) {
 			const info = singleFileComment.textContent.split("\n");
 			const [, , urlData, ...optionalData] = info;
-			const urlMatch = urlData.match(/^ url: (.*) $/);
+			const urlMatch = urlData.match(/^ url: (.*) ?$/);
 			const url = urlMatch && urlMatch[1];
 			if (url) {
 				let options;

package/package.json

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

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

@@ -226,6 +226,7 @@ function initResponse(message) {
 				frameData.content = messageFrameData.content;
 				frameData.baseURI = messageFrameData.baseURI;
 				frameData.title = messageFrameData.title;
+				frameData.url = messageFrameData.url;
 				frameData.canvases = messageFrameData.canvases;
 				frameData.fonts = messageFrameData.fonts;
 				frameData.stylesheets = messageFrameData.stylesheets;
@@ -392,6 +393,7 @@ function getFrameData(document, globalThis, windowId, options) {
 		windowId,
 		content,
 		baseURI,
+		url: document.location.href,
 		title: document.title,
 		canvases: docData.canvases,
 		fonts: docData.fonts,

package/processors/hooks/content/content-hooks-frames-web.js

@@ -317,6 +317,7 @@
 			return new FontFace(...arguments);
 		};
 		globalThis.FontFace.prototype = FontFace.prototype;
+		globalThis.FontFace.toString = function () { return "function FontFace() { [native code] }"; };
 		const deleteFont = document.fonts.delete;
 		document.fonts.delete = function (fontFace) {
 			getDetailObject(fontFace.family).then(detail => dispatchEvent(new CustomEvent(DELETE_FONT_EVENT, { detail })));

package/single-file-core.js

@@ -1798,7 +1798,15 @@ class ProcessorHelper {
 									if (removeElementIfMissing && content == util.EMPTY_RESOURCE) {
 										resourceElement.remove();
 									} else if (content !== util.EMPTY_RESOURCE) {
-										const forbiddenPrefixFound = PREFIXES_FORBIDDEN_DATA_URI.filter(prefixDataURI => content.startsWith(prefixDataURI)).length;
+										let forbiddenPrefixFound = PREFIXES_FORBIDDEN_DATA_URI.filter(prefixDataURI => content.startsWith(prefixDataURI)).length;
+										if (forbiddenPrefixFound) {
+											forbiddenPrefixFound = await new Promise((resolve) => {
+												const element = options.doc.createElement(resourceElement.tagName);
+												element.setAttribute(attributeName, content);
+												element.onload = () => resolve();
+												element.onerror = () => resolve(true);
+											});
+										}
 										if (!forbiddenPrefixFound) {
 											const isSVG = content.startsWith(PREFIX_DATA_URI_IMAGE_SVG);
 											const maxSizeDuplicateImages = options.maxSizeDuplicateImages || SINGLE_FILE_VARIABLE_MAX_SIZE;

package/single-file.js

@@ -55,20 +55,30 @@ async function getPageData(options = {}, initOptions, doc = globalThis.document,
 		helper.initDoc(doc);
 		const preInitializationPromises = [];
 		if (!options.saveRawPage) {
-			if (!options.removeFrames && frames && globalThis.frames && globalThis.frames.length) {
+			if (options.loadDeferredImages) {
+				if (options.loadDeferredImagesBeforeFrames) {
+					await processors.lazy.process(options);
+				} else {
+					preInitializationPromises.push(processors.lazy.process(options));
+				}
+			}
+			if (!options.removeFrames && frames && globalThis.frames) {
 				let frameTreePromise;
 				if (options.loadDeferredImages) {
-					frameTreePromise = new Promise(resolve => globalThis.setTimeout(() => resolve(frames.getAsync(options)), options.loadDeferredImagesMaxIdleTime - frames.TIMEOUT_INIT_REQUEST_MESSAGE));
+					frameTreePromise = new Promise(resolve => globalThis.setTimeout(() => resolve(frames.getAsync(options)), options.loadDeferredImagesBeforeFrames ? 0 : options.loadDeferredImagesMaxIdleTime / 2));
 				} else {
 					frameTreePromise = frames.getAsync(options);
 				}
-				preInitializationPromises.push(frameTreePromise);
-			}
-			if (options.loadDeferredImages) {
-				preInitializationPromises.push(processors.lazy.process(options));
+				if (options.loadDeferredImagesBeforeFrames) {
+					options.frames = await frameTreePromise;
+				} else {
+					preInitializationPromises.push(frameTreePromise);
+				}
 			}
 		}
-		[options.frames] = await Promise.all(preInitializationPromises);
+		if (!options.loadDeferredImagesBeforeFrames) {
+			[,options.frames] = await Promise.all(preInitializationPromises);
+		}
 		framesSessionId = options.frames && options.frames.sessionId;
 	}
 	options.doc = doc;