Always attempt to decompress data - even if an error has occurred

This also fixes a bug with decompressing 404 errors - as you may want to save or see the (decompressed) error page.
danielbankhead · Feb 18, 2017 · d254f2c · d254f2c
1 parent f684dde
commit d254f2c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/docs/request.md b/docs/request.md
@@ -196,8 +196,6 @@
           - `using` STRING
             - The tool used to decompress the data
 
-        - _NOTE_: If `null` check `responseHeaders['content-encoding']` as it is possible the decompression was not available for this request
-
       - `error` OBJECT
         - The error data, if any
         - If `null`, _great_

diff --git a/lib/request.js b/lib/request.js
@@ -40,7 +40,9 @@ function decompressData (results, callback) {
     case 'gzip':
       zlib.gunzip(results.data, (error, result) => {
         if (error !== null) {
-          results.error = {type: 'http-gunzip-failed', details: error}
+          if (results.error === null) {
+            results.error = {type: 'http-gunzip-failed', details: error}
+          }
         } else {
           results.data = result
           results.decompressed = {
@@ -55,7 +57,9 @@ function decompressData (results, callback) {
     case 'deflate':
       zlib.inflate(results.data, (error, result) => {
         if (error !== null) {
-          results.error = {type: 'http-inflate-failed', details: error}
+          if (results.error === null) {
+            results.error = {type: 'http-inflate-failed', details: error}
+          }
         } else {
           results.data = result
           results.decompressed = {
@@ -67,6 +71,12 @@ function decompressData (results, callback) {
         processCallback(results, callback)
       })
       break
+
+    case undefined:
+    case null:
+    case '':
+      processCallback(results, callback)
+      break
     default:
       results.error = {type: 'http-unknown-content-encoding'}
       processCallback(results, callback)