1.0.13

.gitignore

@@ -20,3 +20,4 @@ dist_serve/
 dist_ts_web/
 
 # custom
+assets/pdfdir

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpdf",
-  "version": "1.0.6",
+  "version": "1.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartpdf",
-  "version": "1.0.6",
+  "version": "1.0.13",
   "private": false,
   "description": "create pdfs on the fly",
   "main": "dist/index.js",

test/test.ts

@@ -8,6 +8,10 @@ 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');
 });
@@ -20,8 +24,13 @@ 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

@@ -5,21 +5,28 @@ import { PdfCandidate } from './smartpdf.classes.pdfcandidate';
 
 declare const document;
 
+import { IPdfResult } from './interfaces';
+
 export class SmartPdf {
   htmlServerInstance: Server;
   serverPort: number;
   headlessBrowser: plugins.puppeteer.Browser;
+  externalBrowser: boolean = false;
   private _readyDeferred: plugins.smartpromise.Deferred<void>;
   private _candidates: { [key: string]: PdfCandidate } = {};
 
-  constructor() {
+  constructor(headlessBrowserArg?) {
+    this.headlessBrowser = headlessBrowserArg
     this._readyDeferred = new plugins.smartpromise.Deferred();
-    this.init();
   }
 
-  async init() {
+  async start() {
     // setup puppeteer
+    if (!this.headlessBrowser) {
       this.headlessBrowser = await plugins.puppeteer.launch();
+    } else {
+      this.externalBrowser = true;
+    }
 
     // setup server
     const app = plugins.express();
@@ -36,19 +43,23 @@ export class SmartPdf {
     });
   }
 
-  async close() {
+  async stop() {
     const done = plugins.smartpromise.defer<void>();
     this.htmlServerInstance.close(() => {
       done.resolve();
     });
+    
+    if (!this.externalBrowser) {
       await this.headlessBrowser.close();
+    }
+
     await done.promise;
   }
 
   /**
    * returns a pdf for a given html string;
    */
-  async getPdfForHtmlString(htmlStringArg: string) {
+  async getPdfForHtmlString(htmlStringArg: string): Promise<IPdfResult> {
     await this._readyDeferred.promise;
     const pdfCandidate = new PdfCandidate(htmlStringArg);
     this._candidates[pdfCandidate.pdfId] = pdfCandidate;
@@ -64,43 +75,51 @@ 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<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(() => {
-      
+    const { documentHeight, documentWidth } = await page.evaluate(() => {
       return {
         documentHeight: document.height,
         documentWidth: document.width
       };
     });
-    await page.pdf({
-      path: plugins.path.join(paths.pdfDir, `${pdfId}.pdf`),
+    const pdfBuffer = await page.pdf({
       height: documentWidth,
       width: documentWidth,
       printBackground: true,
@@ -108,5 +127,10 @@ export class SmartPdf {
       preferCSSPageSize: true
     });
     await page.close();
+    return {
+      id: pdfId,
+      name: `${pdfId}.js`,
+      buffer: pdfBuffer
+    };
   }
 }