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

Unified logging

Browse Source
This commit is contained in:
Chris
2024-03-11 01:20:45 +01:00
parent 56ddab0cd5
commit c31c55fafd
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Http/Middleware/MercureHandler.php
View File

@ -91,7 +91,7 @@ class MercureHandler
code: RequestException::ERR_INVALID_REQUEST_DATA
);
[ $name, $value ] = array_map('urldecode', explode("=", $param, 2));
if ($name === 'topic') $topics[] = $value;
if ($name === 'topic' || $name === 'topic[]') $topics[] = $value;
}
// Grab the JWT token from the requests authorization attribute
@ -142,7 +142,9 @@ class MercureHandler
// Parse out the urlencoded body. Pretty sure there is a better way to do this?
$body = explode("&", (string)$request->getBody());
$data = [];
$data = [
'topic' => []
];
foreach ($body as $param) {
if (!str_contains($param, "="))
throw new RequestException(
@ -150,10 +152,8 @@ class MercureHandler
code: RequestException::ERR_INVALID_REQUEST_DATA
);
[ $name, $value ] = array_map('urldecode', explode("=", $param, 2));
if (in_array($name, [ 'topic' ])) {
if (!isset($data[$name]))
$data[$name] = [];
$data[$name][] = $value;
if ($name === 'topic' || $name === 'topic[]') {
$data['topic'][] = $value;
} else {
$data[$name] = $value;
}

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

@ -6,6 +6,7 @@ use NoccyLabs\Mercureact\Configuration;
use NoccyLabs\Mercureact\Http\Exception\SecurityException;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Log\LoggerInterface;
use React\Http\Message\Response;
use React\Promise\Promise;
use React\Promise\PromiseInterface;
@ -15,7 +16,8 @@ class ResponseMiddleware
{
public function __construct(
private Configuration $config
private Configuration $config,
private LoggerInterface $logger,
)
{
@ -60,13 +62,18 @@ class ResponseMiddleware
assert("\$response instanceof ResponseInterface");
$host = ($request->getServerParams()['SERVER_ADDR']??"");
//. ":" . ($request->getServerParams()['SERVER_PORT']??"80");
fprintf(STDOUT, "%s %3d %s %s %d\n",
$this->logger->debug(sprintf("%s %s %s → %3d (%d)",
$request->getServerParams()['REMOTE_ADDR'],
$response->getStatusCode(),
$request->getMethod(),
$request->getUri()->getPath(),
$response->getStatusCode(),
strlen($response->getBody())
);
), [
'remote' => $request->getServerParams()['REMOTE_ADDR'],
'status' => $response->getStatusCode(),
'method' => $request->getMethod(),
'path' => $request->getUri()->getPath(),
]);
return $response
// ->withAddedHeader('Link', '<https://'.$host.'/.well-known/mercure>; rel="mercure"')
// ->withAddedHeader('Link', '<wss://'.$host.'/.well-known/mercure>; rel="mercure+ws"')