fix: handle request errors in addFromURL

ipfs-inactive · Apr 23, 2018 · 7c5cea5 · 7c5cea5
1 parent e9876cf
commit 7c5cea5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/util/url-add.js b/src/util/url-add.js
@@ -35,8 +35,7 @@ module.exports = (send) => {
 const validUrl = (url) => typeof url === 'string' && url.startsWith('http')
 
 const requestWithRedirect = (url, opts, sendOneFile, callback) => {
-  request(parseUrl(url).protocol)(url, (res) => {
-    res.once('error', callback)
+  const req = request(parseUrl(url).protocol)(url, (res) => {
     if (res.statusCode >= 400) {
       return callback(new Error(`Failed to download with ${res.statusCode}`))
     }
@@ -55,5 +54,9 @@ const requestWithRedirect = (url, opts, sendOneFile, callback) => {
       }
       sendOneFile(res, requestOpts, callback)
     }
-  }).end()
+  })
+
+  req.once('error', callback)
+
+  req.end()
 }
diff --git a/test/util.spec.js b/test/util.spec.js
@@ -155,6 +155,14 @@ describe('.util', () => {
       return ipfs.util.addFromURL('http://www.randomtext.me/#/gibberish', { onlyHash: true })
         .then(out => expectTimeout(ipfs.object.get(out[0].hash), 4000))
     })
+
+    it('with invalid url', function (done) {
+      ipfs.util.addFromURL('http://invalid', (err, result) => {
+        expect(err.code).to.equal('ENOTFOUND')
+        expect(result).to.not.exist()
+        done()
+      })
+    })
   })
 
   describe('.getEndpointConfig', () => {