Rethrow developer errors. Closes #103

hapijs · Nov 3, 2017 · bac2072 · bac2072
1 parent f248b2e
commit bac2072
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/lib/directory.js b/lib/directory.js
@@ -5,6 +5,7 @@
 const Path = require('path');
 
 const Boom = require('boom');
+const Bounce = require('bounce');
 const Hoek = require('hoek');
 const Joi = require('joi');
 
@@ -111,6 +112,7 @@ exports.handler = function (route, options) {
                 return await File.load(path, request, fileOptions);
             }
             catch (err) {
+                Bounce.ignore(err, 'boom');
                 error = err;
             }
 
@@ -125,7 +127,9 @@ exports.handler = function (route, options) {
                     try {
                         return await File.load(path + '.' + settings.defaultExtension, request, fileOptions);
                     }
-                    catch (err) { }
+                    catch (err) {
+                        Bounce.ignore(err, 'boom');
+                    }
                 }
 
                 return;
@@ -164,6 +168,7 @@ exports.handler = function (route, options) {
                     return await File.load(indexFile, request, fileOptions);
                 }
                 catch (err) {
+                    Bounce.ignore(err, 'boom');
 
                     // Directory
 
@@ -203,6 +208,7 @@ internals.generateListing = async function (path, resource, selection, hasTraili
         files = await Fs.readdir(path);
     }
     catch (err) {
+        Bounce.rethrow(err, 'system');
         throw Boom.internal('Error accessing directory', err);
     }
 

diff --git a/lib/etag.js b/lib/etag.js
@@ -5,6 +5,7 @@
 const Crypto = require('crypto');
 
 const Boom = require('boom');
+const Bounce = require('bounce');
 const LruCache = require('lru-cache');
 
 
@@ -83,6 +84,7 @@ internals.hashFile = async function (response) {
         return hash.read();
     }
     catch (err) {
+        Bounce.rethrow(err, 'system');
         throw Boom.boomify(err, { message: 'Failed to hash file' });
     }
 };

diff --git a/lib/file.js b/lib/file.js
@@ -6,6 +6,7 @@ const Path = require('path');
 
 const Ammo = require('ammo');
 const Boom = require('boom');
+const Bounce = require('bounce');
 const Hoek = require('hoek');
 const Joi = require('joi');
 
@@ -132,7 +133,6 @@ internals.prepare = async function (response) {
         return response;
     }
     catch (err) {
-
         internals.close(response);
         throw err;
     }
@@ -157,6 +157,7 @@ internals.marshal = async function (response) {
             }
             catch (err) {
                 gzFile.close();
+                Bounce.ignore(err, 'boom');
             }
 
             if (stat) {

diff --git a/lib/fs.js b/lib/fs.js
@@ -5,6 +5,7 @@
 const Util = require('util');
 
 const Boom = require('boom');
+const Bounce = require('bounce');
 const Hoek = require('hoek');
 
 
@@ -70,7 +71,9 @@ exports.File.prototype.stat = async function () {
     }
     catch (err) {
         this.close(this.fd);
-        throw err.isBoom ? err : Boom.boomify(err, { message: 'Failed to stat file' });
+
+        Bounce.rethrow(err, ['boom', 'system']);
+        throw Boom.boomify(err, { message: 'Failed to stat file' });
     }
 };
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "inert",
   "description": "Static file and directory handlers plugin for hapi.js",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "repository": "https://github.com/hapijs/inert.git",
   "main": "lib/index.js",
   "keywords": [
@@ -20,6 +20,7 @@
   "dependencies": {
     "ammo": "3.x.x",
     "boom": "7.x.x",
+    "bounce": "1.x.x",
     "hoek": "5.x.x",
     "joi": "13.x.x",
     "lru-cache": "4.1.x"