3.0.0

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -19,22 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-snyk:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-    - lossless
     - docker
-    - notpriv
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -49,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -4,6 +4,7 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,44 +1,49 @@
 {
   "name": "@pushrocks/smartpdf",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "private": false,
   "description": "create pdfs on the fly",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "(tstest test/)",
-    "format": "(gitzone format)",
-    "build": "(tsbuild)"
+    "test": "(tstest test/ --web)",
+    "build": "(tsbuild --web --allowimplicitany)"
   },
   "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.8",
-    "tslint": "^6.0.0-beta0",
-    "tslint-config-prettier": "^1.18.0"
+    "@gitzone/tsbuild": "^2.1.60",
+    "@gitzone/tsrun": "^1.2.31",
+    "@gitzone/tstest": "^1.0.69",
+    "@pushrocks/tapbundle": "^5.0.3",
+    "@types/node": "^17.0.23"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/smartnetwork": "^1.1.14",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartpuppeteer": "^1.0.11",
-    "@pushrocks/smartunique": "^3.0.1",
-    "@types/express": "^4.17.2",
-    "express": "^4.17.1"
+    "@pushrocks/smartfile": "^9.0.6",
+    "@pushrocks/smartnetwork": "^2.0.14",
+    "@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.3",
+    "pdf-merger-js": "^3.4.0",
+    "pdf2json": "^2.0.0"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,16 +8,26 @@ Create PDFs fast and smoothly
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartpdf/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartpdf/badges/master/build.svg)](https://gitlab.com/pushrocks/smartpdf/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smartpdf/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartpdf/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartpdf.svg)](https://www.npmjs.com/package/@pushrocks/smartpdf)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartpdf/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartpdf)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartpdf/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartpdf/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartpdf)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartpdf)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartpdf)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartpdf)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartpdf)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
 
 ## Contribution
 

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 () => {
@@ -25,18 +29,28 @@ tap.test('should create a pdf from website as single page PDF', async () => {
 });
 
 tap.test('should create a valid PDFResult', async () => {
-  const pdfResult = await testSmartPdf.getFullWebsiteAsSinglePdf(
-    'https://maintainedby.lossless.com'
-  );
-  expect(pdfResult.buffer).to.be.instanceOf(Buffer);
-  const fs = await import('fs');
+  const writePDfToDisk = async (urlArg: string, fileName: string) => {
+    const pdfResult = await testSmartPdf.getFullWebsiteAsSinglePdf(urlArg);
+    expect(pdfResult.buffer).toBeInstanceOf(Buffer);
+    const fs = await import('fs');
 
-  if (!fs.existsSync('.nogit/')) {
-    fs.mkdirSync('.nogit/');
-  }
-  fs.writeFileSync('.nogit/sample.pdf', pdfResult.buffer);
+    if (!fs.existsSync('.nogit/')) {
+      fs.mkdirSync('.nogit/');
+    }
+    fs.writeFileSync(`.nogit/${fileName}`, pdfResult.buffer);
+  };
+  await writePDfToDisk('https://maintainedby.lossless.com/', '1.pdf')
+  await writePDfToDisk('https://rendertron.lossless.one/render/https://fitnessloft.de/impressum/', '2.pdf')
 });
 
+tap.test('should combine pdfs', async () => {
+  const fs = await import('fs');
+  const buffer1 = fs.readFileSync('.nogit/1.pdf');
+  const buffer2 = fs.readFileSync('.nogit/2.pdf');
+  fs.writeFileSync(`.nogit/combined.pdf`, await testSmartPdf.mergePdfBuffers([buffer1, buffer2]));
+
+})
+
 tap.test('should be able to close properly', async () => {
   await testSmartPdf.stop();
 });

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/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,8 +1,11 @@
-import * as plugins from './smartpdf.plugins';
+import * as plugins from './smartpdf.plugins.js';
 
 export class PdfCandidate {
-  pdfId = plugins.smartunique.shortId();
-  doneDeferred = plugins.smartpromise.defer();
+  public htmlString: string;
+  public pdfId = plugins.smartunique.shortId();
+  public doneDeferred = plugins.smartpromise.defer();
 
-  constructor(public htmlString) {}
+  constructor(htmlStringArg: string) {
+    this.htmlString = htmlStringArg;
+  }
 }

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;
+declare const document: any;
 
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 export class SmartPdf {
   htmlServerInstance: Server;
@@ -19,7 +19,7 @@ export class SmartPdf {
     this._readyDeferred = new plugins.smartpromise.Deferred();
   }
 
-  async start(headlessBrowserArg?) {
+  async start(headlessBrowserArg?: plugins.smartpuppeteer.puppeteer.Browser) {
     // lets set the external browser in case one is provided
     this.headlessBrowser = headlessBrowserArg;
     // setup puppeteer
@@ -27,7 +27,7 @@ export class SmartPdf {
       this.externalBrowserBool = true;
     } else {
       this.headlessBrowser = await plugins.smartpuppeteer.getEnvAwareBrowserInstance({
-        forceNoSandbox: true
+        forceNoSandbox: true,
       });
     }
 
@@ -39,7 +39,7 @@ export class SmartPdf {
     });
     this.htmlServerInstance = plugins.http.createServer(app);
     const smartnetworkInstance = new plugins.smartnetwork.SmartNetwork();
-    const portAvailable = smartnetworkInstance.isLocalPortAvailable(3210);
+    const portAvailable = smartnetworkInstance.isLocalPortUnused(3210);
     this.htmlServerInstance.listen(3210, 'localhost');
     this.htmlServerInstance.on('listening', () => {
       this._readyDeferred.resolve();
@@ -63,13 +63,17 @@ 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({
+      width: 794,
+      height: 1122,
+    });
     const response = await page.goto(`http://localhost:3210/${pdfCandidate.pdfId}`, {
-      waitUntil: 'networkidle2'
+      waitUntil: 'networkidle2',
     });
     const headers = response.headers();
     if (headers['pdf-id'] !== pdfCandidate.pdfId) {
@@ -80,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];
@@ -92,61 +96,107 @@ export class SmartPdf {
     return {
       id: pdfCandidate.pdfId,
       name: `${pdfCandidate.pdfId}.js`,
-      buffer: pdfBuffer
+      metadata: {
+        textExtraction: await this.extractTextFromPdfBuffer(pdfBuffer),
+      },
+      buffer: pdfBuffer,
     };
   }
 
   async getPdfResultForWebsite(websiteUrl: string): Promise<interfaces.IPdfResult> {
     const page = await this.headlessBrowser.newPage();
-    await page.emulateMedia('screen');
+    await page.setViewport({
+      width: 1980,
+      height: 1200,
+    });
+    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
+        documentWidth: document.width,
       };
     });
     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`,
-      buffer: pdfBuffer
+      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();
-    page.emulateMedia('screen');
+    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`,
-      buffer: pdfBuffer
+      metadata: {
+        textExtraction: await this.extractTextFromPdfBuffer(pdfBuffer),
+      },
+      buffer: pdfBuffer,
     };
   }
+
+  public async mergePdfBuffers(pdfBuffers: Buffer[]): Promise<Buffer> {
+    const merger = new plugins.pdfMerger();
+    for (const buffer of pdfBuffers) {
+      merger.add(buffer);
+    }
+    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,13 +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 { 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"
-}