Revert "改名"

This reverts commit fdf58326

src/AsyncClient.php

@@ -84,17 +84,15 @@ class AsyncClient extends ClientAbstracts
 		if ($isHttps || $this->isSSL()) {
 			$this->client->enableSSL();
 		}
-        $this->client->set($this->settings());
+		$this->client->set(array_merge($this->settings(), ['open_http_protocol' => true]));
 		if (!empty($this->getAgent())) {
 			$this->withAddedHeader('User-Agent', $this->getAgent());
-        } else {
-            $this->withAddedHeader('User-Agent', ' Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Safari/537.36');
 		}
 
 		$path = $this->setParams($path, $data);
 
-        $this->withAddedHeader('Accept', ' text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9');
+		$this->withAddedHeader('Accept', ' text/html,application/xhtml+xml,application/json,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9');
-        $this->withAddedHeader('Accept-Encoding', 'gzip, deflate');
+//        $this->withAddedHeader('Accept-Encoding', 'gzip');
 		$this->withAddedHeader('Content-Length', $this->getData()->getSize());
 
 		$this->execute($path, $this->getData()->getContents());
@@ -115,20 +113,39 @@ class AsyncClient extends ClientAbstracts
 				$array[] = sprintf('%s: %s', $key, $value);
 			}
 		}
-        $array = implode("\r\n", $array) . "\r\n\r\n";
+		$this->client->send(implode("\r\n", $array) . "\r\n\r\n" . $content);
-        $this->client->send($array . $content);
+		$receive = $this->client->recv();
 
-        $revice = $this->client->recv();
+		[$header, $body] = explode("\r\n\r\n", $receive);
-
-        [$header, $body] = explode("\r\n\r\n", $revice);
 
 		$header = explode("\r\n", $header);
-
 		$status = array_shift($header);
 
-        $this->setBody($body);
 		$this->setStatusCode(intval(explode(' ', $status)[1]));
-        $this->setResponseHeader($header);
+		$this->parseResponseHeaders($header);
+		$this->setBody($body);
+	}
+
+
+	private function chunked()
+	{
+
+	}
+
+
+	/**
+	 * @param array $headers
+	 * @return void
+	 */
+	private function parseResponseHeaders(array $headers)
+	{
+		$array = [];
+		foreach ($headers as $header) {
+			[$key, $value] = explode(': ', $header);
+
+			$array[$key] = trim($value);
+		}
+		$this->setResponseHeader($array);
 	}
 
 

src/Client.php

@@ -6,13 +6,13 @@ use Kiri\Context;
 
 
 /**
- * @mixin CoroutineClient|Curl
+ * @mixin CoroutineClient|CurlClient
  */
 class Client
 {
 
 
-	private CoroutineClient|Curl|AsyncClient $abstracts;
+	private CoroutineClient|CurlClient|AsyncClient $abstracts;
 
 
 	/**
@@ -25,7 +25,7 @@ class Client
 		if (Context::inCoroutine()) {
 			$this->abstracts = new CoroutineClient($host, $port, $isSsl);
 		} else {
-			$this->abstracts = new AsyncClient($host, $port, $isSsl);
+			$this->abstracts = new CurlClient($host, $port, $isSsl);
 		}
 	}
 

src/ClientAbstracts.php

@@ -68,7 +68,7 @@ abstract class ClientAbstracts implements IClient
 
 
     /**
-     * @var resource|\Swoole\Coroutine\Http\Client|\Swoole\Client
+     * @var resource|\Swoole\Coroutine\Http\Client|\Swoole\Client|\CurlHandle
      */
     protected mixed $client;
 

src/CurlClient.php

@@ -12,10 +12,10 @@ use Psr\Http\Message\ResponseInterface;
 
 
 /**
- * Class Curl
+ * Class CurlClient
  * @package Http\Handler\Client
  */
-class Curl extends ClientAbstracts
+class CurlClient extends ClientAbstracts
 {
 
     /**
@@ -74,9 +74,6 @@ class Curl extends ClientAbstracts
      */
     private function curlHandlerSslSet(): void
     {
-        curl_setopt($this->client, CURLOPT_SSL_VERIFYPEER, $this->getVerifyPeer());
-        curl_setopt($this->client, CURLOPT_VERBOSE, TRUE);
-//        curl_setopt($this->client, CURLOPT_SSL_VERIFYHOST, $this->getVerifyPeer());
         if (!empty($this->getSslKeyFile()) && file_exists($this->getSslKeyFile())) {
             curl_setopt($this->client, CURLOPT_SSLKEY, $this->getSslKeyFile());
         }