More code refactoring.

Fix for OS Helper.
Added Hot Reload with FSWatch.

composer.json

@@ -29,7 +29,8 @@
     "predis/predis": "^1.1",
     "ext-json": "*",
     "ext-fileinfo": "*",
-    "ext-pdo": "*"
+    "ext-pdo": "*",
+    "ext-pcntl": "*"
   },
   "require-dev": {
     "laravel/lumen-framework": "~5.3",

config/swoole_http.php

@@ -59,11 +59,11 @@
     |--------------------------------------------------------------------------
     */
     'hot_reload' => [
-        'enabled' => env('SWOOLE_HOT_RELOAD_ENABLE', true),
-        'level' => env('SWOOLE_HOT_RELOAD_DEEP_LEVEL', 10),
-        'directory' => env('SWOOLE_HOT_RELOAD_DIRECTORY', base_path()),
+        'enabled' => env('SWOOLE_HOT_RELOAD_ENABLE', false),
+        'recursively' => env('SWOOLE_HOT_RELOAD_RECURSIVELY', true),
+        'directory' => env('SWOOLE_HOT_RELOAD_DIRECTORY', base_path('app')),
         'log' => env('SWOOLE_HOT_RELOAD_LOG', true),
-        'files' => ['*.php'],
+        'filter' => env('SWOOLE_HOT_RELOAD_FILTER', '.php'),
     ],
 
     /*

src/Commands/HttpServerCommand.php

@@ -5,6 +5,10 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
 use Swoole\Process;
+use SwooleTW\Http\Helpers\Alias;
+use SwooleTW\Http\HotReload\FSEvent;
+use SwooleTW\Http\HotReload\FSProcess;
+use SwooleTW\Http\Server\Facades\Server;
 use SwooleTW\Http\Server\Manager;
 use Throwable;
 
@@ -67,7 +71,7 @@ public function handle()
      */
     protected function loadConfigs()
     {
-        $this->config = $this->laravel->make('config')->get('swoole_http');
+        $this->config = $this->laravel->make(Alias::CONFIG)->get('swoole_http');
     }
 
     /**
@@ -91,6 +95,7 @@ protected function start()
 
         $host = Arr::get($this->config, 'server.host');
         $port = Arr::get($this->config, 'server.port');
+        $hotReloadEnabled = Arr::get($this->config, 'hot_reload.enabled');
 
         $this->info('Starting swoole http server...');
         $this->info("Swoole http server started: <http://{$host}:{$port}>");
@@ -101,7 +106,14 @@ protected function start()
             );
         }
 
-        $this->laravel->make(Manager::class)->run();
+        $manager = $this->laravel->make(Manager::class);
+        $server = $this->laravel->make(Server::class);
+
+        if ($hotReloadEnabled) {
+            $manager->addProcess($this->getHotReloadProcess($server));
+        }
+
+        $manager->run();
     }
 
     /**
@@ -231,6 +243,26 @@ protected function initAction()
         }
     }
 
+    /**
+     * @param \SwooleTW\Http\Server\Facades\Server $server
+     *
+     * @return \Swoole\Process
+     */
+    protected function getHotReloadProcess($server)
+    {
+        $recursively = Arr::get($this->config, 'hot_reload.recursively');
+        $directory = Arr::get($this->config, 'hot_reload.directory');
+        $filter = Arr::get($this->config, 'hot_reload.filter');
+        $log = Arr::get($this->config, 'hot_reload.log');
+
+        $cb = function (FSEvent $event) use ($server, $log) {
+            $log ? $this->info($event->getPath()) : null;
+            $server->reload();
+        };
+
+        return (new FSProcess($filter, $recursively, $directory))->make($cb);
+    }
+
     /**
      * If Swoole process is running.
      *
@@ -333,19 +365,19 @@ protected function checkEnvironment()
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             $this->error("Swoole extension doesn't support Windows OS yet.");
 
-            return;
-        } else {
-            if (! extension_loaded('swoole')) {
-                $this->error("Can't detect Swoole extension installed.");
+            exit(1);
+        }
 
-                return;
-            } else {
-                if (! version_compare(swoole_version(), '4.0.0', 'ge')) {
-                    $this->error("Your Swoole version must be higher than 4.0 to use coroutine.");
+        if (! extension_loaded('swoole')) {
+            $this->error("Can't detect Swoole extension installed.");
 
-                    return;
-                }
-            }
+            exit(1);
+        }
+
+        if (! version_compare(swoole_version(), '4.0.0', 'ge')) {
+            $this->error("Your Swoole version must be higher than 4.0 to use coroutine.");
+
+            exit(1);
         }
     }
 }

src/Concerns/ResetApplication.php

@@ -2,6 +2,7 @@
 
 namespace SwooleTW\Http\Concerns;
 
+use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Container\Container;
 use SwooleTW\Http\Exceptions\SandboxException;
 use SwooleTW\Http\Server\Resetters\ResetterContract;
@@ -28,7 +29,7 @@ trait ResetApplication
      */
     protected function setInitialConfig()
     {
-        $this->config = clone $this->getBaseApp()->make('config');
+        $this->config = clone $this->getBaseApp()->make(Repository::class);
     }
 
     /**

src/Coroutine/Connectors/MySqlConnector.php

@@ -2,6 +2,7 @@
 
 namespace SwooleTW\Http\Coroutine\Connectors;
 
+
 use Illuminate\Database\Connectors\MySqlConnector as BaseConnector;
 use Illuminate\Support\Str;
 use SwooleTW\Http\Coroutine\PDO as SwoolePDO;

src/Coroutine/PDOStatement.php

@@ -236,7 +236,8 @@ public function fetch(
     /**
      * Returns a single column from the next row of a result set or FALSE if there are no more rows.
      *
-     * @param int $column_number
+     * @param int|null $columnNumber
+     *
      * 0-indexed number of the column you wish to retrieve from the row.
      * If no value is supplied, PDOStatement::fetchColumn() fetches the first column.
      *

src/Helpers/OS.php

@@ -21,7 +21,7 @@ final class OS
      *
      * @const string
      */
-    public const LINUX = 'linux';
+    public const LINUX = 'lin';
 
     /**
      * Linux
@@ -39,7 +39,7 @@ final class OS
      */
     public static function is(string ...$types): bool
     {
-        return \in_array(static::current(), $types, true);
+        return Str::contains(static::current(), $types);
     }
 
     /**
@@ -49,6 +49,6 @@ public static function is(string ...$types): bool
      */
     public static function current(): string
     {
-        return Str::lower(PHP_OS);
+        return Str::substr(Str::lower(PHP_OS), 0, 3);
     }
 }

src/HotReload/FSEvent.php

@@ -0,0 +1,138 @@
+<?php
+
+namespace SwooleTW\Http\HotReload;
+
+use Illuminate\Support\Carbon;
+
+/**
+ * Class FSEvent
+ */
+class FSEvent
+{
+    /**
+     * Event - Created
+     *
+     * @var string
+     */
+    public const Created = 'Created';
+
+    /**
+     * Event - Updated
+     *
+     * @var string
+     */
+    public const Updated = 'Updated';
+
+    /**
+     * Event - Removed
+     *
+     * @var string
+     */
+    public const Removed = 'Removed';
+
+    /**
+     * Event - Renamed
+     *
+     * @var string
+     */
+    public const Renamed = 'Renamed';
+
+    /**
+     * Event - OwnerModified
+     *
+     * @var string
+     */
+    public const OwnerModified = 'OwnerModified';
+
+    /**
+     * Event - AttributeModified
+     *
+     * @var string
+     */
+    public const AttributeModified = 'AttributeModified';
+
+    /**
+     * Event - MovedFrom
+     *
+     * @var string
+     */
+    public const MovedFrom = 'MovedFrom';
+
+    /**
+     * Event - MovedTo
+     *
+     * @var string
+     */
+    public const MovedTo = 'MovedTo';
+
+    /**
+     * When event fired
+     *
+     * @var \Illuminate\Support\Carbon
+     */
+    protected $when;
+
+    /**
+     * Directory or file path
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Event types
+     *
+     * @var array
+     */
+    protected $types;
+
+    /**
+     * Event constructor.
+     *
+     * @param \Illuminate\Support\Carbon $when
+     * @param string $path
+     * @param array $types
+     */
+    public function __construct(Carbon $when, string $path, array $types)
+    {
+        $this->when = $when;
+        $this->path = $path;
+        $this->types = $types;
+    }
+
+    /**
+     * @return \Illuminate\Support\Carbon
+     */
+    public function getWhen(): Carbon
+    {
+        return $this->when;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * @return array
+     */
+    public function getTypes(): array
+    {
+        return $this->types;
+    }
+
+    /**
+     * Checks if event types has needed type(s)
+     *
+     * @param string ...$types
+     *
+     * @return bool
+     */
+    public function isType(string ...$types): bool
+    {
+        return count(array_intersect($this->types, $types)) > 0;
+    }
+}

src/HotReload/FSEventParser.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace SwooleTW\Http\HotReload;
+
+use Illuminate\Support\Carbon;
+
+/**
+ * Class FSEventParser
+ */
+class FSEventParser
+{
+    protected const REGEX = '/^([\S+]{3}\s+[\S+]{3}\s+[\d+]{2}\s+[\d+]{2}:[\d+]{2}:{0,2}:[\d+]{2}:{0,2}\s+[\d+]{0,4})\s+(\/[\S+]*)\s+([\S+*\s+]*)/mi';
+
+    protected const DATE = 1;
+    protected const PATH = 2;
+    protected const EVENTS = 3;
+
+    /**
+     * @param string $event
+     *
+     * @return \SwooleTW\Http\HotReload\FSEvent
+     */
+    public static function toEvent(string $event): ?FSEvent
+    {
+        if (preg_match(static::REGEX, $event, $matches)) {
+            $date = Carbon::parse($matches[static::DATE]);
+            $path = $matches[static::PATH];
+            $events = explode(' ', $matches[static::EVENTS]);
+
+            return new FSEvent($date, $path, $events);
+        }
+
+        return null;
+    }
+}