report error on zip package error instead of crash

antiwinter · Sep 1, 2019 · 01be21a · 01be21a
1 parent 9fa70c2
commit 01be21a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/core.js b/core.js
@@ -56,7 +56,8 @@ function getAd(ad, info, tmp, hook) {
     })
     .pipe(fs.createWriteStream(src))
     .on('close', () => {
-      unzip(src, dst, () => {
+      unzip(src, dst, err => {
+        if (err) return hook('unzip failed')
         hook('done')
       })
     })

diff --git a/lib/unzip.js b/lib/unzip.js
@@ -7,7 +7,7 @@ const log = console.log
 
 module.exports = (src, dst, done) => {
   yaz.open(src, { lazyEntries: true }, (err, f) => {
-    if (err) throw err
+    if (err) return done(err)
     f.readEntry()
     f.on('entry', ent => {
       if (/\/$/.test(ent.fileName)) {
@@ -17,7 +17,7 @@ module.exports = (src, dst, done) => {
         // log('  |', path.join(dst, ent.fileName))
         mk(path.dirname(path.join(dst, ent.fileName)), err => {
           f.openReadStream(ent, (err, rs) => {
-            if (err) throw err
+            if (err) return done(err)
 
             rs.pipe(fs.createWriteStream(path.join(dst, ent.fileName))).on(
               'close',
@@ -28,6 +28,8 @@ module.exports = (src, dst, done) => {
           })
         })
       }
-    }).on('end', done)
+    }).on('end', () => {
+      done()
+    })
   })
 }