From 74a0a27fc1fcfcbd763a90f464e146f2095cdf21 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Mon, 3 Jun 2019 17:09:16 +0200 Subject: [PATCH] fix(core): update --- ts/smartpdf.classes.smartpdf.ts | 10 +++++----- ts/smartpdf.paths.ts | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ts/smartpdf.classes.smartpdf.ts b/ts/smartpdf.classes.smartpdf.ts index bbfa5ae..ac67514 100644 --- a/ts/smartpdf.classes.smartpdf.ts +++ b/ts/smartpdf.classes.smartpdf.ts @@ -11,7 +11,7 @@ export class SmartPdf { htmlServerInstance: Server; serverPort: number; headlessBrowser: plugins.puppeteer.Browser; - externalBrowser: boolean = false; + externalBrowserBool: boolean = false; private _readyDeferred: plugins.smartpromise.Deferred; private _candidates: { [key: string]: PdfCandidate } = {}; @@ -23,7 +23,9 @@ export class SmartPdf { // lets set the external browser in case one is provided this.headlessBrowser = headlessBrowserArg // setup puppeteer - if (!this.headlessBrowser) { + if (this.headlessBrowser) { + this.externalBrowserBool = true; + } else { let chromeArgs: string[] = []; if(process.env.CI) { chromeArgs = chromeArgs.concat(['--no-sandbox', '--disable-setuid-sandbox']) @@ -31,8 +33,6 @@ export class SmartPdf { this.headlessBrowser = await plugins.puppeteer.launch({ args: chromeArgs }); - } else { - this.externalBrowser = true; } // setup server @@ -57,7 +57,7 @@ export class SmartPdf { done.resolve(); }); - if (!this.externalBrowser) { + if (!this.externalBrowserBool) { await this.headlessBrowser.close(); } diff --git a/ts/smartpdf.paths.ts b/ts/smartpdf.paths.ts index 88783a8..acf20c9 100644 --- a/ts/smartpdf.paths.ts +++ b/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);