1. Adds feature tests for modules

2. Fixes some bugs with Sentry events
3. Fixes some bugs with inspector events
4. Updates RoadRunner version
5. Fixes some bugs with Ray events

app/config/broadcasting.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use App\Application\Broadcasting\InMemoryDriver;
 use Spiral\Broadcasting\Driver\NullBroadcast;
 
 return [
@@ -14,5 +15,8 @@
  'null' => [
  'driver' => NullBroadcast::class,
  ],
+ 'in-memory' => [
+ 'driver' => InMemoryDriver::class,
+ ],
  ],
 ];

app/config/cache.php

@@ -3,18 +3,22 @@
 declare(strict_types=1);
 
 use Spiral\Cache\Storage\ArrayStorage;
-use Spiral\Cache\Storage\FileStorage;
+
+$defaultStorage = env('CACHE_DEFAULT_STORAGE', 'roadrunner');
 
 return [
- 'default' => env('CACHE_STORAGE', 'local'),
+ 'default' => env('CACHE_STORAGE', 'roadrunner'),
+ 'aliases' => [
+ 'events' => ['storage' => $defaultStorage, 'prefix' => 'events:'],
+ 'local' => ['storage' => $defaultStorage, 'prefix' => 'local:'],
+ ],
  'storages' => [
- 'local' => [
- 'type' => 'roadrunner',
- 'driver' => 'local',
+ 'array' => [
+ 'type' => ArrayStorage::class,
  ],
- 'events' => [
+ 'roadrunner' => [
  'type' => 'roadrunner',
- 'driver' => 'events',
+ 'driver' => 'local',
  ],
  ],
 ];

app/modules/Events/Interfaces/Http/Controllers/ClearEventsAction.php → app/modules/Events/Interfaces/Http/Controllers/ClearAction.php

@@ -5,17 +5,21 @@
 namespace Modules\Events\Interfaces\Http\Controllers;
 
 use App\Application\Commands\ClearEvents;
+use App\Application\HTTP\Response\ResourceInterface;
+use App\Application\HTTP\Response\SuccessResource;
 use Modules\Events\Interfaces\Http\Request\ClearEventsRequest;
 use Spiral\Cqrs\CommandBusInterface;
 use Spiral\Router\Annotation\Route;
 
-final class ClearEventsAction
+final class ClearAction
 {
  #[Route(route: 'events', name: 'events.clear', methods: 'DELETE', group: 'api')]
- public function __invoke(ClearEventsRequest $request, CommandBusInterface $bus): void
+ public function __invoke(ClearEventsRequest $request, CommandBusInterface $bus): ResourceInterface
  {
  $bus->dispatch(
- new ClearEvents(type: $request->type)
+ new ClearEvents(type: $request->type),
  );
+
+ return new SuccessResource();
  }
 }

app/modules/Events/Interfaces/Http/Controllers/DeleteEventAction.php → app/modules/Events/Interfaces/Http/Controllers/DeleteAction.php

@@ -6,16 +6,20 @@
 
 use App\Application\Commands\DeleteEvent;
 use App\Application\Domain\ValueObjects\Uuid;
+use App\Application\HTTP\Response\ResourceInterface;
+use App\Application\HTTP\Response\SuccessResource;
 use Spiral\Cqrs\CommandBusInterface;
 use Spiral\Router\Annotation\Route;
 
-final class DeleteEventAction
+final class DeleteAction
 {
  #[Route(route: 'event/<uuid>', name: 'event.delete', methods: 'DELETE', group: 'api')]
- public function __invoke(CommandBusInterface $bus, Uuid $uuid): void
+ public function __invoke(CommandBusInterface $bus, Uuid $uuid): ResourceInterface
  {
  $bus->dispatch(
- new DeleteEvent($uuid)
+ new DeleteEvent($uuid),
  );
+
+ return new SuccessResource();
  }
 }

app/modules/Events/Interfaces/Http/Controllers/ListAction.php

@@ -6,6 +6,7 @@
 
 use App\Application\Commands\FindEvents;
 use Modules\Events\Interfaces\Http\Request\EventsRequest;
+use Modules\Events\Interfaces\Http\Resources\EventCollection;
 use Spiral\Cqrs\QueryBusInterface;
 use Spiral\Router\Annotation\Route;
 

app/modules/Events/Interfaces/Http/Controllers/ShowAction.php

@@ -7,6 +7,7 @@
 use App\Application\Commands\FindEventByUuid;
 use App\Application\Domain\ValueObjects\Uuid;
 use App\Application\Exception\EntityNotFoundException;
+use Modules\Events\Interfaces\Http\Resources\EventResource;
 use Spiral\Cqrs\QueryBusInterface;
 use Spiral\Http\Exception\ClientException\NotFoundException;
 use Spiral\Router\Annotation\Route;

app/modules/Events/Interfaces/Http/Request/ClearEventsRequest.php

@@ -4,15 +4,15 @@
 
 namespace Modules\Events\Interfaces\Http\Request;
 
-use Spiral\Filters\Attribute\Input\Post;
+use Spiral\Filters\Attribute\Input\Data;
 use Spiral\Filters\Model\Filter;
 use Spiral\Filters\Model\FilterDefinitionInterface;
 use Spiral\Filters\Model\HasFilterDefinition;
 use Spiral\Validator\FilterDefinition;
 
 final class ClearEventsRequest extends Filter implements HasFilterDefinition
 {
- #[Post]
+ #[Data]
  public ?string $type = null;
 
  public function filterDefinition(): FilterDefinitionInterface

app/modules/Events/Interfaces/Http/Controllers/EventCollection.php → app/modules/Events/Interfaces/Http/Resources/EventCollection.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Modules\Events\Interfaces\Http\Controllers;
+namespace Modules\Events\Interfaces\Http\Resources;
 
 use App\Application\HTTP\Response\ResourceCollection;
 

app/modules/Events/Interfaces/Http/Controllers/EventResource.php → app/modules/Events/Interfaces/Http/Resources/EventResource.php

@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Modules\Events\Interfaces\Http\Controllers;
+namespace Modules\Events\Interfaces\Http\Resources;
 
 use App\Application\HTTP\Response\JsonResource;
 use Modules\Events\Domain\Event;
-use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * @property-read Event $data
@@ -18,7 +17,7 @@ public function __construct(Event $data)
  parent::__construct($data);
  }
 
- protected function mapData(ServerRequestInterface $request): array|\JsonSerializable
+ protected function mapData(): array|\JsonSerializable
  {
  return [
  'uuid' => (string)$this->data->getUuid(),

app/modules/HttpDumps/Interfaces/Http/Handler/AnyHttpRequestDump.php

@@ -51,7 +51,7 @@ public function handle(ServerRequestInterface $request, \Closure $next): Respons
  $event = $this->handler->handle($payload);
 
  $this->commands->dispatch(
- new HandleReceivedEvent(type: 'http-dump', payload: $event)
+ new HandleReceivedEvent(type: 'http-dump', payload: $event),
  );
 
  return $this->responseWrapper->create(200);
@@ -77,7 +77,7 @@ private function createPayload(ServerRequestInterface $request): array
  function (UploadedFileInterface $attachment) use ($id) {
  $this->bucket->write(
  $filename = $id . '/' . $attachment->getClientFilename(),
- $attachment->getStream()
+ $attachment->getStream(),
  );
 
  return [
@@ -88,9 +88,9 @@ function (UploadedFileInterface $attachment) use ($id) {
  'mime' => $attachment->getClientMediaType(),
  ];
  },
- $request->getUploadedFiles()
+ $request->getUploadedFiles(),
  ),
- ]
+ ],
  ];
  }
 }

app/modules/Inspector/Interfaces/Http/Handler/EventHandler.php

@@ -35,12 +35,17 @@ public function handle(ServerRequestInterface $request, \Closure $next): Respons
  ?? throw new ClientException\BadRequestException('Invalid data');
 
  $type = $data[0]['type'] ?? 'unknown';
- if ($type !== 'request') {
- throw new ClientException\BadRequestException('Invalid data');
- }
+
+ $data = match ($type) {
+ 'process',
+ 'request' => $data,
+ default => throw new ClientException\BadRequestException(
+ \sprintf('Invalid type "%s". [%s] expected.', $type, \implode(', ', ['process', 'request'])),
+ ),
+ };
 
  $this->commands->dispatch(
- new HandleReceivedEvent(type: 'inspector', payload: $data)
+ new HandleReceivedEvent(type: 'inspector', payload: $data),
  );
 
  return $this->responseWrapper->create(200);

app/modules/Ray/Interfaces/Http/Handler/EventHandler.php

@@ -58,14 +58,15 @@ private function handleEvent(ServerRequestInterface $request): ResponseInterface
  $this->cache->set($hash, 1, CarbonInterval::minute(5));
  } elseif ($type === TypeEnum::ClearAll->value) {
  $this->commands->dispatch(new ClearEvents(type: 'ray'));
+ return $this->responseWrapper->create(200);
  }
 
  $event = $this->handler->handle($event);
 
  $this->commands->dispatch(
  new HandleReceivedEvent(
- type: 'ray', payload: $event, uuid: Uuid::fromString($event['uuid'])
- )
+ type: 'ray', payload: $event, uuid: Uuid::fromString($event['uuid']),
+ ),
  );
 
  return $this->responseWrapper->create(200);
@@ -86,9 +87,11 @@ private function handleLocks(ServerRequestInterface $request): ResponseInterface
 
  private function isValidRequest(ServerRequestInterface $request): bool
  {
+ $userAgent = $request->getServerParams()['HTTP_USER_AGENT'] ?? '';
+
  return $request->getHeaderLine('X-Buggregator-Event') === 'ray'
  || $request->getAttribute('event-type') === 'ray'
- || \str_starts_with($request->getUri()->getPath(), 'Ray')
- || $request->getUri()->getUserInfo() === 'ray';
+ || $request->getUri()->getUserInfo() === 'ray'
+ || \str_starts_with($userAgent, 'Ray');
  }
 }

app/modules/Sentry/Application/PayloadParser.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\Sentry\Application;
+
+use App\Application\HTTP\GzippedStreamFactory;
+use Psr\Http\Message\ServerRequestInterface;
+
+final class PayloadParser
+{
+ public function __construct(
+ private readonly GzippedStreamFactory $gzippedStreamFactory,
+ ) {
+ }
+
+ public function parse(ServerRequestInterface $request): array
+ {
+ $isV4 = $request->getHeaderLine('Content-Type') === 'application/x-sentry-envelope' ||
+ \str_contains($request->getHeaderLine('X-Sentry-Auth'), 'sentry.php/4');
+
+ if ($isV4) {
+ if ($request->getHeaderLine('Content-Encoding') === 'gzip') {
+ return \iterator_to_array($this->gzippedStreamFactory->createFromRequest($request)->getPayload());
+ }
+
+ $payloads = \explode("\n", (string)$request->getBody());
+
+ return \array_map(
+ static fn(string $payload): array => \json_decode($payload, true),
+ \array_filter($payloads),
+ );
+ }
+
+ return [$request->getParsedBody()];
+ }
+}

app/modules/Sentry/Interfaces/Http/Handler/EventHandler.php

@@ -5,9 +5,9 @@
 namespace Modules\Sentry\Interfaces\Http\Handler;
 
 use App\Application\Commands\HandleReceivedEvent;
-use App\Application\HTTP\GzippedStreamFactory;
 use App\Application\Service\HttpHandler\HandlerInterface;
 use Modules\Sentry\Application\EventHandlerInterface;
+use Modules\Sentry\Application\PayloadParser;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Spiral\Cqrs\CommandBusInterface;
@@ -16,7 +16,7 @@
 final class EventHandler implements HandlerInterface
 {
  public function __construct(
- private readonly GzippedStreamFactory $gzippedStreamFactory,
+ private readonly PayloadParser $payloadParser,
  private readonly ResponseWrapper $responseWrapper,
  private readonly EventHandlerInterface $handler,
  private readonly CommandBusInterface $commands,
@@ -35,7 +35,8 @@ public function handle(ServerRequestInterface $request, \Closure $next): Respons
  }
 
  $url = \rtrim($request->getUri()->getPath(), '/');
- $payloads = $this->gzippedStreamFactory->createFromRequest($request)->getPayload();
+
+ $payloads = $this->payloadParser->parse($request);
 
  match (true) {
  \str_ends_with($url, '/envelope') => $this->handleEnvelope($payloads),
@@ -46,42 +47,35 @@ public function handle(ServerRequestInterface $request, \Closure $next): Respons
  return $this->responseWrapper->create(200);
  }
 
- private function handleEvent(\Traversable $data): void
+ private function handleEvent(array $data): void
  {
- $data = \iterator_to_array($data);
-
  $event = $this->handler->handle($data[0]);
 
  $this->commands->dispatch(
- new HandleReceivedEvent(type: 'sentry', payload: $event)
+ new HandleReceivedEvent(type: 'sentry', payload: $event),
  );
  }
 
  /**
  * TODO handle sentry transaction and session
  */
- private function handleEnvelope(\Traversable $data): void
+ private function handleEnvelope(array $data): void
  {
- $data = \iterator_to_array($data);
-
  if (\count($data) == 3) {
  match ($data[1]['type']) {
  'transaction' => null,
  'session' => null,
+ 'event' => $this->handleEvent([$data[2]]),
+ default => null,
  };
  }
  }
 
  private function isValidRequest(ServerRequestInterface $request): bool
  {
- if ($request->getHeaderLine('Content-Encoding') !== 'gzip') {
- return false;
- }
-
  return $request->getHeaderLine('X-Buggregator-Event') === 'sentry'
  || $request->getAttribute('event-type') === 'sentry'
  || $request->hasHeader('X-Sentry-Auth')
- || $request->getUri()->getUserInfo() === 'sentry'
- || (string)$request->getUri() === 'profiler/store';
+ || $request->getUri()->getUserInfo() === 'sentry';
  }
 }

app/src/Application/Bootloader/RoutesBootloader.php

@@ -4,14 +4,11 @@
 
 namespace App\Application\Bootloader;
 
-use App\Application\Service\HttpHandler\CoreHandlerInterface;
 use App\Interfaces\Http\EventHandlerAction;
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Spiral\Bootloader\Http\RoutesBootloader as BaseRoutesBootloader;
 use Spiral\Filter\ValidationHandlerMiddleware;
 use Spiral\Http\Middleware\ErrorHandlerMiddleware;
+use Spiral\Http\Middleware\JsonPayloadMiddleware;
 use Spiral\Router\Bootloader\AnnotatedRoutesBootloader;
 use Spiral\Router\GroupRegistry;
 use Spiral\Router\Loader\Configurator\RoutingConfigurator;
@@ -25,6 +22,7 @@ final class RoutesBootloader extends BaseRoutesBootloader
  protected function globalMiddleware(): array
  {
  return [
+ JsonPayloadMiddleware::class,
  ErrorHandlerMiddleware::class,
  ValidationHandlerMiddleware::class,
  ];