Better optimization

smddzcy · smddzcy · commit 909ce7a2ae1f · 2019-06-12T05:17:46.000+03:00
diff --git a/lib/uploadhandler.js b/lib/uploadhandler.js
@@ -117,12 +117,21 @@ module.exports = function (options) {
                         var ext = path.extname(fileInfo.originalName);
                         // optimize the image
                         if (ext.endsWith('png')) {
-                            await op.png({
-                                compressionLevel: 9,
-                                quality: 80,
-                                adaptiveFiltering: true,
-                            }).toFile(file.path)
-                            ext = '.png';
+                            var metadata = await sharp(data).metadata()
+                            if (metadata.hasAlpha) {
+                                await op.webp({ quality: 80, alphaQuality: 80 }).toFile(file.path)
+                                data = fs.readFileSync(file.path);
+                                await sharp(data).png({ compressionLevel: 9 }).toFile(file.path)
+                                ext = '.png';
+                            } else {
+                                // just convert to jpeg
+                                await op.jpeg({
+                                    quality: 80,
+                                    chromaSubsampling: '4:4:4',
+                                    optimiseScans: true,
+                                }).toFile(file.path)
+                                ext = '.jpg';
+                            }
                         } else if (ext.endsWith('webp')) {
                             await op.png({
                                 quality: 80,
@@ -132,6 +141,7 @@ module.exports = function (options) {
                             await op.jpeg({
                                 quality: 80,
                                 chromaSubsampling: '4:4:4',
+                                optimiseScans: true,
                             }).toFile(file.path)
                             ext = '.jpg';
                         }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "express",
     "middleware"
   ],
-  "version": "0.2.1",
+  "version": "0.2.2",
   "dependencies": {
     "async": "*",
     "formidable": ">=1.0.11",
@@ -30,6 +30,6 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "_id": "jquery-file-upload-middleware@0.2.1",
+  "_id": "jquery-file-upload-middleware@0.2.2",
   "license": "MIT"
 }
