Skip to content

Support streaming response #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lizan merged 1 commit into from
May 15, 2017
Merged

Support streaming response #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ bind(
git_repository(
name = "envoy",
remote = "https://github.com/lyft/envoy.git",
commit = "14e1f10e3c4f17a9d4579f6711d0c03b7d2647c4",
commit = "8f9d56fb92b68ad157bd55d9003ddd433720c7e1",
)

load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
Expand Down
36 changes: 31 additions & 5 deletions src/envoy/transcoding/filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,14 @@ Http::FilterHeadersStatus Instance::decodeHeaders(Http::HeaderMap& headers,
if (end_stream) {
log().debug("header only request");

auto& data = decoder_callbacks_->decodingBuffer();
ASSERT(!data);
data.reset(new Buffer::OwnedImpl(""));

request_in_.Finish();

ReadToBuffer(transcoder_->RequestOutput(), *data);
Buffer::OwnedImpl data;
ReadToBuffer(transcoder_->RequestOutput(), data);

if (data.length()) {
decoder_callbacks_->addDecodedData(data);
}
}
} else {
log().debug("No transcoding" + status.ToString());
Expand All @@ -86,6 +87,18 @@ Http::FilterDataStatus Instance::decodeData(Buffer::Instance& data,
}

Http::FilterTrailersStatus Instance::decodeTrailers(Http::HeaderMap& trailers) {
log().debug("Transcoding::Instance::decodeTrailers");
if (transcoder_) {
request_in_.Finish();

Buffer::OwnedImpl data;
ReadToBuffer(transcoder_->RequestOutput(), data);

if (data.length()) {
decoder_callbacks_->addDecodedData(data);
}
}

return Http::FilterTrailersStatus::Continue;
}

Expand All @@ -96,6 +109,7 @@ void Instance::setDecoderFilterCallbacks(

Http::FilterHeadersStatus Instance::encodeHeaders(Http::HeaderMap& headers,
bool end_stream) {
log().debug("Transcoding::Instance::encodeHeaders");
if (transcoder_) {
headers.insertContentType().value(kJsonContentType);
}
Expand All @@ -104,6 +118,7 @@ Http::FilterHeadersStatus Instance::encodeHeaders(Http::HeaderMap& headers,

Http::FilterDataStatus Instance::encodeData(Buffer::Instance& data,
bool end_stream) {
log().debug("Transcoding::Instance::encodeData");
if (transcoder_) {
response_in_.Move(data);

Expand All @@ -120,6 +135,17 @@ Http::FilterDataStatus Instance::encodeData(Buffer::Instance& data,
}

Http::FilterTrailersStatus Instance::encodeTrailers(Http::HeaderMap& trailers) {
log().debug("Transcoding::Instance::encodeTrailers");
if (transcoder_) {
response_in_.Finish();

Buffer::OwnedImpl data;
ReadToBuffer(transcoder_->ResponseOutput(), data);

if (data.length()) {
encoder_callbacks_->addEncodedData(data);
}
}
return Http::FilterTrailersStatus::Continue;
}

Expand Down