Skip to content

A self-hosted media server and file management system

fix: webpage can fail if reverb config is not valid json

aminnausin04d5460f5dc0
diff --git a/resources/js/echo.ts b/resources/js/echo.ts
index e091a65d..597a0285 100644
--- a/resources/js/echo.ts
+++ b/resources/js/echo.ts
@@ -2,7 +2,7 @@ import Pusher from 'pusher-js';
window.Pusher = Pusher;
-const reverbConfig = JSON.parse(document.getElementById('reverb-config')?.dataset?.reverbConfig ?? '');
+const reverbConfig = JSON.parse(document.getElementById('reverb-config')?.dataset?.reverbConfig ?? '{}');
document.getElementById('reverb-config')?.remove();
@@ -18,10 +18,10 @@ export const EchoConfig: {
enabledTransports: string[];
} = {
broadcaster: 'reverb',
- key: reverbConfig.key ?? import.meta.env.VITE_REVERB_APP_KEY,
- wsHost: reverbConfig.host ?? import.meta.env.VITE_REVERB_HOST,
- wsPort: reverbConfig.port ?? import.meta.env.VITE_REVERB_PORT ?? 80,
- wssPort: reverbConfig.port ?? import.meta.env.VITE_REVERB_PORT ?? 443,
- forceTLS: (reverbConfig.scheme ?? import.meta.env.VITE_REVERB_SCHEME ?? 'https') === 'https',
+ key: reverbConfig?.key ?? import.meta.env.VITE_REVERB_APP_KEY,
+ wsHost: reverbConfig?.host ?? import.meta.env.VITE_REVERB_HOST,
+ wsPort: reverbConfig?.port ?? import.meta.env.VITE_REVERB_PORT ?? 80,
+ wssPort: reverbConfig?.port ?? import.meta.env.VITE_REVERB_PORT ?? 443,
+ forceTLS: (reverbConfig?.scheme ?? import.meta.env.VITE_REVERB_SCHEME ?? 'https') === 'https',
enabledTransports: ['ws', 'wss'],
};