X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FWorker%2FDelivery.php;h=fbc8fb8b25a21013c1447e33fc040a7e4d3ae9d4;hb=81de61c6a7f6c0b2a3f50b50a8fc21c261bdb70f;hp=904e9904efed4830dbadc9db151759549596cd7d;hpb=0c9b76a585b0ae9d742c4febe86133bcbf94cfbc;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 904e9904ef..fbc8fb8b25 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -26,13 +26,14 @@ class Delivery extends BaseObject const RELOCATION = 'relocate'; const DELETION = 'drop'; const POST = 'wall-new'; - const COMMENT = 'comment-new'; + const POKE = 'poke'; + const UPLINK = 'uplink'; const REMOVAL = 'removeme'; const PROFILEUPDATE = 'profileupdate'; public static function execute($cmd, $target_id, $contact_id) { - Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $contact_id, Logger::DEBUG); + Logger::info('Invoked', ['cmd' => $cmd, 'target' => $target_id, 'contact' => $contact_id]); $top_level = false; $followup = false; @@ -42,12 +43,14 @@ class Delivery extends BaseObject if ($cmd == self::MAIL) { $target_item = DBA::selectFirst('mail', [], ['id' => $target_id]); if (!DBA::isResult($target_item)) { + self::setFailedQueue($cmd, $target_id); return; } $uid = $target_item['uid']; } elseif ($cmd == self::SUGGESTION) { $target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]); if (!DBA::isResult($target_item)) { + self::setFailedQueue($cmd, $target_id); return; } $uid = $target_item['uid']; @@ -57,6 +60,7 @@ class Delivery extends BaseObject } else { $item = Model\Item::selectFirst(['parent'], ['id' => $target_id]); if (!DBA::isResult($item) || empty($item['parent'])) { + self::setFailedQueue($cmd, $target_id); return; } $parent_id = intval($item['parent']); @@ -78,11 +82,13 @@ class Delivery extends BaseObject if (empty($target_item)) { Logger::log('Item ' . $target_id . "wasn't found. Quitting here."); + self::setFailedQueue($cmd, $target_id); return; } if (empty($parent)) { Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here."); + self::setFailedQueue($cmd, $target_id); return; } @@ -92,6 +98,21 @@ class Delivery extends BaseObject $uid = $target_item['uid']; } else { Logger::log('Only public users for item ' . $target_id, Logger::DEBUG); + self::setFailedQueue($cmd, $target_id); + return; + } + + $condition = ['uri' => $target_item['thr-parent'], 'uid' => $target_item['uid']]; + $thr_parent = Model\Item::selectFirst(['network'], $condition); + if (!DBA::isResult($thr_parent)) { + // Shouldn't happen. But when this does, we just take the parent as thread parent. + // That's totally okay for what we use this variable here. + $thr_parent = $parent; + } + + if (!empty($contact_id) && Model\Contact::isArchived($contact_id)) { + Logger::info('Contact is archived', ['id' => $contact_id, 'cmd' => $cmd, 'item' => $target_item['id']]); + self::setFailedQueue($cmd, $target_id); return; } @@ -151,6 +172,7 @@ class Delivery extends BaseObject $owner = Model\User::getOwnerDataById($uid); if (!DBA::isResult($owner)) { + self::setFailedQueue($cmd, $target_id); return; } @@ -159,50 +181,31 @@ class Delivery extends BaseObject ['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false] ); if (!DBA::isResult($contact)) { + self::setFailedQueue($cmd, $target_id); return; } if (Network::isUrlBlocked($contact['url'])) { + self::setFailedQueue($cmd, $target_id); return; } - // Transmit via Diaspora if the thread had started as Diaspora post + // Transmit via Diaspora if the thread had started as Diaspora post. + // Also transmit via Diaspora if this is a direct answer to a Diaspora comment. // This is done since the uri wouldn't match (Diaspora doesn't transmit it) - if (isset($parent) && ($parent['network'] == Protocol::DIASPORA) && ($contact['network'] == Protocol::DFRN)) { + if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network']])) { $contact['network'] = Protocol::DIASPORA; } - Logger::log("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']); + Logger::notice('Delivering', ['cmd' => $cmd, 'target' => $target_id, 'followup' => $followup, 'network' => $contact['network']]); switch ($contact['network']) { - case Protocol::DFRN: self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); - - if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) { - Model\ItemDeliveryData::incrementQueueDone($target_id); - } break; case Protocol::DIASPORA: self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); - - if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) { - Model\ItemDeliveryData::incrementQueueDone($target_id); - } - break; - - case Protocol::OSTATUS: - // Do not send to otatus if we are not configured to send to public networks - if ($owner['prvnets']) { - break; - } - if (Config::get('system','ostatus_disabled') || Config::get('system','dfrn_only')) { - break; - } - - // There is currently no code here to distribute anything to OStatus. - // This is done in "notifier.php" (See "url_recipients" and "push_notify") break; case Protocol::MAIL: @@ -216,6 +219,21 @@ class Delivery extends BaseObject return; } + /** + * Increased the "failed" counter in the item delivery data + * + * @param string $cmd Command + * @param integer $id Item id + */ + private static function setFailedQueue(string $cmd, int $id) + { + if (!in_array($cmd, [Delivery::POST, Delivery::POKE])) { + return; + } + + Model\ItemDeliveryData::incrementQueueFailed($id); + } + /** * @brief Deliver content via DFRN * @@ -232,7 +250,7 @@ class Delivery extends BaseObject */ private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { - Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr'])); + Logger::info('Deliver ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' via DFRN to ' . (($contact['addr'] ?? '') ?: $contact['url'])); if ($cmd == self::MAIL) { $item = $target_item; @@ -260,7 +278,7 @@ class Delivery extends BaseObject $atom = DFRN::entries($msgitems, $owner); } - Logger::log('Notifier entry: ' . $contact["url"] . ' ' . defaults($target_item, 'guid', $target_item['id']) . ' entry: ' . $atom, Logger::DATA); + Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom); $basepath = implode('/', array_slice(explode('/', $contact['url']), 0, 3)); @@ -291,9 +309,16 @@ class Delivery extends BaseObject } DFRN::import($atom, $target_importer); + + if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { + Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::DFRN); + } + return; } + $protocol = Model\ItemDeliveryData::DFRN; + // We don't have a relationship with contacts on a public post. // Se we transmit with the new method and via Diaspora as a fallback if (!empty($items) && (($items[0]['uid'] == 0) || ($contact['uid'] == 0))) { @@ -304,7 +329,15 @@ class Delivery extends BaseObject // We never spool failed relay deliveries if ($public_dfrn) { - Logger::log('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status); + Logger::info('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status); + + if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { + if (($deliver_status >= 200) && ($deliver_status <= 299)) { + Model\ItemDeliveryData::incrementQueueDone($target_item['id'], $protocol); + } else { + Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + } + } return; } @@ -314,28 +347,35 @@ class Delivery extends BaseObject return; } } elseif ($cmd != self::RELOCATION) { - $deliver_status = DFRN::deliver($owner, $contact, $atom); + // DFRN payload over Diaspora transport layer + $deliver_status = DFRN::transmit($owner, $contact, $atom); + if ($deliver_status < 200) { + // Legacy DFRN + $deliver_status = DFRN::deliver($owner, $contact, $atom); + $protocol = Model\ItemDeliveryData::LEGACY_DFRN; + } } else { - $deliver_status = DFRN::deliver($owner, $contact, $atom, false, true); + $deliver_status = DFRN::deliver($owner, $contact, $atom); + $protocol = Model\ItemDeliveryData::LEGACY_DFRN; } - Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => defaults($target_item, 'guid', $target_item['id']), 'return' => $deliver_status]); - - if ($deliver_status < 0) { - Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]); - Worker::defer(); - } + Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id'], 'return' => $deliver_status]); if (($deliver_status >= 200) && ($deliver_status <= 299)) { // We successfully delivered a message, the contact is alive Model\Contact::unmarkForArchival($contact); + + if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { + Model\ItemDeliveryData::incrementQueueDone($target_item['id'], $protocol); + } } else { // The message could not be delivered. We mark the contact as "dead" Model\Contact::markForArchival($contact); - // Transmit via Diaspora when all other methods (legacy DFRN and new one) are failing. - // This is a fallback for systems that don't know the new methods. - self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); + Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]); + if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) { + Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + } } } @@ -364,11 +404,12 @@ class Delivery extends BaseObject $loc = $contact['addr']; } - Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via Diaspora to ' . $loc); + Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]); if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) { return; } + if ($cmd == self::MAIL) { Diaspora::sendMail($target_item, $owner, $contact); return; @@ -377,35 +418,60 @@ class Delivery extends BaseObject if ($cmd == self::SUGGESTION) { return; } + if (!$contact['pubkey'] && !$public_message) { return; } + if ($cmd == self::RELOCATION) { - Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); - return; + $deliver_status = Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); } elseif ($target_item['deleted'] && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { // top-level retraction Logger::log('diaspora retract: ' . $loc); - Diaspora::sendRetraction($target_item, $owner, $contact, $public_message); - return; + $deliver_status = Diaspora::sendRetraction($target_item, $owner, $contact, $public_message); } elseif ($followup) { // send comments and likes to owner to relay Logger::log('diaspora followup: ' . $loc); - Diaspora::sendFollowup($target_item, $owner, $contact, $public_message); - return; + $deliver_status = Diaspora::sendFollowup($target_item, $owner, $contact, $public_message); } elseif ($target_item['uri'] !== $target_item['parent-uri']) { // we are the relay - send comments, likes and relayable_retractions to our conversants Logger::log('diaspora relay: ' . $loc); - Diaspora::sendRelay($target_item, $owner, $contact, $public_message); - return; + $deliver_status = Diaspora::sendRelay($target_item, $owner, $contact, $public_message); } elseif ($top_level && !$walltowall) { // currently no workable solution for sending walltowall Logger::log('diaspora status: ' . $loc); - Diaspora::sendStatus($target_item, $owner, $contact, $public_message); + $deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message); + } else { + Logger::log('Unknown mode ' . $cmd . ' for ' . $loc); return; } - Logger::log('Unknown mode ' . $cmd . ' for ' . $loc); + if (($deliver_status >= 200) && ($deliver_status <= 299)) { + // We successfully delivered a message, the contact is alive + Model\Contact::unmarkForArchival($contact); + + if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { + Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::DIASPORA); + } + } else { + // The message could not be delivered. We mark the contact as "dead" + Model\Contact::markForArchival($contact); + + // When it is delivered to the public endpoint, we do mark the relay contact for archival as well + if ($public_message) { + Diaspora::markRelayForArchival($contact); + } + + if (empty($contact['contact-type']) || ($contact['contact-type'] != Model\Contact::TYPE_RELAY)) { + Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]); + // defer message for redelivery + if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) { + Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + } + } elseif (in_array($cmd, [Delivery::POST, Delivery::POKE])) { + Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + } + } } /** @@ -430,7 +496,7 @@ class Delivery extends BaseObject return; } - if (!in_array($cmd, [self::POST, self::COMMENT])) { + if (!in_array($cmd, [self::POST, self::POKE])) { return; }