noccy/react-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixed history logic, example tweaks

Browse Source
This commit is contained in:
Chris 2024-03-02 02:17:32 +01:00
parent fdbcc7adae
commit 266c538f01
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/timers.php
View File

@ -6,16 +6,22 @@ require_once __DIR__."/../vendor/autoload.php";
$shell = new NoccyLabs\React\Shell\Shell(); $shell = new NoccyLabs\React\Shell\Shell();
// The prompt event is invoked before every full redraw. Call redrawPrompt()
// to trigger it manually. Set the prompt or the style here.
$shell->on('prompt', function ($shell) { $shell->on('prompt', function ($shell) {
$shell->setPrompt(date("H:i:s> ")); $shell->setPrompt(date("H:i:s> "));
}); });
// Input handler, parse the commands.
$shell->on('input', function (array $input) use ($shell) { $shell->on('input', function (array $input) use ($shell) {
$shell->write("You entered: ".join(" ", $input)."\n"); $shell->write("You entered: ".join(" ", $input)."\n");
}); });
// The shell is an OutputStream // The shell is an OutputStream, and writing to it will handle hiding the prompt
// and redrawing it afterwards!
$shell->write("Hello World!\n\n"); $shell->write("Hello World!\n\n");
// So output can be writen while you are typing!
Loop::addPeriodicTimer(5, function () use ($shell) { Loop::addPeriodicTimer(5, function () use ($shell) {
$shell->write(date(DATE_ATOM)."\n"); $shell->write(date(DATE_ATOM)."\n");
}); });

13
src/Shell.php
View File

@ -82,7 +82,7 @@ class Shell implements WritableStreamInterface, EventEmitterInterface
public function setPrompt(string $prompt): void public function setPrompt(string $prompt): void
{ {
$this->prompt = $prompt; $this->prompt = $prompt;
$this->promptWidth = mb_strlen($this->prompt); $this->promptWidth = mb_strlen(preg_replace('<(\e\[[0-9;]+?m)>m', '', $this->prompt));
} }
private function handleInput($v) { private function handleInput($v) {
@ -99,6 +99,7 @@ class Shell implements WritableStreamInterface, EventEmitterInterface
// Update the history // Update the history
array_unshift($this->history, $this->buffer); array_unshift($this->history, $this->buffer);
while (count($this->history) > $this->maxHistory) array_pop($this->history); while (count($this->history) > $this->maxHistory) array_pop($this->history);
$this->historyIndex = 0;
// Parse and empty the buffer // Parse and empty the buffer
$buffer = str_getcsv(trim($this->buffer), " "); $buffer = str_getcsv(trim($this->buffer), " ");
$this->buffer = ''; $this->buffer = '';
@ -128,12 +129,12 @@ class Shell implements WritableStreamInterface, EventEmitterInterface
if ($this->historyIndex === null && count($this->history) > 0) { if ($this->historyIndex === null && count($this->history) > 0) {
$this->historyCache = $this->buffer; $this->historyCache = $this->buffer;
$this->historyIndex = 0; $this->historyIndex = 0;
$this->buffer = $this->history[$this->historyIndex]; $this->buffer = $this->history[$this->historyIndex]??'';
} elseif ($this->historyIndex < count($this->history) - 1) { } elseif ($this->historyIndex < count($this->history) - 1) {
$this->historyIndex++; $this->historyIndex++;
$this->buffer = $this->history[$this->historyIndex]; $this->buffer = $this->history[$this->historyIndex]??'';
} }
$this->cursorPos = min(strlen($this->buffer), $this->cursorPos) - $this->scrollOffset; $this->cursorPos = mb_strlen($this->buffer);
break; break;
case "\e[B": // down case "\e[B": // down
if ($this->historyIndex === null) { if ($this->historyIndex === null) {
@ -144,9 +145,9 @@ class Shell implements WritableStreamInterface, EventEmitterInterface
$this->historyCache = null; $this->historyCache = null;
} else { } else {
$this->historyIndex--; $this->historyIndex--;
$this->buffer = $this->history[$this->historyIndex]; $this->buffer = $this->history[$this->historyIndex]??'';
} }
$this->cursorPos = min(strlen($this->buffer), $this->cursorPos) - $this->scrollOffset; $this->cursorPos = mb_strlen($this->buffer);
break; break;
case "\e[H": // home case "\e[H": // home