Update: Compatibility testing for libev extensions

cloudtay · Aug 27, 2024 · 72309da · 72309da
1 parent d9a6fbf
commit 72309da
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 3 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -23,7 +23,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          extensions: posix,sockets,pcntl,openssl,parallel,curl
+          extensions: posix,sockets,pcntl,openssl,parallel,curl,ev
         env:
           phpts: ts
 

diff --git a/README.en.md b/README.en.md
@@ -18,6 +18,21 @@ By using PRipple, you will experience the advantages of managing tasks from a gl
 composer require cclilshy/p-ripple-core
 ````
 
+### Event Selection Guide
+
+| Extension Types | Recommended Use | Compatibility |                                                             Description                                                              |
+|:---------------:|:---------------:|:-------------:|:------------------------------------------------------------------------------------------------------------------------------------:|
+|     `libev`     |       🟢        |      🟢️      | Event extension `Ev` is a more efficient event extension that performs consistently in various systems and is recommended to be used |
+|    `Native`     |        ️        |      🟢       |                                                 Support pure PHP without extensions                                                  |
+|     `event`     |                 |      🌗       |                  The event characteristics under different systems are not uniform, and its use is not recommended                   |
+|    `swoole`     |                 |       ❌       |                        Incompatible with multi-threading model, not recommended, but can coexist with PRipple                        |
+
+### Ev extension installation
+
+```bash
+pecl install ev
+```
+
 ### Learning
 
 You can visit PRipple’s [Documentation](https://p-ripple.cloudtay.com/) to start reading

diff --git a/README.md b/README.md
@@ -18,6 +18,21 @@ PRipple是一个现代化的、高性能的原生PHP协程引擎，旨在解决P
 composer require cclilshy/p-ripple-core
 ````
 
+### 事件选型指南
+
+|   扩展类型   | 推荐使用 | 兼容性 |                说明                 |
+|:--------:|:----:|:---:|:---------------------------------:|
+| `libev`  |  🟢  | 🟢️ | 事件扩展`Ev`是更加高效的事件扩展,在各系统中表现一致,推荐使用 |
+|   `原生`   |  ️   | 🟢  |            支持纯PHP无扩展使用            |
+| `event`  |      | 🌗  |       在不同系统下的事件特性不统一,不推荐使用        |
+| `swoole` |      |  ❌  |   与多线程模型不兼容,不推荐使用,但可以与PRipple并存   |
+
+### Ev扩展安装
+
+```bash
+pecl install ev
+```
+
 ### 开始学习
 
 你可以访问PRipple的[文档](https://p-ripple.cloudtay.com/)开始阅读

diff --git a/src/Core/Http/Http.php b/src/Core/Http/Http.php
@@ -38,6 +38,7 @@
 use Psc\Core\Http\Server\HttpServer;
 use Psc\Core\LibraryAbstract;
 use Psc\Plugins\Guzzle\Guzzle;
+use Throwable;
 
 /**
  * @Author cclilshy
@@ -62,6 +63,7 @@ public function Guzzle(): Guzzle
      * @param string $address
      * @param mixed  $context
      * @return HttpServer
+     * @throws Throwable
      */
     public function server(string $address, mixed $context = null): HttpServer
     {

diff --git a/src/Core/Http/Server/HttpServer.php b/src/Core/Http/Server/HttpServer.php
@@ -76,6 +76,7 @@ class HttpServer
     /**
      * @param string     $address
      * @param mixed|null $context
+     * @throws Throwable
      */
     public function __construct(string $address, mixed $context = null)
     {
@@ -111,7 +112,7 @@ public function __construct(string $address, mixed $context = null)
             $this->server->setOption(SOL_SOCKET, SO_REUSEPORT, 1);
             $this->server->setOption(SOL_SOCKET, SO_KEEPALIVE, 1);
             $this->server->setBlocking(false);
-        });
+        })->await();
     }
 
     /**

diff --git a/src/Core/WebSocket/Server/Server.php b/src/Core/WebSocket/Server/Server.php
@@ -89,6 +89,7 @@ class Server
      * @param string       $address
      * @param mixed|null   $context
      * @param Options|null $options
+     * @throws Throwable
      */
     public function __construct(string $address, mixed $context = null, Options $options = null)
     {
@@ -112,7 +113,7 @@ public function __construct(string $address, mixed $context = null, Options $opt
             $this->server->setOption(SOL_SOCKET, SO_REUSEPORT, 1);
             $this->server->setOption(SOL_SOCKET, SO_KEEPALIVE, 1);
             $this->server->setBlocking(false);
-        });
+        })->await();
     }
 
     /**

diff --git a/src/Core/WebSocket/WebSocket.php b/src/Core/WebSocket/WebSocket.php
@@ -37,6 +37,7 @@
 use Psc\Core\LibraryAbstract;
 use Psc\Core\WebSocket\Client\Connection;
 use Psc\Core\WebSocket\Server\Server;
+use Throwable;
 
 /**
  * @Author cclilshy
@@ -65,6 +66,7 @@ public function connect(string $address, int|float $timeout = 10, mixed $context
      * @param mixed        $context
      * @param Options|null $options
      * @return Server
+     * @throws Throwable
      */
     public function server(string $address, mixed $context, Options $options = null): Server
     {