Revert "改名"

This reverts commit fdf58326

composer.json

@@ -12,6 +12,7 @@
     "php": ">=8.0",
     "ext-json": "*",
     "ext-redis": "*",
+    "ext-swoole": "*",
     "psr/http-client": "^1.0",
     "psr/http-message": "^1.0"
   },

src/AsyncClient.php

@@ -0,0 +1,178 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/5/24 0024
+ * Time: 11:34
+ */
+declare(strict_types=1);
+
+namespace Http\Client;
+
+use Exception;
+use Http\Message\Stream;
+use Kiri\Abstracts\Logger;
+use Kiri\Kiri;
+use Swoole\Client as SwowClient;
+
+/**
+ * Class Client
+ * @package Kiri\Kiri\Http
+ */
+class AsyncClient extends ClientAbstracts
+{
+
+
+	use TSwooleClient;
+
+	/**
+	 * @param string $method
+	 * @param $path
+	 * @param array $params
+	 * @return void
+	 * @throws Exception
+	 */
+	public function request(string $method, $path, array $params = []): void
+	{
+		$this->withMethod($method)
+			->coroutine(
+				$this->matchHost($path),
+				$this->paramEncode($params)
+			);
+	}
+
+
+	/**
+	 * @param $path
+	 * @return $this
+	 */
+	public function withCAInfo($path): static
+	{
+		return $this;
+	}
+
+	/**
+	 * @param $url
+	 * @param array|string $data
+	 * @throws Exception 使用swoole协程方式请求
+	 */
+	private function coroutine($url, array|string $data = []): void
+	{
+		try {
+			$this->generate_client($data, ...$url);
+		} catch (\Throwable $exception) {
+			Kiri::getDi()->get(Logger::class)->error('rpc', [$exception]);
+			$this->setStatusCode(-1);
+			$this->setBody(jTraceEx($exception));
+		}
+	}
+
+
+	/**
+	 * @param $data
+	 * @param $host
+	 * @param $isHttps
+	 * @param $path
+	 * @throws Exception
+	 */
+	private function generate_client($data, $host, $isHttps, $path): void
+	{
+		$this->client = new SwowClient(SWOOLE_TCP, FALSE);
+		if (!$this->client->connect($host, $this->getPort())) {
+			throw new Exception('链接失败');
+		}
+		if ($isHttps || $this->isSSL()) {
+			$this->client->enableSSL();
+		}
+		$this->client->set(array_merge($this->settings(), ['open_http_protocol' => true]));
+		if (!empty($this->getAgent())) {
+			$this->withAddedHeader('User-Agent', $this->getAgent());
+		}
+
+		$path = $this->setParams($path, $data);
+
+		$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');
+		$this->withAddedHeader('Content-Length', $this->getData()->getSize());
+
+		$this->execute($path, $this->getData()->getContents());
+	}
+
+
+	/**
+	 * @param string $path
+	 * @param string $content
+	 * @return void
+	 */
+	private function execute(string $path, string $content)
+	{
+		$array = [];
+		$array[] = strtoupper($this->getMethod()) . ' ' . $path . ' HTTP/1.1';
+		if (!empty($this->getHeader())) {
+			foreach ($this->getHeader() as $key => $value) {
+				$array[] = sprintf('%s: %s', $key, $value);
+			}
+		}
+		$this->client->send(implode("\r\n", $array) . "\r\n\r\n" . $content);
+		$receive = $this->client->recv();
+
+		[$header, $body] = explode("\r\n\r\n", $receive);
+
+		$header = explode("\r\n", $header);
+		$status = array_shift($header);
+
+		$this->setStatusCode(intval(explode(' ', $status)[1]));
+		$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);
+	}
+
+
+	/**
+	 * @param $path
+	 * @param $data
+	 * @return string
+	 */
+	private function setParams($path, $data): string
+	{
+		if ($this->isGet()) {
+			if (!empty($data)) $path .= '?' . $data;
+		} else {
+			$data = $this->mergeParams($data);
+			if (!empty($data)) {
+				$this->withBody(new Stream($data));
+			}
+		}
+		return $path;
+	}
+
+
+	/**
+	 *
+	 */
+	public function close(): void
+	{
+		$this->client->close();
+	}
+}

src/Client.php

@@ -6,13 +6,13 @@ use Kiri\Context;
 
 
 /**
- * @mixin CoroutineClient|Curl
+ * @mixin CoroutineClient|CurlClient
  */
 class Client
 {
 
 
-	private CoroutineClient|Curl $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 Curl($host, $port, $isSsl);
+			$this->abstracts = new CurlClient($host, $port, $isSsl);
 		}
 	}
 

src/CoroutineClient.php

@@ -10,8 +10,6 @@ declare(strict_types=1);
 namespace Http\Client;
 
 use Exception;
-use Http\Message\Response;
-use Http\Message\Stream;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Logger;
 use Kiri\Kiri;
@@ -24,6 +22,8 @@ use Swoole\Coroutine\Http\Client as SwowClient;
 class CoroutineClient extends ClientAbstracts
 {
 
+    use TSwooleClient;
+
 	/**
 	 * @param string $method
 	 * @param $path
@@ -41,6 +41,16 @@ class CoroutineClient extends ClientAbstracts
 	}
 
 
+
+    /**
+     * @param $path
+     * @return $this
+     */
+    public function withCAInfo($path): static
+    {
+        return $this;
+    }
+
 	/**
 	 * @param $url
 	 * @param array|string $data
@@ -53,15 +63,13 @@ class CoroutineClient extends ClientAbstracts
 			if ($this->client->statusCode < 0) {
 				throw new Exception($this->client->errMsg);
 			}
-			$body = (new Response())->withStatus($this->client->getStatusCode())
-				->withHeaders($this->client->getHeaders())
-				->withBody(new Stream($this->client->getBody()));
+			$this->setStatusCode($this->client->getStatusCode());
+			$this->setBody($this->client->getBody());
+			$this->setResponseHeader($this->client->headers);
 		} catch (\Throwable $exception) {
 			Kiri::getDi()->get(Logger::class)->error('rpc', [$exception]);
-			$body = (new Response())->withStatus(-1)->withHeaders([])
-				->withBody(new Stream(jTraceEx($exception)));
-		} finally {
-			$this->setBody($body);
+			$this->setStatusCode(-1);
+			$this->setBody(jTraceEx($exception));
 		}
 	}
 
@@ -111,7 +119,6 @@ class CoroutineClient extends ClientAbstracts
 		return $path;
 	}
 
-
 	/**
 	 *
 	 */
@@ -119,30 +126,4 @@ class CoroutineClient extends ClientAbstracts
 	{
 		$this->client->close();
 	}
-
-	/**
-	 * @return array
-	 */
-	#[Pure] private function settings(): array
-	{
-		$sslCert = $this->getSslCertFile();
-		$sslKey = $this->getSslKeyFile();
-		$sslCa = $this->getCa();
-
-		$params = [];
-		if ($this->getConnectTimeout() > 0) {
-			$params['timeout'] = $this->getConnectTimeout();
-		}
-		if (empty($sslCert) || empty($sslKey) || empty($sslCa)) {
-			return $params;
-		}
-
-		$params['ssl_host_name'] = $this->getHost();
-		$params['ssl_cert_file'] = $this->getSslCertFile();
-		$params['ssl_key_file'] = $this->getSslKeyFile();
-		$params['ssl_verify_peer'] = true;
-		$params['ssl_cafile'] = $sslCa;
-
-		return $params;
-	}
 }

src/Curl.php

@@ -1,204 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Http\Client;
-
-
-use Exception;
-use Http\Message\Response;
-use Http\Message\Stream;
-use JetBrains\PhpStorm\Pure;
-use Psr\Http\Message\ResponseInterface;
-
-
-/**
- * Class Curl
- * @package Http\Handler\Client
- */
-class Curl extends ClientAbstracts
-{
-
-	/**
-	 * @param $method
-	 * @param $path
-	 * @param array $params
-	 * @throws Exception
-	 */
-	public function request($method, $path, array $params = []): void
-	{
-		if ($method == self::GET) {
-			$path = $this->joinGetParams($path, $params);
-		}
-
-		$this->getCurlHandler($path, $method, $params);
-
-		$this->execute();
-	}
-
-
-	/**
-	 * @param $path
-	 * @param $method
-	 * @param $params
-	 * @throws Exception
-	 */
-	private function getCurlHandler($path, $method, $params): void
-	{
-		[$host, $isHttps, $path] = $this->matchHost($path);
-
-		$host = $isHttps ? 'https://' . $host : 'http://' . $host;
-		if ($this->getPort() != 443 && $this->getPort() != 80) {
-			$host .= ':' . $this->getPort();
-		}
-
-		$this->do(curl_init($host . $path), $host . $path, $method);
-		if ($isHttps !== false) {
-			$this->curlHandlerSslSet();
-		}
-
-		$contents = $this->getData()->getContents();
-		if (empty($params) && empty($contents)) {
-			return;
-		}
-
-		if (!empty($contents)) {
-			curl_setopt($this->client, CURLOPT_POSTFIELDS, $contents);
-		} else if ($method === self::POST) {
-			curl_setopt($this->client, CURLOPT_POSTFIELDS, $this->mergeParams($params));
-		} else if ($method === self::UPLOAD) {
-			curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
-		}
-	}
-
-
-	/**
-	 * @return void
-	 * @throws Exception
-	 */
-	private function curlHandlerSslSet(): void
-	{
-		if (!empty($this->ssl_key)) {
-			if (!file_exists($this->ssl_key)) {
-				throw new Exception('SSL protocol certificate not found.');
-			}
-			curl_setopt($this->client, CURLOPT_SSLKEY, $this->getSslKeyFile());
-		}
-		if (!empty($this->ssl_cert)) {
-			if (!!file_exists($this->ssl_cert)) {
-				throw new Exception('SSL protocol certificate not found.');
-			}
-			curl_setopt($this->client, CURLOPT_SSLCERT, $this->getSslCertFile());
-		}
-	}
-
-
-	/**
-	 * @param $resource
-	 * @param $path
-	 * @param $method
-	 * @throws Exception
-	 */
-	private function do($resource, $path, $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);
-		}
-		curl_setopt($resource, CURLOPT_CUSTOMREQUEST, strtoupper($method));
-
-		$this->client = $resource;
-	}
-
-
-	/**
-	 * @throws Exception
-	 */
-	private function execute(): void
-	{
-		$output = curl_exec($this->client);
-		if ($output === false) {
-			$response = (new Response())->withStatus(400)->withBody(new Stream(curl_error($this->client)));
-		} else {
-			$response = $this->explode($output);
-		}
-		$this->setBody($response);
-	}
-
-
-	/**
-	 *
-	 */
-	public function close(): void
-	{
-		curl_close($this->client);
-	}
-
-
-	/**
-	 * @param $output
-	 * @return ResponseInterface
-	 * @throws Exception
-	 */
-	private function explode($output): ResponseInterface
-	{
-		[$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);
-		}
-
-		$header = explode("\r\n", $header);
-		$status = explode(' ', array_shift($header));
-
-		return (new Response())->withStatus(intval($status[1]))->withHeaders($this->headerFormat($header))
-			->withBody(new Stream($body));
-	}
-
-	/**
-	 * @param $headers
-	 * @return array
-	 */
-	private function headerFormat($headers): array
-	{
-		$_tmp = [];
-		foreach ($headers as $val) {
-			$trim = explode(': ', trim($val));
-
-			$_tmp[strtolower($trim[0])] = [$trim[1] ?? ''];
-		}
-		return $_tmp;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	#[Pure] private function parseHeaderMat(): array
-	{
-		$headers = [];
-		foreach ($this->getHeader() as $key => $val) {
-			$headers[$key] = $key . ': ' . $val;
-		}
-		return array_values($headers);
-	}
-}

src/CurlClient.php

@@ -0,0 +1,208 @@
+<?php
+declare(strict_types=1);
+
+namespace Http\Client;
+
+
+use Exception;
+use Http\Message\Response;
+use Http\Message\Stream;
+use JetBrains\PhpStorm\Pure;
+use Psr\Http\Message\ResponseInterface;
+
+
+/**
+ * Class CurlClient
+ * @package Http\Handler\Client
+ */
+class CurlClient extends ClientAbstracts
+{
+
+    /**
+     * @param $method
+     * @param $path
+     * @param array $params
+     * @throws Exception
+     */
+    public function request($method, $path, array $params = []): void
+    {
+        if ($method == self::GET) {
+            $path = $this->joinGetParams($path, $params);
+        }
+
+        $this->getCurlHandler($path, $method, $params);
+
+        $this->execute();
+    }
+
+
+    /**
+     * @param $path
+     * @param $method
+     * @param $params
+     * @throws Exception
+     */
+    private function getCurlHandler($path, $method, $params): void
+    {
+        [$host, $isHttps, $path] = $this->matchHost($path);
+
+        $host = $isHttps ? 'https://' . $host : 'http://' . $host;
+        if ($this->getPort() != 443 && $this->getPort() != 80) {
+            $host .= ':' . $this->getPort();
+        }
+        $this->do(curl_init($host . $path), $host . $path, $method);
+        if ($isHttps !== FALSE) {
+            $this->curlHandlerSslSet();
+        }
+        $contents = $this->getData()->getContents();
+        if (empty($params) && empty($contents)) {
+            return;
+        }
+        if (!empty($contents)) {
+            curl_setopt($this->client, CURLOPT_POSTFIELDS, $contents);
+        } else if ($method === self::POST) {
+            curl_setopt($this->client, CURLOPT_POSTFIELDS, $this->mergeParams($params));
+        } else if ($method === self::UPLOAD) {
+            curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
+        }
+    }
+
+
+    /**
+     * @return void
+     * @throws Exception
+     */
+    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());
+        }
+    }
+
+
+    /**
+     * @param $resource
+     * @param $path
+     * @param $method
+     * @throws Exception
+     */
+    private function do($resource, $path, $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);
+        }
+        curl_setopt($resource, CURLOPT_CUSTOMREQUEST, strtoupper($method));
+        $this->client = $resource;
+        if (!empty($this->caPath)) {
+            curl_setopt($this->client,CURLOPT_CAINFO, $this->caPath);
+        }
+    }
+
+
+    private string $caPath = '';
+
+
+    /**
+     * @param $path
+     * @return $this
+     */
+    public function withCAInfo($path): static
+    {
+        $this->caPath = $path;
+        return $this;
+    }
+
+
+    /**
+     * @throws Exception
+     */
+    private function execute(): void
+    {
+        $output = curl_exec($this->client);
+        if ($output === FALSE) {
+            $this->setStatusCode(curl_errno($this->client));
+            $this->setBody(curl_error($this->client));
+        } else {
+            $this->explode($output);
+        }
+    }
+
+
+    /**
+     *
+     */
+    public function close(): void
+    {
+        curl_close($this->client);
+    }
+
+
+    /**
+     * @param $output
+     * @return void
+     * @throws Exception
+     */
+    private function explode($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);
+        }
+
+        $header = explode("\r\n", $header);
+        $status = explode(' ', array_shift($header));
+
+        $this->setStatusCode(intval($status[1]));
+        $this->setBody($body);
+        $this->setResponseHeader($header);
+    }
+
+    /**
+     * @param $headers
+     * @return array
+     */
+    private function headerFormat($headers): array
+    {
+        $_tmp = [];
+        foreach ($headers as $val) {
+            $trim = explode(': ', trim($val));
+
+            $_tmp[strtolower($trim[0])] = [$trim[1] ?? ''];
+        }
+        return $_tmp;
+    }
+
+
+    /**
+     * @return array
+     */
+    #[Pure] private function parseHeaderMat(): array
+    {
+        $headers = [];
+        foreach ($this->getHeader() as $key => $val) {
+            $headers[$key] = $key . ': ' . $val;
+        }
+        return array_values($headers);
+    }
+}

src/TSwooleClient.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Http\Client;
+
+use JetBrains\PhpStorm\Pure;
+
+trait TSwooleClient
+{
+
+
+
+    /**
+     * @return array
+     */
+    #[Pure] private function settings(): array
+    {
+        $sslCert = $this->getSslCertFile();
+        $sslKey = $this->getSslKeyFile();
+        $sslCa = $this->getCa();
+
+        $params = [];
+        if ($this->getConnectTimeout() > 0) {
+            $params['timeout'] = $this->getConnectTimeout();
+        }
+        if (empty($sslCert) || empty($sslKey) || empty($sslCa)) {
+            return $params;
+        }
+
+        $params['ssl_host_name'] = $this->getHost();
+        $params['ssl_cert_file'] = $this->getSslCertFile();
+        $params['ssl_key_file'] = $this->getSslKeyFile();
+        $params['ssl_verify_peer'] = TRUE;
+        $params['ssl_cafile'] = $sslCa;
+
+        return $params;
+    }
+
+}