blax-software
/
laravel-websockets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed inconsistency by not passing $appId to all methods

This commit is contained in:
Alex Renoki 2020-08-23 13:39:59 +03:00
parent 714cc5b22d
commit 108a717c0a
4 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Statistics/Logger/MemoryStatisticsLogger.php
View File

@ -6,7 +6,6 @@ use BeyondCode\LaravelWebSockets\Apps\App;
use BeyondCode\LaravelWebSockets\Statistics\Drivers\StatisticsDriver; use BeyondCode\LaravelWebSockets\Statistics\Drivers\StatisticsDriver;
use BeyondCode\LaravelWebSockets\Statistics\Statistic; use BeyondCode\LaravelWebSockets\Statistics\Statistic;
use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
use Ratchet\ConnectionInterface;
class MemoryStatisticsLogger implements StatisticsLogger class MemoryStatisticsLogger implements StatisticsLogger
{ {
@ -47,12 +46,12 @@ class MemoryStatisticsLogger implements StatisticsLogger
/** /**
* Handle the incoming websocket message. * Handle the incoming websocket message.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function webSocketMessage(ConnectionInterface $connection) public function webSocketMessage($appId)
{ {
$this->findOrMakeStatisticForAppId($connection->app->id) $this->findOrMakeStatisticForAppId($appId)
->webSocketMessage(); ->webSocketMessage();
} }
@ -71,24 +70,24 @@ class MemoryStatisticsLogger implements StatisticsLogger
/** /**
* Handle the new conection. * Handle the new conection.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function connection(ConnectionInterface $connection) public function connection($appId)
{ {
$this->findOrMakeStatisticForAppId($connection->app->id) $this->findOrMakeStatisticForAppId($appId)
->connection(); ->connection();
} }
/** /**
* Handle disconnections. * Handle disconnections.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function disconnection(ConnectionInterface $connection) public function disconnection($appId)
{ {
$this->findOrMakeStatisticForAppId($connection->app->id) $this->findOrMakeStatisticForAppId($appId)
->disconnection(); ->disconnection();
} }

13
src/Statistics/Logger/NullStatisticsLogger.php
View File

@ -4,7 +4,6 @@ namespace BeyondCode\LaravelWebSockets\Statistics\Logger;
use BeyondCode\LaravelWebSockets\Statistics\Drivers\StatisticsDriver; use BeyondCode\LaravelWebSockets\Statistics\Drivers\StatisticsDriver;
use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
use Ratchet\ConnectionInterface;
class NullStatisticsLogger implements StatisticsLogger class NullStatisticsLogger implements StatisticsLogger
{ {
@ -38,10 +37,10 @@ class NullStatisticsLogger implements StatisticsLogger
/** /**
* Handle the incoming websocket message. * Handle the incoming websocket message.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function webSocketMessage(ConnectionInterface $connection) public function webSocketMessage($appId)
{ {
// //
} }
@ -60,10 +59,10 @@ class NullStatisticsLogger implements StatisticsLogger
/** /**
* Handle the new conection. * Handle the new conection.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function connection(ConnectionInterface $connection) public function connection($appId)
{ {
// //
} }
@ -71,10 +70,10 @@ class NullStatisticsLogger implements StatisticsLogger
/** /**
* Handle disconnections. * Handle disconnections.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function disconnection(ConnectionInterface $connection) public function disconnection($appId)
{ {
// //
} }

14
src/Statistics/Logger/StatisticsLogger.php
View File

@ -2,17 +2,15 @@
namespace BeyondCode\LaravelWebSockets\Statistics\Logger; namespace BeyondCode\LaravelWebSockets\Statistics\Logger;
use Ratchet\ConnectionInterface;
interface StatisticsLogger interface StatisticsLogger
{ {
/** /**
* Handle the incoming websocket message. * Handle the incoming websocket message.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function webSocketMessage(ConnectionInterface $connection); public function webSocketMessage($appId);
/** /**
* Handle the incoming API message. * Handle the incoming API message.
@ -25,18 +23,18 @@ interface StatisticsLogger
/** /**
* Handle the new conection. * Handle the new conection.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function connection(ConnectionInterface $connection); public function connection($appId);
/** /**
* Handle disconnections. * Handle disconnections.
* *
* @param \Ratchet\ConnectionInterface $connection * @param mixed $appId
* @return void * @return void
*/ */
public function disconnection(ConnectionInterface $connection); public function disconnection($appId);
/** /**
* Save all the stored statistics. * Save all the stored statistics.

6
src/WebSockets/WebSocketHandler.php
View File

@ -65,7 +65,7 @@ class WebSocketHandler implements MessageComponentInterface
$message->respond(); $message->respond();
StatisticsLogger::webSocketMessage($connection); StatisticsLogger::webSocketMessage($connection->app->id);
} }
/** /**
@ -82,7 +82,7 @@ class WebSocketHandler implements MessageComponentInterface
'socketId' => $connection->socketId, 'socketId' => $connection->socketId,
]); ]);
StatisticsLogger::disconnection($connection); StatisticsLogger::disconnection($connection->app->id);
} }
/** /**
@ -200,7 +200,7 @@ class WebSocketHandler implements MessageComponentInterface
'socketId' => $connection->socketId, 'socketId' => $connection->socketId,
]); ]);
StatisticsLogger::connection($connection); StatisticsLogger::connection($connection->app->id);
return $this; return $this;
} }