hdoc-tools 0.17.11 → 0.17.13

package/hdoc-build-pdf.js

@@ -38,7 +38,7 @@
 
         // Use cheerio to parse html
         const $ = cheerio.load(html_source);
-        
+
         // Get iFrames from HTML, to replace with a tags
         let iframes = [];
         const iframe_html = $('iframe').map(function () {
@@ -55,7 +55,7 @@
             const regex = new RegExp(`<iframe.*src="${iframes[i].src.replace('/', '\\/')}".*</iframe>`);
             html_source = html_source.replace(regex, link);
         }
-        
+
         // Get image links from HTML, to embed into the pdf
         let imgs = [];
         const srcs = $('img').map(function (i) {
@@ -64,18 +64,18 @@
         imgs.push(...srcs);
         for (let i = 0; i < imgs.length; i++) {
             if (!hdoc.valid_url(imgs[i])) {
-                 // Internal link
-                 const image_path = path.join(book_work_root, imgs[i].replace('_books/', ''));
-                 try {
-                     const image_buffer = fs.readFileSync(image_path);
-                     const mime_type = mime.lookup(image_path);
-                     let image_b64 = image_buffer.toString("base64");
-                     image_b64 = `data:${mime_type};base64,${image_b64}`;
-                     html_source = html_source.replace(imgs[i], image_b64);
-                 } catch (err) {
-                     console.log('Error reading image from HTML source [', image_path, '] -', err);
-                     return null;
-                 }
+                // Internal link
+                const image_path = path.join(book_work_root, imgs[i].replace('_books/', ''));
+                try {
+                    const image_buffer = fs.readFileSync(image_path);
+                    const mime_type = mime.lookup(image_path);
+                    let image_b64 = image_buffer.toString("base64");
+                    image_b64 = `data:${mime_type};base64,${image_b64}`;
+                    html_source = html_source.replace(imgs[i], image_b64);
+                } catch (err) {
+                    console.log('Error reading image from HTML source [', image_path, '] -', err);
+                    return null;
+                }
             } else {
                 // External Link
                 try {
@@ -100,7 +100,7 @@
 
     exports.generate_pdf = async function (browser, pdf_template_path, pdf_template_content, book_config, html_source, target_file, css_templates, verbose = false) {
         let pdf_size = 0;
-    
+
         // Cache footer
         if (footer === '') footer = get_footer(pdf_template_path);
 

package/hdoc-build.js

@@ -533,7 +533,7 @@
             if (!bc[relative_path.replace('.html', '')] && bc[relative_path.replace('/index.html', '')]) {
                 relative_path = relative_path.replace('/index.html', '');
             }
-            
+
             index_records.push({
                 relative_path: relative_path,
                 index_html: hdoc_index.transform_html_for_index(html_txt),
@@ -624,7 +624,7 @@
                     let last_commit_date = fm_headers[i].value;
                     if (last_commit_date !== 'No Commit Date Available') {
                         last_commit_date = new Date(fm_headers[i].value).toDateString();
-                    } 
+                    }
                     wip_doc_header = wip_doc_header.replaceAll('{{last-update}}', last_commit_date);
                     break;
             }

package/hdoc-module.js

@@ -4,9 +4,11 @@
     const axios = require('axios'),
         axiosRetry = require('axios-retry'),
         cheerio = require('cheerio'),
+        fs = require('fs'),
         html2text = require('html-to-text'),
         https = require('https'),
         htmlentities = require('html-entities'),
+        path = require('path'),
         wordsCount = require('words-count').default;
 
     let includesCache = {},
@@ -106,6 +108,7 @@
             found: 0,
             success: 0,
             failed: 0,
+            included: [],
             errors: []
         };
 
@@ -136,30 +139,44 @@
             }
 
             // Validate link in INCLUDE
-            try {
-                new URL(link);
-            } catch (err) {
-                response.failed++;
-                response.errors.push(`Error validating INCLUDE link [${link}] from [${file_path}]: ${e}`);
-                continue;
-            }
-
             let file_content;
-            try {
-                const file_response = await axios.get(link);
-                if (retried) {
-                    retried = false;
-                    console.log(`API call retry success!`);
+            if (link.startsWith('http://') || link.startsWith('https://')) {
+                // Remote content to include
+                try {
+                    new URL(link);
+                } catch (e) {
+                    response.failed++;
+                    response.errors.push(`Error validating INCLUDE link [${link}] from [${file_path}]: ${e}`);
+                    continue;
                 }
-                if (file_response.status === 200) {
-                    file_content = file_response.data;
-                } else {
-                    throw `Unexpected Status ${file_response.status}`;
+    
+                try {
+                    const file_response = await axios.get(link);
+                    if (retried) {
+                        retried = false;
+                        console.log(`API call retry success!`);
+                    }
+                    if (file_response.status === 200) {
+                        file_content = file_response.data;
+                    } else {
+                        throw `Unexpected Status ${file_response.status}`;
+                    }
+                } catch (e) {
+                    response.failed++;
+                    response.errors.push(`Error getting INCLUDE link content [${link}] from [${file_path}]: ${e}`);
+                    continue;
                 }
-            } catch (e) {
-                response.failed++;
-                response.errors.push(`Error getting INCLUDE link content [${link}] from [${file_path}]: ${e}`);
-                continue;
+                console.log(`Included From Remote Source: ${link}`);
+            } else {
+                // Local content to include
+                try {
+                    file_content = fs.readFileSync(path.join(process.cwd(), link), 'utf8');
+                } catch (e) {
+                    response.failed++;
+                    response.errors.push(`Error getting INCLUDE file [${link}] from [${file_path}]: ${e}`);
+                    continue;
+                }
+                console.log(`Included From Local Source: ${link}`);
             }
             response.success++;
             includesCache[link] = file_content;

package/hdoc-serve.js

@@ -108,7 +108,7 @@
                   console.error(includes_processed.errors[i]);
                }
             } else {
-               if (includes_processed.found > 0) {
+               if (includes_processed.success > 0) {
                   console.log(`Includes injected into document: ${includes_processed.success}`);
                }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.17.11",
+  "version": "0.17.13",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {
@@ -54,7 +54,7 @@
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
     "prompt": "^1.3.0",
-    "puppeteer": "^20.3.0",
+    "puppeteer": "^21.11.0",
     "retry": "^0.13.1",
     "stream": "0.0.2",
     "true-case-path": "^2.2.1",

package/templates/pdf/css/hdocs-pdf.css

@@ -451,4 +451,37 @@ video {
 
 code {
   font-size: 0.9em;
+}
+
+/* From Bootstrap 5, text color decorations */
+.text-primary {
+  color: #0d6efd !important;
+}
+
+.text-secondary {
+  color: #6c757d !important;
+}
+
+.text-success {
+  color: #198754 !important;
+}
+
+.text-info {
+  color: #0dcaf0 !important;
+}
+
+.text-warning {
+  color: #ffc107 !important;
+}
+
+.text-danger {
+  color: #dc3545 !important;
+}
+
+.text-light {
+  color: #f8f9fa !important;
+}
+
+.text-dark {
+  color: #212529 !important;
 }