2.0.0

.gitignore

@@ -1,7 +1,22 @@
 .nogit/
-node_modules/
+
-assets/pdfdir/
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
 .yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -18,10 +18,11 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 snyk:
   stage: security
@@ -31,101 +32,89 @@ snyk:
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
-    
+    - priv
-testSTABLE:
+
+testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm prepare
-        --env SOURCE_CODE="$PWD"
+    - npmci npm install
-        --volume "$PWD":/code
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -133,15 +122,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
-  allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
   allow_failure: true

.snyk

@@ -0,0 +1,9 @@
+# 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: {}

npmextra.json

@@ -2,5 +2,15 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartpdf",
+      "shortDescription": "Create PDFs fast and smoothly",
+      "npmPackagename": "@pushrocks/smartpdf",
+      "license": "MIT"
+    }
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpdf",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "private": false,
   "description": "create pdfs on the fly",
   "main": "dist/index.js",
@@ -13,20 +13,32 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.8",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.5",
+    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.20",
+    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.9",
+    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^11.13.2"
+    "@types/node": "^12.12.8",
+    "tslint": "^6.0.0-beta0",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartfile": "^7.0.2",
+    "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/smartnetwork": "^1.1.0",
+    "@pushrocks/smartnetwork": "^1.1.14",
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpuppeteer": "^1.0.11",
     "@pushrocks/smartunique": "^3.0.1",
-    "@types/express": "^4.16.1",
+    "@types/express": "^4.17.2",
-    "@types/puppeteer": "^1.12.3",
+    "express": "^4.17.1"
-    "express": "^4.16.4",
+  },
-    "puppeteer": "^1.14.0"
+  "files": [
-  }
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -0,0 +1,31 @@
+# @pushrocks/smartpdf
+Create PDFs fast and smoothly
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartpdf)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartpdf)
+* [github.com (source mirror)](https://github.com/pushrocks/smartpdf)
+* [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/)
+
+## 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). :)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -8,16 +8,37 @@ tap.test('should create a valid instance of smartpdf', async () => {
   expect(testSmartPdf).to.be.instanceof(smartpdf.SmartPdf);
 });
 
-tap.test('should create a pdf from html string', async () => {
+tap.test('should start the instance', async () => {
-  await testSmartPdf.getPdfForHtmlString('hi');
+  await testSmartPdf.start();
 });
 
-tap.test('should create a pdf from website', async () => {
+tap.test('should create a pdf from html string', async () => {
-  await testSmartPdf.getPdfForWebsite('https://maintainedby.lossless.com');
+  await testSmartPdf.getPdfResultForHtmlString('hi');
+});
+
+tap.test('should create a pdf from website as A4', async () => {
+  await testSmartPdf.getPdfResultForWebsite('https://www.wikipedia.org');
+});
+
+tap.test('should create a pdf from website as single page PDF', async () => {
+  await testSmartPdf.getFullWebsiteAsSinglePdf('https://www.wikipedia.org');
+});
+
+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');
+
+  if (!fs.existsSync('.nogit/')) {
+    fs.mkdirSync('.nogit/');
+  }
+  fs.writeFileSync('.nogit/sample.pdf', pdfResult.buffer);
 });
 
 tap.test('should be able to close properly', async () => {
-  await testSmartPdf.close();
+  await testSmartPdf.stop();
 });
 
 tap.start();

ts/index.ts

@@ -1,8 +1,8 @@
 // compatibility
 declare global {
-  interface Element { }
+  interface Element {}
-  interface Node { }
+  interface Node {}
-  interface NodeListOf<TNode = Node> { }
+  interface NodeListOf<TNode = Node> {}
 }
 
 // normal

ts/interfaces/index.ts

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

ts/interfaces/interface.pdfresult.ts

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

ts/smartpdf.classes.pdfresult.ts

@@ -1 +0,0 @@
-import * as plugins from './smartpdf.plugins';

ts/smartpdf.classes.smartpdf.ts

@@ -3,21 +3,33 @@ import * as paths from './smartpdf.paths';
 import { Server } from 'http';
 import { PdfCandidate } from './smartpdf.classes.pdfcandidate';
 
+declare const document;
+
+import * as interfaces from './interfaces';
+
 export class SmartPdf {
   htmlServerInstance: Server;
   serverPort: number;
-  headlessBrowser: plugins.puppeteer.Browser;
+  headlessBrowser: plugins.smartpuppeteer.puppeteer.Browser;
+  externalBrowserBool: boolean = false;
   private _readyDeferred: plugins.smartpromise.Deferred<void>;
   private _candidates: { [key: string]: PdfCandidate } = {};
 
   constructor() {
     this._readyDeferred = new plugins.smartpromise.Deferred();
-    this.init();
   }
 
-  async init() {
+  async start(headlessBrowserArg?) {
+    // lets set the external browser in case one is provided
+    this.headlessBrowser = headlessBrowserArg;
     // setup puppeteer
-    this.headlessBrowser = await plugins.puppeteer.launch();
+    if (this.headlessBrowser) {
+      this.externalBrowserBool = true;
+    } else {
+      this.headlessBrowser = await plugins.smartpuppeteer.getEnvAwareBrowserInstance({
+        forceNoSandbox: true
+      });
+    }
 
     // setup server
     const app = plugins.express();
@@ -34,19 +46,24 @@ export class SmartPdf {
     });
   }
 
-  async close () {
+  // stop
+  async stop() {
     const done = plugins.smartpromise.defer<void>();
     this.htmlServerInstance.close(() => {
       done.resolve();
     });
-    await this.headlessBrowser.close();
+
+    if (!this.externalBrowserBool) {
+      await this.headlessBrowser.close();
+    }
+
     await done.promise;
-  } 
+  }
 
   /**
    * returns a pdf for a given html string;
    */
-  async getPdfForHtmlString(htmlStringArg: string) {
+  async getPdfResultForHtmlString(htmlStringArg: string): Promise<interfaces.IPdfResult> {
     await this._readyDeferred.promise;
     const pdfCandidate = new PdfCandidate(htmlStringArg);
     this._candidates[pdfCandidate.pdfId] = pdfCandidate;
@@ -62,27 +79,74 @@ export class SmartPdf {
       console.log(`id security check passed for ${pdfCandidate.pdfId}`);
     }
 
-    await page.pdf({
+    const pdfBuffer = await page.pdf({
-      path: plugins.path.join(paths.pdfDir, `${pdfCandidate.pdfId}.pdf`),
-      format: 'A4'
-    });
-    await page.close();
-    delete this._candidates[pdfCandidate.pdfId];
-    pdfCandidate.doneDeferred.resolve();
-    await pdfCandidate.doneDeferred.promise;
-  }
-
-  async getPdfForWebsite(websiteUrl: string) {
-    const page = await this.headlessBrowser.newPage();
-    const response = await page.goto(websiteUrl, { waitUntil: 'networkidle2' });
-    const pdfId = plugins.smartunique.shortId();
-    await page.pdf({
-      path: plugins.path.join(paths.pdfDir, `${pdfId}.pdf`),
       format: 'A4',
       printBackground: true,
       displayHeaderFooter: false,
       preferCSSPageSize: true
     });
     await page.close();
+    delete this._candidates[pdfCandidate.pdfId];
+    pdfCandidate.doneDeferred.resolve();
+    await pdfCandidate.doneDeferred.promise;
+    return {
+      id: pdfCandidate.pdfId,
+      name: `${pdfCandidate.pdfId}.js`,
+      buffer: pdfBuffer
+    };
+  }
+
+  async getPdfResultForWebsite(websiteUrl: string): Promise<interfaces.IPdfResult> {
+    const page = await this.headlessBrowser.newPage();
+    await page.emulateMedia('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
+    });
+    await page.close();
+    return {
+      id: pdfId,
+      name: `${pdfId}.js`,
+      buffer: pdfBuffer
+    };
+  }
+
+  async getFullWebsiteAsSinglePdf(websiteUrl: string) {
+    const page = await this.headlessBrowser.newPage();
+    page.emulateMedia('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
+    });
+    await page.close();
+    return {
+      id: pdfId,
+      name: `${pdfId}.js`,
+      buffer: pdfBuffer
+    };
   }
 }

ts/smartpdf.paths.ts

@@ -1,6 +1,3 @@
 import * as plugins from './smartpdf.plugins';
 
 export const packageDir = plugins.path.join(__dirname, '../');
-export const pdfDir = plugins.path.join(packageDir, 'assets/pdfdir');
-
-plugins.smartfile.fs.ensureDirSync(pdfDir);

ts/smartpdf.plugins.ts

@@ -7,13 +7,13 @@ export { http, path };
 // @pushrocks
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpuppeteer from '@pushrocks/smartpuppeteer';
 import * as smartnetwork from '@pushrocks/smartnetwork';
 import * as smartunique from '@pushrocks/smartunique';
 
-export { smartfile, smartpromise, smartunique, smartnetwork };
+export { smartfile, smartpromise, smartpuppeteer, smartunique, smartnetwork };
 
 // thirdparty
-import * as express from 'express';
+import express from 'express';
-import * as puppeteer from 'puppeteer';
 
-export { express, puppeteer };
+export { express };

tslint.json

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