archive-gh-me/grpc-node
1
0
Fork 0
mirror of https://github.com/grpc/grpc-node.git synced 2025-12-08 18:23:54 +00:00
Code Issues Projects Releases Wiki Activity

grpc-js: Merge remote-tracking branch 'upstream/master' into patch/grpc-js-linting

Browse Source
This commit is contained in:
Patrick Remy 2020-04-12 16:56:44 +02:00
commit 2c3c22ea2a
No known key found for this signature in database
GPG Key ID: FE25C0B14C0500CD
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/package.json
View File

@ -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",

9
packages/grpc-js/src/http_proxy.ts
View File

@ -181,7 +181,9 @@ export function getProxiedConnection(
'Failed to connect to ' +
subchannelAddress +
' through proxy ' +
PROXY_INFO.address
PROXY_INFO.address +
' with status ' +
res.statusCode
);
reject();
}
@ -190,7 +192,10 @@ export function getProxiedConnection(
request.removeAllListeners();
log(
LogVerbosity.ERROR,
'Failed to connect to proxy ' + PROXY_INFO.address
'Failed to connect to proxy ' +
PROXY_INFO.address +
' with error ' +
err.message
);
reject();
});

6
packages/grpc-js/src/resolver-dns.ts
View File

@ -306,16 +306,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}`);