Optimize collectors

Author: guanguans

composer.json

@@ -52,6 +52,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.2",
+        "ext-json": "*",
         "guanguans/notify": "^1.13",
         "illuminate/bus": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
         "illuminate/contracts": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0",

config/exception-notify.php

@@ -80,8 +80,17 @@
             \Guanguans\LaravelExceptionNotify\Collectors\LaravelCollector::class,
             \Guanguans\LaravelExceptionNotify\Collectors\AnnexCollector::class,
             \Guanguans\LaravelExceptionNotify\Collectors\PhpInfoCollector::class,
-            \Guanguans\LaravelExceptionNotify\Collectors\ExceptionCollector::class,
-            \Guanguans\LaravelExceptionNotify\Collectors\RequestCollector::class,
+            \Guanguans\LaravelExceptionNotify\Collectors\ExceptionBasicCollector::class,
+            \Guanguans\LaravelExceptionNotify\Collectors\ExceptionTraceCollector::class,
+            \Guanguans\LaravelExceptionNotify\Collectors\RequestBasicCollector::class,
+            // \Guanguans\LaravelExceptionNotify\Collectors\RequestMiddlewareCollector::class,
+            // \Guanguans\LaravelExceptionNotify\Collectors\RequestHeaderCollector::class,
+            \Guanguans\LaravelExceptionNotify\Collectors\RequestQueryCollector::class,
+            \Guanguans\LaravelExceptionNotify\Collectors\RequestPostCollector::class,
+            \Guanguans\LaravelExceptionNotify\Collectors\RequestFileCollector::class,
+            // \Guanguans\LaravelExceptionNotify\Collectors\RequestServerCollector::class,
+            // \Guanguans\LaravelExceptionNotify\Collectors\RequestCookieCollector::class,
+            // \Guanguans\LaravelExceptionNotify\Collectors\RequestSessionCollector::class,
         ],
         // The transformer is used to transformer collectors to reports.
         'transformer' => \Guanguans\LaravelExceptionNotify\CollectorTransformer::class,
@@ -98,7 +107,7 @@
     'reporting' => [
         // \Guanguans\LaravelExceptionNotify\Listeners\Reporting\LogReportListener::class,
         // \Guanguans\LaravelExceptionNotify\Listeners\Reporting\DumpReportListener::class,
-        // \Guanguans\LaravelExceptionNotify\Listeners\Reporting\DdReportListener::class,
+        \Guanguans\LaravelExceptionNotify\Listeners\Reporting\DdReportListener::class,
     ],
 
     /*

src/Collectors/AnnexCollector.php

@@ -12,7 +12,7 @@
 
 class AnnexCollector extends Collector
 {
-    public function collect(): array
+    public function collect()
     {
         return [
             'Time' => date('Y-m-d H:i:s'),

src/Collectors/Collector.php

@@ -10,26 +10,45 @@
 
 namespace Guanguans\LaravelExceptionNotify\Collectors;
 
-use ArrayAccess;
 use Guanguans\LaravelExceptionNotify\Contracts\Collector as CollectorContract;
-use Guanguans\LaravelExceptionNotify\Support\Traits\OptionsProperty;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
-abstract class Collector implements CollectorContract, ArrayAccess
+abstract class Collector implements CollectorContract
 {
-    use OptionsProperty;
+    /**
+     * @var callable|null
+     */
+    protected $pipe;
+
+    public function __construct(callable $pipe = null)
+    {
+        $this->pipe = $pipe;
+    }
 
     public function getName(): string
     {
         return Str::ucfirst(Str::beforeLast(class_basename($this), 'Collector'));
     }
 
+    protected function applyPipeCollect()
+    {
+        $pipedCollect = collect($this->collect())
+                ->when($this->pipe, function (Collection $collects) {
+                    return $collects->pipe($this->pipe);
+                });
+
+        return collect($pipedCollect)
+            ->filter(function ($item) {
+                return ! blank($item);
+            })
+            ->all();
+    }
+
     public function __toString()
     {
         return varexport(
-            array_filter($this->collect(), function ($value) {
-                return ! blank($value);
-            }),
+            $this->applyPipeCollect(),
             true
         );
     }

src/Collectors/ExceptionBasicCollector.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the guanguans/laravel-exception-notify.
+ *
+ * (c) guanguans <ityaozm@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled.
+ */
+
+namespace Guanguans\LaravelExceptionNotify\Collectors;
+
+use Guanguans\LaravelExceptionNotify\Concerns\ExceptionProperty;
+use Guanguans\LaravelExceptionNotify\Contracts\ExceptionProperty as ExceptionPropertyContract;
+use Guanguans\LaravelExceptionNotify\Support\ExceptionContext;
+
+class ExceptionBasicCollector extends Collector implements ExceptionPropertyContract
+{
+    use ExceptionProperty;
+
+    public function collect()
+    {
+        return [
+            'Class' => get_class($this->exception),
+            'Message' => $this->exception->getMessage(),
+            'Code' => $this->exception->getCode(),
+            'File' => $this->exception->getFile(),
+            'Line' => $this->exception->getLine(),
+            'Preview' => ExceptionContext::getFormattedContext($this->exception),
+        ];
+    }
+}

src/Collectors/ExceptionCollector.php

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the guanguans/laravel-exception-notify.
+ *
+ * (c) guanguans <ityaozm@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled.
+ */
+
+namespace Guanguans\LaravelExceptionNotify\Collectors;
+
+use Guanguans\LaravelExceptionNotify\Concerns\ExceptionProperty;
+use Guanguans\LaravelExceptionNotify\Contracts\ExceptionProperty as ExceptionPropertyContract;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
+
+class ExceptionTraceCollector extends Collector implements ExceptionPropertyContract
+{
+    use ExceptionProperty;
+
+    public function __construct(callable $pipe = null)
+    {
+        parent::__construct();
+        $this->pipe = $pipe
+            ?: function (Collection $traces) {
+                return $traces->filter(function ($trace) {
+                    return ! Str::contains($trace, 'vendor');
+                });
+            };
+    }
+
+    public function collect()
+    {
+        return collect($this->exception->getTrace())
+            ->filter(function ($trace) {
+                return isset($trace['file']) and isset($trace['line']);
+            })
+            ->map(function ($trace) {
+                return $trace['file']."({$trace['line']})";
+            })
+            ->all();
+    }
+}

src/Collectors/ExceptionTraceCollector.php

@@ -19,12 +19,13 @@ class LaravelCollector extends Collector
      */
     protected $app;
 
-    public function __construct(Container $app)
+    public function __construct(Container $app, callable $pipe = null)
     {
+        parent::__construct($pipe);
         $this->app = $app;
     }
 
-    public function collect(): array
+    public function collect()
     {
         return [
             'Name' => $this->app['config']['app.name'],

src/Collectors/LaravelCollector.php

@@ -12,7 +12,7 @@
 
 class PhpInfoCollector extends Collector
 {
-    public function collect(): array
+    public function collect()
     {
         return [
             'Version' => implode('.', [PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION]),

src/Collectors/PhpInfoCollector.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the guanguans/laravel-exception-notify.
+ *
+ * (c) guanguans <ityaozm@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled.
+ */
+
+namespace Guanguans\LaravelExceptionNotify\Collectors;
+
+use Illuminate\Http\Request;
+
+class RequestBasicCollector extends Collector
+{
+    /**
+     * @var \Illuminate\Http\Request
+     */
+    protected $request;
+
+    public function __construct(Request $request, callable $pipe = null)
+    {
+        parent::__construct($pipe);
+        $this->request = $request;
+    }
+
+    public function collect()
+    {
+        return [
+            'Url' => $this->request->url(),
+            'Ip' => $this->request->ip(),
+            'Method' => $this->request->method(),
+            'Action' => optional($this->request->route())->getActionName(),
+            'Duration' => value(function () {
+                $startTime = defined('LARAVEL_START') ? LARAVEL_START : $this->request->server('REQUEST_TIME_FLOAT');
+
+                return floor((microtime(true) - $startTime) * 1000).'ms';
+            }),
+        ];
+    }
+}