2.0.3

.gitlab-ci.yml

@@ -25,11 +25,11 @@ mirror:
     - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
+    - npmci command npm ci --ignore-scripts
     - npmci command snyk test
   tags:
     - lossless

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpdf",
-  "version": "1.0.23",
+  "version": "2.0.3",
   "private": false,
   "description": "create pdfs on the fly",
   "main": "dist/index.js",
@@ -13,19 +13,21 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.12.7"
+    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tstest": "^1.0.52",
+    "@pushrocks/tapbundle": "^3.2.14",
+    "@types/node": "^14.14.31",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/smartnetwork": "^1.1.14",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartpuppeteer": "^1.0.5",
-    "@pushrocks/smartunique": "^3.0.1",
-    "@types/express": "^4.17.2",
+    "@pushrocks/smartfile": "^8.0.8",
+    "@pushrocks/smartnetwork": "^1.1.22",
+    "@pushrocks/smartpromise": "^3.1.3",
+    "@pushrocks/smartpuppeteer": "^1.0.21",
+    "@pushrocks/smartunique": "^3.0.3",
+    "@types/express": "^4.17.11",
     "express": "^4.17.1"
   },
   "files": [

test/test.ts

@@ -13,15 +13,15 @@ tap.test('should start the instance', async () => {
 });
 
 tap.test('should create a pdf from html string', async () => {
-  await testSmartPdf.getPdfForHtmlString('hi');
+  await testSmartPdf.getPdfResultForHtmlString('hi');
 });
 
 tap.test('should create a pdf from website as A4', async () => {
-  await testSmartPdf.getPdfForWebsite('https://maintainedby.lossless.com');
+  await testSmartPdf.getPdfResultForWebsite('https://www.wikipedia.org');
 });
 
 tap.test('should create a pdf from website as single page PDF', async () => {
-  await testSmartPdf.getFullWebsiteAsSinglePdf('https://maintainedby.lossless.com');
+  await testSmartPdf.getFullWebsiteAsSinglePdf('https://www.wikipedia.org');
 });
 
 tap.test('should create a valid PDFResult', async () => {

ts/smartpdf.classes.smartpdf.ts

@@ -26,7 +26,9 @@ export class SmartPdf {
     if (this.headlessBrowser) {
       this.externalBrowserBool = true;
     } else {
-      this.headlessBrowser = await plugins.smartpuppeteer.getEnvAwareBrowserInstance();
+      this.headlessBrowser = await plugins.smartpuppeteer.getEnvAwareBrowserInstance({
+        forceNoSandbox: true
+      });
     }
 
     // setup server
@@ -61,7 +63,7 @@ export class SmartPdf {
   /**
    * returns a pdf for a given html string;
    */
-  async getPdfForHtmlString(htmlStringArg: string): Promise<interfaces.IPdfResult> {
+  async getPdfResultForHtmlString(htmlStringArg: string): Promise<interfaces.IPdfResult> {
     await this._readyDeferred.promise;
     const pdfCandidate = new PdfCandidate(htmlStringArg);
     this._candidates[pdfCandidate.pdfId] = pdfCandidate;
@@ -78,7 +80,10 @@ export class SmartPdf {
     }
 
     const pdfBuffer = await page.pdf({
-      format: 'A4'
+      format: 'A4',
+      printBackground: true,
+      displayHeaderFooter: false,
+      preferCSSPageSize: true
     });
     await page.close();
     delete this._candidates[pdfCandidate.pdfId];
@@ -91,13 +96,21 @@ export class SmartPdf {
     };
   }
 
-  async getPdfForWebsite(websiteUrl: string): Promise<interfaces.IPdfResult> {
+  async getPdfResultForWebsite(websiteUrl: string): Promise<interfaces.IPdfResult> {
     const page = await this.headlessBrowser.newPage();
-    page.emulateMedia('screen');
+    await page.emulateMediaType('screen');
     const response = await page.goto(websiteUrl, { waitUntil: 'networkidle2' });
     const pdfId = plugins.smartunique.shortId();
+    const { documentHeight, documentWidth } = await page.evaluate(() => {
+      return {
+        documentHeight: document.height,
+        documentWidth: document.width
+      };
+    });
     const pdfBuffer = await page.pdf({
       format: 'A4',
+      height: documentWidth,
+      width: documentWidth,
       printBackground: true,
       displayHeaderFooter: false,
       preferCSSPageSize: true
@@ -112,7 +125,7 @@ export class SmartPdf {
 
   async getFullWebsiteAsSinglePdf(websiteUrl: string) {
     const page = await this.headlessBrowser.newPage();
-    page.emulateMedia('screen');
+    page.emulateMediaType('screen');
     const response = await page.goto(websiteUrl, { waitUntil: 'networkidle2' });
     const pdfId = plugins.smartunique.shortId();
     const { documentHeight, documentWidth } = await page.evaluate(() => {
@@ -122,6 +135,7 @@ export class SmartPdf {
       };
     });
     const pdfBuffer = await page.pdf({
+      format: 'A4',
       height: documentWidth,
       width: documentWidth,
       printBackground: true,