Compare commits

..

6 Commits

Author SHA1 Message Date
30e4b4665c 1.0.17 2019-06-03 17:09:16 +02:00
74a0a27fc1 fix(core): update 2019-06-03 17:09:16 +02:00
59eed53644 1.0.16 2019-06-03 16:39:21 +02:00
473aaa004a fix(core): update 2019-06-03 16:39:21 +02:00
ecfd4115a1 1.0.15 2019-06-03 13:56:44 +02:00
0fbbfaac7c fix(core): update 2019-06-03 13:56:43 +02:00
4 changed files with 15 additions and 16 deletions

2
package-lock.json generated
View File

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

View File

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

View File

@ -5,24 +5,27 @@ import { PdfCandidate } from './smartpdf.classes.pdfcandidate';
declare const document; declare const document;
import { IPdfResult } from './interfaces'; import * as interfaces from './interfaces';
export class SmartPdf { export class SmartPdf {
htmlServerInstance: Server; htmlServerInstance: Server;
serverPort: number; serverPort: number;
headlessBrowser: plugins.puppeteer.Browser; headlessBrowser: plugins.puppeteer.Browser;
externalBrowser: boolean = false; externalBrowserBool: boolean = false;
private _readyDeferred: plugins.smartpromise.Deferred<void>; private _readyDeferred: plugins.smartpromise.Deferred<void>;
private _candidates: { [key: string]: PdfCandidate } = {}; private _candidates: { [key: string]: PdfCandidate } = {};
constructor(headlessBrowserArg?) { constructor() {
this.headlessBrowser = headlessBrowserArg
this._readyDeferred = new plugins.smartpromise.Deferred(); this._readyDeferred = new plugins.smartpromise.Deferred();
} }
async start() { async start(headlessBrowserArg?) {
// lets set the external browser in case one is provided
this.headlessBrowser = headlessBrowserArg
// setup puppeteer // setup puppeteer
if (!this.headlessBrowser) { if (this.headlessBrowser) {
this.externalBrowserBool = true;
} else {
let chromeArgs: string[] = []; let chromeArgs: string[] = [];
if(process.env.CI) { if(process.env.CI) {
chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']) chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox'])
@ -30,8 +33,6 @@ export class SmartPdf {
this.headlessBrowser = await plugins.puppeteer.launch({ this.headlessBrowser = await plugins.puppeteer.launch({
args: chromeArgs args: chromeArgs
}); });
} else {
this.externalBrowser = true;
} }
// setup server // setup server
@ -49,13 +50,14 @@ export class SmartPdf {
}); });
} }
// stop
async stop() { async stop() {
const done = plugins.smartpromise.defer<void>(); const done = plugins.smartpromise.defer<void>();
this.htmlServerInstance.close(() => { this.htmlServerInstance.close(() => {
done.resolve(); done.resolve();
}); });
if (!this.externalBrowser) { if (!this.externalBrowserBool) {
await this.headlessBrowser.close(); await this.headlessBrowser.close();
} }
@ -65,7 +67,7 @@ export class SmartPdf {
/** /**
* returns a pdf for a given html string; * returns a pdf for a given html string;
*/ */
async getPdfForHtmlString(htmlStringArg: string): Promise<IPdfResult> { async getPdfForHtmlString(htmlStringArg: string): Promise<interfaces.IPdfResult> {
await this._readyDeferred.promise; await this._readyDeferred.promise;
const pdfCandidate = new PdfCandidate(htmlStringArg); const pdfCandidate = new PdfCandidate(htmlStringArg);
this._candidates[pdfCandidate.pdfId] = pdfCandidate; this._candidates[pdfCandidate.pdfId] = pdfCandidate;
@ -95,7 +97,7 @@ export class SmartPdf {
}; };
} }
async getPdfForWebsite(websiteUrl: string): Promise<IPdfResult> { async getPdfForWebsite(websiteUrl: string): Promise<interfaces.IPdfResult> {
const page = await this.headlessBrowser.newPage(); const page = await this.headlessBrowser.newPage();
page.emulateMedia('screen'); page.emulateMedia('screen');
const response = await page.goto(websiteUrl, { waitUntil: 'networkidle2' }); const response = await page.goto(websiteUrl, { waitUntil: 'networkidle2' });

View File

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