@antora/ui-loader 3.2.0-alpha.2 → 3.2.0-alpha.4

package/README.md

@@ -10,4 +10,4 @@ Its site generator aggregates documents from versioned content repositories and
 
 Copyright (C) 2017-present [OpenDevise Inc.](https://opendevise.com) and the [Antora Project](https://antora.org).
 
-Use of this software is granted under the terms of the [Mozilla Public License Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/) (MPL-2.0).
+Use of this software is granted under the terms of the [Mozilla Public License Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/) (MPL-2.0).

package/lib/load-ui.js

@@ -8,6 +8,7 @@ const { promises: fsp } = require('fs')
 const { concat: get } = require('simple-get')
 const getCacheDir = require('cache-directory')
 const globStream = require('glob-stream')
+const { inspect } = require('util')
 const ospath = require('path')
 const { posix: path } = ospath
 const picomatch = require('picomatch')
@@ -17,7 +18,7 @@ const forEach = (write, final) => new Writable({ objectMode: true, write, final
 const map = (transform) => new Transform({ objectMode: true, transform })
 const UiCatalog = require('./ui-catalog')
 const yaml = require('js-yaml')
-const vzip = require('gulp-vinyl-zip')
+const vzip = require('@vscode/gulp-vinyl-zip')
 
 const STATIC_FILE_MATCHER_OPTS = {
   expandRange: (begin, end, step, opts) => bracesToGroup(opts ? `{${begin}..${end}..${step}}` : `{${begin}..${end}}`),
@@ -111,12 +112,10 @@ async function loadUi (playbook) {
             .on('error', reject)
             .pipe(collectFiles(resolve))
       ).catch((err) => {
-        const errWrapper = new Error(
+        const msg =
           `Failed to read UI ${bundleFile.isDirectory() ? 'directory' : 'bundle'}: ` +
-            (bundleUrl === bundleFile.path ? bundleUrl : `${bundleFile.path} (resolved from url: ${bundleUrl})`)
-        )
-        errWrapper.stack += `\nCaused by: ${err.stack || 'unknown'}`
-        throw errWrapper
+          (bundleUrl === bundleFile.path ? bundleUrl : `${bundleFile.path} (resolved from url: ${bundleUrl})`)
+        throw transformError(err, msg)
       })
     ),
     srcSupplementalFiles(supplementalFilesSpec, startDir),
@@ -175,7 +174,7 @@ function createAgent (url, { httpProxy, httpsProxy, noProxy }) {
 function downloadBundle (url, to, agent) {
   return new Promise((resolve, reject) => {
     get({ url, agent }, (err, response, contents) => {
-      if (err) reject(err)
+      if (err) return reject(err)
       if (response.statusCode !== 200) {
         const message = `Response code ${response.statusCode} (${response.statusMessage})`
         return reject(Object.assign(new Error(message), { name: 'HTTPError' }))
@@ -193,8 +192,10 @@ function downloadBundle (url, to, agent) {
         )
     })
   }).catch((err) => {
-    const errWrapper = new Error(`${err.summary || 'Failed to download UI bundle'}: ${url}`)
-    errWrapper.stack += `\nCaused by: ${err.stack || 'unknown'}`
+    const errWrapper = transformError(err, `${err.summary || 'Failed to download UI bundle'}: ${url}`)
+    if (err.code === 'ECONNRESET' || (err.message || '').toLowerCase() === 'request timed out') {
+      Object.defineProperty(errWrapper, 'recoverable', { value: true })
+    }
     throw errWrapper
   })
 }
@@ -289,9 +290,7 @@ function srcSupplementalFiles (filesSpec, startDir) {
     if (err.code === 'ENOENT' && err.path === cwd) {
       throw new Error(`Specified ui.supplemental_files directory does not exist: ${dir}`)
     } else {
-      const errWrapper = new Error(`Failed to read ui.supplemental_files ${cwd ? `directory: ${dir}` : 'entry'}`)
-      errWrapper.stack += `\nCaused by: ${err.stack || 'unknown'}`
-      throw errWrapper
+      throw transformError(err, `Failed to read ui.supplemental_files ${cwd ? `directory: ${dir}` : 'entry'}`)
     }
   })
 }
@@ -405,4 +404,10 @@ function symlinkAwareStat (path_) {
   })
 }
 
+function transformError (err, msg) {
+  const errWrapper = new Error(msg)
+  errWrapper.stack += `\nCaused by: ${err.stack ? inspect(err).replace(/^Error \[(.+)\](?=: )/, '$1') : err}`
+  return errWrapper
+}
+
 module.exports = loadUi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/ui-loader",
-  "version": "3.2.0-alpha.2",
+  "version": "3.2.0-alpha.4",
   "description": "Downloads a UI bundle, if necessary, and loads the files into a UI catalog for use in an Antora documentation pipeline.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -26,10 +26,10 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~2.0",
+    "@vscode/gulp-vinyl-zip": "~2.5",
     "braces": "~3.0",
     "cache-directory": "~2.0",
     "glob-stream": "~7.0",
-    "gulp-vinyl-zip": "~2.5",
     "hpagent": "~1.2",
     "js-yaml": "~4.1",
     "picomatch": "~2.3",
@@ -54,7 +54,7 @@
   ],
   "scripts": {
     "test": "_mocha",
-    "prepublishOnly": "node $npm_config_local_prefix/npm/prepublishOnly.js",
-    "postpublish": "node $npm_config_local_prefix/npm/postpublish.js"
+    "prepublishOnly": "npx -y downdoc@latest --prepublish",
+    "postpublish": "npx -y downdoc@latest --postpublish"
   }
 }