Merge pull request #40 from highcharts/bugfix/failed-download

Bugfix/failed download

Author: goransle

app/download.js

@@ -89,7 +89,7 @@ async function downloadSourceFolder (outputDir, repositoryURL, branch) {
  * @param {string} branch
  * @returns Promise<[{}]>
  */
-async function downloadSourceFolderGit (outputDir, branch) {
+async function downloadSourceFolderGit (outputDir, branch, mode = 'tar') {
   log(0, `Downloading source for commit ${branch} using git`)
 
   const responses = []
@@ -107,7 +107,7 @@ async function downloadSourceFolderGit (outputDir, branch) {
           cache: false,
           force: true,
           verbose: false,
-          mode: 'tar'
+          mode
         })
         emitter.clone(outputPath).then(() => {
           result.success = true

app/handlers.js

@@ -325,7 +325,15 @@ async function serveBuildFile (branch, requestURL, useGitDownloader = true) {
   if (!isAlreadyDownloaded) {
     try {
       const downloadPromise = server.getDownloadJob(branch) || server.addDownloadJob(branch, useGitDownloader
-        ? downloadSourceFolderGit(pathCacheDirectory, branch)
+        ? downloadSourceFolderGit(pathCacheDirectory, branch).then(
+            result => {
+            // Sometimes the default degit/tiged tar mode fails to find a branch
+              if (!result.some(res => res.success)) {
+                log(2, 'Retrying using git mode')
+                return downloadSourceFolderGit(pathCacheDirectory, branch, 'git')
+              }
+            }
+          )
         : downloadSourceFolder(pathCacheDirectory, URL_DOWNLOAD, branch))
       if (!downloadPromise) throw new Error()
     } catch (error) {

app/middleware.js

@@ -41,6 +41,10 @@ function bodyJSONParser (req, res, next) {
  * @param {Function} next Call the next middleware function in the stack.
  */
 function clientErrorHandler (err, req, res, next) {
+  if (res?.writable) {
+    next(err)
+  }
+
   res.status(response.error.status).send(response.error.body)
   next(err)
 }