fix off by one error with downloadRetries

Sebastian-Webster · Sebastian-Webster · commit a93dd900a0fb · 2024-11-20T20:57:56.000+13:00
diff --git a/src/libraries/Downloader.ts b/src/libraries/Downloader.ts
@@ -245,7 +245,7 @@ export function downloadBinary(binaryInfo: BinaryInfo, options: InternalServerOp
                         logger.error('An error occurred while deleting extractedPath and/or archivePath:', e)
                     }
 
-                    if (downloadTries >= options.downloadRetries) {
+                    if (downloadTries > options.downloadRetries) {
                         //Only reject if we have met the downloadRetries limit
                         try {
                             await releaseFunction()
@@ -258,7 +258,7 @@ export function downloadBinary(binaryInfo: BinaryInfo, options: InternalServerOp
                         console.warn(`An error was encountered during the binary download process. Retrying for retry ${downloadTries}/${options.downloadRetries}. The error was:`, e)
                     }
                 }
-            } while (downloadTries < options.downloadRetries)
+            } while (downloadTries <= options.downloadRetries)
 
             try {
                 releaseFunction()
@@ -292,14 +292,14 @@ export function downloadBinary(binaryInfo: BinaryInfo, options: InternalServerOp
                         logger.error('An error occurred while deleting extractedPath and/or archivePath:', e)
                     }
 
-                    if (downloadTries >= options.downloadRetries) {
+                    if (downloadTries > options.downloadRetries) {
                         //Only reject if we have met the downloadRetries limit
                         return reject(e)
                     } else {
                         console.warn(`An error was encountered during the binary download process. Retrying for retry ${downloadTries}/${options.downloadRetries}. The error was:`, e)
                     }
                 }
-            } while (downloadTries < options.downloadRetries)
+            } while (downloadTries <= options.downloadRetries)
         }
     })
 }

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ export function downloadBinary(binaryInfo: BinaryInfo, options: InternalServerOp`
`245`	`245`	`logger.error('An error occurred while deleting extractedPath and/or archivePath:', e)`
`246`	`246`	`}`
`247`	`247`
`248`		`- if (downloadTries >= options.downloadRetries) {`
	`248`	`+ if (downloadTries > options.downloadRetries) {`
`249`	`249`	`//Only reject if we have met the downloadRetries limit`
`250`	`250`	`try {`
`251`	`251`	`await releaseFunction()`
`@@ -258,7 +258,7 @@ export function downloadBinary(binaryInfo: BinaryInfo, options: InternalServerOp`
`258`	`258`	console.warn(`An error was encountered during the binary download process. Retrying for retry ${downloadTries}/${options.downloadRetries}. The error was:`, e)
`259`	`259`	`}`
`260`	`260`	`}`
`261`		`- } while (downloadTries < options.downloadRetries)`
	`261`	`+ } while (downloadTries <= options.downloadRetries)`
`262`	`262`
`263`	`263`	`try {`
`264`	`264`	`releaseFunction()`
`@@ -292,14 +292,14 @@ export function downloadBinary(binaryInfo: BinaryInfo, options: InternalServerOp`
`292`	`292`	`logger.error('An error occurred while deleting extractedPath and/or archivePath:', e)`
`293`	`293`	`}`
`294`	`294`
`295`		`- if (downloadTries >= options.downloadRetries) {`
	`295`	`+ if (downloadTries > options.downloadRetries) {`
`296`	`296`	`//Only reject if we have met the downloadRetries limit`
`297`	`297`	`return reject(e)`
`298`	`298`	`} else {`
`299`	`299`	console.warn(`An error was encountered during the binary download process. Retrying for retry ${downloadTries}/${options.downloadRetries}. The error was:`, e)
`300`	`300`	`}`
`301`	`301`	`}`
`302`		`- } while (downloadTries < options.downloadRetries)`
	`302`	`+ } while (downloadTries <= options.downloadRetries)`
`303`	`303`	`}`
`304`	`304`	`})`
`305`	`305`	`}`