Allow to boomify non-Error errors

hapijs · Dec 4, 2023 · 9600c08 · 9600c08
1 parent 19e5e2a
commit 9600c08
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -106,8 +106,9 @@ exports.Boom = class extends Error {
         }
         else {
             this.output.payload.message = this.message;
-            if (this.cause?.message) {
-                this.output.payload.message = (this.message === this.output.payload.error) ? this.cause.message : this.message + ': ' + this.cause.message;
+            if (this.cause) {
+                const message = this.cause.message ?? this.cause;
+                this.output.payload.message = (this.message === this.output.payload.error) ? message : this.message + ': ' + message;
             }
         }
     }
@@ -148,11 +149,9 @@ exports.isBoom = function (err, statusCode) {
 
 exports.boomify = function (err, options = {}) {
 
-    Hoek.assert(err instanceof Error, 'Cannot boomify non-Error object');
-
     const { override, data, statusCode, message } = options;
 
-    if (!err.isBoom) {
+    if (!err?.isBoom) {
         return new exports.Boom(message, { statusCode, cause: err, data });
     }
 

diff --git a/test/index.js b/test/index.js
@@ -249,6 +249,15 @@ describe('Boom', () => {
             expect(boom.output.payload.message).to.equal('Override message: Missing data');
             expect(boom.output.statusCode).to.equal(599);
         });
+
+        it('handles non-Error errors', () => {
+
+            const boom = Boom.boomify(123, { message: 'Hello', statusCode: 400 });
+
+            expect(boom.cause).to.equal(123);
+            expect(boom.output.payload.message).to.equal('Hello: 123');
+            expect(boom.output.statusCode).to.equal(400);
+        });
     });
 
     describe('create()', () => {