@tryghost/image-transform 1.2.10 → 1.3.0

package/lib/transform.js

@@ -2,6 +2,8 @@ const errors = require('@tryghost/errors');
 const fs = require('fs-extra');
 const path = require('path');
 
+const DEFAULT_PROCESSING_TIMEOUT_SECONDS = 0; // 0 means no timeout
+
 /**
  * Check if this tool can handle any file transformations as Sharp is an optional dependency
  */
@@ -58,13 +60,14 @@ const canTransformToFormat = format => [
   * https://github.com/lovell/sharp/issues/1360.
   *
   * Resize an image referenced by the `in` path and write it to the `out` path
-  * @param {{in, out, width}} options
+  * @param {{in, out, width, timeout}} options
   */
 const unsafeResizeFromPath = (options = {}) => {
     return fs.readFile(options.in)
         .then((data) => {
             return unsafeResizeFromBuffer(data, {
-                width: options.width
+                width: options.width,
+                timeout: options.timeout
             });
         })
         .then((data) => {
@@ -76,7 +79,7 @@ const unsafeResizeFromPath = (options = {}) => {
  * Resize an image
  *
  * @param {Buffer} originalBuffer image to resize
- * @param {{width?: number, height?: number, format?: keyof import('sharp').FormatEnum, animated?: boolean, withoutEnlargement?: boolean}} [options]
+ * @param {{width?: number, height?: number, format?: keyof import('sharp').FormatEnum, animated?: boolean, withoutEnlargement?: boolean, timeout:? number}} [options]
  *  options.animated defaults to true for file formats where animation is supported (will always maintain animation if possible)
  * @returns {Promise<Buffer>} the resizedBuffer
  */
@@ -105,10 +108,19 @@ const unsafeResizeFromBuffer = async (originalBuffer, options = {}) => {
             withoutEnlargement: options.withoutEnlargement ?? true
         })
         // CASE: Automatically remove metadata and rotate based on the orientation.
-        .rotate();
+        .rotate()
+        .timeout({seconds: options.timeout || DEFAULT_PROCESSING_TIMEOUT_SECONDS});
+
+    const metadata = await s.metadata();
 
     if (options.format) {
-        s = s.toFormat(options.format);
+        if (options.format === 'jpeg') {
+            s.jpeg({mozjpeg: true}); // .jpeg sets format
+        } else {
+            s = s.toFormat(options.format);
+        }
+    } else if (metadata.format === 'jpeg') {
+        s.jpeg({mozjpeg: true}); // .jpeg sets format
     }
 
     const resizedBuffer = await s.toBuffer();
@@ -154,3 +166,4 @@ module.exports.canTransformToFormat = canTransformToFormat;
 module.exports.generateOriginalImageName = generateOriginalImageName;
 module.exports.resizeFromPath = makeSafe(unsafeResizeFromPath);
 module.exports.resizeFromBuffer = makeSafe(unsafeResizeFromBuffer);
+module.exports.DEFAULT_PROCESSING_TIMEOUT_SECONDS = DEFAULT_PROCESSING_TIMEOUT_SECONDS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/image-transform",
-  "version": "1.2.10",
+  "version": "1.3.0",
   "repository": "https://github.com/TryGhost/SDK/tree/main/packages/image-transform",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -19,10 +19,10 @@
     "access": "public"
   },
   "devDependencies": {
-    "c8": "8.0.1",
-    "mocha": "10.2.0",
+    "c8": "9.1.0",
+    "mocha": "10.4.0",
     "should": "13.2.3",
-    "sinon": "17.0.0"
+    "sinon": "17.0.1"
   },
   "dependencies": {
     "@tryghost/errors": "^1.2.26",
@@ -31,5 +31,5 @@
   "optionalDependencies": {
     "sharp": "^0.32.0"
   },
-  "gitHead": "77a1645eadd5ce2c2a747a95405f6d8b15ea4e45"
+  "gitHead": "048ccde4bd78d2dcd60e778d03eb8dc3227cece5"
 }