file-type 16.1.0 → 16.2.0

package/core.d.ts

@@ -136,7 +136,8 @@ declare namespace core {
 		| 'pgp'
 		| 'asar'
 		| 'stl'
-		| 'chm';
+		| 'chm'
+		| '3mf';
 
 	type MimeType =
 		| 'image/jpeg'
@@ -266,7 +267,8 @@ declare namespace core {
 		| 'application/pgp-encrypted'
 		| 'application/x-asar'
 		| 'model/stl'
-		| 'application/vnd.ms-htmlhelp';
+		| 'application/vnd.ms-htmlhelp'
+		| 'model/3mf';
 
 	interface FileTypeResult {
 		/**

package/core.js

@@ -55,15 +55,6 @@ function _check(buffer, headers, options) {
 	return true;
 }
 
-async function _checkSequence(sequence, tokenizer, ignoreBytes) {
-	const buffer = Buffer.alloc(minimumBytes);
-	await tokenizer.ignore(ignoreBytes);
-
-	await tokenizer.peekBuffer(buffer, {mayBeLess: true});
-
-	return buffer.includes(Buffer.from(sequence));
-}
-
 async function fromTokenizer(tokenizer) {
 	try {
 		return _fromTokenizer(tokenizer);
@@ -79,7 +70,6 @@ async function _fromTokenizer(tokenizer) {
 	const bytesRead = 12;
 	const check = (header, options) => _check(buffer, header, options);
 	const checkString = (header, options) => check(stringToBytes(header), options);
-	const checkSequence = (sequence, ignoreBytes) => _checkSequence(sequence, tokenizer, ignoreBytes);
 
 	// Keep reading until EOF if the file size is unknown.
 	if (!tokenizer.fileInfo.size) {
@@ -318,6 +308,13 @@ async function _fromTokenizer(tokenizer) {
 					};
 				}
 
+				if (zipHeader.filename.startsWith('3D/') && zipHeader.filename.endsWith('.model')) {
+					return {
+						ext: '3mf',
+						mime: 'model/3mf'
+					};
+				}
+
 				// The docx, xlsx and pptx file types extend the Office Open XML file format:
 				// https://en.wikipedia.org/wiki/Office_Open_XML_file_formats
 				// We look for:
@@ -589,9 +586,13 @@ async function _fromTokenizer(tokenizer) {
 	}
 
 	if (checkString('%PDF')) {
+		await tokenizer.ignore(1350);
+		const maxBufferSize = 10 * 1024 * 1024;
+		const buffer = Buffer.alloc(Math.min(maxBufferSize, tokenizer.fileInfo.size));
+		await tokenizer.readBuffer(buffer, {mayBeLess: true});
+
 		// Check if this is an Adobe Illustrator file
-		const isAiFile = await checkSequence('Adobe Illustrator', 1350);
-		if (isAiFile) {
+		if (buffer.includes(Buffer.from('AIPrivateData'))) {
 			return {
 				ext: 'ai',
 				mime: 'application/postscript'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "16.1.0",
+	"version": "16.2.0",
 	"description": "Detect the file type of a Buffer/Uint8Array/ArrayBuffer",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -180,7 +180,8 @@
 		"pgp",
 		"asar",
 		"stl",
-		"chm"
+		"chm",
+		"3mf"
 	],
 	"devDependencies": {
 		"@types/node": "^13.1.4",

package/readme.md

@@ -405,6 +405,7 @@ Returns a set of supported MIME types.
 - [`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)
 - [`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
 
 *Pull requests are welcome for additional commonly used file types.*
 

package/supported.js

@@ -134,7 +134,8 @@ module.exports = {
 		'pgp',
 		'asar',
 		'stl',
-		'chm'
+		'chm',
+		'3mf'
 	],
 	mimeTypes: [
 		'image/jpeg',
@@ -264,6 +265,7 @@ module.exports = {
 		'application/pgp-encrypted',
 		'application/x-asar',
 		'model/stl',
-		'application/vnd.ms-htmlhelp'
+		'application/vnd.ms-htmlhelp',
+		'model/3mf'
 	]
 };