Handle signals in onRequest. Closes #3884

hapijs · Jan 6, 2019 · 0c592b7 · 0c592b7
1 parent 2f64d40
commit 0c592b7
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 2 deletions.
diff --git a/lib/response.js b/lib/response.js
@@ -70,7 +70,9 @@ exports = module.exports = internals.Response = class {
 
     static wrap(result, request) {
 
-        if (result instanceof internals.Response) {
+        if (result instanceof internals.Response ||
+            typeof result === 'symbol') {
+
             return result;
         }
 

diff --git a/test/toolkit.js b/test/toolkit.js
@@ -289,10 +289,11 @@ describe('Toolkit', () => {
 
         describe('abandon', () => {
 
-            it('abandon request with manual response', async () => {
+            it('abandon request with manual response (handler)', async () => {
 
                 const handler = (request, h) => {
 
+                    request.raw.res.setHeader('content-type', 'text/plain');
                     request.raw.res.end('manual');
                     return h.abandon;
                 };
@@ -303,6 +304,54 @@ describe('Toolkit', () => {
                 const res = await server.inject('/');
                 expect(res.result).to.equal('manual');
             });
+
+            it('abandon request with manual response (onRequest)', async () => {
+
+                const server = Hapi.server();
+                server.route({ method: 'GET', path: '/', handler: () => null });
+
+                server.ext('onRequest', (request, h) => {
+
+                    request.raw.res.setHeader('content-type', 'text/plain');
+                    request.raw.res.end('manual');
+                    return h.abandon;
+                });
+
+                const res = await server.inject('/');
+                expect(res.result).to.equal('manual');
+            });
+
+            it('abandon request with manual response (lifecycle)', async () => {
+
+                const server = Hapi.server();
+                server.route({ method: 'GET', path: '/', handler: () => null });
+
+                server.ext('onPreHandler', (request, h) => {
+
+                    request.raw.res.setHeader('content-type', 'text/plain');
+                    request.raw.res.end('manual');
+                    return h.abandon;
+                });
+
+                const res = await server.inject('/');
+                expect(res.result).to.equal('manual');
+            });
+
+            it('abandon request with manual response (post cycle)', async () => {
+
+                const server = Hapi.server();
+                server.route({ method: 'GET', path: '/', handler: () => null });
+
+                server.ext('onPreResponse', (request, h) => {
+
+                    request.raw.res.setHeader('content-type', 'text/plain');
+                    request.raw.res.end('manual');
+                    return h.abandon;
+                });
+
+                const res = await server.inject('/');
+                expect(res.result).to.equal('manual');
+            });
         });
 
         describe('close', () => {