faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

[WebSocket] Message refactoring

Browse Source 
Moved the message buffering into its own class
This commit is contained in:
Chris Boden 2012-05-20 01:04:09 -04:00
parent ac7cc55d5f
commit e9825e0ba7
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Ratchet/WebSocket/MessageParser.php Normal file
View File

@ -0,0 +1,37 @@
<?php
namespace Ratchet\WebSocket;
class MessageParser {
public function onData(WsConnection $from, $data) {
if (!isset($from->WebSocket->message)) {
$from->WebSocket->message = $from->WebSocket->version->newMessage();
}
// There is a frame fragment attatched to the connection, add to it
if (!isset($from->WebSocket->frame)) {
$from->WebSocket->frame = $from->WebSocket->version->newFrame();
}
$from->WebSocket->frame->addBuffer($data);
if ($from->WebSocket->frame->isCoalesced()) {
if ($from->WebSocket->frame->getOpcode() > 2) {
$from->close();
throw new \UnexpectedValueException('Control frame support coming soon!');
}
// Check frame
// If is control frame, do your thing
// Else, add to message
// Control frames (ping, pong, close) can be sent in between a fragmented message
$from->WebSocket->message->addFrame($from->WebSocket->frame);
unset($from->WebSocket->frame);
}
if ($from->WebSocket->message->isCoalesced()) {
$parsed = (string)$from->WebSocket->message;
unset($from->WebSocket->message);
return $parsed;
}
}
}

39
src/Ratchet/WebSocket/WsServer.php
View File

@ -69,7 +69,7 @@ class WsServer implements MessageComponentInterface {
// mb_internal_encoding('UTF-8');
$this->handshaker = new HandshakeNegotiator;
//$this->messager = new MessageParser;
$this->messager = new MessageParser;
$this->_decorating = $component;
$this->connections = new \SplObjectStorage;
@ -115,41 +115,8 @@ class WsServer implements MessageComponentInterface {
return $this->_decorating->onOpen($conn);
}
/*
if (null !== ($parsed = $this->messager->onData($from, $msg))) {
$this->_decorating->onMessage($from, $parsed);
}
/**/
/*************************************************************/
if (!isset($from->WebSocket->message)) {
$from->WebSocket->message = $from->WebSocket->version->newMessage();
}
// There is a frame fragment attatched to the connection, add to it
if (!isset($from->WebSocket->frame)) {
$from->WebSocket->frame = $from->WebSocket->version->newFrame();
}
$from->WebSocket->frame->addBuffer($msg);
if ($from->WebSocket->frame->isCoalesced()) {
if ($from->WebSocket->frame->getOpcode() > 2) {
$from->close();
throw new \UnexpectedValueException('Control frame support coming soon!');
}
// Check frame
// If is control frame, do your thing
// Else, add to message
// Control frames (ping, pong, close) can be sent in between a fragmented message
$from->WebSocket->message->addFrame($from->WebSocket->frame);
unset($from->WebSocket->frame);
}
if ($from->WebSocket->message->isCoalesced()) {
$this->_decorating->onMessage($this->connections[$from], (string)$from->WebSocket->message);
unset($from->WebSocket->message);
if (null !== ($parsed = $this->messager->onData($conn, $msg))) {
$this->_decorating->onMessage($conn, $parsed);
}
}