Skip to content

Catch Guzzle parser exception #82

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
WyriHaximus merged 2 commits into from
May 2, 2017
Merged

Catch Guzzle parser exception #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61bf248
catch Guzzle parser exception
Apr 15, 2017
1e683d3
unsubscribe from the stream
Apr 28, 2017
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
10 changes: 9 additions & 1 deletion src/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,11 @@ public function handleData($data)
$this->buffer .= $data;

if (false !== strpos($this->buffer, "\r\n\r\n")) {
list($response, $bodyChunk) = $this->parseResponse($this->buffer);
try {
list($response, $bodyChunk) = $this->parseResponse($this->buffer);
} catch (\InvalidArgumentException $exception) {
$this->emit('error', [$exception, $this]);
}
Copy link
Member

@clue clue Apr 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May I ask you to amend your changes to return within this block instead? :)

Copy link
Contributor Author

@djagya djagya Apr 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I just wasn't sure if we need to clear the buffer and remove listeners if we emit an error.
Similar changes in react/http made me think that they must be removed/buffer must be cleared even if the response parsing was not successful.
Isn't that the case here?

Copy link
Member

@clue clue Apr 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@djagya It looks like your analysis may be right and makes perfect sense here, sorry for the confusion 👍 Can you update this again?

Copy link
Contributor Author

@djagya djagya Apr 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clue done, sorry for the delay


$this->buffer = null;

Expand All @@ -141,6 +145,10 @@ public function handleData($data)
$this->stream->removeListener('end', array($this, 'handleEnd'));
$this->stream->removeListener('error', array($this, 'handleError'));

if (!isset($response)) {
return;
}

$this->response = $response;

$response->on('end', function () {
Expand Down
22 changes: 22 additions & 0 deletions tests/RequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,28 @@ public function requestShouldEmitErrorIfConnectionEmitsError()
$request->handleError(new \Exception('test'));
}

/** @test */
public function requestShouldEmitErrorIfGuzzleParseThrowsException()
{
$requestData = new RequestData('GET', 'http://www.example.com');
$request = new Request($this->connector, $requestData);

$this->successfulConnectionMock();

$handler = $this->createCallableMock();
$handler->expects($this->once())
->method('__invoke')
->with(
$this->isInstanceOf('\InvalidArgumentException'),
$this->isInstanceOf('React\HttpClient\Request')
);

$request->on('error', $handler);

$request->writeHead();
$request->handleData("\r\n\r\n");
}

/**
* @test
* @expectedException Exception
Expand Down