mobi/nc_ext_dav_push
1
0
Fork 0
Code Pull requests Activity

switch to GuzzleHttp for web push transport, parallelize notification sending

Browse source
This commit is contained in:
Jonathan Treffler 2024-09-14 16:52:54 +02:00
parent 248b4277bc
commit e2805beb16
3 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Listener/CalendarListener.php
View file

@ -37,6 +37,7 @@ use OCA\DAV\Events\CardDeletedEvent;
use OCA\DAV\Events\CardUpdatedEvent;
use Psr\Log\LoggerInterface;
use GuzzleHttp\Promise;
use OCA\DavPush\Service\SubscriptionService;
use OCA\DavPush\Transport\TransportManager;
@ -59,13 +60,16 @@ class CalendarListener implements IEventListener {
$collectionName = $event->getCalendarData()['uri'];
$subscriptions = $this->subscriptionService->findAll($collectionName);
$notificationPromises = (function () use ($collectionName, $subscriptions): Generator {
foreach($subscriptions as $subscription) {
$transport = $this->transportManager->getTransport($subscription->getTransport());
try {
$transport->notify($subscription->getUserId(), $collectionName, $subscription->getId());
} catch (\Exception $e) {
$this->logger->error("transport " . $subscription->getTransport() . " failed to deliver notification to subscription " . $subscription->getId());
}
}
yield $transport->notify($subscription->getUserId(), $collectionName, $subscription->getId());
}
})();
$responses = Promise\Utils::settle($notificationPromises)->wait();
// TODO: iterate over responses and log errors
// $this->logger->error("transport " . $subscription->getTransport() . " failed to deliver notification to subscription " . $subscription->getId());
}
}

22
lib/PushTransports/WebPushTransport.php
View file

@ -30,6 +30,9 @@ use OCA\DavPush\Transport\Transport;
use OCA\DavPush\Service\WebPushSubscriptionService;
use OCA\DavPush\Errors\WebPushSubscriptionNotFound;
use OCP\Http\Client\IClientService;
use OCP\Http\Client\IPromise;
use Sabre\Xml\Service;
class WebPushTransport extends Transport {
@ -37,6 +40,7 @@ class WebPushTransport extends Transport {
public function __construct(
private WebPushSubscriptionService $webPushSubscriptionService,
private IClientService $httpClientService
) {}
private function parseOptions(array $options): array {
@ -79,7 +83,7 @@ class WebPushTransport extends Transport {
];
}
public function notify(string $userId, string $collectionName, int $subscriptionId) {
public function notify(string $userId, string $collectionName, int $subscriptionId): IPromise {
$xmlService = new Service();
$pushResource = $this->webPushSubscriptionService->findBySubscriptionId($subscriptionId)->getPushResource();
@ -88,15 +92,15 @@ class WebPushTransport extends Transport {
'{DAV:Push}topic' => $collectionName,
]);
$options = [
'http' => [
'method' => 'POST',
'content' => $content,
],
];
$httpClient = $this->httpClientService->newClient();
$context = stream_context_create($options);
$result = file_get_contents($pushResource, false, $context);
return $httpClient->postAsync($pushResource, [
"body" => $content,
"timeout" => 10,
"headers" => [
"Content-Type" => "application/xml",
],
]);
}
public function getSubscriptionIdFromOptions(string $userId, string $collectionName, $options): ?int {

4
lib/Transport/Transport.php
View file

@ -26,6 +26,8 @@ declare(strict_types=1);
namespace OCA\DavPush\Transport;
use OCP\Http\Client\IPromise;
abstract class Transport {
protected $id;
@ -69,5 +71,5 @@ abstract class Transport {
// Change mutable options of the subscription (if any exist)
abstract public function updateSubscription($subsciptionId, $options);
abstract public function notify(string $userId, string $collectionName, int $subscriptionId);
abstract public function notify(string $userId, string $collectionName, int $subscriptionId): IPromise;
}