as2252258/kiri-http-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

eee

Browse Source
This commit is contained in:
whwyy
2026-07-08 11:58:04 +08:00
parent 614e943845
commit acc966c3df
3 changed files with 301 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Abstracts/FileWatcher.php
+54 -124
View File
@@ -11,14 +11,18 @@ use Kiri\Server\Events\OnWorkerStart;
use Kiri\Server\Processes\AbstractProcess; use Kiri\Server\Processes\AbstractProcess;
use Kiri\Server\Processes\OnProcessInterface; use Kiri\Server\Processes\OnProcessInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Swoole\Coroutine;
use Swoole\Event; use Swoole\Event;
use Swoole\Process; use Swoole\Process;
use Swoole\Timer;
use const SIGKILL; use const SIGKILL;
use const SIGTERM; use const SIGTERM;
use const SIGUSR1; use const SIGUSR1;
class FileWatcher extends AbstractProcess implements OnProcessInterface class FileWatcher extends AbstractProcess implements OnProcessInterface
{ {
use ReloadWorkers;
protected mixed $pipe; protected mixed $pipe;
#[Container(LoggerInterface::class)] #[Container(LoggerInterface::class)]
@@ -32,40 +36,40 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
protected bool $reloading = false; protected bool $reloading = false;
private array $watchPaths = []; private array $watchPaths = [];
private array $excludePatterns = []; private array $excludePatterns = [];
private array $extensions = ['php']; private array $extensions = ['php'];
private string $strategy; private string $strategy;
private bool $running = false; private bool $running = false;
private bool $scanning = false; private bool $scanning = false;
private $inotifyFd = null; private mixed $inotifyFd = null;
private array $inotifyWatchMap = []; private array $inotifyWatchMap = [];
private $fswatchProcess = null; private mixed $fswatchProcess = null;
private array $fswatchPipes = []; private array $fswatchPipes = [];
private int $pollInterval = 2; private int $pollInterval = 2;
private array $fileSnapshot = []; private array $fileSnapshot = [];
private $pollTimer = null; private int $pollTimer = -1;
private $debounceTimer = null; private int $debounceTimer = -1;
private int $debounceMs = 200; private int $debounceMs = 200;
private int $minReloadIntervalMs = 1000; private int $minReloadIntervalMs = 1000;
private int $lastReloadAtMs = 0; private int $lastReloadAtMs = 0;
private const STRATEGY_INOTIFY = 'inotify'; private const string STRATEGY_INOTIFY = 'inotify';
private const STRATEGY_FSWATCH = 'fswatch'; private const string STRATEGY_FSWATCH = 'fswatch';
private const STRATEGY_POLL = 'poll'; private const string STRATEGY_POLL = 'poll';
public function __construct() public function __construct()
{ {
$this->watchPaths = config('servers.reload.listen', []); $this->watchPaths = config('servers.reload.listen', []);
$this->excludePatterns = config('servers.reload.scan.skip_patterns', []); $this->excludePatterns = config('servers.reload.scan.skip_patterns', []);
$this->extensions = config('servers.reload.scan.extensions', ['php']); $this->extensions = config('servers.reload.scan.extensions', ['php']);
di(EventProvider::class)->on(OnWorkerStart::class, [di(Router::class), 'scan_build_route']); di(EventProvider::class)->on(OnWorkerStart::class, [di(Router::class), 'scan_build_route']);
$this->debounceMs = (int)config('servers.reload.debounce_ms', $this->debounceMs); $this->debounceMs = (int)config('servers.reload.debounce_ms', $this->debounceMs);
$this->minReloadIntervalMs = (int)config('servers.reload.min_interval_ms', $this->minReloadIntervalMs); $this->minReloadIntervalMs = (int)config('servers.reload.min_interval_ms', $this->minReloadIntervalMs);
$this->strategy = $this->detectBestStrategy(); $this->strategy = $this->detectBestStrategy();
} }
public function getName(): string public function getName(): string
@@ -115,7 +119,7 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
private function isFswatchAvailable(): bool private function isFswatchAvailable(): bool
{ {
$output = []; $output = [];
$returnVar = 0; $returnVar = 0;
exec('which fswatch 2>/dev/null', $output, $returnVar); exec('which fswatch 2>/dev/null', $output, $returnVar);
return $returnVar === 0 && !empty($output[0]); return $returnVar === 0 && !empty($output[0]);
@@ -136,7 +140,7 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
public function process(Process|null $process): void public function process(Process|null $process): void
{ {
if (class_exists('\\Swoole\\Coroutine')) { if (class_exists('\\Swoole\\Coroutine')) {
\Swoole\Coroutine::set(['enable_deadlock_check' => false]); Coroutine::set(['enable_deadlock_check' => false]);
} }
if ($this->running) { if ($this->running) {
@@ -180,13 +184,13 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
$this->stopFswatchProcess(); $this->stopFswatchProcess();
if ($this->pollTimer) { if ($this->pollTimer) {
\Swoole\Timer::clear($this->pollTimer); Timer::clear($this->pollTimer);
$this->pollTimer = null; $this->pollTimer = -1;
} }
if ($this->debounceTimer) { if ($this->debounceTimer) {
\Swoole\Timer::clear($this->debounceTimer); Timer::clear($this->debounceTimer);
$this->debounceTimer = null; $this->debounceTimer = -1;
} }
@Event::exit(); @Event::exit();
@@ -229,6 +233,7 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
} }
$this->fswatchProcess = null; $this->fswatchProcess = null;
} }
private function isExcluded(string $path): bool private function isExcluded(string $path): bool
{ {
foreach ($this->excludePatterns as $pattern) { foreach ($this->excludePatterns as $pattern) {
@@ -252,23 +257,25 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
private function triggerCallback(array $changedFiles): void private function triggerCallback(array $changedFiles): void
{ {
$changedFiles = array_values(array_unique(array_filter($changedFiles, function ($file) { $changedFiles = array_filter($changedFiles, function ($file) {
return !$this->isExcluded($file) && $this->hasValidExtension($file); return !$this->isExcluded($file) && $this->hasValidExtension($file);
}))); })
|> array_unique(...)
|> array_values(...);
if (empty($changedFiles)) { if (empty($changedFiles)) {
return; return;
} }
if ($this->debounceTimer) { if ($this->debounceTimer) {
\Swoole\Timer::clear($this->debounceTimer); Timer::clear($this->debounceTimer);
} }
$now = intdiv(hrtime(true), 1000000); $now = intdiv(hrtime(true), 1000000);
$elapsed = $this->lastReloadAtMs > 0 ? $now - $this->lastReloadAtMs : $this->minReloadIntervalMs; $elapsed = $this->lastReloadAtMs > 0 ? $now - $this->lastReloadAtMs : $this->minReloadIntervalMs;
$delay = max($this->debounceMs, $this->minReloadIntervalMs - $elapsed); $delay = max($this->debounceMs, $this->minReloadIntervalMs - $elapsed);
$this->debounceTimer = \Swoole\Timer::after($delay, function () use ($changedFiles) { $this->debounceTimer = Timer::after($delay, function () use ($changedFiles) {
$this->debounceTimer = null; $this->debounceTimer = null;
$this->reload($changedFiles); $this->reload($changedFiles);
}); });
@@ -284,7 +291,7 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
try { try {
$this->lastReloadAtMs = intdiv(hrtime(true), 1000000); $this->lastReloadAtMs = intdiv(hrtime(true), 1000000);
$preview = implode(', ', array_slice($changedFiles, 0, 3)); $preview = implode(', ', array_slice($changedFiles, 0, 3));
if (count($changedFiles) > 3) { if (count($changedFiles) > 3) {
$preview .= ' ...'; $preview .= ' ...';
} }
@@ -300,58 +307,6 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
} }
} }
private function reloadWorkers(): bool
{
$pid = $this->getMasterPid();
if ($pid === null) {
return false;
}
return Process::kill($pid, SIGUSR1);
}
private function getMasterPid(): ?int
{
$processes = $this->listProcesses();
$candidates = [];
$pidFile = function_exists('storage') ? storage('.swoole.pid') : '';
if (is_file($pidFile)) {
$candidates[] = (int)trim((string)file_get_contents($pidFile));
}
foreach ($processes as $process) {
if ($this->isMasterProcessCommand($process['command'])) {
$candidates[] = (int)$process['pid'];
}
}
foreach (array_values(array_unique(array_filter($candidates))) as $pid) {
if ($this->isProcessAlive($pid) && $this->isMasterPid($pid, $processes)) {
return $pid;
}
}
return null;
}
/**
* @param int $pid
* @param array $processes
* @return bool
*/
private function isMasterPid(int $pid, array $processes): bool
{
foreach ($processes as $process) {
if ((int)$process['pid'] === $pid) {
return $this->isMasterProcessCommand($process['command']) && $this->isSameAppProcess($pid);
}
}
return false;
}
private function isMasterProcessCommand(string $command): bool private function isMasterProcessCommand(string $command): bool
{ {
$prefix = '[' . config('site.id', 'system-service') . '].Master['; $prefix = '[' . config('site.id', 'system-service') . '].Master[';
@@ -374,37 +329,12 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
return rtrim(str_replace('\\', '/', $real), '/'); return rtrim(str_replace('\\', '/', $real), '/');
} }
private function listProcesses(): array
{
$lines = [];
exec('ps -eo pid=,ppid=,args=', $lines);
$processes = [];
foreach ($lines as $line) {
$line = trim($line);
if ($line === '') {
continue;
}
$parts = preg_split('/\s+/', $line, 3);
if (count($parts) < 3) {
continue;
}
$processes[] = [
'pid' => (int)$parts[0],
'ppid' => (int)$parts[1],
'command' => $parts[2],
];
}
return $processes;
}
private function isProcessAlive(int $pid): bool private function isProcessAlive(int $pid): bool
{ {
return $pid > 1 && @Process::kill($pid, 0); return $pid > 1 && @Process::kill($pid, 0);
} }
private function startInotify(): void private function startInotify(): void
{ {
$this->inotifyFd = inotify_init(); $this->inotifyFd = inotify_init();
@@ -426,9 +356,9 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
$changedFiles = []; $changedFiles = [];
foreach ($events as $event) { foreach ($events as $event) {
$wd = $event['wd']; $wd = $event['wd'];
$dir = $this->inotifyWatchMap[$wd] ?? ''; $dir = $this->inotifyWatchMap[$wd] ?? '';
$name = $event['name'] ?? ''; $name = $event['name'] ?? '';
$filePath = $name === '' ? $dir : $dir . '/' . $name; $filePath = $name === '' ? $dir : $dir . '/' . $name;
if (($event['mask'] & IN_CREATE) && $filePath !== '' && is_dir($filePath) && !$this->isExcluded($filePath)) { if (($event['mask'] & IN_CREATE) && $filePath !== '' && is_dir($filePath) && !$this->isExcluded($filePath)) {
@@ -452,7 +382,7 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
if (is_file($path)) { if (is_file($path)) {
if ($this->hasValidExtension($path)) { if ($this->hasValidExtension($path)) {
$wd = inotify_add_watch($this->inotifyFd, $path, IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); $wd = inotify_add_watch($this->inotifyFd, $path, IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
$this->inotifyWatchMap[$wd] = dirname($path); $this->inotifyWatchMap[$wd] = dirname($path);
} }
return; return;
@@ -462,7 +392,7 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
return; return;
} }
$wd = inotify_add_watch($this->inotifyFd, $path, IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); $wd = inotify_add_watch($this->inotifyFd, $path, IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
$this->inotifyWatchMap[$wd] = $path; $this->inotifyWatchMap[$wd] = $path;
$items = scandir($path); $items = scandir($path);
@@ -517,7 +447,7 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
return; return;
} }
$files = explode("\0", trim($data, "\0")); $files = explode("\0", trim($data, "\0"));
$changedFiles = array_values(array_filter($files, function ($file) { $changedFiles = array_values(array_filter($files, function ($file) {
return $file !== ''; return $file !== '';
})); }));
@@ -530,15 +460,15 @@ class FileWatcher extends AbstractProcess implements OnProcessInterface
{ {
$this->buildFileSnapshot(); $this->buildFileSnapshot();
$intervalMs = $this->pollInterval * 1000; $intervalMs = $this->pollInterval * 1000;
$this->pollTimer = \Swoole\Timer::tick($intervalMs, function () { $this->pollTimer = Timer::tick($intervalMs, function () {
if (!$this->running || $this->scanning) { if (!$this->running || $this->scanning) {
return; return;
} }
$this->scanning = true; $this->scanning = true;
try { try {
$newSnapshot = []; $newSnapshot = [];
$changedFiles = $this->compareSnapshots($newSnapshot); $changedFiles = $this->compareSnapshots($newSnapshot);
if (!$this->running) { if (!$this->running) {
return; return;
Abstracts/HotReload.php
+160 -232
View File
@@ -15,267 +15,195 @@ use Kiri\Server\Processes\AbstractProcess;
class HotReload extends AbstractProcess class HotReload extends AbstractProcess
{ {
use ReloadWorkers;
/**
* @var mixed
*/
protected mixed $pipe;
/** /**
* @var LoggerInterface|StdoutLogger * @var mixed
*/ */
#[Container(LoggerInterface::class)] protected mixed $pipe;
public StdoutLogger|LoggerInterface $logger;
/** /**
* @var bool * @var LoggerInterface|StdoutLogger
*/ */
protected bool $enable_coroutine = false; #[Container(LoggerInterface::class)]
public StdoutLogger|LoggerInterface $logger;
/** /**
* @var array * @var bool
*/ */
protected array $watches = []; protected bool $enable_coroutine = false;
/** /**
* @var bool * @var array
*/ */
protected bool $enable_queue = false; protected array $watches = [];
/** /**
* @var bool * @var bool
*/ */
protected bool $reloading = false; protected bool $enable_queue = false;
/** /**
* @throws \Exception * @var bool
*/ */
public function __construct() protected bool $reloading = false;
{
di(EventProvider::class)->on(OnWorkerStart::class, [di(Router::class), 'scan_build_route']);
}
/** /**
* @return string * @throws \Exception
*/ */
public function getName(): string public function __construct()
{ {
return 'hotReload'; di(EventProvider::class)->on(OnWorkerStart::class, [di(Router::class), 'scan_build_route']);
} }
/** /**
* @return void * @return string
*/ */
public function onSigterm(): void public function getName(): string
{ {
$this->stop(); return 'hotReload';
} }
public function stop(): void /**
{ * @return void
parent::stop(); */
if (isset($this->pipe) && is_resource($this->pipe)) { public function onSigterm(): void
@Event::del($this->pipe); {
@fclose($this->pipe); $this->stop();
} }
@Event::exit();
}
/**
* @param ?Process $process
*/
public function process(Process|null $process): void
{
$this->pipe = inotify_init();
$this->addListen();
Event::add($this->pipe, function () use ($process) {
$read = inotify_read($this->pipe);
if (count($read) > 0) {
$this->reload();
}
});
Event::cycle(function (): void {
if ($this->isStop()) {
Event::exit();
}
});
Event::wait();
}
/** public function stop(): void
* @return void {
*/ parent::stop();
public function reload(): void if (isset($this->pipe) && is_resource($this->pipe)) {
{ @Event::del($this->pipe);
if ($this->reloading) { @fclose($this->pipe);
return; }
} @Event::exit();
$this->reloading = true; }
di(StdoutLogger::class)->println('reloading server[' . \config('site.id', 'system-service') . '], please waite.'); /**
* @param ?Process $process
$this->clear(); */
if (!$this->reloadWorkers()) { public function process(Process|null $process): void
di(StdoutLogger::class)->println('reload server failed: master pid not found or signal failed'); {
} $this->pipe = inotify_init();
$this->addListen(); $this->addListen();
Event::add($this->pipe, function () use ($process) {
$this->reloading = false; $read = inotify_read($this->pipe);
} if (count($read) > 0) {
$this->reload();
}
});
Event::cycle(function (): void {
if ($this->isStop()) {
Event::exit();
}
});
Event::wait();
}
/** /**
* @return void * @return void
*/ */
private function reloadWorkers(): bool public function reload(): void
{ {
$pid = $this->getMasterPid(); if ($this->reloading) {
if ($pid === null) { return;
return false; }
} $this->reloading = true;
return Process::kill($pid, SIGUSR1); di(StdoutLogger::class)->println('reloading server[' . \config('site.id', 'system-service') . '], please waite.');
}
private function getMasterPid(): ?int $this->clear();
{ if (!$this->reloadWorkers()) {
$processes = $this->listProcesses(); di(StdoutLogger::class)->println('reload server failed: master pid not found or signal failed');
$candidates = []; }
$this->addListen();
$pidFile = function_exists('storage') ? storage('.swoole.pid') : ''; $this->reloading = false;
if (is_file($pidFile)) { }
$candidates[] = (int)trim((string)file_get_contents($pidFile));
}
foreach ($processes as $process) {
if ($this->isMasterProcessCommand($process['command'])) {
$candidates[] = (int)$process['pid'];
}
}
foreach (array_values(array_unique(array_filter($candidates))) as $pid) {
if ($this->isProcessAlive($pid) && $this->isMasterPid($pid, $processes)) {
return $pid;
}
}
return null;
}
private function isMasterPid(int $pid, array $processes): bool
{
foreach ($processes as $process) {
if ((int)$process['pid'] === $pid) {
return $this->isMasterProcessCommand($process['command']) && $this->isSameAppProcess($pid);
}
}
return false;
}
private function isMasterProcessCommand(string $command): bool
{
$prefix = '[' . config('site.id', 'system-service') . '].Master[';
return str_contains($command, $prefix);
}
private function isSameAppProcess(int $pid): bool
{
$cwd = @readlink('/proc/' . $pid . '/cwd');
if ($cwd === false || $cwd === '') {
return false;
}
return $this->normalizePath($cwd) === $this->normalizePath(APP_PATH);
}
private function normalizePath(string $path): string
{
$real = realpath($path) ?: $path;
return rtrim(str_replace('\\', '/', $real), '/');
}
private function listProcesses(): array
{
$lines = [];
exec('ps -eo pid=,ppid=,args=', $lines);
$processes = [];
foreach ($lines as $line) {
$line = trim($line);
if ($line === '') {
continue;
}
$parts = preg_split('/\s+/', $line, 3);
if (count($parts) < 3) {
continue;
}
$processes[] = [
'pid' => (int)$parts[0],
'ppid' => (int)$parts[1],
'command' => $parts[2],
];
}
return $processes;
}
private function isProcessAlive(int $pid): bool
{
return $pid > 1 && @Process::kill($pid, 0);
}
protected function addListen(): void
{
foreach (config('servers.reload.listen') as $value) {
$this->readDirectory($value);
}
}
/** private function isMasterProcessCommand(string $command): bool
* @return void {
*/ $prefix = '[' . config('site.id', 'system-service') . '].Master[';
protected function clear(): void return str_contains($command, $prefix);
{ }
$this->watches = [];
}
/** private function isSameAppProcess(int $pid): bool
* @param string $directory {
* @return void $cwd = @readlink('/proc/' . $pid . '/cwd');
*/ if ($cwd === false || $cwd === '') {
public function readFile(string $directory): void return false;
{ }
if (str_ends_with($directory, '.php') === true) {
inotify_add_watch($this->pipe, $directory, IN_MODIFY | IN_MOVE | IN_CREATE | IN_DELETE); return $this->normalizePath($cwd) === $this->normalizePath(APP_PATH);
} }
}
private function normalizePath(string $path): string
{
$real = realpath($path) ?: $path;
return rtrim(str_replace('\\', '/', $real), '/');
}
/** private function isProcessAlive(int $pid): bool
* @param string $directory {
* @return void return $pid > 1 && @Process::kill($pid, 0);
*/ }
public function readDirectory(string $directory): void
{ protected function addListen(): void
foreach (glob($directory . '/*') as $data) { {
if (is_dir($data)) { foreach (config('servers.reload.listen') as $value) {
$this->readDirectory($data); $this->readDirectory($value);
} else { }
$this->readFile($data); }
}
}
} /**
* @return void
*/
protected function clear(): void
{
$this->watches = [];
}
/**
* @param string $directory
* @return void
*/
public function readFile(string $directory): void
{
if (str_ends_with($directory, '.php') === true) {
inotify_add_watch($this->pipe, $directory, IN_MODIFY | IN_MOVE | IN_CREATE | IN_DELETE);
}
}
/**
* @param string $directory
* @return void
*/
public function readDirectory(string $directory): void
{
foreach (glob($directory . '/*') as $data) {
if (is_dir($data)) {
$this->readDirectory($data);
} else {
$this->readFile($data);
}
}
}
} }
Abstracts/ReloadWorkers.php
+87
View File
@@ -0,0 +1,87 @@
<?php
namespace Kiri\Server\Abstracts;
use Swoole\Process;
trait ReloadWorkers
{
/**
* @return void
*/
private function reloadWorkers(): bool
{
$pid = $this->getMasterPid();
if ($pid === null) {
return false;
}
return Process::kill($pid, SIGUSR1);
}
private function getMasterPid(): ?int
{
$processes = $this->listProcesses();
$candidates = [];
$pidFile = function_exists('storage') ? storage('.swoole.pid') : '';
if (is_file($pidFile)) {
$candidates[] = (int)trim((string)file_get_contents($pidFile));
}
foreach ($processes as $process) {
if ($this->isMasterProcessCommand($process['command'])) {
$candidates[] = (int)$process['pid'];
}
}
foreach ($candidates
|> array_filter(...)
|> array_unique(...)
|> array_values(...) as $pid) {
if ($this->isProcessAlive($pid) && $this->isMasterPid($pid, $processes)) {
return $pid;
}
}
return null;
}
private function isMasterPid(int $pid, array $processes): bool
{
foreach ($processes as $process) {
if ((int)$process['pid'] === $pid) {
return $this->isMasterProcessCommand($process['command']) && $this->isSameAppProcess($pid);
}
}
return false;
}
private function listProcesses(): array
{
$lines = [];
exec('ps -eo pid=,ppid=,args=', $lines);
$processes = [];
foreach ($lines as $line) {
$line = trim($line);
if ($line === '') {
continue;
}
$parts = preg_split('/\s+/', $line, 3);
if (count($parts) < 3) {
continue;
}
$processes[] = [
'pid' => (int)$parts[0],
'ppid' => (int)$parts[1],
'command' => $parts[2],
];
}
return $processes;
}
}