Display the runtime

[friendica.git] / src / Worker / APDelivery.php

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 1ec0ba47cee87c27bc94d5fa1a333b0cc09a3c74..e341787e21151bdc7740936f00daaeca4a81dc2e 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -25,7 +25,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Model\Contact;
 use Friendica\Model\GServer;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
@@ -48,11 +47,18 @@ class APDelivery
        {
                if (ActivityPub\Transmitter::archivedInbox($inbox)) {
                        Logger::info('Inbox is archived', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $item_id, 'uri-id' => $uri_id, 'uid' => $uid]);
-                       if (in_array($cmd, [Delivery::POST])) {
-                               if (empty($uri_id)) {
-                                       $item = Post::selectFirst(['uri-id'], ['id' => $item_id]);
-                                       $uri_id = $item['uri-id'] ?? 0;
-                               }
+                       if (empty($uri_id) && !empty($item_id)) {
+                               $item = Post::selectFirst(['uri-id'], ['id' => $item_id]);
+                               $uri_id = $item['uri-id'] ?? 0;
+                       }
+                       if (empty($uri_id)) {
+                               $posts   = Post\Delivery::selectForInbox($inbox);
+                               $uri_ids = array_column($posts, 'uri-id');
+                       } else {
+                               $uri_ids = [$uri_id];
+                       }
+
+                       foreach ($uri_ids as $uri_id) {
                                Post\Delivery::remove($uri_id, $inbox);
                                Post\DeliveryData::incrementQueueFailed($uri_id);
                        }
@@ -62,15 +68,16 @@ 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];
                }
 
-               if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
+               if (!$success && !Worker::defer() && !empty($uri_ids)) {
                        foreach ($uri_ids as $uri_id) {
                                Post\Delivery::remove($uri_id, $inbox);
                                Post\DeliveryData::incrementQueueFailed($uri_id);
@@ -78,15 +85,25 @@ class APDelivery
                }
        }
 
-       private static function deliver(string $inbox)
+       private static function deliver(string $inbox):array
        {
-               Post\Delivery::removeFailed($inbox);
-               
                $uri_ids = [];
                $posts   = Post\Delivery::selectForInbox($inbox);
+               $timeout = false;
 
                foreach ($posts as $post) {
-                       if (!self::deliverToInbox($post['command'], 0, $inbox, $post['uid'], [], $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'];
                        }
                }
@@ -95,30 +112,21 @@ 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]]);
-                       $item_id = $item['id'] ?? 0;
-                       if (empty($receivers) && !empty($item)) {
-                               $parent = Post::selectFirst(Item::DELIVER_FIELDLIST, ['id' => $item['parent']]);
-
-                               $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid);
-                               $receivers = $inboxes[$inbox] ?? [];
-
-                               // When we haven't fetched the receiver list, it can be a personal inbox
-                               if (empty($receivers)) {
-                                       $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid, true);
-                                       $receivers = $inboxes[$inbox] ?? [];
-                               }
-                       } elseif (empty($item_id)) {
+                       if (empty($item['id'])) {
                                Logger::debug('Item not found, removing delivery', ['uri-id' => $uri_id, 'uid' => $uid, 'cmd' => $cmd, 'inbox' => $inbox]);
                                Post\Delivery::remove($uri_id, $inbox);
                                return true;
+                       } else {
+                               $item_id = $item['id'];
                        }
                }
 
                $success = true;
+               $timeout = false;
 
                if ($cmd == Delivery::MAIL) {
                        $data = ActivityPub\Transmitter::createActivityFromMail($item_id);
@@ -138,7 +146,14 @@ class APDelivery
                } else {
                        $data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id);
                        if (!empty($data)) {
-                               $success = HTTPSignature::transmit($data, $inbox, $uid);
+                               $timestamp = microtime(true);
+                               $response = HTTPSignature::post($data, $inbox, $uid);
+                               $runtime  = microtime(true) - $timestamp;
+                               $success  = $response->isSuccess();
+                               $timeout  = $response->isTimeout();
+                               if (!$success) {
+                                       Logger::debug('Delivery failed', ['retcode' => $response->getReturnCode(), 'timeout' => $timeout, 'runtime' => round($runtime, 3), '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);
@@ -157,7 +172,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)