Merge remote-tracking branch 'origin/hotfix/jochem-fix-resize-quality…

…' into v2.x

.env.example

@@ -3,6 +3,7 @@ SERVICE_NAME=
 
 BUCKET=
 # IMAGE_ACL="public-read"
+# IMAGE_QUALITY=80
 
 # Deployment options:
 DEPLOYMENT_BUCKET=

README.md

@@ -89,6 +89,10 @@ The following environment variables are mandatory:
 - `SERVERLESS_ROLE`: the role assumed by the Lambda function.
 - `SERVICE_NAME`: the name of the Lambda function, defaults to "imageScaler".
 
+The following environment variables are optional:
+
+- `QUALITY`: the format option quality setting for all image types. (integer: 1-100)
+
 ##### Defining SERVERLESS_ROLE
 
 Create a role which Lambda functions are allowed to assume. Add the following trust relationship:

index.js

@@ -7,7 +7,7 @@ const getImageMimetype = require("./util/get-image-mime-type.js");
 
 const S3 = new AWS.S3();
 
-const { BUCKET, IMAGE_ACL } = process.env;
+const { BUCKET, IMAGE_ACL, IMAGE_QUALITY } = process.env;
 const ALLOWED_EXTENSIONS = ["jpeg", "jpg", "png", "webp", "gif", "svg", "jfif"];
 
 module.exports.handler = async function handler(event, context, callback) {
@@ -19,10 +19,14 @@ module.exports.handler = async function handler(event, context, callback) {
       key,
       ALLOWED_EXTENSIONS
     );
+    const quality = parseInt(IMAGE_QUALITY);
 
     console.log(`Using path: ${path}`);
     console.log(`Using dimensions: ${size}`);
     console.log(`Using output-format: ${outputFormat}`);
+    if (quality) {
+      console.log(`Using quality: ${quality}`);
+    }
 
     // Note: both dimensions are optional, but either width or height should always be present.
     const dimensions = size.split("x");
@@ -46,14 +50,15 @@ module.exports.handler = async function handler(event, context, callback) {
       height,
       fit: "cover",
     });
+
     /**
      * Note: resizing SVG doesn't make sense.
      * In that case, simply re-upload the original image to the new destination.
      */
     const buffer =
       outputFormat === "svg" && originalExtension === "svg"
         ? objectBody
-        : await resizeImage(objectBody, outputFormat, options);
+        : await resizeImage(objectBody, outputFormat, options, quality);
 
     /**
      * Store the new image on the originally requested path in the bucket.

server/index.js

@@ -1,10 +1,14 @@
+const dotenv = require("dotenv");
 const express = require("express");
 const fs = require("fs");
 const pathToParams = require("../util/pathToParams.js");
 const toSharpOptions = require("../util/toSharpOptions.js");
 const resizeImage = require("../util/resizeImage.js");
 const getImageMimetype = require("../util/get-image-mime-type.js");
 
+dotenv.config();
+const { IMAGE_QUALITY } = process.env;
+
 const app = express();
 
 // TODO nice to make the port configurable.
@@ -36,10 +40,14 @@ app.get("*", async function (req, res, next) {
       res.sendStatus(404);
       return;
     }
+    const quality = parseInt(IMAGE_QUALITY);
 
     console.log(`Using path: ${path}`);
     console.log(`Using dimensions: ${size}`);
     console.log(`Using output-format: ${outputFormat}`);
+    if (quality) {
+      console.log(`Using quality: ${quality}`);
+    }
 
     // Note: both dimensions are optional, but either width or height should always be present.
     const dimensions = size.split("x");
@@ -73,7 +81,7 @@ app.get("*", async function (req, res, next) {
     const buffer =
       outputFormat === "svg" && originalExtension === "svg"
         ? objectBody
-        : await resizeImage(objectBody, outputFormat, options);
+        : await resizeImage(objectBody, outputFormat, options, quality);
 
     /**
      * Redirect the user back to the originally requested path.

serverless.yml

@@ -25,6 +25,7 @@ provider:
   environment:
     BUCKET: ${env:BUCKET}
     IMAGE_ACL: ${env:IMAGE_ACL,""}
+    IMAGE_QUALITY: ${env:IMAGE_QUALITY}
 
 functions:
   main:

util/resizeImage.js

@@ -4,11 +4,15 @@ const SHARP = require("sharp");
  * Resize an image.
  * Pass it the contents of the original file, the output format and further Sharp options.
  */
-function resizeImage(body, outputFormat, sharpOptions) {
+function resizeImage(body, outputFormat, sharpOptions, quality) {
+  const options = { progressive: true };
+  if (quality) {
+    options.quality = quality;
+  }
   return SHARP(body)
     .withMetadata()
     .resize(sharpOptions)
-    .toFormat(toSharpOutputFormat(outputFormat), { progressive: true })
+    .toFormat(toSharpOutputFormat(outputFormat), options)
     .toBuffer();
 }