From 0d177a818f83cd9de6fc1f5e4bd343de4538e35a Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Wed, 25 Jan 2023 11:52:24 -0800
Subject: [PATCH] grpc-js: Fix tracking of active calls in transport

---
 packages/grpc-js/src/transport.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/grpc-js/src/transport.ts b/packages/grpc-js/src/transport.ts
index a5bf59b3f..a9308471b 100644
--- a/packages/grpc-js/src/transport.ts
+++ b/packages/grpc-js/src/transport.ts
@@ -354,16 +354,20 @@ class Http2Transport implements Transport {
 
   private removeActiveCall(call: Http2SubchannelCall) {
     this.activeCalls.delete(call);
-    if (this.activeCalls.size === 0 && !this.keepaliveWithoutCalls) {
+    if (this.activeCalls.size === 0) {
       this.session.unref();
-      this.stopKeepalivePings();
+      if (!this.keepaliveWithoutCalls) {
+        this.stopKeepalivePings();
+      }
     }
   }
 
   private addActiveCall(call: Http2SubchannelCall) {
-    if (this.activeCalls.size === 0 && !this.keepaliveWithoutCalls) {
+    if (this.activeCalls.size === 0) {
       this.session.ref();
-      this.startKeepalivePings();
+      if (!this.keepaliveWithoutCalls) {
+        this.startKeepalivePings();
+      }
     }
     this.activeCalls.add(call);
   }