WIP

lib/interceptor/cache.js

@@ -58,8 +58,12 @@ module.exports = (opts = {}) => {
         try {
           stream
             .on('error', function (err) {
-              if (!this.readableEnded && typeof handler.onError === 'function') {
-                handler.onError(err)
+              if (!this.readableEnded) {
+                if (typeof handler.onError === 'function') {
+                  handler.onError(err)
+                } else {
+                  throw err
+                }
               }
             })
             .on('close', function () {
@@ -116,22 +120,22 @@ module.exports = (opts = {}) => {
         // TODO (fix): It's weird that "value" lives on stream.
         const { value } = stream
 
-        // Check if the response is stale
-        const now = Date.now()
-        if (now < value.staleAt) {
-          // Dump body.
-          if (util.isStream(opts.body)) {
-            opts.body.on('error', () => {}).resume()
-          }
-          respondWithCachedValue(stream, value)
-        } else if (util.isStream(opts.body) && util.bodyLength(opts.body) !== 0) {
-          // If body is is stream we can't revalidate...
-          // TODO (fix): This could be less strict...
-          dispatch(opts, new CacheHandler(globalOpts, opts, handler))
-        } else {
-          // Need to revalidate the response
-          try {
-            return dispatch(
+        try {
+          // Check if the response is stale
+          const now = Date.now()
+          if (now < value.staleAt) {
+            // Dump body.
+            if (util.isStream(opts.body)) {
+              opts.body.on('error', () => {}).resume()
+            }
+            respondWithCachedValue(stream, value)
+          } else if (util.isStream(opts.body) && util.bodyLength(opts.body) !== 0) {
+            // If body is is stream we can't revalidate...
+            // TODO (fix): This could be less strict...
+            dispatch(opts, new CacheHandler(globalOpts, opts, handler))
+          } else {
+            // Need to revalidate the response
+            dispatch(
               {
                 ...opts,
                 headers: {
@@ -144,10 +148,12 @@ module.exports = (opts = {}) => {
                 new CacheHandler(globalOpts, opts, handler)
               )
             )
-          } catch (err) {
-            if (typeof handler.onError === 'function') {
-              handler.onError(err)
-            }
+          }
+        } catch (err) {
+          if (typeof handler.onError === 'function') {
+            handler.onError(err)
+          } else {
+            throw err
           }
         }
       }
@@ -158,6 +164,8 @@ module.exports = (opts = {}) => {
         Promise.resolve(stream).then(handleStream, err => {
           if (typeof handler.onError === 'function') {
             handler.onError(err)
+          } else {
+            throw err
           }
         })
       }