upgrades

Author: erikn69

src/DataCollector/CacheCollector.php

@@ -7,12 +7,16 @@
 use Illuminate\Cache\Events\{
     CacheFlushed,
     CacheFlushFailed,
+    CacheFlushing,
     CacheHit,
     CacheMissed,
+    ForgettingKey,
     KeyForgetFailed,
     KeyForgotten,
     KeyWriteFailed,
     KeyWritten,
+    RetrievingKey,
+    WritingKey,
 };
 use Illuminate\Events\Dispatcher;
 
@@ -23,33 +27,43 @@ class CacheCollector extends TimeDataCollector
     /** @var bool */
     protected $collectValues;
 
+    /** @var array */
+    protected $eventStarts = [];
+
     /** @var array */
     protected $classMap = [
-        CacheHit::class => 'hit',
-        CacheMissed::class => 'missed',
-        CacheFlushed::class => 'flushed',
-        CacheFlushFailed::class => 'flush_failed',
-        KeyWritten::class => 'written',
-        KeyWriteFailed::class => 'write_failed',
-        KeyForgotten::class => 'forgotten',
-        KeyForgetFailed::class => 'forget_failed',
+        CacheHit::class => ['hit', RetrievingKey::class],
+        CacheMissed::class => ['missed', RetrievingKey::class],
+        CacheFlushed::class => ['flushed', CacheFlushing::class],
+        CacheFlushFailed::class => ['flush_failed', CacheFlushing::class],
+        KeyWritten::class => ['written', WritingKey::class],
+        KeyWriteFailed::class => ['write_failed', WritingKey::class],
+        KeyForgotten::class => ['forgotten', ForgettingKey::class],
+        KeyForgetFailed::class => ['forget_failed', ForgettingKey::class],
     ];
 
     public function __construct($requestStartTime, $collectValues)
     {
         parent::__construct();
 
         $this->collectValues = $collectValues;
+        $this->memoryMeasure = true;
     }
 
     public function onCacheEvent($event)
     {
         $class = get_class($event);
         $params = get_object_vars($event);
-
-        $label = $this->classMap[$class];
+        $label = $this->classMap[$class][0];
+        $endTime = microtime(true);
+        $startHashKey = $this->getEventHash($this->classMap[$class][1] ?? '', $params);
+        $startTime = $this->eventStarts[$startHashKey] ?? $endTime;
 
         if (isset($params['value'])) {
+            $params['memoryUsage'] = strlen(serialize($params['value'])) * 8;
+            if (is_string($params['value'])) {
+                $params['value'] = @unserialize($params['value']) ?: $params['value'];
+            }
             if ($this->collectValues) {
                 if ($this->isHtmlVarDumperUsed()) {
                     $params['value'] = $this->getVarDumper()->renderVar($params['value']);
@@ -61,23 +75,43 @@ public function onCacheEvent($event)
             }
         }
 
-
         if (!empty($params['key'] ?? null) && in_array($label, ['hit', 'written'])) {
             $params['delete'] = route('debugbar.cache.delete', [
                 'key' => urlencode($params['key']),
                 'tags' => !empty($params['tags']) ? json_encode($params['tags']) : '',
             ]);
         }
 
-        $time = microtime(true);
-        $this->addMeasure($label . "\t" . ($params['key'] ?? ''), $time, $time, $params);
+        $this->addMeasure($label . "\t" . ($params['key'] ?? ''), $startTime, $endTime, $params);
+    }
+
+    public function onStartCacheEvent($event)
+    {
+        $startHashKey = $this->getEventHash(get_class($event), get_object_vars($event));
+        $this->eventStarts[$startHashKey] = microtime(true);
+    }
+
+    private function getEventHash(string $class, array $params): string
+    {
+        unset($params['value']);
+
+        return $class . ':' . substr(hash('sha256', json_encode($params)), 0, 12);
     }
 
     public function subscribe(Dispatcher $dispatcher)
     {
         foreach (array_keys($this->classMap) as $eventClass) {
             $dispatcher->listen($eventClass, [$this, 'onCacheEvent']);
         }
+
+        $startEvents = array_unique(array_filter(array_map(
+            fn ($values) => $values[1] ?? null,
+            array_values($this->classMap)
+        )));
+
+        foreach ($startEvents as $eventClass) {
+            $dispatcher->listen($eventClass, [$this, 'onStartCacheEvent']);
+        }
     }
 
     public function collect()

src/LaravelDebugbar.php

@@ -905,6 +905,7 @@ public function modifyResponse(Request $request, Response $response)
             && !$this->isJsonRequest($request, $response)
             && $response->getContent() !== false
             && in_array($request->getRequestFormat(), [null, 'html'], true)
+            && !$this->isJsonResponse($response)
         ) {
             try {
                 $this->injectDebugbar($response);
@@ -978,6 +979,30 @@ protected function isJsonRequest(Request $request, Response $response)
         return false;
     }
 
+    /**
+     * @param  \Symfony\Component\HttpFoundation\Response $response
+     * @return bool
+     */
+    protected function isJsonResponse(Response $response)
+    {
+        if ($response->headers->get('Content-Type') == 'application/json') {
+            return true;
+        }
+
+        $content = $response->getContent();
+
+        if (function_exists('json_validate')) {
+            return json_validate($content);
+        } else if (is_string($content)) {
+            // PHP <= 8.2 check
+            json_decode($content, true);
+
+            return json_last_error() === JSON_ERROR_NONE;
+        }
+
+        return false;
+    }
+
     /**
      * Collects the data from the collectors
      *