chore(release): 1.0.0-alpha.3

Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>

.idea/HDK-Core.iml

@@ -2,8 +2,8 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Singularity\HDK\Core\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Singularity\HDK\Test\Core\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/lines-of-code" />

.idea/codeception.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Codeception">
+    <option name="configurations">
+      <list>
+        <Configuration>
+          <option name="path" value="$PROJECT_DIR$/tests" />
+        </Configuration>
+      </list>
+    </option>
+  </component>
+</project>

.idea/phpspec.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PHPSpec">
+    <suites>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+    </suites>
+  </component>
+</project>

CHANGELOG.md

@@ -1,4 +1,18 @@
 # 版本更新日志
+## [1.0.0-alpha.3](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.2...v1.0.0-alpha.3) (2023-08-30)
+
+
+### ♻️ Code Refactoring | 代码重构
+
+* **http:** 整理了 Http 请求服务 ([2d95fba](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/2d95fbae9e926788402c24266ab0d232732a7754))
+
+## [1.0.0-alpha.2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2023-07-21)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **controller:** 修复方法访问级别不足以继承的问题 ([b30c844](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/b30c84488b7f85447bd802df77c9decbf315ed85))
+
 ## [1.0.0-alpha.1](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.0...v1.0.0-alpha.1) (2023-07-21)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-1.0.0-alpha.1
+1.0.0-alpha.3

composer.json

@@ -111,5 +111,5 @@
       "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "1.0.0-alpha.1"
+  "version": "1.0.0-alpha.3"
 }

docs/Http 请求.md

@@ -0,0 +1,26 @@
+# Http 请求
+
+## 1 组成
+
+* 单例类
+    * \Singularity\HDK\Core\Http\RequestService
+* 工厂类
+    * \Singularity\HDK\Core\Http\RequestServiceFactory
+
+## 2 初始化服务
+
+创建一个请求服务的方法有两种，效果是一致的：
+
+* 工厂模式
+* `\Singularity\HDK\Core\Http\RequestServiceFactory::make($options)`
+* `\Singularity\HDK\Core\Http\RequestServiceFactory::make()->setOptions($options)`
+* 单例模式
+    * `new \Singularity\HDK\Core\Http\RequestService($options)`
+    * `(new \Singularity\HDK\Core\Http\RequestService())->setOptions($options)`
+
+这两个方法都回返回一个 `\Singularity\HDK\Core\Http\RequestService` 实例
+
+## 3 规范
+
+每个通过本包提供的 Http 请求服务创建的服务，都应该在构建方法中实例化一个 RequestService 服务，
+之后该服务中使用的所有请求都基于该服务，这样可以避免共用单例模式导致的 options 污染

src/Http/RequestService.php

@@ -0,0 +1,190 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Singularity\HDK\Core\Http;
+
+use Ergebnis\Http\Method;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Utils;
+use Hyperf\Codec\Json;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\Guzzle\ClientFactory;
+use Psr\Http\Message\ResponseInterface;
+use Singularity\HDK\Core\Service\AbstractSingleton;
+
+/**
+ * Singularity\HDK\Core\Service\Http\RequestService@Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/8/30
+ *
+ * @template Options of array<literal-string, mixed>
+ */
+final class RequestService extends AbstractSingleton
+{
+    // public const TIMEOUT = 20;
+
+    #[Inject]
+    private ClientFactory $client;
+
+    /**
+     * @var Options
+     */
+    private array $options = [];
+
+    /**
+     * @param Options $options
+     */
+    public function __construct(array $options = [])
+    {
+        $this->setOptions($options);
+    }
+
+    /**
+     * 定制 options
+     * @param Options $options
+     * @return $this
+     */
+    public function setOptions(array $options): self
+    {
+        $this->options = array_replace_recursive($this->options, $options);
+        return $this;
+    }
+
+    /**
+     * @param string $url
+     * @param array<string, string|int> $params
+     * @param array $data
+     * @param Options $options
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
+    public function requestGet(
+        string $url,
+        array $params = [],
+        array $data = [],
+        array $options = []
+    ): ResponseInterface {
+        $request = new Request(
+            method: Method\Rfc\Rfc7231::GET, uri: $url
+        );
+        return $this->getClient($options)->send($request, ['query' => $params, 'json' => $data,]);
+    }
+
+    /**
+     *  工厂模式初始化请求
+     * @param Options $options
+     * @return Client
+     */
+    private function getClient(array $options): Client
+    {
+        $options = array_replace_recursive($this->options, $options);
+        return $this->client->create($options);
+    }
+
+    /**
+     * @param string $url
+     * @param array<string, string|int> $params
+     * @param array<string, mixed> $data
+     * @param Options $options
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
+    public function requestPost(
+        string $url,
+        array $params = [],
+        array $data = [],
+        array $options = []
+    ): ResponseInterface {
+        $data = Json::encode($data);
+        $request = new Request(
+            method: Method\Rfc\Rfc7231::POST,
+            uri: $url,
+            headers: ['Content-Type' => 'application/json'],
+            body: Utils::streamFor($data),
+        );
+        return $this->getClient($options)->send($request, ['query' => $params,]);
+    }
+
+    /**
+     * @param string $url
+     * @param array<string, mixed> $data
+     * @param array<string, string|int> $params
+     * @param Options $options
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
+    public function requestPut(
+        string $url,
+        array $params = [],
+        array $data = [],
+        array $options = []
+    ): ResponseInterface {
+        $data = Json::encode($data);
+        $request = new Request(
+            method: Method\Rfc\Rfc7231::PUT,
+            uri: $url,
+            headers: ['Content-Type' => 'application/json'],
+            body: Utils::streamFor($data)
+        );
+        return $this->getClient($options)->send(
+            $request, ['query' => $params,]
+        );
+    }
+
+    /**
+     * @param string $url
+     * @param array<string, mixed> $data
+     * @param array<string, string|int> $params
+     * @param Options $options
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
+    public function requestPatch(
+        string $url,
+        array $params = [],
+        array $data = [],
+        array $options = []
+    ): ResponseInterface {
+        $data = Json::encode($data);
+        $request = new Request(
+            method: Method\Rfc\Rfc5789::PATCH,
+            uri: $url,
+            headers: ['Content-Type' => 'application/json'],
+            body: Utils::streamFor($data)
+        );
+        return $this->getClient($options)->send(
+            $request, ['query' => $params,]
+        );
+    }
+
+    /**
+     * @param string $url
+     * @param array<string, mixed> $data
+     * @param array<string, string|int> $params
+     * @param Options $options
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
+    public function requestDelete(
+        string $url,
+        array $params = [],
+        array $data = [],
+        array $options = []
+    ): ResponseInterface {
+        $data = Json::encode($data);
+        $request = new Request(
+            method: Method\Rfc\Rfc7231::DELETE,
+            uri: $url,
+            headers: ['Content-Type' => 'application/json'],
+            body: Utils::streamFor($data)
+        );
+        return $this->getClient($options)->send(
+            $request, ['query' => $params,]
+        );
+    }
+}

src/Http/RequestServiceFactory.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * RequestFactory.php@Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/8/30
+ */
+
+namespace Singularity\HDK\Core\Http;
+
+use Singularity\HDK\Core\Service\AbstractFactory;
+
+final class RequestServiceFactory extends AbstractFactory
+{
+    public static function make(array $options = []): RequestService
+    {
+        return new RequestService($options);
+    }
+}

src/Service/AbstractFactory.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * AbstractFactory.php@Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/8/30
+ */
+
+namespace Singularity\HDK\Core\Service;
+
+use Dont\DontCall;
+use Dont\DontInstantiate;
+
+/**
+ * Singularity\HDK\Core\Service\AbstractFactory@Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/8/30
+ */
+abstract class AbstractFactory
+{
+    use DontInstantiate;
+    use DontCall;
+
+    abstract static function make();
+}

src/Service/AbstractSingleton.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * SingletonInterface.php@Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/8/30
+ */
+
+namespace Singularity\HDK\Core\Service;
+
+use Dont\DontCallStatic;
+use Dont\DontClone;
+
+/**
+ * Singularity\HDK\Core\Service\SingletonInterface@Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/8/30
+ */
+abstract class AbstractSingleton
+{
+    use DontCallStatic;
+    use DontClone;
+}

src/Service/HttpRequestService.php

@@ -16,6 +16,7 @@ use Psr\Http\Message\ResponseInterface;
 
 /**
  * 发起 Http 请求的类
+ * @deprecated since version 1.0-alpha.3, to be removed in 1.0
  */
 class HttpRequestService
 {

src/Traits/RestfulList.php

@@ -20,11 +20,11 @@ use Singularity\HDK\Core\Service\ExtendService;
 trait RestfulList
 {
     #[Inject]
-    private ExtendService $extend;
+    protected ExtendService $extend;
     #[Inject]
-    private RequestInterface $request;
+    protected RequestInterface $request;
 
-    public function restSelect(Closure $callback, ?Closure $filter = null)
+    protected function restSelect(Closure $callback, ?Closure $filter = null)
     {
         $options = [];
         $result = $this->parseParameters(function ($query, $parsedOptions) use ($callback, &$options) {
@@ -34,7 +34,7 @@ trait RestfulList
         return $this->responseFormatter($options, $result, $filter);
     }
 
-    public function parseParameters(Closure $callback): mixed
+    protected function parseParameters(Closure $callback): mixed
     {
         $query = $this->request->getQueryParams();
         $options = [
@@ -49,7 +49,7 @@ trait RestfulList
         return $callback(query: $query, options: $options);
     }
 
-    public function responseFormatter(
+    protected function responseFormatter(
         array $options,
         Builder $builder,
         ?Closure $filter = null