From 9c1bc63f7897eda2d25ee92fce2326779b88f753 Mon Sep 17 00:00:00 2001
From: whwyy <as2252258@163.com>
Date: Wed, 26 Nov 2025 07:52:46 +0800
Subject: [PATCH] ea

---
 CurlClient.php | 373 +++++++++++++++++++++++++------------------------
 1 file changed, 188 insertions(+), 185 deletions(-)

diff --git a/CurlClient.php b/CurlClient.php
index f835f0b..2ae63e1 100644
--- a/CurlClient.php
+++ b/CurlClient.php
@@ -6,219 +6,222 @@ namespace Kiri;
 
 /**
  * Class CurlClient
+ *
  * @package Http\Handler\Client
  */
 class CurlClient extends ClientAbstracts
 {
 
 
-    /**
-     * @param string $method
-     * @param string $path
-     * @param array|string $params
-     * @return void
-     */
-    public function request(string $method, string $path, array|string $params = []): void
-    {
-        if (!str_starts_with($path, '/')) {
-            $path = '/' . $path;
-        }
-        if ($method == self::GET) {
-            $path = $this->joinGetParams($path, $params);
-        }
+	/**
+	 * @param string       $method
+	 * @param string       $path
+	 * @param array|string $params
+	 *
+	 * @return void
+	 */
+	public function request(string $method, string $path, array|string $params = []): void
+	{
+		if (!str_starts_with($path, '/')) {
+			$path = '/' . $path;
+		}
+		if ($method == self::GET) {
+			$path = $this->joinGetParams($path, $params);
+		}
 
-        $this->getCurlHandler($path, $method, $params);
+		$this->getCurlHandler($path, $method, $params);
 
-        $this->execute();
-    }
+		$this->execute();
+	}
 
 
-    /**
-     * @param string $path
-     * @param string $method
-     * @param $params
-     * @return void
-     */
-    private function getCurlHandler(string $path, string $method, $params): void
-    {
-        $host = $this->isSSL() ? 'https://' . $this->getHost() : 'http://' . $this->getHost();
-        if ($this->getPort() != 443 && $this->getPort() != 80) {
-            $host .= ':' . $this->getPort();
-        }
-        $this->do(curl_init($host . $path), $host . $path, $method);
-        if ($this->isSSL()) {
-            $this->curlHandlerSslSet();
-        }
-        $contents = $this->getData();
-        if (empty($params) && empty($contents)) {
-            return;
-        }
-        if (!empty($contents)) {
-            curl_setopt($this->client, CURLOPT_POSTFIELDS, $contents);
-        } else if ($method === self::UPLOAD) {
-            curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
-        } else if ($method === self::POST) {
-            if (is_array($params)) {
-                $params = http_build_query($params);
-            }
-            curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
-        }
-    }
+	/**
+	 * @param string $path
+	 * @param string $method
+	 * @param        $params
+	 *
+	 * @return void
+	 */
+	private function getCurlHandler(string $path, string $method, $params): void
+	{
+		$host = $this->isSSL() ? 'https://' . $this->getHost() : 'http://' . $this->getHost();
+		if ($this->getPort() != 443 && $this->getPort() != 80) {
+			$host .= ':' . $this->getPort();
+		}
+		$this->do(curl_init($host . $path), $host . $path, $method);
+		if ($this->isSSL()) {
+			$this->curlHandlerSslSet();
+		}
+		$contents = $this->getData();
+		if (empty($params) && empty($contents)) {
+			return;
+		}
+		if (!empty($contents)) {
+			curl_setopt($this->client, CURLOPT_POSTFIELDS, $contents);
+		} else if ($method === self::UPLOAD) {
+			curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
+		} else if ($method === self::POST) {
+			if (is_array($params)) {
+				$params = http_build_query($params);
+			}
+			curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
+		}
+	}
 
 
-    /**
-     * @return void
-     * @throws
-     */
-    private function curlHandlerSslSet(): void
-    {
-        if (!empty($this->getSslKeyFile()) && file_exists($this->getSslKeyFile())) {
-            curl_setopt($this->client, CURLOPT_SSLKEY, $this->getSslKeyFile());
-        }
-        if (!empty($this->getSslCertFile()) && file_exists($this->getSslCertFile())) {
-            curl_setopt($this->client, CURLOPT_SSLCERT, $this->getSslCertFile());
-        }
-        if (!empty($this->getCa()) && file_exists($this->getCa())) {
-            curl_setopt($this->client, CURLOPT_CAINFO, $this->getCa());
-        }
-    }
+	/**
+	 * @return void
+	 * @throws
+	 */
+	private function curlHandlerSslSet(): void
+	{
+		if (!empty($this->getSslKeyFile()) && file_exists($this->getSslKeyFile())) {
+			curl_setopt($this->client, CURLOPT_SSLKEY, $this->getSslKeyFile());
+		}
+		if (!empty($this->getSslCertFile()) && file_exists($this->getSslCertFile())) {
+			curl_setopt($this->client, CURLOPT_SSLCERT, $this->getSslCertFile());
+		}
+		if (!empty($this->getCa()) && file_exists($this->getCa())) {
+			curl_setopt($this->client, CURLOPT_CAINFO, $this->getCa());
+		}
+	}
 
 
-    /**
-     * @param mixed $resource
-     * @param string $path
-     * @param string $method
-     * @return void
-     */
-    private function do(mixed $resource, string $path, string $method): void
-    {
-        curl_setopt($resource, CURLOPT_URL, $path);
-        curl_setopt($resource, CURLOPT_TIMEOUT, $this->getTimeout());                     // 超时设置
-        curl_setopt($resource, CURLOPT_CONNECTTIMEOUT, $this->getConnectTimeout());       // 超时设置
-        curl_setopt($resource, CURLOPT_HEADER, TRUE);
-        curl_setopt($resource, CURLOPT_FAILONERROR, TRUE);
-        curl_setopt($resource, CURLOPT_HTTPHEADER, $this->parseHeaderMat());
-        if (defined('CURLOPT_SSL_FALSESTART')) {
-            curl_setopt($resource, CURLOPT_SSL_FALSESTART, TRUE);
-        }
-        curl_setopt($resource, CURLOPT_FORBID_REUSE, FALSE);
-        curl_setopt($resource, CURLOPT_FRESH_CONNECT, FALSE);
-        if (!empty($this->getAgent())) {
-            curl_setopt($resource, CURLOPT_USERAGENT, $this->getAgent());
-        }
-        curl_setopt($resource, CURLOPT_NOBODY, FALSE);
-        curl_setopt($resource, CURLOPT_RETURNTRANSFER, TRUE);//返回内容
-        curl_setopt($resource, CURLOPT_FOLLOWLOCATION, TRUE);// 跟踪重定向
-        curl_setopt($resource, CURLOPT_ENCODING, 'gzip,deflate');
-        if ($method === self::POST || $method == self::UPLOAD) {
-            curl_setopt($resource, CURLOPT_POST, 1);
-        }
-        [$proxy, $port] = [$this->getProxyHost(), $this->getProxyPort()];
-        if (!empty($proxy) && $port > 0) {
-            curl_setopt($resource, CURLOPT_PROXYPORT, $port);
-            curl_setopt($resource, CURLOPT_PROXY, $proxy);
-        }
-        curl_setopt($resource, CURLOPT_CUSTOMREQUEST, strtoupper($method));
-        $this->client = $resource;
-        if (!empty($this->caPath)) {
-            curl_setopt($this->client, CURLOPT_CAINFO, $this->caPath);
-        }
-    }
+	/**
+	 * @param mixed  $resource
+	 * @param string $path
+	 * @param string $method
+	 *
+	 * @return void
+	 */
+	private function do(mixed $resource, string $path, string $method): void
+	{
+		curl_setopt($resource, CURLOPT_URL, $path);
+		curl_setopt($resource, CURLOPT_TIMEOUT, $this->getTimeout());                     // 超时设置
+		curl_setopt($resource, CURLOPT_CONNECTTIMEOUT, $this->getConnectTimeout());       // 超时设置
+		curl_setopt($resource, CURLOPT_HEADER, TRUE);
+		curl_setopt($resource, CURLOPT_FAILONERROR, TRUE);
+		curl_setopt($resource, CURLOPT_HTTPHEADER, $this->parseHeaderMat());
+		if (defined('CURLOPT_SSL_FALSESTART')) {
+			curl_setopt($resource, CURLOPT_SSL_FALSESTART, TRUE);
+		}
+		curl_setopt($resource, CURLOPT_FORBID_REUSE, FALSE);
+		curl_setopt($resource, CURLOPT_FRESH_CONNECT, FALSE);
+		if (!empty($this->getAgent())) {
+			curl_setopt($resource, CURLOPT_USERAGENT, $this->getAgent());
+		}
+		curl_setopt($resource, CURLOPT_NOBODY, FALSE);
+		curl_setopt($resource, CURLOPT_RETURNTRANSFER, TRUE);//返回内容
+		curl_setopt($resource, CURLOPT_FOLLOWLOCATION, TRUE);// 跟踪重定向
+		curl_setopt($resource, CURLOPT_ENCODING, 'gzip,deflate');
+		if ($method === self::POST || $method == self::UPLOAD) {
+			curl_setopt($resource, CURLOPT_POST, 1);
+		}
+		[$proxy, $port] = [$this->getProxyHost(), $this->getProxyPort()];
+		if (!empty($proxy) && $port > 0) {
+			curl_setopt($resource, CURLOPT_PROXYPORT, $port);
+			curl_setopt($resource, CURLOPT_PROXY, $proxy);
+		}
+		curl_setopt($resource, CURLOPT_CUSTOMREQUEST, strtoupper($method));
+		$this->client = $resource;
+		if (!empty($this->caPath)) {
+			curl_setopt($this->client, CURLOPT_CAINFO, $this->caPath);
+		}
+	}
 
 
-    /**
-     * @var string
-     */
-    private string $caPath = '';
+	/**
+	 * @var string
+	 */
+	private string $caPath = '';
 
 
-    /**
-     * @param string $path
-     * @return $this
-     */
-    public function withCAInfo(string $path): static
-    {
-        $this->caPath = $path;
-        return $this;
-    }
+	/**
+	 * @param string $path
+	 *
+	 * @return $this
+	 */
+	public function withCAInfo(string $path): static
+	{
+		$this->caPath = $path;
+		return $this;
+	}
 
 
-    /**
-     * @throws
-     */
-    private function execute(): void
-    {
-        $output = curl_exec($this->client);
-        if ($output !== FALSE) {
-            $this->explode($output);
-        } else {
-            $this->setStatusCode(curl_errno($this->client));
-            $this->setBody(curl_error($this->client));
-        }
-    }
+	/**
+	 * @throws
+	 */
+	private function execute(): void
+	{
+		$output = curl_exec($this->client);
+		if ($output !== FALSE) {
+			$this->explode($this->client, $output);
+		} else {
+			$this->setStatusCode(curl_errno($this->client));
+			$this->setBody(curl_error($this->client));
+		}
+	}
 
 
-    /**
-     * @return void
-     * @throws
-     */
-    private function retry(): void
-    {
-        if (($this->num += 1) <= $this->retryNum) {
-            sleep($this->retryTimeout);
+	/**
+	 * @return void
+	 * @throws
+	 */
+	private function retry(): void
+	{
+		if (($this->num += 1) <= $this->retryNum) {
+			sleep($this->retryTimeout);
 
-            $this->execute();
-        } else {
-            $this->setStatusCode(curl_errno($this->client));
-            $this->setBody(curl_error($this->client));
-        }
-    }
+			$this->execute();
+		} else {
+			$this->setStatusCode(curl_errno($this->client));
+			$this->setBody(curl_error($this->client));
+		}
+	}
 
 
-    /**
-     *
-     */
-    public function close(): void
-    {
-        curl_close($this->client);
-    }
+	/**
+	 *
+	 */
+	public function close(): void
+	{
+		curl_close($this->client);
+	}
 
 
-    /**
-     * @param string $output
-     * @return void
-     * @throws
-     */
-    private function explode(string $output): void
-    {
-        [$header, $body] = explode("\r\n\r\n", $output, 2);
-        if ($header == 'HTTP/1.1 100 Continue') {
-            [$header, $body] = explode("\r\n\r\n", $body, 2);
-        }
+	/**
+	 * @param string $output
+	 *
+	 * @return void
+	 * @throws
+	 */
+	private function explode($ch, string $output): void
+	{
+		// 获取 HTTP 状态码
+		$statusCode = +curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
-        $header = explode("\r\n", $header);
-        $status = explode(' ', array_shift($header));
-
-        $statusCode = intval($status[1]);
-        if (in_array($statusCode, [502, 404])) {
-            $this->retry();
-        } else {
-            $this->setStatusCode($statusCode);
-            $this->setBody($body);
-            $this->setResponseHeader($header);
-        }
-    }
+		// 获取 header 的大小（不包括最后的 \r\n\r\n 分隔符）
+		$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+		$header     = substr($output, 0, $headerSize);
+		if (in_array($statusCode, [502, 404])) {
+			$this->retry();
+		} else {
+			$this->setStatusCode($statusCode);
+			$this->setBody(substr($output, $headerSize));
+			$this->setResponseHeader(explode("\r\n", $header));
+		}
+	}
 
 
-    /**
-     * @return array
-     */
-    private function parseHeaderMat(): array
-    {
-        $headers = [];
-        foreach ($this->getHeader() as $key => $val) {
-            $headers[$key] = $key . ': ' . $val;
-        }
-        return array_values($headers);
-    }
+	/**
+	 * @return array
+	 */
+	private function parseHeaderMat(): array
+	{
+		$headers = [];
+		foreach ($this->getHeader() as $key => $val) {
+			$headers[$key] = $key . ': ' . $val;
+		}
+		return array_values($headers);
+	}
 }