file-type 14.6.2 → 15.0.1

package/core.d.ts

@@ -23,6 +23,7 @@ declare namespace core {
 		| 'icns'
 		| 'jxr'
 		| 'psd'
+		| 'indd'
 		| 'zip'
 		| 'tar'
 		| 'rar'
@@ -72,7 +73,7 @@ declare namespace core {
 		| 'rpm'
 		| 'Z'
 		| 'lz'
-		| 'msi'
+		| 'cfb'
 		| 'mxf'
 		| 'mts'
 		| 'wasm'
@@ -134,7 +135,8 @@ declare namespace core {
 		| 'avif'
 		| 'eps'
 		| 'lzh'
-		| 'pgp';
+		| 'pgp'
+		| 'asar';
 
 	type MimeType =
 		| 'image/jpeg'
@@ -149,6 +151,7 @@ declare namespace core {
 		| 'image/icns'
 		| 'image/vnd.ms-photo'
 		| 'image/vnd.adobe.photoshop'
+		| 'application/x-indesign'
 		| 'application/epub+zip'
 		| 'application/x-xpinstall'
 		| 'application/vnd.oasis.opendocument.text'
@@ -211,7 +214,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'
@@ -260,7 +263,8 @@ declare namespace core {
 		| 'application/vnd.sketchup.skp'
 		| 'image/avif'
 		| 'application/x-lzh-compressed'
-		| 'application/pgp-encrypted';
+		| 'application/pgp-encrypted'
+		| 'application/x-asar';
 
 	interface FileTypeResult {
 		/**
@@ -332,7 +336,7 @@ declare namespace core {
 	/**
 	Supported file extensions.
 	*/
-	const extensions: readonly core.FileExtension[];
+	const extensions: Set<core.FileExtension>;
 
 	/**
 	Supported MIME types.

package/core.js

@@ -4,8 +4,7 @@ const strtok3 = require('strtok3/lib/core');
 const {
 	stringToBytes,
 	tarHeaderChecksumMatches,
-	uint32SyncSafeToken,
-	uint8ArrayUtf8ByteString
+	uint32SyncSafeToken
 } = require('./util');
 const supported = require('./supported');
 
@@ -464,7 +463,7 @@ async function _fromTokenizer(tokenizer) {
 	) {
 		// They all can have MIME `video/mp4` except `application/mp4` special-case which is hard to detect.
 		// For some cases, we're specific, everything else falls to `video/mp4` with `mp4` extension.
-		const brandMajor = uint8ArrayUtf8ByteString(buffer, 8, 12).replace('\0', ' ').trim();
+		const brandMajor = buffer.toString('binary', 8, 12).replace('\0', ' ').trim();
 		switch (brandMajor) {
 			case 'avif':
 				return {ext: 'avif', mime: 'image/avif'};
@@ -968,6 +967,10 @@ async function _fromTokenizer(tokenizer) {
 
 		do {
 			const chunk = await readChunkHeader();
+			if (chunk.length < 0) {
+				return; // Invalid chunk length
+			}
+
 			switch (chunk.type) {
 				case 'IDAT':
 					return {
@@ -982,7 +985,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',
@@ -1170,6 +1173,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});
 
@@ -1195,21 +1206,22 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
-	if (
-		check([0x30, 0x30, 0x30, 0x30, 0x30, 0x30], {offset: 148, mask: [0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8]}) && // Valid tar checksum
-		tarHeaderChecksumMatches(buffer)
-	) {
-		return {
-			ext: 'tar',
-			mime: 'application/x-tar'
-		};
-	}
-
-	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([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) {
+			try {
+				const header = buffer.slice(16, jsonSize + 16).toString();
+				const json = JSON.parse(header);
+				// Check if Pickle is ASAR
+				if (json.files) { // Final check, assuring Pickle/ASAR format
+					return {
+						ext: 'asar',
+						mime: 'application/x-asar'
+					};
+				}
+			} catch (_) {
+			}
+		}
 	}
 
 	if (check([0x06, 0x0E, 0x2B, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0D, 0x01, 0x02, 0x01, 0x01, 0x02])) {
@@ -1275,13 +1287,18 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
+	if (check([0x06, 0x06, 0xED, 0xF5, 0xD8, 0x1D, 0x46, 0xE5, 0xBD, 0x31, 0xEF, 0xE7, 0xFE, 0x74, 0xB7, 0x1D])) {
+		return {
+			ext: 'indd',
+			mime: 'application/x-indesign'
+		};
+	}
+
 	// Increase sample size from 256 to 512
 	await tokenizer.peekBuffer(buffer, {length: Math.min(512, tokenizer.fileInfo.size), mayBeLess: true});
 
-	if (
-		check([0x30, 0x30, 0x30, 0x30, 0x30, 0x30], {offset: 148, mask: [0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8]}) && // Valid tar checksum
-		tarHeaderChecksumMatches(buffer)
-	) {
+	// Requires a buffer size of 512 bytes
+	if (tarHeaderChecksumMatches(buffer)) {
 		return {
 			ext: 'tar',
 			mime: 'application/x-tar'
@@ -1360,7 +1377,8 @@ const stream = readableStream => new Promise((resolve, reject) => {
 		const pass = new stream.PassThrough();
 		let outputStream;
 		if (stream.pipeline) {
-			outputStream = stream.pipeline(readableStream, pass, () => {});
+			outputStream = stream.pipeline(readableStream, pass, () => {
+			});
 		} else {
 			outputStream = readableStream.pipe(pass);
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "14.6.2",
+	"version": "15.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",
@@ -66,6 +67,7 @@
 		"icns",
 		"jxr",
 		"psd",
+		"indd",
 		"zip",
 		"tar",
 		"rar",
@@ -110,7 +112,7 @@
 		"rpm",
 		"Z",
 		"lz",
-		"msi",
+		"cfb",
 		"mxf",
 		"mts",
 		"wasm",
@@ -177,7 +179,8 @@
 		"avif",
 		"eps",
 		"lzh",
-		"pgp"
+		"pgp",
+		"asar"
 	],
 	"devDependencies": {
 		"@types/node": "^13.1.4",

package/readme.md

@@ -1,4 +1,4 @@
-# file-type [![Build Status](https://travis-ci.com/sindresorhus/file-type.svg?branch=master)](https://travis-ci.ocomrg/sindresorhus/file-type)
+# file-type [![Build Status](https://travis-ci.com/sindresorhus/file-type.svg?branch=master)](https://travis-ci.com/github/sindresorhus/file-type)
 
 > Detect the file type of a Buffer/Uint8Array/ArrayBuffer
 
@@ -289,6 +289,7 @@ Returns a set of supported MIME types.
 - [`icns`](https://en.wikipedia.org/wiki/Apple_Icon_Image_format)
 - [`jxr`](https://en.wikipedia.org/wiki/JPEG_XR)
 - [`psd`](https://en.wikipedia.org/wiki/Adobe_Photoshop#File_format)
+- [`indd`](https://en.wikipedia.org/wiki/Adobe_InDesign#File_format)
 - [`zip`](https://en.wikipedia.org/wiki/Zip_(file_format))
 - [`tar`](https://en.wikipedia.org/wiki/Tar_(computing)#File_format)
 - [`rar`](https://en.wikipedia.org/wiki/RAR_(file_format))
@@ -342,7 +343,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)
@@ -401,13 +402,16 @@ Returns a set of supported MIME types.
 - [`eps`](https://en.wikipedia.org/wiki/Encapsulated_PostScript) - Encapsulated PostScript
 - [`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
 
 *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

@@ -21,6 +21,7 @@ module.exports = {
 		'icns',
 		'jxr',
 		'psd',
+		'indd',
 		'zip',
 		'tar',
 		'rar',
@@ -71,7 +72,7 @@ module.exports = {
 		'rpm',
 		'Z',
 		'lz',
-		'msi',
+		'cfb',
 		'mxf',
 		'mts',
 		'blend',
@@ -132,7 +133,8 @@ module.exports = {
 		'avif',
 		'eps',
 		'lzh',
-		'pgp'
+		'pgp',
+		'asar'
 	],
 	mimeTypes: [
 		'image/jpeg',
@@ -146,6 +148,7 @@ module.exports = {
 		'image/bmp',
 		'image/vnd.ms-photo',
 		'image/vnd.adobe.photoshop',
+		'application/x-indesign',
 		'application/epub+zip',
 		'application/x-xpinstall',
 		'application/vnd.oasis.opendocument.text',
@@ -209,7 +212,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',
@@ -258,6 +261,7 @@ module.exports = {
 		'application/vnd.sketchup.skp',
 		'image/avif',
 		'application/x-lzh-compressed',
-		'application/pgp-encrypted'
+		'application/pgp-encrypted',
+		'application/x-asar'
 	]
 };

package/util.js

@@ -2,48 +2,32 @@
 
 exports.stringToBytes = string => [...string].map(character => character.charCodeAt(0));
 
-const uint8ArrayUtf8ByteString = (array, start, end) => {
-	return String.fromCharCode(...array.slice(start, end));
-};
+/**
+Checks whether the TAR checksum is valid.
 
-exports.tarHeaderChecksumMatches = buffer => { // Does not check if checksum field characters are valid
-	if (buffer.length < 512) { // `tar` header size, cannot compute checksum without it
+@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 = 256; // Intitalize sum, with 256 as sum of 8 spaces in checksum field
-	let signedBitSum = 0; // Initialize signed bit sum
+	let sum = 8 * 0x20; // 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];
 	}
 
-	const readSum = parseInt(uint8ArrayUtf8ByteString(buffer, 148, 154), 8); // Read sum in header
-
-	// 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;
 };
 
-exports.uint8ArrayUtf8ByteString = uint8ArrayUtf8ByteString;
-
 /**
 ID3 UINT32 sync-safe tokenizer token.
 28 bits (representing up to 256MB) integer, the msb is 0 to avoid "false syncsignals".