diff --git a/src/Dashboard/EventSubscriber.php b/src/Dashboard/EventSubscriber.php deleted file mode 100644 index b62b823..0000000 --- a/src/Dashboard/EventSubscriber.php +++ /dev/null @@ -1,59 +0,0 @@ -appId, - $event->channeldId, - $event->name, - $event->data - ); - } - - public function onChannelOccupied(ChannelOccupied $event) - { - DashboardLogger::occupied($event->connection, $event->channelId); - } - - public function onChannelVacated(ChannelVacated $event) - { - DashboardLogger::vacated($event->connection, $event->channelId); - } - - public function onClientMessageSent(ClientMessageSent $event) - { - DashboardLogger::clientMessage($event->connection, $event->payload); - } - - public function onConnectionEstablished(ConnectionEstablished $event) - { - DashboardLogger::connection($event->connection); - } - - public function onSubscribedToChannel(SubscribedToChannel $event) - { - DashboardLogger::subscribed($event->connection, $event->channelId); - } - - public function subscribe(Dispatcher $events) - { - $events->listen(ApiMessageSent::class, static::class. '@onApiMessageSent'); - $events->listen(ChannelOccupied::class, static::class . '@onChannelOccupied'); - $events->listen(ChannelVacated::class, static::class . '@onChannelVacated'); - $events->listen(ClientMessageSent::class, static::class . '@onClientMessageSent'); - $events->listen(ConnectionEstablished::class, static::class . '@onConnectionEstablished'); - $events->listen(SubscribedToChannel::class, static::class . '@onSubscribedToChannel'); - } -} \ No newline at end of file diff --git a/src/Events/ApiMessageSent.php b/src/Events/ApiMessageSent.php deleted file mode 100644 index 68f77d6..0000000 --- a/src/Events/ApiMessageSent.php +++ /dev/null @@ -1,25 +0,0 @@ -appId = $appId; - - $this->channeldId = $channeldId; - - $this->name = $name; - - $this->data = $data; - } -} \ No newline at end of file diff --git a/src/Events/ChannelOccupied.php b/src/Events/ChannelOccupied.php deleted file mode 100644 index 1c39c3e..0000000 --- a/src/Events/ChannelOccupied.php +++ /dev/null @@ -1,21 +0,0 @@ -connection = $connection; - - $this->channelId = $channelId; - } -} \ No newline at end of file diff --git a/src/Events/ChannelVacated.php b/src/Events/ChannelVacated.php deleted file mode 100644 index fde092a..0000000 --- a/src/Events/ChannelVacated.php +++ /dev/null @@ -1,21 +0,0 @@ -connection = $connection; - - $this->channelId = $channelId; - } -} \ No newline at end of file diff --git a/src/Events/ClientMessageSent.php b/src/Events/ClientMessageSent.php deleted file mode 100644 index 7c171ed..0000000 --- a/src/Events/ClientMessageSent.php +++ /dev/null @@ -1,22 +0,0 @@ -connection = $connection; - - $this->payload = $payload; - } -} \ No newline at end of file diff --git a/src/Events/ConnectionEstablished.php b/src/Events/ConnectionEstablished.php deleted file mode 100644 index 296505b..0000000 --- a/src/Events/ConnectionEstablished.php +++ /dev/null @@ -1,17 +0,0 @@ -connection = $connection; - } -} \ No newline at end of file diff --git a/src/Events/ExceptionThrown.php b/src/Events/ExceptionThrown.php deleted file mode 100644 index 274bbd9..0000000 --- a/src/Events/ExceptionThrown.php +++ /dev/null @@ -1,21 +0,0 @@ -connection = $connection; - - $this->exception = $exception; - } -} \ No newline at end of file diff --git a/src/Events/SubscribedToChannel.php b/src/Events/SubscribedToChannel.php deleted file mode 100644 index 00fdb63..0000000 --- a/src/Events/SubscribedToChannel.php +++ /dev/null @@ -1,21 +0,0 @@ -connection = $connection; - - $this->channelId = $channelId; - } -} \ No newline at end of file diff --git a/src/HttpApi/Controllers/Controller.php b/src/HttpApi/Controllers/Controller.php index abc19b2..b945056 100644 --- a/src/HttpApi/Controllers/Controller.php +++ b/src/HttpApi/Controllers/Controller.php @@ -3,6 +3,7 @@ namespace BeyondCode\LaravelWebSockets\HttpApi\Controllers; use BeyondCode\LaravelWebSockets\ClientProviders\Client; +use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; use BeyondCode\LaravelWebSockets\Events\ExceptionThrown; use BeyondCode\LaravelWebSockets\QueryParameters; use Exception; @@ -59,8 +60,6 @@ abstract class Controller implements HttpServerInterface function onError(ConnectionInterface $connection, Exception $exception) { - event(new ExceptionThrown($connection, $exception)); - if (! $exception instanceof HttpException) { return; } diff --git a/src/HttpApi/Controllers/TriggerEventController.php b/src/HttpApi/Controllers/TriggerEventController.php index 6febcdc..14e46f1 100644 --- a/src/HttpApi/Controllers/TriggerEventController.php +++ b/src/HttpApi/Controllers/TriggerEventController.php @@ -21,12 +21,12 @@ class TriggerEventController extends Controller 'data' => $request->json()->get('data'), ], $request->json()->get('socket_id')); - event(new ApiMessageSent( + DashboardLogger::apiMessage( $request->appId, $channelId, $request->json()->get('name'), $request->json()->get('data') - )); + ); } return $request->json()->all(); diff --git a/src/WebSockets/Channels/Channel.php b/src/WebSockets/Channels/Channel.php index c1c4551..8933fc0 100644 --- a/src/WebSockets/Channels/Channel.php +++ b/src/WebSockets/Channels/Channel.php @@ -2,6 +2,7 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Channels; +use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; use BeyondCode\LaravelWebSockets\Events\ChannelOccupied; use BeyondCode\LaravelWebSockets\Events\ChannelVacated; use BeyondCode\LaravelWebSockets\Events\SubscribedToChannel; @@ -64,7 +65,7 @@ class Channel unset($this->subscriptions[$connection->socketId]); if (! $this->hasConnections()) { - event(new ChannelVacated($connection, $this->channelId)); + DashboardLogger::vacated($connection, $this->channelId); } } @@ -75,10 +76,10 @@ class Channel $this->subscriptions[$connection->socketId] = $connection; if (! $hadConnectionsPreviously) { - event(new ChannelOccupied($connection, $this->channelId)); + DashboardLogger::occupied($connection, $this->channelId); } - event(new SubscribedToChannel($connection, $this->channelId)); + DashboardLogger::subscribed($connection, $this->channelId); } public function broadcast($payload) diff --git a/src/WebSockets/Messages/Message.php b/src/WebSockets/Messages/Message.php index 40da333..30b8422 100644 --- a/src/WebSockets/Messages/Message.php +++ b/src/WebSockets/Messages/Message.php @@ -2,6 +2,7 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Messages; +use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; use BeyondCode\LaravelWebSockets\Events\ClientMessageSent; use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager; use Ratchet\ConnectionInterface; @@ -33,7 +34,7 @@ class Message implements RespondableMessage return; } - event(new ClientMessageSent($this->connection, $this->payload)); + DashboardLogger::clientMessage($this->connection, $this->payload); $channel = $this->channelManager->find($this->connection->client->appId, $this->payload->channel); diff --git a/src/WebSockets/WebSocketHandler.php b/src/WebSockets/WebSocketHandler.php index 0a9c94c..a2a917f 100644 --- a/src/WebSockets/WebSocketHandler.php +++ b/src/WebSockets/WebSocketHandler.php @@ -2,6 +2,7 @@ namespace BeyondCode\LaravelWebSockets\WebSockets; +use BeyondCode\LaravelWebSockets\Dashboard\DashboardLogger; use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished; use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\WebSocketException; use BeyondCode\LaravelWebSockets\WebSockets\Messages\RespondableMessageFactory; @@ -85,7 +86,7 @@ class WebSocketHandler implements MessageComponentInterface ]) ])); - event(new ConnectionEstablished($connection)); + DashboardLogger::connection($connection); return $this; } diff --git a/src/WebSocketsServiceProvider.php b/src/WebSocketsServiceProvider.php index e6477b7..4c73665 100644 --- a/src/WebSocketsServiceProvider.php +++ b/src/WebSocketsServiceProvider.php @@ -2,13 +2,11 @@ namespace BeyondCode\LaravelWebSockets; -use BeyondCode\LaravelWebSockets\Dashboard\EventSubscriber; use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\AuthenticateDashboard; use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\SendMessage; use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\ShowDashboard; use BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize; use BeyondCode\LaravelWebSockets\Server\Router; -use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Route; use BeyondCode\LaravelWebSockets\ClientProviders\ClientProvider; @@ -32,8 +30,6 @@ class WebSocketsServiceProvider extends ServiceProvider $this->commands([ Console\StartWebSocketServer::class, ]); - - Event::subscribe(EventSubscriber::class); } public function register()