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

改名

Browse Source
This commit is contained in:
Mr·x
2021-09-24 18:16:39 +08:00
parent 0f988a4c3b
commit ed44026f12
2 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http-handler/Abstracts/Handler.php
+73 -75
View File
@@ -2,7 +2,6 @@
namespace Http\Handler\Abstracts; namespace Http\Handler\Abstracts;
use Annotation\Inject;
use Http\Handler\Handler as CHl; use Http\Handler\Handler as CHl;
use Http\Message\ServerRequest; use Http\Message\ServerRequest;
use Kiri\Core\Help; use Kiri\Core\Help;
@@ -19,95 +18,94 @@ abstract class Handler implements RequestHandlerInterface
{ {
protected AspectProxy $aspectProxy; protected AspectProxy $aspectProxy;
/** /**
* @param CHl $handler * @param CHl $handler
* @param Iterator $middlewares * @param null|Iterator $middlewares
*/ */
public function __construct(public CHl $handler, public Iterator $middlewares) public function __construct(public CHl $handler, public ?Iterator $middlewares)
{ {
$this->aspectProxy = Kiri::getDi()->get(AspectProxy::class); $this->aspectProxy = Kiri::getDi()->get(AspectProxy::class);
} }
/** /**
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
* @return ResponseInterface * @return ResponseInterface
* @throws \Exception * @throws \Exception
*/ */
protected function execute(ServerRequestInterface $request): ResponseInterface protected function execute(ServerRequestInterface $request): ResponseInterface
{ {
$middleware = $this->middlewares->current(); if (empty($this->middlewares) || !($middleware = $this->middlewares->current())) {
if (empty($middleware)) { return $this->dispatcher($request);
return $this->dispatcher($request); }
} if (!($middleware instanceof MiddlewareInterface)) {
if (!($middleware instanceof MiddlewareInterface)) { throw new \Exception('get_implements_class($middleware) not found method process.');
throw new \Exception('get_implements_class($middleware) not found method process.'); }
}
$this->middlewares->next(); $this->middlewares->next();
return $middleware->process($request, $this); return $middleware->process($request, $this);
} }
/** /**
* @param ServerRequestInterface $request * @param ServerRequestInterface $request
* @return mixed * @return mixed
* @throws \Exception * @throws \Exception
*/ */
protected function dispatcher(ServerRequestInterface $request): mixed protected function dispatcher(ServerRequestInterface $request): mixed
{ {
$response = $this->aspectProxy->proxy($this->handler); $response = $this->aspectProxy->proxy($this->handler);
if (!($response instanceof ResponseInterface)) { if (!($response instanceof ResponseInterface)) {
$response = $this->transferToResponse($response); $response = $this->transferToResponse($response);
} }
$response->withHeader('Run-Time', $this->_runTime($request)); $response->withHeader('Run-Time', $this->_runTime($request));
return $response; return $response;
} }
/** /**
* @param ServerRequest $request * @param ServerRequest $request
* @return float * @return float
*/ */
private function _runTime(ServerRequestInterface $request): float private function _runTime(ServerRequestInterface $request): float
{ {
$float = microtime(true) - time(); $float = microtime(true) - time();
$serverParams = $request->getServerParams(); $serverParams = $request->getServerParams();
$rTime = $serverParams['request_time_float'] - $serverParams['request_time']; $rTime = $serverParams['request_time_float'] - $serverParams['request_time'];
return round($float - $rTime, 6); return round($float - $rTime, 6);
} }
/** /**
* @param mixed $responseData * @param mixed $responseData
* @return \Server\Constrict\ResponseInterface * @return \Server\Constrict\ResponseInterface
* @throws \Exception * @throws \Exception
*/ */
private function transferToResponse(mixed $responseData): ResponseInterface private function transferToResponse(mixed $responseData): ResponseInterface
{ {
$interface = response()->withStatus(200); $interface = response()->withStatus(200);
if (!$interface->hasContentType()) { if (!$interface->hasContentType()) {
$interface->withContentType('application/json;charset=utf-8'); $interface->withContentType('application/json;charset=utf-8');
} }
if (is_object($responseData)) { if (is_object($responseData)) {
$responseData = get_object_vars($responseData); $responseData = get_object_vars($responseData);
} }
if (str_contains($interface->getContentType(), 'xml')) { if (str_contains($interface->getContentType(), 'xml')) {
$interface->getBody()->write(Help::toXml($responseData)); $interface->getBody()->write(Help::toXml($responseData));
} else if (is_array($responseData)) { } else if (is_array($responseData)) {
$interface->getBody()->write(json_encode($responseData)); $interface->getBody()->write(json_encode($responseData));
} else { } else {
$interface->getBody()->write((string)$responseData); $interface->getBody()->write((string)$responseData);
} }
return $interface; return $interface;
} }
} }
http-server/Service/Http.php
+1 -3
View File
@@ -16,7 +16,6 @@ use Http\Message\Stream;
use Kiri\Abstracts\Config; use Kiri\Abstracts\Config;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
use Kiri\Kiri; use Kiri\Kiri;
use Kiri\Pool\Helper\SplQueue;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Server\Abstracts\Utility\EventDispatchHelper; use Server\Abstracts\Utility\EventDispatchHelper;
use Server\Abstracts\Utility\ResponseHelper; use Server\Abstracts\Utility\ResponseHelper;
@@ -115,8 +114,7 @@ class Http implements OnCloseInterface, OnConnectInterface, OnRequestInterface
{ {
$middlewares = MiddlewareManager::get($handler->callback); $middlewares = MiddlewareManager::get($handler->callback);
$dispatcher = new Dispatcher($handler, empty($middlewares) ? null : new Iterator($middlewares));
$dispatcher = new Dispatcher($handler, new Iterator($middlewares));
return $dispatcher->handle($PsrRequest); return $dispatcher->handle($PsrRequest);
} }