Skip to content

Emit error when response stream closes before retrying connection #14

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
clue merged 1 commit into from
Jul 18, 2020
Merged

Emit error when response stream closes before retrying connection #14

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
4 changes: 4 additions & 0 deletions examples/stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
var_dump($message);
});

$es->on('open', function () {
echo 'open' . PHP_EOL;
});

$es->on('error', function (Exception $e) use ($es) {
if ($es->readyState === EventSource::CLOSED) {
echo 'Permanent error: ' . $e->getMessage() . PHP_EOL;
Expand Down
8 changes: 7 additions & 1 deletion src/EventSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,12 @@ private function request()
$this->request = null;
if ($this->readyState === self::OPEN) {
$this->readyState = self::CONNECTING;

$this->emit('error', [new \RuntimeException('Stream closed, reconnecting in ' . $this->reconnectTime . ' seconds')]);
if ($this->readyState === self::CLOSED) {
return;
}

$this->timer = $this->loop->addTimer($this->reconnectTime, function () {
$this->timer = null;
$this->request();
Expand All @@ -170,7 +176,7 @@ private function request()
return;
}

$this->emit('error', array($e));
$this->emit('error', [$e]);
if ($this->readyState === self::CLOSED) {
return;
}
Expand Down
30 changes: 28 additions & 2 deletions tests/EventSourceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ public function testConstructorWillReportOpenWhenGetResponseResolvesWithValidRes
$this->assertEquals(EventSource::OPEN, $readyState);
}

public function testCloseResponseStreamWillStartRetryTimerWithoutErrorEvent()
public function testCloseResponseStreamWillStartRetryTimerWithErrorEvent()
{
$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
$loop->expects($this->once())->method('addTimer')->with(
Expand All @@ -373,7 +373,33 @@ public function testCloseResponseStreamWillStartRetryTimerWithoutErrorEvent()
$stream->close();

$this->assertEquals(EventSource::CONNECTING, $es->readyState);
$this->assertNull($error);
$this->assertInstanceOf('RuntimeException', $error);
$this->assertEquals('Stream closed, reconnecting in 3 seconds', $error->getMessage());
}

public function testCloseResponseStreamWillNotStartRetryTimerWhenEventSourceIsClosedFromErrorHandler()
{
$loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
$loop->expects($this->never())->method('addTimer');

$deferred = new Deferred();
$browser = $this->getMockBuilder('React\Http\Browser')->disableOriginalConstructor()->getMock();
$browser->expects($this->once())->method('withRejectErrorResponse')->willReturnSelf();
$browser->expects($this->once())->method('requestStreaming')->willReturn($deferred->promise());

$es = new EventSource('http://example.com', $loop, $browser);

$stream = new ThroughStream();
$response = new Response(200, array('Content-Type' => 'text/event-stream'), new ReadableBodyStream($stream));
$deferred->resolve($response);

$es->on('error', function ($e) use ($es) {
$es->close();
});

$stream->close();

$this->assertEquals(EventSource::CLOSED, $es->readyState);
}

public function testCloseFromOpenEventWillCloseResponseStreamAndCloseEventSource()
Expand Down