eee

This reverts commit fdf58326

.gitignore

@@ -0,0 +1,37 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Yii template
+assets/*
+!assets/.gitignore
+protected/runtime/*
+!protected/runtime/.gitignore
+protected/data/*.db
+themes/classic/views/
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+
+db/
+async-queue/
+
+composer.lock
+
+*.log
+commands/result
+config/setting.php
+tests/
+vendor/*
+runtime/
+
+*.xml
+*.lock
+
+oot
+d
+
+composer.lock

Client.php

@@ -1,43 +1,43 @@
-<?php
+<?php
-
+
-namespace Http\Client;
+namespace Kiri;
-
+
-use Kiri\Context;
+use Swoole\Coroutine;
-
+
-
+
-/**
+/**
- * @mixin CoroutineClient|CurlClient
+ * @mixin CoroutineClient|CurlClient
- */
+ */
-class Client
+class Client
-{
+{
-
+
-
+
-	private CoroutineClient|CurlClient|AsyncClient $abstracts;
+	private CoroutineClient|CurlClient $abstracts;
-
+
-
+
-	/**
+    /**
-	 * @param string $host
+     * @param string $host
-	 * @param int $port
+     * @param int $port
-	 * @param bool $isSsl
+     * @param bool $isSsl
-	 */
+     */
-	public function __construct(string $host, int $port, bool $isSsl = false)
+	public function __construct(string $host, int $port, bool $isSsl = false)
-	{
+	{
-		if (Context::inCoroutine()) {
+		if (class_exists(Coroutine::class) && Coroutine::getCid() > -1) {
-			$this->abstracts = new CoroutineClient($host, $port, $isSsl);
+			$this->abstracts = new CoroutineClient($host, $port, $isSsl);
-		} else {
+		} else {
-			$this->abstracts = new CurlClient($host, $port, $isSsl);
+			$this->abstracts = new CurlClient($host, $port, $isSsl);
-		}
+		}
-	}
+	}
-
+
-
+
-	/**
+	/**
-	 * @param string $name
+	 * @param string $name
-	 * @param array $arguments
+	 * @param array $arguments
-	 * @return mixed
+	 * @return mixed
-	 */
+	 */
-	public function __call(string $name, array $arguments)
+	public function __call(string $name, array $arguments)
-	{
+	{
-		return $this->abstracts->{$name}(...$arguments);
+		return $this->abstracts->{$name}(...$arguments);
-	}
+	}
-
+
-}
+}

CoroutineClient.php

@@ -0,0 +1,160 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: whwyy
+ * Date: 2018/5/24 0024
+ * Time: 11:34
+ */
+declare(strict_types=1);
+
+namespace Kiri;
+
+use Exception;
+use Swoole\Coroutine\Http\Client as SwowClient;
+
+/**
+ * Class Client
+ * @package Kiri\Http
+ */
+class CoroutineClient extends ClientAbstracts
+{
+
+    use TSwooleClient;
+
+    /**
+     * @param string $method
+     * @param $path
+     * @param array|string $params
+     * @return void
+     * @throws
+     */
+    public function request(string $method, $path, array|string $params = []): void
+    {
+        if (!str_starts_with($path, '/')) {
+            $path = '/' . $path;
+        }
+
+        $host = $this->getHost();
+        if (!preg_match('/(\d{1,3}\.){3}\d{1,3}/', $host)) {
+            $this->withAddedHeader('Host', $host);
+        }
+        $this->withMethod($method)
+             ->coroutine(
+                 $path,
+                 $this->paramEncode($params)
+             );
+    }
+
+
+    /**
+     * @param string $path
+     * @return $this
+     */
+    public function withCAInfo(string $path): static
+    {
+        return $this;
+    }
+
+    /**
+     * @param string $url
+     * @param array|string $data
+     */
+    private function coroutine(string $url, array|string $data = []): void
+    {
+        try {
+            $this->generate_client($this->getHost(), $this->isSSL());
+            if ($this->client->statusCode < 0) {
+                throw new Exception($this->client->errMsg);
+            }
+
+            $this->execute($url, $data);
+
+        } catch (\Throwable $exception) {
+            $this->setStatusCode(-1);
+            $this->setBody(jTraceEx($exception));
+        }
+    }
+
+
+    /**
+     * @param string $path
+     * @param array|string $data
+     * @return void
+     */
+    private function execute(string $path, array|string $data): void
+    {
+        $this->client->execute($this->setParams($path, $data));
+        if (in_array($this->client->getStatusCode(), [502, 404])) {
+            $this->retry($path, $data);
+        } else {
+            $this->setStatusCode($this->client->getStatusCode());
+            $this->setBody($this->client->getBody());
+            $this->setResponseHeader($this->client->headers);
+        }
+    }
+
+
+    /**
+     * @param string $path
+     * @param array|string $data
+     * @return void
+     */
+    private function retry(string $path, array|string $data): void
+    {
+        if (($this->num += 1) <= $this->retryNum) {
+            sleep($this->retryTimeout);
+
+            $this->execute($path, $data);
+        } else {
+            $this->setStatusCode($this->client->statusCode);
+            $this->setBody($this->client->errMsg);
+        }
+    }
+
+    /**
+     * @param string $host
+     * @param bool $isHttps
+     */
+    private function generate_client(string $host, bool $isHttps): void
+    {
+        if ($isHttps || $this->isSSL()) {
+            $this->client = new SwowClient($host, 443, true);
+        } else {
+            $this->client = new SwowClient($host, $this->getPort(), false);
+        }
+        $this->client->set($this->settings());
+        if (!empty($this->getAgent())) {
+            $this->withAddedHeader('User-Agent', $this->getAgent());
+        }
+        $this->client->setHeaders($this->getHeader());
+        $this->client->setMethod(strtoupper($this->getMethod()));
+    }
+
+
+    /**
+     * @param string $path
+     * @param mixed $data
+     * @return string
+     */
+    private function setParams(string $path, mixed $data): string
+    {
+        $content = $this->getData();
+        if (!empty($content)) {
+            $this->client->setData($content);
+        }
+        if ($this->isGet()) {
+            if (!empty($data)) $path .= '?' . $data;
+        } else if (!empty($data)) {
+            $this->client->setData($data);
+        }
+        return $path;
+    }
+
+    /**
+     *
+     */
+    public function close(): void
+    {
+        $this->client->close();
+    }
+}

CurlClient.php

@@ -1,208 +1,224 @@
-<?php
+<?php
-declare(strict_types=1);
+declare(strict_types=1);
-
+
-namespace Http\Client;
+namespace Kiri;
-
+
-
+
-use Exception;
+/**
-use Http\Message\Response;
+ * Class CurlClient
-use Http\Message\Stream;
+ * @package Http\Handler\Client
-use JetBrains\PhpStorm\Pure;
+ */
-use Psr\Http\Message\ResponseInterface;
+class CurlClient extends ClientAbstracts
-
+{
-
+
-/**
+
- * Class CurlClient
+    /**
- * @package Http\Handler\Client
+     * @param string $method
- */
+     * @param string $path
-class CurlClient extends ClientAbstracts
+     * @param array|string $params
-{
+     * @return void
-
+     */
-    /**
+    public function request(string $method, string $path, array|string $params = []): void
-     * @param $method
+    {
-     * @param $path
+        if (!str_starts_with($path, '/')) {
-     * @param array $params
+            $path = '/' . $path;
-     * @throws Exception
+        }
-     */
+        if ($method == self::GET) {
-    public function request($method, $path, array $params = []): void
+            $path = $this->joinGetParams($path, $params);
-    {
+        }
-        if ($method == self::GET) {
+
-            $path = $this->joinGetParams($path, $params);
+        $this->getCurlHandler($path, $method, $params);
-        }
+
-
+        $this->execute();
-        $this->getCurlHandler($path, $method, $params);
+    }
-
+
-        $this->execute();
+
-    }
+    /**
-
+     * @param string $path
-
+     * @param string $method
-    /**
+     * @param $params
-     * @param $path
+     * @return void
-     * @param $method
+     */
-     * @param $params
+    private function getCurlHandler(string $path, string $method, $params): void
-     * @throws Exception
+    {
-     */
+        $host = $this->isSSL() ? 'https://' . $this->getHost() : 'http://' . $this->getHost();
-    private function getCurlHandler($path, $method, $params): void
+        if ($this->getPort() != 443 && $this->getPort() != 80) {
-    {
+            $host .= ':' . $this->getPort();
-        [$host, $isHttps, $path] = $this->matchHost($path);
+        }
-
+        $this->do(curl_init($host . $path), $host . $path, $method);
-        $host = $isHttps ? 'https://' . $host : 'http://' . $host;
+        if ($this->isSSL()) {
-        if ($this->getPort() != 443 && $this->getPort() != 80) {
+            $this->curlHandlerSslSet();
-            $host .= ':' . $this->getPort();
+        }
-        }
+        $contents = $this->getData();
-        $this->do(curl_init($host . $path), $host . $path, $method);
+        if (empty($params) && empty($contents)) {
-        if ($isHttps !== FALSE) {
+            return;
-            $this->curlHandlerSslSet();
+        }
-        }
+        if (!empty($contents)) {
-        $contents = $this->getData()->getContents();
+            curl_setopt($this->client, CURLOPT_POSTFIELDS, $contents);
-        if (empty($params) && empty($contents)) {
+        } else if ($method === self::UPLOAD) {
-            return;
+            curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
-        }
+        } else if ($method === self::POST) {
-        if (!empty($contents)) {
+            if (is_array($params)) {
-            curl_setopt($this->client, CURLOPT_POSTFIELDS, $contents);
+                $params = http_build_query($params);
-        } else if ($method === self::POST) {
+            }
-            curl_setopt($this->client, CURLOPT_POSTFIELDS, $this->mergeParams($params));
+            curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
-        } else if ($method === self::UPLOAD) {
+        }
-            curl_setopt($this->client, CURLOPT_POSTFIELDS, $params);
+    }
-        }
+
-    }
+
-
+    /**
-
+     * @return void
-    /**
+     * @throws
-     * @return void
+     */
-     * @throws Exception
+    private function curlHandlerSslSet(): void
-     */
+    {
-    private function curlHandlerSslSet(): void
+        if (!empty($this->getSslKeyFile()) && file_exists($this->getSslKeyFile())) {
-    {
+            curl_setopt($this->client, CURLOPT_SSLKEY, $this->getSslKeyFile());
-        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->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 $resource
+    /**
-     * @param $path
+     * @param mixed $resource
-     * @param $method
+     * @param string $path
-     * @throws Exception
+     * @param string $method
-     */
+     * @return void
-    private function do($resource, $path, $method): 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_URL, $path);
-        curl_setopt($resource, CURLOPT_CONNECTTIMEOUT, $this->getConnectTimeout());       // 超时设置
+        curl_setopt($resource, CURLOPT_TIMEOUT, $this->getTimeout());                     // 超时设置
-        curl_setopt($resource, CURLOPT_HEADER, TRUE);
+        curl_setopt($resource, CURLOPT_CONNECTTIMEOUT, $this->getConnectTimeout());       // 超时设置
-        curl_setopt($resource, CURLOPT_FAILONERROR, TRUE);
+        curl_setopt($resource, CURLOPT_HEADER, TRUE);
-        curl_setopt($resource, CURLOPT_HTTPHEADER, $this->parseHeaderMat());
+        curl_setopt($resource, CURLOPT_FAILONERROR, TRUE);
-        if (defined('CURLOPT_SSL_FALSESTART')) {
+        curl_setopt($resource, CURLOPT_HTTPHEADER, $this->parseHeaderMat());
-            curl_setopt($resource, CURLOPT_SSL_FALSESTART, TRUE);
+        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);
+        curl_setopt($resource, CURLOPT_FORBID_REUSE, FALSE);
-        if (!empty($this->getAgent())) {
+        curl_setopt($resource, CURLOPT_FRESH_CONNECT, FALSE);
-            curl_setopt($resource, CURLOPT_USERAGENT, $this->getAgent());
+        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_NOBODY, FALSE);
-        curl_setopt($resource, CURLOPT_FOLLOWLOCATION, TRUE);// 跟踪重定向
+        curl_setopt($resource, CURLOPT_RETURNTRANSFER, TRUE);//返回内容
-        curl_setopt($resource, CURLOPT_ENCODING, 'gzip,deflate');
+        curl_setopt($resource, CURLOPT_FOLLOWLOCATION, TRUE);// 跟踪重定向
-        if ($method === self::POST || $method == self::UPLOAD) {
+        curl_setopt($resource, CURLOPT_ENCODING, 'gzip,deflate');
-            curl_setopt($resource, CURLOPT_POST, 1);
+        if ($method === self::POST || $method == self::UPLOAD) {
-        }
+            curl_setopt($resource, CURLOPT_POST, 1);
-        curl_setopt($resource, CURLOPT_CUSTOMREQUEST, strtoupper($method));
+        }
-        $this->client = $resource;
+        [$proxy, $port] = [$this->getProxyHost(), $this->getProxyPort()];
-        if (!empty($this->caPath)) {
+        if (!empty($proxy) && $port > 0) {
-            curl_setopt($this->client,CURLOPT_CAINFO, $this->caPath);
+            curl_setopt($resource, CURLOPT_PROXYPORT, $port);
-        }
+            curl_setopt($resource, CURLOPT_PROXY, $proxy);
-    }
+        }
-
+        curl_setopt($resource, CURLOPT_CUSTOMREQUEST, strtoupper($method));
-
+        $this->client = $resource;
-    private string $caPath = '';
+        if (!empty($this->caPath)) {
-
+            curl_setopt($this->client, CURLOPT_CAINFO, $this->caPath);
-
+        }
-    /**
+    }
-     * @param $path
+
-     * @return $this
+
-     */
+    /**
-    public function withCAInfo($path): static
+     * @var string
-    {
+     */
-        $this->caPath = $path;
+    private string $caPath = '';
-        return $this;
+
-    }
+
-
+    /**
-
+     * @param string $path
-    /**
+     * @return $this
-     * @throws Exception
+     */
-     */
+    public function withCAInfo(string $path): static
-    private function execute(): void
+    {
-    {
+        $this->caPath = $path;
-        $output = curl_exec($this->client);
+        return $this;
-        if ($output === FALSE) {
+    }
-            $this->setStatusCode(curl_errno($this->client));
+
-            $this->setBody(curl_error($this->client));
+
-        } else {
+    /**
-            $this->explode($output);
+     * @throws
-        }
+     */
-    }
+    private function execute(): void
-
+    {
-
+        $output = curl_exec($this->client);
-    /**
+        if ($output !== FALSE) {
-     *
+            $this->explode($output);
-     */
+        } else {
-    public function close(): void
+            $this->setStatusCode(curl_errno($this->client));
-    {
+            $this->setBody(curl_error($this->client));
-        curl_close($this->client);
+        }
-    }
+    }
-
+
-
+
-    /**
+    /**
-     * @param $output
+     * @return void
-     * @return void
+     * @throws
-     * @throws Exception
+     */
-     */
+    private function retry(): void
-    private function explode($output): void
+    {
-    {
+        if (($this->num += 1) <= $this->retryNum) {
-        [$header, $body] = explode("\r\n\r\n", $output, 2);
+            sleep($this->retryTimeout);
-        if ($header == 'HTTP/1.1 100 Continue') {
+
-            [$header, $body] = explode("\r\n\r\n", $body, 2);
+            $this->execute();
-        }
+        } else {
-
+            $this->setStatusCode(curl_errno($this->client));
-        $header = explode("\r\n", $header);
+            $this->setBody(curl_error($this->client));
-        $status = explode(' ', array_shift($header));
+        }
-
+    }
-        $this->setStatusCode(intval($status[1]));
+
-        $this->setBody($body);
+
-        $this->setResponseHeader($header);
+    /**
-    }
+     *
-
+     */
-    /**
+    public function close(): void
-     * @param $headers
+    {
-     * @return array
+        curl_close($this->client);
-     */
+    }
-    private function headerFormat($headers): array
+
-    {
+
-        $_tmp = [];
+    /**
-        foreach ($headers as $val) {
+     * @param string $output
-            $trim = explode(': ', trim($val));
+     * @return void
-
+     * @throws
-            $_tmp[strtolower($trim[0])] = [$trim[1] ?? ''];
+     */
-        }
+    private function explode(string $output): void
-        return $_tmp;
+    {
-    }
+        [$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);
-    /**
+        }
-     * @return array
+
-     */
+        $header = explode("\r\n", $header);
-    #[Pure] private function parseHeaderMat(): array
+        $status = explode(' ', array_shift($header));
-    {
+
-        $headers = [];
+        $statusCode = intval($status[1]);
-        foreach ($this->getHeader() as $key => $val) {
+        if (in_array($statusCode, [502, 404])) {
-            $headers[$key] = $key . ': ' . $val;
+            $this->retry();
-        }
+        } else {
-        return array_values($headers);
+            $this->setStatusCode($statusCode);
-    }
+            $this->setBody($body);
-}
+            $this->setResponseHeader($header);
+        }
+    }
+
+
+    /**
+     * @return array
+     */
+    private function parseHeaderMat(): array
+    {
+        $headers = [];
+        foreach ($this->getHeader() as $key => $val) {
+            $headers[$key] = $key . ': ' . $val;
+        }
+        return array_values($headers);
+    }
+}

HttpParse.php

@@ -0,0 +1,108 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiri;
+
+use Exception;
+
+/**
+ * Class HttpParse
+ * @package BeReborn\Http
+ */
+class HttpParse
+{
+    /**
+     * @param mixed ...$object
+     * @return string
+     */
+    private static function getKey(...$object): string
+    {
+        $first = '';
+        $tp    = [];
+        foreach ($object as $value) {
+            if ($value === null) {
+                continue;
+            }
+            if (is_array($value)) {
+                $value = key($value);
+            }
+            if ($first === '') {
+                $first = $value;
+            } else {
+                $tp[] = $value;
+            }
+        }
+        $key = $first . '[' . implode('][', $tp) . ']';
+        if (count($tp) < 1) {
+            $key = $first;
+        }
+        return $key;
+    }
+
+    /**
+     * @param array|string $data
+     * @return string
+     */
+    public static function parse(array|string $data): string
+    {
+        $tmp = [];
+        if (is_string($data)) {
+            return $data;
+        }
+        foreach ($data as $key => $datum) {
+            if ($datum === null) {
+                continue;
+            }
+            $tmp[] = static::ifElse($key, $datum);
+        }
+        return implode('&', $tmp);
+    }
+
+    /**
+     * @param $t
+     * @param $qt
+     * @return string
+     * @throws
+     */
+    private static function ifElse(string $t, mixed $qt): string
+    {
+        if (is_numeric($qt)) {
+            return $t . '=' . $qt;
+        }
+        if (is_string($qt)) {
+            $string = $t . '=' . urlencode($qt);
+        } else {
+            $string = static::encode($t, $qt);
+        }
+        return $string;
+    }
+
+    /**
+     * @param mixed ...$object
+     * @return string
+     * @throws
+     */
+    private static function encode(...$object): string
+    {
+        $ret = [];
+
+        $data = $object[count($object) - 1];
+        $key  = static::getKey(...$object);
+        foreach ($data as $s => $datum) {
+            if (is_array($datum)) {
+                $object[count($object) - 1] = $s;
+                $object[]                   = $datum;
+                $string                     = static::encode(...$object);
+            } else {
+                if (is_object($datum)) {
+                    throw new Exception('Http body con\'t object.');
+                }
+                $string = $key . '=' . urlencode($datum);
+            }
+            $ret[] = $string;
+        }
+        return implode('&', $ret);
+    }
+
+
+}

IClient.php

@@ -1,181 +1,179 @@
-<?php
+<?php
-
+
-
+
-namespace Http\Client;
+namespace Kiri;
-
+
-
+
-use Closure;
+use Closure;
-use Psr\Http\Message\ResponseInterface;
+
-use Psr\Http\Message\StreamInterface;
+interface IClient
-
+{
-interface IClient
+
-{
+
-
+    /**
-
+     * @param string $path
-	/**
+     * @param array|string $params
-	 * @param string $path
+     */
-	 * @param array $params
+	public function get(string $path, array|string $params = []): void;
-	 */
+
-	public function get(string $path, array $params = []): void;
+
-
+    /**
-
+     * @param string $path
-	/**
+     * @param array|string $params
-	 * @param string $path
+     */
-	 * @param array $params
+	public function post(string $path, array|string $params = []): void;
-	 */
+
-	public function post(string $path, array $params = []): void;
+
-
+	/**
-
+	 *
-	/**
+	 */
-	 *
+	public function close(): void;
-	 */
+
-	public function close(): void;
+
-
+    /**
-
+     * @param string $path
-	/**
+     * @param array|string $params
-	 * @param string $path
+     */
-	 * @param array $params
+	public function delete(string $path, array|string $params = []): void;
-	 */
+
-	public function delete(string $path, array $params = []): void;
+
-
+    /**
-
+     * @param string $path
-	/**
+     * @param array|string $params
-	 * @param string $path
+     */
-	 * @param array $params
+	public function options(string $path, array|string $params = []): void;
-	 */
+
-	public function options(string $path, array $params = []): void;
+
-
+    /**
-
+     * @param string $path
-	/**
+     * @param array|string $params
-	 * @param string $path
+     */
-	 * @param array $params
+	public function upload(string $path, array|string $params = []): void;
-	 */
+
-	public function upload(string $path, array $params = []): void;
+
-
+    /**
-
+     * @param string $path
-	/**
+     * @param array|string $params
-	 * @param string $path
+     */
-	 * @param array $params
+	public function put(string $path, array|string $params = []): void;
-	 */
+
-	public function put(string $path, array $params = []): void;
+
-
+    /**
-
+     * @param string $path
-	/**
+     * @param array|string $params
-	 * @param string $path
+     */
-	 * @param array $params
+	public function head(string $path, array|string $params = []): void;
-	 */
+
-	public function head(string $path, array $params = []): void;
+
-
+	/**
-
+	 * @param string $method
-	/**
+	 * @param string $path
-	 * @param string $method
+	 * @param array|string $params
-	 * @param string $path
+	 */
-	 * @param array $params
+	public function request(string $method, string $path, array|string $params = []): void;
-	 */
+
-	public function request(string $method, string $path, array $params = []): void;
+
-
+	/**
-
+	 * @param array $header
-	/**
+	 * @return static
-	 * @param array $header
+	 */
-	 * @return static
+	public function withHeader(array $header): static;
-	 */
+
-	public function withHeader(array $header): static;
+
-
+	/**
-
+	 * @param array $header
-	/**
+	 * @return static
-	 * @param array $header
+	 */
-	 * @return static
+	public function withHeaders(array $header): static;
-	 */
+
-	public function withHeaders(array $header): static;
+
-
+	/**
-
+	 * @param string $key
-	/**
+	 * @param string $value
-	 * @param string $key
+	 * @return static
-	 * @param string $value
+	 */
-	 * @return static
+	public function withAddedHeader(string $key, string $value): static;
-	 */
+
-	public function withAddedHeader(string $key, string $value): static;
+
-
+	/**
-
+	 * @param int $value
-	/**
+	 * @return static
-	 * @param int $value
+	 */
-	 * @return static
+	public function withTimeout(int $value): static;
-	 */
+
-	public function withTimeout(int $value): static;
+
-
+	/**
-
+	 * @param Closure|null $value
-	/**
+	 * @return static
-	 * @param Closure|null $value
+	 */
-	 * @return static
+	public function withCallback(?Closure $value): static;
-	 */
+
-	public function withCallback(?Closure $value): static;
+
-
+	/**
-
+	 * @param string $value
-	/**
+	 * @return static
-	 * @param string $value
+	 */
-	 * @return static
+	public function withMethod(string $value): static;
-	 */
+
-	public function withMethod(string $value): static;
+
-
+	/**
-
+	 * @param bool $isSSL
-	/**
+	 * @return static
-	 * @param bool $isSSL
+	 */
-	 * @return static
+	public function withIsSSL(bool $isSSL): static;
-	 */
+
-	public function withIsSSL(bool $isSSL): static;
+
-
+	/**
-
+	 * @param string $agent
-	/**
+	 * @return static
-	 * @param string $agent
+	 */
-	 * @return static
+	public function withAgent(string $agent): static;
-	 */
+
-	public function withAgent(string $agent): static;
+
-
+	/**
-
+	 * @param string $ssl_cert_file
-	/**
+	 * @return static
-	 * @param string $ssl_cert_file
+	 */
-	 * @return static
+	public function withSslCertFile(string $ssl_cert_file): static;
-	 */
+
-	public function withSslCertFile(string $ssl_cert_file): static;
+
-
+	/**
-
+	 * @param string $ssl_key_file
-	/**
+	 * @return static
-	 * @param string $ssl_key_file
+	 */
-	 * @return static
+	public function withSslKeyFile(string $ssl_key_file): static;
-	 */
+
-	public function withSslKeyFile(string $ssl_key_file): static;
+
-
+	/**
-
+	 * @param string $ssl_key_file
-	/**
+	 * @return static
-	 * @param string $ssl_key_file
+	 */
-	 * @return static
+	public function withCa(string $ssl_key_file): static;
-	 */
+
-	public function withCa(string $ssl_key_file): static;
+
-
+	/**
-
+	 * @param string $data
-	/**
+	 * @return static
-	 * @param string|StreamInterface $data
+	 */
-	 * @return static
+	public function withBody(string $data): static;
-	 */
+
-	public function withBody(string|StreamInterface $data): static;
+
-
+	/**
-
+	 * @param int $connect_timeout
-	/**
+	 * @return static
-	 * @param int $connect_timeout
+	 */
-	 * @return static
+	public function withConnectTimeout(int $connect_timeout): static;
-	 */
+
-	public function withConnectTimeout(int $connect_timeout): static;
+
-
+	/**
-
+	 * @param string $contentType
-	/**
+	 * @return static
-	 * @param string $contentType
+	 */
-	 * @return static
+	public function withContentType(string $contentType): static;
-	 */
+
-	public function withContentType(string $contentType): static;
+
-
+	/**
-
+	 * @return mixed
-	/**
+	 */
-	 * @return mixed
+	public function getBody(): mixed;
-	 */
+}
-	public function getBody(): mixed;
-}

LICENSE

@@ -1,21 +1,21 @@
-MIT License
+MIT License
-
+
-Copyright (c) 2021 向林
+Copyright (c) 2021 向林
-
+
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
+of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
+in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
+copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+furnished to do so, subject to the following conditions:
-
+
-The above copyright notice and this permission notice shall be included in all
+The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+copies or substantial portions of the Software.
-
+
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

TSwooleClient.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Kiri;
+
+trait TSwooleClient
+{
+
+
+	/**
+	 * @return array
+	 */
+	private function settings(): array
+	{
+		$sslCert = $this->getSslCertFile();
+		$sslKey = $this->getSslKeyFile();
+		$sslCa = $this->getCa();
+
+		$params = [];
+		if ($this->getConnectTimeout() > 0) {
+			$params['timeout'] = $this->getConnectTimeout();
+		}
+
+        [$proxy, $port] = [$this->getProxyHost(), $this->getProxyPort()];
+        if (!empty($proxy) && $port > 0) {
+            $params['http_proxy_host'] = $proxy;
+            $params['http_proxy_port'] = $port;
+        }
+		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;
+	}
+
+}

TcpClient.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Kiri;
+
+use Exception;
+use Kiri\Di\Context;
+use Swoole\Coroutine\Client as CoroutineClient;
+use Swoole\Client as AsyncClient;
+
+
+class TcpClient
+{
+
+
+    /**
+     * @var AsyncClient|CoroutineClient
+     */
+    protected AsyncClient|CoroutineClient $client;
+
+
+    /**
+     * @param string $host
+     * @param int $port
+     * @param int $socket
+     * @throws
+     */
+    public function __construct(readonly public string $host, readonly public int $port, readonly public int $socket = SWOOLE_SOCK_TCP)
+    {
+        $this->reconnect();
+    }
+
+
+    /**
+     * @return void
+     * @throws
+     */
+    public function reconnect(): void
+    {
+        $this->client?->close();
+        if (Context::inCoroutine()) {
+            $this->client = new CoroutineClient($this->socket);
+        } else {
+            $this->client = new AsyncClient($this->socket);
+        }
+        if (!$this->client->connect($this->host, $this->port, 1)) {
+            throw new Exception('Connect ' . $this->host . '::' . $this->port . ' fail');
+        }
+    }
+
+
+    /**
+     * @param string $data
+     * @return int|bool
+     */
+    public function send(string $data): int|bool
+    {
+        return $this->client->send($data);
+    }
+
+
+    /**
+     * @return bool|string
+     */
+    public function read(): bool|string
+    {
+        return $this->client->recv();
+    }
+
+
+    /**
+     * @return bool
+     */
+    public function isConnected(): bool
+    {
+        return $this->client->isConnected();
+    }
+
+
+    /**
+     * @return bool
+     */
+    public function close(): bool
+    {
+        return $this->client->close();
+    }
+
+}

composer.json

@@ -1,26 +1,23 @@
-{
+{
-  "name": "game-worker/kiri-client",
+  "name": "game-worker/kiri-client",
-  "description": "db",
+  "description": "db",
-  "authors": [
+  "authors": [
-    {
+    {
-      "name": "XiangLin",
+      "name": "XiangLin",
-      "email": "as2252258@163.com"
+      "email": "as2252258@163.com"
-    }
+    }
-  ],
+  ],
-  "license": "MIT",
+  "license": "MIT",
-  "require": {
+  "require": {
-    "php": ">=8.0",
+    "php": ">=8.0",
-    "ext-json": "*",
+    "ext-json": "*",
-    "ext-redis": "*",
+    "ext-swoole": "*"
-    "ext-swoole": "*",
+  },
-    "psr/http-client": "^1.0",
+  "autoload": {
-    "psr/http-message": "^1.0"
+    "psr-4": {
-  },
+      "Kiri\\": "./"
-  "autoload": {
+    }
-    "psr-4": {
+  },
-      "Http\\Client\\": "src/"
+  "require-dev": {
-    }
+  }
-  },
+}
-  "require-dev": {
-  }
-}

src/AsyncClient.php

@@ -1,178 +0,0 @@
-<?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/CoroutineClient.php

@@ -1,129 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/5/24 0024
- * Time: 11:34
- */
-declare(strict_types=1);
-
-namespace Http\Client;
-
-use Exception;
-use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
-use Swoole\Coroutine\Http\Client as SwowClient;
-
-/**
- * Class Client
- * @package Kiri\Kiri\Http
- */
-class CoroutineClient 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);
-			if ($this->client->statusCode < 0) {
-				throw new Exception($this->client->errMsg);
-			}
-			$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]);
-			$this->setStatusCode(-1);
-			$this->setBody(jTraceEx($exception));
-		}
-	}
-
-
-	/**
-	 * @param $data
-	 * @param $host
-	 * @param $isHttps
-	 * @param $path
-	 */
-	private function generate_client($data, $host, $isHttps, $path): void
-	{
-		if ($isHttps || $this->isSSL()) {
-			$this->client = new SwowClient($host, 443, true);
-		} else {
-			$this->client = new SwowClient($host, $this->getPort(), false);
-		}
-		$this->client->set($this->settings());
-		if (!empty($this->getAgent())) {
-			$this->withAddedHeader('User-Agent', $this->getAgent());
-		}
-		$this->client->setHeaders($this->getHeader());
-		$this->client->setMethod(strtoupper($this->getMethod()));
-		$this->client->execute($this->setParams($path, $data));
-	}
-
-
-	/**
-	 * @param $path
-	 * @param $data
-	 * @return string
-	 */
-	private function setParams($path, $data): string
-	{
-		$content = $this->getData()->getContents();
-		if (!empty($content)) {
-			$this->client->setData($content);
-		}
-		if ($this->isGet()) {
-			if (!empty($data)) $path .= '?' . $data;
-		} else {
-			$data = $this->mergeParams($data);
-			if (!empty($data)) {
-				$this->client->setData($data);
-			}
-		}
-		return $path;
-	}
-
-	/**
-	 *
-	 */
-	public function close(): void
-	{
-		$this->client->close();
-	}
-}

src/HttpParse.php

@@ -1,109 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Http\Client;
-
-use Exception;
-
-/**
- * Class HttpParse
- * @package BeReborn\Http
- */
-class HttpParse
-{
-	/**
-	 * @param mixed ...$object
-	 * @return string
-	 */
-	private static function getKey(...$object): string
-	{
-		$first = '';
-		$tp = [];
-		foreach ($object as $key => $value) {
-			if ($value === null) {
-				continue;
-			}
-			if (is_array($value)) {
-				$value = key($value);
-			}
-			if ($first === '') {
-				$first = $value;
-			} else {
-				$tp[] = $value;
-			}
-		}
-		$key = $first . '[' . implode('][', $tp) . ']';
-		if (count($tp) < 1) {
-			$key = $first;
-		}
-		return $key;
-	}
-
-	/**
-	 * @param $data
-	 * @return string
-	 * @throws Exception
-	 */
-	public static function parse($data): string
-	{
-		$tmp = [];
-		if (is_string($data)) {
-			return $data;
-		}
-		foreach ($data as $key => $datum) {
-			if ($datum === null) {
-				continue;
-			}
-			$tmp[] = static::ifElse($key, $datum);
-		}
-		return implode('&', $tmp);
-	}
-
-	/**
-	 * @param $t
-	 * @param $qt
-	 * @return string
-	 * @throws Exception
-	 */
-	private static function ifElse($t, $qt): string
-	{
-		if (is_numeric($qt)) {
-			return $t . '=' . $qt;
-		}
-		if (is_string($qt)) {
-			$string = $t . '=' . urlencode($qt);
-		} else {
-			$string = static::encode($t, $qt);
-		}
-		return $string;
-	}
-
-	/**
-	 * @param mixed ...$object
-	 * @return string
-	 * @throws Exception
-	 */
-	private static function encode(...$object): string
-	{
-		$ret = [];
-
-		$data = $object[count($object) - 1];
-		$key = static::getKey(...$object);
-		foreach ($data as $s => $datum) {
-			if (is_array($datum)) {
-				$object[count($object) - 1] = $s;
-				$object[] = $datum;
-				$string = static::encode(...$object);
-			} else {
-				if (is_object($datum)) {
-					throw new Exception('Http body con\'t object.');
-				}
-				$string = $key . '=' . urlencode($datum);
-			}
-			$ret[] = $string;
-		}
-		return implode('&', $ret);
-	}
-
-
-}

src/TSwooleClient.php

@@ -1,38 +0,0 @@
-<?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;
-    }
-
-}