From 86d332a2c064b5640ec9688bf7647f44e3110584 Mon Sep 17 00:00:00 2001
From: Marcel Pociot <m.pociot@gmail.com>
Date: Tue, 27 Nov 2018 15:55:30 +0100
Subject: [PATCH] wip

---
 config/websockets.php                             |  5 +++++
 src/Dashboard/EventSubscriber.php                 |  2 +-
 src/Exceptions/InvalidWebSocketController.php     |  2 +-
 src/Facades/WebSocketRouter.php                   |  2 +-
 src/Server/HttpServer.php                         | 15 +++++++++++++++
 src/{ => Server}/Router.php                       |  6 ++++--
 src/{ => Server}/WebSocketController.php          |  2 +-
 src/Server/WebSocketServer.php                    |  3 +--
 .../Controllers/EchoController.php                |  6 +++---
 .../Controllers/FetchChannel.php                  |  2 +-
 .../Controllers/FetchChannels.php                 |  4 ++--
 .../Controllers/FetchUsers.php                    |  4 ++--
 .../Controllers/TriggerEvent.php                  |  2 +-
 .../Messages}/Message.php                         |  6 +++---
 .../Messages}/RespondableMessage.php              |  2 +-
 .../Messages}/RespondableMessageFactory.php       |  6 +++---
 .../Pusher/Channels/Channel.php                   |  4 ++--
 .../Pusher/Channels/ChannelManager.php            |  2 +-
 .../Pusher/Channels/PresenceChannel.php           |  2 +-
 .../Pusher/Channels/PrivateChannel.php            |  2 +-
 .../Pusher/Dashboard.php                          |  4 ++--
 .../Pusher/Exceptions/InvalidConnection.php       |  2 +-
 .../Pusher/Exceptions/InvalidSignature.php        |  2 +-
 .../Pusher/Exceptions/PusherException.php         |  2 +-
 .../Pusher/Exceptions/UnknownAppKey.php           |  2 +-
 .../Pusher/PusherController.php}                  | 15 ++++++++-------
 .../Pusher/PusherMessage.php                      | 10 +++++-----
 src/WebSocketsServiceProvider.php                 |  3 ++-
 tests/ConnectionTest.php                          | 10 +++++-----
 29 files changed, 76 insertions(+), 53 deletions(-)
 create mode 100644 src/Server/HttpServer.php
 rename src/{ => Server}/Router.php (91%)
 rename src/{ => Server}/WebSocketController.php (91%)
 rename src/{LaravelEcho/Http => WebSocketServer}/Controllers/EchoController.php (92%)
 rename src/{LaravelEcho/Http => WebSocketServer}/Controllers/FetchChannel.php (86%)
 rename src/{LaravelEcho/Http => WebSocketServer}/Controllers/FetchChannels.php (84%)
 rename src/{LaravelEcho/Http => WebSocketServer}/Controllers/FetchUsers.php (84%)
 rename src/{LaravelEcho/Http => WebSocketServer}/Controllers/TriggerEvent.php (92%)
 rename src/{LaravelEcho/WebSocket => WebSocketServer/Messages}/Message.php (79%)
 rename src/{LaravelEcho/WebSocket => WebSocketServer/Messages}/RespondableMessage.php (51%)
 rename src/{LaravelEcho/WebSocket => WebSocketServer/Messages}/RespondableMessageFactory.php (72%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Channels/Channel.php (95%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Channels/ChannelManager.php (95%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Channels/PresenceChannel.php (96%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Channels/PrivateChannel.php (80%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Dashboard.php (95%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Exceptions/InvalidConnection.php (70%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Exceptions/InvalidSignature.php (70%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Exceptions/PusherException.php (80%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/Exceptions/UnknownAppKey.php (73%)
 rename src/{LaravelEcho/WebSocket/PusherServer.php => WebSocketServer/Pusher/PusherController.php} (79%)
 rename src/{LaravelEcho => WebSocketServer}/Pusher/PusherMessage.php (80%)

diff --git a/config/websockets.php b/config/websockets.php
index 75365fc..67efc05 100644
--- a/config/websockets.php
+++ b/config/websockets.php
@@ -36,6 +36,11 @@ return [
         //
     ],
 
+    /*
+     * The maximum request size that is allowed for an incoming websocket request.
+     */
+    'maxRequestSize' => 256000,
+
     /*
      * Define the optional SSL context for your websocket connections.
      * You can see all available options at: http://php.net/manual/en/context.ssl.php
diff --git a/src/Dashboard/EventSubscriber.php b/src/Dashboard/EventSubscriber.php
index b7c9e90..65806be 100644
--- a/src/Dashboard/EventSubscriber.php
+++ b/src/Dashboard/EventSubscriber.php
@@ -8,7 +8,7 @@ use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
 use BeyondCode\LaravelWebSockets\Events\ClientMessageSent;
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
 use BeyondCode\LaravelWebSockets\Events\SubscribedToChannel;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Dashboard;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Dashboard;
 use Illuminate\Events\Dispatcher;
 
 class EventSubscriber
diff --git a/src/Exceptions/InvalidWebSocketController.php b/src/Exceptions/InvalidWebSocketController.php
index 8860d3a..4a61c1c 100644
--- a/src/Exceptions/InvalidWebSocketController.php
+++ b/src/Exceptions/InvalidWebSocketController.php
@@ -2,7 +2,7 @@
 
 namespace BeyondCode\LaravelWebSockets\Exceptions;
 
-use BeyondCode\LaravelWebSockets\WebSocketController;
+use BeyondCode\LaravelWebSockets\Server\WebSocketController;
 
 class InvalidWebSocketController extends \Exception
 {
diff --git a/src/Facades/WebSocketRouter.php b/src/Facades/WebSocketRouter.php
index 66f7744..fd50499 100644
--- a/src/Facades/WebSocketRouter.php
+++ b/src/Facades/WebSocketRouter.php
@@ -4,7 +4,7 @@ namespace BeyondCode\LaravelWebSockets\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
-/** @see \BeyondCode\LaravelWebSockets\Router */
+/** @see \BeyondCode\LaravelWebSockets\Server\Router */
 class WebSocketRouter extends Facade
 {
     protected static function getFacadeAccessor()
diff --git a/src/Server/HttpServer.php b/src/Server/HttpServer.php
new file mode 100644
index 0000000..82a26d4
--- /dev/null
+++ b/src/Server/HttpServer.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace BeyondCode\LaravelWebsockets\Server;
+
+use Ratchet\Http\HttpServerInterface;
+
+class HttpServer extends \Ratchet\Http\HttpServer
+{
+    public function __construct(HttpServerInterface $component, int $maxRequestSize = 4096)
+    {
+        parent::__construct($component);
+
+        $this->_reqParser->maxSize = $maxRequestSize;
+    }
+}
\ No newline at end of file
diff --git a/src/Router.php b/src/Server/Router.php
similarity index 91%
rename from src/Router.php
rename to src/Server/Router.php
index 3f07418..c5afff5 100644
--- a/src/Router.php
+++ b/src/Server/Router.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets;
+namespace BeyondCode\LaravelWebSockets\Server;
 
+use BeyondCode\LaravelWebSockets\LaravelEcho;
 use BeyondCode\LaravelWebSockets\Server\Logger\MessageLogger;
+use BeyondCode\LaravelWebSockets\Server\WebSocketController;
 use Ratchet\WebSocket\WsServer;
 use Symfony\Component\Routing\Route;
 use Ratchet\Http\HttpServerInterface;
@@ -65,7 +67,7 @@ class Router
 
     public function echo()
     {
-        $this->get('/app/{appKey}', LaravelEcho\WebSocket\PusherServer::class);
+        $this->get('/app/{appKey}', LaravelEcho\Pusher\PusherServer::class);
 
         $this->get('/apps/{appId}/channels', LaravelEcho\Http\Controllers\FetchChannels::class);
         $this->get('/apps/{appId}/channels/{channelName}', LaravelEcho\Http\Controllers\FetchChannel::class);
diff --git a/src/WebSocketController.php b/src/Server/WebSocketController.php
similarity index 91%
rename from src/WebSocketController.php
rename to src/Server/WebSocketController.php
index aa2b6cd..d2bda8f 100644
--- a/src/WebSocketController.php
+++ b/src/Server/WebSocketController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets;
+namespace BeyondCode\LaravelWebSockets\Server;
 
 use Exception;
 use Ratchet\ConnectionInterface;
diff --git a/src/Server/WebSocketServer.php b/src/Server/WebSocketServer.php
index 241f914..233efb1 100644
--- a/src/Server/WebSocketServer.php
+++ b/src/Server/WebSocketServer.php
@@ -5,7 +5,6 @@ namespace BeyondCode\LaravelWebSockets\Server;
 use Ratchet\Http\Router;
 use React\Socket\SecureServer;
 use React\Socket\Server;
-use Ratchet\Http\HttpServer;
 use Ratchet\Server\IoServer;
 use React\EventLoop\LoopInterface;
 use React\EventLoop\Factory as LoopFactory;
@@ -87,7 +86,7 @@ class WebSocketServer
 
         $app = new OriginCheck($router, config('websockets.allowedOrigins', []));
 
-        $httpServer = new HttpServer($app);
+        $httpServer = new HttpServer($app, config('websockets.maxRequestSize'));
 
         return new IoServer($httpServer, $socket, $this->loop);
     }
diff --git a/src/LaravelEcho/Http/Controllers/EchoController.php b/src/WebSocketServer/Controllers/EchoController.php
similarity index 92%
rename from src/LaravelEcho/Http/Controllers/EchoController.php
rename to src/WebSocketServer/Controllers/EchoController.php
index 287f9c6..27a398c 100644
--- a/src/LaravelEcho/Http/Controllers/EchoController.php
+++ b/src/WebSocketServer/Controllers/EchoController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Http\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
 use BeyondCode\LaravelWebSockets\Events\ExceptionThrown;
@@ -15,11 +15,11 @@ use Ratchet\Http\HttpServerInterface;
 use Psr\Http\Message\RequestInterface;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
 
 abstract class EchoController implements HttpServerInterface
 {
-    /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(ChannelManager $channelManager)
diff --git a/src/LaravelEcho/Http/Controllers/FetchChannel.php b/src/WebSocketServer/Controllers/FetchChannel.php
similarity index 86%
rename from src/LaravelEcho/Http/Controllers/FetchChannel.php
rename to src/WebSocketServer/Controllers/FetchChannel.php
index 099fb86..e7654c8 100644
--- a/src/LaravelEcho/Http/Controllers/FetchChannel.php
+++ b/src/WebSocketServer/Controllers/FetchChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Http\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
 
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
diff --git a/src/LaravelEcho/Http/Controllers/FetchChannels.php b/src/WebSocketServer/Controllers/FetchChannels.php
similarity index 84%
rename from src/LaravelEcho/Http/Controllers/FetchChannels.php
rename to src/WebSocketServer/Controllers/FetchChannels.php
index 85338e9..9ef1e36 100644
--- a/src/LaravelEcho/Http/Controllers/FetchChannels.php
+++ b/src/WebSocketServer/Controllers/FetchChannels.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Http\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\PresenceChannel;
 
 class FetchChannels extends EchoController
 {
diff --git a/src/LaravelEcho/Http/Controllers/FetchUsers.php b/src/WebSocketServer/Controllers/FetchUsers.php
similarity index 84%
rename from src/LaravelEcho/Http/Controllers/FetchUsers.php
rename to src/WebSocketServer/Controllers/FetchUsers.php
index aa6cece..b386c81 100644
--- a/src/LaravelEcho/Http/Controllers/FetchUsers.php
+++ b/src/WebSocketServer/Controllers/FetchUsers.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Http\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\PresenceChannel;
 
 class FetchUsers extends EchoController
 {
diff --git a/src/LaravelEcho/Http/Controllers/TriggerEvent.php b/src/WebSocketServer/Controllers/TriggerEvent.php
similarity index 92%
rename from src/LaravelEcho/Http/Controllers/TriggerEvent.php
rename to src/WebSocketServer/Controllers/TriggerEvent.php
index 9e0cf59..3e6369a 100644
--- a/src/LaravelEcho/Http/Controllers/TriggerEvent.php
+++ b/src/WebSocketServer/Controllers/TriggerEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Http\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
 
 use BeyondCode\LaravelWebSockets\Events\ApiMessageSent;
 use Illuminate\Http\Request;
diff --git a/src/LaravelEcho/WebSocket/Message.php b/src/WebSocketServer/Messages/Message.php
similarity index 79%
rename from src/LaravelEcho/WebSocket/Message.php
rename to src/WebSocketServer/Messages/Message.php
index d746d6a..0e1f63d 100644
--- a/src/LaravelEcho/WebSocket/Message.php
+++ b/src/WebSocketServer/Messages/Message.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
 
 use BeyondCode\LaravelWebSockets\Events\ClientMessageSent;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
 use Ratchet\ConnectionInterface;
 use stdClass;
 
@@ -15,7 +15,7 @@ class Message implements RespondableMessage
     /** @var \Ratchet\ConnectionInterface */
     protected $connection;
 
-    /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(stdClass $payload, ConnectionInterface $connection, ChannelManager $channelManager)
diff --git a/src/LaravelEcho/WebSocket/RespondableMessage.php b/src/WebSocketServer/Messages/RespondableMessage.php
similarity index 51%
rename from src/LaravelEcho/WebSocket/RespondableMessage.php
rename to src/WebSocketServer/Messages/RespondableMessage.php
index 6b77181..17dec71 100644
--- a/src/LaravelEcho/WebSocket/RespondableMessage.php
+++ b/src/WebSocketServer/Messages/RespondableMessage.php
@@ -1,5 +1,5 @@
 <?php
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
 
 interface RespondableMessage
 {
diff --git a/src/LaravelEcho/WebSocket/RespondableMessageFactory.php b/src/WebSocketServer/Messages/RespondableMessageFactory.php
similarity index 72%
rename from src/LaravelEcho/WebSocket/RespondableMessageFactory.php
rename to src/WebSocketServer/Messages/RespondableMessageFactory.php
index 6bbbdec..910aa7c 100644
--- a/src/LaravelEcho/WebSocket/RespondableMessageFactory.php
+++ b/src/WebSocketServer/Messages/RespondableMessageFactory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
 
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\PusherMessage;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherMessage;
 use Ratchet\ConnectionInterface;
 use Ratchet\RFC6455\Messaging\MessageInterface;
 
diff --git a/src/LaravelEcho/Pusher/Channels/Channel.php b/src/WebSocketServer/Pusher/Channels/Channel.php
similarity index 95%
rename from src/LaravelEcho/Pusher/Channels/Channel.php
rename to src/WebSocketServer/Pusher/Channels/Channel.php
index a54a157..da6740a 100644
--- a/src/LaravelEcho/Pusher/Channels/Channel.php
+++ b/src/WebSocketServer/Pusher/Channels/Channel.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
 
 use BeyondCode\LaravelWebSockets\Events\ChannelOccupied;
 use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
 use BeyondCode\LaravelWebSockets\Events\SubscribedToChannel;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\InvalidSignature;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\InvalidSignature;
 use Illuminate\Support\Collection;
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/LaravelEcho/Pusher/Channels/ChannelManager.php b/src/WebSocketServer/Pusher/Channels/ChannelManager.php
similarity index 95%
rename from src/LaravelEcho/Pusher/Channels/ChannelManager.php
rename to src/WebSocketServer/Pusher/Channels/ChannelManager.php
index bd8dd8a..08556cf 100644
--- a/src/LaravelEcho/Pusher/Channels/ChannelManager.php
+++ b/src/WebSocketServer/Pusher/Channels/ChannelManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
 
 use ReflectionClass;
 use Ratchet\ConnectionInterface;
diff --git a/src/LaravelEcho/Pusher/Channels/PresenceChannel.php b/src/WebSocketServer/Pusher/Channels/PresenceChannel.php
similarity index 96%
rename from src/LaravelEcho/Pusher/Channels/PresenceChannel.php
rename to src/WebSocketServer/Pusher/Channels/PresenceChannel.php
index 9db2cc4..26ea422 100644
--- a/src/LaravelEcho/Pusher/Channels/PresenceChannel.php
+++ b/src/WebSocketServer/Pusher/Channels/PresenceChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/LaravelEcho/Pusher/Channels/PrivateChannel.php b/src/WebSocketServer/Pusher/Channels/PrivateChannel.php
similarity index 80%
rename from src/LaravelEcho/Pusher/Channels/PrivateChannel.php
rename to src/WebSocketServer/Pusher/Channels/PrivateChannel.php
index 66e7f34..a176f9d 100644
--- a/src/LaravelEcho/Pusher/Channels/PrivateChannel.php
+++ b/src/WebSocketServer/Pusher/Channels/PrivateChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/LaravelEcho/Pusher/Dashboard.php b/src/WebSocketServer/Pusher/Dashboard.php
similarity index 95%
rename from src/LaravelEcho/Pusher/Dashboard.php
rename to src/WebSocketServer/Pusher/Dashboard.php
index af2de7c..56dadf0 100644
--- a/src/LaravelEcho/Pusher/Dashboard.php
+++ b/src/WebSocketServer/Pusher/Dashboard.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
 
 use Ratchet\ConnectionInterface;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
 use stdClass;
 
 class Dashboard
diff --git a/src/LaravelEcho/Pusher/Exceptions/InvalidConnection.php b/src/WebSocketServer/Pusher/Exceptions/InvalidConnection.php
similarity index 70%
rename from src/LaravelEcho/Pusher/Exceptions/InvalidConnection.php
rename to src/WebSocketServer/Pusher/Exceptions/InvalidConnection.php
index 30a465a..3863df7 100644
--- a/src/LaravelEcho/Pusher/Exceptions/InvalidConnection.php
+++ b/src/WebSocketServer/Pusher/Exceptions/InvalidConnection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
 
 class InvalidConnection extends PusherException
 {
diff --git a/src/LaravelEcho/Pusher/Exceptions/InvalidSignature.php b/src/WebSocketServer/Pusher/Exceptions/InvalidSignature.php
similarity index 70%
rename from src/LaravelEcho/Pusher/Exceptions/InvalidSignature.php
rename to src/WebSocketServer/Pusher/Exceptions/InvalidSignature.php
index 94ef279..8165683 100644
--- a/src/LaravelEcho/Pusher/Exceptions/InvalidSignature.php
+++ b/src/WebSocketServer/Pusher/Exceptions/InvalidSignature.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
 
 class InvalidSignature extends PusherException
 {
diff --git a/src/LaravelEcho/Pusher/Exceptions/PusherException.php b/src/WebSocketServer/Pusher/Exceptions/PusherException.php
similarity index 80%
rename from src/LaravelEcho/Pusher/Exceptions/PusherException.php
rename to src/WebSocketServer/Pusher/Exceptions/PusherException.php
index e14f060..afb2c94 100644
--- a/src/LaravelEcho/Pusher/Exceptions/PusherException.php
+++ b/src/WebSocketServer/Pusher/Exceptions/PusherException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
 
 use Exception;
 
diff --git a/src/LaravelEcho/Pusher/Exceptions/UnknownAppKey.php b/src/WebSocketServer/Pusher/Exceptions/UnknownAppKey.php
similarity index 73%
rename from src/LaravelEcho/Pusher/Exceptions/UnknownAppKey.php
rename to src/WebSocketServer/Pusher/Exceptions/UnknownAppKey.php
index 76e856f..ec7ee39 100644
--- a/src/LaravelEcho/Pusher/Exceptions/UnknownAppKey.php
+++ b/src/WebSocketServer/Pusher/Exceptions/UnknownAppKey.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
 
 class UnknownAppKey extends PusherException
 {
diff --git a/src/LaravelEcho/WebSocket/PusherServer.php b/src/WebSocketServer/Pusher/PusherController.php
similarity index 79%
rename from src/LaravelEcho/WebSocket/PusherServer.php
rename to src/WebSocketServer/Pusher/PusherController.php
index aa3e644..062b59f 100644
--- a/src/LaravelEcho/WebSocket/PusherServer.php
+++ b/src/WebSocketServer/Pusher/PusherController.php
@@ -1,21 +1,22 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
 
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Messages\RespondableMessageFactory;
 use BeyondCode\LaravelWebSockets\QueryParameters;
 use Exception;
 use Ratchet\ConnectionInterface;
 use Ratchet\RFC6455\Messaging\MessageInterface;
-use BeyondCode\LaravelWebSockets\WebSocketController;
+use BeyondCode\LaravelWebSockets\Server\WebSocketController;
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\PusherException;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\UnknownAppKey;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\PusherException;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\UnknownAppKey;
 
-class PusherServer extends WebSocketController
+class PusherController extends WebSocketController
 {
-    /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(ChannelManager $channelManager)
diff --git a/src/LaravelEcho/Pusher/PusherMessage.php b/src/WebSocketServer/Pusher/PusherMessage.php
similarity index 80%
rename from src/LaravelEcho/Pusher/PusherMessage.php
rename to src/WebSocketServer/Pusher/PusherMessage.php
index bd707b2..d9036ce 100644
--- a/src/LaravelEcho/Pusher/PusherMessage.php
+++ b/src/WebSocketServer/Pusher/PusherMessage.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\LaravelEcho\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
 
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket\RespondableMessage;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Messages\RespondableMessage;
 use Ratchet\ConnectionInterface;
 use stdClass;
 
 class PusherMessage implements RespondableMessage
 {
-    /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\stdClass */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\stdClass */
     protected $payload;
 
     /** @var \React\Socket\ConnectionInterface */
     protected $connection;
 
-    /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(stdClass $payload, ConnectionInterface $connection, ChannelManager $channelManager)
diff --git a/src/WebSocketsServiceProvider.php b/src/WebSocketsServiceProvider.php
index bd0f27d..a8e8853 100644
--- a/src/WebSocketsServiceProvider.php
+++ b/src/WebSocketsServiceProvider.php
@@ -7,12 +7,13 @@ use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\AuthenticateDashboar
 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;
 use Illuminate\Support\ServiceProvider;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
 
 class WebSocketsServiceProvider extends ServiceProvider
 {
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
index ea34ac7..0189b71 100644
--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@@ -3,21 +3,21 @@
 namespace BeyondCode\LaravelWebSockets\Tests;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\InvalidSignature;
-use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\UnknownAppKey;
-use BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket\PusherServer;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\InvalidSignature;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\UnknownAppKey;
+use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController;
 use BeyondCode\LaravelWebSockets\Tests\Mocks\Message;
 
 class ConnectionTest extends TestCase
 {
-    /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket\PusherServer */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController */
     protected $pusherServer;
 
     public function setUp()
     {
         parent::setUp();
 
-        $this->pusherServer = app(PusherServer::class);
+        $this->pusherServer = app(PusherController::class);
     }
 
     /** @test */