Merge pull request #2 from CatsJuice/feature/format-jpeg

feature: add jpeg format support(only support white bg yet)
CatsJuice · Mar 4, 2022 · 60cd2f2 · 60cd2f2
2 parents 453161c + a2e9109
commit 60cd2f2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/src/app.controller.ts b/src/app.controller.ts
@@ -42,11 +42,22 @@ export class AppController {
         res.header('Content-Type', 'text/html;charset=utf-8');
         res.send(generateHtml(raw, username));
       } else if (format === OutputFormat.PNG) {
-        res.header('Content-Type', 'image/svg;charset=utf-8');
+        res.header('Content-Type', 'image/png;charset=utf-8');
         res.header('Content-Disposition', `inline; filename=${filename}.png`);
         res.send(
-          await this.appService.transformSvg2Png(
+          await this.appService.transformSvg2Image(
+            raw,
+            'png',
+            Math.min(10, Math.max(0.1, parseFloat(`${query.quality}`) || 1)),
+          ),
+        );
+      } else if (format === OutputFormat.JPEG) {
+        res.header('Content-Type', 'image/jpeg;charset=utf-8');
+        res.header('Content-Disposition', `inline; filename=${filename}.jpg`);
+        res.send(
+          await this.appService.transformSvg2Image(
             raw,
+            'jpeg',
             Math.min(10, Math.max(0.1, parseFloat(`${query.quality}`) || 1)),
           ),
         );

diff --git a/src/app.service.ts b/src/app.service.ts
@@ -40,15 +40,19 @@ export class AppService {
    * @param resize
    * @returns
    */
-  public async transformSvg2Png(svgRaw: string, resize = 1) {
+  public async transformSvg2Image(svgRaw: string, format: string, resize = 1) {
     const buf = Buffer.from(svgRaw);
     return await sharp(buf)
       .metadata()
-      .then(({ width }) =>
-        sharp(buf)
+      .then(({ width }) => {
+        let ref = sharp(buf);
+        // TODO: add to configuration
+        if (format === 'jpeg') ref = ref.flatten({ background: '#fff' });
+        return ref
+          .toFormat(format)
           .resize(Math.round(width * resize) * 2)
-          .toBuffer(),
-      );
+          .toBuffer();
+      });
   }
 
   /**

diff --git a/src/dto/config-chart.query.dto.ts b/src/dto/config-chart.query.dto.ts
@@ -3,6 +3,7 @@ export enum OutputFormat {
   XML = 'xml',
   PNG = 'png',
   HTML = 'html',
+  JPEG = 'jpeg',
 }
 
 export enum WidgetSize {
@@ -41,7 +42,7 @@ export class ConfigChartQueryDto {
   format?: OutputFormat;
 
   /**
-   * png quality, only works when format=png, [0.1, 10]
+   * png quality, only works when format=png|jpeg, [0.1, 10]
    * @default {1}
    */
   quality?: number;