hdoc-tools 0.17.5 → 0.17.6

package/hdoc-module.js

@@ -2,6 +2,7 @@
     'use strict';
 
     const axios = require('axios'),
+        axiosRetry = require('axios-retry'),
         cheerio = require('cheerio'),
         html2text = require('html-to-text'),
         https = require('https'),
@@ -10,7 +11,18 @@
     let includesCache = {},
         agent = new https.Agent({
             rejectUnauthorized: false
-        });
+        }),
+        retried = false;
+
+    axiosRetry(axios, {
+        retries: 5,
+        shouldResetTimeout: true,
+        retryCondition: (_error) => true,
+        onRetry: (retryCount, error, requestConfig) => {
+            retried = true;
+            console.log(`\n[WARNING] API call failed - ${error.message}\nEndpoint: ${requestConfig.url}\nRetrying: ${retryCount}`);
+        },
+    });
 
     exports.content_type_for_ext = function (ext) {
         switch (ext) {
@@ -132,6 +144,10 @@
             let file_content;
             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 {
@@ -226,7 +242,7 @@
             repo = repo.endsWith('/') ? repo.slice(0, -1) : repo;
             let github_paths = {};
             github_paths.api_path = repo.replace('https://github.com/', 'https://api.github.com/repos/');
-            github_paths.api_path += '/commits?path=/' + relative_path.replace('\\\\', '/').replace('\\', '/');
+            github_paths.api_path += '/commits?path=' + encodeURIComponent('/' + relative_path.replace('\\\\', '/').replace('\\', '/'));
             github_paths.edit_path = repo + '/blob/main/' + relative_path.replace('\\\\', '/').replace('\\', '/');
             return github_paths;
         }
@@ -240,6 +256,7 @@
         github_paths.api_path += '/contributors';
         return github_paths;
     };
+
     exports.get_github_contributors = async function (github_url, github_api_token, repo) {
         let response = {
             success: false,
@@ -256,7 +273,8 @@
                 'Cache-Control': 'no-cache',
                 'Host': 'api.github.com',
                 'Accept': 'application/json'
-            }
+            },
+            timeout: 5000
         };
         if (github_api_token !== '') {
             request_options.headers.authorization = `Bearer ${github_api_token}`;
@@ -264,15 +282,22 @@
         let github_response;
         try {
             github_response = await axios.get(github_url, request_options);
+            if (retried) {
+                retried = false;
+                console.log(`API call retry success!`);
+            }
         } catch (err) {
-            if (err.response.status !== 403) {
-                response.error = err;
-                return response;
+            if (err.response) {
+                if (err.response.status !== 403) {
+                    response.error = err;
+                    return response;
+                } else {
+                    github_response = err.response;
+                }
             } else {
-                github_response = err.response;
+                response.error = `Unexpected response from GitHub for [${github_url}:\n${JSON.stringify(err)}]`
             }
         }
-
         if (github_response.status === 200) {
             response.success = true;
             let commits = github_response.data;
@@ -306,10 +331,18 @@
             const contrib_url = get_github_contributors_path(repo).api_path;
             try {
                 github_response = await axios.get(contrib_url, request_options);
+                if (retried) {
+                    retried = false;
+                    console.log(`API call retry success!`);
+                }
             } catch (err) {
-                if (err.response.status !== 200) {
-                    response.error = err;
-                    return response;
+                if (err.response && err.response.status) {
+                    if (err.response.status !== 200) {
+                        response.error = err;
+                        return response;
+                    }
+                } else {
+                    response.error = `Unexpected response from GitHub for [${contrib_url}:\n${JSON.stringify(err)}]`
                 }
             }
             if (github_response.status === 200) {

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.17.5",
+  "version": "0.17.6",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {