From 1f592689ef269868ffbfb450f701d022e539fd9a Mon Sep 17 00:00:00 2001
From: xl <as2252258@163.com>
Date: Wed, 22 Nov 2023 09:26:18 +0800
Subject: [PATCH] eee

---
 Events/OnAfterWorkerStart.php |  8 ++++++++
 Handler/OnRequest.php         |  4 ++--
 Handler/OnServerWorker.php    | 36 +++++++++++++++++------------------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/Events/OnAfterWorkerStart.php b/Events/OnAfterWorkerStart.php
index 5cb6afb..9406c72 100644
--- a/Events/OnAfterWorkerStart.php
+++ b/Events/OnAfterWorkerStart.php
@@ -5,4 +5,12 @@ namespace Kiri\Server\Events;
 class OnAfterWorkerStart
 {
 
+
+    /**
+     * @param int $workerId
+     */
+    public function __construct(public int $workerId)
+    {
+    }
+
 }
diff --git a/Handler/OnRequest.php b/Handler/OnRequest.php
index 06ec912..5f77083 100644
--- a/Handler/OnRequest.php
+++ b/Handler/OnRequest.php
@@ -119,14 +119,14 @@ class OnRequest implements OnRequestInterface
             $PsrRequest = Context::set(RequestInterface::class, $this->createConstrictRequest($request));
 
             /** @var ConstrictResponse $PsrResponse */
-            Context::set(ResponseInterface::class, new ConstrictResponse())->withContentType($this->response->contentType);
+            Context::set(ResponseInterface::class, new ConstrictResponse($this->response->contentType));
 
             /** @var $PsrResponse */
             $PsrResponse = $this->router->query($request->server['path_info'], $request->getMethod())->run($PsrRequest);
         } catch (Throwable $throwable) {
             $PsrResponse = $this->exception->emit($throwable, $this->constrictResponse);
         } finally {
-            $this->responseEmitter->xxxxxxxxxxxxxxxxxxxxxxxxxSender($PsrResponse, $response, $PsrRequest);
+            $this->responseEmitter->response($PsrResponse, $response, $PsrRequest);
         }
     }
 
diff --git a/Handler/OnServerWorker.php b/Handler/OnServerWorker.php
index 3296ff9..1880d1c 100644
--- a/Handler/OnServerWorker.php
+++ b/Handler/OnServerWorker.php
@@ -8,15 +8,14 @@ use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
 use Kiri\Server\Events\OnAfterWorkerStart;
 use Kiri\Server\Events\OnBeforeWorkerStart;
-use Kiri\Server\Events\OnTaskerStart as OnTaskStart;
+use Kiri\Server\Events\OnTaskerStart as OnTaskerStart;
 use Kiri\Server\Events\OnWorkerError;
 use Kiri\Server\Events\OnWorkerExit;
 use Kiri\Server\Events\OnWorkerStart;
 use Kiri\Server\Events\OnWorkerStop;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
 use Swoole\Server;
+use Kiri\Di\Inject\Container;
 use Swoole\Timer;
 
 
@@ -28,6 +27,13 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
 {
 
 
+    /**
+     * @var EventDispatch
+     */
+    #[Container(EventDispatch::class)]
+    public EventDispatch $dispatch;
+
+
     /**
      * @param Server $server
      * @param int $workerId
@@ -36,21 +42,16 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
      */
     public function onWorkerStart(Server $server, int $workerId): void
     {
-        $dispatch = \Kiri::getDi()->get(EventDispatch::class);
-        $dispatch->dispatch(new OnBeforeWorkerStart($workerId));
+        $this->dispatch->dispatch(new OnBeforeWorkerStart(workerId: $workerId));
+        $this->processName($server, $workerId < $server->setting['worker_num'] ? 'Worker' : 'Tasker');
         set_env('environmental_workerId', $workerId);
-
+        set_env('environmental', $workerId < $server->setting['worker_num'] ? Kiri::WORKER : Kiri::TASK);
         if ($workerId < $server->setting['worker_num']) {
-            $this->processName($server, 'Worker');
-            set_env('environmental', Kiri::WORKER);
-            $dispatch->dispatch(new OnWorkerStart($server, $workerId));
+            $this->dispatch->dispatch(new OnWorkerStart($server, $workerId));
         } else {
-            $this->processName($server, 'Tasker');
-            set_env('environmental', Kiri::TASK);;
-            $dispatch->dispatch(new OnTaskStart($server, $workerId));
+            $this->dispatch->dispatch(new OnTaskerStart($server, $workerId));
         }
-
-        $dispatch->dispatch(new OnAfterWorkerStart());
+        $this->dispatch->dispatch(new OnAfterWorkerStart(workerId: $workerId));
     }
 
 
@@ -61,8 +62,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
      */
     protected function processName(Server $server, string $prefix): void
     {
-        $prefix = sprintf($prefix . ' Process[%d].%d', $server->worker_pid, $server->worker_id);
-        Kiri::setProcessName($prefix);
+        Kiri::setProcessName(sprintf($prefix . ' Process[%d].%d', $server->worker_pid, $server->worker_id));
     }
 
 
@@ -102,9 +102,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
         event(new OnWorkerError($server, $worker_id, $worker_pid, $exit_code, $signal));
 
         debug_print_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
-        $message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s',
-            $worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), $signal)
-        );
+        $message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s', $worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), $signal));
 
         error($message);