Prdp 100 feat add playwright engine (#37)

* [PRDP-100] feat: Changed structure to intialize Playwright chromium * [PRDP-100] feat: Changed structure to intialize Playwright chromium * Bump to version 1.6.2-PRDP-100-feat-add-playwright-engine [skip ci] --------- Co-authored-by: acialini <[email protected]> Co-authored-by: pagopa-github-bot <[email protected]>
pagopa · Aug 24, 2023 · b415582 · b415582
1 parent 4d78216
commit b415582
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -127,6 +127,17 @@ file and other optional attachments, such as CSS files, that will be used to gen
 > The HTML template file must be named to match the value of the `HTML_TEMPLATE_FILE_NAME` environment variable 
 > (default is `template`) (example of HTML template file name: `template.html`)
 
+### Playwright version
+
+In order to use the newly introduced engine you may use the parameter
+
+```
+...
+--form 'generatorType="PLAYWRIGHT"'
+``` 
+
+The two values available are PLAYWRIGHT and ITEXT (the value defaults to ITEXT currently)
+
 ---
 
 ## Develop Locally 💻

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -214,6 +214,9 @@
           },
           "generateZipped": {
             "type": "boolean"
+          },
+          "generatorType": {
+            "type": "string"
           }
         }
       }

diff --git a/performance-test/src/modules/pdf_engine_client.js b/performance-test/src/modules/pdf_engine_client.js
@@ -4,7 +4,8 @@ export function generatePDF(pdfEngineUri, subKey, zipFile, inputData, generateZi
     const form = {
         data: inputData,
         template: http.file(zipFile, 'template.zip'),
-        generateZipped: generateZipped
+        generateZipped: generateZipped,
+        generatorType: "PLAYWRIGHT"
       };
 
       let headers = { 

diff --git a/src/main/java/it/gov/pagopa/pdf/engine/HttpTriggerGeneratePDFFunction.java b/src/main/java/it/gov/pagopa/pdf/engine/HttpTriggerGeneratePDFFunction.java
@@ -68,10 +68,8 @@ public class HttpTriggerGeneratePDFFunction {
     private Playwright playwright;
 
     public HttpTriggerGeneratePDFFunction() throws GeneratePDFException {
-        playwright = Playwright.create();
-        BrowserType chromium = playwright.chromium();
-        this.generatePDFService = new GeneratePDFServiceImpl(buildHandlebars(),
-            chromium.launch(new BrowserType.LaunchOptions().setHeadless(true)).newContext());
+
+        this.generatePDFService = new GeneratePDFServiceImpl(buildHandlebars());
         this.parseRequestBodyService = new ParseRequestBodyServiceImpl(new ObjectMapper());
     }
 

diff --git a/src/main/java/it/gov/pagopa/pdf/engine/service/impl/GeneratePDFServiceImpl.java b/src/main/java/it/gov/pagopa/pdf/engine/service/impl/GeneratePDFServiceImpl.java
@@ -54,11 +54,8 @@ public class GeneratePDFServiceImpl implements GeneratePDFService {
     private final String htmlTemplateFileName = System.getenv().getOrDefault("HTML_TEMPLATE_FILE_NAME", "template");
 
     private final Handlebars handlebars;
-    private final BrowserContext context;
-
-    public GeneratePDFServiceImpl(Handlebars handlebars, BrowserContext browserContext) throws GeneratePDFException {
+    public GeneratePDFServiceImpl(Handlebars handlebars) throws GeneratePDFException {
         this.handlebars = handlebars;
-        this.context = browserContext;
     }
 
     @Override
@@ -182,21 +179,28 @@ private String createUsingPlaywright(Path workingDirPath, File pdfTempFile, Stri
         FileUtils.writeByteArrayToFile(new File(workingDirPath.toAbsolutePath()
                 + UNZIPPED_FILES_FOLDER + "/filledTemplate.html"), filledTemplate.getBytes());
 
-        try (Page page = context.newPage()) {
 
-            page.emulateMedia(new Page.EmulateMediaOptions().setMedia(Media.SCREEN));
-            page.navigate("file:" + workingDirPath.toAbsolutePath() + UNZIPPED_FILES_FOLDER + "/filledTemplate.html");
-            page.waitForLoadState(LoadState.NETWORKIDLE);
-            page.pdf(new Page.PdfOptions().setFormat("A4").setPath(pdfTempFile.getAbsoluteFile().toPath()));
+        try (Playwright playwright = Playwright.create()) {
+            BrowserType chromium = playwright.chromium();
+
+            try (BrowserContext context = chromium.launch(new BrowserType.LaunchOptions().setHeadless(true)).newContext();
+                 Page page = context.newPage()) {
+                page.emulateMedia(new Page.EmulateMediaOptions().setMedia(Media.SCREEN));
+                page.navigate("file:" + workingDirPath.toAbsolutePath() + UNZIPPED_FILES_FOLDER + "/filledTemplate.html");
+                page.waitForLoadState(LoadState.NETWORKIDLE);
+                page.pdf(new Page.PdfOptions().setFormat("A4").setPath(pdfTempFile.getAbsoluteFile().toPath()));
 
-            //Create a PdfStandardsConverter instance, passing in the input file as a parameter
-            PdfStandardsConverter converter = new PdfStandardsConverter(pdfTempFile.getAbsolutePath());
+                //Create a PdfStandardsConverter instance, passing in the input file as a parameter
+                PdfStandardsConverter converter = new PdfStandardsConverter(pdfTempFile.getAbsolutePath());
 
-            //Convert to PdfA2A
-            converter.toPdfA2A(pdfTempFile.getParent() + "/ToPdfA2A.pdf");
+                //Convert to PdfA2A
+                converter.toPdfA2A(pdfTempFile.getParent() + "/ToPdfA2A.pdf");
+
+                return pdfTempFile.getParent() + "/ToPdfA2A.pdf";
+            }
 
-            return pdfTempFile.getParent() + "/ToPdfA2A.pdf";
         }
+
     }
 
 }
diff --git a/src/test/java/it/gov/pagopa/pdf/engine/service/impl/GeneratePDFServiceImplTest.java b/src/test/java/it/gov/pagopa/pdf/engine/service/impl/GeneratePDFServiceImplTest.java
@@ -65,7 +65,7 @@ void setUp() throws IOException, GeneratePDFException {
         browserContextMock = mock(BrowserContext.class);
         pageMock = mock(Page.class);
 
-        sut = spy(new GeneratePDFServiceImpl(handlebarsMock, browserContextMock));
+        sut = spy(new GeneratePDFServiceImpl(handlebarsMock));
         workingPath = Files.createTempDirectory("testDir");
     }