file-type 16.3.0 → 16.5.2

package/browser.js

@@ -1,6 +1,5 @@
 'use strict';
 const {ReadableWebToNodeStream} = require('readable-web-to-node-stream');
-const toBuffer = require('typedarray-to-buffer');
 const core = require('./core');
 
 async function fromStream(stream) {
@@ -11,25 +10,25 @@ async function fromStream(stream) {
 }
 
 async function fromBlob(blob) {
-	const buffer = await convertBlobToBuffer(blob);
-	return core.fromBuffer(buffer);
+	const buffer = await blobToArrayBuffer(blob);
+	return core.fromBuffer(Buffer.from(buffer));
 }
 
 /**
-Convert Web API File to Node Buffer.
+Convert Blobs to ArrayBuffer.
 @param {Blob} blob - Web API Blob.
-@returns {Promise<Buffer>}
+@returns {Promise<ArrayBuffer>}
 */
-function convertBlobToBuffer(blob) {
+function blobToArrayBuffer(blob) {
+	if (blob.arrayBuffer) {
+		return blob.arrayBuffer();
+	}
+
+	// TODO: Remove when stop supporting older environments
 	return new Promise((resolve, reject) => {
 		const fileReader = new FileReader();
 		fileReader.addEventListener('loadend', event => {
-			let data = event.target.result;
-			if (data instanceof ArrayBuffer) {
-				data = toBuffer(new Uint8Array(event.target.result));
-			}
-
-			resolve(data);
+			resolve(event.target.result);
 		});
 
 		fileReader.addEventListener('error', event => {

package/core.d.ts

@@ -10,6 +10,7 @@ declare namespace core {
 		| 'gif'
 		| 'webp'
 		| 'flif'
+		| 'xcf'
 		| 'cr2'
 		| 'cr3'
 		| 'orf'
@@ -138,7 +139,9 @@ declare namespace core {
 		| 'stl'
 		| 'chm'
 		| '3mf'
-		| 'zst';
+		| 'zst'
+		| 'jxl'
+		| 'vcf';
 
 	type MimeType =
 		| 'image/jpeg'
@@ -146,6 +149,7 @@ declare namespace core {
 		| 'image/gif'
 		| 'image/webp'
 		| 'image/flif'
+		| 'image/x-xcf'
 		| 'image/x-canon-cr2'
 		| 'image/x-canon-cr3'
 		| 'image/tiff'
@@ -238,6 +242,7 @@ declare namespace core {
 		| 'application/dicom'
 		| 'audio/x-musepack'
 		| 'text/calendar'
+		| 'text/vcard'
 		| 'model/gltf-binary'
 		| 'application/vnd.tcpdump.pcap'
 		| 'audio/x-dsf' // Non-standard
@@ -270,6 +275,7 @@ declare namespace core {
 		| 'model/stl'
 		| 'application/vnd.ms-htmlhelp'
 		| 'model/3mf'
+		| 'image/jxl'
 		| 'application/zstd';
 
 	interface FileTypeResult {
@@ -347,7 +353,7 @@ declare namespace core {
 	/**
 	Supported MIME types.
 	*/
-	const mimeTypes: readonly core.MimeType[];
+	const mimeTypes: Set<core.MimeType>;
 
 	/**
 	Detect the file type of a readable stream.

package/core.js

@@ -911,13 +911,6 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
-	if (checkString('BEGIN:')) {
-		return {
-			ext: 'ics',
-			mime: 'text/calendar'
-		};
-	}
-
 	if (check([0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C])) {
 		return {
 			ext: '7z',
@@ -1051,6 +1044,13 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
+	if (checkString('gimp xcf ')) {
+		return {
+			ext: 'xcf',
+			mime: 'image/x-xcf'
+		};
+	}
+
 	// -- 12-byte signatures --
 
 	if (check([0x49, 0x49, 0x55, 0x00, 0x18, 0x00, 0x00, 0x00, 0x88, 0xE7, 0x74, 0xD8])) {
@@ -1067,7 +1067,7 @@ async function _fromTokenizer(tokenizer) {
 			await tokenizer.readBuffer(guid);
 			return {
 				id: guid,
-				size: await tokenizer.readToken(Token.UINT64_LE)
+				size: Number(await tokenizer.readToken(Token.UINT64_LE))
 			};
 		}
 
@@ -1162,6 +1162,16 @@ async function _fromTokenizer(tokenizer) {
 		}
 	}
 
+	if (
+		check([0xFF, 0x0A]) ||
+		check([0x00, 0x00, 0x00, 0x0C, 0x4A, 0x58, 0x4C, 0x20, 0x0D, 0x0A, 0x87, 0x0A])
+	) {
+		return {
+			ext: 'jxl',
+			mime: 'image/jxl'
+		};
+	}
+
 	// -- Unsafe signatures --
 
 	if (
@@ -1206,6 +1216,24 @@ async function _fromTokenizer(tokenizer) {
 	// Increase sample size from 12 to 256.
 	await tokenizer.peekBuffer(buffer, {length: Math.min(256, tokenizer.fileInfo.size), mayBeLess: true});
 
+	// -- 15-byte signatures --
+
+	if (checkString('BEGIN:')) {
+		if (checkString('VCARD', {offset: 6})) {
+			return {
+				ext: 'vcf',
+				mime: 'text/vcard'
+			};
+		}
+
+		if (checkString('VCALENDAR', {offset: 6})) {
+			return {
+				ext: 'ics',
+				mime: 'text/calendar'
+			};
+		}
+	}
+
 	// `raf` is here just to keep all the raw image detectors together.
 	if (checkString('FUJIFILMCCD-RAW')) {
 		return {
@@ -1230,7 +1258,7 @@ async function _fromTokenizer(tokenizer) {
 
 	if (check([0x04, 0x00, 0x00, 0x00]) && buffer.length >= 16) { // Rough & quick check Pickle/ASAR
 		const jsonSize = buffer.readUInt32LE(12);
-		if (jsonSize > 12 && jsonSize < 240 && buffer.length >= jsonSize + 16) {
+		if (jsonSize > 12 && buffer.length >= jsonSize + 16) {
 			try {
 				const header = buffer.slice(16, jsonSize + 16).toString();
 				const json = JSON.parse(header);
@@ -1341,50 +1369,47 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
-	// Check for MPEG header at different starting offsets
-	for (let start = 0; start < 2 && start < (buffer.length - 16); start++) {
-		// Check MPEG 1 or 2 Layer 3 header, or 'layer 0' for ADTS (MPEG sync-word 0xFFE)
-		if (buffer.length >= start + 2 && check([0xFF, 0xE0], {offset: start, mask: [0xFF, 0xE0]})) {
-			if (check([0x10], {offset: start + 1, mask: [0x16]})) {
-				// Check for (ADTS) MPEG-2
-				if (check([0x08], {offset: start + 1, mask: [0x08]})) {
-					return {
-						ext: 'aac',
-						mime: 'audio/aac'
-					};
-				}
-
-				// Must be (ADTS) MPEG-4
+	// Check MPEG 1 or 2 Layer 3 header, or 'layer 0' for ADTS (MPEG sync-word 0xFFE)
+	if (buffer.length >= 2 && check([0xFF, 0xE0], {offset: 0, mask: [0xFF, 0xE0]})) {
+		if (check([0x10], {offset: 1, mask: [0x16]})) {
+			// Check for (ADTS) MPEG-2
+			if (check([0x08], {offset: 1, mask: [0x08]})) {
 				return {
 					ext: 'aac',
 					mime: 'audio/aac'
 				};
 			}
 
-			// MPEG 1 or 2 Layer 3 header
-			// Check for MPEG layer 3
-			if (check([0x02], {offset: start + 1, mask: [0x06]})) {
-				return {
-					ext: 'mp3',
-					mime: 'audio/mpeg'
-				};
-			}
+			// Must be (ADTS) MPEG-4
+			return {
+				ext: 'aac',
+				mime: 'audio/aac'
+			};
+		}
 
-			// Check for MPEG layer 2
-			if (check([0x04], {offset: start + 1, mask: [0x06]})) {
-				return {
-					ext: 'mp2',
-					mime: 'audio/mpeg'
-				};
-			}
+		// MPEG 1 or 2 Layer 3 header
+		// Check for MPEG layer 3
+		if (check([0x02], {offset: 1, mask: [0x06]})) {
+			return {
+				ext: 'mp3',
+				mime: 'audio/mpeg'
+			};
+		}
 
-			// Check for MPEG layer 1
-			if (check([0x06], {offset: start + 1, mask: [0x06]})) {
-				return {
-					ext: 'mp1',
-					mime: 'audio/mpeg'
-				};
-			}
+		// Check for MPEG layer 2
+		if (check([0x04], {offset: 1, mask: [0x06]})) {
+			return {
+				ext: 'mp2',
+				mime: 'audio/mpeg'
+			};
+		}
+
+		// Check for MPEG layer 1
+		if (check([0x06], {offset: 1, mask: [0x06]})) {
+			return {
+				ext: 'mp1',
+				mime: 'audio/mpeg'
+			};
 		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "16.3.0",
+	"version": "16.5.2",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -11,7 +11,7 @@
 		"url": "https://sindresorhus.com"
 	},
 	"engines": {
-		"node": ">=8"
+		"node": ">=10"
 	},
 	"scripts": {
 		"ava": "ava --serial --verbose",
@@ -54,6 +54,7 @@
 		"gif",
 		"webp",
 		"flif",
+		"xcf",
 		"cr2",
 		"cr3",
 		"orf",
@@ -182,7 +183,9 @@
 		"stl",
 		"chm",
 		"3mf",
-		"zst"
+		"zst",
+		"jxl",
+		"vcf"
 	],
 	"devDependencies": {
 		"@types/node": "^13.1.4",
@@ -194,9 +197,8 @@
 	},
 	"dependencies": {
 		"readable-web-to-node-stream": "^3.0.0",
-		"strtok3": "^6.0.3",
-		"token-types": "^2.0.0",
-		"typedarray-to-buffer": "^3.1.5"
+		"strtok3": "6.1.3",
+		"token-types": "^3.0.0"
 	},
 	"xo": {
 		"envs": [

package/readme.md

@@ -6,6 +6,36 @@ The file type is detected by checking the [magic number](https://en.wikipedia.or
 
 This package is for detecting binary-based file formats, not text-based formats like `.txt`, `.csv`, `.svg`, etc.
 
+<br>
+
+---
+
+<div align="center">
+	<p>
+		<p>
+			<sup>
+				<a href="https://github.com/sponsors/sindresorhus">My open source work is supported by the community</a>
+			</sup>
+		</p>
+		<sup>Special thanks to:</sup>
+		<br>
+		<br>
+		<a href="https://bit.io/?utm_campaign=github_repo&utm_medium=referral&utm_content=file-type&utm_source=github">
+			<div>
+				<img src="https://sindresorhus.com/assets/thanks/bitio-logo.svg" width="190" alt="bit.io">
+			</div>
+			<b>Instant, shareable cloud PostgreSQL database</b>
+			<div>
+				<sup>Import any dataset in seconds, share with anyone with a click, try without signing up</sup>
+			</div>
+		</a>
+	</p>
+</div>
+
+---
+
+<br>
+
 ## Install
 
 ```
@@ -278,6 +308,7 @@ Returns a set of supported MIME types.
 - [`gif`](https://en.wikipedia.org/wiki/GIF) - Graphics Interchange Format
 - [`webp`](https://en.wikipedia.org/wiki/WebP) - Web Picture format
 - [`flif`](https://en.wikipedia.org/wiki/Free_Lossless_Image_Format) - Free Lossless Image Format
+- [`xcf`](https://en.wikipedia.org/wiki/XCF_(file_format)) - eXperimental Computing Facility
 - [`cr2`](https://fileinfo.com/extension/cr2) - Canon Raw image file (v2)
 - [`cr3`](https://fileinfo.com/extension/cr3) - Canon Raw image file (v3)
 - [`orf`](https://en.wikipedia.org/wiki/ORF_format) - Olympus Raw image file
@@ -373,6 +404,7 @@ Returns a set of supported MIME types.
 - [`dcm`](https://en.wikipedia.org/wiki/DICOM#Data_format) - DICOM Image File
 - [`mpc`](https://en.wikipedia.org/wiki/Musepack) - Musepack (SV7 & SV8)
 - [`ics`](https://en.wikipedia.org/wiki/ICalendar#Data_format) - iCalendar
+- [`vcf`](https://en.wikipedia.org/wiki/VCard) - vCard
 - [`glb`](https://github.com/KhronosGroup/glTF) - GL Transmission Format
 - [`pcap`](https://wiki.wireshark.org/Development/LibpcapFileFormat) - Libpcap File Format
 - [`dsf`](https://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf) - Sony DSD Stream File (DSF)
@@ -407,6 +439,7 @@ Returns a set of supported MIME types.
 - [`stl`](https://en.wikipedia.org/wiki/STL_(file_format)) - Standard Tesselated Geometry File Format (ASCII only)
 - [`chm`](https://en.wikipedia.org/wiki/Microsoft_Compiled_HTML_Help) - Microsoft Compiled HTML Help
 - [`3mf`](https://en.wikipedia.org/wiki/3D_Manufacturing_Format) - 3D Manufacturing Format
+- [`jxl`](https://en.wikipedia.org/wiki/JPEG_XL) - JPEG XL image format
 
 *Pull requests are welcome for additional commonly used file types.*
 

package/supported.js

@@ -8,6 +8,7 @@ module.exports = {
 		'gif',
 		'webp',
 		'flif',
+		'xcf',
 		'cr2',
 		'cr3',
 		'orf',
@@ -136,7 +137,9 @@ module.exports = {
 		'stl',
 		'chm',
 		'3mf',
-		'zst'
+		'zst',
+		'jxl',
+		'vcf'
 	],
 	mimeTypes: [
 		'image/jpeg',
@@ -144,6 +147,7 @@ module.exports = {
 		'image/gif',
 		'image/webp',
 		'image/flif',
+		'image/x-xcf',
 		'image/x-canon-cr2',
 		'image/x-canon-cr3',
 		'image/tiff',
@@ -236,6 +240,7 @@ module.exports = {
 		'application/dicom',
 		'audio/x-musepack',
 		'text/calendar',
+		'text/vcard',
 		'model/gltf-binary',
 		'application/vnd.tcpdump.pcap',
 		'audio/x-dsf', // Non-standard
@@ -268,6 +273,7 @@ module.exports = {
 		'model/stl',
 		'application/vnd.ms-htmlhelp',
 		'model/3mf',
+		'image/jxl',
 		'application/zstd'
 	]
 };