marx/http
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support PPM

Browse source
This commit is contained in:
eater 2018-01-22 15:21:48 +01:00
parent de13d9da75
commit 4e60619e77
Signed by: eater
GPG key ID: AD2560A0F84F0759
3 changed files with 53 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -11,4 +11,4 @@
"BitCommunism\\Http\\": "src/"
}
}
}
}

2
config/default.php
View file

@ -10,7 +10,7 @@ use function DI\object;
return [
'marx.calls' => add([
'http' => function(Server $server) {
$server->serve();
return $server;
}
]),

80
src/Server.php
View file

@ -17,6 +17,7 @@ use function GuzzleHttp\Psr7\copy_to_stream;
use GuzzleHttp\Psr7\Response;
use GuzzleHttp\Psr7\ServerRequest;
use function GuzzleHttp\Psr7\stream_for;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
@ -24,6 +25,10 @@ class Server
{
private $routes = [];
private $container;
/**
* @var Dispatcher
*/
private $router;
public function __construct($routes, Container $container)
@ -78,30 +83,10 @@ class Server
public function serve()
{
$request = ServerRequest::fromGlobals();
$path = $request->getUri()->getPath();
$method = $request->getMethod();
$routeInfo = $this->router->dispatch($method, $path);
$response = null;
$response = $this->respond($request);
switch ($routeInfo[0]) {
case Dispatcher::NOT_FOUND:
// todo: Error page
break;
case Dispatcher::METHOD_NOT_ALLOWED:
// todo: Error page
break;
case Dispatcher::FOUND:
[$_, $handler, $vars] = $routeInfo;
$response = $this->handleHttp($request, $handler, $vars);
break;
}
if ($response === null) {
// todo: Error page
}
header('Status: ' . $response->getStatusCode() . ' ' . $response->getReasonPhrase());
header('HTTP/' . $response->getProtocolVersion() . ' ' . $response->getStatusCode() . ' ' . $response->getReasonPhrase());
$wrote = [];
foreach ($response->getHeaders() as [$headerName, $headerValue]) {
@ -115,36 +100,73 @@ class Server
copy_to_stream($response->getBody(), stream_for($stdout));
}
public function handleHttp(ServerRequestInterface $request, array $handler, array $vars): ResponseInterface
public function respond(ServerRequestInterface $request, ResponseInterface $response = null): ResponseInterface
{
$path = $request->getUri()->getPath();
$method = $request->getMethod();
$routeInfo = $this->router->dispatch($method, $path);
switch ($routeInfo[0]) {
case Dispatcher::NOT_FOUND:
// todo: Error page
break;
case Dispatcher::METHOD_NOT_ALLOWED:
// todo: Error page
break;
case Dispatcher::FOUND:
[$_, $handler, $vars] = $routeInfo;
$response = $this->handleHttp($request, $handler, $vars, $response);
break;
}
if ($response === null) {
// todo: Error page
}
return $response;
}
public function handleHttp(ServerRequestInterface $request, array $handler, array $vars, ResponseInterface $response = null): ResponseInterface
{
[$_, $_, $middlewareArray] = $handler;
$middlewarePointer = 0;
$next = null;
$response = new Response(200, [], stream_for('No answer'));
if ($response === null) {
$response = new Response(200, [], stream_for('No answer'));
}
$next = function ($request, $response, $vars) use ($handler, $middlewareArray, &$middlewarePointer, &$next) {
$output = null;
if (count($middlewareArray) >= $middlewarePointer) {
$obj = $this->container->get($handler[0]);
$output = $obj->{$handler[1]}($request, $response, $vars);
$call = [$obj, $handler[1]];
} else {
[$name, $func] = $middlewareArray[$middlewarePointer++];
$middleware = $this->container->get($name);
$output = $middleware->{$func}($request, $response, $vars);
$call = [$middleware, $func];
}
$output = $this->container->call($call, [
RequestInterface::class => $request,
ResponseInterface::class => $response,
'request' => $request,
'response' => $response,
'vars' => $vars,
]);
return $this->normalizeResponse($output, $response);
};
return $next($request, $response, $vars);
}
private function normalizeResponse($response, ResponseInterface $previousResponse) {
private function normalizeResponse($response, ResponseInterface $previousResponse)
{
if ($response instanceof ResponseInterface) {
return $response;
}