Merge pull request #158 from wchaws/dev2

fix: disable gif enlarge and reduce high resolution png size

Author: wchaws

source/new-image-handler/src/processor/image/auto-orient.ts

@@ -13,6 +13,12 @@ export class AutoOrientAction extends BaseImageAction {
     ctx.features[Features.AutoOrient] = false;
   }
 
+  public beforeProcess(ctx: IImageContext, _2: string[], index: number): void {
+    if ('gif' === ctx.metadata.format) {
+      ctx.mask.disable(index);
+    }
+  }
+
   public validate(params: string[]): ReadOnly<AutoOrientOpts> {
     const opt: AutoOrientOpts = { auto: false };
 

source/new-image-handler/src/processor/image/index.ts

@@ -31,6 +31,8 @@ export interface IImageContext extends IProcessContext {
   info?: IImageInfo;
 }
 
+const MB = 1024 * 1024;
+
 export class ImageProcessor implements IProcessor {
   public static getInstance(): ImageProcessor {
     if (!ImageProcessor._instance) {
@@ -77,15 +79,14 @@ export class ImageProcessor implements IProcessor {
     if (ctx.features[Features.LimitAnimatedFrames] > 0) {
       image = sharp(buffer, { failOnError: false, animated: false });
       metadata = await image.metadata();
-      let cutGifFramesNum = ctx.features[Features.LimitAnimatedFrames];
       if (!('gif' === metadata.format)) {
         throw new InvalidArgument('Format must be Gif');
       }
       if (!(metadata.pages)) {
         throw new InvalidArgument('Can\'t read gif\'s pages');
       }
-      cutGifFramesNum = Math.min(cutGifFramesNum, metadata.pages);
-      image = sharp(buffer, { failOnError: false, animated: ctx.features[Features.ReadAllAnimatedFrames], pages: cutGifFramesNum });
+      const pages = Math.min(ctx.features[Features.LimitAnimatedFrames], metadata.pages);
+      image = sharp(buffer, { failOnError: false, animated: ctx.features[Features.ReadAllAnimatedFrames], pages });
       metadata = await image.metadata();
     } else {
       image = sharp(buffer, { failOnError: false, animated: ctx.features[Features.ReadAllAnimatedFrames] });
@@ -94,6 +95,9 @@ export class ImageProcessor implements IProcessor {
     if ('gif' === metadata.format) {
       image.gif({ effort: 1 }); // https://github.com/lovell/sharp/issues/3176
     }
+    if ('png' === metadata.format && metadata.size && metadata.size > (5 * MB)) {
+      image.png({ adaptiveFiltering: true });
+    }
 
     return {
       uri: ctx.uri,

source/new-image-handler/src/processor/image/interlace.ts

@@ -24,10 +24,15 @@ export class InterlaceAction extends BaseImageAction {
     return opt;
   }
 
+  public beforeProcess(ctx: IImageContext, _2: string[], index: number): void {
+    if ('gif' === ctx.metadata.format) {
+      ctx.mask.disable(index);
+    }
+  }
 
   public async process(ctx: IImageContext, params: string[]): Promise<void> {
     const opt = this.validate(params);
-    const metadata = await ctx.image.metadata();
+    const metadata = ctx.metadata;
     if (('jpg' === metadata.format || 'jpeg' === metadata.format) && opt.interlace) {
       ctx.image.jpeg({ progressive: true });
     }

source/new-image-handler/src/processor/image/resize.ts

@@ -77,51 +77,67 @@ export class ResizeAction extends BaseImageAction {
     }
     return opt;
   }
-  public async process(ctx: IImageContext, params: string[]): Promise<void> {
-    const o = this.validate(params);
-    const opt: sharp.ResizeOptions = {
-      width: o.w,
-      height: o.h,
-      withoutEnlargement: o.limit,
-      background: o.color,
-    };
-    // Mode
-    if (o.m === Mode.LFIT) {
-      opt.fit = sharp.fit.inside;
-    } else if (o.m === Mode.MFIT) {
-      opt.fit = sharp.fit.outside;
-    } else if (o.m === Mode.FILL) {
-      opt.fit = sharp.fit.cover;
-    } else if (o.m === Mode.PAD) {
-      opt.fit = sharp.fit.contain;
-    } else if (o.m === Mode.FIXED) {
-      opt.fit = sharp.fit.fill;
-    }
+
+  public beforeProcess(ctx: IImageContext, params: string[], index: number): void {
     const metadata = ctx.metadata;
-    if (!(metadata.width && metadata.height)) {
-      throw new InvalidArgument('Can\'t read image\'s width and height');
+    if ('gif' === metadata.format) {
+      const opt = buildSharpOpt(ctx, this.validate(params));
+      const isEnlargingWidth = (opt.width && metadata.width && opt.width > metadata.width);
+      const isEnlargingHeight = (opt.height && metadata.pageHeight && (opt.height > metadata.pageHeight));
+      if (isEnlargingWidth || isEnlargingHeight) {
+        ctx.mask.disable(index);
+      }
     }
+  }
 
-    if (o.p && (!o.w) && (!o.h)) {
-      opt.withoutEnlargement = false;
-      opt.width = Math.round(metadata.width * o.p * 0.01);
-    } else {
-      if (o.l) {
-        if (metadata.width > metadata.height) {
-          opt.width = o.l;
-        } else {
-          opt.height = o.l;
-        }
+  public async process(ctx: IImageContext, params: string[]): Promise<void> {
+    const opt = buildSharpOpt(ctx, this.validate(params));
+    ctx.image.resize(null, null, opt);
+  }
+}
+
+function buildSharpOpt(ctx: IImageContext, o: ResizeOpts): sharp.ResizeOptions {
+  const opt: sharp.ResizeOptions = {
+    width: o.w,
+    height: o.h,
+    withoutEnlargement: o.limit,
+    background: o.color,
+  };
+  // Mode
+  if (o.m === Mode.LFIT) {
+    opt.fit = sharp.fit.inside;
+  } else if (o.m === Mode.MFIT) {
+    opt.fit = sharp.fit.outside;
+  } else if (o.m === Mode.FILL) {
+    opt.fit = sharp.fit.cover;
+  } else if (o.m === Mode.PAD) {
+    opt.fit = sharp.fit.contain;
+  } else if (o.m === Mode.FIXED) {
+    opt.fit = sharp.fit.fill;
+  }
+  const metadata = ctx.metadata;
+  if (!(metadata.width && metadata.height)) {
+    throw new InvalidArgument('Can\'t read image\'s width and height');
+  }
+
+  if (o.p && (!o.w) && (!o.h)) {
+    opt.withoutEnlargement = false;
+    opt.width = Math.round(metadata.width * o.p * 0.01);
+  } else {
+    if (o.l) {
+      if (metadata.width > metadata.height) {
+        opt.width = o.l;
+      } else {
+        opt.height = o.l;
       }
-      if (o.s) {
-        if (metadata.height < metadata.width) {
-          opt.height = o.s;
-        } else {
-          opt.width = o.s;
-        }
+    }
+    if (o.s) {
+      if (metadata.height < metadata.width) {
+        opt.height = o.s;
+      } else {
+        opt.width = o.s;
       }
     }
-
-    ctx.image.resize(null, null, opt);
   }
+  return opt;
 }