hdoc-tools 0.9.16 → 0.9.18

package/hdoc-build-pdf.js

@@ -7,7 +7,6 @@
         fs = require('fs-extra'),
         mime = require('mime-types'),
         path = require('path'),
-        puppeteer = require('puppeteer'),
         hdoc = require(path.join(__dirname, 'hdoc-module.js'));
 
     const dree_options = {
@@ -99,7 +98,7 @@
         return html_source;
     };
 
-    exports.generate_pdf = async function (pdf_template_path, pdf_template_content, book_config, html_source, target_file, verbose = false) {
+    exports.generate_pdf = async function (browser, pdf_template_path, pdf_template_content, book_config, html_source, target_file, verbose = false) {
         if (verbose) console.log(`Generating PDF: ${target_file}`);
         let pdf_size = 0;
         // Cache footer
@@ -120,9 +119,6 @@
 
         html_source = pdf_template_content.replace('{{book_title}}', book_config.title).replace('{{document_content}}', html_source).replace('{{hb_logo}}', hb_logo);
 
-        // Create a browser instance
-        const browser = await puppeteer.launch();
-
         // Create a new page
         const page = await browser.newPage();
 
@@ -166,9 +162,7 @@
         } catch (err) {
             console.log(`Error generating PDF ${target_file} - ${err}`);
         }
-
-        // Close the browser instance
-        await browser.close();
+        await page.close();
         return pdf_size;
     };
 })();

package/hdoc-build.js

@@ -6,6 +6,7 @@
         fs = require('fs-extra'),
         mdfm = require('markdown-it-front-matter'),
         path = require('path'),
+        puppeteer = require('puppeteer'),
         URL = require("url").URL,
         hdoc_validate = require(path.join(__dirname, 'hdoc-validate.js')),
         hdoc = require(path.join(__dirname, 'hdoc-module.js')),
@@ -23,11 +24,12 @@
         non_git_pdf_header_template_path = path.join(__dirname, 'templates', 'pdf-header-non-git.html'),
         pdf_template_path = path.join(__dirname, 'templates', 'pdf'),
         pdf_template_file_path = path.join(pdf_template_path, 'template.html'),
-        regex_version = /^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}$/;
+        regex_version = /^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,6}$/;
 
     let bc = {}, // Breadcrumbs map
-        book_read_time = 0,
         built_file_hashes = [],
+        book_read_time = 0,
+        browser = {},
         conversion_attempted = 0,
         conversion_success = 0,
         conversion_failed = 0,
@@ -238,7 +240,7 @@
 
                 // Generate PDF file from HTML
                 const pdf_file_path = file_path.path.replace(path.extname(file_path.path), '.pdf');
-                pdf_size = await hdoc_build_pdf.generate_pdf(pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
+                pdf_size = await hdoc_build_pdf.generate_pdf(browser, pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
             }
 
             html_txt = `${fm_header_content}\n${doc_header}\n${html_txt}`;
@@ -448,7 +450,7 @@
 
                 // Generate PDF file from HTML
                 const pdf_file_path = file_path.path.replace(path.extname(file_path.path), '.pdf');
-                pdf_size = await hdoc_build_pdf.generate_pdf(pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
+                pdf_size = await hdoc_build_pdf.generate_pdf(browser, pdf_template_path, pdf_template, hdocbook_config, pdf_txt, pdf_file_path, verbose);
             }
 
             html_txt = `${fm_header}\n${doc_header}\n${html_txt}`;
@@ -572,6 +574,7 @@
         }
         verbose = verbose_output;
 
+        const start_time = Date.now();
         // GERRY: The purpose of this function is to create a zip file containing the hdocbook content, 
         // * Create a _work folder 
         // * copy the hdocbook content to the work folder
@@ -688,6 +691,11 @@
         // Get a list of MD files in work_path
         dree.scan(work_path, dreeOptions, build_file_callback);
 
+        if (pdf_enable) {
+            // Create a Chromium browser instance to generate PDFs with
+            browser = await puppeteer.launch({headless: 'new'});
+        }
+
         // Work through MD files and convert to HTML
         for (let i = 0; i < md_files.length; i++) {
             await transform_markdown_and_save_html(md_files[i]);
@@ -698,6 +706,11 @@
             await transform_static_html(static_html_files[i]);
         }
 
+        if (pdf_enable) {
+            // Close the Chromium browser instance
+            await browser.close();
+        }
+
         // Output to console
         console.log(`                MD files found: ${conversion_attempted}`);
         console.log(`Successfully converted to HTML: ${conversion_success}`);
@@ -710,6 +723,8 @@
         // Validate content
         const validation_success = await hdoc_validate.run(work_path, doc_id, verbose, hdocbook_config, hdocbook_project, bc);
         if (!validation_success) {
+            const end_time = Date.now();
+            console.log(`Time Taken: ${get_duration(start_time, end_time)}\n`);
             process.exit(1);
         }
 
@@ -761,5 +776,21 @@
         } else {
             console.log('\nValidation Complete\n');
         }
+        const end_time = Date.now();
+        console.log(`Time Taken: ${get_duration(start_time, end_time)}\n`);
     };
+
+    const get_duration = function(start, end) {
+        const total_time = new Date(end - start).toISOString().slice(11,19);
+        const duration_arr = total_time.split(':');
+        let duration = '';
+        if (parseInt(duration_arr[0], 10) > 0) {
+            duration += parseInt(duration_arr[0], 10) + 'h ';
+        }
+        if (duration !== '' || parseInt(duration_arr[1], 10)) {
+            duration += parseInt(duration_arr[1], 10) + 'm ';
+        }
+        duration += parseInt(duration_arr[2], 10) + 's';
+        return duration;
+    }
 })();

package/hdoc-module.js

@@ -379,5 +379,4 @@
         }
         return bc;
     };
-
 })();

package/hdoc.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 (async function () {
    'use strict';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.9.16",
+  "version": "0.9.18",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {
@@ -50,7 +50,7 @@
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
     "prompt": "^1.3.0",
-    "puppeteer": "^19.6.0",
+    "puppeteer": "^19.8.0",
     "stream": "0.0.2",
     "words-count": "^2.0.2",
     "zip-a-folder": "^1.1.5"