Revert "改名"
This reverts commit fdf58326
This commit is contained in:
@@ -23,9 +23,9 @@ use Swoole\WebSocket\Server;
|
|||||||
defined('DB_ERROR_BUSY') or define('DB_ERROR_BUSY', 'The database is busy. Please try again later.');
|
defined('DB_ERROR_BUSY') or define('DB_ERROR_BUSY', 'The database is busy. Please try again later.');
|
||||||
defined('SELECT_IS_NULL') or define('SELECT_IS_NULL', 'Query data does not exist, please check the relevant conditions.');
|
defined('SELECT_IS_NULL') or define('SELECT_IS_NULL', 'Query data does not exist, please check the relevant conditions.');
|
||||||
defined('PARAMS_IS_NULL') or define('PARAMS_IS_NULL', 'Required items cannot be empty, please add.');
|
defined('PARAMS_IS_NULL') or define('PARAMS_IS_NULL', 'Required items cannot be empty, please add.');
|
||||||
defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', APP_PATH . 'controllers/');
|
defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', realpath(APP_PATH . 'controllers/'));
|
||||||
defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'models/');
|
defined('MODEL_PATH') or define('MODEL_PATH', realpath(APP_PATH . 'models/'));
|
||||||
defined('COMPONENT_PATH') or define('COMPONENT_PATH', APP_PATH . 'components/');
|
defined('COMPONENT_PATH') or define('COMPONENT_PATH', realpath(APP_PATH . 'components/'));
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -3,18 +3,17 @@
|
|||||||
namespace Kiri\FileListen;
|
namespace Kiri\FileListen;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
use Kiri;
|
||||||
use Kiri\Abstracts\Config;
|
use Kiri\Abstracts\Config;
|
||||||
|
use Kiri\Annotation\Inject;
|
||||||
use Kiri\Core\Json;
|
use Kiri\Core\Json;
|
||||||
use Kiri\Error\Logger;
|
use Kiri\Error\Logger;
|
||||||
use Kiri\Exception\ConfigException;
|
use Kiri\Exception\ConfigException;
|
||||||
use Kiri;
|
|
||||||
use Kiri\Annotation\Inject;
|
|
||||||
use Swoole\Coroutine;
|
use Swoole\Coroutine;
|
||||||
use Swoole\Process;
|
use Swoole\Process;
|
||||||
use Swoole\Timer;
|
use Swoole\Timer;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
use Symfony\Component\Console\Input\InputOption;
|
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
|
||||||
|
|
||||||
@@ -25,201 +24,203 @@ class HotReload extends Command
|
|||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
public bool $isReloading = FALSE;
|
public bool $isReloading = FALSE;
|
||||||
public bool $isReloadingOut = FALSE;
|
public bool $isReloadingOut = FALSE;
|
||||||
public ?array $dirs = [];
|
public ?array $dirs = [];
|
||||||
|
|
||||||
public int $events;
|
public int $events;
|
||||||
|
|
||||||
public int $int = -1;
|
public int $int = -1;
|
||||||
|
|
||||||
|
|
||||||
private ?Process $process = NULL;
|
private ?Process $process = NULL;
|
||||||
|
|
||||||
|
|
||||||
public Inotify|Scaner $driver;
|
public Inotify|Scaner $driver;
|
||||||
|
|
||||||
|
|
||||||
#[Inject(Logger::class)]
|
#[Inject(Logger::class)]
|
||||||
public Logger $logger;
|
public Logger $logger;
|
||||||
|
|
||||||
|
|
||||||
protected mixed $source = NULL;
|
protected mixed $source = NULL;
|
||||||
|
|
||||||
protected mixed $pipes = [];
|
protected mixed $pipes = [];
|
||||||
|
|
||||||
protected ?Coroutine\Channel $channel = NULL;
|
protected ?Coroutine\Channel $channel = NULL;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
protected function configure()
|
protected function configure()
|
||||||
{
|
{
|
||||||
$this->setName('sw:wather')->setDescription('server start');
|
$this->setName('sw:wather')->setDescription('server start');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws ConfigException
|
* @throws ConfigException
|
||||||
* @throws \ReflectionException
|
* @throws Exception
|
||||||
* @throws Exception
|
*/
|
||||||
*/
|
protected function initCore()
|
||||||
protected function initCore()
|
{
|
||||||
{
|
set_error_handler([$this, 'errorHandler']);
|
||||||
set_error_handler([$this, 'errorHandler']);
|
$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
|
||||||
$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
|
if (!extension_loaded('inotify')) {
|
||||||
if (!extension_loaded('inotify')) {
|
$this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
|
||||||
$this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
|
} else {
|
||||||
} else {
|
$this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
|
||||||
$this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
|
}
|
||||||
}
|
$this->clearOtherService();
|
||||||
$this->clearOtherService();
|
$this->setProcessName();
|
||||||
$this->setProcessName();
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws ConfigException
|
* @throws ConfigException
|
||||||
*/
|
*/
|
||||||
public function setProcessName()
|
public function setProcessName()
|
||||||
{
|
{
|
||||||
swoole_async_set(['enable_coroutine' => FALSE]);
|
swoole_async_set(['enable_coroutine' => FALSE]);
|
||||||
if (Kiri::getPlatform()->isLinux()) {
|
if (Kiri::getPlatform()->isLinux()) {
|
||||||
swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
|
swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function clearOtherService()
|
public function clearOtherService()
|
||||||
{
|
{
|
||||||
if (file_exists(storage('.manager.pid'))) {
|
if (file_exists(storage('.manager.pid'))) {
|
||||||
$pid = (int)file_get_contents(storage('.manager.pid'));
|
$pid = (int)file_get_contents(storage('.manager.pid'));
|
||||||
if ($pid > 0 && Process::kill($pid, 0)) {
|
if ($pid > 0 && Process::kill($pid, 0)) {
|
||||||
Process::kill($pid, 15) && Process::wait(TRUE);
|
Process::kill($pid, 15) && Process::wait(TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
file_put_contents(storage('.manager.pid'), getmypid());
|
file_put_contents(storage('.manager.pid'), getmypid());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function errorHandler()
|
public function errorHandler()
|
||||||
{
|
{
|
||||||
$error = func_get_args();
|
$error = func_get_args();
|
||||||
|
|
||||||
$path = ['file' => $error[2], 'line' => $error[3]];
|
$path = ['file' => $error[2], 'line' => $error[3]];
|
||||||
|
|
||||||
if ($error[0] === 0) {
|
if ($error[0] === 0) {
|
||||||
$error[0] = 500;
|
$error[0] = 500;
|
||||||
}
|
}
|
||||||
$data = Json::to(500, $error[1], $path);
|
$data = Json::to(500, $error[1], $path);
|
||||||
|
|
||||||
$this->logger->error($data, 'error');
|
$this->logger->error($data, 'error');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param InputInterface $input
|
* @param InputInterface $input
|
||||||
* @param OutputInterface $output
|
* @param OutputInterface $output
|
||||||
* @return int
|
* @return int
|
||||||
* @throws ConfigException
|
* @throws ConfigException
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function execute(InputInterface $input, OutputInterface $output): int
|
public function execute(InputInterface $input, OutputInterface $output): int
|
||||||
{
|
{
|
||||||
$this->initCore();
|
$this->initCore();
|
||||||
|
|
||||||
$this->trigger_reload();
|
$this->trigger_reload();
|
||||||
Timer::tick(1000, fn() => $this->healthCheck());
|
Timer::tick(1000, fn() => $this->healthCheck());
|
||||||
|
|
||||||
Process::signal(SIGTERM, [$this, 'onSignal']);
|
Process::signal(SIGTERM, [$this, 'onSignal']);
|
||||||
Process::signal(SIGKILL, [$this, 'onSignal']);
|
Process::signal(SIGKILL, [$this, 'onSignal']);
|
||||||
|
|
||||||
$this->driver->start();
|
$this->driver->start();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function healthCheck()
|
public function healthCheck()
|
||||||
{
|
{
|
||||||
$pid = (int)file_get_contents(storage('.swoole.pid'));
|
$pid = (int)file_get_contents(storage('.swoole.pid'));
|
||||||
if ($this->int == 1) {
|
if ($this->int == 1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (empty($pid)) {
|
if (empty($pid)) {
|
||||||
$this->logger->warning('service is shutdown you need reload.');
|
$this->logger->warning('service is shutdown you need reload.');
|
||||||
$this->trigger_reload();
|
$this->trigger_reload();
|
||||||
} else if (!Process::kill($pid, 0)) {
|
} else if (!Process::kill($pid, 0)) {
|
||||||
$this->logger->warning('service is shutdown you need reload.');
|
$this->logger->warning('service is shutdown you need reload.');
|
||||||
$this->trigger_reload();
|
$this->trigger_reload();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $data
|
* @param $data
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function onSignal($data)
|
public function onSignal($data)
|
||||||
{
|
{
|
||||||
if (!$data) {
|
if (!$data) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Timer::clearAll();
|
Timer::clearAll();
|
||||||
$this->driver->clear();
|
$this->driver->clear();
|
||||||
$this->stopServer();
|
$this->stopServer();
|
||||||
while ($ret = Process::wait(TRUE)) {
|
while ($ret = Process::wait(TRUE)) {
|
||||||
echo "PID={$ret['pid']}\n";
|
echo "PID={$ret['pid']}\n";
|
||||||
sleep(1);
|
sleep(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
protected function stopServer()
|
protected function stopServer()
|
||||||
{
|
{
|
||||||
$pid = file_get_contents(storage('.swoole.pid'));
|
$pid = file_get_contents(storage('.swoole.pid'));
|
||||||
if (!empty($pid) && Process::kill($pid, 0)) {
|
if (!empty($pid) && Process::kill($pid, 0)) {
|
||||||
Process::kill($pid, SIGTERM);
|
Process::kill($pid, SIGTERM);
|
||||||
}
|
}
|
||||||
if ($this->process && Process::kill($this->process->pid, 0)) {
|
if ($this->process && Process::kill($this->process->pid, 0)) {
|
||||||
Process::kill($this->process->pid) && Process::wait(TRUE);
|
Process::kill($this->process->pid) && Process::wait(TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
/**
|
* 重启
|
||||||
* 重启
|
*
|
||||||
*
|
* @throws Exception
|
||||||
* @throws Exception
|
*/
|
||||||
*/
|
public function trigger_reload(string $path = '')
|
||||||
public function trigger_reload()
|
{
|
||||||
{
|
if ($this->int == 1) {
|
||||||
if ($this->int == 1) {
|
return;
|
||||||
return;
|
}
|
||||||
}
|
$this->int = 1;
|
||||||
$this->int = 1;
|
$this->logger->warning('change reload');
|
||||||
$this->logger->warning('change reload');
|
if (!empty($path) && str_starts_with($path, CONTROLLER_PATH)) {
|
||||||
|
$pid = file_get_contents(storage('.swoole.pid'));
|
||||||
$this->stopServer();
|
if (!empty($pid) && Process::kill($pid, 0)) {
|
||||||
$this->process = new Process(function (Process $process) {
|
Process::kill($pid, SIGUSR1);
|
||||||
$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
|
}
|
||||||
});
|
} else {
|
||||||
|
$this->stopServer();
|
||||||
$this->process->start();
|
$this->process = new Process(function (Process $process) {
|
||||||
$this->int = -1;
|
$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "start"]);
|
||||||
}
|
});
|
||||||
|
$this->process->start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+127
-131
@@ -9,161 +9,157 @@ use Swoole\Timer;
|
|||||||
class Inotify
|
class Inotify
|
||||||
{
|
{
|
||||||
|
|
||||||
private mixed $inotify;
|
private mixed $inotify;
|
||||||
private mixed $events;
|
private mixed $events;
|
||||||
|
|
||||||
private array $watchFiles = [];
|
private array $watchFiles = [];
|
||||||
|
|
||||||
|
|
||||||
public bool $isReloading = FALSE;
|
public bool $isReloading = FALSE;
|
||||||
|
|
||||||
|
|
||||||
protected int $cid;
|
protected int $cid;
|
||||||
|
|
||||||
const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
|
const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $dirs
|
* @param array $dirs
|
||||||
* @param HotReload $process
|
* @param HotReload $process
|
||||||
*/
|
*/
|
||||||
public function __construct(protected array $dirs, public HotReload $process)
|
public function __construct(protected array $dirs, public HotReload $process)
|
||||||
{
|
{
|
||||||
set_error_handler([$this, 'error']);
|
set_error_handler([$this, 'error']);
|
||||||
set_exception_handler([$this, 'error']);
|
set_exception_handler([$this, 'error']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function error(): void
|
public function error(): void
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function start()
|
public function start()
|
||||||
{
|
{
|
||||||
$this->inotify = inotify_init();
|
$this->inotify = inotify_init();
|
||||||
$this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
|
$this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
|
||||||
foreach ($this->dirs as $dir) {
|
foreach ($this->dirs as $dir) {
|
||||||
if (!is_dir($dir)) continue;
|
if (!is_dir($dir)) continue;
|
||||||
$this->watch($dir);
|
$this->watch($dir);
|
||||||
}
|
}
|
||||||
Event::add($this->inotify, [$this, 'check']);
|
Event::add($this->inotify, [$this, 'check']);
|
||||||
Event::wait();
|
Event::wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function clear()
|
public function clear()
|
||||||
{
|
{
|
||||||
Event::del($this->inotify);
|
Event::del($this->inotify);
|
||||||
Event::exit();
|
Event::exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 开始监听
|
* 开始监听
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function check()
|
public function check()
|
||||||
{
|
{
|
||||||
if (!($events = inotify_read($this->inotify))) {
|
if (!($events = inotify_read($this->inotify))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ($this->isReloading) {
|
if ($this->isReloading) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
|
$LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
|
||||||
foreach ($events as $ev) {
|
foreach ($events as $ev) {
|
||||||
if (!in_array($ev['mask'], $LISTEN_TYPE)) {
|
if (!in_array($ev['mask'], $LISTEN_TYPE)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//非重启类型
|
//非重启类型
|
||||||
if (str_ends_with($ev['name'], '.php')) {
|
if (str_ends_with($ev['name'], '.php')) {
|
||||||
Timer::after(3000, fn() => $this->reload());
|
Timer::after(3000, fn() => $this->reload($ev['name']));
|
||||||
$this->isReloading = TRUE;
|
$this->isReloading = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function reload()
|
public function reload($path)
|
||||||
{
|
{
|
||||||
$this->process->trigger_reload();
|
$this->process->trigger_reload($path);
|
||||||
$this->clearWatch();
|
$this->clearWatch();
|
||||||
foreach ($this->dirs as $root) {
|
foreach ($this->dirs as $root) {
|
||||||
$this->watch($root);
|
$this->watch($root);
|
||||||
}
|
}
|
||||||
$this->process->int = -1;
|
$this->process->int = -1;
|
||||||
$this->isReloading = FALSE;
|
$this->isReloading = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function clearWatch()
|
public function clearWatch()
|
||||||
{
|
{
|
||||||
foreach ($this->watchFiles as $wd) {
|
foreach ($this->watchFiles as $wd) {
|
||||||
try {
|
@inotify_rm_watch($this->inotify, $wd);
|
||||||
@inotify_rm_watch($this->inotify, $wd);
|
}
|
||||||
} catch (\Throwable $exception) {
|
$this->watchFiles = [];
|
||||||
// logger()->addError($exception->getMessage(), 'throwable');
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
$this->watchFiles = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $dir
|
* @param $dir
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function watch($dir): bool
|
public function watch($dir): bool
|
||||||
{
|
{
|
||||||
//目录不存在
|
//目录不存在
|
||||||
if (!is_dir($dir)) {
|
if (!is_dir($dir)) {
|
||||||
return logger()->addError("[$dir] is not a directory.");
|
return logger()->addError("[$dir] is not a directory.");
|
||||||
}
|
}
|
||||||
//避免重复监听
|
//避免重复监听
|
||||||
if (isset($this->watchFiles[$dir])) {
|
if (isset($this->watchFiles[$dir])) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (in_array($dir, self::IG_DIR)) {
|
if (in_array($dir, self::IG_DIR)) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
$wd = @inotify_add_watch($this->inotify, $dir, $this->events);
|
$wd = @inotify_add_watch($this->inotify, $dir, $this->events);
|
||||||
$this->watchFiles[$dir] = $wd;
|
$this->watchFiles[$dir] = $wd;
|
||||||
|
|
||||||
$files = scandir($dir);
|
$files = scandir($dir);
|
||||||
foreach ($files as $f) {
|
foreach ($files as $f) {
|
||||||
if ($f == '.' || $f == '..') {
|
if ($f == '.' || $f == '..') {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$path = $dir . '/' . $f;
|
$path = $dir . '/' . $f;
|
||||||
//递归目录
|
//递归目录
|
||||||
if (is_dir($path)) {
|
if (is_dir($path)) {
|
||||||
$this->watch($path);
|
$this->watch($path);
|
||||||
} else if (!str_ends_with($f, '.php')) {
|
} else if (!str_ends_with($f, '.php')) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//检测文件类型
|
//检测文件类型
|
||||||
if (strstr($f, '.') == '.php') {
|
if (strstr($f, '.') == '.php') {
|
||||||
$wd = @inotify_add_watch($this->inotify, $path, $this->events);
|
$wd = @inotify_add_watch($this->inotify, $path, $this->events);
|
||||||
$this->watchFiles[$path] = $wd;
|
$this->watchFiles[$path] = $wd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+113
-110
@@ -8,142 +8,145 @@ use Swoole\Timer;
|
|||||||
class Scaner
|
class Scaner
|
||||||
{
|
{
|
||||||
|
|
||||||
private array $md5Map = [];
|
private array $md5Map = [];
|
||||||
|
|
||||||
public bool $isReloading = FALSE;
|
public bool $isReloading = FALSE;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $dirs
|
* @param array $dirs
|
||||||
* @param HotReload $process
|
* @param HotReload $process
|
||||||
*/
|
*/
|
||||||
public function __construct(protected array $dirs, public HotReload $process)
|
public function __construct(protected array $dirs, public HotReload $process)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function start(): void
|
public function start(): void
|
||||||
{
|
{
|
||||||
$this->loadDirs();
|
$this->loadDirs();
|
||||||
$this->tick();
|
$this->tick();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param bool $isReload
|
* @param bool $isReload
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
private function loadDirs(bool $isReload = FALSE)
|
private function loadDirs(bool $isReload = FALSE)
|
||||||
{
|
{
|
||||||
foreach ($this->dirs as $value) {
|
foreach ($this->dirs as $value) {
|
||||||
if (is_bool($path = realpath($value))) {
|
if (is_bool($path = realpath($value))) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_dir($path)) continue;
|
if (!is_dir($path)) continue;
|
||||||
|
|
||||||
$this->loadByDir($path, $isReload);
|
$this->loadByDir($path, $isReload);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $path
|
* @param $path
|
||||||
* @param bool $isReload
|
* @param bool $isReload
|
||||||
* @return void
|
* @return void
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
private function loadByDir($path, bool $isReload = FALSE): void
|
private function loadByDir($path, bool $isReload = FALSE): void
|
||||||
{
|
{
|
||||||
if (!is_string($path)) {
|
if (!is_string($path)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$path = rtrim($path, '/');
|
$path = rtrim($path, '/');
|
||||||
foreach (glob(realpath($path) . '/*') as $value) {
|
foreach (glob(realpath($path) . '/*') as $value) {
|
||||||
if (is_dir($value)) {
|
if (is_dir($value)) {
|
||||||
$this->loadByDir($value, $isReload);
|
$this->loadByDir($value, $isReload);
|
||||||
}
|
}
|
||||||
if (is_file($value)) {
|
if (is_file($value)) {
|
||||||
if ($this->checkFile($value, $isReload)) {
|
if ($this->checkFile($value, $isReload)) {
|
||||||
Timer::after(2000, fn() => $this->timerReload());
|
Timer::after(2000, fn() => $this->timerReload());
|
||||||
$this->isReloading = TRUE;
|
$this->isReloading = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $value
|
* @param $value
|
||||||
* @param $isReload
|
* @param $isReload
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
private function checkFile($value, $isReload): bool
|
private function checkFile($value, $isReload): bool
|
||||||
{
|
{
|
||||||
$md5 = md5($value);
|
$md5 = md5($value);
|
||||||
$mTime = filectime($value);
|
$mTime = filectime($value);
|
||||||
if (!isset($this->md5Map[$md5])) {
|
if (!isset($this->md5Map[$md5])) {
|
||||||
if ($isReload) {
|
if ($isReload) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
$this->md5Map[$md5] = $mTime;
|
$this->md5Map[$md5] = $mTime;
|
||||||
} else {
|
} else {
|
||||||
if ($this->md5Map[$md5] != $mTime) {
|
if ($this->md5Map[$md5] != $mTime) {
|
||||||
if ($isReload) {
|
if ($isReload) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
$this->md5Map[$md5] = $mTime;
|
$this->md5Map[$md5] = $mTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function timerReload()
|
public function timerReload($path)
|
||||||
{
|
{
|
||||||
$this->isReloading = TRUE;
|
$this->isReloading = TRUE;
|
||||||
$this->process->trigger_reload();
|
|
||||||
|
|
||||||
$this->process->int = -1;
|
if (str_contains($path, CONTROLLER_PATH))
|
||||||
|
|
||||||
$this->loadDirs();
|
$this->process->trigger_reload($path);
|
||||||
|
|
||||||
$this->isReloading = FALSE;
|
$this->loadDirs();
|
||||||
$this->process->isReloadingOut = FALSE;
|
|
||||||
|
|
||||||
$this->tick();
|
$this->process->int = -1;
|
||||||
}
|
|
||||||
|
$this->isReloading = FALSE;
|
||||||
|
$this->process->isReloadingOut = FALSE;
|
||||||
|
|
||||||
|
$this->tick();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private bool $isStop = FALSE;
|
private bool $isStop = FALSE;
|
||||||
|
|
||||||
public function clear()
|
public function clear()
|
||||||
{
|
{
|
||||||
$this->isStop = TRUE;
|
$this->isStop = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function tick()
|
public function tick()
|
||||||
{
|
{
|
||||||
if ($this->isReloading || $this->isStop) {
|
if ($this->isReloading || $this->isStop) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->loadDirs(TRUE);
|
$this->loadDirs(TRUE);
|
||||||
|
|
||||||
sleep(2);
|
sleep(2);
|
||||||
|
|
||||||
$this->tick();
|
$this->tick();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user