From 68934520221b735a8fca66ab798a7e2f977a9a14 Mon Sep 17 00:00:00 2001
From: "as2252258@163.com" <as22522582>
Date: Sun, 29 Aug 2021 04:44:33 +0800
Subject: [PATCH] 111

---
 http-helper/Command.php              | 16 ++++---
 http-server/Worker/OnWorkerStart.php | 69 ++++++++--------------------
 2 files changed, 29 insertions(+), 56 deletions(-)

diff --git a/http-helper/Command.php b/http-helper/Command.php
index 891ecadc..c8931a76 100644
--- a/http-helper/Command.php
+++ b/http-helper/Command.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace Http;
 
 
+use Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Input;
 use Kiri\Events\EventProvider;
@@ -28,6 +29,13 @@ class Command extends \Console\Command
     const ACTIONS = ['start', 'stop', 'restart'];
 
 
+    /**
+     * @var \Kiri\Events\EventProvider
+     */
+    #[Inject(EventProvider::class)]
+    public EventProvider $eventProvider;
+
+
     /**
      * @param Input $dtl
      * @return string
@@ -61,14 +69,8 @@ class Command extends \Console\Command
     private function generate_runtime_builder($manager)
     {
         exec(PHP_BINARY . ' ' . APP_PATH . 'kiri.php runtime:builder');
-        if (!is_enable_file_modification_listening()) {
-            scan_directory(directory('app'), 'App');
-            $loader = Kiri::app()->getRouter();
-            $loader->_loader();
-        }
 
-        $event = di(EventProvider::class);
-        $event->on(OnWorkerStart::class, [di(WorkerDispatch::class), 'dispatch']);
+        $this->eventProvider->on(OnWorkerStart::class, [WorkerDispatch::class, 'dispatch']);
 
         return $manager->start();
     }
diff --git a/http-server/Worker/OnWorkerStart.php b/http-server/Worker/OnWorkerStart.php
index 2d27c9da..520ba25c 100644
--- a/http-server/Worker/OnWorkerStart.php
+++ b/http-server/Worker/OnWorkerStart.php
@@ -3,7 +3,9 @@
 namespace Server\Worker;
 
 use Annotation\Annotation;
+use Annotation\Inject;
 use Exception;
+use Http\Route\Router;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
@@ -16,17 +18,12 @@ class OnWorkerStart implements EventDispatcherInterface
 {
 
 
+    #[Inject(Annotation::class)]
     public Annotation $annotation;
 
 
-    /**
-     * @param \Server\Events\OnWorkerStart $onWorkerStart
-     * @throws \Exception
-     */
-    public function __construct()
-    {
-        $this->annotation = Kiri::app()->getAnnotation();
-    }
+    #[Inject(Router::class)]
+    public Router $router;
 
 
     /**
@@ -43,51 +40,25 @@ class OnWorkerStart implements EventDispatcherInterface
         if (!empty($serialize)) {
             Config::sets(unserialize($serialize));
         }
-        if ($event->workerId < $event->server->setting['worker_num']) {
-            $this->onWorkerInit($event);
-        } else {
-            $this->onTaskInit($event);
-        }
+
+        $isWorker = $event->workerId < $event->server->setting['worker_num'];
+
+        $this->annotation->read(APP_PATH . 'app','App', $isWorker ? [] : [CONTROLLER_PATH]);
         $this->interpretDirectory();
-    }
+        if ($isWorker) {
+            putenv('environmental=' . Kiri::WORKER);
+            $this->router->_loader();
 
+            echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Worker[%d].%d start.", $event->server->worker_pid, $event->workerId) . PHP_EOL;
 
-    /**
-     * @param $event
-     * @throws \Kiri\Exception\ConfigException
-     * @throws \Exception
-     */
-    public function onTaskInit($event)
-    {
-        putenv('environmental=' . Kiri::TASK);
-        if (is_enable_file_modification_listening()) {
-            $this->annotation->read(APP_PATH . 'app', 'App', [CONTROLLER_PATH]);
+            $this->setProcessName(sprintf('Worker[%d].%d', $event->server->worker_pid, $event->workerId));
+        } else {
+            putenv('environmental=' . Kiri::TASK);
+
+            echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Tasker[%d].%d start.", $event->server->worker_pid, $event->workerId) . PHP_EOL;
+
+            $this->setProcessName(sprintf('Tasker[%d].%d', $event->server->worker_pid, $event->workerId));
         }
-
-        echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Tasker[%d].%d start.", $event->server->worker_pid, $event->workerId) . PHP_EOL;
-
-        $this->setProcessName(sprintf('Tasker[%d].%d', $event->server->worker_pid, $event->workerId));
-    }
-
-
-    /**
-     * @param $event
-     * @throws \Kiri\Exception\ConfigException
-     * @throws \ReflectionException
-     */
-    public function onWorkerInit($event)
-    {
-        putenv('environmental=' . Kiri::WORKER);
-
-        if (is_enable_file_modification_listening()) {
-            $this->annotation->read(APP_PATH . 'app');
-            $loader = Kiri::app()->getRouter();
-            $loader->_loader();
-        }
-
-        echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m Worker[%d].%d start.", $event->server->worker_pid, $event->workerId) . PHP_EOL;
-
-        $this->setProcessName(sprintf('Worker[%d].%d', $event->server->worker_pid, $event->workerId));
     }