Move files from root internal directory to plugins

src/BundledPlugin/HttpServer/Internal/Middleware/RequestsCounterMiddleware.php

@@ -18,8 +18,10 @@ public function __construct(private NetworkTrafficCounter $trafficStatisticStore
 
     public function handleRequest(Request $request, RequestHandler $requestHandler): Response
     {
-        $this->trafficStatisticStore->incRequests();
-
-        return $requestHandler->handleRequest($request);
+        try {
+            return $requestHandler->handleRequest($request);
+        } finally {
+            $this->trafficStatisticStore->incRequests();
+        }
     }
 }

src/ReloadStrategy/EachRequestReloadStrategy.php → src/BundledPlugin/HttpServer/ReloadStrategy/EachRequestReloadStrategy.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\ReloadStrategy;
+namespace Luzrain\PHPStreamServer\BundledPlugin\HttpServer\ReloadStrategy;
 
 use Amp\Http\Server\Request;
-use Luzrain\PHPStreamServer\Internal\ReloadStrategy\ReloadStrategyInterface;
+use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy\ReloadStrategyInterface;
 
 /**
  * Reload worker after each request.

src/ReloadStrategy/MaxRequestsReloadStrategy.php → src/BundledPlugin/HttpServer/ReloadStrategy/MaxRequestsReloadStrategy.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\ReloadStrategy;
+namespace Luzrain\PHPStreamServer\BundledPlugin\HttpServer\ReloadStrategy;
 
 use Amp\Http\Server\Request;
-use Luzrain\PHPStreamServer\Internal\ReloadStrategy\ReloadStrategyInterface;
+use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy\ReloadStrategyInterface;
 
 /**
  * Reload worker on every $maxRequests requests.

src/Internal/Scheduler/Scheduler.php → src/BundledPlugin/Scheduler/Internal/Scheduler.php

@@ -2,16 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Scheduler;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Internal;
 
 use Amp\DeferredFuture;
 use Amp\Future;
-use Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Internal\ProcessScheduledEvent;
 use Luzrain\PHPStreamServer\BundledPlugin\Scheduler\PeriodicProcess;
+use Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Trigger\TriggerFactory;
+use Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Trigger\TriggerInterface;
 use Luzrain\PHPStreamServer\Exception\PHPStreamServerException;
 use Luzrain\PHPStreamServer\Internal\MessageBus\MessageBus;
-use Luzrain\PHPStreamServer\Internal\Scheduler\Trigger\TriggerFactory;
-use Luzrain\PHPStreamServer\Internal\Scheduler\Trigger\TriggerInterface;
 use Luzrain\PHPStreamServer\Internal\SIGCHLDHandler;
 use Luzrain\PHPStreamServer\Internal\Status;
 use Psr\Log\LoggerInterface;

src/Internal/Scheduler/WorkerPool.php → src/BundledPlugin/Scheduler/Internal/WorkerPool.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Scheduler;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Internal;
 
 use Luzrain\PHPStreamServer\BundledPlugin\Scheduler\PeriodicProcess;
 use Luzrain\PHPStreamServer\Exception\PHPStreamServerException;

src/BundledPlugin/Scheduler/SchedulerPlugin.php

@@ -6,13 +6,13 @@
 
 use Amp\Future;
 use Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Command\SchedulerCommand;
+use Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Internal\Scheduler;
 use Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Internal\SchedulerStatus;
 use Luzrain\PHPStreamServer\Internal\Container;
 use Luzrain\PHPStreamServer\Internal\Logger\LoggerInterface;
 use Luzrain\PHPStreamServer\Internal\MasterProcess;
 use Luzrain\PHPStreamServer\Internal\MessageBus\MessageBus;
 use Luzrain\PHPStreamServer\Internal\MessageBus\MessageHandler;
-use Luzrain\PHPStreamServer\Internal\Scheduler\Scheduler;
 use Luzrain\PHPStreamServer\Plugin\Plugin;
 use Luzrain\PHPStreamServer\Process;
 use Revolt\EventLoop\Suspension;

src/Internal/Scheduler/Trigger/CronExpressionTrigger.php → src/BundledPlugin/Scheduler/Trigger/CronExpressionTrigger.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Scheduler\Trigger;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Trigger;
 
 use Cron\CronExpression;
 

src/Internal/Scheduler/Trigger/DateTimeTrigger.php → src/BundledPlugin/Scheduler/Trigger/DateTimeTrigger.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Scheduler\Trigger;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Trigger;
 
 /**
  * @internal

src/Internal/Scheduler/Trigger/JitterTrigger.php → src/BundledPlugin/Scheduler/Trigger/JitterTrigger.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Scheduler\Trigger;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Trigger;
 
 /**
  * @internal

src/Internal/Scheduler/Trigger/PeriodicalTrigger.php → src/BundledPlugin/Scheduler/Trigger/PeriodicalTrigger.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Scheduler\Trigger;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Trigger;
 
 /**
  * @internal

src/Internal/Scheduler/Trigger/TriggerFactory.php → src/BundledPlugin/Scheduler/Trigger/TriggerFactory.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Scheduler\Trigger;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Trigger;
 
 /**
  * @internal

src/Internal/Scheduler/Trigger/TriggerInterface.php → src/BundledPlugin/Scheduler/Trigger/TriggerInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Scheduler\Trigger;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Scheduler\Trigger;
 
 /**
  * @internal

src/Internal/Supervisor/ProcessStatus.php → src/BundledPlugin/Supervisor/Internal/ProcessStatus.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Supervisor;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal;
 
 /**
  * @internal

src/Internal/ReloadStrategy/ReloadStrategyInterface.php → src/BundledPlugin/Supervisor/Internal/ReloadStrategy/ReloadStrategyInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\ReloadStrategy;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy;
 
 interface ReloadStrategyInterface
 {

src/Internal/ReloadStrategy/ReloadStrategyTrigger.php → src/BundledPlugin/Supervisor/Internal/ReloadStrategy/ReloadStrategyTrigger.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\ReloadStrategy;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy;
 
 use Revolt\EventLoop;
 
@@ -14,11 +14,10 @@ final class ReloadStrategyTrigger
     /** @var list<ReloadStrategyInterface> */
     private array $reloadStrategies = [];
 
-    public function __construct(private readonly \Closure $reloadCallback)
-    {
-    }
-
-    public function addReloadStrategy(ReloadStrategyInterface ...$reloadStrategies): void
+    /**
+     * @param array<ReloadStrategyInterface> $reloadStrategies
+     */
+    public function __construct(private readonly \Closure $reloadCallback, array $reloadStrategies)
     {
         foreach ($reloadStrategies as $reloadStrategy) {
             if ($reloadStrategy instanceof TimerReloadStrategyInterface) {

src/Internal/ReloadStrategy/TimerReloadStrategyInterface.php → src/BundledPlugin/Supervisor/Internal/ReloadStrategy/TimerReloadStrategyInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\ReloadStrategy;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy;
 
 interface TimerReloadStrategyInterface extends ReloadStrategyInterface
 {

src/Internal/Supervisor/Supervisor.php → src/BundledPlugin/Supervisor/Internal/Supervisor.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Supervisor;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal;
 
 use Amp\DeferredFuture;
 use Amp\Future;

src/Internal/Supervisor/WorkerPool.php → src/BundledPlugin/Supervisor/Internal/WorkerPool.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\Internal\Supervisor;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal;
 
 use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\WorkerProcess;
 use Luzrain\PHPStreamServer\Exception\PHPStreamServerException;
@@ -22,7 +22,7 @@ final class WorkerPool
     private array $workerPool = [];
 
     /**
-     * @var array<int, array<int, ProcessStatus>>
+     * @var ProcessStatus
      */
     private array $processStatusMap = [];
 

src/ReloadStrategy/ExceptionReloadStrategy.php → src/BundledPlugin/Supervisor/ReloadStrategy/ExceptionReloadStrategy.php

@@ -2,21 +2,18 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\ReloadStrategy;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\ReloadStrategy;
 
-use Amp\Http\Server\ClientException;
-use Amp\Http\Server\HttpErrorException;
-use Luzrain\PHPStreamServer\Internal\ReloadStrategy\ReloadStrategyInterface;
+use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy\ReloadStrategyInterface;
 
 /**
- * Reload worker each time after exception occurs
+ * Reload worker each time when exception occurs
  */
 final class ExceptionReloadStrategy implements ReloadStrategyInterface
 {
     /** @var array<class-string<\Throwable>> */
     private array $allowedExceptions = [
-        ClientException::class,
-        HttpErrorException::class,
+        'Amp\Http\Server\HttpErrorException',
     ];
 
     /**

src/ReloadStrategy/MaxMemoryReloadStrategy.php → src/BundledPlugin/Supervisor/ReloadStrategy/MaxMemoryReloadStrategy.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\ReloadStrategy;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\ReloadStrategy;
 
-use Luzrain\PHPStreamServer\Internal\ReloadStrategy\TimerReloadStrategyInterface;
+use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy\TimerReloadStrategyInterface;
 
 /**
  * Reload worker if worker memory usage has increased $maxMemory value

src/ReloadStrategy/TTLReloadStrategy.php → src/BundledPlugin/Supervisor/ReloadStrategy/TTLReloadStrategy.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Luzrain\PHPStreamServer\ReloadStrategy;
+namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor\ReloadStrategy;
 
-use Luzrain\PHPStreamServer\Internal\ReloadStrategy\TimerReloadStrategyInterface;
+use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy\TimerReloadStrategyInterface;
 
 /**
  * Reload worker after $ttl working time

src/BundledPlugin/Supervisor/SupervisorPlugin.php

@@ -6,13 +6,13 @@
 
 use Amp\Future;
 use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Command\ProcessesCommand;
+use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\Supervisor;
 use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Status\SupervisorStatus;
 use Luzrain\PHPStreamServer\Internal\Container;
 use Luzrain\PHPStreamServer\Internal\Logger\LoggerInterface;
 use Luzrain\PHPStreamServer\Internal\MasterProcess;
 use Luzrain\PHPStreamServer\Internal\MessageBus\MessageBus;
 use Luzrain\PHPStreamServer\Internal\MessageBus\MessageHandler;
-use Luzrain\PHPStreamServer\Internal\Supervisor\Supervisor;
 use Luzrain\PHPStreamServer\Plugin\Plugin;
 use Luzrain\PHPStreamServer\Process;
 use Revolt\EventLoop\Suspension;

src/BundledPlugin/Supervisor/WorkerProcess.php

@@ -4,9 +4,9 @@
 
 namespace Luzrain\PHPStreamServer\BundledPlugin\Supervisor;
 
+use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy\ReloadStrategyInterface;
+use Luzrain\PHPStreamServer\BundledPlugin\Supervisor\Internal\ReloadStrategy\ReloadStrategyTrigger;
 use Luzrain\PHPStreamServer\Internal\ErrorHandler;
-use Luzrain\PHPStreamServer\Internal\ReloadStrategy\ReloadStrategyInterface;
-use Luzrain\PHPStreamServer\Internal\ReloadStrategy\ReloadStrategyTrigger;
 use Luzrain\PHPStreamServer\Process;
 use Revolt\EventLoop;
 
@@ -15,13 +15,14 @@ class WorkerProcess extends Process
     final public const RELOAD_EXIT_CODE = 100;
     private const GC_PERIOD = 180;
 
-    private ReloadStrategyTrigger $reloadStrategyTrigger;
+    protected readonly ReloadStrategyTrigger $reloadStrategyTrigger;
     private bool $isReloading = false;
 
     /**
      * @param null|\Closure(self):void $onStart
      * @param null|\Closure(self):void $onStop
      * @param null|\Closure(self):void $onReload
+     * @param array<ReloadStrategyInterface> $reloadStrategies
      */
     public function __construct(
         string $name = 'none',
@@ -32,6 +33,7 @@ public function __construct(
         \Closure|null $onStart = null,
         private readonly \Closure|null $onStop = null,
         private readonly \Closure|null $onReload = null,
+        private readonly array $reloadStrategies = [],
     ) {
         parent::__construct(name: $name, user: $user, group: $group, onStart: $onStart, onStop: $this->onStop(...));
     }
@@ -60,27 +62,14 @@ protected function start(): void
             \gc_mem_caches();
         });
 
-        $this->reloadStrategyTrigger = new ReloadStrategyTrigger($this->reload(...));
+        $this->reloadStrategyTrigger = new ReloadStrategyTrigger($this->reload(...), $this->reloadStrategies);
 
         EventLoop::setErrorHandler(function (\Throwable $exception) {
             ErrorHandler::handleException($exception);
             $this->reloadStrategyTrigger->emitEvent($exception);
         });
     }
 
-    public function addReloadStrategy(ReloadStrategyInterface ...$reloadStrategies): void
-    {
-        $this->reloadStrategyTrigger->addReloadStrategy(...$reloadStrategies);
-    }
-
-    /**
-     * @TODO get rid of this
-     */
-    public function emitReloadEvent(mixed $event): void
-    {
-        $this->reloadStrategyTrigger->emitEvent($event);
-    }
-
     public function stop(int $code = 0): void
     {
         $this->isReloading = $this->reloadable && $code === self::RELOAD_EXIT_CODE;