To distinguish the APIConnectError request timeout and response timeout difference

Author: xiezefan

examples/PushExample.php

@@ -38,18 +38,21 @@
     echo 'Push Fail.' . $br;
     echo 'Http Code : ' . $e->httpCode . $br;
     echo 'code : ' . $e->code . $br;
-    echo 'message : ' . $e->message . $br;
+    echo 'Error Message : ' . $e->message . $br;
     echo 'Response JSON : ' . $e->json . $br;
     echo 'rateLimitLimit : ' . $e->rateLimitLimit . $br;
     echo 'rateLimitRemaining : ' . $e->rateLimitRemaining . $br;
     echo 'rateLimitReset : ' . $e->rateLimitReset . $br;
 } catch (APIConnectionException $e) {
-    echo 'Push Fail.' . $br;
-    echo 'message' . $e->getMessage() . $br;
+    echo 'Push Fail: ' . $br;
+    echo 'Error Message: ' . $e->getMessage() . $br;
+    //response timeout means your request has probably be received by JPUsh Server,please check that whether need to be pushed again.
+    echo 'IsResponseTimeout: ' . $e->isResponseTimeout . $br;
 }
 
 echo $br . '-------------' . $br;
 
+
 //full push
 try {
     $result = $client->push()
@@ -75,8 +78,10 @@
     echo 'rateLimitRemaining : ' . $e->rateLimitRemaining . $br;
     echo 'rateLimitReset : ' . $e->rateLimitReset . $br;
 } catch (APIConnectionException $e) {
-    echo 'Push Fail.' . $br;
-    echo 'message' . $e->getMessage() . $br;
+    echo 'Push Fail: ' . $br;
+    echo 'Error Message: ' . $e->getMessage() . $br;
+    //response timeout means your request has probably be received by JPUsh Server,please check that whether need to be pushed again.
+    echo 'IsResponseTimeout: ' . $e->isResponseTimeout . $br;
 }
 
 
@@ -108,6 +113,8 @@
     echo 'rateLimitRemaining : ' . $e->rateLimitRemaining . $br;
     echo 'rateLimitReset : ' . $e->rateLimitReset . $br;
 } catch (APIConnectionException $e) {
-    echo 'Push Fail.' . $br;
-    echo 'message' . $e->getMessage() . $br;
+    echo 'Push Fail: ' . $br;
+    echo 'Error Message: ' . $e->getMessage() . $br;
+    //response timeout means your request has probably be received by JPUsh Server,please check that whether need to be pushed again.
+    echo 'IsResponseTimeout: ' . $e->isResponseTimeout . $br;
 }

examples/ReportExample.php

@@ -1,4 +1,5 @@
 <?php
+
 require_once 'vendor/autoload.php';
 
 use JPush\Model as M;
@@ -22,7 +23,7 @@
 
 
 try {
-    $msg_ids = '1931816610,1466786990,1931499836';
+    $msg_ids = '1150720279,1492401191,1150722083';
     $result = $client->report($msg_ids);
     foreach($result->received_list as  $received) {
         echo '---------' . $br;
@@ -34,14 +35,16 @@
     echo 'Push Fail.' . $br;
     echo 'Http Code : ' . $e->httpCode . $br;
     echo 'code : ' . $e->code . $br;
-    echo 'message : ' . $e->message . $br;
+    echo 'Error Message : ' . $e->message . $br;
     echo 'Response JSON : ' . $e->json . $br;
     echo 'rateLimitLimit : ' . $e->rateLimitLimit . $br;
     echo 'rateLimitRemaining : ' . $e->rateLimitRemaining . $br;
     echo 'rateLimitReset : ' . $e->rateLimitReset . $br;
 } catch (APIConnectionException $e) {
-    echo 'Push Fail.' . $br;
-    echo 'message' . $e->getMessage() . $br;
+    echo 'Push Fail: ' . $br;
+    echo 'Error Message: ' . $e->getMessage() . $br;
+    //response timeout means your request has probably be received by JPUsh Server,please check that whether need to be pushed again.
+    echo 'IsResponseTimeout: ' . $e->isResponseTimeout . $br;
 }
 
 

src/JPush/Exception/APIConnectionException.php

@@ -10,7 +10,9 @@
 
 
 class APIConnectionException extends \Exception {
-    function __construct($message) {
+    public $isResponseTimeout;
+    function __construct($message, $isResponseTimeout = false) {
         parent::__construct($message);
+        $this->isResponseTimeout = $isResponseTimeout;
     }
 }

src/JPush/JPushClient.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: xiezefan
- * Date: 14-6-9
- * Time: 下午1:49
- */
 
 namespace JPush;
 
@@ -21,6 +15,7 @@ class JPushClient {
     const REPORT_URL = 'https://report.jpush.cn/v2/received';
     const USER_AGENT = 'JPush-API-PHP-Client';
     const CONNECT_TIMEOUT = 5;
+    const READ_TIMEOUT = 30;
     const DEFAULT_MAX_RETRY_TIMES = 3;
 
     public $appKey;
@@ -84,14 +79,18 @@ public function request($url, $data, $header, $method='POST') {
 
         $request->addHeaders($header)
             ->authenticateWith($this->appKey, $this->masterSecret)
-            ->timeout(self::CONNECT_TIMEOUT);
+            ->timeout(self::READ_TIMEOUT);
 
         $response = null;
         for ($retryTimes=0;;$retryTimes++) {
             try {
                 $response = $request->send();
                 break;
             } catch (ConnectionErrorException $e) {
+                if (strpos($e->getMessage(),'28')) {
+                    throw new APIConnectionException("Response timeout. Your request has probably be received by JPUsh Server,please check that whether need to be pushed again.", true);
+                }
+                //echo '<br/>';
                 if ($retryTimes >= $this->retryTimes) {
                     throw new APIConnectionException("Connect timeout. Please retry later.");
                 } else {