file-type 20.0.0 → 20.1.0

package/core.js

@@ -476,13 +476,6 @@ export class FileTypeParser {
 			};
 		}
 
-		if (this.checkString('WEBP', {offset: 8})) {
-			return {
-				ext: 'webp',
-				mime: 'image/webp',
-			};
-		}
-
 		// Musepack, SV8
 		if (this.checkString('MPCK')) {
 			return {
@@ -726,17 +719,19 @@ export class FileTypeParser {
 
 		if (this.checkString('%PDF')) {
 			try {
-				await tokenizer.ignore(1350);
-				const maxBufferSize = 10 * 1024 * 1024;
-				const buffer = new Uint8Array(Math.min(maxBufferSize, tokenizer.fileInfo.size));
-				await tokenizer.readBuffer(buffer, {mayBeLess: true});
-
-				// Check if this is an Adobe Illustrator file
-				if (includes(buffer, new TextEncoder().encode('AIPrivateData'))) {
-					return {
-						ext: 'ai',
-						mime: 'application/postscript',
-					};
+				const skipBytes = 1350;
+				if (skipBytes === await tokenizer.ignore(skipBytes)) {
+					const maxBufferSize = 10 * 1024 * 1024;
+					const buffer = new Uint8Array(Math.min(maxBufferSize, tokenizer.fileInfo.size - skipBytes));
+					await tokenizer.readBuffer(buffer, {mayBeLess: true});
+
+					// Check if this is an Adobe Illustrator file
+					if (includes(buffer, new TextEncoder().encode('AIPrivateData'))) {
+						return {
+							ext: 'ai',
+							mime: 'application/postscript',
+						};
+					}
 				}
 			} catch (error) {
 				// Swallow end of stream error if file is too small for the Adobe AI check
@@ -849,31 +844,6 @@ export class FileTypeParser {
 			}
 		}
 
-		// RIFF file format which might be AVI, WAV, QCP, etc
-		if (this.check([0x52, 0x49, 0x46, 0x46])) {
-			if (this.check([0x41, 0x56, 0x49], {offset: 8})) {
-				return {
-					ext: 'avi',
-					mime: 'video/vnd.avi',
-				};
-			}
-
-			if (this.check([0x57, 0x41, 0x56, 0x45], {offset: 8})) {
-				return {
-					ext: 'wav',
-					mime: 'audio/wav',
-				};
-			}
-
-			// QLCM, QCP file
-			if (this.check([0x51, 0x4C, 0x43, 0x4D], {offset: 8})) {
-				return {
-					ext: 'qcp',
-					mime: 'audio/qcelp',
-				};
-			}
-		}
-
 		if (this.checkString('SQLi')) {
 			return {
 				ext: 'sqlite',
@@ -1305,6 +1275,38 @@ export class FileTypeParser {
 
 		// -- 12-byte signatures --
 
+		// RIFF file format which might be AVI, WAV, QCP, etc
+		if (this.check([0x52, 0x49, 0x46, 0x46])) {
+			if (this.checkString('WEBP', {offset: 8})) {
+				return {
+					ext: 'webp',
+					mime: 'image/webp',
+				};
+			}
+
+			if (this.check([0x41, 0x56, 0x49], {offset: 8})) {
+				return {
+					ext: 'avi',
+					mime: 'video/vnd.avi',
+				};
+			}
+
+			if (this.check([0x57, 0x41, 0x56, 0x45], {offset: 8})) {
+				return {
+					ext: 'wav',
+					mime: 'audio/wav',
+				};
+			}
+
+			// QLCM, QCP file
+			if (this.check([0x51, 0x4C, 0x43, 0x4D], {offset: 8})) {
+				return {
+					ext: 'qcp',
+					mime: 'audio/qcelp',
+				};
+			}
+		}
+
 		if (this.check([0x49, 0x49, 0x55, 0x00, 0x18, 0x00, 0x00, 0x00, 0x88, 0xE7, 0x74, 0xD8])) {
 			return {
 				ext: 'rw2',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "file-type",
-	"version": "20.0.0",
+	"version": "20.1.0",
 	"description": "Detect the file type of a file, stream, or data",
 	"license": "MIT",
 	"repository": "sindresorhus/file-type",
@@ -238,7 +238,7 @@
 	],
 	"dependencies": {
 		"@tokenizer/inflate": "^0.2.6",
-		"strtok3": "^10.0.1",
+		"strtok3": "^10.2.0",
 		"token-types": "^6.0.0",
 		"uint8array-extras": "^1.4.0"
 	},

package/readme.md

@@ -20,6 +20,8 @@ npm install file-type
 
 If you use it with Webpack, you need the latest Webpack version and ensure you configure it correctly for ESM.
 
+File type detection is based on binary signatures (magic numbers) and should be treated as a best-effort hint, not a guarantee.
+
 ## Usage
 
 ### Node.js
@@ -256,15 +258,16 @@ console.log(fileType);
 Or use [`@tokenizer/s3`](https://github.com/Borewit/tokenizer-s3) to determine the file type of a file stored on [Amazon S3](https://aws.amazon.com/s3):
 
 ```js
-import S3 from 'aws-sdk/clients/s3';
-import {makeTokenizer} from '@tokenizer/s3';
+import {S3Client} from '@aws-sdk/client-s3';
+import {makeChunkedTokenizerFromS3} from '@tokenizer/s3';
 import {fileTypeFromTokenizer} from 'file-type';
 
 // Initialize the S3 client
-const s3 = new S3();
+// Initialize S3 client
+const s3 = new S3Client();
 
 // Initialize the S3 tokenizer.
-const s3Tokenizer = await makeTokenizer(s3, {
+const s3Tokenizer = await makeChunkedTokenizerFromS3(s3, {
 	Bucket: 'affectlab',
 	Key: '1min_35sec.mp4'
 });