Merge 1.9.x into master

packages/grpc-js/src/http_proxy.ts

@@ -30,6 +30,7 @@ import {
 import { ChannelOptions } from './channel-options';
 import { GrpcUri, parseUri, splitHostPort, uriToString } from './uri-parser';
 import { URL } from 'url';
+import { DEFAULT_PORT } from './resolver-dns';
 
 const TRACER_NAME = 'proxy';
 
@@ -189,12 +190,19 @@ export function getProxiedConnection(
   if (parsedTarget === null) {
     return Promise.resolve<ProxyConnectionResult>({});
   }
+  const splitHostPost = splitHostPort(parsedTarget.path);
+  if (splitHostPost === null) {
+    return Promise.resolve<ProxyConnectionResult>({});
+  }
+  const hostPort = `${splitHostPost.host}:${
+    splitHostPost.port ?? DEFAULT_PORT
+  }`;
   const options: http.RequestOptions = {
     method: 'CONNECT',
-    path: parsedTarget.path,
+    path: hostPort,
   };
   const headers: http.OutgoingHttpHeaders = {
-    Host: parsedTarget.path,
+    Host: hostPort,
   };
   // Connect to the subchannel address as a proxy
   if (isTcpSubchannelAddress(address)) {

packages/grpc-js/src/resolver-dns.ts

@@ -43,7 +43,7 @@ function trace(text: string): void {
 /**
  * The default TCP port to connect to if not explicitly specified in the target.
  */
-const DEFAULT_PORT = 443;
+export const DEFAULT_PORT = 443;
 
 const DEFAULT_MIN_TIME_BETWEEN_RESOLUTIONS_MS = 30_000;