From 2b78a845ac2f93b0f4c9f9a3315afca71f646b0c Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Fri, 21 Sep 2018 15:36:27 -0700
Subject: [PATCH 1/3] http2: add Http2Session.lastReceivedTime

Adds a time stamp indicating the last time data was received from
the connected peer.

Fixes: https://github.com/nodejs/node/issues/21730
---
 doc/api/http2.md                              | 11 ++++++
 lib/internal/http2/core.js                    |  4 +++
 src/node_http2.cc                             | 11 ++++++
 src/node_http2.h                              |  5 +++
 .../test-http2-session-lastreceivedtime.js    | 35 +++++++++++++++++++
 5 files changed, 66 insertions(+)
 create mode 100644 test/parallel/test-http2-session-lastreceivedtime.js

diff --git a/doc/api/http2.md b/doc/api/http2.md
index 205c0dc85b8102..70656c0716ef5b 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -411,6 +411,17 @@ added: v9.4.0
 Transmits a `GOAWAY` frame to the connected peer *without* shutting down the
 `Http2Session`.
 
+#### http2session.lastReceivedTime
+<!-- YAML
+added: REPLACEME
+-->
+
+* { double }
+
+A timestamp indicating the moment the most recently received communication of
+any kind was received from the connected peer. A value of `0` indicates that
+the session is still open but no data has yet been received.
+
 #### http2session.localSettings
 <!-- YAML
 added: v8.4.0
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 9cfa2fe4ccf48a..63cc363092b60e 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -1015,6 +1015,10 @@ class Http2Session extends EventEmitter {
     return !!(this[kState].flags & SESSION_FLAGS_DESTROYED);
   }
 
+  get lastReceivedTime() {
+    return !this.destroyed ? this[kHandle].getLastReceivedTime() : undefined;
+  }
+
   // Resets the timeout counter
   [kUpdateTimer]() {
     if (this.destroyed)
diff --git a/src/node_http2.cc b/src/node_http2.cc
index 837d58c81cbfb5..e25580b108e43a 100644
--- a/src/node_http2.cc
+++ b/src/node_http2.cc
@@ -855,6 +855,14 @@ ssize_t Http2Session::OnCallbackPadding(size_t frameLen,
   return retval;
 }
 
+// last_received_ts_ tracks the last time data was received by this
+// Http2Session object from the underlying i/o
+void Http2Session::GetLastReceivedTime(
+    const FunctionCallbackInfo<Value>& args) {
+  Http2Session* session;
+  ASSIGN_OR_RETURN_UNWRAP(&session, args.Holder());
+  args.GetReturnValue().Set(session->LastReceivedTime());
+}
 
 // Write data received from the i/o stream to the underlying nghttp2_session.
 // On each call to nghttp2_session_mem_recv, nghttp2 will begin calling the
@@ -866,6 +874,7 @@ ssize_t Http2Session::Write(const uv_buf_t* bufs, size_t nbufs) {
   // Note that nghttp2_session_mem_recv is a synchronous operation that
   // will trigger a number of other callbacks. Those will, in turn have
   // multiple side effects.
+  last_received_ts_ = uv_hrtime();
   for (size_t n = 0; n < nbufs; n++) {
     Debug(this, "receiving %d bytes [wants data? %d]",
           bufs[n].len,
@@ -2987,6 +2996,8 @@ void Initialize(Local<Object> target,
   session->SetClassName(http2SessionClassName);
   session->InstanceTemplate()->SetInternalFieldCount(1);
   AsyncWrap::AddWrapMethods(env, session);
+  env->SetProtoMethod(session, "getLastReceivedTime",
+                      Http2Session::GetLastReceivedTime);
   env->SetProtoMethod(session, "origin", Http2Session::Origin);
   env->SetProtoMethod(session, "altsvc", Http2Session::AltSvc);
   env->SetProtoMethod(session, "ping", Http2Session::Ping);
diff --git a/src/node_http2.h b/src/node_http2.h
index 7fa230979a87cb..aac0da429fd0a1 100644
--- a/src/node_http2.h
+++ b/src/node_http2.h
@@ -799,6 +799,7 @@ class Http2Session : public AsyncWrap, public StreamListener {
   static void Ping(const FunctionCallbackInfo<Value>& args);
   static void AltSvc(const FunctionCallbackInfo<Value>& args);
   static void Origin(const FunctionCallbackInfo<Value>& args);
+  static void GetLastReceivedTime(const FunctionCallbackInfo<Value>& args);
 
   template <get_setting fn>
   static void RefreshSettings(const FunctionCallbackInfo<Value>& args);
@@ -828,6 +829,8 @@ class Http2Session : public AsyncWrap, public StreamListener {
   // this session now, and may outlive it.
   void StopTrackingRcbuf(nghttp2_rcbuf* buf);
 
+  double LastReceivedTime() { return last_received_ts_ / 1e6; }
+
   // Returns the current session memory including memory allocated by nghttp2,
   // the current outbound storage queue, and pending writes.
   uint64_t GetCurrentSessionMemory() {
@@ -992,6 +995,8 @@ class Http2Session : public AsyncWrap, public StreamListener {
   std::vector<uint8_t> outgoing_storage_;
   std::vector<int32_t> pending_rst_streams_;
 
+  uint64_t last_received_ts_ = 0;
+
   void CopyDataIntoOutgoing(const uint8_t* src, size_t src_length);
   void ClearOutgoing(int status);
 
diff --git a/test/parallel/test-http2-session-lastreceivedtime.js b/test/parallel/test-http2-session-lastreceivedtime.js
new file mode 100644
index 00000000000000..33549f4bb78333
--- /dev/null
+++ b/test/parallel/test-http2-session-lastreceivedtime.js
@@ -0,0 +1,35 @@
+'use strict';
+
+const {
+  hasCrypto,
+  mustCall,
+  skip
+} = require('../common');
+if (!hasCrypto)
+  skip('missing crypto');
+const {
+  createServer,
+  connect
+} = require('http2');
+const assert = require('assert');
+
+const server = createServer();
+server.on('stream', mustCall((stream) => {
+  assert(stream.session.lastReceivedTime > 0);
+  stream.respond();
+  stream.end('ok');
+}));
+
+server.listen(0, mustCall(() => {
+  const client = connect(`http://localhost:${server.address().port}`);
+
+  const req = client.request();
+  req.on('response', mustCall(() => {
+    assert(client.lastReceivedTime > 0);
+  }));
+  req.resume();
+  req.on('close', mustCall(() => {
+    server.close();
+    client.close();
+  }));
+}));

From 2dc37cf5e809db66a01e47aa0b6dbf0ba33ce93e Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Fri, 21 Sep 2018 15:58:42 -0700
Subject: [PATCH 2/3] [Squash] nit[

---
 doc/api/http2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/http2.md b/doc/api/http2.md
index 70656c0716ef5b..ea68a6147d6fb7 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -416,7 +416,7 @@ Transmits a `GOAWAY` frame to the connected peer *without* shutting down the
 added: REPLACEME
 -->
 
-* { double }
+* {number}
 
 A timestamp indicating the moment the most recently received communication of
 any kind was received from the connected peer. A value of `0` indicates that

From bc5fd8e05536d2dcf6a8856aee287a0d705e6503 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Sun, 23 Sep 2018 16:20:09 -0700
Subject: [PATCH 3/3] [Squash] use function instead

---
 doc/api/http2.md                                     | 11 ++++++-----
 lib/internal/http2/core.js                           |  2 +-
 test/parallel/test-http2-session-lastreceivedtime.js |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/api/http2.md b/doc/api/http2.md
index ea68a6147d6fb7..ab74b94528c81c 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -411,16 +411,17 @@ added: v9.4.0
 Transmits a `GOAWAY` frame to the connected peer *without* shutting down the
 `Http2Session`.
 
-#### http2session.lastReceivedTime
+#### http2session.getLastReceivedTime()
 <!-- YAML
 added: REPLACEME
 -->
 
-* {number}
+* Returns: {number}
 
-A timestamp indicating the moment the most recently received communication of
-any kind was received from the connected peer. A value of `0` indicates that
-the session is still open but no data has yet been received.
+Returns a timestamp indicating the moment the most recently received
+communication of any kind was received from the connected peer. A value of `0`
+indicates that the session is still open but no data has yet been received.
+A value of `undefined` indicates that the session is no longer valid.
 
 #### http2session.localSettings
 <!-- YAML
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
index 63cc363092b60e..0c6e50c113bd1f 100644
--- a/lib/internal/http2/core.js
+++ b/lib/internal/http2/core.js
@@ -1015,7 +1015,7 @@ class Http2Session extends EventEmitter {
     return !!(this[kState].flags & SESSION_FLAGS_DESTROYED);
   }
 
-  get lastReceivedTime() {
+  getLastReceivedTime() {
     return !this.destroyed ? this[kHandle].getLastReceivedTime() : undefined;
   }
 
diff --git a/test/parallel/test-http2-session-lastreceivedtime.js b/test/parallel/test-http2-session-lastreceivedtime.js
index 33549f4bb78333..1b6f3cbb10f1ed 100644
--- a/test/parallel/test-http2-session-lastreceivedtime.js
+++ b/test/parallel/test-http2-session-lastreceivedtime.js
@@ -15,7 +15,7 @@ const assert = require('assert');
 
 const server = createServer();
 server.on('stream', mustCall((stream) => {
-  assert(stream.session.lastReceivedTime > 0);
+  assert(stream.session.getLastReceivedTime() > 0);
   stream.respond();
   stream.end('ok');
 }));
@@ -25,7 +25,7 @@ server.listen(0, mustCall(() => {
 
   const req = client.request();
   req.on('response', mustCall(() => {
-    assert(client.lastReceivedTime > 0);
+    assert(client.getLastReceivedTime() > 0);
   }));
   req.resume();
   req.on('close', mustCall(() => {