cyberchef 10.22.0 → 10.23.0

package/src/core/operations/FlipImage.mjs

@@ -9,13 +9,12 @@ import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
 import { isWorkerEnvironment } from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Flip Image operation
  */
 class FlipImage extends Operation {
-
     /**
      * FlipImage constructor
      */
@@ -33,8 +32,8 @@ class FlipImage extends Operation {
             {
                 name: "Axis",
                 type: "option",
-                value: ["Horizontal", "Vertical"]
-            }
+                value: ["Horizontal", "Vertical"],
+            },
         ];
     }
 
@@ -60,18 +59,24 @@ class FlipImage extends Operation {
                 self.sendStatusMessage("Flipping image...");
             switch (flipAxis) {
                 case "Horizontal":
-                    image.flip(true, false);
+                    image.flip({
+                        horizontal: true,
+                        vertical: false,
+                    });
                     break;
                 case "Vertical":
-                    image.flip(false, true);
+                    image.flip({
+                        horizontal: false,
+                        vertical: true,
+                    });
                     break;
             }
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
@@ -95,7 +100,6 @@ class FlipImage extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default FlipImage;

package/src/core/operations/GenerateImage.mjs

@@ -7,16 +7,15 @@
 import Operation from "../Operation.mjs";
 import OperationError from "../errors/OperationError.mjs";
 import Utils from "../Utils.mjs";
-import {isImage} from "../lib/FileType.mjs";
-import {toBase64} from "../lib/Base64.mjs";
-import {isWorkerEnvironment} from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { isImage } from "../lib/FileType.mjs";
+import { toBase64 } from "../lib/Base64.mjs";
+import { isWorkerEnvironment } from "../Utils.mjs";
+import { Jimp, JimpMime, ResizeStrategy, rgbaToInt } from "jimp";
 
 /**
  * Generate Image operation
  */
 class GenerateImage extends Operation {
-
     /**
      * GenerateImage constructor
      */
@@ -25,27 +24,28 @@ class GenerateImage extends Operation {
 
         this.name = "Generate Image";
         this.module = "Image";
-        this.description = "Generates an image using the input as pixel values.";
+        this.description =
+            "Generates an image using the input as pixel values.";
         this.infoURL = "";
         this.inputType = "ArrayBuffer";
         this.outputType = "ArrayBuffer";
         this.presentType = "html";
         this.args = [
             {
-                "name": "Mode",
-                "type": "option",
-                "value": ["Greyscale", "RG", "RGB", "RGBA", "Bits"]
+                name: "Mode",
+                type: "option",
+                value: ["Greyscale", "RG", "RGB", "RGBA", "Bits"],
             },
             {
-                "name": "Pixel Scale Factor",
-                "type": "number",
-                "value": 8,
+                name: "Pixel Scale Factor",
+                type: "number",
+                value: 8,
             },
             {
-                "name": "Pixels per row",
-                "type": "number",
-                "value": 64,
-            }
+                name: "Pixels per row",
+                type: "number",
+                value: 64,
+            },
         ];
     }
 
@@ -67,21 +67,23 @@ class GenerateImage extends Operation {
         }
 
         const bytePerPixelMap = {
-            "Greyscale": 1,
-            "RG": 2,
-            "RGB": 3,
-            "RGBA": 4,
-            "Bits": 1/8,
+            Greyscale: 1,
+            RG: 2,
+            RGB: 3,
+            RGBA: 4,
+            Bits: 1 / 8,
         };
 
         const bytesPerPixel = bytePerPixelMap[mode];
 
-        if (bytesPerPixel > 0 && input.length % bytesPerPixel  !== 0) {
-            throw new OperationError(`Number of bytes is not a divisor of ${bytesPerPixel}`);
+        if (bytesPerPixel > 0 && input.length % bytesPerPixel !== 0) {
+            throw new OperationError(
+                `Number of bytes is not a divisor of ${bytesPerPixel}`,
+            );
         }
 
         const height = Math.ceil(input.length / bytesPerPixel / width);
-        const image = await new Jimp(width, height, (err, image) => {});
+        const image = new Jimp({ width, height });
 
         if (isWorkerEnvironment())
             self.sendStatusMessage("Generating image from data...");
@@ -94,8 +96,8 @@ class GenerateImage extends Operation {
                     const x = index % width;
                     const y = Math.floor(index / width);
 
-                    const value = curByte[k] === "0" ? 0xFF : 0x00;
-                    const pixel = Jimp.rgbaToInt(value, value, value, 0xFF);
+                    const value = curByte[k] === "0" ? 0xff : 0x00;
+                    const pixel = rgbaToInt(value, value, value, 0xff);
                     image.setPixelColor(pixel, x, y);
                 }
             }
@@ -109,7 +111,7 @@ class GenerateImage extends Operation {
                 let red = 0x00;
                 let green = 0x00;
                 let blue = 0x00;
-                let alpha = 0xFF;
+                let alpha = 0xff;
 
                 switch (mode) {
                     case "Greyscale":
@@ -139,10 +141,12 @@ class GenerateImage extends Operation {
                 }
 
                 try {
-                    const pixel = Jimp.rgbaToInt(red, green, blue, alpha);
+                    const pixel = rgbaToInt(red, green, blue, alpha);
                     image.setPixelColor(pixel, x, y);
                 } catch (err) {
-                    throw new OperationError(`Error while generating image from pixel values. (${err})`);
+                    throw new OperationError(
+                        `Error while generating image from pixel values. (${err})`,
+                    );
                 }
             }
         }
@@ -151,11 +155,15 @@ class GenerateImage extends Operation {
             if (isWorkerEnvironment())
                 self.sendStatusMessage("Scaling image...");
 
-            image.scaleToFit(width*scale, height*scale, Jimp.RESIZE_NEAREST_NEIGHBOR);
+            image.scaleToFit({
+                w: width * scale,
+                h: height * scale,
+                mode: ResizeStrategy.NEAREST_NEIGHBOR,
+            });
         }
 
         try {
-            const imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            const imageBuffer = await image.getBuffer(JimpMime.png);
             return imageBuffer.buffer;
         } catch (err) {
             throw new OperationError(`Error generating image. (${err})`);
@@ -178,7 +186,6 @@ class GenerateImage extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default GenerateImage;

package/src/core/operations/ImageBrightnessContrast.mjs

@@ -9,13 +9,12 @@ import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
 import { isWorkerEnvironment } from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Image Brightness / Contrast operation
  */
 class ImageBrightnessContrast extends Operation {
-
     /**
      * ImageBrightnessContrast constructor
      */
@@ -35,15 +34,15 @@ class ImageBrightnessContrast extends Operation {
                 type: "number",
                 value: 0,
                 min: -100,
-                max: 100
+                max: 100,
             },
             {
                 name: "Contrast",
                 type: "number",
                 value: 0,
                 min: -100,
-                max: 100
-            }
+                max: 100,
+            },
         ];
     }
 
@@ -77,14 +76,16 @@ class ImageBrightnessContrast extends Operation {
             }
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
-            throw new OperationError(`Error adjusting image brightness or contrast. (${err})`);
+            throw new OperationError(
+                `Error adjusting image brightness or contrast. (${err})`,
+            );
         }
     }
 
@@ -104,7 +105,6 @@ class ImageBrightnessContrast extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default ImageBrightnessContrast;

package/src/core/operations/ImageFilter.mjs

@@ -9,13 +9,12 @@ import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
 import { isWorkerEnvironment } from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Image Filter operation
  */
 class ImageFilter extends Operation {
-
     /**
      * ImageFilter constructor
      */
@@ -33,11 +32,8 @@ class ImageFilter extends Operation {
             {
                 name: "Filter type",
                 type: "option",
-                value: [
-                    "Greyscale",
-                    "Sepia"
-                ]
-            }
+                value: ["Greyscale", "Sepia"],
+            },
         ];
     }
 
@@ -60,7 +56,11 @@ class ImageFilter extends Operation {
         }
         try {
             if (isWorkerEnvironment())
-                self.sendStatusMessage("Applying " + filterType.toLowerCase() + " filter to image...");
+                self.sendStatusMessage(
+                    "Applying " +
+                        filterType.toLowerCase() +
+                        " filter to image...",
+                );
             if (filterType === "Greyscale") {
                 image.greyscale();
             } else {
@@ -68,14 +68,16 @@ class ImageFilter extends Operation {
             }
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
-            throw new OperationError(`Error applying filter to image. (${err})`);
+            throw new OperationError(
+                `Error applying filter to image. (${err})`,
+            );
         }
     }
 
@@ -95,7 +97,6 @@ class ImageFilter extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default ImageFilter;

package/src/core/operations/ImageHueSaturationLightness.mjs

@@ -9,13 +9,12 @@ import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
 import { isWorkerEnvironment } from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Image Hue/Saturation/Lightness operation
  */
 class ImageHueSaturationLightness extends Operation {
-
     /**
      * ImageHueSaturationLightness constructor
      */
@@ -24,7 +23,8 @@ class ImageHueSaturationLightness extends Operation {
 
         this.name = "Image Hue/Saturation/Lightness";
         this.module = "Image";
-        this.description = "Adjusts the hue / saturation / lightness (HSL) values of an image.";
+        this.description =
+            "Adjusts the hue / saturation / lightness (HSL) values of an image.";
         this.infoURL = "";
         this.inputType = "ArrayBuffer";
         this.outputType = "ArrayBuffer";
@@ -35,22 +35,22 @@ class ImageHueSaturationLightness extends Operation {
                 type: "number",
                 value: 0,
                 min: -360,
-                max: 360
+                max: 360,
             },
             {
                 name: "Saturation",
                 type: "number",
                 value: 0,
                 min: -100,
-                max: 100
+                max: 100,
             },
             {
                 name: "Lightness",
                 type: "number",
                 value: 0,
                 min: -100,
-                max: 100
-            }
+                max: 100,
+            },
         ];
     }
 
@@ -76,43 +76,45 @@ class ImageHueSaturationLightness extends Operation {
             if (hue !== 0) {
                 if (isWorkerEnvironment())
                     self.sendStatusMessage("Changing image hue...");
-                image.colour([
+                image.color([
                     {
                         apply: "hue",
-                        params: [hue]
-                    }
+                        params: [hue],
+                    },
                 ]);
             }
             if (saturation !== 0) {
                 if (isWorkerEnvironment())
                     self.sendStatusMessage("Changing image saturation...");
-                image.colour([
+                image.color([
                     {
                         apply: "saturate",
-                        params: [saturation]
-                    }
+                        params: [saturation],
+                    },
                 ]);
             }
             if (lightness !== 0) {
                 if (isWorkerEnvironment())
                     self.sendStatusMessage("Changing image lightness...");
-                image.colour([
+                image.color([
                     {
                         apply: "lighten",
-                        params: [lightness]
-                    }
+                        params: [lightness],
+                    },
                 ]);
             }
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
-            throw new OperationError(`Error adjusting image hue / saturation / lightness. (${err})`);
+            throw new OperationError(
+                `Error adjusting image hue / saturation / lightness. (${err})`,
+            );
         }
     }
 

package/src/core/operations/ImageOpacity.mjs

@@ -9,13 +9,12 @@ import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
 import { isWorkerEnvironment } from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Image Opacity operation
  */
 class ImageOpacity extends Operation {
-
     /**
      * ImageOpacity constructor
      */
@@ -35,8 +34,8 @@ class ImageOpacity extends Operation {
                 type: "number",
                 value: 100,
                 min: 0,
-                max: 100
-            }
+                max: 100,
+            },
         ];
     }
 
@@ -63,10 +62,10 @@ class ImageOpacity extends Operation {
             image.opacity(opacity / 100);
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
@@ -90,7 +89,6 @@ class ImageOpacity extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default ImageOpacity;

package/src/core/operations/InvertImage.mjs

@@ -9,13 +9,12 @@ import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
 import { isWorkerEnvironment } from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Invert Image operation
  */
 class InvertImage extends Operation {
-
     /**
      * InvertImage constructor
      */
@@ -54,10 +53,10 @@ class InvertImage extends Operation {
             image.invert();
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
@@ -81,7 +80,6 @@ class InvertImage extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default InvertImage;

package/src/core/operations/Jq.mjs

@@ -30,7 +30,12 @@ class Jq extends Operation {
                 name: "Query",
                 type: "string",
                 value: ""
-            }
+            },
+            {
+                name: "Raw",
+                type: "boolean",
+                value: false
+            },
         ];
     }
 
@@ -40,7 +45,7 @@ class Jq extends Operation {
      * @returns {string}
      */
     run(input, args) {
-        const [query] = args;
+        const [query, raw] = args;
         let result;
 
         try {
@@ -48,8 +53,11 @@ class Jq extends Operation {
         } catch (err) {
             throw new OperationError(`Invalid jq expression: ${err.message}`);
         }
-
-        return JSON.stringify(result);
+        if (raw && typeof result === "string") {
+            return result;
+        } else {
+            return JSON.stringify(result);
+        }
     }
 
 }

package/src/core/operations/NormaliseImage.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 } from "jimp";
 
 /**
  * Normalise Image operation
  */
 class NormaliseImage extends Operation {
-
     /**
      * NormaliseImage constructor
      */
@@ -27,7 +26,7 @@ class NormaliseImage extends Operation {
         this.infoURL = "";
         this.inputType = "ArrayBuffer";
         this.outputType = "ArrayBuffer";
-        this.presentType=  "html";
+        this.presentType = "html";
         this.args = [];
     }
 
@@ -52,10 +51,10 @@ class NormaliseImage extends Operation {
             image.normalize();
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
@@ -79,7 +78,6 @@ class NormaliseImage extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default NormaliseImage;

package/src/core/operations/OffsetChecker.mjs

@@ -99,7 +99,7 @@ class OffsetChecker extends Operation {
             }
         }
 
-        return outputs.join(sampleDelim);
+        return outputs.join(Utils.escapeHtml(sampleDelim));
     }
 
 }