Merge pull request #1 from closeio/relax_mp3_detection_algorithm

philfreo · web-flow · commit 307b4f65d6d9 · 2018-08-17T11:18:37.000-04:00
Relax mp3 detection algorithm since it had false negatives
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Close.io
+Copyright (c) 2018 Close.io
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ function(filevalidator) {
 
     fileInput.addEventListener('change', function(e) {
         var file = e.currentTarget.files[0];
-        FileDetector.verifyFileType(file, ['mp3', 'wav'], function(valid) {
+        filevalidator.verifyFileType(file, ['mp3', 'wav'], function(valid) {
             alert('Valid mp3 or wave file: ' + !!valid);
         });
     });
diff --git a/filevalidator.js b/filevalidator.js
@@ -11,7 +11,15 @@ function(_) {
             // MPEG-1 Layer 3 file without an ID3 tag or with an ID3v1 tag (which's appended at the end of the file)
             [0xFF, 0xFB],
             // MP3 file with an ID3v2 container
-            [0x49, 0x44, 0x33]
+            [0x49, 0x44, 0x33],
+            // Other MP3 files (FF Fx and FF Ex – they may cause false-positives)
+            // Headers taken from https://www.garykessler.net/library/file_sigs.html
+            [0xFF, 0xE0], [0xFF, 0xE1], [0xFF, 0xE2], [0xFF, 0xE3], [0xFF, 0xE4],
+            [0xFF, 0xE5], [0xFF, 0xE6], [0xFF, 0xE7], [0xFF, 0xE8], [0xFF, 0xE9],
+            [0xFF, 0xEA], [0xFF, 0xEB], [0xFF, 0xEC], [0xFF, 0xED], [0xFF, 0xEE], [0xFF, 0xEF],
+            [0xFF, 0xF0], [0xFF, 0xF1], [0xFF, 0xF2], [0xFF, 0xF3], [0xFF, 0xF4],
+            [0xFF, 0xF5], [0xFF, 0xF6], [0xFF, 0xF7], [0xFF, 0xF8], [0xFF, 0xF9],
+            [0xFF, 0xFA], [0xFF, 0xFB], [0xFF, 0xFC], [0xFF, 0xFD], [0xFF, 0xFE], [0xFF, 0xFF]
         ],
         'wav': [
             // Waveform Audio File Format
diff --git a/package.json b/package.json
@@ -1,11 +1,8 @@
 {
   "name": "filevalidator",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "File signature validation in JavaScript",
   "main": "filevalidator.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "author": "Phil Freo <phil@philfreo.com> (http://philfreo.com/)",
   "license": "MIT"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "filevalidator",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"description": "File signature validation in JavaScript",`
`5`	`5`	`"main": "filevalidator.js",`
`6`		`- "scripts": {`
`7`		`- "test": "echo \"Error: no test specified\" && exit 1"`
`8`		`- },`
`9`	`6`	`"author": "Phil Freo <phil@philfreo.com> (http://philfreo.com/)",`
`10`	`7`	`"license": "MIT"`
`11`	`8`	`}`