ConsoleReader: improvements from pmmp

Author: PeratX

src/iTXTech/SimpleFramework/Console/ConsoleReader.php

@@ -17,16 +17,21 @@
 namespace iTXTech\SimpleFramework\Console;
 
 use iTXTech\SimpleFramework\Thread;
-use iTXTech\SimpleFramework\Util\Util;
 
 class ConsoleReader extends Thread{
+	public const TYPE_STREAM = 1;
+	public const TYPE_PIPED = 2;
+
+	/** @var resource */
+	private static $stdin;
+
 	/** @var \Threaded */
 	protected $buffer;
 	private $shutdown = false;
-	private $stdin;
+	private $type = self::TYPE_STREAM;
+
 
 	public function __construct(){
-		$this->stdin = fopen("php://stdin", "r");
 		$this->buffer = new \Threaded;
 		$this->start();
 	}
@@ -36,13 +41,81 @@ public function shutdown(){
 	}
 
 	public function quit(){
+		$wait = microtime(true) + 0.5;
+		while(microtime(true) < $wait){
+			if($this->isRunning()){
+				usleep(100000);
+			}else{
+				parent::quit();
+				return;
+			}
+		}
+	}
+
+	private function initStdin(){
+		if(is_resource(self::$stdin)){
+			fclose(self::$stdin);
+		}
+
+		self::$stdin = fopen("php://stdin", "r");
+		if($this->isPipe(self::$stdin)){
+			$this->type = self::TYPE_PIPED;
+		}else{
+			$this->type = self::TYPE_STREAM;
+		}
+	}
+
+	/**
+	 * Checks if the specified stream is a FIFO pipe.
+	 *
+	 * @param resource $stream
+	 *
+	 * @return bool
+	 */
+	private function isPipe($stream) : bool{
+		return is_resource($stream) and (!stream_isatty($stream) or ((fstat($stream)["mode"] & 0170000) === 0010000));
 	}
 
-	private function readLine(){
-		$line = trim(fgets($this->stdin));
+	/**
+	 * Reads a line from the console and adds it to the buffer. This method may block the thread.
+	 *
+	 * @return bool if the main execution should continue reading lines
+	 */
+	private function readLine() : bool{
+		$line = "";
+		if(!is_resource(self::$stdin)){
+			$this->initStdin();
+		}
+
+		switch($this->type){
+			/** @noinspection PhpMissingBreakStatementInspection */
+			case self::TYPE_STREAM:
+				//stream_select doesn't work on piped streams for some reason
+				$r = [self::$stdin];
+				if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
+					return true;
+				}elseif($count === false){ //stream error
+					$this->initStdin();
+				}
+
+			case self::TYPE_PIPED:
+				if(($raw = fgets(self::$stdin)) === false){ //broken pipe or EOF
+					$this->initStdin();
+					$this->synchronized(function(){
+						$this->wait(200000);
+					}); //prevent CPU waste if it's end of pipe
+					return true; //loop back round
+				}
+
+				$line = trim($raw);
+				break;
+		}
+
 		if($line !== ""){
-			$this->buffer[] = $line;
+			$this->buffer[] = preg_replace("#\\x1b\\x5b([^\\x1b]*\\x7e|[\\x40-\\x50])#", "", $line);
 		}
+
+		return true;
 	}
 
 	/**
@@ -52,35 +125,20 @@ private function readLine(){
 	 */
 	public function getLine(){
 		if($this->buffer->count() !== 0){
-			return $this->buffer->shift();
+			return (string) $this->buffer->shift();
 		}
 
 		return null;
 	}
 
 	public function run(){
-		while(!$this->shutdown){
-			$r = [$this->stdin];
-			$w = null;
-			$e = null;
-			if(stream_select($r, $w, $e, 0, 200000) > 0){
-				// PHP on Windows sucks
-				if(feof($this->stdin)){
-					if(Util::getOS() == "win"){
-						$this->stdin = fopen("php://stdin", "r");
-						if(!is_resource($this->stdin)){
-							break;
-						}
-					}else{
-						break;
-					}
-				}
-				$this->readLine();
-			}
-		}
+		$this->registerClassLoader();
+		$this->initStdin();
+		while(!$this->shutdown and $this->readLine()) ;
+		fclose(self::$stdin);
 	}
 
-	public function getThreadName(){
+	public function getThreadName() : string{
 		return "Console";
 	}
 }