feat: add s3 bucket for pdf storage (#796)

--------- Signed-off-by: hxtree <[email protected]>
hxtree · Jan 25, 2024 · bf3a53a · bf3a53a
1 parent d90c5d5
commit bf3a53a
Show file tree

Hide file tree

Showing 16 changed files with 263 additions and 61 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "ccec2f270b02bf293d50edfd0195997ed4b3a241",
+  "pnpmShrinkwrapHash": "b209a35e98f12fa88d1188d3c62ad9ce898dc1e2",
   "preferredVersionsHash": "a48003cf229dd47d077bcf6301ac15a6f90e1c34"
 }
diff --git a/services/authentication-service/package.json b/services/authentication-service/package.json
@@ -80,7 +80,7 @@
     "ts-jest": "29.1.1",
     "ts-node": "10.9.2",
     "typescript": "5.3.3",
-    "@cats-cradle/create-bundle": "1.0.9",
+    "@cats-cradle/create-bundle": "1.0.12",
     "@shelf/jest-mongodb": "~4.1.7",
     "@types/passport": "~1.0.13"
   }

diff --git a/services/billing-system/package.json b/services/billing-system/package.json
@@ -65,7 +65,7 @@
     "@types/lodash": "~4.14.202",
     "supertest": "~6.3.3",
     "@types/supertest": "~2.0.16",
-    "@cats-cradle/create-bundle": "1.0.9",
+    "@cats-cradle/create-bundle": "1.0.12",
     "@cats-cradle/create-artifact": "2.0.6"
   }
 }
diff --git a/services/character-sheet/package.json b/services/character-sheet/package.json
@@ -71,7 +71,7 @@
     "ts-jest": "29.1.1",
     "ts-node": "10.9.2",
     "typescript": "5.3.3",
-    "@cats-cradle/create-bundle": "1.0.9",
+    "@cats-cradle/create-bundle": "1.0.12",
     "@shelf/jest-mongodb": "~4.1.7",
     "mongodb-memory-server-global": "8.13.0",
     "mongoose": "6.11.3"

diff --git a/services/email-service/package.json b/services/email-service/package.json
@@ -79,7 +79,7 @@
     "@types/html-to-text": "~9.0.0",
     "@types/lodash": "~4.14.202",
     "@cats-cradle/create-artifact": "2.0.6",
-    "@cats-cradle/create-bundle": "1.0.9",
+    "@cats-cradle/create-bundle": "1.0.12",
     "@shelf/jest-mongodb": "~4.1.7",
     "mongodb": "6.0.0"
   }

diff --git a/services/graphql/package.json b/services/graphql/package.json
@@ -65,7 +65,7 @@
     "@types/lodash": "~4.14.202",
     "supertest": "~6.3.3",
     "@types/supertest": "~2.0.16",
-    "@cats-cradle/create-bundle": "1.0.9",
+    "@cats-cradle/create-bundle": "1.0.12",
     "@cats-cradle/create-artifact": "2.0.6"
   }
 }
diff --git a/services/html-to-pdf/package.json b/services/html-to-pdf/package.json
@@ -59,6 +59,7 @@
     "@nestjs/axios": "~2.0.0",
     "@cats-cradle/faker-factory": "workspace:*",
     "@sparticuz/chromium-min": "112.0.0",
+    "@sparticuz/chromium": "112.0.0",
     "puppeteer-core": "19.8.0",
     "uuid": "~9.0.1",
     "axios": "^0.21.1"
@@ -82,7 +83,7 @@
     "@types/lodash": "~4.14.202",
     "supertest": "~6.3.3",
     "@types/supertest": "~2.0.16",
-    "@cats-cradle/create-bundle": "1.0.9",
+    "@cats-cradle/create-bundle": "1.0.12",
     "@cats-cradle/create-artifact": "2.0.6",
     "axios": "^0.21.1"
   }

diff --git a/services/html-to-pdf/src/module/pdf/pdf.service.ts b/services/html-to-pdf/src/module/pdf/pdf.service.ts
@@ -2,6 +2,9 @@
 import { Injectable } from '@nestjs/common';
 import { Readable } from 'stream';
 import puppeteer, { PDFOptions } from 'puppeteer-core';
+
+// TOGGLE for local development
+// import chromium from '@sparticuz/chromium';
 import chromium from '@sparticuz/chromium-min';
 
 @Injectable()
@@ -68,9 +71,11 @@ export class PdfService {
   }
 
   private async getBrowser() {
-    const CHROMIUM_EXECUTABLE_PATH = process.env.AWS_EXECUTION_ENV
-      ? '/opt/nodejs/node_modules/@sparticuz/chromium/bin'
-      : undefined;
+    let CHROMIUM_EXECUTABLE_PATH: string | undefined;
+
+    if (process.env.AWS_EXECUTION_ENV) {
+      CHROMIUM_EXECUTABLE_PATH = '/opt/nodejs/node_modules/@sparticuz/chromium/bin';
+    }
 
     await chromium.font(
       'http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf',