Update JIMP (#2171)

src/core/operations/ConvertImageFormat.mjs

@@ -8,13 +8,12 @@ import Operation from "../Operation.mjs";
 import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime, PNGFilterType } from "jimp";
 
 /**
  * Convert Image Format operation
  */
 class ConvertImageFormat extends Operation {
-
     /**
      * ConvertImageFormat constructor
      */
@@ -23,7 +22,8 @@ class ConvertImageFormat extends Operation {
 
         this.name = "Convert Image Format";
         this.module = "Image";
-        this.description = "Converts an image between different formats. Supported formats:<br><ul><li>Joint Photographic Experts Group (JPEG)</li><li>Portable Network Graphics (PNG)</li><li>Bitmap (BMP)</li><li>Tagged Image File Format (TIFF)</li></ul><br>Note: GIF files are supported for input, but cannot be outputted.";
+        this.description =
+            "Converts an image between different formats. Supported formats:<br><ul><li>Joint Photographic Experts Group (JPEG)</li><li>Portable Network Graphics (PNG)</li><li>Bitmap (BMP)</li><li>Tagged Image File Format (TIFF)</li></ul><br>Note: GIF files are supported for input, but cannot be outputted.";
         this.infoURL = "https://wikipedia.org/wiki/Image_file_formats";
         this.inputType = "ArrayBuffer";
         this.outputType = "ArrayBuffer";
@@ -32,39 +32,27 @@ class ConvertImageFormat extends Operation {
             {
                 name: "Output Format",
                 type: "option",
-                value: [
-                    "JPEG",
-                    "PNG",
-                    "BMP",
-                    "TIFF"
-                ]
+                value: ["JPEG", "PNG", "BMP", "TIFF"],
             },
             {
                 name: "JPEG Quality",
                 type: "number",
                 value: 80,
                 min: 1,
-                max: 100
+                max: 100,
             },
             {
                 name: "PNG Filter Type",
                 type: "option",
-                value: [
-                    "Auto",
-                    "None",
-                    "Sub",
-                    "Up",
-                    "Average",
-                    "Paeth"
-                ]
+                value: ["Auto", "None", "Sub", "Up", "Average", "Paeth"],
             },
             {
                 name: "PNG Deflate Level",
                 type: "number",
                 value: 9,
                 min: 0,
-                max: 9
-            }
+                max: 9,
+            },
         ];
     }
 
@@ -76,19 +64,19 @@ class ConvertImageFormat extends Operation {
     async run(input, args) {
         const [format, jpegQuality, pngFilterType, pngDeflateLevel] = args;
         const formatMap = {
-            "JPEG": Jimp.MIME_JPEG,
-            "PNG": Jimp.MIME_PNG,
-            "BMP": Jimp.MIME_BMP,
-            "TIFF": Jimp.MIME_TIFF
+            JPEG: JimpMime.jpeg,
+            PNG: JimpMime.png,
+            BMP: JimpMime.bmp,
+            TIFF: JimpMime.tiff,
         };
 
         const pngFilterMap = {
-            "Auto": Jimp.PNG_FILTER_AUTO,
-            "None": Jimp.PNG_FILTER_NONE,
-            "Sub": Jimp.PNG_FILTER_SUB,
-            "Up": Jimp.PNG_FILTER_UP,
-            "Average": Jimp.PNG_FILTER_AVERAGE,
-            "Paeth": Jimp.PNG_FILTER_PATH
+            Auto: PNGFilterType.AUTO,
+            None: PNGFilterType.NONE,
+            Sub: PNGFilterType.SUB,
+            Up: PNGFilterType.UP,
+            Average: PNGFilterType.AVERAGE,
+            Paeth: PNGFilterType.PATH,
         };
 
         const mime = formatMap[format];
@@ -103,18 +91,25 @@ class ConvertImageFormat extends Operation {
             throw new OperationError(`Error opening image file. (${err})`);
         }
         try {
-            switch (format) {
-                case "JPEG":
-                    image.quality(jpegQuality);
+            let buffer;
+            switch (mime) {
+                case JimpMime.jpeg:
+                    buffer = await image.getBuffer(mime, {
+                        quality: jpegQuality,
+                    });
                     break;
-                case "PNG":
-                    image.filterType(pngFilterMap[pngFilterType]);
-                    image.deflateLevel(pngDeflateLevel);
+                case JimpMime.png:
+                    buffer = await image.getBuffer(mime, {
+                        filterType: pngFilterMap[pngFilterType],
+                        deflateLevel: pngDeflateLevel,
+                    });
+                    break;
+                default:
+                    buffer = await image.getBuffer(mime);
                     break;
             }
 
-            const imageBuffer = await image.getBufferAsync(mime);
-            return imageBuffer.buffer;
+            return buffer.buffer;
         } catch (err) {
             throw new OperationError(`Error converting image format. (${err})`);
         }
@@ -137,7 +132,6 @@ class ConvertImageFormat extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default ConvertImageFormat;