DFRN: Improvements to delivery. Logging and marking as not reachable

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index ea867a84d6a5c0c390de18cc5bf22db9a37d5b88..734fbde628f096427333003ef5f98574ddca18f0 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1146,13 +1146,20 @@ class DFRN
         * @param string $atom     Content that will be transmitted
         * @param bool   $dissolve (to be documented)
         *
-        * @return int Deliver status. -1 means an error.
+        * @return int Deliver status. Negative values mean an error.
         * @todo Add array type-hint for $owner, $contact
         */
        public static function deliver($owner, $contact, $atom, $dissolve = false)
        {
                $a = get_app();
 
+               // At first try the Diaspora transport layer
+               $ret = self::transmit($owner, $contact, $atom);
+               if ($ret >= 200) {
+                       logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
+                       return $ret;
+               }
+
                $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
                if ($contact['duplex'] && $contact['dfrn-id']) {
@@ -1196,13 +1203,13 @@ class DFRN
                $xml = $ret['body'];
 
                $curl_stat = $a->get_curl_code();
-               if (!$curl_stat) {
+               if (empty($curl_stat)) {
                        return -3; // timed out
                }
 
                logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
 
-               if (! $xml) {
+               if (empty($xml)) {
                        return 3;
                }
 
@@ -1215,7 +1222,7 @@ class DFRN
                $res = XML::parseString($xml);
 
                if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
-                       return (($res->status) ? $res->status : 3);
+                       return ($res->status ? $res->status : 3);
                }
 
                $postvars     = [];
@@ -1338,11 +1345,11 @@ class DFRN
                logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
 
                $curl_stat = $a->get_curl_code();
-               if ((!$curl_stat) || (!strlen($xml))) {
+               if (empty($curl_stat) || empty($xml)) {
                        return -9; // timed out
                }
 
-               if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
+               if (($curl_stat == 503) && stristr($a->get_curl_headers(), 'retry-after')) {
                        return -10;
                }
 
@@ -1354,7 +1361,7 @@ class DFRN
 
                $res = XML::parseString($xml);
 
-               if (!isset($res->status)) {
+               if (empty($res->status)) {
                        return -11;
                }
 
@@ -1370,40 +1377,76 @@ class DFRN
        }
 
        /**
-        * @brief Delivers items to the contacts via the Diaspora transport layer
+        * @brief Transmits atom content to the contacts via the Diaspora transport layer
         *
-        * @param array $owner    Owner record
-        * @param array $contact  Contact record of the receiver
-        * @param array $items    Items that will be transmitted
+        * @param array  $owner    Owner record
+        * @param array  $contact  Contact record of the receiver
+        * @param string $atom     Content that will be transmitted
         *
-        * @return int HTTP Deliver status
+        * @return int Deliver status. Negative values mean an error.
         */
-       public static function buildAndTransmit($owner, $contact, $items)
+       public static function transmit($owner, $contact, $atom, $public_batch = false)
        {
                $a = get_app();
 
-               // Currently disabled, at first we will not use the batch delivery
-               // $public_batch = !$items[0]['private'];
-               $public_batch = false;
+               if (empty($contact['addr'])) {
+                       logger('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
+                       if (Contact::updateFromProbe($contact['id'])) {
+                               $new_contact = dba::selectFirst('contact', ['addr'], ['id' => $contact['id']]);
+                               $contact['addr'] = $new_contact['addr'];
+                       }
 
-               $msg = DFRN::entries($items, $owner);
+                       if (empty($contact['addr'])) {
+                               logger('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
+                               return -21;
+                       }
+               }
 
                $fcontact = Diaspora::personByHandle($contact['addr']);
                if (empty($fcontact)) {
-                       logger("unable to find contact details");
-                       return;
+                       logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
+                       return -21;
                }
 
-               $envelope = Diaspora::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch);
+               $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch);
 
                $dest_url = ($public_batch ? $fcontact["batch"] : $contact["notify"]);
 
                $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json");
 
-               $ret = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]);
+               $xml = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]);
+
+               $curl_stat = $a->get_curl_code();
+               if (empty($curl_stat) || empty($xml)) {
+                       logger('Empty answer from ' . $contact['id'] . ' - ' . $dest_url);
+                       return -9; // timed out
+               }
+
+               if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
+                       return -10;
+               }
 
-               /// @ToDo: Add better treatment of return codes
-               return $a->get_curl_code();
+               if (strpos($xml, '<?xml') === false) {
+                       logger('No valid XML returned from ' . $contact['id'] . ' - ' . $dest_url);
+                       logger('Returned XML: ' . $xml, LOGGER_DATA);
+                       return 3;
+               }
+
+               $res = XML::parseString($xml);
+
+               if (empty($res->status)) {
+                       return -11;
+               }
+
+               if (!empty($res->message)) {
+                       logger('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
+               }
+
+               if ($res->status == 200) {
+                       Contact::unmarkForArchival($contact);
+               }
+
+               return intval($res->status);
        }
 
        /**