3.0.3

.snyk

@@ -1,9 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.5
-# ignores vulnerabilities until expiry date; change duration by modifying expiry date
-ignore:
-  SNYK-JS-LODASH-450202:
-    - '@pushrocks/smartnetwork > portscanner > async > lodash':
-        reason: None given
-        expires: '2019-09-13T09:39:26.276Z'
-patch: {}

LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Push.Rocks
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package.json

@@ -1,34 +1,35 @@
 {
   "name": "@pushrocks/smartpdf",
-  "version": "2.0.13",
+  "version": "3.0.3",
   "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/tsrun": "^1.2.18",
-    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^3.2.15",
-    "@types/node": "^17.0.8",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
+    "@gitzone/tsbuild": "^2.1.61",
+    "@gitzone/tsrun": "^1.2.32",
+    "@gitzone/tstest": "^1.0.69",
+    "@pushrocks/tapbundle": "^5.0.3",
+    "@types/node": "^17.0.23"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^9.0.5",
-    "@pushrocks/smartnetwork": "^2.0.10",
-    "@pushrocks/smartpromise": "^3.1.6",
-    "@pushrocks/smartpuppeteer": "^1.0.36",
+    "@pushrocks/smartfile": "^9.0.6",
+    "@pushrocks/smartnetwork": "^3.0.0",
+    "@pushrocks/smartpath": "^5.0.5",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartpuppeteer": "^2.0.0",
     "@pushrocks/smartunique": "^3.0.3",
     "@types/express": "^4.17.13",
-    "express": "^4.17.2",
-    "pdf-merger-js": "^3.2.1"
+    "express": "^4.17.3",
+    "pdf-merger-js": "^3.4.0",
+    "pdf2json": "^2.0.0"
   },
   "files": [
     "ts/**/*",

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,7 +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.getA4PdfResultForHtmlString('hi');
 });
 
 tap.test('should create a pdf from website as A4', async () => {
@@ -27,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/')) {
@@ -36,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/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartpdf',
+  version: '3.0.3',
+  description: 'create pdfs on the fly'
+}

ts/index.ts

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

ts/interfaces/index.ts

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

ts/interfaces/interface.pdfresult.ts

@@ -1,5 +1,8 @@
 export interface IPdfResult {
   name: string;
   id: string;
+  metadata: {
+    textExtraction: string;
+  };
   buffer: Buffer;
 }

ts/smartpdf.classes.pdfcandidate.ts

@@ -1,4 +1,8 @@
-import * as plugins from './smartpdf.plugins';
+/*
+* pdf candidate is a construct used internally for mapping html
+* to pdf buffers delivered by puppeteer
+*/
+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 paths from './smartpdf.paths';
+import * as plugins from './smartpdf.plugins.js';
+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,15 +63,15 @@ 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;
     const page = await this.headlessBrowser.newPage();
     await page.setViewport({
-      height: 842,
-      width: 595,
-    })
+      width: 794,
+      height: 1122,
+    });
     const response = await page.goto(`http://localhost:3210/${pdfCandidate.pdfId}`, {
       waitUntil: 'networkidle2',
     });
@@ -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];
@@ -96,12 +96,19 @@ export class SmartPdf {
     return {
       id: pdfCandidate.pdfId,
       name: `${pdfCandidate.pdfId}.js`,
+      metadata: {
+        textExtraction: await this.extractTextFromPdfBuffer(pdfBuffer),
+      },
       buffer: pdfBuffer,
     };
   }
 
   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();
@@ -112,44 +119,56 @@ export class SmartPdf {
       };
     });
     const pdfBuffer = await page.pdf({
-      format: 'a4',
-      height: documentWidth,
+      height: documentHeight,
       width: documentWidth,
       printBackground: true,
       displayHeaderFooter: false,
-      preferCSSPageSize: true,
     });
     await page.close();
     return {
       id: pdfId,
       name: `${pdfId}.js`,
+      metadata: {
+        textExtraction: await this.extractTextFromPdfBuffer(pdfBuffer),
+      },
       buffer: pdfBuffer,
     };
   }
 
-  async getFullWebsiteAsSinglePdf(websiteUrl: string) {
+  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,
-        documentWidth: document.width,
+        documentHeight: document.body.scrollHeight,
+        documentWidth: document.body.clientWidth,
       };
     });
+    await page.setViewport({
+      width: 1920,
+      height: documentHeight,
+    });
     const pdfBuffer = await page.pdf({
-      format: 'a4',
-      height: documentWidth,
-      width: documentWidth,
+      height: documentHeight,
+      width: 1920,
       printBackground: true,
       displayHeaderFooter: false,
-      preferCSSPageSize: true,
+      scale: 1,
+      pageRanges: '1'
     });
     await page.close();
     return {
       id: pdfId,
       name: `${pdfId}.js`,
+      metadata: {
+        textExtraction: await this.extractTextFromPdfBuffer(pdfBuffer),
+      },
       buffer: pdfBuffer,
     };
   }
@@ -161,4 +180,23 @@ export class SmartPdf {
     }
     return merger.saveAsBuffer();
   }
+
+  public async extractTextFromPdfBuffer(pdfBufferArg: Buffer): Promise<string> {
+    const deferred = plugins.smartpromise.defer<string>();
+    const pdfParser: any = new plugins.pdf2json();
+    pdfParser.on('pdfParser_dataReady', (pdfData: any) => {
+      let finalText = ''
+      for (const page of pdfData.Pages) {
+        for(const text of page.Texts) {
+          for (const letter of text.R) {
+            finalText = finalText + letter.T;
+          }
+          
+        };
+      }
+      deferred.resolve(finalText);
+    });
+    pdfParser.parseBuffer(pdfBufferArg);
+    return deferred.promise;
+  }
 }

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,14 +7,17 @@ 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';
+// @ts-ignore
+import pdf2json from 'pdf2json';
 import express from 'express';
 
-export { pdfMerger, express };
+export { pdfMerger, pdf2json, express };

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"
-}