Merge branch '4.x'

# Conflicts:
#	CHANGELOG.md
#	public/app.js
#	public/mix-manifest.json
#	src/Contracts/PrunableRepository.php

Author: driesvints

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/telescope/compare/v4.5.1...master)
+## [Unreleased](https://github.com/laravel/telescope/compare/v4.6.0...master)
+
+
+## [v4.6.0 (2021-07-13)](https://github.com/laravel/telescope/compare/v4.5.1...v4.6.0)
+
+### Added
+- Add a new "Clear Entries" button ([#1091](https://github.com/laravel/telescope/pull/1091))
+
+### Changed
+- `Telescope:withoutRecording()` should be exception safe ([#1092](https://github.com/laravel/telescope/pull/1092))
+
+### Fixed
+- Fixed frontend request polling memory leaks ([#1086](https://github.com/laravel/telescope/pull/1086))
+- Fix for `JobWatchers` when the job payload is encrypted ([#1089](https://github.com/laravel/telescope/pull/1089))
 
 
 ## [v4.5.1 (2021-06-22)](https://github.com/laravel/telescope/compare/v4.5.0...v4.5.1)

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=12781ecb1d54769d6eb9",
+    "/app.js": "/app.js?id=5fb4f607120d34b271ed",
     "/app-dark.css": "/app-dark.css?id=bc22d805b64b5a2ecaaa",
     "/app.css": "/app.css?id=d2d43f24f2a54d31e084"
 }

public/app.js

@@ -136,18 +136,20 @@
                             '&take=1' +
                             '&family_hash=' + this.familyHash
                     ).then(response => {
-                        this.recordingStatus = response.data.status;
+                        if (! this._isDestroyed) {
+                            this.recordingStatus = response.data.status;
 
-                        if (response.data.entries.length && !this.entries.length) {
-                            this.loadNewEntries();
-                        } else if (response.data.entries.length && _.first(response.data.entries).id !== _.first(this.entries).id) {
-                            if (this.$root.autoLoadsNewEntries) {
+                            if (response.data.entries.length && !this.entries.length) {
                                 this.loadNewEntries();
+                            } else if (response.data.entries.length && _.first(response.data.entries).id !== _.first(this.entries).id) {
+                                if (this.$root.autoLoadsNewEntries) {
+                                    this.loadNewEntries();
+                                } else {
+                                    this.hasNewEntries = true;
+                                }
                             } else {
-                                this.hasNewEntries = true;
+                                this.checkForNewEntries();
                             }
-                        } else {
-                            this.checkForNewEntries();
                         }
                     })
                 }, this.newEntriesTimer);

public/mix-manifest.json

@@ -11,7 +11,7 @@ interface PrunableRepository
      *
      * @param  \DateTimeInterface  $before
      * @param  bool  $keepExceptions
-     * @return void
+     * @return int
      */
     public function prune(DateTimeInterface $before, $keepExceptions);
 }

resources/js/components/IndexScreen.vue

@@ -260,9 +260,11 @@ public static function withoutRecording($callback)
 
         static::$shouldRecord = false;
 
-        call_user_func($callback);
-
-        static::$shouldRecord = $shouldRecord;
+        try {
+            call_user_func($callback);
+        } finally {
+            static::$shouldRecord = $shouldRecord;
+        }
     }
 
     /**

src/Contracts/PrunableRepository.php

@@ -3,16 +3,19 @@
 namespace Laravel\Telescope\Watchers;
 
 use Illuminate\Bus\BatchRepository;
+use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Queue\Events\JobFailed;
 use Illuminate\Queue\Events\JobProcessed;
 use Illuminate\Queue\Queue;
+use Illuminate\Support\Str;
 use Laravel\Telescope\EntryType;
 use Laravel\Telescope\EntryUpdate;
 use Laravel\Telescope\ExceptionContext;
 use Laravel\Telescope\ExtractProperties;
 use Laravel\Telescope\ExtractTags;
 use Laravel\Telescope\IncomingEntry;
 use Laravel\Telescope\Telescope;
+use RuntimeException;
 
 class JobWatcher extends Watcher
 {
@@ -180,8 +183,10 @@ protected function tags(array $payload)
      */
     protected function updateBatch($payload)
     {
+        $command = $this->getCommand($payload['data']);
+
         $properties = ExtractProperties::from(
-            unserialize($payload['data']['command'])
+            $command
         );
 
         if (isset($properties['batchId'])) {
@@ -196,4 +201,25 @@ protected function updateBatch($payload)
             ));
         }
     }
+
+    /**
+     * Get the command from the given payload.
+     *
+     * @param  array  $data
+     * @return mixed
+     *
+     * @throws \RuntimeException
+     */
+    protected function getCommand(array $data)
+    {
+        if (Str::startsWith($data['command'], 'O:')) {
+            return unserialize($data['command']);
+        }
+
+        if (app()->bound(Encrypter::class)) {
+            return unserialize(app(Encrypter::class)->decrypt($data['command']));
+        }
+
+        throw new RuntimeException('Unable to extract job payload.');
+    }
 }