fix bugs

Author: jochen-testingbot

lib/downloader.js

@@ -20,8 +20,12 @@ exports.get = function (url, options, cb) {
         const file = fs.createWriteStream(dest)
         response.pipe(file)
         file.on('finish', () => {
-            file.close()
-            cb(null, dest)
+            file.close(err => {
+                if (err) {
+                    return cb(err, null)
+                }
+                cb(null, dest)
+            })
         })
         file.on('error', err => {
             fs.unlink(dest, () => {})

lib/tunnel-launcher.js

@@ -99,6 +99,9 @@ function run (options, callback) {
     checkJava.on('error', err => {
         return callback(new Error(`Java might not be installed, necessary to use testingbot-tunnel ${err.message}`))
     })
+    checkJava.on('spawn', () => {
+        checkJava.kill()
+    })
 
     const onReady = function () {
         started = true
@@ -176,13 +179,9 @@ function run (options, callback) {
 
     activeTunnel.close = closeCallback => {
         if (closeCallback) {
-            if (!activeTunnel) {
+            activeTunnel.on('close', () => {
                 closeCallback()
-            } else {
-                activeTunnel.on('close', () => {
-                    closeCallback()
-                })
-            }
+            })
         }
         activeTunnel.kill('SIGINT')
     }