فهرست منبع

removed font validation

Former-commit-id: 58b9b963f1b2a2ad1c94f164c7b233a521841826
Gildas 6 سال پیش
والد
کامیت
c27ee4afd8
4فایلهای تغییر یافته به همراه0 افزوده شده و 36 حذف شده
  1. 0 6
      cli/back-ends/jsdom.js
  2. 0 12
      lib/single-file/single-file-core.js
  3. 0 3
      lib/single-file/single-file-util.js
  4. 0 15
      lib/single-file/single-file.js

+ 0 - 6
cli/back-ends/jsdom.js

@@ -142,7 +142,6 @@ function getSingleFileClass(win) {
 	};
 	const domUtil = {
 		getResourceContent,
-		isValidFontUrl,
 		digestText
 	};
 	return win.singlefile.lib.core.getClass(win.singlefile.lib.util.getInstance(modules, domUtil), win.singlefile.lib.vendor.cssTree);
@@ -154,11 +153,6 @@ async function digestText(algo, text) {
 	return hash.digest("hex");
 }
 
-function isValidFontUrl(/* urlFunction */) {
-	// TODO?
-	return true;
-}
-
 async function getResourceContent(resourceURL, options) {
 	const resourceContent = await request({
 		method: "GET",

+ 0 - 12
lib/single-file/single-file-core.js

@@ -1263,7 +1263,6 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 	const ABOUT_BLANK_URI = "about:blank";
 	const EMPTY_DATA_URI = "data:base64,";
 	const REGEXP_URL_HASH = /(#.+?)$/;
-	const PREFIX_DATA_URI_VND = "data:application/vnd.";
 	const SINGLE_FILE_VARIABLE_NAME_PREFIX = "--sf-img-";
 
 	class ProcessorHelper {
@@ -1484,19 +1483,8 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
 							if (!Util.testIgnoredPath(resourceURL)) {
 								if (Util.testValidURL(resourceURL)) {
 									let { content } = await batchRequest.addURL(resourceURL, true);
-									if (content != EMPTY_DATA_URI && !content.startsWith(PREFIX_DATA_URI_VND) && !content.startsWith(PREFIX_DATA_URI_IMAGE_SVG)) {
-										const validResource = await util.validFont(urlFunction);
-										if (!validResource) {
-											content = EMPTY_DATA_URI;
-										}
-									}
 									replaceURLs(declaration, originalResourceURL, content);
 								}
-							} else if (resourceURL.startsWith(DATA_URI_PREFIX) && !resourceURL.startsWith(PREFIX_DATA_URI_VND) && !resourceURL.startsWith(PREFIX_DATA_URI_IMAGE_SVG)) {
-								const validResource = await util.validFont(urlFunction);
-								if (!validResource) {
-									replaceURLs(declaration, originalResourceURL, EMPTY_DATA_URI);
-								}
 							}
 						}));
 					}

+ 0 - 3
lib/single-file/single-file-util.js

@@ -86,9 +86,6 @@ this.singlefile.lib.util = this.singlefile.lib.util || (() => {
 				async digest(algo, text) {
 					return util.digestText(algo, text);
 				},
-				async validFont(urlFunction) {
-					return util.isValidFontUrl(urlFunction);
-				},
 				getContentSize(content) {
 					return new Blob([content]).size;
 				},

+ 0 - 15
lib/single-file/single-file.js

@@ -24,10 +24,8 @@
 /* global	
 	crypto,
 	fetch, 
-	setTimeout, 
 	Blob, 
 	FileReader, 
-	FontFace,	
 	TextDecoder,
 	TextEncoder */
 
@@ -35,8 +33,6 @@ this.singlefile.lib.SingleFile = this.singlefile.lib.SingleFile || (() => {
 
 	const singlefile = this.singlefile;
 
-	const FONT_FACE_TEST_MAX_DELAY = 1000;
-
 	const modules = {
 		helper: singlefile.lib.helper,
 		srcsetParser: singlefile.lib.vendor.srcsetParser,
@@ -52,7 +48,6 @@ this.singlefile.lib.SingleFile = this.singlefile.lib.SingleFile || (() => {
 	};
 	const util = {
 		getResourceContent,
-		isValidFontUrl,
 		digestText
 	};
 	const SingleFile = singlefile.lib.core.getClass(singlefile.lib.util.getInstance(modules, util), singlefile.lib.vendor.cssTree);
@@ -113,14 +108,4 @@ this.singlefile.lib.SingleFile = this.singlefile.lib.SingleFile || (() => {
 		return hexCodes.join("");
 	}
 
-	async function isValidFontUrl(urlFunction) {
-		try {
-			const font = new FontFace("font-test", urlFunction);
-			await Promise.race([font.load(), new Promise(resolve => setTimeout(() => resolve(true), FONT_FACE_TEST_MAX_DELAY))]);
-			return true;
-		} catch (error) {
-			return false;
-		}
-	}
-
 })();