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

grpc-js-core: various fixes

This commit is contained in:
Kelvin Jin 2017-12-07 13:49:58 -08:00
parent 09cb531f9b
commit b7eb3d6988
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/grpc-js-core/src/call-stream.ts
View File

@ -182,9 +182,10 @@ export class Http2CallStream extends Duplex implements CallStream {
this.cancelWithStatus(Status.UNKNOWN, error.message); this.cancelWithStatus(Status.UNKNOWN, error.message);
}); });
}); });
stream.on('trailers', (headers) => { stream.on('trailers', (headers: http2.IncomingHttpHeaders) => {
let code: Status = this.mappedStatusCode; let code: Status = this.mappedStatusCode;
if (headers.hasOwnProperty('grpc-status')) { let details = '';
if (typeof headers['grpc-status'] === 'string') {
let receivedCode = Number(headers['grpc-status']); let receivedCode = Number(headers['grpc-status']);
if (receivedCode in Status) { if (receivedCode in Status) {
code = receivedCode; code = receivedCode;
@ -193,9 +194,8 @@ export class Http2CallStream extends Duplex implements CallStream {
} }
delete headers['grpc-status']; delete headers['grpc-status'];
} }
let details = ''; if (typeof headers['grpc-message'] === 'string') {
if (headers.hasOwnProperty('grpc-message')) { details = decodeURI(headers['grpc-message'] as string);
details = decodeURI(headers['grpc-message']);
} }
let metadata: Metadata; let metadata: Metadata;
try { try {
@ -301,7 +301,7 @@ export class Http2CallStream extends Duplex implements CallStream {
} }
this.endCall({code: code, details: details, metadata: new Metadata()}); this.endCall({code: code, details: details, metadata: new Metadata()});
}); });
stream.on('error', () => { stream.on('error', (err: Error) => {
this.endCall({ this.endCall({
code: Status.INTERNAL, code: Status.INTERNAL,
details: 'Internal HTTP2 error', details: 'Internal HTTP2 error',
@ -325,7 +325,9 @@ export class Http2CallStream extends Duplex implements CallStream {
cancelWithStatus(status: Status, details: string): void { cancelWithStatus(status: Status, details: string): void {
this.endCall({code: status, details: details, metadata: new Metadata()}); this.endCall({code: status, details: details, metadata: new Metadata()});
if (this.http2Stream !== null) { // The http2 stream could already have been destroyed if cancelWithStatus
// is called in response to an internal http2 error.
if (this.http2Stream !== null && !this.http2Stream.destroyed) {
/* TODO(murgatroid99): Determine if we want to send different RST_STREAM /* TODO(murgatroid99): Determine if we want to send different RST_STREAM
* codes based on the status code */ * codes based on the status code */
this.http2Stream.rstWithCancel(); this.http2Stream.rstWithCancel();

1
packages/grpc-js-core/src/metadata.ts
View File

@ -166,6 +166,7 @@ export class Metadata {
* Creates an OutgoingHttpHeaders object that can be used with the http2 API. * Creates an OutgoingHttpHeaders object that can be used with the http2 API.
*/ */
toHttp2Headers(): http2.OutgoingHttpHeaders { toHttp2Headers(): http2.OutgoingHttpHeaders {
// NOTE: Node <8.9 formats http2 headers incorrectly.
const result: http2.OutgoingHttpHeaders = {}; const result: http2.OutgoingHttpHeaders = {};
forOwn(this.internalRepr, (values, key) => { forOwn(this.internalRepr, (values, key) => {
// We assume that the user's interaction with this object is limited to // We assume that the user's interaction with this object is limited to