From cf11b60ce20123394dc6cb21488c665c7787d84e Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Mon, 18 Apr 2022 09:36:57 -0700
Subject: [PATCH] grpc-js: End calls when keepalive pings time out

---
 packages/grpc-js/package.json      |  2 +-
 packages/grpc-js/src/subchannel.ts | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index 09a88b5a5..a0df55736 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "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/subchannel.ts b/packages/grpc-js/src/subchannel.ts
index 5880f3f97..5d479a73a 100644
--- a/packages/grpc-js/src/subchannel.ts
+++ b/packages/grpc-js/src/subchannel.ts
@@ -358,7 +358,7 @@ export class Subchannel {
     this.keepaliveTrace('Sending ping with timeout ' + this.keepaliveTimeoutMs + 'ms');
     this.keepaliveTimeoutId = setTimeout(() => {
       this.keepaliveTrace('Ping timeout passed without response');
-      this.transitionToState([ConnectivityState.READY], ConnectivityState.IDLE);
+      this.handleDisconnect();
     }, this.keepaliveTimeoutMs);
     this.keepaliveTimeoutId.unref?.();
     this.session!.ping(
@@ -642,6 +642,15 @@ export class Subchannel {
     );
   }
 
+  private handleDisconnect() {
+    this.transitionToState(
+      [ConnectivityState.READY],
+      ConnectivityState.TRANSIENT_FAILURE);
+    for (const listener of this.disconnectListeners) {
+      listener();
+    }
+  }
+
   /**
    * Initiate a state transition from any element of oldStates to the new
    * state. If the current connectivityState is not in oldStates, do nothing.
@@ -672,12 +681,7 @@ export class Subchannel {
         const session = this.session!;
         session.socket.once('close', () => {
           if (this.session === session) {
-            this.transitionToState(
-              [ConnectivityState.READY],
-              ConnectivityState.TRANSIENT_FAILURE);
-            for (const listener of this.disconnectListeners) {
-              listener();
-            }
+            this.handleDisconnect();
           }
         });
         if (this.keepaliveWithoutCalls) {