Merge pull request #695 from dscho/fix-flaky-unzips

Fix flaky unzips

Author: dscho

__tests__/main.test.ts

@@ -45,6 +45,8 @@ if (process.env.RUN_NETWORK_TESTS !== 'true') {
         env: {
           INPUT_REPOSITORY: 'git/git',
           INPUT_DEFINITIONID: '10',
+          INPUT_ARTIFACT: 'sparse-20.04',
+          INPUT_PATH: '.',
           INPUT_VERBOSE: 'true',
           INPUT_CACHE: 'true'
         }

dist/index.js

@@ -70,6 +70,16 @@ export async function unzip(
         process.stderr.write(`Writing ${storeZipAs}\n`)
         res.pipe(fs.createWriteStream(storeZipAs)).on('error', reject)
       }
+
+      let writingEntry = false
+      let wroteLastEntry = false
+      const finish = (): void => {
+        if (writingEntry || !wroteLastEntry) return
+        if (bytesToExtract === 0) resolve(files)
+        // eslint-disable-next-line prefer-promise-reject-errors
+        else reject(`${bytesToExtract} bytes left to extract`)
+      }
+
       res
         .on('error', reject)
         .pipe(unzipper.Parse())
@@ -78,6 +88,8 @@ export async function unzip(
             process.stderr.write(
               `warning: skipping ${entry.path} because it does not start with ${stripPrefix}\n`
             )
+            entry.autodrain()
+            return
           }
           const entryPath = `${outputDirectory}/${entry.path.substring(
             stripPrefix.length
@@ -86,21 +98,23 @@ export async function unzip(
             mkdirp(entryPath.replace(/\/$/, ''))
             entry.autodrain()
           } else {
+            writingEntry = true
             progress(entryPath)
             entry
               .pipe(fs.createWriteStream(`${entryPath}`))
+              .on('error', reject)
               .on('finish', () => {
                 bytesToExtract -= fs.statSync(entryPath).size
+                writingEntry = false
+                finish()
               })
           }
         })
         .on('error', reject)
         .on('finish', progress)
         .on('finish', () => {
-          bytesToExtract === 0
-            ? resolve(files)
-            : // eslint-disable-next-line prefer-promise-reject-errors
-              reject(`${bytesToExtract} bytes left to extract`)
+          wroteLastEntry = true
+          finish()
         })
     }
     if (url.startsWith('file:')) {