Added clearing of socket before sending data (in case previous respon…

…se timed out and data is left on the socket
Volantus · Mar 25, 2018 · c76a520 · c76a520
1 parent f67d4cb
commit c76a520
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -45,6 +45,7 @@ public function __construct(Socket $socket = null)
      */
     public function sendRaw(Request $request): Response
     {
+        $this->socket->clear();
         $this->socket->send($request->encode());
         $this->requestStarted = microtime(true);
 

diff --git a/src/Network/Socket.php b/src/Network/Socket.php
@@ -63,4 +63,14 @@ public function __destruct()
     {
         socket_close($this->connection);
     }
+
+    /**
+     * Clears all data currently in queue
+     */
+    public function clear()
+    {
+        socket_set_nonblock($this->connection);
+        socket_read($this->connection, 65536);
+        socket_set_block($this->connection);
+    }
 }
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -71,15 +71,15 @@ public function test_sendRaw_headerNotComplete()
 
         $request = new DefaultRequest(8, 21, 1500, $responseStructure);
 
-        $this->socket->expects(self::at(0))
+        $this->socket->expects(self::at(1))
             ->method('send')
             ->with(self::equalTo($request->encode()));
 
-        $this->socket->expects(self::at(1))
+        $this->socket->expects(self::at(2))
             ->method('listen')
             ->willReturn('ABCDEFGHIJKLMN');
 
-        $this->socket->expects(self::at(2))
+        $this->socket->expects(self::at(3))
             ->method('listen')
             ->willReturn('OP');
 
@@ -105,23 +105,23 @@ public function test_sendRaw_incompleteDataException()
 
         $request = new DefaultRequest(8, 21, 1500, $responseStructure);
 
-        $this->socket->expects(self::at(0))
+        $this->socket->expects(self::at(1))
             ->method('send')
             ->with(self::equalTo($request->encode()));
 
-        $this->socket->expects(self::at(1))
+        $this->socket->expects(self::at(2))
             ->method('listen')
             ->willReturn('ABCDEFGHIJKLMN');
 
-        $this->socket->expects(self::at(2))
+        $this->socket->expects(self::at(3))
             ->method('listen')
             ->willReturn('OP');
 
-        $this->socket->expects(self::at(3))
+        $this->socket->expects(self::at(4))
             ->method('listen')
             ->willReturn('QR');
 
-        $this->socket->expects(self::at(4))
+        $this->socket->expects(self::at(5))
             ->method('listen')
             ->willReturn('ST');
 
@@ -146,14 +146,14 @@ public function test_sendRaw_timeoutOccurredOnSocketLevel()
 
     public function test_sendRaw_correctTimeoutCalculated()
     {
-        $this->socket->expects(self::at(1))
+        $this->socket->expects(self::at(2))
             ->method('listen')
             ->will(self::returnCallback(function () {
                 usleep(10000);
                 return 'ABCDEFGHIJKLMN';
             }));
 
-        $this->socket->expects(self::at(2))
+        $this->socket->expects(self::at(3))
             ->method('listen')
             ->will(self::returnCallback(function (int $timeout) {
                 self::assertGreaterThan(80000, $timeout);
@@ -174,4 +174,16 @@ public function test_sendRaw_calculatedTimeoutLessThenZero()
         $request = new DefaultRequest(8, 21, 1500, new DefaultResponseStructure(), 1);
         $this->service->sendRaw($request);
     }
+
+    public function test_sendRaw_socketClearedBeforeSendingData()
+    {
+        $this->socket->expects(self::at(0))
+            ->method('clear');
+
+        $this->socket->expects(self::once())
+            ->method('listen')
+            ->willReturn('ABCDEFGHIJKLMNOP');
+
+        $this->service->sendRaw(new DefaultRequest(8, 21, 1500));
+    }
 }