Swoole server ready

Console helper ready for all
Small touches across the system

Author: ahmard

.gitignore

@@ -1,5 +1,5 @@
 /.idea/
 /vendor/
 /composer.lock
-/bin/.pid
+/bin/.swoole-pid
 .env

README.md

@@ -1,16 +1,21 @@
 # PHP Server
-A small library to help run PHP servers easily and quickly. 
+
+A small library to help run PHP servers easily and quickly.
 
 ## Installation
+
 ```
 composer require ahmard/php-server
 ```
 
 ## Usage
+
 ### PHP Built-In Server
+
 An implementation of [Built-In Server](https://www.php.net/manual/en/features.commandline.webserver.php)
 
 - With document root
+
 ```php
 use PHPServer\BuiltIn\Server;
 
@@ -21,6 +26,7 @@ Server::create('127.0.0.1', '9900')
 ```
 
 - Route request to single entry file
+
 ```php
 use PHPServer\BuiltIn\Server;
 
@@ -30,6 +36,7 @@ Server::create('127.0.0.1', '9900')
 ```
 
 - Provide callable to be invoked when request is received
+
 ```php
 use PHPServer\BuiltIn\Server;
 
@@ -38,8 +45,8 @@ Server::create('127.0.0.1', '9900')
     ->start();
 ```
 
-
 ### ReactPHP
+
 An implementation of [ReactPHP](https://reactphp.org)
 
 ```php
@@ -63,6 +70,7 @@ Server::create('127.0.0.1', 9001)
 ```
 
 ### Swoole
+
 An implementation of [Swoole](https://swoole.co.uk)
 
 ```php
@@ -79,7 +87,6 @@ $handler = function (Request $request) {
 };
 
 Server::create('127.0.0.1', 9904)
-    ->watchFilesystemChanges([__DIR__])
     ->onRequest($handler)
     ->setServerConfig([
         'enable_static_handler' => true,
@@ -89,4 +96,27 @@ Server::create('127.0.0.1', 9904)
     ])
     ->start()
     ->logOutputToConsole();
+```
+
+Swoole with filesystem watcher
+
+```php
+use PHPServer\Swoole\Http\Request;
+use PHPServer\Swoole\Server;
+
+require 'vendor/autoload.php';
+
+Server::create('127.0.0.1', 9904)
+    ->watchFilesystemChanges([__DIR__])
+    ->onRequest(function (Request $request){
+        $request->response()->html('Hello');
+    })
+    ->setServerConfig([
+        'enable_static_handler' => true,
+        'http_parse_post' => true,
+        'worker_num' => 8,
+        'package_max_length' => 10 * 1024 * 1024
+    ])
+    ->start()
+    ->logOutputToConsole();
 ```

bin/built-in.php

@@ -10,7 +10,6 @@
 /**@var ServerInfo $serverInfo * */
 $serverInfo = $arguments['info'];
 
-
 if (null !== $serverInfo->getRequestCallback()) {
     $serverInfo->getRequestCallback()();
 }

bin/react.php

@@ -13,8 +13,8 @@
 $serverInfo = $arguments['info'];
 
 $socket = new SocketServer("{$serverInfo->getHost()}:{$serverInfo->getPort()}");
-$http = new HttpServer($serverInfo->getRequestCallback());
+$httpServer = new HttpServer($serverInfo->getRequestCallback());
 
-echo "Server started";
+echo "ReactPHP server started at http://{$serverInfo->getHost()}:{$serverInfo->getPort()}\n";
 
-$http->listen($socket);
+$httpServer->listen($socket);

bin/swoole.php

@@ -1,9 +1,9 @@
 <?php
 
 use Dotenv\Dotenv;
+use PHPServer\Console;
 use PHPServer\Env;
 use PHPServer\ServerInfo;
-use PHPServer\Swoole\Console;
 use PHPServer\Swoole\Http\Request;
 use PHPServer\Swoole\Http\Response;
 use PHPServer\Terminal;
@@ -62,7 +62,7 @@ function (SWRequest $swRequest, SWResponse $swResponse) use ($serverInfo): void
     $server->on('start', function (Server $server) use ($serverInfo, $swooleData) {
         Console::info("Swoole server started at http://{$serverInfo->getHost()}:{$serverInfo->getPort()}");
 
-        file_put_contents(__DIR__ . '/.pid', $server->getMasterPid());
+        file_put_contents(__DIR__ . '/.swoole-pid', $server->getMasterPid());
 
         //Run file watcher
         if (!empty($swooleData['watch_filesystem_changes'])) {

composer.json

@@ -17,8 +17,7 @@
     "require-dev": {
         "phpstan/phpstan": "^0.12.98",
         "symfony/var-dumper": "^5.3",
-        "swoole/ide-helper": "^4.7",
-        "ahmard/swotch": "^0.0.1"
+        "swoole/ide-helper": "^4.7"
     },
     "autoload": {
         "psr-4": {

src/Swoole/Console.php renamed to src/Console.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace PHPServer\Swoole;
+namespace PHPServer;
 
 
 use Symfony\Component\Console\Output\ConsoleOutput;

src/Swoole/Http/Middleware.php

@@ -8,7 +8,6 @@
 use PHPServer\Env;
 use RingCentral\Psr7\Uri;
 use Swoole\Http\Request as SWRequest;
-use Throwable;
 
 
 /**
@@ -20,7 +19,6 @@ class Request
 {
     protected ?array $parsedJsonBody = null;
     protected bool $expectsJson = false;
-    protected RequestMiddleware $middleware;
     protected Uri $uri;
 
 
@@ -75,16 +73,6 @@ public function __call(string $name, array $arguments): mixed
         return $this->request->$name(...$arguments);
     }
 
-    /**
-     * @throws Throwable
-     * @throws JsonException
-     */
-    public function initMiddleware(array $middlewares): void
-    {
-        $this->middleware = new RequestMiddleware($this, $middlewares);
-        $this->middleware->current()->handle($this);
-    }
-
     /**
      * Get http url params
      *
@@ -191,11 +179,11 @@ public function response(): Response
         return $this->response;
     }
 
-    public function middleware(): RequestMiddleware
-    {
-        return $this->middleware;
-    }
-
+    /**
+     * Returns an instance of swoole request class
+     *
+     * @return SWRequest
+     */
     public function getSwooleRequest(): SWRequest
     {
         return $this->request;

src/Swoole/Http/Middlewares/MiddlewareInterface.php

@@ -173,4 +173,14 @@ public function html(string $htmlCode, int $status = 200, array $headers = []):
             );
         }
     }
+
+    /**
+     * Returns an instance of swoole response class
+     *
+     * @return SWResponse
+     */
+    public function getSwooleResponse(): SWResponse
+    {
+        return $this->response;
+    }
 }

src/Swoole/Http/Request.php

@@ -5,6 +5,8 @@
 use PHPServer\AbstractServer;
 use PHPServer\ServerCommand;
 use PHPServer\Terminal;
+use RuntimeException;
+use Swotch\Watcher;
 use function PHPServer\base_path;
 
 class Server extends AbstractServer
@@ -21,8 +23,18 @@ public static function cleanSwooleServerConfig(array $config): array
         return $config;
     }
 
+    /**
+     * This will require an installation of "ahmard/swotch" package
+     *
+     * @param array $paths
+     * @return $this
+     */
     public function watchFilesystemChanges(array $paths): static
     {
+        if (!class_exists(Watcher::class)) {
+            throw new RuntimeException('Filesystem watcher requires an installation of "ahmard/swotch"');
+        }
+
         $this->serverConfig['watch_filesystem_changes'] = $paths;
         return $this;
     }