3.0.1

package.json

@@ -1,34 +1,34 @@
 {
   "name": "@pushrocks/smartpdf",
-  "version": "2.0.15",
+  "version": "3.0.1",
   "private": false,
   "description": "create pdfs on the fly",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web --allowimplicitany)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tsbuild": "^2.1.61",
-    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tsrun": "^1.2.32",
-    "@gitzone/tstest": "^1.0.60",
+    "@gitzone/tstest": "^1.0.69",
-    "@pushrocks/tapbundle": "^3.2.15",
+    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^17.0.8",
+    "@types/node": "^17.0.23"
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^9.0.5",
+    "@pushrocks/smartfile": "^9.0.6",
-    "@pushrocks/smartnetwork": "^2.0.10",
+    "@pushrocks/smartnetwork": "^3.0.0",
-    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartpuppeteer": "^1.0.36",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartpuppeteer": "^2.0.0",
     "@pushrocks/smartunique": "^3.0.3",
     "@types/express": "^4.17.13",
-    "express": "^4.17.2",
+    "express": "^4.17.3",
-    "pdf-merger-js": "^3.2.1",
+    "pdf-merger-js": "^3.4.0",
     "pdf2json": "^2.0.0"
   },
   "files": [

test/test.ts

@@ -1,11 +1,11 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartpdf from '../ts/index';
+import * as smartpdf from '../ts/index.js';
 
 let testSmartPdf: smartpdf.SmartPdf;
 
 tap.test('should create a valid instance of smartpdf', async () => {
   testSmartPdf = new smartpdf.SmartPdf();
-  expect(testSmartPdf).to.be.instanceof(smartpdf.SmartPdf);
+  expect(testSmartPdf).toBeInstanceOf(smartpdf.SmartPdf);
 });
 
 tap.test('should start the instance', async () => {
@@ -13,11 +13,11 @@ tap.test('should start the instance', async () => {
 });
 
 tap.test('should create a pdf from html string', async () => {
-  await testSmartPdf.getPdfResultForHtmlString('hi');
+  await testSmartPdf.getA4PdfResultForHtmlString('hi');
 });
 
 tap.test('should create a pdf from html string', async () => {
-  await testSmartPdf.getPdfResultForHtmlString('hi');
+  await testSmartPdf.getA4PdfResultForHtmlString('hi');
 });
 
 tap.test('should create a pdf from website as A4', async () => {
@@ -31,7 +31,7 @@ tap.test('should create a pdf from website as single page PDF', async () => {
 tap.test('should create a valid PDFResult', async () => {
   const writePDfToDisk = async (urlArg: string, fileName: string) => {
     const pdfResult = await testSmartPdf.getFullWebsiteAsSinglePdf(urlArg);
-    expect(pdfResult.buffer).to.be.instanceOf(Buffer);
+    expect(pdfResult.buffer).toBeInstanceOf(Buffer);
     const fs = await import('fs');
 
     if (!fs.existsSync('.nogit/')) {
@@ -40,7 +40,7 @@ tap.test('should create a valid PDFResult', async () => {
     fs.writeFileSync(`.nogit/${fileName}`, pdfResult.buffer);
   };
   await writePDfToDisk('https://maintainedby.lossless.com/', '1.pdf')
-  await writePDfToDisk('https://lossless.com/', '2.pdf')
+  await writePDfToDisk('https://rendertron.lossless.one/render/https://fitnessloft.de/impressum/', '2.pdf')
 });
 
 tap.test('should combine pdfs', async () => {

ts/index.ts

@@ -6,4 +6,4 @@ declare global {
 }
 
 // normal
-export * from './smartpdf.classes.smartpdf';
+export * from './smartpdf.classes.smartpdf.js';

ts/interfaces/index.ts

@@ -1 +1 @@
-export * from './interface.pdfresult';
+export * from './interface.pdfresult.js';

ts/smartpdf.classes.pdfcandidate.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartpdf.plugins';
+import * as plugins from './smartpdf.plugins.js';
 
 export class PdfCandidate {
   public htmlString: string;

ts/smartpdf.classes.smartpdf.ts

@@ -1,11 +1,11 @@
-import * as plugins from './smartpdf.plugins';
+import * as plugins from './smartpdf.plugins.js';
-import * as paths from './smartpdf.paths';
+import * as paths from './smartpdf.paths.js';
 import { Server } from 'http';
-import { PdfCandidate } from './smartpdf.classes.pdfcandidate';
+import { PdfCandidate } from './smartpdf.classes.pdfcandidate.js';
 
 declare const document: any;
 
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 export class SmartPdf {
   htmlServerInstance: Server;
@@ -63,7 +63,7 @@ export class SmartPdf {
   /**
    * returns a pdf for a given html string;
    */
-  async getPdfResultForHtmlString(htmlStringArg: string): Promise<interfaces.IPdfResult> {
+  async getA4PdfResultForHtmlString(htmlStringArg: string): Promise<interfaces.IPdfResult> {
     await this._readyDeferred.promise;
     const pdfCandidate = new PdfCandidate(htmlStringArg);
     this._candidates[pdfCandidate.pdfId] = pdfCandidate;
@@ -84,10 +84,10 @@ export class SmartPdf {
     }
 
     const pdfBuffer = await page.pdf({
-      format: 'a4',
+      width: 794,
+      height: 1122,
       printBackground: true,
       displayHeaderFooter: false,
-      preferCSSPageSize: true,
     });
     await page.close();
     delete this._candidates[pdfCandidate.pdfId];
@@ -105,6 +105,10 @@ export class SmartPdf {
 
   async getPdfResultForWebsite(websiteUrl: string): Promise<interfaces.IPdfResult> {
     const page = await this.headlessBrowser.newPage();
+    await page.setViewport({
+      width: 1980,
+      height: 1200,
+    });
     await page.emulateMediaType('screen');
     const response = await page.goto(websiteUrl, { waitUntil: 'networkidle2' });
     const pdfId = plugins.smartunique.shortId();
@@ -115,12 +119,10 @@ export class SmartPdf {
       };
     });
     const pdfBuffer = await page.pdf({
-      format: 'a4',
+      height: documentHeight,
-      height: documentWidth,
       width: documentWidth,
       printBackground: true,
       displayHeaderFooter: false,
-      preferCSSPageSize: true,
     });
     await page.close();
     return {
@@ -135,22 +137,30 @@ export class SmartPdf {
 
   async getFullWebsiteAsSinglePdf(websiteUrl: string): Promise<interfaces.IPdfResult> {
     const page = await this.headlessBrowser.newPage();
+    await page.setViewport({
+      width: 1920,
+      height: 1200,
+    });
     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,
+        documentHeight: document.body.scrollHeight,
-        documentWidth: document.width,
+        documentWidth: document.body.clientWidth,
       };
     });
+    await page.setViewport({
+      width: 1920,
+      height: documentHeight,
+    });
     const pdfBuffer = await page.pdf({
-      format: 'a4',
+      height: documentHeight,
-      height: documentWidth,
+      width: 1920,
-      width: documentWidth,
       printBackground: true,
       displayHeaderFooter: false,
-      preferCSSPageSize: true,
+      scale: 1,
+      pageRanges: '1'
     });
     await page.close();
     return {

ts/smartpdf.paths.ts

@@ -1,3 +1,3 @@
-import * as plugins from './smartpdf.plugins';
+import * as plugins from './smartpdf.plugins.js';
 
-export const packageDir = plugins.path.join(__dirname, '../');
+export const packageDir = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');

ts/smartpdf.plugins.ts

@@ -7,11 +7,12 @@ export { http, path };
 // @pushrocks
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpath from '@pushrocks/smartpath';
 import * as smartpuppeteer from '@pushrocks/smartpuppeteer';
 import * as smartnetwork from '@pushrocks/smartnetwork';
 import * as smartunique from '@pushrocks/smartunique';
 
-export { smartfile, smartpromise, smartpuppeteer, smartunique, smartnetwork };
+export { smartfile, smartpromise, smartpath, smartpuppeteer, smartunique, smartnetwork };
 
 // thirdparty
 import pdfMerger from 'pdf-merger-js';

tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext"
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}