chromiumly 2.3.1 → 2.5.0

package/src/chromium/converters/html.converter.ts

@@ -1,67 +1,65 @@
-import { constants, createReadStream, PathLike, promises } from "fs";
-
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import FormData from "form-data";
 
-import { GotenbergUtils, PdfFormat } from "../../common";
+import {GotenbergUtils, PathLikeOrReadStream, PdfFormat} from "../../common";
 import {
-  EmulatedMediaType,
-  PageProperties,
+    EmulatedMediaType,
+    PageProperties,
 } from "../interfaces/converter.types";
-import { ConverterUtils } from "../utils/converter.utils";
-import { Converter } from "./converter";
-import { ChromiumRoute } from "../../main.config";
+import {ConverterUtils} from "../utils/converter.utils";
+import {Converter} from "./converter";
+import {ChromiumRoute} from "../../main.config";
 
 export class HtmlConverter extends Converter {
-  constructor() {
-    super(ChromiumRoute.HTML);
-  }
+    constructor() {
+        super(ChromiumRoute.HTML);
+    }
 
-  async convert({
-    html,
-    header,
-    footer,
-    properties,
-    pdfFormat,
-    pdfUA,
-    emulatedMediaType,
-    waitDelay,
-    waitForExpression,
-    userAgent,
-    extraHttpHeaders,
-    failOnConsoleExceptions,
-  }: {
-    html: PathLike;
-    header?: PathLike;
-    footer?: PathLike;
-    properties?: PageProperties;
-    pdfFormat?: PdfFormat;
-    pdfUA?: boolean;
-    emulatedMediaType?: EmulatedMediaType;
-    waitDelay?: string;
-    waitForExpression?: string;
-    userAgent?: string;
-    extraHttpHeaders?: Record<string, string>;
-    failOnConsoleExceptions?: boolean;
-  }): Promise<Buffer> {
-    await promises.access(html, constants.R_OK);
-    const data = new FormData();
+    async convert({
+                      html,
+                      header,
+                      footer,
+                      properties,
+                      pdfFormat,
+                      pdfUA,
+                      emulatedMediaType,
+                      waitDelay,
+                      waitForExpression,
+                      userAgent,
+                      extraHttpHeaders,
+                      failOnConsoleExceptions,
+                  }: {
+        html: PathLikeOrReadStream;
+        header?: PathLikeOrReadStream;
+        footer?: PathLikeOrReadStream;
+        properties?: PageProperties;
+        pdfFormat?: PdfFormat;
+        pdfUA?: boolean;
+        emulatedMediaType?: EmulatedMediaType;
+        waitDelay?: string;
+        waitForExpression?: string;
+        userAgent?: string;
+        extraHttpHeaders?: Record<string, string>;
+        failOnConsoleExceptions?: boolean;
+    }): Promise<Buffer> {
+        const data = new FormData();
 
-    data.append("index.html", createReadStream(html));
+        await ConverterUtils.addFile(data, html, "index.html")
 
-    ConverterUtils.customize(data, {
-      header,
-      footer,
-      properties,
-      pdfFormat,
-      pdfUA,
-      emulatedMediaType,
-      waitDelay,
-      waitForExpression,
-      userAgent,
-      extraHttpHeaders,
-      failOnConsoleExceptions,
-    });
+        await ConverterUtils.customize(data, {
+            header,
+            footer,
+            properties,
+            pdfFormat,
+            pdfUA,
+            emulatedMediaType,
+            waitDelay,
+            waitForExpression,
+            userAgent,
+            extraHttpHeaders,
+            failOnConsoleExceptions,
+        });
 
-    return GotenbergUtils.fetch(this.endpoint, data);
-  }
+        return GotenbergUtils.fetch(this.endpoint, data);
+    }
 }

package/src/chromium/converters/markdown.converter.ts

@@ -1,71 +1,68 @@
-import { constants, createReadStream, PathLike, promises } from "fs";
-
 import FormData from "form-data";
 
-import { GotenbergUtils, PdfFormat } from "../../common";
+import {GotenbergUtils, PdfFormat, PathLikeOrReadStream} from "../../common";
 import {
-  EmulatedMediaType,
-  PageProperties,
+    EmulatedMediaType,
+    PageProperties,
 } from "../interfaces/converter.types";
-import { ConverterUtils } from "../utils/converter.utils";
-import { Converter } from "./converter";
-import { ChromiumRoute } from "../../main.config";
+import {ConverterUtils} from "../utils/converter.utils";
+import {Converter} from "./converter";
+import {ChromiumRoute} from "../../main.config";
 
 export class MarkdownConverter extends Converter {
-  constructor() {
-    super(ChromiumRoute.MARKDOWN);
-  }
+    constructor() {
+        super(ChromiumRoute.MARKDOWN);
+    }
+
+    async convert({
+                      html,
+                      markdown,
+                      header,
+                      footer,
+                      properties,
+                      pdfFormat,
+                      pdfUA,
+                      emulatedMediaType,
+                      waitDelay,
+                      waitForExpression,
+                      userAgent,
+                      extraHttpHeaders,
+                      failOnConsoleExceptions,
+                  }: {
+        html: PathLikeOrReadStream;
+        markdown: PathLikeOrReadStream;
+        header?: PathLikeOrReadStream;
+        footer?: PathLikeOrReadStream;
+        properties?: PageProperties;
+        pdfFormat?: PdfFormat;
+        pdfUA?: boolean;
+        emulatedMediaType?: EmulatedMediaType;
+        waitDelay?: string;
+        waitForExpression?: string;
+        userAgent?: string;
+        extraHttpHeaders?: Record<string, string>;
+        failOnConsoleExceptions?: boolean;
+    }): Promise<Buffer> {
+        const data = new FormData();
 
-  async convert({
-    html,
-    markdown,
-    header,
-    footer,
-    properties,
-    pdfFormat,
-    pdfUA,
-    emulatedMediaType,
-    waitDelay,
-    waitForExpression,
-    userAgent,
-    extraHttpHeaders,
-    failOnConsoleExceptions,
-  }: {
-    html: PathLike;
-    markdown: PathLike;
-    header?: PathLike;
-    footer?: PathLike;
-    properties?: PageProperties;
-    pdfFormat?: PdfFormat;
-    pdfUA?: boolean;
-    emulatedMediaType?: EmulatedMediaType;
-    waitDelay?: string;
-    waitForExpression?: string;
-    userAgent?: string;
-    extraHttpHeaders?: Record<string, string>;
-    failOnConsoleExceptions?: boolean;
-  }): Promise<Buffer> {
-    await promises.access(html, constants.R_OK);
-    await promises.access(markdown, constants.R_OK);
-    const data = new FormData();
+        await ConverterUtils.addFile(data, html, "index.html");
 
-    data.append("index.html", createReadStream(html));
-    data.append("file.md", createReadStream(markdown));
+        await ConverterUtils.addFile(data, markdown, "file.md");
 
-    ConverterUtils.customize(data, {
-      header,
-      footer,
-      properties,
-      pdfFormat,
-      pdfUA,
-      emulatedMediaType,
-      waitDelay,
-      waitForExpression,
-      userAgent,
-      extraHttpHeaders,
-      failOnConsoleExceptions,
-    });
+        await ConverterUtils.customize(data, {
+            header,
+            footer,
+            properties,
+            pdfFormat,
+            pdfUA,
+            emulatedMediaType,
+            waitDelay,
+            waitForExpression,
+            userAgent,
+            extraHttpHeaders,
+            failOnConsoleExceptions,
+        });
 
-    return GotenbergUtils.fetch(this.endpoint, data);
-  }
+        return GotenbergUtils.fetch(this.endpoint, data);
+    }
 }

package/src/chromium/converters/tests/html.converter.test.ts

@@ -1,152 +1,147 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { createReadStream, promises } from "fs";
+import {createReadStream, promises} from "fs";
 
 import fetch from "node-fetch";
 import FormData from "form-data";
 
-import { PdfFormat } from "../../../common";
-import { HtmlConverter } from "../html.converter";
+import {PdfFormat} from "../../../common";
+import {HtmlConverter} from "../html.converter";
 
-const { Response } = jest.requireActual("node-fetch");
+const {Response} = jest.requireActual("node-fetch");
 jest.mock("node-fetch", () => jest.fn());
 
 describe("HtmlConverter", () => {
-  const mockPromisesAccess = jest.spyOn(promises, "access");
-  const mockFetch = fetch as jest.MockedFunction<typeof fetch>;
-  const mockFormDataAppend = jest.spyOn(FormData.prototype, "append");
-
-  const converter = new HtmlConverter();
-  beforeEach(() => {
-    (createReadStream as jest.Mock) = jest
-      .fn()
-      .mockImplementation((file) => file);
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  describe("endpoint", () => {
-    it("should route to Chromium HTML route", () => {
-      expect(converter.endpoint).toEqual(
-        "http://localhost:3000/forms/chromium/convert/html"
-      );
-    });
-  });
-
-  describe("convert", () => {
-    describe("when file exists", () => {
-      it("should return a buffer", async () => {
-        mockPromisesAccess.mockResolvedValue();
-        mockFetch.mockResolvedValue(new Response("content"));
-        const buffer = await converter.convert({ html: "path/to/index.html" });
-        expect(buffer).toEqual(Buffer.from("content"));
-      });
-    });
+    const converter = new HtmlConverter();
 
-    describe("when pdf format parameter is passed", () => {
-      it("should return a buffer", async () => {
-        mockPromisesAccess.mockResolvedValue();
-        mockFetch.mockResolvedValue(new Response("content"));
-        const buffer = await converter.convert({
-          html: "path/to/index.html",
-          pdfFormat: PdfFormat.A_1a,
+    describe("endpoint", () => {
+        it("should route to Chromium HTML route", () => {
+            expect(converter.endpoint).toEqual(
+                "http://localhost:3000/forms/chromium/convert/html"
+            );
         });
-        expect(mockFormDataAppend).toHaveBeenCalledTimes(2);
-        expect(buffer).toEqual(Buffer.from("content"));
-      });
     });
 
-    describe("when page properties parameter is passed", () => {
-      it("should return a buffer", async () => {
-        mockPromisesAccess.mockResolvedValue();
-        mockFetch.mockResolvedValue(new Response("content"));
-        const buffer = await converter.convert({
-          html: "path/to/index.html",
-          properties: { size: { width: 8.3, height: 11.7 } },
+    describe("convert", () => {
+        const mockPromisesAccess = jest.spyOn(promises, "access");
+        const mockFetch = fetch as jest.MockedFunction<typeof fetch>;
+        const mockFormDataAppend = jest.spyOn(FormData.prototype, "append");
+        
+        beforeEach(() => {
+            (createReadStream as jest.Mock) = jest.fn()
         });
-        expect(mockFormDataAppend).toHaveBeenCalledTimes(3);
-        expect(buffer).toEqual(Buffer.from("content"));
-      });
-    });
 
-    describe("when header parameter is passed", () => {
-      it("should return a buffer", async () => {
-        mockPromisesAccess.mockResolvedValue();
-        mockFetch.mockResolvedValue(new Response("content"));
-        const buffer = await converter.convert({
-          html: "path/to/index.html",
-          header: "path/to/header.html",
+        afterEach(() => {
+            jest.resetAllMocks();
         });
-        expect(mockFormDataAppend).toHaveBeenCalledTimes(2);
-        expect(buffer).toEqual(Buffer.from("content"));
-      });
-    });
 
-    describe("when footer parameter is passed", () => {
-      it("should return a buffer", async () => {
-        mockPromisesAccess.mockResolvedValue();
-        mockFetch.mockResolvedValue(new Response("content"));
-        const buffer = await converter.convert({
-          html: "path/to/index.html",
-          footer: "path/to/footer.html",
+        describe("when html parameter is passed", () => {
+            it("should return a buffer", async () => {
+                mockFetch.mockResolvedValue(new Response("content"));
+                const buffer = await converter.convert({
+                    html: Buffer.from("data"),
+                });
+                expect(buffer).toEqual(Buffer.from("content"));
+            });
         });
-        expect(mockFormDataAppend).toHaveBeenCalledTimes(2);
-        expect(buffer).toEqual(Buffer.from("content"));
-      });
-    });
 
-    describe("when emulatedMediaType parameter is passed", () => {
-      it("should return a buffer", async () => {
-        mockPromisesAccess.mockResolvedValue();
-        mockFetch.mockResolvedValue(new Response("content"));
-        const buffer = await converter.convert({
-          html: "path/to/index.html",
-          emulatedMediaType: "screen",
+        describe("when pdf format parameter is passed", () => {
+            it("should return a buffer", async () => {
+                mockFetch.mockResolvedValue(new Response("content"));
+                const buffer = await converter.convert({
+                    html: Buffer.from("data"),
+                    pdfFormat: PdfFormat.A_1a,
+                });
+                expect(mockFormDataAppend).toHaveBeenCalledTimes(2);
+                expect(buffer).toEqual(Buffer.from("content"));
+            });
         });
-        expect(mockFormDataAppend).toHaveBeenCalledTimes(2);
-        expect(buffer).toEqual(Buffer.from("content"));
-      });
-    });
 
-    describe("when all parameters are passed", () => {
-      it("should return a buffer", async () => {
-        mockPromisesAccess.mockResolvedValue();
-        mockFetch.mockResolvedValue(new Response("content"));
-        const buffer = await converter.convert({
-          html: "path/to/index.html",
-          header: "path/to/header.html",
-          footer: "path/to/footer.html",
-          pdfFormat: PdfFormat.A_1a,
-          emulatedMediaType: "screen",
-          properties: { size: { width: 8.3, height: 11.7 } },
+        describe("when page properties parameter is passed", () => {
+            it("should return a buffer", async () => {
+                mockFetch.mockResolvedValue(new Response("content"));
+                const buffer = await converter.convert({
+                    html: Buffer.from("data"),
+                    properties: {size: {width: 8.3, height: 11.7}},
+                });
+                expect(mockFormDataAppend).toHaveBeenCalledTimes(3);
+                expect(buffer).toEqual(Buffer.from("content"));
+            });
         });
-        expect(mockFormDataAppend).toHaveBeenCalledTimes(7);
-        expect(buffer).toEqual(Buffer.from("content"));
-      });
-    });
 
-    describe("when file does not exist", () => {
-      it("should throw an error", async () => {
-        const errorMessage =
-          "ENOENT: no such file or directory, access 'path/to/index.html'";
-        mockPromisesAccess.mockRejectedValue(new Error(errorMessage));
-        await expect(() =>
-          converter.convert({ html: "path/to/index.html" })
-        ).rejects.toThrow(errorMessage);
-      });
-    });
+        describe("when header parameter is passed", () => {
+            it("should return a buffer", async () => {
+                mockFetch.mockResolvedValue(new Response("content"));
+                const buffer = await converter.convert({
+                    html: Buffer.from("data"),
+                    header: Buffer.from("header"),
+                });
+                expect(mockFormDataAppend).toHaveBeenCalledTimes(2);
+                expect(buffer).toEqual(Buffer.from("content"));
+            });
+        });
 
-    describe("when fetch request fails", () => {
-      it("should throw an error", async () => {
-        const errorMessage =
-          "FetchError: request to http://localhost:3000/forms/chromium/convert/html failed";
-        mockPromisesAccess.mockResolvedValue();
-        mockFetch.mockRejectedValue(new Error(errorMessage));
-        await expect(() =>
-          converter.convert({ html: "path/to/index.html" })
-        ).rejects.toThrow(errorMessage);
-      });
+        describe("when footer parameter is passed", () => {
+            it("should return a buffer", async () => {
+                mockFetch.mockResolvedValue(new Response("content"));
+                const buffer = await converter.convert({
+                    html: Buffer.from("data"),
+                    footer: Buffer.from("footer"),
+                });
+                expect(mockFormDataAppend).toHaveBeenCalledTimes(2);
+                expect(buffer).toEqual(Buffer.from("content"));
+            });
+        });
+
+        describe("when emulatedMediaType parameter is passed", () => {
+            it("should return a buffer", async () => {
+                mockFetch.mockResolvedValue(new Response("content"));
+                const buffer = await converter.convert({
+                    html: Buffer.from("data"),
+                    emulatedMediaType: "screen",
+                });
+                expect(mockFormDataAppend).toHaveBeenCalledTimes(2);
+                expect(buffer).toEqual(Buffer.from("content"));
+            });
+        });
+
+        describe("when all parameters are passed", () => {
+            it("should return a buffer", async () => {
+                mockPromisesAccess.mockResolvedValue();
+                mockFetch.mockResolvedValue(new Response("content"));
+                const buffer = await converter.convert({
+                    html: Buffer.from("data"),
+                    header: Buffer.from("header"),
+                    footer: Buffer.from("footer"),
+                    pdfFormat: PdfFormat.A_1a,
+                    emulatedMediaType: "screen",
+                    properties: {size: {width: 8.3, height: 11.7}},
+                });
+                expect(mockFormDataAppend).toHaveBeenCalledTimes(7);
+                expect(buffer).toEqual(Buffer.from("content"));
+            });
+        });
+
+        describe("when file does not exist", () => {
+            it("should throw an error", async () => {
+                const errorMessage =
+                    "ENOENT: no such file or directory, access 'path/to/index.html'";
+                mockPromisesAccess.mockRejectedValue(new Error(errorMessage));
+                await expect(() =>
+                    converter.convert({html: "path/to/index.html"})
+                ).rejects.toThrow(errorMessage);
+            });
+        });
+
+        describe("when fetch request fails", () => {
+            it("should throw an error", async () => {
+                const errorMessage =
+                    "FetchError: request to http://localhost:3000/forms/chromium/convert/html failed";
+                mockPromisesAccess.mockResolvedValue();
+                mockFetch.mockRejectedValue(new Error(errorMessage));
+                await expect(() =>
+                    converter.convert({html: "path/to/index.html"})
+                ).rejects.toThrow(errorMessage);
+            });
+        });
     });
-  });
 });