From 19d960074b1223f918de4f63d1a9e3dc140c5a80 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Fri, 10 Apr 2020 10:09:54 -0700
Subject: [PATCH 1/2] grpc-js: Add more information to proxy errors

---
 packages/grpc-js/package.json      | 2 +-
 packages/grpc-js/src/http_proxy.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index 12f06052..9e888eb5 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "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/http_proxy.ts b/packages/grpc-js/src/http_proxy.ts
index ab1083fc..00891bad 100644
--- a/packages/grpc-js/src/http_proxy.ts
+++ b/packages/grpc-js/src/http_proxy.ts
@@ -149,13 +149,13 @@ export function getProxiedConnection(target: string, subchannelAddress: Subchann
         trace('Successfully connected to ' + subchannelAddress + ' through proxy ' + PROXY_INFO.address);
         resolve(socket);
       } else {
-        log(LogVerbosity.ERROR, 'Failed to connect to ' + subchannelAddress + ' through proxy ' + PROXY_INFO.address);
+        log(LogVerbosity.ERROR, 'Failed to connect to ' + subchannelAddress + ' through proxy ' + PROXY_INFO.address + ' with status ' + res.statusCode);
         reject();
       }
     });
     request.once('error', (err) => {
       request.removeAllListeners();
-      log(LogVerbosity.ERROR, 'Failed to connect to proxy ' + PROXY_INFO.address);
+      log(LogVerbosity.ERROR, 'Failed to connect to proxy ' + PROXY_INFO.address + ' with error ' + err.message);
       reject();
     });
   });

From f1c1dafae4318096ddd7fc9cc8c097d753dddc32 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Fri, 10 Apr 2020 10:15:29 -0700
Subject: [PATCH 2/2] grpc-js: Don't include the port in :authority

---
 packages/grpc-js/src/resolver-dns.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/grpc-js/src/resolver-dns.ts b/packages/grpc-js/src/resolver-dns.ts
index 82727a42..4da295e1 100644
--- a/packages/grpc-js/src/resolver-dns.ts
+++ b/packages/grpc-js/src/resolver-dns.ts
@@ -298,16 +298,10 @@ class DnsResolver implements Resolver {
       IPV6_REGEX.exec(target) ||
       IPV6_BRACKET_REGEX.exec(target);
     if (ipMatch) {
-      if (ipMatch[2]) {
-        return ipMatch[1] + ':' + ipMatch[2];
-      }
       return ipMatch[1];
     }
     const dnsMatch = DNS_REGEX.exec(target);
     if (dnsMatch) {
-      if (dnsMatch[2]) {
-        return dnsMatch[1] + ':' + dnsMatch[2];
-      }
       return dnsMatch[1];
     }
     throw new Error(`Failed to parse target ${target}`);