From b342001b38237f337af23d9f81fed25b3e6507d6 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Thu, 12 Jan 2023 09:24:21 -0800
Subject: [PATCH 1/3] grpc-js: Reference session in transport when there are
 active calls

---
 packages/grpc-js/package.json     | 2 +-
 packages/grpc-js/src/transport.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index 700c7b77..d9ef213d 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
diff --git a/packages/grpc-js/src/transport.ts b/packages/grpc-js/src/transport.ts
index 64f77094..31497102 100644
--- a/packages/grpc-js/src/transport.ts
+++ b/packages/grpc-js/src/transport.ts
@@ -354,12 +354,14 @@ class Http2Transport implements Transport {
   private removeActiveCall(call: Http2SubchannelCall) {
     this.activeCalls.delete(call);
     if (this.activeCalls.size === 0 && !this.keepaliveWithoutCalls) {
+      this.session.unref();
       this.stopKeepalivePings();
     }
   }
 
   private addActiveCall(call: Http2SubchannelCall) {
     if (this.activeCalls.size === 0 && !this.keepaliveWithoutCalls) {
+      this.session.ref();
       this.startKeepalivePings();
     }
     this.activeCalls.add(call);

From fade30bd0a27bfa32395a35a1bf61ab15cb62f8e Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Thu, 12 Jan 2023 09:47:19 -0800
Subject: [PATCH 2/3] grpc-js: Make call and stream tracking more consistent

---
 packages/grpc-js/src/subchannel-call.ts | 3 +--
 packages/grpc-js/src/transport.ts       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/grpc-js/src/subchannel-call.ts b/packages/grpc-js/src/subchannel-call.ts
index a560ed4d..16ac35b5 100644
--- a/packages/grpc-js/src/subchannel-call.ts
+++ b/packages/grpc-js/src/subchannel-call.ts
@@ -198,6 +198,7 @@ export class Http2SubchannelCall implements SubchannelCall {
        * we can bubble up the error message from that event. */
       process.nextTick(() => {
         this.trace('HTTP/2 stream closed with code ' + http2Stream.rstCode);
+        this.callEventTracker.onStreamEnd(this.finalStatus?.code === Status.OK);
         /* If we have a final status with an OK status code, that means that
          * we have received all of the messages and we have processed the
          * trailers and the call completed successfully, so it doesn't matter
@@ -288,7 +289,6 @@ export class Http2SubchannelCall implements SubchannelCall {
         );
         this.internalError = err;
       }
-      this.callEventTracker.onStreamEnd(false);
     });
   }
 
@@ -403,7 +403,6 @@ export class Http2SubchannelCall implements SubchannelCall {
   }
 
   private handleTrailers(headers: http2.IncomingHttpHeaders) {
-    this.callEventTracker.onStreamEnd(true);
     let headersString = '';
     for (const header of Object.keys(headers)) {
       headersString += '\t\t' + header + ': ' + headers[header] + '\n';
diff --git a/packages/grpc-js/src/transport.ts b/packages/grpc-js/src/transport.ts
index 31497102..fc904227 100644
--- a/packages/grpc-js/src/transport.ts
+++ b/packages/grpc-js/src/transport.ts
@@ -420,6 +420,7 @@ class Http2Transport implements Transport {
         },
         onCallEnd: status => {
           subchannelCallStatsTracker.onCallEnd?.(status);
+          this.removeActiveCall(call);
         },
         onStreamEnd: success => {
           if (success) {
@@ -427,7 +428,6 @@ class Http2Transport implements Transport {
           } else {
             this.streamTracker.addCallFailed();
           }
-          this.removeActiveCall(call);
           subchannelCallStatsTracker.onStreamEnd?.(success);
         }
       }

From 7eaebaf1ed601b16c988702cf420a9aeb24a7130 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Thu, 12 Jan 2023 10:00:28 -0800
Subject: [PATCH 3/3] grpc-js: Undo changes to stream tracking

---
 packages/grpc-js/src/subchannel-call.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/grpc-js/src/subchannel-call.ts b/packages/grpc-js/src/subchannel-call.ts
index 16ac35b5..a560ed4d 100644
--- a/packages/grpc-js/src/subchannel-call.ts
+++ b/packages/grpc-js/src/subchannel-call.ts
@@ -198,7 +198,6 @@ export class Http2SubchannelCall implements SubchannelCall {
        * we can bubble up the error message from that event. */
       process.nextTick(() => {
         this.trace('HTTP/2 stream closed with code ' + http2Stream.rstCode);
-        this.callEventTracker.onStreamEnd(this.finalStatus?.code === Status.OK);
         /* If we have a final status with an OK status code, that means that
          * we have received all of the messages and we have processed the
          * trailers and the call completed successfully, so it doesn't matter
@@ -289,6 +288,7 @@ export class Http2SubchannelCall implements SubchannelCall {
         );
         this.internalError = err;
       }
+      this.callEventTracker.onStreamEnd(false);
     });
   }
 
@@ -403,6 +403,7 @@ export class Http2SubchannelCall implements SubchannelCall {
   }
 
   private handleTrailers(headers: http2.IncomingHttpHeaders) {
+    this.callEventTracker.onStreamEnd(true);
     let headersString = '';
     for (const header of Object.keys(headers)) {
       headersString += '\t\t' + header + ': ' + headers[header] + '\n';