Skip to content

Update property visbility according to EventSource specs #30

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
SimonFrings merged 1 commit into from
Apr 11, 2022
Merged

Update property visbility according to EventSource specs #30

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
33 changes: 28 additions & 5 deletions src/EventSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@
*/
class EventSource extends EventEmitter
{
/**
* @var string (read-only) last event ID received
*/
public $lastEventId = '';

// ready state
const CONNECTING = 0;
const OPEN = 1;
Expand All @@ -67,18 +62,46 @@ class EventSource extends EventEmitter
* @see self::CONNECTING
* @see self::OPEN
* @see self::CLOSED
* @psalm-readonly-allow-private-mutation
*/
public $readyState = self::CLOSED;

/**
* @var string (read-only) URL
* @readonly
*/
public $url;

/**
* @var string last event ID received
*/
private $lastEventId = '';

/**
* @var LoopInterface
* @readonly
*/
private $loop;

/**
* @var Browser
* @readonly
*/
private $browser;

/**
* @var ?\React\Promise\PromiseInterface
*/
private $request;

/**
* @var ?\React\EventLoop\TimerInterface
*/
private $timer;

/**
* @var float
*/
private $reconnectTime = 3.0;

/**
Expand Down
4 changes: 4 additions & 0 deletions src/MessageEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,26 @@ public static function parse($data)

/**
* @var string
* @readonly
*/
public $data = '';

/**
* @var ?string
* @readonly
*/
public $lastEventId = null;

/**
* @var string
* @readonly
*/
public $type = 'message';

/**
* @internal
* @var ?int
* @readonly
*/
public $retry;
}
6 changes: 5 additions & 1 deletion tests/EventSourceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,11 @@ public function testEmitMessageOnceWhenCallingCloseFromMessageHandlerFromEventSt

$this->assertInstanceOf('Clue\React\EventSource\MessageEvent', $message);
$this->assertEquals('1', $message->lastEventId);
$this->assertEquals('1', $es->lastEventId);

$ref = new \ReflectionProperty($es, 'lastEventId');
$ref->setAccessible(true);

$this->assertEquals('1', $ref->getValue($es));
}

public function testReconnectAfterStreamClosesUsesLastEventIdFromParsedEventStreamForNextRequest()
Expand Down