1.0.17

.gitignore

@@ -19,4 +19,5 @@ dist_web/
 dist_serve/
 dist_ts_web/
 
-# custom
+# custom
+assets/pdfdir

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpdf",
-  "version": "1.0.5",
+  "version": "1.0.17",
   "private": false,
   "description": "create pdfs on the fly",
   "main": "dist/index.js",
@@ -13,21 +13,21 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.8",
-    "@gitzone/tsrun": "^1.2.5",
-    "@gitzone/tstest": "^1.0.20",
+    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tstest": "^1.0.24",
     "@pushrocks/tapbundle": "^3.0.9",
-    "@types/node": "^11.13.2"
+    "@types/node": "^12.0.3"
   },
   "dependencies": {
     "@pushrocks/smartfile": "^7.0.2",
-    "@pushrocks/smartnetwork": "^1.1.0",
+    "@pushrocks/smartnetwork": "^1.1.6",
     "@pushrocks/smartpromise": "^3.0.2",
     "@pushrocks/smartunique": "^3.0.1",
     "@types/express": "^4.16.1",
-    "@types/puppeteer": "^1.12.3",
-    "express": "^4.16.4",
-    "puppeteer": "^1.14.0"
+    "@types/puppeteer": "^1.12.4",
+    "express": "^4.17.1",
+    "puppeteer": "^1.17.0"
   },
   "files": [
     "ts/*",

test/test.ts

@@ -8,16 +8,29 @@ tap.test('should create a valid instance of smartpdf', async () => {
   expect(testSmartPdf).to.be.instanceof(smartpdf.SmartPdf);
 });
 
+tap.test('should start the instance', async () => {
+  await testSmartPdf.start();
+});
+
 tap.test('should create a pdf from html string', async () => {
   await testSmartPdf.getPdfForHtmlString('hi');
 });
 
-tap.test('should create a pdf from website', async () => {
+tap.test('should create a pdf from website as A4', async () => {
   await testSmartPdf.getPdfForWebsite('https://maintainedby.lossless.com');
 });
 
+tap.test('should create a pdf from website as single page PDF', async () => {
+  await testSmartPdf.getFullWebsiteAsSinglePdf('https://maintainedby.lossless.com');
+});
+
+tap.test('should create a valid PDFResult', async () => {
+  const pdfResult = await testSmartPdf.getFullWebsiteAsSinglePdf('https://maintainedby.lossless.com');
+  expect(pdfResult.buffer).to.be.instanceOf(Buffer);
+});
+
 tap.test('should be able to close properly', async () => {
-  await testSmartPdf.close();
+  await testSmartPdf.stop();
 });
 
 tap.start();

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.smartpdf.ts

@@ -3,21 +3,37 @@ 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;
+  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 {
+      let  chromeArgs: string[] = [];
+      if(process.env.CI) {
+        chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox'])
+      }
+      this.headlessBrowser = await plugins.puppeteer.launch({
+        args: chromeArgs
+      });
+    }
 
     // setup server
     const app = plugins.express();
@@ -34,19 +50,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 getPdfForHtmlString(htmlStringArg: string): Promise<interfaces.IPdfResult> {
     await this._readyDeferred.promise;
     const pdfCandidate = new PdfCandidate(htmlStringArg);
     this._candidates[pdfCandidate.pdfId] = pdfCandidate;
@@ -62,27 +83,62 @@ export class SmartPdf {
       console.log(`id security check passed for ${pdfCandidate.pdfId}`);
     }
 
-    await page.pdf({
-      path: plugins.path.join(paths.pdfDir, `${pdfCandidate.pdfId}.pdf`),
+    const pdfBuffer = await page.pdf({
       format: 'A4'
     });
     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 getPdfForWebsite(websiteUrl: string) {
+  async getPdfForWebsite(websiteUrl: string): Promise<interfaces.IPdfResult> {
     const page = await this.headlessBrowser.newPage();
+    page.emulateMedia('screen');
     const response = await page.goto(websiteUrl, { waitUntil: 'networkidle2' });
     const pdfId = plugins.smartunique.shortId();
-    await page.pdf({
-      path: plugins.path.join(paths.pdfDir, `${pdfId}.pdf`),
+    const pdfBuffer = await page.pdf({
       format: 'A4',
       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({
+      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

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