noccy/mercureact
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved response middleware, added tests

Browse Source
This commit is contained in:
Chris
2024-03-13 22:20:54 +01:00
parent 7c14b51333
commit 952b13535d
3 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Http/Middleware/ResponseMiddleware.php
View File

@ -35,7 +35,14 @@ class ResponseMiddleware
{
$promise = new Promise(
function (callable $resolve) use ($request, $next) {
$resolve($next($request));
try {
$resolve($next($request));
} catch (SecurityException $t) {
$resolve(Response::plaintext("Access Denied")->withStatus(Response::STATUS_UNAUTHORIZED));
} catch (\Throwable $t) {
$this->logger->warning(get_class($t).": ".$t->getMessage(), [ 'file'=>$t->getFile(), 'line'=>$t->getLine() ]);
$resolve(Response::plaintext("500: Internal Server Error (".$t->getMessage().")\n")->withStatus(500));
}
}
);
return $promise->then(
@ -50,19 +57,10 @@ class ResponseMiddleware
return Response::plaintext($response);
}
return Response::plaintext((string)$response);
},
function (Throwable $t) {
if ($t instanceof SecurityException) {
return Response::plaintext("Access Denied")->withStatus(Response::STATUS_UNAUTHORIZED);
}
$this->logger->warning(get_class($t).": ".$t->getMessage(), [ 'file'=>$t->getFile(), 'line'=>$t->getLine() ]);
return Response::plaintext("500: Internal Server Error (".$t->getMessage().")\n")->withStatus(500);
}
)->then(
function ($response) use ($request) {
assert("\$response instanceof ResponseInterface");
$host = ($request->getServerParams()['SERVER_ADDR']??"");
//. ":" . ($request->getServerParams()['SERVER_PORT']??"80");
$this->logger->debug(sprintf("%s %s %s → %3d (%d)",
$request->getServerParams()['REMOTE_ADDR'],
$request->getMethod(),