file-type 14.5.0 → 14.7.0

package/core.d.ts

@@ -23,6 +23,7 @@ declare namespace core {
 		| 'icns'
 		| 'jxr'
 		| 'psd'
+		| 'indd'
 		| 'zip'
 		| 'tar'
 		| 'rar'
@@ -133,7 +134,9 @@ declare namespace core {
 		| 'skp'
 		| 'avif'
 		| 'eps'
-		| 'lzh';
+		| 'lzh'
+		| 'pgp'
+		| 'asar';
 
 	type MimeType =
 		| 'image/jpeg'
@@ -148,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'
@@ -258,7 +262,9 @@ declare namespace core {
 		| 'video/MP2P'
 		| 'application/vnd.sketchup.skp'
 		| 'image/avif'
-		| 'application/x-lzh-compressed';
+		| 'application/x-lzh-compressed'
+		| 'application/pgp-encrypted'
+		| 'application/x-asar';
 
 	interface FileTypeResult {
 		/**
@@ -330,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

@@ -353,7 +353,20 @@ async function _fromTokenizer(tokenizer) {
 					}
 				}
 
-				await tokenizer.ignore(zipHeader.compressedSize);
+				// Try to find next header manually when current one is corrupted
+				if (zipHeader.compressedSize === 0) {
+					let nextHeaderIndex = -1;
+
+					while (nextHeaderIndex < 0 && (tokenizer.position < tokenizer.fileInfo.size)) {
+						await tokenizer.peekBuffer(buffer, {mayBeLess: true});
+
+						nextHeaderIndex = buffer.indexOf('504B0304', 0, 'hex');
+						// Move position to the next header if found, skip the whole buffer otherwise
+						await tokenizer.ignore(nextHeaderIndex >= 0 ? nextHeaderIndex : buffer.length);
+					}
+				} else {
+					await tokenizer.ignore(zipHeader.compressedSize);
+				}
 			}
 		} catch (error) {
 			if (!(error instanceof strtok3.EndOfStreamError)) {
@@ -1182,6 +1195,24 @@ 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) {
+			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([0x30, 0x30, 0x30, 0x30, 0x30, 0x30], {offset: 148, mask: [0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8]}) && // Valid tar checksum
 		tarHeaderChecksumMatches(buffer)
@@ -1262,6 +1293,13 @@ 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});
 
@@ -1282,6 +1320,13 @@ async function _fromTokenizer(tokenizer) {
 		};
 	}
 
+	if (checkString('-----BEGIN PGP MESSAGE-----')) {
+		return {
+			ext: 'pgp',
+			mime: 'application/pgp-encrypted'
+		};
+	}
+
 	// 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)
@@ -1340,7 +1385,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.5.0",
+	"version": "14.7.0",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -66,6 +66,7 @@
 		"icns",
 		"jxr",
 		"psd",
+		"indd",
 		"zip",
 		"tar",
 		"rar",
@@ -176,7 +177,9 @@
 		"skp",
 		"avif",
 		"eps",
-		"lzh"
+		"lzh",
+		"pgp",
+		"asar"
 	],
 	"devDependencies": {
 		"@types/node": "^13.1.4",
@@ -188,7 +191,7 @@
 	},
 	"dependencies": {
 		"readable-web-to-node-stream": "^2.0.0",
-		"strtok3": "^6.0.0",
+		"strtok3": "^6.0.3",
 		"token-types": "^2.0.0",
 		"typedarray-to-buffer": "^3.1.5"
 	},

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))
@@ -400,6 +401,8 @@ Returns a set of supported MIME types.
 - [`avif`](https://en.wikipedia.org/wiki/AV1#AV1_Image_File_Format_(AVIF)) - AV1 Image File Format
 - [`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.*
 

package/supported.js

@@ -21,6 +21,7 @@ module.exports = {
 		'icns',
 		'jxr',
 		'psd',
+		'indd',
 		'zip',
 		'tar',
 		'rar',
@@ -131,7 +132,9 @@ module.exports = {
 		'skp',
 		'avif',
 		'eps',
-		'lzh'
+		'lzh',
+		'pgp',
+		'asar'
 	],
 	mimeTypes: [
 		'image/jpeg',
@@ -145,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',
@@ -256,6 +260,8 @@ module.exports = {
 		'video/MP2P',
 		'application/vnd.sketchup.skp',
 		'image/avif',
-		'application/x-lzh-compressed'
+		'application/x-lzh-compressed',
+		'application/pgp-encrypted',
+		'application/x-asar'
 	]
 };