future(): ripplev2 & databse-connection-pool

Author: cclilshy

.gitignore

@@ -4,4 +4,3 @@ laravel-ripple.iml
 composer.lock
 .php-cs-fixer.cache
 /vendor/
-

README.md

@@ -1,7 +1,4 @@
 <p align="center">
-<img src="https://raw.githubusercontent.com/cloudtay/ripple/refs/heads/main/assets/images/logo.png" width="420" alt="Logo">
-</p>
-<p align="center">
 <a href="#"><img src="https://img.shields.io/badge/PHP-%3E%3D%208.3-blue" alt="Build Status"></a>
 <a href="https://packagist.org/packages/cloudtay/ripple"><img src="https://img.shields.io/packagist/dt/cloudtay/ripple" alt="Download statistics"></a>
 <a href="https://packagist.org/packages/cloudtay/ripple"><img src="https://img.shields.io/packagist/v/cloudtay/ripple" alt="Stable version"></a>

composer.json

@@ -19,22 +19,14 @@
     "ext-posix": "*",
     "ext-sockets": "*",
     "ext-pdo": "*",
-    "cloudtay/ripple": "^1.0",
-    "cloudtay/ripple-http": "^1.0",
+    "cloudtay/ripple": "^2.0",
     "laravel/framework": "^11.0|^12.0"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "*",
-    "illuminate/http": "*",
-    "illuminate/console": "*",
-    "illuminate/container": "*",
-    "illuminate/support": "*",
     "phpunit/phpunit": "*",
     "laravel/octane": "2.x-dev"
   },
-  "suggest": {
-    "cloudtay/ripple-websocket": "^1.0"
-  },
   "minimum-stability": "dev",
   "prefer-stable": true,
   "extra": {

src/Built/Command.php

@@ -13,8 +13,7 @@
 namespace Laravel\Ripple\Built;
 
 use Laravel\Ripple\Inspector\Client;
-use Revolt\EventLoop\UnsupportedFeatureException;
-use Ripple\Utils\Output;
+use Ripple\Runtime\Support\Stdin;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -26,7 +25,6 @@ class Command extends \Illuminate\Console\Command
 {
     /**
      * the name and signature of the console command.
-     *
      * @var string
      */
     protected $signature = 'ripple:server
@@ -41,9 +39,8 @@ class Command extends \Illuminate\Console\Command
     protected $description = 'start the ripple service';
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
-     *
      * @return void
      */
     public function initialize(InputInterface $input, OutputInterface $output): void
@@ -53,58 +50,55 @@ public function initialize(InputInterface $input, OutputInterface $output): void
 
     /**
      * 运行服务
-     *
      * @param Client $client
-     *
      * @return void
-     * @throws UnsupportedFeatureException
      */
     public function handle(Client $client): void
     {
         switch ($this->argument('action')) {
             case 'start':
                 if ($client->serverIsRunning()) {
-                    Output::warning('the server is already running');
+                    Stdin::println('the server is already running');
                     return;
                 }
                 $client->start($this->option('daemon'));
-                Output::writeln('server started');
+                Stdin::println('server started');
                 break;
 
             case 'stop':
                 if (!$client->serverIsRunning()) {
-                    Output::warning('the server is not running');
+                    Stdin::println('the server is not running');
                     return;
                 }
                 $client->inspector->stopServer();
                 break;
 
             case 'reload':
                 if (!$client->serverIsRunning()) {
-                    Output::warning('the server is not running');
+                    Stdin::println('the server is not running');
                     return;
                 }
                 $client->inspector->reloadServer();
                 break;
 
             case 'restart':
                 if (!$client->serverIsRunning()) {
-                    Output::warning('the server is not running');
+                    Stdin::println('the server is not running');
                     return;
                 }
                 $client->inspector->restartServer();
                 break;
 
             case 'status':
                 if (!$client->serverIsRunning()) {
-                    Output::writeln('the server is not running');
+                    Stdin::println('the server is not running');
                 } else {
-                    Output::info('the server is running');
+                    Stdin::println('the server is running');
                 }
                 break;
 
             default:
-                Output::warning('Unsupported operation');
+                Stdin::println('Unsupported operation');
         }
     }
 }

src/Built/Coroutine/ContainerMap.php

@@ -29,7 +29,6 @@ class ContextManager
 
     /**
      * @param Container $application
-     *
      * @return void
      */
     public static function bind(Container $application): void
@@ -56,7 +55,6 @@ public static function unbind(): void
     /**
      * @param string|null $abstract
      * @param array       $parameters
-     *
      * @return mixed
      * @throws BindingResolutionException
      */

src/Built/Coroutine/ContextManager.php

@@ -19,7 +19,7 @@
 use Laravel\Ripple\Built\Listeners\FlushAuthenticationState;
 use Laravel\Ripple\Built\Listeners\FlushQueuedCookies;
 use Laravel\Ripple\Built\Listeners\FlushSessionState;
-use Ripple\Utils\Output;
+use Ripple\Runtime\Support\Stdin;
 
 class RequestReceived
 {
@@ -40,7 +40,7 @@ public function __construct(public Application $app, public Application $sandbox
             try {
                 $app->make($listener)->handle($this);
             } catch (BindingResolutionException $e) {
-                Output::warning($e->getMessage());
+                Stdin::println($e->getMessage());
             }
         }
 

src/Built/Events/RequestReceived.php

@@ -21,7 +21,7 @@ class WorkerErrorOccurred
     /**
      * @param Application $app
      * @param Application $sandbox
-     * @param Throwable                          $exception
+     * @param Throwable $exception
      */
     public function __construct(public Application $app, public Application $sandbox, public Throwable $exception)
     {

src/Built/Events/WorkerErrorOccurred.php

@@ -12,17 +12,11 @@
 
 namespace Laravel\Ripple\Built;
 
-use FilesystemIterator;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Config;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use Ripple\File\File;
-use Ripple\File\Monitor;
-use SplFileInfo;
+use Laravel\Ripple\Monitor;
 
 use function is_dir;
-use function array_shift;
 use function is_file;
 
 class Factory
@@ -104,38 +98,16 @@ public static function defaultServicesToWarm(): array
      */
     public static function createMonitor(): Monitor
     {
-        $monitor    = File::getInstance()->monitor();
+        $monitor = new Monitor();
         $watchPaths = Config::get('ripple.WATCH_PATHS', []);
 
-        $after = [];
-
         foreach ($watchPaths as $path) {
             if (is_file($path)) {
                 $monitor->add($path);
             }
 
             if (is_dir($path)) {
-                $iterator = new RecursiveIteratorIterator(
-                    new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS),
-                    RecursiveIteratorIterator::SELF_FIRST
-                );
-
-                /*** @var SplFileInfo $file */
-                foreach ($iterator as $file) {
-                    if ($file->isDir()) {
-                        $after[] = $file->getPathname();
-                    }
-
-                    if ($file->isFile()) {
-                        $monitor->add($file->getPathname());
-                    }
-                }
-
-                $after[] = $path;
-            }
-
-            while ($path = array_shift($after)) {
-                $monitor->add($path);
+                $monitor->add($path, 'php');
             }
         }
 

src/Built/Factory.php

@@ -18,7 +18,6 @@ class FlushAuthenticationState
 {
     /**
      * Handle the event.
-     *
      * @param mixed $event
      */
     public function handle(mixed $event): void