Resubscribe to relay servers

This commit is contained in:
Michael 2022-05-24 07:02:42 +00:00
parent a1871756ee
commit b1a2de5cb5
3 changed files with 72 additions and 3 deletions

View File

@ -22,6 +22,7 @@
namespace Friendica\Protocol\ActivityPub; namespace Friendica\Protocol\ActivityPub;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\GServer; use Friendica\Model\GServer;
@ -32,6 +33,12 @@ use Friendica\Worker\Delivery as WorkerDelivery;
class Delivery class Delivery
{ {
/**
* Deliver posts to the given inbox
*
* @param string $inbox
* @return array with the elements "success" and "uri_ids" of the failed posts
*/
public static function deliver(string $inbox): array public static function deliver(string $inbox): array
{ {
$uri_ids = []; $uri_ids = [];
@ -50,7 +57,7 @@ class Delivery
} }
} }
if ($serverfail || !$result['success']) { if ($serverfail || (!$result['success'] && !$result['drop'])) {
$uri_ids[] = $post['uri-id']; $uri_ids[] = $post['uri-id'];
} }
} }
@ -59,6 +66,17 @@ class Delivery
return ['success' => empty($uri_ids), 'uri_ids' => $uri_ids]; return ['success' => empty($uri_ids), 'uri_ids' => $uri_ids];
} }
/**
* Deliver the given post to the given inbox
*
* @param string $cmd
* @param integer $item_id
* @param string $inbox
* @param integer $uid
* @param array $receivers
* @param integer $uri_id
* @return array
*/
public static function deliverToInbox(string $cmd, int $item_id, string $inbox, int $uid, array $receivers, int $uri_id): array public static function deliverToInbox(string $cmd, int $item_id, string $inbox, int $uid, array $receivers, int $uri_id): array
{ {
if (empty($item_id) && !empty($uri_id) && !empty($uid)) { if (empty($item_id) && !empty($uri_id) && !empty($uid)) {
@ -74,6 +92,7 @@ class Delivery
$success = true; $success = true;
$serverfail = false; $serverfail = false;
$drop = false;
if ($cmd == WorkerDelivery::MAIL) { if ($cmd == WorkerDelivery::MAIL) {
$data = ActivityPub\Transmitter::createActivityFromMail($item_id); $data = ActivityPub\Transmitter::createActivityFromMail($item_id);
@ -99,20 +118,37 @@ class Delivery
$success = $response->isSuccess(); $success = $response->isSuccess();
$serverfail = $response->isTimeout(); $serverfail = $response->isTimeout();
if (!$success) { if (!$success) {
// 5xx errors are problems on the server. We don't need to continue delivery then.
if (!$serverfail && ($response->getReturnCode() >= 500) && ($response->getReturnCode() <= 599)) { if (!$serverfail && ($response->getReturnCode() >= 500) && ($response->getReturnCode() <= 599)) {
$serverfail = true; $serverfail = true;
} }
// A 404 means that the inbox doesn't exist. We can stop the delivery here.
if (!$serverfail && ($response->getReturnCode() == 404)) {
$serverfail = true;
}
$xrd_timeout = DI::config()->get('system', 'xrd_timeout'); $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
if (!$serverfail && $xrd_timeout && ($runtime > $xrd_timeout)) { if (!$serverfail && $xrd_timeout && ($runtime > $xrd_timeout)) {
$serverfail = true; $serverfail = true;
} }
$curl_timeout = DI::config()->get('system', 'curl_timeout'); $curl_timeout = DI::config()->get('system', 'curl_timeout');
if (!$serverfail && $curl_timeout && ($runtime > $curl_timeout)) { if (!$serverfail && $curl_timeout && ($runtime > $curl_timeout)) {
$serverfail = true; $serverfail = true;
} }
Logger::info('Delivery failed', ['retcode' => $response->getReturnCode(), 'serverfailure' => $serverfail, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]); // Resubscribe to relay server upon client error
if (!$serverfail && ($response->getReturnCode() >= 400) && ($response->getReturnCode() <= 499)) {
$actor = self:: fetchActorForRelayInbox($inbox);
if (!empty($actor)) {
$drop = !ActivityPub\Transmitter::sendRelayFollow($actor);
Logger::notice('Resubscribed to relay', ['url' => $actor, 'success' => !$drop]);
}
}
Logger::info('Delivery failed', ['retcode' => $response->getReturnCode(), 'serverfailure' => $serverfail, 'drop' => $drop, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]);
} }
if ($uri_id) { if ($uri_id) {
if ($success) { if ($success) {
@ -132,9 +168,27 @@ class Delivery
Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB); Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
} }
return ['success' => $success, 'serverfailure' => $serverfail]; return ['success' => $success, 'serverfailure' => $serverfail, 'drop' => $drop];
} }
/**
* Fetch the actor of the given inbox of an relay server
*
* @param string $inbox
* @return string
*/
private static function fetchActorForRelayInbox(string $inbox): string
{
return DBA::selectFirst('apcontact', ['url'], ['sharedinbox' => $inbox, 'type' => 'Application']) ?: '';
}
/**
* mark or unmark the given receivers for archival upon succoess
*
* @param array $receivers
* @param boolean $success
* @return void
*/
private static function setSuccess(array $receivers, bool $success) private static function setSuccess(array $receivers, bool $success)
{ {
$gsid = null; $gsid = null;

View File

@ -341,4 +341,15 @@ class Relay
// It should never happen that we arrive here // It should never happen that we arrive here
return []; return [];
} }
/**
* Resubscribe to all relay servers
*/
public static function reSubscribe()
{
foreach (self::getList() as $server) {
$success = ActivityPub\Transmitter::sendRelayFollow($server['url']);
Logger::debug('Resubscribed', ['profile' => $server['url'], 'success' => $success]);
}
}
} }

View File

@ -27,6 +27,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Protocol\Relay;
class Cron class Cron
{ {
@ -125,6 +126,9 @@ class Cron
} }
DI::config()->set('system', 'last_cron_daily', time()); DI::config()->set('system', 'last_cron_daily', time());
// Resubscribe to relay servers
Relay::reSubscribe();
} }
Logger::notice('end'); Logger::notice('end');