Handle timeout

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index db1d7a2799a9b46cc714db4162c572be678d34b4..b76c12f591e616eb603d0f2c6522254b029f3046 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -29,6 +29,7 @@ use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\ItemURI;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 
@@ -264,21 +265,21 @@ class HTTPSignature
         */
 
        /**
-        * Transmit given data to a target for a user
+        * Post given data to a target for a user, returns the result class
         *
         * @param array   $data   Data that is about to be send
         * @param string  $target The URL of the inbox
         * @param integer $uid    User id of the sender
         *
-        * @return boolean Was the transmission successful?
+        * @return ICanHandleHttpResponses
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function transmit($data, $target, $uid)
+       public static function post(array $data, string $target, int $uid): ICanHandleHttpResponses
        {
                $owner = User::getOwnerDataById($uid);
 
                if (!$owner) {
-                       return;
+                       return null;
                }
 
                $content = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
@@ -310,11 +311,27 @@ class HTTPSignature
 
                Logger::info('Transmit to ' . $target . ' returned ' . $return_code);
 
-               $success = ($return_code >= 200) && ($return_code <= 299);
+               self::setInboxStatus($target, ($return_code >= 200) && ($return_code <= 299));
+
+               return $postResult;
+       }
 
-               self::setInboxStatus($target, $success);
+       /**
+        * Transmit given data to a target for a user
+        *
+        * @param array   $data   Data that is about to be send
+        * @param string  $target The URL of the inbox
+        * @param integer $uid    User id of the sender
+        *
+        * @return boolean Was the transmission successful?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public static function transmit(array $data, string $target, int $uid): bool
+       {
+               $postResult = self::post($data, $target, $uid);
+               $return_code = $postResult->getReturnCode();
 
-               return $success;
+               return ($return_code >= 200) && ($return_code <= 299);
        }
 
        /**

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index df9df8128a4fefb736fc3c0f8d1852c430d291b9..e06fca12dc3c1ca7e14d4db8a8fd0c1153503e40 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -68,11 +68,12 @@ class APDelivery
                Logger::info('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
 
                if (empty($uri_id)) {
-                       $result = self::deliver($inbox);
+                       $result  = self::deliver($inbox);
                        $success = $result['success'];
                        $uri_ids = $result['uri_ids'];
                } else {
-                       $success = self::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id);
+                       $result  = self::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id);
+                       $success = $result['success'];
                        $uri_ids = [$uri_id];
                }
 
@@ -84,13 +85,25 @@ class APDelivery
                }
        }
 
-       private static function deliver(string $inbox)
+       private static function deliver(string $inbox):array
        {
                $uri_ids = [];
                $posts   = Post\Delivery::selectForInbox($inbox);
+               $timeout = false;
 
                foreach ($posts as $post) {
-                       if (!self::deliverToInbox($post['command'], 0, $inbox, $post['uid'], $post['receivers'], $post['uri-id'])) {
+                       if (!$timeout) {
+                               $result = self::deliverToInbox($post['command'], 0, $inbox, $post['uid'], $post['receivers'], $post['uri-id']);
+
+                               if ($result['timeout']) {
+                                       // In a timeout situation we assume that every delivery to that inbox will time out.
+                                       // So we set the flag and try all deliveries at a later time.
+                                       Logger::debug('Inbox delivery has a time out', ['inbox' => $inbox]);
+                                       $timeout = true;
+                               }
+                       }
+
+                       if ($timeout || !$result['success']) {
                                $uri_ids[] = $post['uri-id'];
                        }
                }
@@ -99,7 +112,7 @@ class APDelivery
                return ['success' => empty($uri_ids), 'uri_ids' => $uri_ids];
        }
 
-       private static function deliverToInbox(string $cmd, int $item_id, string $inbox, int $uid, array $receivers, int $uri_id)
+       private 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)) {
                        $item = Post::selectFirst(['id', 'parent', 'origin'], ['uri-id' => $uri_id, 'uid' => [$uid, 0]], ['order' => ['uid' => true]]);
@@ -113,6 +126,7 @@ class APDelivery
                }
 
                $success = true;
+               $timeout = false;
 
                if ($cmd == Delivery::MAIL) {
                        $data = ActivityPub\Transmitter::createActivityFromMail($item_id);
@@ -132,7 +146,12 @@ class APDelivery
                } else {
                        $data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id);
                        if (!empty($data)) {
-                               $success = HTTPSignature::transmit($data, $inbox, $uid);
+                               $response = HTTPSignature::post($data, $inbox, $uid);
+                               $success  = $response->isSuccess();
+                               $timeout  = $response->isTimeout();
+                               if (!$success) {
+                                       Logger::debug('Delivery failed', ['retcode' => $response->getReturnCode(), 'timeout' => $timeout, 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]);
+                               }
                                if ($uri_id) {
                                        if ($success) {
                                                Post\Delivery::remove($uri_id, $inbox);
@@ -151,7 +170,7 @@ class APDelivery
                        Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
                }
 
-               return $success;
+               return ['success' => $success, 'timeout' => $timeout];
        }
 
        private static function setSuccess(array $receivers, bool $success)