Use Guzzle (#76)

* composer require guzzle instead of buzz

* start transition from buzz to guzzle

* implement guzzle batch

* update readme for Guzzle

Author: Minishlink

README.md

@@ -210,31 +210,21 @@ $webPush->setAutomaticPadding(512); // enable automatic padding to 512 bytes (yo
 $webPush->setAutomaticPadding(true); // enable automatic padding to default maximum compatibility length
 ```
 
-### Changing the browser client
-By default, WebPush will use `MultiCurl`, allowing to send multiple notifications in parallel.
-You can change the client to any client extending `\Buzz\Client\AbstractClient`.
-Timeout is configurable in the constructor.
+### Customizing the HTTP client
+WebPush uses [Guzzle](https://github.com/guzzle/guzzle). It will use the most appropriate client it finds, 
+and most of the time it will be `MultiCurl`, which allows to send multiple notifications in parallel.
 
+You can customize the default request options and timeout when instantiating WebPush:
 ```php
 <?php
 
 use Minishlink\WebPush\WebPush;
 
-$client = new \Buzz\Client\Curl();
 $timeout = 20; // seconds
-$webPush = new WebPush(array(), array(), $timeout, $client);
-```
-
-You have access to the inner browser if you want to configure it further.
-```php
-<?php
-
-use Minishlink\WebPush\WebPush;
-
-$webPush = new WebPush();
-
-/** @var $browser \Buzz\Browser */
-$browser = $webPush->getBrowser();
+$clientOptions = array(
+    \GuzzleHttp\RequestOptions::ALLOW_REDIRECTS => false,
+); // see \GuzzleHttp\RequestOptions
+$webPush = new WebPush(array(), array(), $timeout, $clientOptions);
 ```
 
 ## Common questions

composer.json

@@ -14,12 +14,12 @@
   ],
   "require": {
     "php": ">=5.6",
-    "kriswallsmith/buzz": ">=0.6",
     "mdanter/ecc": "^0.4.0",
     "lib-openssl": "*",
     "spomky-labs/base64url": "^1.0",
     "spomky-labs/php-aes-gcm": "^1.0",
-    "spomky-labs/jose": "^6.0"
+    "spomky-labs/jose": "^6.0",
+    "guzzlehttp/guzzle": "^6.2"
   },
   "require-dev": {
     "phpunit/phpunit": "4.8.*"

src/WebPush.php

@@ -11,18 +11,17 @@
 
 namespace Minishlink\WebPush;
 
-use Buzz\Browser;
-use Buzz\Client\AbstractClient;
-use Buzz\Client\MultiCurl;
-use Buzz\Exception\RequestException;
-use Buzz\Message\Response;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Promise;
 
 class WebPush
 {
     const GCM_URL = 'https://android.googleapis.com/gcm/send';
 
-    /** @var Browser */
-    protected $browser;
+    /** @var Client */
+    protected $client;
 
     /** @var array */
     protected $auth;
@@ -45,9 +44,9 @@ class WebPush
      * @param array               $auth           Some servers needs authentication
      * @param array               $defaultOptions TTL, urgency, topic
      * @param int|null            $timeout        Timeout of POST request
-     * @param AbstractClient|null $client
+     * @param array               $clientOptions
      */
-    public function __construct(array $auth = array(), $defaultOptions = array(), $timeout = 30, AbstractClient $client = null)
+    public function __construct(array $auth = array(), $defaultOptions = array(), $timeout = 30, $clientOptions = array())
     {
         if (array_key_exists('VAPID', $auth)) {
             $auth['VAPID'] = VAPID::validate($auth['VAPID']);
@@ -57,9 +56,10 @@ public function __construct(array $auth = array(), $defaultOptions = array(), $t
 
         $this->setDefaultOptions($defaultOptions);
 
-        $client = isset($client) ? $client : new MultiCurl();
-        $client->setTimeout($timeout);
-        $this->browser = new Browser($client);
+        if (!array_key_exists('timeout', $clientOptions) && isset($timeout)) {
+            $clientOptions['timeout'] = $timeout;
+        }
+        $this->client = new Client($clientOptions);
 
         $this->nativePayloadEncryptionSupport = version_compare(phpversion(), '7.1', '>=');
     }
@@ -131,36 +131,36 @@ public function flush()
         }
 
         // for each endpoint server type
-        $responses = $this->prepareAndSend($this->notifications);
-
-        // if multi curl, flush
-        if ($this->browser->getClient() instanceof MultiCurl) {
-            /** @var MultiCurl $multiCurl */
-            $multiCurl = $this->browser->getClient();
-            $multiCurl->flush();
+        $requests = $this->prepare($this->notifications);
+        $promises = [];
+        foreach ($requests as $request) {
+            $promises[] = $this->client->sendAsync($request);
         }
+        $results = Promise\settle($promises)->wait();
 
-        /** @var Response|null $response */
         $return = array();
         $completeSuccess = true;
-        foreach ($responses as $i => $response) {
-            if (!isset($response)) {
-                $return[] = array(
-                    'success' => false,
-                    'endpoint' => $this->notifications[$i]->getEndpoint(),
-                );
+        foreach ($results as $result) {
+            if ($result['state'] === "rejected") {
+                /** @var RequestException $reason **/
+                $reason = $result['reason'];
 
-                $completeSuccess = false;
-            } elseif (!$response->isSuccessful()) {
-                $return[] = array(
+                $error = array(
                     'success' => false,
-                    'endpoint' => $this->notifications[$i]->getEndpoint(),
-                    'statusCode' => $response->getStatusCode(),
-                    'headers' => $response->getHeaders(),
-                    'content' => $response->getContent(),
-                    'expired' => in_array($response->getStatusCode(), array(400, 404, 410)),
+                    'endpoint' => "".$reason->getRequest()->getUri(),
+                    'message' => $reason->getMessage(),
                 );
 
+                $response = $reason->getResponse();
+                if ($response !== null) {
+                    $statusCode = $response->getStatusCode();
+                    $error['statusCode'] = $statusCode;
+                    $error['expired'] = in_array($statusCode, array(400, 404, 410));
+                    $error['content'] = $response->getBody();
+                    $error['headers'] = $response->getHeaders();
+                }
+
+                $return[] = $error;
                 $completeSuccess = false;
             } else {
                 $return[] = array(
@@ -175,9 +175,9 @@ public function flush()
         return $completeSuccess ? true : $return;
     }
 
-    private function prepareAndSend(array $notifications)
+    private function prepare(array $notifications)
     {
-        $responses = array();
+        $requests = array();
         /** @var Notification $notification */
         foreach ($notifications as $notification) {
             $endpoint = $notification->getEndpoint();
@@ -247,48 +247,10 @@ private function prepareAndSend(array $notifications)
                 }
             }
 
-            $responses[] = $this->sendRequest($endpoint, $headers, $content);
+            $requests[] = new Request('POST', $endpoint, $headers, $content);
         }
 
-        return $responses;
-    }
-
-    /**
-     * @param string $url
-     * @param array  $headers
-     * @param string $content
-     *
-     * @return \Buzz\Message\MessageInterface|null
-     */
-    private function sendRequest($url, array $headers, $content)
-    {
-        try {
-            $response = $this->browser->post($url, $headers, $content);
-        } catch (RequestException $e) {
-            $response = null;
-        }
-
-        return $response;
-    }
-
-    /**
-     * @return Browser
-     */
-    public function getBrowser()
-    {
-        return $this->browser;
-    }
-
-    /**
-     * @param Browser $browser
-     *
-     * @return WebPush
-     */
-    public function setBrowser($browser)
-    {
-        $this->browser = $browser;
-
-        return $this;
+        return $requests;
     }
 
     /**