grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2873 from murgatroid99/grpc-js_http_error_resource_exhausted_fix 

grpc-js: Prioritize HTTP status errors over message decoding errors
This commit is contained in:
Michael Lumish 2024-12-18 12:45:37 -08:00 committed by GitHub
parent e9359efc24 63d97170da
commit bae98b3d2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 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", "name": "@grpc/grpc-js",
"version": "1.12.4", "version": "1.12.5",
"description": "gRPC Library for Node - pure JS implementation", "description": "gRPC Library for Node - pure JS implementation",
"homepage": "https://grpc.io/", "homepage": "https://grpc.io/",
"repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js", "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

15
packages/grpc-js/src/subchannel-call.ts
View File

@ -190,7 +190,22 @@ export class Http2SubchannelCall implements SubchannelCall {
try { try {
messages = this.decoder.write(data); messages = this.decoder.write(data);
} catch (e) { } catch (e) {
/* Some servers send HTML error pages along with HTTP status codes.
* When the client attempts to parse this as a length-delimited
* message, the parsed message size is greater than the default limit,
* resulting in a message decoding error. In that situation, the HTTP
* error code information is more useful to the user than the
* RESOURCE_EXHAUSTED error is, so we report that instead. Normally,
* we delay processing the HTTP status until after the stream ends, to
* prioritize reporting the gRPC status from trailers if it is present,
* but when there is a message parsing error we end the stream early
* before processing trailers. */
if (this.httpStatusCode !== undefined && this.httpStatusCode !== 200) {
const mappedStatus = mapHttpStatusCode(this.httpStatusCode);
this.cancelWithStatus(mappedStatus.code, mappedStatus.details);
} else {
this.cancelWithStatus(Status.RESOURCE_EXHAUSTED, (e as Error).message); this.cancelWithStatus(Status.RESOURCE_EXHAUSTED, (e as Error).message);
}
return; return;
} }