Merge pull request #13 from ElvenSpellmaker/fix/send-eof-on-invalid-read

Commands EOF when reading from an invalid buffer.

Author: ElvenSpellmaker

src/PipeSys/Command/AbstractCommand.php

@@ -54,15 +54,7 @@ public function runOnce()
 			$firstRun = true;
 		}
 
-		try
-		{
-			return $this->attemptRun($firstRun);
-		}
-		catch (InvalidBufferException $e)
-		{
-			$this->invalidate();
-			return null;
-		}
+		return $this->attemptRun($firstRun);
 	}
 
 	/**
@@ -82,6 +74,11 @@ private function attemptRun($firstRun)
 		{
 			$data = $this->attemptRead();
 
+			if ($data instanceof EOF)
+			{
+				$this->invalidate();
+			}
+
 			if ($this->isReading())
 			{
 				return false;
@@ -155,7 +152,14 @@ private function handleResponse($data)
 	{
 		if ($data instanceof OutputIntent)
 		{
-			$this->write($data->getChannel(), $data->getContent());
+			try
+			{
+				$this->write($data->getChannel(), $data->getContent());
+			}
+			catch (InvalidBufferException $e)
+			{
+				$this->invalidate();
+			}
 		}
 		if ($data instanceof ReadIntent)
 		{

src/PipeSys/Command/DelayedHead.php

@@ -46,7 +46,5 @@ public function getCommand()
 
 			yield new OutputIntent($input);
 		}
-
-		yield new OutputIntent(new EOF);
 	}
 }

src/PipeSys/Command/Sprunge.php

@@ -22,6 +22,7 @@ class Sprunge extends AbstractCommand
 	 */
 	public function getCommand()
 	{
+
 		while (true)
 		{
 			$input = (yield new ReadIntent);
@@ -34,9 +35,8 @@ public function getCommand()
 			$this->text .= $input;
 		}
 
-		$curl = curl_init();
+		$curl = curl_init('http://sprunge.us');
 
-		curl_setopt($curl, CURLOPT_URL, 'http://sprunge.us');
 		curl_setopt($curl, CURLOPT_POST, 1);
 		curl_setopt($curl, CURLOPT_POSTFIELDS, ['sprunge' => $this->text]);
 

src/PipeSys/IO/IOableTrait.php

@@ -123,7 +123,14 @@ public function read($key)
 			throw new IOException("The IOableObject in position '$key' does not implement the InputInterface!");
 		}
 
-		return $this->ios[$key]['channel']->read();
+		try
+		{
+			return $this->ios[$key]['channel']->read();
+		}
+		catch (InvalidBufferException $e)
+		{
+			return new EOF;
+		}
 	}
 
 	/**

src/PipeSys/Scheduler.php

@@ -57,7 +57,7 @@ public function run()
 			{
 				$result = $command->runOnce();
 
-				if ($result === null)
+				if ($result === null || ! $command->isValid())
 				{
 					unset($this->commands[$key]);
 				}