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

Read config, handle lastEventId in topicmanager

Browse Source
This commit is contained in:
Chris
2024-03-11 22:12:01 +01:00
parent 8cbd12ee61
commit 99b5710c59
8 changed files with 71 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Http/Middleware/ApiHandler.php
View File

@ -66,7 +66,7 @@ class ApiHandler
$resolve($this->apiGetSubscriptions($topic, $subscription));
return;
case preg_match('<^/.well-known/mercureact/status$>', $path):
case preg_match('<^/.well-known/mercure/status$>', $path):
$resolve([
'server' => 'Mercureact/1.0',
'topics' => $this->topicManager->getTopicCount(),
@ -75,10 +75,6 @@ class ApiHandler
'memoryUsage' => memory_get_usage(true)
]);
return;
case preg_match('<^/.well-known/mercureact/status$>', $path):
$resolve([ 'version' => '1.0' ]);
return;
}
$resolve($next($request));
@ -96,7 +92,7 @@ class ApiHandler
// TODO implement once we can enumerate topics and subscriptions
$subscriptions = $this->topicManager->getSubscriptions();
$lastEventId = "urn:uuid:5e94c686-2c0b-4f9b-958c-92ccc3bbb4eb";
$lastEventId = $this->topicManager->getLastEventId();
$data = [
"@context" => "https://mercure.rocks/",
"id" => "/.well-known/mercure/subscriptions",

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

@ -17,6 +17,7 @@ use React\Http\Message\Response;
use React\Promise\Promise;
use React\Promise\PromiseInterface;
use React\Stream\ThroughStream;
use Rize\UriTemplate\UriTemplate;
use Symfony\Component\Uid\Uuid;
class MercureHandler
@ -194,11 +195,15 @@ class MercureHandler
$matched = 0;
foreach ((array)$topic as $match) {
foreach ($claims as $claim) {
// TODO implement matching of URI Templates
if (($claim === "*") || ($claim === $match)) {
$matched++;
break;
}
// TODO make sure that UriTemplate parsing works
if ((new UriTemplate())->extract($claim, $match, true)) {
$matched++;
break;
}
}
}
return ($matched == count($topic));