Skip to content
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

Jump to bottom

Append chunked body responses invoked as part of _build_request #40

Merged
merged 2 commits into from Feb 5, 2018
Merged

Append chunked body responses invoked as part of _build_request #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c50d8a7
Append chunked body responses invoked as part of _build_request
Feb 4, 2018
d6673e8
Handle streaming and non-streaming events cleanly
Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
53 changes: 39 additions & 14 deletions lib/Net/Etcd/Role/Actions.pm
View file
Open in desktop
Expand Up @@ -169,21 +169,46 @@ sub _build_request {
my($headers) = @_;
$self->{response}{headers} = $headers;
},
on_body => sub {
my ($data, $hdr) = @_;
$self->{response}{content} = $data;
$cb->($data, $hdr) if $cb;
my $status = $hdr->{Status};
$self->check_hdr($status);
$cv->end;
1
},
want_body_handle => 1,
sub {
my (undef, $hdr) = @_;
#print STDERR Dumper($hdr);
my $status = $hdr->{Status};
$self->check_hdr($status);
$cv->end;
my ($handle, $hdr) = @_;
my $json_reader = sub {
my ($handle, $json) = @_;
return unless $json;
$self->{response}{content} = JSON::encode_json($json);
$cb->($json, $hdr) if $cb;
my $status = $hdr->{Status};
$self->check_hdr($status);
$cv->send;
};
my $chunk_reader = sub {
my($handle, $line) = @_;
return unless $line;
#read chunk size
$line =~ /^([0-9a-fA-F]+)/ or die 'bad chunk (incorrect length) -['.$line.']-';
my $len = hex $1;
#read chunk
$handle->push_read(chunk => $len, sub {
my($handle, $chunk) = @_;
$handle->push_read(line => sub {
length $_[1] and die 'bad chunk (missing last empty line)';
});
$self->{response}{content} = $chunk;
$cb->($chunk, $hdr) if $cb;
my $status = $hdr->{Status};
$self->check_hdr($status);
$cv->send;
});
};

if (($hdr->{'transfer-encoding'} || '') =~ /\bchunked\b/i) {
$handle->on_read(sub {$handle->push_read(line => $chunk_reader)});
} else {
$handle->on_read(sub {$handle->push_read(json => $json_reader)});
}

$handle->on_eof(sub {$handle->destroy; $cv->end});
$handle->on_error(sub {$handle->destroy; $cv->end});
}
);
$cv->recv;
Expand Down