@antora/content-aggregator 3.1.6 → 3.1.7

package/lib/aggregate-content.js

@@ -16,6 +16,7 @@ const GitCredentialManagerStore = require('./git-credential-manager-store')
 const git = require('./git')
 const { NotFoundError, ObjectTypeError, UnknownTransportError, UrlParseError } = git.Errors
 const globStream = require('glob-stream')
+const { inspect } = require('util')
 const invariably = require('./invariably')
 const logger = require('./logger')
 const { makeMatcherRx, versionMatcherOpts: VERSION_MATCHER_OPTS } = require('./matcher')
@@ -118,11 +119,11 @@ async function collectFiles (sourcesByUrl, loadOpts, concurrency, fetchedUrls) {
   })
   return gracefulPromiseAllWithLimit(loadTasks, concurrency.fetch).then(([results, rejections]) => {
     if (rejections.length) {
-      if (concurrency.fetch > 1 && rejections.every(({ recoverable }) => recoverable)) {
+      if (concurrency.fetch > 1 && results.length > 1 && rejections.every(({ recoverable }) => recoverable)) {
         if (loadOpts.progress) loadOpts.progress.terminate() // reset cursor position and allow it be reused
-        const msg0 = 'An unexpected error occurred while concurrently fetching content sources.'
+        const msg0 = 'An unexpected error occurred while fetching content sources concurrently.'
         const msg1 = 'Retrying with git.fetch_concurrency value of 1.'
-        logger.warn(msg0 + ' ' + msg1)
+        logger.warn(rejections[0], msg0 + ' ' + msg1)
         const fulfilledUrls = results.map((it) => it && it.repo.url && it.url).filter((it) => it)
         return collectFiles(sourcesByUrl, loadOpts, Object.assign(concurrency, { fetch: 1 }), fulfilledUrls)
       }
@@ -986,15 +987,14 @@ function transformGitCloneError (err, displayUrl, authRequested) {
   } else if (err.code === 'ENOTFOUND') {
     wrappedMsg = `Content repository host could not be resolved: ${err.hostname}`
   } else {
-    wrappedMsg = `${err.name}: ${err.message}`
+    wrappedMsg = err.message || String(err)
     recoverable = trimMessage = true
   }
-  if (trimMessage) {
-    wrappedMsg = ~(wrappedMsg = wrappedMsg.trimEnd()).indexOf('. ') ? wrappedMsg : wrappedMsg.replace(/\.$/, '')
-  }
+  if (trimMessage && !~(wrappedMsg = wrappedMsg.trimEnd()).indexOf('. ')) wrappedMsg = wrappedMsg.replace(/\.$/, '')
   const errWrapper = new Error(`${wrappedMsg} (url: ${displayUrl})`)
-  errWrapper.stack += `\nCaused by: ${err.stack || 'unknown'}`
-  return recoverable ? Object.assign(errWrapper, { recoverable }) : errWrapper
+  errWrapper.stack += `\nCaused by: ${err.stack ? inspect(err).replace(/^Error \[(.+?)\](?=: )/, '$1') : err}`
+  if (recoverable) Object.defineProperty(errWrapper, 'recoverable', { value: true })
+  return errWrapper
 }
 
 function splitRefPatterns (str) {

package/lib/git-plugin-http.js

@@ -49,11 +49,12 @@ module.exports = ({ headers: extraHeaders, httpProxy, httpsProxy, noProxy } = {}
   }
   return {
     async request ({ url, method, headers, body }) {
-      headers = mergeHeaders(headers, extraHeaders)
+      headers = Object.assign(mergeHeaders(headers, extraHeaders), { connection: 'close' })
       body = await mergeBuffers(body)
-      return new Promise((resolve, reject) =>
-        get({ url, method, headers, body }, (err, res) => (err ? reject(err) : resolve(distillResponse(res))))
-      )
+      return new Promise((resolve, reject) => {
+        const opts = { url, method, headers, body, timeout: 0, keepAlive: false }
+        return get(opts, (err, res) => (err ? reject(err) : resolve(distillResponse(res))))
+      })
     },
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "Fetches and aggregates content from distributed sources for use in an Antora documentation pipeline.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~2.0",
-    "@antora/logger": "3.1.6",
+    "@antora/logger": "3.1.7",
     "@antora/user-require-helper": "~2.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",
     "glob-stream": "~7.0",
     "hpagent": "~1.2",
-    "isomorphic-git": "~1.21",
+    "isomorphic-git": "~1.25",
     "js-yaml": "~4.1",
     "multi-progress": "~4.0",
     "picomatch": "~2.3",