hdoc-tools 0.9.45 → 0.9.47

package/hdoc-build.js

@@ -637,7 +637,7 @@
         console.log(`Loading product families...`);
         const prods = await hdoc.load_product_families();
         if (!prods.success) {
-            console.log(`ERROR: Failed to load product families: ${prods.errors}\n`);
+            console.log(`${prods.errors}\n`);
             process.exit(1);
         } else {
             prod_families = prods.prod_families;
@@ -655,7 +655,7 @@
                 try {
                     css_templates.push(fs.readFileSync(css_files[i], 'utf8'));
                 } catch (e) {
-                    console.log(`Error reading file [${css_files[i]}]: ${e}`);
+                    console.log(`Error reading file[${css_files[i]}]: ${e}`);
                 }
             }
         }

package/hdoc-module.js

@@ -358,23 +358,30 @@
             prods_supported: [],
             errors: ''
         };
-
-        try {
-            const prods = await axios.get('https://docs.hornbill.com/_books/products.json', {
-                httpsAgent: agent
-            });
-            if (prods.status === 200) {
-                response.prod_families = prods.data;
-                response.prods_supported = [];
-                for (let i = 0; i < response.prod_families.products.length; i++) {
-                    response.prods_supported.push(response.prod_families.products[i].id);
+        const prod_families_url = 'https://docs.hornbill.com/_books/products.json';
+        for (let i = 1; i < 4; i++) {
+            try {
+                const prods = await axios.get(prod_families_url, {
+                    httpsAgent: agent,
+                    timeout: 5000
+                });
+                if (prods.status === 200) {
+                    response.prod_families = prods.data;
+                    response.prods_supported = [];
+                    for (let i = 0; i < response.prod_families.products.length; i++) {
+                        response.prods_supported.push(response.prod_families.products[i].id);
+                    }
+                    response.success = true;
+                    break;
+                } else {
+                    throw `Unexpected status - ${prods.status} ${prods.statusText}`;
                 }
-                response.success = true;
-            } else {
-                throw `Unexpected Status ${prods.status}`;
+            } catch (e) {
+                if (response.errors === '') response.errors = `Request to ${prod_families_url} failed:`;
+                response.errors += `\nAttempt ${i} - Error returning product families: ${e}`;
+                // Wait 2 seconds and try again
+                await new Promise(r => setTimeout(r, 2000));
             }
-        } catch (e) {
-            response.errors = (`Error returning product families: ${e}`);
         }
         return response;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.9.45",
+  "version": "0.9.47",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {
@@ -34,6 +34,7 @@
   "dependencies": {
     "american-british-english-translator": "^0.2.1",
     "axios": "^1.3.2",
+    "axios-retry": "^3.5.0",
     "better-sqlite3": "^8.0.1",
     "body-parser": "^1.20.1",
     "cheerio": "^1.0.0-rc.12",
@@ -50,6 +51,7 @@
     "multer": "^1.4.5-lts.1",
     "prompt": "^1.3.0",
     "puppeteer": "^19.8.0",
+    "retry": "^0.13.1",
     "stream": "0.0.2",
     "true-case-path": "^2.2.1",
     "words-count": "^2.0.2",

package/ui/js/doc.hornbill.js

@@ -133,6 +133,7 @@ function listenForHrefClicks()
 
 }
 
+//-- based on content url highlight match navigation menu item
 //-- based on content url highlight match navigation menu item
 function highlightNavigationLinkFromUrl(matchLinkHref)
 {
@@ -140,32 +141,45 @@ function highlightNavigationLinkFromUrl(matchLinkHref)
     matchLinkHref = removeStartingSlash(matchLinkHref).split("#")[0]; //-- remvoe # link
     $('a.DocLink').removeClass("active");
     
-    document.querySelectorAll('a.DocLink').forEach((el) => {
-        
+    let arrItems = document.querySelectorAll('a.DocLink');
+    
+    for(let x=0;x<arrItems.length;x++)
+    {       
         let checkUrl = null;
         try{
             checkUrl = new URL(el.href);
         }
         catch(e)
         {
-            console.log("BAD navigation menu item found",el.href);
+            //console.log("BAD navigation menu item found",el);
         }
 
         if(checkUrl)
         {
             //console.log(checkUrl.pathname,matchLinkHref)
-            if(removeStartingSlash(checkUrl.pathname).indexOf(matchLinkHref)===0)
+            let testCurrPath = removeStartingSlash(checkUrl.pathname);
+            if(testCurrPath===matchLinkHref)
             {
-                $(el).addClass("active");
+                //-- exact match
+                $(el).addClass("active")
+                el.scrollIntoView();
+                return false;//break out
+            }
+            else if(testCurrPath.indexOf(matchLinkHref)===0)
+            {
+                //-- 
+                $(el).addClass("active")
+                el.scrollIntoView();
                 return false;//break out
             }
             else if(matchLinkHref.indexOf(removeStartingSlash(checkUrl.pathname) + "/")===0)
             {
                 $(el).addClass("active");
+                el.scrollIntoView();
                 return false;//break out
             }
         }
-    });
+    }
 }
 
 function getAnchorFromHash(strHash,strHasClass)