Merge pull request #13 from Cube-Solutions/master

Handle case when session is null on receiving a message
thruway · Jun 2, 2022 · 9547ecd · 9547ecd
2 parents 096d401 + 85ca1ca
commit 9547ecd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -3,6 +3,7 @@
 namespace Thruway;
 
 use React\EventLoop\LoopInterface;
+use React\Socket\ConnectorInterface;
 use Thruway\Message\AuthenticateMessage;
 use Thruway\Message\ChallengeMessage;
 use Thruway\Peer\Client;
@@ -46,12 +47,12 @@ class Connection implements EventEmitterInterface
      * @param \React\EventLoop\LoopInterface $loop
      * @throws \Exception
      */
-    public function __construct(Array $options, LoopInterface $loop = null)
+    public function __construct(Array $options, LoopInterface $loop = null, ConnectorInterface $connector = null)
     {
         $this->options = $options;
         $this->client  = new Client($options['realm'], $loop);
         $url           = isset($options['url']) ? $options['url'] : null;
-        $pawlTransport = new PawlTransportProvider($url);
+        $pawlTransport = new PawlTransportProvider($url, $connector);
 
         $this->client->addTransportProvider($pawlTransport);
         $this->client->setReconnectOptions($options);

diff --git a/src/Peer/Client.php b/src/Peer/Client.php
@@ -328,6 +328,11 @@ public function onMessage(TransportInterface $transport, Message $msg)
 
         $session = $this->session;
 
+        if($session === null) {
+            Logger::warning($this, "Message discarded, no session: {$msg}");
+            return;
+        }
+
         if ($msg instanceof WelcomeMessage):
             $this->processWelcome($session, $msg);
         elseif ($msg instanceof AbortMessage):