This commit is contained in:
xl
2023-07-10 02:04:49 +08:00
parent d093dd7f57
commit 6ea25f35a4
+97 -92
View File
@@ -21,11 +21,11 @@ use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
use ReflectionException; use ReflectionException;
use Symfony\Component\Console\{Application as ConsoleApplication, use Symfony\Component\Console\{Application as ConsoleApplication,
Input\ArgvInput, Input\ArgvInput,
Output\ConsoleOutput, Output\ConsoleOutput,
Output\OutputInterface Output\OutputInterface
}; };
use Kiri\Server\Events\OnWorkerStart;
/** /**
* Class Init * Class Init
@@ -35,88 +35,88 @@ use Symfony\Component\Console\{Application as ConsoleApplication,
class Application extends BaseApplication class Application extends BaseApplication
{ {
/** /**
* @var string * @var string
*/ */
public string $id = 'uniqueId'; public string $id = 'uniqueId';
public string $state = ''; public string $state = '';
/** /**
* @return void * @return void
* @throws ReflectionException * @throws ReflectionException
*/ */
public function init(): void public function init(): void
{ {
$error = Kiri::getDi()->get(ErrorHandler::class); $error = Kiri::getDi()->get(ErrorHandler::class);
$error->registerShutdownHandler(\config('error.shutdown', [])); $error->registerShutdownHandler(\config('error.shutdown', []));
$error->registerExceptionHandler(\config('error.exception', [])); $error->registerExceptionHandler(\config('error.exception', []));
$error->registerErrorHandler(\config('error.error', [])); $error->registerErrorHandler(\config('error.error', []));
$this->id = \config('id', uniqid('id.')); $this->id = \config('id', uniqid('id.'));
} }
/** /**
* @param string $service * @param string $service
* @return $this * @return $this
* @throws * @throws
*/ */
public function import(string $service): static public function import(string $service): static
{ {
if (!class_exists($service)) { if (!class_exists($service)) {
return $this; return $this;
} }
$class = Kiri::getDi()->get($service); $class = Kiri::getDi()->get($service);
if (method_exists($class, 'onImport')) { if (method_exists($class, 'onImport')) {
$class->onImport(Kiri::getDi()->get(LocalService::class)); $class->onImport(Kiri::getDi()->get(LocalService::class));
} }
return $this; return $this;
} }
/** /**
* @param Kernel $kernel * @param Kernel $kernel
* @return $this * @return $this
* @throws ReflectionException * @throws ReflectionException
*/ */
public function commands(Kernel $kernel): static public function commands(Kernel $kernel): static
{ {
foreach ($kernel->getCommands() as $command) { foreach ($kernel->getCommands() as $command) {
$this->command($command); $this->command($command);
} }
return $this; return $this;
} }
/** /**
* @param string $command * @param string $command
* @return void * @return void
* @throws ReflectionException * @throws ReflectionException
*/ */
public function command(string $command): void public function command(string $command): void
{ {
$container = Kiri::getDi(); $container = Kiri::getDi();
$console = $container->get(ConsoleApplication::class); $console = $container->get(ConsoleApplication::class);
$console->add($container->get($command)); $console->add($container->get($command));
} }
/** /**
* @param array $argv * @param array $argv
* @return void * @return void
* @throws ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface * @throws NotFoundExceptionInterface
* @throws ReflectionException * @throws ReflectionException
* @throws Exception * @throws Exception
*/ */
public function execute(array $argv): void public function execute(array $argv): void
{ {
$container = Kiri::getDi(); $container = Kiri::getDi();
[$input, $output] = $this->argument($argv); [$input, $output] = $this->argument($argv);
$console = $container->get(ConsoleApplication::class); $console = $container->get(ConsoleApplication::class);
$command = $console->find($input->getFirstArgument()); $command = $console->find($input->getFirstArgument());
if (!($command instanceof Kiri\Server\ServerCommand)) { if (!($command instanceof Kiri\Server\ServerCommand)) {
$scanner = $container->get(Scanner::class); $scanner = $container->get(Scanner::class);
@@ -124,29 +124,34 @@ class Application extends BaseApplication
} else if (\config('reload.hot', false) === false) { } else if (\config('reload.hot', false) === false) {
$scanner = $container->get(Scanner::class); $scanner = $container->get(Scanner::class);
$scanner->read(APP_PATH . 'app/'); $scanner->read(APP_PATH . 'app/');
} else {
on(OnWorkerStart::class, function () {
$scanner = di(Scanner::class);
$scanner->read(APP_PATH . 'app/');
}, -1);
} }
fire(new OnBeforeCommandExecute()); fire(new OnBeforeCommandExecute());
$command->run($input, $output); $command->run($input, $output);
fire(new OnAfterCommandExecute()); fire(new OnAfterCommandExecute());
$output->writeln('ok' . PHP_EOL); $output->writeln('ok' . PHP_EOL);
} }
/** /**
* @param $argv * @param $argv
* @return array * @return array
*/ */
private function argument($argv): array private function argument($argv): array
{ {
$container = Kiri::getDi(); $container = Kiri::getDi();
$input = new ArgvInput($argv); $input = new ArgvInput($argv);
$container->bind(ArgvInput::class, $input); $container->bind(ArgvInput::class, $input);
$output = new ConsoleOutput(); $output = new ConsoleOutput();
$container->bind(OutputInterface::class, $output); $container->bind(OutputInterface::class, $output);
return [$input, $output]; return [$input, $output];
} }
} }