From 6d98dc5bbfe0d01025c210c80e4f88533679b34a Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Wed, 25 Jan 2023 10:01:45 -0800
Subject: [PATCH] grpc-js: Hold a reference to transport in SubchannelCall

---
 packages/grpc-js/package.json           |  2 +-
 packages/grpc-js/src/subchannel-call.ts | 15 +++------------
 packages/grpc-js/src/transport.ts       |  7 ++++++-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index e9a18179..c17d5e6b 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.8.5",
+  "version": "1.8.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-call.ts b/packages/grpc-js/src/subchannel-call.ts
index a560ed4d..969282e1 100644
--- a/packages/grpc-js/src/subchannel-call.ts
+++ b/packages/grpc-js/src/subchannel-call.ts
@@ -26,7 +26,7 @@ import { LogVerbosity } from './constants';
 import { ServerSurfaceCall } from './server-call';
 import { Deadline } from './deadline';
 import { InterceptingListener, MessageContext, StatusObject, WriteCallback } from './call-interface';
-import { CallEventTracker } from './transport';
+import { CallEventTracker, Transport } from './transport';
 
 const TRACER_NAME = 'subchannel_call';
 
@@ -105,24 +105,15 @@ export class Http2SubchannelCall implements SubchannelCall {
   // This is populated (non-null) if and only if the call has ended
   private finalStatus: StatusObject | null = null;
 
-  private disconnectListener: () => void;
-
   private internalError: SystemError | null = null;
 
   constructor(
     private readonly http2Stream: http2.ClientHttp2Stream,
     private readonly callEventTracker: CallEventTracker,
     private readonly listener: SubchannelCallInterceptingListener,
-    private readonly peerName: string,
+    private readonly transport: Transport,
     private readonly callId: number
   ) {
-    this.disconnectListener = () => {
-      this.endCall({
-        code: Status.UNAVAILABLE,
-        details: 'Connection dropped',
-        metadata: new Metadata(),
-      });
-    };
     http2Stream.on('response', (headers, flags) => {
       let headersString = '';
       for (const header of Object.keys(headers)) {
@@ -475,7 +466,7 @@ export class Http2SubchannelCall implements SubchannelCall {
   }
 
   getPeer(): string {
-    return this.peerName;
+    return this.transport.getPeerName();
   }
 
   getCallNumber(): number {
diff --git a/packages/grpc-js/src/transport.ts b/packages/grpc-js/src/transport.ts
index fc904227..a5bf59b3 100644
--- a/packages/grpc-js/src/transport.ts
+++ b/packages/grpc-js/src/transport.ts
@@ -65,6 +65,7 @@ export interface TransportDisconnectListener {
 
 export interface Transport {
   getChannelzRef(): SocketRef;
+  getPeerName(): string;
   createCall(metadata: Metadata, host: string, method: string, listener: SubchannelCallInterceptingListener, subchannelCallStatsTracker: Partial<CallEventTracker>): SubchannelCall;
   addDisconnectListener(listener: TransportDisconnectListener): void;
   shutdown(): void;
@@ -448,7 +449,7 @@ class Http2Transport implements Transport {
         }
       }
     }
-    call = new Http2SubchannelCall(http2Stream, eventTracker, listener, this.subchannelAddressString, getNextCallNumber());
+    call = new Http2SubchannelCall(http2Stream, eventTracker, listener, this, getNextCallNumber());
     this.addActiveCall(call);
     return call;
   }
@@ -457,6 +458,10 @@ class Http2Transport implements Transport {
     return this.channelzRef;
   }
 
+  getPeerName() {
+    return this.subchannelAddressString;
+  }
+
   shutdown() {
     this.session.close();
   }