实现重试回调 (#24)

Yurunsoft · Nov 15, 2022 · 0976581 · 0976581
1 parent fc11816
commit 0976581
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 12 deletions.
diff --git a/src/HttpRequest.php b/src/HttpRequest.php
@@ -58,6 +58,13 @@ class HttpRequest
      */
     public $retry = 0;
 
+    /**
+     * 重试回调.
+     *
+     * @var callable|null
+     */
+    public $retryCallback = null;
+
     /**
      * 是否使用代理，默认false.
      *
@@ -267,6 +274,7 @@ public function open($options = [])
     {
         $this->handler = YurunHttp::getHandler($options);
         $this->retry = 0;
+        $this->retryCallback = null;
         $this->headers = $this->options = [];
         $this->url = $this->content = '';
         $this->useProxy = false;
@@ -639,13 +647,15 @@ public function ua($userAgent)
     /**
      * 设置失败重试次数，状态码为5XX或者0才需要重试.
      *
-     * @param string $retry
+     * @param int           $retry
+     * @param callable|null $callback
      *
      * @return static
      */
-    public function retry($retry)
+    public function retry($retry, $callback = null)
     {
         $this->retry = $retry < 0 ? 0 : $retry;   //至少请求1次，即重试0次
+        $this->retryCallback = $callback;
 
         return $this;
     }
@@ -938,6 +948,8 @@ public function buildRequest($url = null, $requestBody = null, $method = null, $
                             ->withAttribute(Attributes::UPLOAD_SPEED, $this->uploadSpeed)
                             ->withAttribute(Attributes::FOLLOW_LOCATION, $this->followLocation)
                             ->withAttribute(Attributes::CONNECTION_POOL, $this->connectionPool)
+                            ->withAttribute(Attributes::RETRY, $this->retry)
+                            ->withAttribute(Attributes::RETRY_CALLBACK, $this->retryCallback)
                             ->withProtocolVersion($this->protocolVersion)
                             ;
         foreach ($this->proxy as $name => $value)

diff --git a/src/YurunHttp/Attributes.php b/src/YurunHttp/Attributes.php
@@ -24,6 +24,11 @@ abstract class Attributes
      */
     const RETRY = 'retry';
 
+    /**
+     * 重试回调.
+     */
+    const RETRY_CALLBACK = 'retry_callback';
+
     /**
      * 下载文件保存路径.
      */

diff --git a/src/YurunHttp/Handler/Curl.php b/src/YurunHttp/Handler/Curl.php
@@ -180,6 +180,8 @@ public function send(&$request)
             $isLocation = false;
             $statusCode = 0;
             $redirectCount = 0;
+            $retry = $request->getAttribute(Attributes::RETRY, 0);
+            $retryCallback = $request->getAttribute(Attributes::RETRY_CALLBACK);
             $beginTime = microtime(true);
             do
             {
@@ -201,19 +203,28 @@ public function send(&$request)
                     $bodyContent = false;
                 }
                 $this->buildCurlHandlerEx($request, $handler, $uri, $method, $bodyContent);
-                $retry = $request->getAttribute(Attributes::RETRY, 0);
                 $result = null;
                 for ($i = 0; $i <= $retry; ++$i)
                 {
                     $receiveHeaders = [];
                     $curlResult = curl_exec($handler);
                     $this->result = $this->getResponse($request, $handler, $curlResult, $receiveHeaders);
                     $result = &$this->result;
-                    $statusCode = $result->getStatusCode();
-                    // 状态码为5XX或者0才需要重试
-                    if (!(0 === $statusCode || (5 === (int) ($statusCode / 100))))
+                    if ($retryCallback)
                     {
-                        break;
+                        if ($retryCallback($request, $result, $i))
+                        {
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        $statusCode = $result->getStatusCode();
+                        // 状态码为5XX或者0才需要重试
+                        if (!(0 === $statusCode || (5 === (int) ($statusCode / 100))))
+                        {
+                            break;
+                        }
                     }
                 }
                 if ($request->getAttribute(Attributes::FOLLOW_LOCATION, true) && ($statusCode >= 300 && $statusCode < 400) && $result && '' !== ($location = $result->getHeaderLine('location')))

diff --git a/src/YurunHttp/Handler/Swoole.php b/src/YurunHttp/Handler/Swoole.php
@@ -407,13 +407,24 @@ public function recvDefer($request, $timeout = null)
         }
         $result = &$this->result;
         $statusCode = $result->getStatusCode();
-        // 状态码为5XX或者0才需要重试
-        if ((0 === $statusCode || (5 === (int) ($statusCode / 100))) && $retryCount < $request->getAttribute(Attributes::RETRY, 0))
+        if ($retryCount < $request->getAttribute(Attributes::RETRY, 0))
         {
-            $request = $request->withAttribute(Attributes::RETRY, ++$retryCount);
-            $deferRequest = $this->sendDefer($request);
+            if ($retryCallback = $request->getAttribute(Attributes::RETRY_CALLBACK))
+            {
+                $retry = !$retryCallback($request, $result, $retryCount);
+            }
+            else
+            {
+                // 状态码为5XX或者0才需要重试
+                $retry = (0 === $statusCode || (5 === (int) ($statusCode / 100)));
+            }
+            if ($retry)
+            {
+                $request = $request->withAttribute(Attributes::PRIVATE_RETRY_COUNT, ++$retryCount);
+                $deferRequest = $this->sendDefer($request);
 
-            return $this->recvDefer($deferRequest, $timeout);
+                return $this->recvDefer($deferRequest, $timeout);
+            }
         }
         if (!$isWebSocket && $statusCode >= 300 && $statusCode < 400 && $request->getAttribute(Attributes::FOLLOW_LOCATION, true) && '' !== ($location = $result->getHeaderLine('location')))
         {