From e528507edb1f9b113ef2a4b5e7cc0dc62ea1b35d Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 19 Mar 2024 15:06:30 +0000
Subject: [PATCH 1/2] Update Laravel Echo

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee6ec8c99b..769e6d208a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,7 +50,7 @@
         "fuse.js": "^3.4.6",
         "highlight.js": "^11.7.0",
         "imask": "^6.6.0-alpha.0",
-        "laravel-echo": "^1.6.1",
+        "laravel-echo": "^1.16.0",
         "lowlight": "^2.8.1",
         "marked": "^4.0.10",
         "marked-plaintext": "0.0.2",
@@ -7640,9 +7640,9 @@
       }
     },
     "node_modules/laravel-echo": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.15.0.tgz",
-      "integrity": "sha512-q5YaEw2NFu9xra6sYUfh/FX2YotN5iY1nMeKz90J3W3Vpa+5WjK3/DYeEzkTfBZz8Oq1Dv9vWNE4IUvt7kxYIg==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.16.0.tgz",
+      "integrity": "sha512-BJGUa4tcKvYmTkzTmcBGMHiO2tq+k7Do5wPmLbRswWfzKwyfZEUR+J5iwBTPEfLLwNPZlA9Kjo6R/NV6pmyIpg==",
       "engines": {
         "node": ">=10"
       }
diff --git a/package.json b/package.json
index 21d937e909..726f1d77a8 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "fuse.js": "^3.4.6",
     "highlight.js": "^11.7.0",
     "imask": "^6.6.0-alpha.0",
-    "laravel-echo": "^1.6.1",
+    "laravel-echo": "^1.16.0",
     "lowlight": "^2.8.1",
     "marked": "^4.0.10",
     "marked-plaintext": "0.0.2",

From e6693866e98a5e30ca86b7bb3726eec29a59b78c Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 19 Mar 2024 16:21:53 +0000
Subject: [PATCH 2/2] Generate the Echo config in PHP

---
 resources/js/components/Echo.js            |  5 +---
 src/Providers/BroadcastServiceProvider.php | 33 ++++++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/Echo.js b/resources/js/components/Echo.js
index 57684c8547..cf52d8bd5b 100644
--- a/resources/js/components/Echo.js
+++ b/resources/js/components/Echo.js
@@ -19,10 +19,7 @@ class Echo {
 
     start() {
         let config = {
-            broadcaster: 'pusher',
-            key: Statamic.$config.get('broadcasting.pusher.key'),
-            cluster: Statamic.$config.get('broadcasting.pusher.cluster'),
-            encrypted: Statamic.$config.get('broadcasting.pusher.encrypted'),
+            ...Statamic.$config.get('broadcasting.options'),
             csrfToken: Statamic.$config.get('csrfToken'),
             authEndpoint: Statamic.$config.get('broadcasting.endpoint'),
         };
diff --git a/src/Providers/BroadcastServiceProvider.php b/src/Providers/BroadcastServiceProvider.php
index 4f2e4f32d3..ec3d487b80 100755
--- a/src/Providers/BroadcastServiceProvider.php
+++ b/src/Providers/BroadcastServiceProvider.php
@@ -17,17 +17,34 @@ public function boot()
 
     protected function variables()
     {
-        return [
-            'enabled' => true,
-            'endpoint' => $this->authEndpoint(),
-            'pusher' => [
+        $options = [];
+
+        if (config('broadcasting.default') === 'pusher') {
+            $options = [
+                'broadcaster' => 'pusher',
                 'key' => config('broadcasting.connections.pusher.key'),
                 'cluster' => config('broadcasting.connections.pusher.options.cluster'),
                 'encrypted' => config('broadcasting.connections.pusher.options.encrypted'),
-                'scheme' => config('broadcasting.connections.pusher.options.scheme'),
-                'host' => config('broadcasting.connections.pusher.options.host'),
-                'port' => config('broadcasting.connections.pusher.options.port'),
-            ],
+            ];
+        }
+
+        if (config('broadcasting.default') === 'reverb') {
+            $options = [
+                'broadcaster' => 'reverb',
+                'key' => config('broadcasting.connections.reverb.key'),
+                'wsHost' => config('broadcasting.connections.reverb.options.host'),
+                'wsPort' => config('broadcasting.connections.reverb.options.port', 80),
+                'wssPort' => config('broadcasting.connections.reverb.options.port', 443),
+                'forceTLS' => config('broadcasting.connections.reverb.options.useTLS'),
+                'enabledTransports' => ['ws', 'wss'],
+            ];
+        }
+
+        return [
+            'enabled' => true,
+            'endpoint' => $this->authEndpoint(),
+            'connection' => config('broadcasting.default'),
+            'options' => $options,
         ];
     }