Use more reliable, external UTF-8 sequencer

This is broken due to the Sequencer class not properly handling byte
sequences.

Author: clue

composer.json

@@ -13,7 +13,8 @@
     "require": {
         "php": ">=5.3",
         "react/event-loop": "0.3.*|0.4.*",
-        "react/stream": "^0.4.2"
+        "react/stream": "^0.4.2",
+        "clue/utf8-react": "^0.1"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Stdio\\": "src/" }

src/Readline.php

@@ -6,6 +6,8 @@
 use React\Stream\ReadableStreamInterface;
 use React\Stream\WritableStreamInterface;
 use React\Stream\Util;
+use Clue\React\Utf8\Sequencer as Utf8Sequencer;
+use React\Stream\ReadableStream;
 
 class Readline extends EventEmitter implements ReadableStreamInterface
 {
@@ -62,35 +64,19 @@ public function __construct(ReadableStreamInterface $input, WritableStreamInterf
         $this->sequencer->addSequence(self::ESC_SEQUENCE . self::ESC_DEL, array($this, 'onKeyDelete'));
         $this->sequencer->addSequence(self::ESC_SEQUENCE . self::ESC_END, array($this, 'onKeyEnd'));
 
-        $expect = 0;
-        $char = '';
-        $that = $this;
-        $this->sequencer->addFallback('', function ($byte) use (&$expect, &$char, $that) {
-            if ($expect === 0) {
-                $code = ord($byte);
-                // count number of bytes expected for this UTF-8 multi-byte character
-                $expect = 1;
-                if ($code & 128 && $code & 64) {
-                    ++$expect;
-                    if ($code & 32) {
-                        ++$expect;
-                        if ($code & 16) {
-                            ++$expect;
-                        }
-                    }
-                }
-            }
-            $char .= $byte;
-            --$expect;
-
-            // forward buffered bytes as a single multi byte character once last byte has been read
-            if ($expect === 0) {
-                $save = $char;
-                $char = '';
-                $that->onFallback($save);
-            }
+        // push input into sequencer
+        $input->on('data', array($this->sequencer, 'push'));
+
+        // push sequencer output through utf8sequencer
+        $readable = new ReadableStream();
+        $this->sequencer->addFallback('', function ($data) use ($readable) {
+            $readable->emit('data', array($data));
         });
 
+        // push utf8sequences as input
+        $utf8 = new Utf8Sequencer($readable);
+        $utf8->on('data', array($this, 'onFallback'));
+
         $this->sequencer->addFallback(self::ESC_SEQUENCE, function ($bytes) {
             echo 'unknown sequence: ' . ord($bytes) . PHP_EOL;
         });
@@ -519,7 +505,7 @@ public function onFallback($chars)
         $post = $this->substr($this->linebuffer, $this->linepos);
 
         $this->linebuffer = $pre . $chars . $post;
-        ++$this->linepos;
+        $this->linepos += $this->strlen($chars);
 
         $this->redraw();
     }