From 91ae2b44b165f4d77ed76deab5275df98230776b Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Mon, 25 Oct 2021 13:29:06 -0700
Subject: [PATCH] grpc-js: Handle undefined socket.localAddress

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

diff --git a/packages/grpc-js/src/channelz.ts b/packages/grpc-js/src/channelz.ts
index a1c85eb47..768efaa58 100644
--- a/packages/grpc-js/src/channelz.ts
+++ b/packages/grpc-js/src/channelz.ts
@@ -298,7 +298,7 @@ export interface TlsInfo {
 }
 
 export interface SocketInfo {
-  localAddress: SubchannelAddress;
+  localAddress: SubchannelAddress | null;
   remoteAddress: SubchannelAddress | null;
   security: TlsInfo | null;
   remoteName: string | null;
@@ -629,7 +629,7 @@ function GetSocket(call: ServerUnaryCall<GetSocketRequest__Output, GetSocketResp
   } : null;
   const socketMessage: SocketMessage = {
     ref: socketRefToMessage(socketEntry.ref),
-    local: subchannelAddressToAddressMessage(resolvedInfo.localAddress),
+    local: resolvedInfo.localAddress ? subchannelAddressToAddressMessage(resolvedInfo.localAddress) : null,
     remote: resolvedInfo.remoteAddress ? subchannelAddressToAddressMessage(resolvedInfo.remoteAddress) : null,
     remote_name: resolvedInfo.remoteName ?? undefined,
     security: securityMessage,
diff --git a/packages/grpc-js/src/server.ts b/packages/grpc-js/src/server.ts
index 8bfc2a5bc..d1905c2e4 100644
--- a/packages/grpc-js/src/server.ts
+++ b/packages/grpc-js/src/server.ts
@@ -188,7 +188,7 @@ export class Server {
       const sessionInfo = this.sessions.get(session)!;
       const sessionSocket = session.socket;
       const remoteAddress = sessionSocket.remoteAddress ? stringToSubchannelAddress(sessionSocket.remoteAddress, sessionSocket.remotePort) : null;
-      const localAddress = stringToSubchannelAddress(sessionSocket.localAddress, sessionSocket.localPort);
+      const localAddress = sessionSocket.localAddress ? stringToSubchannelAddress(sessionSocket.localAddress!, sessionSocket.localPort) : null;
       let tlsInfo: TlsInfo | null;
       if (session.encrypted) {
         const tlsSocket: TLSSocket = sessionSocket as TLSSocket;
diff --git a/packages/grpc-js/src/subchannel.ts b/packages/grpc-js/src/subchannel.ts
index edc843a8a..0b6465b2e 100644
--- a/packages/grpc-js/src/subchannel.ts
+++ b/packages/grpc-js/src/subchannel.ts
@@ -261,7 +261,7 @@ export class Subchannel {
     }
     const sessionSocket = this.session.socket;
     const remoteAddress = sessionSocket.remoteAddress ? stringToSubchannelAddress(sessionSocket.remoteAddress, sessionSocket.remotePort) : null;
-    const localAddress = stringToSubchannelAddress(sessionSocket.localAddress, sessionSocket.localPort);
+    const localAddress = sessionSocket.localAddress ? stringToSubchannelAddress(sessionSocket.localAddress, sessionSocket.localPort) : null;
     let tlsInfo: TlsInfo | null;
     if (this.session.encrypted) {
       const tlsSocket: TLSSocket = sessionSocket as TLSSocket;