[Server] IoServer cleanup
Removed React event loop as a requirement; loop can be run outside Removed Server as a requirement for Connection; wasn't used anymore
This commit is contained in:
parent
3d97c76bcb
commit
534375160a
@ -7,19 +7,13 @@ use React\Socket\ConnectionInterface as ReactConn;
|
|||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
class IoConnection implements ConnectionInterface {
|
class IoConnection implements ConnectionInterface {
|
||||||
/**
|
|
||||||
* @var Ratchet\Server\IOServer
|
|
||||||
*/
|
|
||||||
protected $server;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var React\Socket\ConnectionInterface
|
* @var React\Socket\ConnectionInterface
|
||||||
*/
|
*/
|
||||||
protected $conn;
|
protected $conn;
|
||||||
|
|
||||||
public function __construct(ReactConn $conn, IoServer $server) {
|
public function __construct(ReactConn $conn) {
|
||||||
$this->conn = $conn;
|
$this->conn = $conn;
|
||||||
$this->server = $server;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -31,9 +31,9 @@ class IoServer {
|
|||||||
/**
|
/**
|
||||||
* @param Ratchet\MessageComponentInterface The Ratchet application stack to host
|
* @param Ratchet\MessageComponentInterface The Ratchet application stack to host
|
||||||
* @param React\Socket\ServerInterface The React socket server to run the Ratchet application off of
|
* @param React\Socket\ServerInterface The React socket server to run the Ratchet application off of
|
||||||
* @param React\EventLoop\LoopInterface The React looper to run the Ratchet application off of
|
* @param React\EventLoop\LoopInterface|null The React looper to run the Ratchet application off of
|
||||||
*/
|
*/
|
||||||
public function __construct(MessageComponentInterface $app, ServerInterface $socket, LoopInterface $loop) {
|
public function __construct(MessageComponentInterface $app, ServerInterface $socket, LoopInterface $loop = null) {
|
||||||
gc_enable();
|
gc_enable();
|
||||||
set_time_limit(0);
|
set_time_limit(0);
|
||||||
ob_implicit_flush();
|
ob_implicit_flush();
|
||||||
@ -64,8 +64,13 @@ class IoServer {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Run the application by entering the event loop
|
* Run the application by entering the event loop
|
||||||
|
* @throws RuntimeException If a loop was not previously specified
|
||||||
*/
|
*/
|
||||||
public function run() {
|
public function run() {
|
||||||
|
if (null === $this->loop) {
|
||||||
|
throw new \RuntimeException("A React Loop was not provided during instantiation");
|
||||||
|
}
|
||||||
|
|
||||||
$this->loop->run();
|
$this->loop->run();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,7 +78,7 @@ class IoServer {
|
|||||||
* Triggered when a new connection is received from React
|
* Triggered when a new connection is received from React
|
||||||
*/
|
*/
|
||||||
public function handleConnect($conn) {
|
public function handleConnect($conn) {
|
||||||
$conn->decor = new IoConnection($conn, $this);
|
$conn->decor = new IoConnection($conn);
|
||||||
|
|
||||||
$conn->decor->resourceId = (int)$conn->stream;
|
$conn->decor->resourceId = (int)$conn->stream;
|
||||||
$conn->decor->remoteAddress = $conn->getRemoteAddress();
|
$conn->decor->remoteAddress = $conn->getRemoteAddress();
|
||||||
|
@ -20,7 +20,7 @@ class IoServerTest extends \PHPUnit_Framework_TestCase {
|
|||||||
public function setUp() {
|
public function setUp() {
|
||||||
$this->app = new Component;
|
$this->app = new Component;
|
||||||
|
|
||||||
$loop = new StreamSelectLoop(0);
|
$loop = new StreamSelectLoop;
|
||||||
$this->reactor = new Server($loop);
|
$this->reactor = new Server($loop);
|
||||||
$this->reactor->listen(0);
|
$this->reactor->listen(0);
|
||||||
|
|
||||||
@ -86,4 +86,12 @@ class IoServerTest extends \PHPUnit_Framework_TestCase {
|
|||||||
public function testFactory() {
|
public function testFactory() {
|
||||||
$this->assertInstanceOf('\\Ratchet\\Server\\IoServer', IoServer::factory($this->app, 0));
|
$this->assertInstanceOf('\\Ratchet\\Server\\IoServer', IoServer::factory($this->app, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testNoLoopProvidedError() {
|
||||||
|
$loop = new StreamSelectLoop;
|
||||||
|
$io = new IoServer(new Component, new Server($loop));
|
||||||
|
|
||||||
|
$this->setExpectedException('RuntimeException');
|
||||||
|
$io->run();
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user