Merge branch 'hotfix/subscription-monitor'

tidal · Oct 2, 2016 · b27afce · b27afce
2 parents 010fa8b + 6436d8a
commit b27afce
Show file tree

Hide file tree

Showing 3 changed files with 236 additions and 175 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/tests/integration/crossbar/CrossbarTestingTrait.php b/tests/integration/crossbar/CrossbarTestingTrait.php
@@ -16,6 +16,8 @@
 use Thruway\Connection;
 use React\EventLoop\Factory as LoopFactory;
 use React\EventLoop\LoopInterface;
+use Thruway\ClientSession;
+use Tidal\WampWatch\Adapter\Thruway\ClientSession as Adapter;
 
 trait CrossbarTestingTrait
 {
@@ -24,6 +26,11 @@ trait CrossbarTestingTrait
      */
     private $connection;
 
+    /**
+     * @var Adapter
+     */
+    private $clientSession;
+
     /**
      * @var LoopInterface
      */
@@ -39,17 +46,29 @@ trait CrossbarTestingTrait
      */
     private $monitoredSessionId = -2;
 
+    /**
+     * @var string
+     */
+    private $testTopicName = 'foo';
+
     private function setupConnection()
     {
 
         $this->clientSessionId = -1;
         $this->monitoredSessionId = -2;
 
+        $this->setupTestTopicName();
+
         Logger::set(new NullLogger());
 
-        $this->loop = LoopFactory::create();
+        $this->getConnection()->on('error', function ($reason) {
+            echo "The connected has closed with error: {$reason}\n";
+        });
 
-        $this->connection = $this->createConnection($this->loop);
+        $this->getConnection()->on('open', function (ClientSession $session) {
+            $this->clientSession = $this->createSessionAdapter($session);
+            $this->clientSessionId = $session->getSessionId();
+        });
 
     }
 
@@ -61,7 +80,7 @@ private function setupConnection()
     private function createConnection(LoopInterface $loop = null)
     {
         if ($loop === null) {
-            $loop = LoopFactory::create();
+            $loop = $this->getLoop();
         }
 
         return new Connection(
@@ -72,4 +91,62 @@ private function createConnection(LoopInterface $loop = null)
             $loop
         );
     }
+
+    /**
+     * @return \Thruway\Connection
+     */
+    private function createClientConnection()
+    {
+        $connection = $this->createConnection();
+
+        $connection->on('error', function ($reason) {
+            echo "The client connection has closed with error: {$reason}\n";
+        });
+        $this->getConnection()->on('close', [$connection, 'close']);
+        $connection->on('open', function ($session) {
+            $this->clientSession = $this->createSessionAdapter($session);
+        });
+
+        return $connection;
+    }
+
+    private function setupTestTopicName()
+    {
+        $this->testTopicName = "";
+
+        $chars = str_split("abcdefghijklmnopqrstuvwxyz");
+        for ($i = 0; $i < 10; $i++) {
+            $key = array_rand($chars);
+            $this->testTopicName .= "" . $chars[$key];
+        }
+    }
+
+    /**
+     * @return \React\EventLoop\LoopInterface
+     */
+    private function getLoop()
+    {
+        return $this->loop
+            ?: $this->loop = LoopFactory::create();
+    }
+
+    /**
+     * @param ClientSession $session
+     *
+     * @return Adapter
+     */
+    private function createSessionAdapter(ClientSession $session)
+    {
+        return new Adapter($session);
+    }
+
+    /**
+     * @return \Thruway\Connection
+     */
+    public function getConnection()
+    {
+        return $this->connection
+            ?: $this->connection = $this->createConnection();
+    }
+
 }