Merge pull request #10 from clue-labs/heartbeat

Support sending heart beat requests and fix invalid heart beat timezone
clue · May 12, 2015 · 1c13976 · 1c13976
2 parents a1f9c7c + ad9673a
commit 1c13976
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -119,13 +119,22 @@ public function sendInitRequest($class, $name)
         )));
     }
 
+    public function sendHeartBeatRequest(\DateTime $dt)
+    {
+        // TODO: legacy protocol uses a QTime, datastream protocol QDateTime
+        $this->send($this->protocol->writeVariantList(array(
+            Protocol::REQUEST_HEARTBEAT,
+            $dt
+        ), array(1 => Types::TYPE_QTIME)));
+    }
+
     public function sendHeartBeatReply(\DateTime $dt)
     {
-        // legacy protocol actually uses a QTime instead of QDateTime, but accepts both
+        // TODO: legacy protocol uses a QTime, datastream protocol QDateTime
         $this->send($this->protocol->writeVariantList(array(
             Protocol::REQUEST_HEARTBEATREPLY,
             $dt
-        )));
+        ), array(1 => Types::TYPE_QTIME)));
     }
 
     public function sendBufferInput($bufferInfo, $input)

diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
@@ -5,6 +5,7 @@
 use Clue\React\Block\Blocker;
 use Clue\React\Quassel\Client;
 use React\Promise\Deferred;
+use Clue\React\Quassel\Io\Protocol;
 
 class FunctionalTest extends TestCase
 {
@@ -124,6 +125,33 @@ public function testSendClientLogin(Client $client, $message)
         return self::$blocker->awaitOne($deferred->promise());
     }
 
+    /**
+     * @depends testCreateClient
+     *
+     * @param Client $client
+     */
+    public function testSendHeartBeat(Client $client)
+    {
+        $time = new \DateTime();
+
+        $deferred = new Deferred();
+
+        $callback = function ($message) use ($deferred, &$callback, $client) {
+            if (isset($message[0]) && $message[0] === Protocol::REQUEST_HEARTBEATREPLY) {
+                $client->removeListener('message', $callback);
+                $deferred->resolve($message[1]);
+            }
+        };
+
+        $client->on('message', $callback);
+
+        $client->sendHeartBeatRequest($time);
+
+        $received = self::$blocker->awaitOne($deferred->promise());
+
+        $this->assertEquals($time, $received);
+    }
+
     /**
      * @depends testCreateClient
      */