Merge pull request #253 from Sebastian-Webster/252-lock-does-not-get-released-when-getting-binary-download-redirect-url-on-alpine-linux

Fix lock not being released on binary URL redirect fetch failure that happened on Alpine Linux

Author: Sebastian-Webster

src/libraries/Downloader.ts

@@ -293,9 +293,10 @@ export function downloadBinary(binaryInfo: BinaryInfo, options: InternalServerOp
             let useDownloadsURL = false;
 
             do {
-                const downloadURL = binaryInfo.hostedByOracle ? `${useDownloadsURL ? MySQLCDNDownloadsBaseURL : MySQLCDNArchivesBaseURL}${url}` : await getFileDownloadURLRedirect(url)
+                let downloadURL: string = 'UNINITIALISED'
                 try {
                     downloadTries++;
+                    downloadURL = binaryInfo.hostedByOracle ? `${useDownloadsURL ? MySQLCDNDownloadsBaseURL : MySQLCDNArchivesBaseURL}${url}` : await getFileDownloadURLRedirect(url)
                     logger.log(`Starting download for MySQL version ${version} from ${downloadURL}.`)
                     await downloadFromCDN(downloadURL, archivePath, logger)
                     logger.log(`Finished downloading MySQL version ${version} from ${downloadURL}. Now starting binary extraction.`)
@@ -358,14 +359,15 @@ export function downloadBinary(binaryInfo: BinaryInfo, options: InternalServerOp
             let useDownloadsURL = false;
 
             do {
-                const downloadURL = binaryInfo.hostedByOracle ? `${useDownloadsURL ? MySQLCDNDownloadsBaseURL : MySQLCDNArchivesBaseURL}${url}` : await getFileDownloadURLRedirect(url)
+                let downloadURL: string = 'UNINITIALISED'
                 const uuid = randomUUID()
                 const zipFilepath = `${dirpath}/${uuid}.${fileExtension}`
                 logger.log('Binary filepath:', zipFilepath)
                 const extractedPath = `${dirpath}/${uuid}`
 
                 try {
                     downloadTries++
+                    downloadURL = binaryInfo.hostedByOracle ? `${useDownloadsURL ? MySQLCDNDownloadsBaseURL : MySQLCDNArchivesBaseURL}${url}` : await getFileDownloadURLRedirect(url)
                     logger.log(`Starting download for MySQL version ${version} from ${downloadURL}.`)
                     await downloadFromCDN(downloadURL, zipFilepath, logger)
                     logger.log(`Finished downloading MySQL version ${version} from ${downloadURL}. Now starting binary extraction.`)