pre-release: v1.0.0-alpha

cloudtay · Oct 31, 2024 · c530743 · c530743
1 parent 6bc1ebd
commit c530743
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 320 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,5 @@
 {
   "name": "cloudtay/ripple-driver",
-  "version": "dev-main",
   "license": "MIT",
   "autoload": {
     "psr-4": {
@@ -23,7 +22,9 @@
     "ext-posix": "*",
     "ext-sockets": "*",
     "ext-pdo": "*",
-    "cloudtay/ripple": "*"
+    "cloudtay/ripple": "^1.0.0",
+    "cloudtay/ripple-http": "dev-main",
+    "cloudtay/ripple-websocket": "dev-main"
   },
   "require-dev": {
     "amphp/mysql": "^3.0",
@@ -38,10 +39,8 @@
     "topthink/framework": "*",
     "workerman/workerman": "*",
     "workerman/webman-framework": "dev-master",
-    "yiisoft/yii2": "^2.0@beta",
-    "cloudtay/ripple": "dev-main",
-    "cloudtay/ripple-http": "dev-main",
-    "cloudtay/ripple-websocket": "dev-main"
+    "yiisoft/yii2": "^2.0@beta"
+
   },
   "extra": {
     "laravel": {

diff --git a/example/fifo.php b/example/fifo.php
diff --git a/example/output.php b/example/output.php
diff --git a/example/worker.php b/example/worker.php
diff --git a/example/workerman4.php b/example/workerman4.php
@@ -34,7 +34,7 @@
 
 include_once __DIR__ . '/../vendor/autoload.php';
 
-use Ripple\Drive\Workerman\Driver4;
+use Ripple\Driver\Workerman\Driver4;
 use Ripple\Utils\Output;
 use Workerman\Timer;
 use Workerman\Worker;
@@ -73,7 +73,7 @@
 
     //使用原生guzzle实现异步请求
     try {
-        $response = Co\Plugin::Guzzle()->newClient()->get('https://www.baidu.com/');
+        $response = \Ripple\Http\Guzzle::newClient()->get('https://www.baidu.com/');
         \var_dump($response->getStatusCode());
         $connection->send("[async] Response status code: {$response->getStatusCode()}" . \PHP_EOL);
     } catch (Throwable $exception) {

diff --git a/example/workerman5.php b/example/workerman5.php
@@ -34,7 +34,7 @@
 
 include_once __DIR__ . '/../vendor/autoload.php';
 
-use Ripple\Drive\Workerman\Driver5;
+use Ripple\Driver\Workerman\Driver5;
 use Ripple\Utils\Output;
 use Workerman\Timer;
 use Workerman\Worker;
@@ -73,15 +73,14 @@
 
     //使用原生guzzle实现异步请求
     try {
-        $response = Co\Plugin::Guzzle()->newClient()->get('https://www.baidu.com/');
+        $response = \Ripple\Http\Guzzle::newClient()->get('https://www.baidu.com/');
         \var_dump($response->getStatusCode());
         $connection->send("[async] Response status code: {$response->getStatusCode()}" . \PHP_EOL);
     } catch (Throwable $exception) {
         $connection->send("[async] Exception: {$exception->getMessage()}" . \PHP_EOL);
 
     }
 
-
     $connection->send("say {$data}");
 };
 

diff --git a/src/Laravel/Driver.php b/src/Laravel/Driver.php
@@ -36,13 +36,13 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Config;
-use Ripple\Stream\Exception\ConnectionException;
-use Ripple\Stream\Stream;
+use Revolt\EventLoop\UnsupportedFeatureException;
 use Ripple\Kernel;
+use Ripple\Stream;
+use Ripple\Stream\Exception\ConnectionException;
 use Ripple\Utils\Output;
 use Ripple\Utils\Serialization\Zx7e;
 use Ripple\Worker\Manager;
-use Revolt\EventLoop\UnsupportedFeatureException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -115,6 +115,7 @@ class Driver extends Command
      * @param OutputInterface $output
      *
      * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function initialize(InputInterface $input, OutputInterface $output): void
     {

diff --git a/src/Laravel/Worker.php b/src/Laravel/Worker.php
@@ -35,12 +35,9 @@
 namespace Ripple\Driver\Laravel;
 
 use Co\IO;
-use Co\Net;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Config;
-use Ripple\App\Http\Server\Request;
-use Ripple\App\Http\Server\Server;
 use Ripple\Driver\Laravel\Events\RequestHandled;
 use Ripple\Driver\Laravel\Events\RequestReceived;
 use Ripple\Driver\Laravel\Events\RequestTerminated;
@@ -49,7 +46,8 @@
 use Ripple\Driver\Laravel\Traits\DispatchesEvents;
 use Ripple\Driver\Utils\Console;
 use Ripple\Driver\Utils\Guard;
-use Ripple\Utils\Output;
+use Ripple\Http\Server;
+use Ripple\Http\Server\Request;
 use Ripple\Worker\Manager;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Throwable;
@@ -66,7 +64,7 @@
  * @Author cclilshy
  * @Date   2024/8/16 23:38
  */
-class Worker extends \Ripple\Worker\Worker
+class Worker extends \Ripple\Worker
 {
     use Console;
     use DispatchesEvents;
@@ -119,18 +117,13 @@ public function register(Manager $manager): void
         /*** output logs*/
         fwrite(STDOUT, $this->formatRow(["- Logs"]));
 
-        $server = Net::Http()->server($this->address, [
+        $server = new Server($this->address, [
             'socket' => [
                 'so_reuseport' => 1,
                 'so_reuseaddr' => 1
             ]
         ]);
 
-        if (!$server) {
-            Output::error('Server not supported');
-            exit(1);
-        }
-
         $this->server      = $server;
         $this->application = Application::getInstance();