single-file-core 1.2.17 → 1.2.19

package/core/util.js

@@ -35,10 +35,37 @@ const DEFAULT_REPLACEMENT_CHARACTER = "_";
 const CONTENT_TYPE_EXTENSIONS = {
 	"image/svg+xml": ".svg",
 	"image/png": ".png",
-	"image/jpeg": ".jpg",
 	"image/gif": ".gif",
-	"image/webp": ".webp"
+	"image/tiff": ".tiff",
+	"image/bmp": ".bmp",
+	"image/x-icon": ".ico",
+	"image/heif": ".heif",
+	"image/heic": ".heic",
+	"image/avif": ".avif",
+	"image/apng": ".apng",
+	"image/jpeg": ".jpg",
+	"image/webp": ".webp",
+	"audio/mpeg": ".mp3",
+	"audio/ogg": ".ogg",
+	"audio/wav": ".wav",
+	"audio/webm": ".webm",
+	"video/3gpp": ".3gp",
+	"video/3gpp2": ".3g2",
+	"video/mpeg": ".mpeg",
+	"video/quicktime": ".mov",
+	"video/x-msvideo": ".avi",
+	"video/webm": ".webm",
+	"video/ogg": ".ogv",
+	"video/mp4": ".mp4",
+	"video/mp2t": ".ts",
+	"font/otf": ".otf",
+	"font/ttf": ".ttf",
+	"font/woff": ".woff",
+	"font/woff2": ".woff2",
+	"application/vnd.ms-fontobject": ".eot",
+	"font/collection": ".ttc"
 };
+const CONTENT_TYPE_OCTET_STREAM = "application/octet-stream";
 
 const URL = globalThis.URL;
 const DOMParser = globalThis.DOMParser;
@@ -265,8 +292,8 @@ function getInstance(utilOptions) {
 		} catch (error) {
 			// ignored
 		}
-		if (!contentType) {
-			contentType = guessMIMEType(options.expectedType, buffer);
+		if (!contentType || (contentType == CONTENT_TYPE_OCTET_STREAM && options.asBinary)) {
+			contentType = guessMIMEType(options.expectedType, buffer, options.asBinary);
 		}
 		if (!charset && options.charset) {
 			charset = options.charset;
@@ -346,7 +373,7 @@ async function getFetchResponse(resourceURL, options, data, charset, contentType
 	return { data, resourceURL, charset, contentType };
 }
 
-function guessMIMEType(expectedType, buffer) {
+function guessMIMEType(expectedType, buffer, asBinary) {
 	if (expectedType == "image") {
 		if (compareBytes([255, 255, 255, 255], [0, 0, 1, 0])) {
 			return "image/x-icon";
@@ -394,6 +421,56 @@ function guessMIMEType(expectedType, buffer) {
 			return "font/woff2";
 		}
 	}
+	if (expectedType == "video") {
+		if (compareBytes([0, 0, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255], [0, 0, 0, 0, 102, 116, 121, 112, 105, 115, 111, 109])) {
+			return "video/mp4";
+		}
+		if (compareBytes([255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255], [82, 73, 70, 70, 0, 0, 0, 0, 87, 65, 86, 69])) {
+			return "video/x-msvideo";
+		}
+		if (compareBytes([255, 255, 255, 255], [0, 0, 1, 179]) || compareBytes([255, 255, 255, 255], [0, 0, 1, 186])) {
+			return "video/mpeg";
+		}
+		if (compareBytes([255, 255, 255, 255], [79, 103, 103, 83])) {
+			return "video/ogg";
+		}
+		if (compareBytes([255], [71])) {
+			return "video/mp2t";
+		}
+		if (compareBytes([255, 255, 255, 255], [26, 69, 223, 163])) {
+			return "video/webm";
+		}
+		if (compareBytes([0, 0, 0, 0, 255, 255, 255, 255, 255, 255], [0, 0, 0, 0, 102, 116, 121, 112, 51, 103])) {
+			return "video/3gpp";
+		}
+	}
+	if (expectedType == "audio") {
+		if (compareBytes([255, 255], [255, 249]) || compareBytes([255, 255], [255, 254])) {
+			return "audio/aac";
+		}
+		if (compareBytes([255, 255, 255, 255], [77, 84, 104, 100])) {
+			return "audio/midi";
+		}
+		if (compareBytes([255, 255, 255, 255], [0, 0, 1, 179]) || compareBytes([255, 255, 255, 255], [0, 0, 1, 186])) {
+			return "audio/mpeg";
+		}
+		if (compareBytes([255, 255], [255, 251]) || compareBytes([255, 255], [255, 243]) || compareBytes([255, 255], [255, 242]) || compareBytes([255, 255, 255], [73, 68, 51])) {
+			return "audio/mpeg";
+		}
+		if (compareBytes([255, 255, 255, 255], [79, 103, 103, 83])) {
+			return "audio/ogg";
+		}
+		if (compareBytes([255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255], [82, 73, 70, 70, 0, 0, 0, 0, 87, 65, 86, 69])) {
+			return "audio/wav";
+		}
+		if (compareBytes([255, 255, 255, 255], [26, 69, 223, 163])) {
+			return "audio/webm";
+		}
+		if (compareBytes([0, 0, 0, 0, 255, 255, 255, 255, 255, 255], [0, 0, 0, 0, 102, 116, 121, 112, 51, 103])) {
+			return "audio/3gpp";
+		}
+	}
+	return asBinary ? CONTENT_TYPE_OCTET_STREAM : "";
 
 	function compareBytes(mask, pattern) {
 		let patternMatch = true, index = 0;

package/package.json

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

package/processors/compression/compression-extract.js

@@ -52,7 +52,17 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 		"midi": "audio/midi",
 		"opus": "audio/opus",
 		"wav": "audio/wav",
-		"weba": "audio/webm"
+		"weba": "audio/webm",
+		"heif": "image/heif",
+		"heic": "image/heic",
+		"avif": "image/avif",
+		"apng": "image/apng",
+		"mov": "video/quicktime",
+		"otf": "font/otf",
+		"ttf": "font/ttf",
+		"woff": "font/woff",
+		"woff2": "font/woff2",
+		"eot": "application/vnd.ms-fontobject"
 	};
 	const REGEXP_MATCH_STYLESHEET = /stylesheet_[0-9]+\.css/;
 	const REGEXP_MATCH_SCRIPT = /scripts\/[0-9]+\.js/;

package/processors/compression/compression.js

@@ -38,8 +38,7 @@ import {
 } from "./compression-display.js";
 
 const { Blob, fetch, TextEncoder, DOMParser } = globalThis;
-
-const NO_COMPRESSION_EXTENSIONS = [".jpg", ".jpeg", ".png", ".pdf", ".woff2", ".mp4", ".mp3", ".ogg", ".webp", ".webm"];
+const NO_COMPRESSION_EXTENSIONS = [ ".jpg", ".jpeg", ".png", ".pdf", ".woff2", ".mp4", ".mp3", ".ogg", ".webp", ".webm", ".avi", ".mpeg", ".ts", ".ogv" ];
 const SCRIPT_PATH = "/lib/single-file-zip.min.js";
 
 const browser = globalThis.browser;