From d694bc06ccbf66f4f8ce432c39b71deea6766135 Mon Sep 17 00:00:00 2001 From: rennokki Date: Fri, 24 Jun 2022 21:35:29 +0300 Subject: [PATCH] [9.x] Added support for easy development configuration in bootstrap.js (#5900) * Added support for easy development configuration in bootstrap.js * Added extra variables for existing configuration in broadcasting * Update bootstrap.js * Setting default for empty variable * Update .env.example * Update .env.example Co-authored-by: Taylor Otwell --- .env.example | 6 ++++++ config/broadcasting.php | 2 +- resources/js/bootstrap.js | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index 1a334043..00b6110e 100644 --- a/.env.example +++ b/.env.example @@ -46,7 +46,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false PUSHER_APP_ID= PUSHER_APP_KEY= PUSHER_APP_SECRET= +PUSHER_HOST= +PUSHER_PORT=443 +PUSHER_SCHEME=https PUSHER_APP_CLUSTER=mt1 VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +VITE_PUSHER_HOST="${PUSHER_HOST}" +VITE_PUSHER_PORT="${PUSHER_PORT}" +VITE_PUSHER_SCHEME="${PUSHER_SCHEME}" VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" diff --git a/config/broadcasting.php b/config/broadcasting.php index 7cc99087..16882424 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -36,7 +36,7 @@ 'secret' => env('PUSHER_APP_SECRET'), 'app_id' => env('PUSHER_APP_ID'), 'options' => [ - 'host' => env('PUSHER_HOST', 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com'), + 'host' => env('PUSHER_HOST', 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com', 'port' => env('PUSHER_PORT', 443), 'scheme' => env('PUSHER_SCHEME', 'https'), 'encrypted' => true, diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index a954d249..57fbd3b0 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -26,6 +26,9 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; // window.Echo = new Echo({ // broadcaster: 'pusher', // key: import.meta.env.VITE_PUSHER_APP_KEY, -// cluster: import.meta.env.VITE_PUSHER_APP_CLUSTER, -// forceTLS: true +// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_CLUSTER}.pusher.com`, +// wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80, +// wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443, +// forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https', +// enabledTransports: ['ws', 'wss'], // });