fix: disable gif enlarge and reduce high resolution png size

0779ac46961491aaa1fa0a1fa3b48c79_6802770812466820349.gif?x-oss-process=image/resize,s_1000/quality,q_80/auto-orient,0/interlace,1/format,gif
1.PNG?x-oss-process=image/strip-metadata

Author: wchaws

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

@@ -27,7 +27,7 @@ export class InterlaceAction extends BaseImageAction {
 
   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

@@ -122,6 +122,14 @@ export class ResizeAction extends BaseImageAction {
       }
     }
 
+    if ('gif' === metadata.format) {
+      const isEnlargingWidth = (opt.width && opt.width > metadata.width);
+      const isEnlargingHeight = (opt.height && metadata.pageHeight && (opt.height > metadata.pageHeight));
+      if (isEnlargingWidth || isEnlargingHeight) {
+        return;
+      }
+    }
+
     ctx.image.resize(null, null, opt);
   }
 }