file-type 14.7.1 → 16.0.1

package/core.d.ts

@@ -37,7 +37,6 @@ declare namespace core {
 		| 'webm'
 		| 'mov'
 		| 'avi'
-		| 'wmv'
 		| 'mpg'
 		| 'mp2'
 		| 'mp3'
@@ -73,7 +72,7 @@ declare namespace core {
 		| 'rpm'
 		| 'Z'
 		| 'lz'
-		| 'msi'
+		| 'cfb'
 		| 'mxf'
 		| 'mts'
 		| 'wasm'
@@ -99,7 +98,6 @@ declare namespace core {
 		| 'ape'
 		| 'wv'
 		| 'asf'
-		| 'wma'
 		| 'dcm'
 		| 'mpc'
 		| 'ics'
@@ -136,7 +134,8 @@ declare namespace core {
 		| 'eps'
 		| 'lzh'
 		| 'pgp'
-		| 'asar';
+		| 'asar'
+		| 'stl';
 
 	type MimeType =
 		| 'image/jpeg'
@@ -175,7 +174,7 @@ declare namespace core {
 		| 'video/vnd.avi'
 		| 'audio/vnd.wave'
 		| 'audio/qcelp'
-		| 'audio/x-ms-wma'
+		| 'audio/x-ms-asf'
 		| 'video/x-ms-asf'
 		| 'application/vnd.ms-asf'
 		| 'video/mpeg'
@@ -214,7 +213,7 @@ declare namespace core {
 		| 'application/x-rpm'
 		| 'application/x-compress'
 		| 'application/x-lzip'
-		| 'application/x-msi'
+		| 'application/x-cfb'
 		| 'application/x-mie'
 		| 'application/x-apache-arrow'
 		| 'application/mxf'
@@ -264,7 +263,8 @@ declare namespace core {
 		| 'image/avif'
 		| 'application/x-lzh-compressed'
 		| 'application/pgp-encrypted'
-		| 'application/x-asar';
+		| 'application/x-asar'
+		| 'model/stl';
 
 	interface FileTypeResult {
 		/**

package/core.js

@@ -920,6 +920,13 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
+	if (checkString('solid ')) {
+		return {
+			ext: 'stl',
+			mime: 'model/stl'
+		};
+	}
+
 	// -- 7-byte signatures --
 
 	if (checkString('BLENDER')) {
@@ -967,6 +974,10 @@ async function _fromTokenizer(tokenizer) {
 
 		do {
 			const chunk = await readChunkHeader();
+			if (chunk.length < 0) {
+				return; // Invalid chunk length
+			}
+
 			switch (chunk.type) {
 				case 'IDAT':
 					return {
@@ -981,7 +992,7 @@ async function _fromTokenizer(tokenizer) {
 				default:
 					await tokenizer.ignore(chunk.length + 4); // Ignore chunk-data + CRC
 			}
-		} while (tokenizer.position < tokenizer.fileInfo.size);
+		} while (tokenizer.position + 8 < tokenizer.fileInfo.size);
 
 		return {
 			ext: 'png',
@@ -1058,15 +1069,15 @@ async function _fromTokenizer(tokenizer) {
 				if (_check(typeId, [0x40, 0x9E, 0x69, 0xF8, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B])) {
 					// Found audio:
 					return {
-						ext: 'wma',
-						mime: 'audio/x-ms-wma'
+						ext: 'asf',
+						mime: 'audio/x-ms-asf'
 					};
 				}
 
 				if (_check(typeId, [0xC0, 0xEF, 0x19, 0xBC, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B])) {
 					// Found video:
 					return {
-						ext: 'wmv',
+						ext: 'asf',
 						mime: 'video/x-ms-asf'
 					};
 				}
@@ -1169,6 +1180,14 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
+	if (check([0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1])) {
+		// Detected Microsoft Compound File Binary File (MS-CFB) Format.
+		return {
+			ext: 'cfb',
+			mime: 'application/x-cfb'
+		};
+	}
+
 	// Increase sample size from 12 to 256.
 	await tokenizer.peekBuffer(buffer, {length: Math.min(256, tokenizer.fileInfo.size), mayBeLess: true});
 
@@ -1212,13 +1231,6 @@ async function _fromTokenizer(tokenizer) {
 		}
 	}
 
-	if (check([0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E])) {
-		return {
-			ext: 'msi',
-			mime: 'application/x-msi'
-		};
-	}
-
 	if (check([0x06, 0x0E, 0x2B, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0D, 0x01, 0x02, 0x01, 0x01, 0x02])) {
 		return {
 			ext: 'mxf',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "14.7.1",
+	"version": "16.0.1",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -31,6 +31,7 @@
 		"mime",
 		"file",
 		"type",
+		"magic",
 		"archive",
 		"image",
 		"img",
@@ -111,7 +112,7 @@
 		"rpm",
 		"Z",
 		"lz",
-		"msi",
+		"cfb",
 		"mxf",
 		"mts",
 		"wasm",
@@ -132,7 +133,6 @@
 		"odp",
 		"xml",
 		"heic",
-		"wma",
 		"ics",
 		"glb",
 		"pcap",
@@ -151,7 +151,6 @@
 		"f4v",
 		"mie",
 		"qcp",
-		"wmv",
 		"asf",
 		"ogv",
 		"ogm",
@@ -179,7 +178,8 @@
 		"eps",
 		"lzh",
 		"pgp",
-		"asar"
+		"asar",
+		"stl"
 	],
 	"devDependencies": {
 		"@types/node": "^13.1.4",
@@ -190,7 +190,7 @@
 		"xo": "^0.25.3"
 	},
 	"dependencies": {
-		"readable-web-to-node-stream": "^2.0.0",
+		"readable-web-to-node-stream": "^3.0.0",
 		"strtok3": "^6.0.3",
 		"token-types": "^2.0.0",
 		"typedarray-to-buffer": "^3.1.5"

package/readme.md

@@ -4,6 +4,8 @@
 
 The file type is detected by checking the [magic number](https://en.wikipedia.org/wiki/Magic_number_(programming)#Magic_numbers_in_files) of the buffer.
 
+This package is for detecting binary-based file formats, not text-based formats like `.txt`, `.csv`, `.svg`, etc.
+
 ## Install
 
 ```
@@ -343,7 +345,7 @@ Returns a set of supported MIME types.
 - [`rpm`](https://fileinfo.com/extension/rpm)
 - [`Z`](https://fileinfo.com/extension/z)
 - [`lz`](https://en.wikipedia.org/wiki/Lzip)
-- [`msi`](https://en.wikipedia.org/wiki/Windows_Installer)
+- [`cfb`](https://en.wikipedia.org/wiki/Compound_File_Binary_Format)
 - [`mxf`](https://en.wikipedia.org/wiki/Material_Exchange_Format)
 - [`mts`](https://en.wikipedia.org/wiki/.m2ts)
 - [`wasm`](https://en.wikipedia.org/wiki/WebAssembly)
@@ -367,8 +369,6 @@ Returns a set of supported MIME types.
 - [`ape`](https://en.wikipedia.org/wiki/Monkey%27s_Audio) - Monkey's Audio
 - [`wv`](https://en.wikipedia.org/wiki/WavPack) - WavPack
 - [`asf`](https://en.wikipedia.org/wiki/Advanced_Systems_Format) - Advanced Systems Format
-- [`wma`](https://en.wikipedia.org/wiki/Windows_Media_Audio) - Windows Media Audio
-- [`wmv`](https://en.wikipedia.org/wiki/Windows_Media_Video) - Windows Media Video
 - [`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
@@ -403,13 +403,16 @@ Returns a set of supported MIME types.
 - [`lzh`](https://en.wikipedia.org/wiki/LHA_(file_format)) - LZH archive
 - [`pgp`](https://en.wikipedia.org/wiki/Pretty_Good_Privacy) - Pretty Good Privacy
 - [`asar`](https://github.com/electron/asar#format) - Archive format primarily used to enclose Electron applications
+- [`stl`](https://en.wikipedia.org/wiki/STL_(file_format)) - Standard Tesselated Geometry File Format (ASCII only)
 
 *Pull requests are welcome for additional commonly used file types.*
 
 The following file types will not be accepted:
-- `.doc` - Too old and difficult to parse.
-- `.xls` - Too old and difficult to parse.
-- `.ppt` - Too old and difficult to parse.
+- [MS-CFB: Microsoft Compound File Binary File Format based formats](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cfb/53989ce4-7b05-4f8d-829b-d08d6148375b), too old and difficult to parse:
+	- `.doc` - Microsoft Word 97-2003 Document 
+	- `.xls` - Microsoft Excel 97-2003 Document 
+	- `.ppt` - Microsoft PowerPoint97-2003 Document
+	- `.msi` - Microsoft Windows Installer
 - `.csv` - [Reason.](https://github.com/sindresorhus/file-type/issues/264#issuecomment-568439196)
 - `.svg` - Detecting it requires a full-blown parser. Check out [`is-svg`](https://github.com/sindresorhus/is-svg) for something that mostly works.
 

package/supported.js

@@ -72,7 +72,7 @@ module.exports = {
 		'rpm',
 		'Z',
 		'lz',
-		'msi',
+		'cfb',
 		'mxf',
 		'mts',
 		'blend',
@@ -98,8 +98,6 @@ module.exports = {
 		'ktx',
 		'ape',
 		'wv',
-		'wmv',
-		'wma',
 		'dcm',
 		'ics',
 		'glb',
@@ -134,7 +132,8 @@ module.exports = {
 		'eps',
 		'lzh',
 		'pgp',
-		'asar'
+		'asar',
+		'stl'
 	],
 	mimeTypes: [
 		'image/jpeg',
@@ -173,7 +172,7 @@ module.exports = {
 		'video/vnd.avi',
 		'audio/vnd.wave',
 		'audio/qcelp',
-		'audio/x-ms-wma',
+		'audio/x-ms-asf',
 		'video/x-ms-asf',
 		'application/vnd.ms-asf',
 		'video/mpeg',
@@ -212,7 +211,7 @@ module.exports = {
 		'application/x-rpm',
 		'application/x-compress',
 		'application/x-lzip',
-		'application/x-msi',
+		'application/x-cfb',
 		'application/x-mie',
 		'application/mxf',
 		'video/mp2t',
@@ -262,6 +261,7 @@ module.exports = {
 		'image/avif',
 		'application/x-lzh-compressed',
 		'application/pgp-encrypted',
-		'application/x-asar'
+		'application/x-asar',
+		'model/stl'
 	]
 };

package/util.js

@@ -2,43 +2,30 @@
 
 exports.stringToBytes = string => [...string].map(character => character.charCodeAt(0));
 
-exports.tarHeaderChecksumMatches = buffer => { // Does not check if checksum field characters are valid
-	if (buffer.length < 512) { // `tar` header size, cannot compute checksum without it
-		return false;
-	}
+/**
+Checks whether the TAR checksum is valid.
 
+@param {Buffer} buffer - The TAR header `[offset ... offset + 512]`.
+@param {number} offset - TAR header offset.
+@returns {boolean} `true` if the TAR checksum is valid, otherwise `false`.
+*/
+exports.tarHeaderChecksumMatches = (buffer, offset = 0) => {
 	const readSum = parseInt(buffer.toString('utf8', 148, 154).replace(/\0.*$/, '').trim(), 8); // Read sum in header
 	if (isNaN(readSum)) {
 		return false;
 	}
 
-	const MASK_8TH_BIT = 0x80;
+	let sum = 8 * 0x20; // Initialize signed bit sum
 
-	let sum = 256; // Initialize sum, with 256 as sum of 8 spaces in checksum field
-	let signedBitSum = 0; // Initialize signed bit sum
-
-	for (let i = 0; i < 148; i++) {
-		const byte = buffer[i];
-		sum += byte;
-		signedBitSum += byte & MASK_8TH_BIT; // Add signed bit to signed bit sum
+	for (let i = offset; i < offset + 148; i++) {
+		sum += buffer[i];
 	}
 
-	// Skip checksum field
-
-	for (let i = 156; i < 512; i++) {
-		const byte = buffer[i];
-		sum += byte;
-		signedBitSum += byte & MASK_8TH_BIT; // Add signed bit to signed bit sum
+	for (let i = offset + 156; i < offset + 512; i++) {
+		sum += buffer[i];
 	}
 
-	// Some implementations compute checksum incorrectly using signed bytes
-	return (
-		// Checksum in header equals the sum we calculated
-		readSum === sum ||
-
-		// Checksum in header equals sum we calculated plus signed-to-unsigned delta
-		readSum === (sum - (signedBitSum << 1))
-	);
+	return readSum === sum;
 };
 
 /**