http: added aborted property to request

Backport-PR-URL: #22850
PR-URL: #20094
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

Author: ronag

doc/api/http.md

@@ -1401,7 +1401,7 @@ following additional events, methods, and properties.
 added: v0.3.8
 -->
 
-Emitted when the request has been aborted and the network socket has closed.
+Emitted when the request has been aborted.
 
 ### Event: 'close'
 <!-- YAML
@@ -1411,6 +1411,16 @@ added: v0.4.2
 Indicates that the underlying connection was closed.
 Just like `'end'`, this event occurs only once per response.
 
+### message.aborted
+<!-- YAML
+added: REPLACEME
+-->
+
+* {boolean}
+
+The `message.aborted` property will be `true` if the request has
+been aborted.
+
 ### message.destroy([error])
 <!-- YAML
 added: v0.3.0

doc/api/http2.md

@@ -2422,6 +2422,16 @@ added: v8.4.0
 Indicates that the underlying [`Http2Stream`][] was closed.
 Just like `'end'`, this event occurs only once per response.
 
+#### request.aborted
+<!-- YAML
+added: REPLACEME
+-->
+
+* {boolean}
+
+The `request.aborted` property will be `true` if the request has
+been aborted.
+
 #### request.destroy([error])
 <!-- YAML
 added: v8.4.0

lib/_http_client.js

@@ -299,6 +299,7 @@ ClientRequest.prototype.abort = function abort() {
 if(!this.aborted){
 process.nextTick(emitAbortNT.bind(this));
 }
+
 // Mark as aborting so we can avoid sending queued request data
 // This is used as a truthy flag elsewhere. The use of Date.now is for
 // debugging purposes only.
@@ -350,7 +351,10 @@ function socketCloseListener() {
 req.emit('close');
 if(req.res&&req.res.readable){
 // Socket closed before we emitted 'end' below.
-if(!req.res.complete)req.res.emit('aborted');
+if(!req.res.complete){
+req.res.aborted=true;
+req.res.emit('aborted');
+}
 varres=req.res;
 res.on('end',function(){
 res.emit('close');

lib/_http_incoming.js

@@ -59,6 +59,8 @@ function IncomingMessage(socket) {
 
 this.readable=true;
 
+this.aborted=false;
+
 this.upgrade=null;
 
 // request (server) only

lib/_http_server.js

@@ -436,6 +436,7 @@ function socketOnClose(socket, state) {
 functionabortIncoming(incoming){
 while(incoming.length){
 varreq=incoming.shift();
+req.aborted=true;
 req.emit('aborted');
 req.emit('close');
 }

lib/internal/http2/compat.js

@@ -19,6 +19,7 @@ const kTrailers = Symbol('trailers');
 constkRawTrailers=Symbol('rawTrailers');
 constkProxySocket=Symbol('proxySocket');
 constkSetHeader=Symbol('setHeader');
+constkAborted=Symbol('aborted');
 
 const{
 HTTP2_HEADER_AUTHORITY,
@@ -125,6 +126,7 @@ function onStreamDrain() {
 functiononStreamAbortedRequest(){
 constrequest=this[kRequest];
 if(request!==undefined&&request[kState].closed===false){
+request[kAborted]=true;
 request.emit('aborted');
 }
 }
@@ -221,6 +223,7 @@ class Http2ServerRequest extends Readable {
 this[kTrailers]={};
 this[kRawTrailers]=[];
 this[kStream]=stream;
+this[kAborted]=false;
 stream[kProxySocket]=null;
 stream[kRequest]=this;
 
@@ -236,6 +239,10 @@ class Http2ServerRequest extends Readable {
 this.on('resume',onRequestResume);
 }
 
+getaborted(){
+returnthis[kAborted];
+}
+
 getcomplete(){
 returnthis._readableState.ended||
 this[kState].closed||

test/parallel/test-http-aborted.js

@@ -0,0 +1,26 @@
+'use strict';
+
+constcommon=require('../common');
+consthttp=require('http');
+constassert=require('assert');
+
+constserver=http.createServer(common.mustCall(function(req,res){
+req.on('aborted',common.mustCall(function(){
+assert.strictEqual(this.aborted,true);
+server.close();
+}));
+assert.strictEqual(req.aborted,false);
+res.write('hello');
+}));
+
+server.listen(0,common.mustCall(()=>{
+constreq=http.get({
+port: server.address().port,
+headers: {connection: 'keep-alive'}
+},common.mustCall((res)=>{
+res.on('aborted',common.mustCall(()=>{
+assert.strictEqual(res.aborted,true);
+}));
+req.abort();
+}));
+}));

test/parallel/test-http2-compat-aborted.js

@@ -0,0 +1,27 @@
+'use strict';
+
+constcommon=require('../common');
+if(!common.hasCrypto)
+common.skip('missing crypto');
+consth2=require('http2');
+constassert=require('assert');
+
+
+constserver=h2.createServer(common.mustCall(function(req,res){
+req.on('aborted',common.mustCall(function(){
+assert.strictEqual(this.aborted,true);
+}));
+assert.strictEqual(req.aborted,false);
+res.write('hello');
+server.close();
+}));
+
+server.listen(0,common.mustCall(function(){
+consturl=`http://localhost:${server.address().port}`;
+constclient=h2.connect(url,common.mustCall(()=>{
+constrequest=client.request();
+request.on('data',common.mustCall((chunk)=>{
+client.destroy();
+}));
+}));
+}));