新增http客户端

extend/catcher/facade/Http.php

@@ -0,0 +1,12 @@
+<?php
+namespace catcher\facade;
+
+use think\Facade;
+
+class Http extends Facade
+{
+    protected static function getFacadeClass()
+    {
+        return \catcher\library\client\Http::class;
+    }
+}

extend/catcher/library/Http.php

@@ -1,84 +0,0 @@
-<?php
-namespace catcher\library;
-
-use catcher\CatchAdmin;
-use catcher\exceptions\FailedException;
-use GuzzleHttp\Client;
-use GuzzleHttp\TransferStats;
-use Psr\Http\Message\ResponseInterface;
-use function GuzzleHttp\Psr7\stream_for;
-
-class Http
-{
-    protected $auth = [];
-
-    protected $proxy = [];
-
-    /**
-     * download
-     *
-     * @time 2020年04月30日
-     * @param $remoteUrl
-     * @param $filePath
-     * @return mixed
-     */
-    public function download($remoteUrl, $filePath = null)
-    {
-        try {
-
-            $params = [
-                'timeout' => 5, // 请求超时时间
-                'on_headers' => function (ResponseInterface $response) {
-                    $response->getHeader('Content-Length');
-                },
-                'on_stats' => function (TransferStats $stats) {
-                },
-            ];
-
-            if (!empty($this->auth)) {
-                $params['auth'] = $this->auth;
-            }
-
-            if (!empty($proxy)) {
-                $params['proxy'] = $this->proxy;
-            }
-
-            if ($filePath) {
-                $resource = fopen($filePath, 'w+');
-
-                $stream = stream_for($resource);
-
-                $params['save_to'] = $stream;
-            }
-
-           return (new Client())->request('get', $remoteUrl, $params);
-        } catch (\Exception $e) {
-            throw new FailedException($e->getMessage());
-        }
-
-        return $filePath;
-    }
-
-    /**
-     * 认证
-     *
-     * @time 2020年04月30日
-     * @param $username
-     * @param $password
-     * @return $this
-     */
-    public function auth($username, $password)
-    {
-        $this->auth = [$username, $password];
-
-        return $this;
-    }
-
-
-    public function proxy(array $proxy)
-    {
-        $this->proxy = $proxy;
-
-        return $this;
-    }
-}

extend/catcher/library/client/Http.php

@@ -0,0 +1,345 @@
+<?php
+namespace catcher\library\client;
+
+use catcher\exceptions\FailedException;
+use GuzzleHttp\Client;
+use GuzzleHttp\TransferStats;
+use Psr\Http\Message\ResponseInterface;
+use function GuzzleHttp\Psr7\stream_for;
+
+class Http
+{
+    /**
+     * @var Client $client
+     */
+    protected $client = null;
+
+    /**
+     * auth
+     *
+     * @var array
+     */
+    protected $auth = [];
+
+    /**
+     * 代理
+     *
+     * @var array
+     */
+    protected $proxy = [];
+
+    protected $body = [];
+
+
+    protected $header = [];
+
+
+    protected $formParams = [];
+
+
+    protected $query = [];
+
+
+    protected $json = [];
+    /**
+     * 异步请求
+     *
+     * @var bool
+     */
+    protected $async = false;
+
+
+    protected $timeout = [];
+
+    /**
+     * Http constructor.
+     * @param string $baseUri
+     */
+    public function __construct(string $baseUri = '')
+    {
+        $this->getClient($baseUri);
+
+
+    }
+
+    /**
+     * 获取 Guzzle 客户端
+     *
+     * @param $baseUri
+     * @time 2020年05月21日
+     * @return Client
+     */
+    public function getClient(string $baseUri)
+    {
+        if (!$this->client) {
+            $this->client = $baseUri ? new Client([
+                'base_uri' => $baseUri
+            ]) : new Client;
+        }
+
+        return $this->client;
+    }
+
+    /**
+     * headers
+     *
+     * @time 2020年05月21日
+     * @param array $headers
+     * @return $this
+     */
+    public function headers(array $headers)
+    {
+        $this->header = [
+            'headers' => $headers
+        ];
+
+        return $this;
+    }
+
+    /**
+     * body
+     *
+     * @time 2020年05月21日
+     * @param $body
+     * @return $this
+     */
+    public function body($body)
+    {
+        $this->body = [
+            'body' => $body
+        ];
+
+        return $this;
+    }
+
+    /**
+     * json
+     *
+     * @time 2020年05月21日
+     * @param array $data
+     * @return $this
+     */
+    public function json(array $data)
+    {
+        $this->json = [
+            'json' => $data
+        ];
+
+        return $this;
+    }
+
+    /**
+     * query
+     *
+     * @time 2020年05月21日
+     * @param array $query
+     * @return $this
+     */
+    public function query(array $query)
+    {
+        $this->query = [
+            'query' => $query,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * form params
+     *
+     * @time 2020年05月21日
+     * @param $params
+     * @return $this
+     */
+    public function formParams($params)
+    {
+        $this->formParams = [
+            'form_params' => $params
+        ];
+
+        return $this;
+    }
+
+    /**
+     * timeout
+     *
+     * @time 2020年05月21日
+     * @param $timeout
+     * @return $this
+     */
+    public function timeout($timeout)
+    {
+        $this->timeout = [
+            'connect_timeout' => $timeout
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Request get
+     *
+     * @time 2020年05月21日
+     * @param $url
+     * @return Response
+     */
+    public function get($url)
+    {
+        $response = $this->client->{$this->asyncMethod(__FUNCTION__)}($url, array_merge($this->header, $this->query, $this->timeout));
+
+        return new Response($response);
+    }
+
+    /**
+     * Request post
+     *
+     * @time 2020年05月21日
+     * @param $url
+     * @return mixed
+     */
+    public function post($url)
+    {
+        return $this->client->{$this->asyncMethod(__FUNCTION__)}($url, array_merge(
+            $this->header, $this->body, $this->formParams, $this->json, $this->timeout
+        ) );
+    }
+
+    /**
+     * Request put
+     *
+     * @time 2020年05月21日
+     * @param $url
+     * @return mixed
+     */
+    public function put($url)
+    {
+        return $this->client->{$this->asyncMethod(__FUNCTION__)}($url, array_merge(
+            $this->header, $this->body, $this->formParams, $this->json, $this->timeout
+        ));
+    }
+
+    /**
+     * Request delete
+     *
+     * @time 2020年05月21日
+     * @param $url
+     * @return mixed
+     */
+    public function delete($url)
+    {
+        return $this->client{$this->asyncMethod(__FUNCTION__)}($url, array_merge(
+            $this->header, $this->query, $this->timeout
+        ));
+    }
+
+    /**
+     * 异步请求
+     *
+     * @time 2020年05月21日
+     * @return $this
+     */
+    public function async()
+    {
+        $this->async = true;
+
+        return $this;
+    }
+
+    /**
+     * 异步方法
+     *
+     * @time 2020年05月21日
+     * @param $method
+     * @return string
+     */
+    protected function asyncMethod($method)
+    {
+        return $this->async ? $method . 'Async' : $method;
+    }
+
+    public function onHeaders(\Closure $closure)
+    {
+        return $closure();
+    }
+
+    public function onStats(\Closure $closure)
+    {
+        return $closure();
+    }
+
+
+    /**
+     * download
+     *
+     * @time 2020年04月30日
+     * @param $remoteUrl
+     * @param $filePath
+     * @param int $timeout
+     * @return mixed
+     */
+    public function download($remoteUrl, $filePath = null, $timeout = 5)
+    {
+        try {
+
+            $params = [
+                'timeout' => $timeout, // 请求超时时间
+                'on_headers' => function (ResponseInterface $response) {
+                    $response->getHeader('Content-Length');
+                },
+                'on_stats' => function (TransferStats $stats) {
+                },
+            ];
+
+            if (!empty($this->auth)) {
+                $params['auth'] = $this->auth;
+            }
+
+            if (!empty($proxy)) {
+                $params['proxy'] = $this->proxy;
+            }
+
+            if ($filePath) {
+                $resource = fopen($filePath, 'w+');
+
+                $stream = stream_for($resource);
+
+                $params['save_to'] = $stream;
+            }
+
+            return (new Client())->request('get', $remoteUrl, $params);
+        } catch (\Exception $e) {
+            throw new FailedException($e->getMessage());
+        }
+
+        return $filePath;
+    }
+
+    /**
+     * 认证
+     *
+     * @time 2020年04月30日
+     * @param $username
+     * @param $password
+     * @return $this
+     */
+    public function auth($username, $password)
+    {
+        $this->auth = [$username, $password];
+
+        return $this;
+    }
+
+    /**
+     * proxy
+     *
+     * @time 2020年05月21日
+     * @param array $proxy
+     * @return $this
+     */
+    public function proxy(array $proxy)
+    {
+        $this->proxy = $proxy;
+
+        return $this;
+    }
+}

extend/catcher/library/client/Response.php

@@ -0,0 +1,147 @@
+<?php
+namespace catcher\library\client;
+
+
+/**
+ * http response
+ *
+ * From Laravel
+ *
+ * @time 2020年05月21日
+ */
+class Response implements \ArrayAccess
+{
+    /**
+     * @var \GuzzleHttp\Psr7\Response
+     */
+    protected $response;
+
+    public function __construct(\GuzzleHttp\Psr7\Response $response)
+    {
+        $this->response = $response;
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @return string
+     */
+    public function body():string
+    {
+        return $this->response->getBody();
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @return array
+     */
+    public function json():array
+    {
+        return \json_decode($this->response->getBody()->getContents(), true);
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @return int
+     */
+    public function status():int
+    {
+        return $this->response->getStatusCode();
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @return bool
+     */
+    public function ok():bool
+    {
+        return $this->status() == 200;
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @return bool
+     */
+    public function successful():bool
+    {
+        return $this->status() >= 200 && $this->status() < 300;
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @return bool
+     */
+    public function failed():bool
+    {
+        return $this->status() >= 400;
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @return array
+     */
+    public function headers(): array
+    {
+        return $this->response->getHeaders();
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @param $name
+     * @param $arguments
+     * @return mixed
+     */
+    public function __call($name, $arguments)
+    {
+        // TODO: Implement __call() method.
+        return $this->response->{$name}(...$arguments);
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset)
+    {
+        // TODO: Implement offsetExists() method.
+        return isset($this->json()[$offset]);
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @param mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset)
+    {
+        // TODO: Implement offsetGet() method.
+        return $this->json()[$offset];
+    }
+
+    /**
+     *
+     * @time 2020年05月21日
+     * @param mixed $offset
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        // TODO: Implement offsetSet() method.
+    }
+
+    public function offsetUnset($offset)
+    {
+        // TODO: Implement offsetUnset() method.
+    }
+}