Refactor Profiler frame

src/Proto/Frame/Profiler.php

@@ -5,24 +5,35 @@
 namespace Buggregator\Trap\Proto\Frame;
 
 use Buggregator\Trap\Proto\Frame;
-use Buggregator\Trap\Proto\Frame\Profiler\File;
-use Buggregator\Trap\Proto\Frame\Profiler\Payload;
+use Buggregator\Trap\ProtoType;
 use Buggregator\Trap\Support\Json;
 use DateTimeImmutable;
 
 /**
  * @internal
  * @psalm-internal Buggregator
  */
-abstract class Profiler extends Frame
+final class Profiler extends Frame
 {
+    public function __construct(
+        public readonly Frame\Profiler\Payload $payload,
+        DateTimeImmutable $time = new DateTimeImmutable(),
+    ) {
+        parent::__construct(ProtoType::Profiler, $time);
+    }
+
     public static function fromString(string $payload, DateTimeImmutable $time): static
     {
         $data = Json::decode($payload);
-        return match (true) {
-            $data['type'] === File::PROFILE_FRAME_TYPE => File::fromArray($data, $time),
-            $data['type'] === Payload::PROFILE_FRAME_TYPE => Payload::fromArray($data, $time),
-            default => throw new \InvalidArgumentException('Unknown Profile frame type.'),
-        };
+
+        return new self(Frame\Profiler\Payload::fromArray($data), $time);
+    }
+
+    /**
+     * @throws \JsonException
+     */
+    public function __toString(): string
+    {
+        return Json::encode($this->payload->jsonSerialize() + ['']);
     }
 }

src/Proto/Frame/Profiler/Payload.php

@@ -4,36 +4,84 @@
 
 namespace Buggregator\Trap\Proto\Frame\Profiler;
 
-use Buggregator\Trap\Proto\Frame;
-use Buggregator\Trap\ProtoType;
-use Buggregator\Trap\Support\Json;
-use DateTimeImmutable;
+use Buggregator\Trap\Proto\Frame\Profiler\Type as PayloadType;
+use Buggregator\Trap\Service\FilesObserver\FileInfo;
 
 /**
+ * @psalm-type Metadata = array{
+ *     date: int,
+ *     hostname: non-empty-string,
+ *     filename?: non-empty-string,
+ *     ...
+ * }
+ * @psalm-type Calls = array{
+ *     edges: array,
+ *     peaks: array
+ * }
+ *
  * @internal
  * @psalm-internal Buggregator
  */
-final class Payload extends Frame\Profiler
+class Payload implements \JsonSerializable
 {
-    public const PROFILE_FRAME_TYPE = 'payload';
-
-    public function __construct(
-        public array $payload,
-        DateTimeImmutable $time = new DateTimeImmutable(),
+    /**
+     * @param PayloadType $type
+     * @param Metadata $metadata
+     * @param \Closure(): Calls $callsProvider
+     */
+    private function __construct(
+        public readonly PayloadType $type,
+        private array $metadata,
+        private \Closure $callsProvider,
     ) {
-        parent::__construct(ProtoType::Profiler, $time);
+        $this->metadata['type'] = $type->value;
+    }
+
+    public static function fromArray(array $data, ?Type $type = null): static
+    {
+        $metadata = $data;
+        unset($metadata['edges'], $metadata['peaks']);
+        return new static(
+            $type ?? PayloadType::from($data['type']),
+            $metadata,
+            static fn(): array => $data,
+        );
+    }
+
+    public static function fromFile(FileInfo $fileInfo): static
+    {
+        // todo
+        // $metadata = $data;
+        // unset($metadata['edges'], $metadata['peaks']);
+        // return new static(PayloadType::from($data['type']), $metadata, fn(): array => $data);
     }
 
     /**
-     * @throws \JsonException
+     * @return Calls
      */
-    public function __toString(): string
+    public function getCalls(): array
     {
-        return Json::encode($this->payload);
+        return ($this->callsProvider)();
     }
 
-    public static function fromArray(array $data, DateTimeImmutable $time): static
+    /**
+     * @return Metadata
+     */
+    public function getMetadata(): array
+    {
+        return $this->metadata;
+    }
+
+    public function toArray(): array
+    {
+        return ['type' => $this->type->value] + $this->getCalls() + $this->getMetadata();
+    }
+
+    /**
+     * @return array{type: non-empty-string}&Calls&Metadata
+     */
+    public function jsonSerialize(): array
     {
-        return new self($data, $time);
+        return $this->toArray();
     }
 }

src/Proto/Frame/Profiler/Type.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buggregator\Trap\Proto\Frame\Profiler;
+
+/**
+ * @internal
+ * @psalm-internal Buggregator
+ */
+enum Type: string
+{
+    case XHProf = 'XHProf';
+    case XDebug = 'XDebug';
+}

src/Sender/Console/Renderer/Profiler.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buggregator\Trap\Sender\Console\Renderer;
+
+use Buggregator\Trap\Proto\Frame;
+use Buggregator\Trap\ProtoType;
+use Buggregator\Trap\Sender\Console\Renderer;
+use Buggregator\Trap\Sender\Console\Support\Common;
+use DateTimeImmutable;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @implements Renderer<Frame\Profiler>
+ *
+ * @internal
+ */
+final class Profiler implements Renderer
+{
+    public function isSupport(Frame $frame): bool
+    {
+        return $frame->type === ProtoType::Profiler;
+    }
+
+    public function render(OutputInterface $output, Frame $frame): void
+    {
+        \assert($frame instanceof Frame\Profiler);
+
+        $subtitle = $frame->payload->type->value;
+        Common::renderHeader1($output, 'PROFILER', $subtitle);
+
+        $metadata = $frame->payload->getMetadata();
+        $data = [];
+        isset($metadata['date']) && \is_numeric($metadata['date'])
+        and $data['Time'] = new DateTimeImmutable('@' . $metadata['date']);
+        isset($metadata['hostname']) and $data['Hostname'] = $metadata['hostname'];
+        isset($metadata['filename']) and $data['File name'] = $metadata['filename'];
+
+        Common::renderMetadata($output, $data);
+    }
+}

src/Sender/ConsoleSender.php

@@ -35,6 +35,7 @@ public static function create(OutputInterface $output): self
         $renderer->register(new Renderer\Monolog($templateRenderer));
         $renderer->register(new Renderer\Smtp());
         $renderer->register(new Renderer\Http());
+        $renderer->register(new Renderer\Profiler());
         $renderer->register(new Renderer\Binary());
         $renderer->register(new Renderer\Plain($templateRenderer));
 

src/Sender/Frontend/FrameMapper.php

@@ -20,7 +20,7 @@ public function map(Frame $frame): Event
             Frame\Sentry\SentryStore::class => (new Mapper\SentryStore())->map($frame),
             Frame\Sentry\SentryEnvelope::class => (new Mapper\SentryEnvelope())->map($frame),
             Frame\Monolog::class => (new Mapper\Monolog())->map($frame),
-            Frame\Profiler\Payload::class => (new Mapper\Profiler())->map($frame),
+            Frame\Profiler::class => (new Mapper\Profiler())->map($frame),
             default => throw new \InvalidArgumentException('Unknown frame type ' . $frame::class),
         };
     }

src/Sender/Frontend/Mapper/Profiler.php

@@ -12,12 +12,12 @@
  */
 final class Profiler
 {
-    public function map(\Buggregator\Trap\Proto\Frame\Profiler\Payload $frame): Event
+    public function map(\Buggregator\Trap\Proto\Frame\Profiler $frame): Event
     {
         return new Event(
             uuid: Uuid::generate(),
             type: 'profiler',
-            payload: $frame->payload,
+            payload: $frame->payload->toArray(),
             timestamp: (float)$frame->time->format('U.u'),
         );
     }

src/Service/FilesObserver/Filter/XHProf.php

@@ -29,10 +29,14 @@ public function convert(FileInfo $file): \Traversable
             $payload = $this->dataToPayload($data);
             $payload['date'] = $file->mtime;
             $payload['hostname'] = \explode('.', $file->getName(), 2)[0];
+            $payload['filename'] = $file->getName();
 
-            yield new ProfilerFrame\Payload(
-                $payload,
+            yield new ProfilerFrame(
+                ProfilerFrame\Payload::fromArray($payload, ProfilerFrame\Type::XHProf),
             );
+            // yield new ProfilerFrame(
+            //     ProfilerFrame\Payload::fromFile($file),
+            // );
         } catch (\Throwable $e) {
             // todo log
             var_dump($e->getMessage());