Merge pull request #154 from tomaszmrozinski/master

Add option to control timeout of the Guzzle Client

Author: berkayk

README.md

@@ -67,6 +67,11 @@ You need to fill in your OneSignal *App ID* and *REST API Key* inside your
 ONESIGNAL_APP_ID=xxxxxxxxxxxxxxxxxxxx
 ONESIGNAL_REST_API_KEY=xxxxxxxxxxxxxxxxxx
 ```
+You can control timeout of the Guzzle client used by OneSignalClient by adding following into your .env file
+```
+ONESIGNAL_GUZZLE_CLIENT_TIMEOUT=integer_value
+```
+This param is useful when you are planning to send push notification via [Laravel queues](https://divinglaravel.com/always-set-a-timeout-for-guzzle-requests-inside-a-queued-job) 
 
 ## Usage
 

config/onesignal.php

@@ -19,5 +19,15 @@
 	|
 	*/
     'rest_api_key' => env('ONESIGNAL_REST_API_KEY'),
-    'user_auth_key' => env('USER_AUTH_KEY')
+    'user_auth_key' => env('USER_AUTH_KEY'),
+
+    /*
+	|--------------------------------------------------------------------------
+	| Guzzle Timeout
+	|--------------------------------------------------------------------------
+	|
+    |
+	|
+	*/
+    'guzzle_client_timeout' => env('ONESIGNAL_GUZZLE_CLIENT_TIMEOUT', 0),
 );

src/OneSignalClient.php

@@ -69,14 +69,21 @@ public function callback(Callable $requestCallback)
         return $this;
     }
 
-    public function __construct($appId, $restApiKey, $userAuthKey)
+    /**
+     * @param $appId
+     * @param $restApiKey
+     * @param $userAuthKey
+     * @param int $guzzleClientTimeout
+     */
+    public function __construct($appId, $restApiKey, $userAuthKey, $guzzleClientTimeout = 0)
     {
         $this->appId = $appId;
         $this->restApiKey = $restApiKey;
         $this->userAuthKey = $userAuthKey;
 
         $this->client = new Client([
             'handler' => $this->createGuzzleHandler(),
+            'timeout' => $guzzleClientTimeout,
         ]);
         $this->headers = ['headers' => []];
         $this->additionalParams = [];

src/OneSignalServiceProvider.php

@@ -36,9 +36,7 @@ public function register()
                 $config = $app['config']['onesignal'] ?: $app['config']['onesignal::config'];
             }
 
-            $client = new OneSignalClient($config['app_id'], $config['rest_api_key'], $config['user_auth_key']);
-
-            return $client;
+            return new OneSignalClient($config['app_id'], $config['rest_api_key'], $config['user_auth_key'] , $config['guzzle_client_timeout']);
         });
 
         $this->app->alias('onesignal', 'Berkayk\OneSignal\OneSignalClient');