removed base64.js

extension/core/bg/script-loader.js

@@ -25,7 +25,6 @@ singlefile.scriptLoader = (() => {
 	const contentScriptFiles = [
 		"/lib/browser-polyfill/custom-browser-polyfill.js",
 		"/lib/single-file/util/timeout.js",
-		"/lib/single-file/vendor/base64.js",
 		"/lib/single-file/vendor/css-tree.js",
 		"/lib/single-file/vendor/html-srcset-parser.js",
 		"/lib/single-file/doc-helper.js",

lib/single-file/single-file-browser.js

@@ -18,7 +18,7 @@
  *   along with SingleFile.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* global SingleFileCore, DOMParser, URL, setTimeout, TextDecoder, Blob, fetch, base64, superFetch, srcsetParser, cssMinifier, htmlMinifier, cssRulesMinifier, fontsMinifier, serializer, docHelper, mediasMinifier, TextEncoder, crypto, matchedRules, imagesMinifier, FontFace, cssTree */
+/* global SingleFileCore, DOMParser, URL, setTimeout, TextDecoder, Blob, fetch, FileReader, superFetch, srcsetParser, cssMinifier, htmlMinifier, cssRulesMinifier, fontsMinifier, serializer, docHelper, mediasMinifier, TextEncoder, crypto, matchedRules, imagesMinifier, FontFace, cssTree */
 
 this.SingleFile = this.SingleFile || (() => {
 
@@ -94,7 +94,12 @@ this.SingleFile = this.SingleFile || (() => {
 					if (DEBUG) {
 						log("  // ENDED   download url =", resourceURL, "delay =", Date.now() - startTime);
 					}
-					const dataURI = "data:" + (contentType || "") + ";" + "base64," + base64.fromByteArray(new Uint8Array(buffer));
+					const reader = new FileReader();
+					reader.readAsDataURL(new Blob([buffer], { type: contentType }));
+					const dataURI = await new Promise((resolve, reject) => {
+						reader.addEventListener("load", () => resolve(reader.result), false);
+						reader.addEventListener("error", reject, false);
+					});
 					if (options.maxResourceSizeEnabled && buffer.byteLength > options.maxResourceSize * ONE_MB) {
 						return "data:base64,";
 					} else {

lib/single-file/vendor/base64.js

@@ -1,183 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Copyright (c) 2018
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
-*/
-
-// derived from https://github.com/beatgammit/base64-js
-
-this.base64 = this.base64 || (() => {
-
-	const lookup = [];
-	const revLookup = [];
-	const Arr = typeof Uint8Array !== "undefined" ? Uint8Array : Array;
-
-	const code = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	for (let i = 0, len = code.length; i < len; ++i) {
-		lookup[i] = code[i];
-		revLookup[code.charCodeAt(i)] = i;
-	}
-
-	// Support decoding URL-safe base64 strings, as Node.js does.
-	// See: https://en.wikipedia.org/wiki/Base64#URL_applications
-	revLookup["-".charCodeAt(0)] = 62;
-	revLookup["_".charCodeAt(0)] = 63;
-
-	function getLens(b64) {
-		const len = b64.length;
-
-		if (len % 4 > 0) {
-			throw new Error("Invalid string. Length must be a multiple of 4");
-		}
-
-		// Trim off extra bytes after placeholder bytes are found
-		// See: https://github.com/beatgammit/base64-js/issues/42
-		let validLen = b64.indexOf("=");
-		if (validLen === -1) validLen = len;
-
-		const placeHoldersLen = validLen === len
-			? 0
-			: 4 - (validLen % 4);
-
-		return [validLen, placeHoldersLen];
-	}
-
-	// base64 is 4/3 + up to two characters of the original data
-	function byteLength(b64) {
-		const lens = getLens(b64);
-		const validLen = lens[0];
-		const placeHoldersLen = lens[1];
-		return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen;
-	}
-
-	function _byteLength(b64, validLen, placeHoldersLen) {
-		return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen;
-	}
-
-	function toByteArray(b64) {
-		let tmp;
-		const lens = getLens(b64);
-		const validLen = lens[0];
-		const placeHoldersLen = lens[1];
-
-		const arr = new Arr(_byteLength(b64, validLen, placeHoldersLen));
-
-		let curByte = 0;
-
-		// if there are placeholders, only get up to the last complete 4 chars
-		const len = placeHoldersLen > 0
-			? validLen - 4
-			: validLen;
-
-		let i;
-
-		for (i = 0; i < len; i += 4) {
-			tmp =
-				(revLookup[b64.charCodeAt(i)] << 18) |
-				(revLookup[b64.charCodeAt(i + 1)] << 12) |
-				(revLookup[b64.charCodeAt(i + 2)] << 6) |
-				revLookup[b64.charCodeAt(i + 3)];
-			arr[curByte++] = (tmp >> 16) & 0xFF;
-			arr[curByte++] = (tmp >> 8) & 0xFF;
-			arr[curByte++] = tmp & 0xFF;
-		}
-
-		if (placeHoldersLen === 2) {
-			tmp =
-				(revLookup[b64.charCodeAt(i)] << 2) |
-				(revLookup[b64.charCodeAt(i + 1)] >> 4);
-			arr[curByte++] = tmp & 0xFF;
-		}
-
-		if (placeHoldersLen === 1) {
-			tmp =
-				(revLookup[b64.charCodeAt(i)] << 10) |
-				(revLookup[b64.charCodeAt(i + 1)] << 4) |
-				(revLookup[b64.charCodeAt(i + 2)] >> 2);
-			arr[curByte++] = (tmp >> 8) & 0xFF;
-			arr[curByte++] = tmp & 0xFF;
-		}
-
-		return arr;
-	}
-
-	function tripletToBase64(num) {
-		return lookup[num >> 18 & 0x3F] +
-			lookup[num >> 12 & 0x3F] +
-			lookup[num >> 6 & 0x3F] +
-			lookup[num & 0x3F];
-	}
-
-	function encodeChunk(uint8, start, end) {
-		let tmp;
-		let output = "";
-		for (let i = start; i < end; i += 3) {
-			tmp =
-				((uint8[i] << 16) & 0xFF0000) +
-				((uint8[i + 1] << 8) & 0xFF00) +
-				(uint8[i + 2] & 0xFF);
-			output += tripletToBase64(tmp);
-		}
-		return output;
-	}
-
-	function fromByteArray(uint8) {
-		let tmp;
-		const len = uint8.length;
-		const extraBytes = len % 3; // if we have 1 byte left, pad 2 bytes
-		const parts = [];
-		const maxChunkLength = 196608; // must be multiple of 3
-
-		// go through the array every three bytes, we"ll deal with trailing stuff later
-		for (let i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
-			parts.push(encodeChunk(
-				uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength)
-			));
-		}
-
-		// pad the end with zeros, but make sure to not forget the extra bytes
-		if (extraBytes === 1) {
-			tmp = uint8[len - 1];
-			parts.push(
-				lookup[tmp >> 2] +
-				lookup[(tmp << 4) & 0x3F] +
-				"=="
-			);
-		} else if (extraBytes === 2) {
-			tmp = (uint8[len - 2] << 8) + uint8[len - 1];
-			parts.push(
-				lookup[tmp >> 10] +
-				lookup[(tmp >> 4) & 0x3F] +
-				lookup[(tmp << 2) & 0x3F] +
-				"="
-			);
-		}
-
-		return parts.join("");
-	}
-
-	return {
-		byteLength,
-		toByteArray,
-		fromByteArray
-	};
-
-})();

manifest.json

@@ -62,7 +62,6 @@
 			"extension/ui/bg/ui-menu.js",
 			"extension/ui/bg/ui-button.js",
 			"extension/ui/bg/ui-autosave.js",
-			"lib/single-file/vendor/base64.js",
 			"lib/single-file/vendor/css-minifier.js",
 			"lib/single-file/vendor/css-tree.js",
 			"lib/single-file/vendor/css-media-query-parser.js",