diff --git a/README.md b/README.md index a4f13e7..997af12 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ mumh5 keeps the foundation and replaces the experience. - Sound: on Linux one program or everything except mumh5 itself (through PipeWire, so viewers do not hear the voice chat twice); on Windows the whole system; in a browser what the browser offers - People in the channel see an indicator next to your name, on your tile and in your profile, and click to watch. The tiles above the chat fill a stage you can drag taller or shorter. A stream opens large, with everyone as a strip of tiles below, like a meeting, and can move to a window of its own; in the stacked layout it is just the picture, as wide as the chat. Sounds announce streams and viewers. Viewers set the stream's volume - No server setup and no extra account: the setup messages travel through the Mumble server, the stream goes directly between the two clients (WebRTC), up to 8 viewers. Regular Mumble clients do not see streams -- Direct connections mean sharer and viewer see each other's IP address; mumh5 says so before the first use. Across the internet both sides need a STUN server. The browser version uses the one built into its proxy; in the desktop app you enter one in Settings, Voice (the proxy's address works there too), and none is contacted unless you do +- Direct connections mean sharer and viewer see each other's IP address; mumh5 says so before the first use. Across the internet both sides need a STUN server. The browser version uses the one built into its proxy; in the desktop app you choose one in Settings, Voice (Google, Cloudflare, or any address such as your proxy's), and none is contacted unless you do - Tested between two desktop instances on one machine with a test picture. Sound capture, real screens, connections across the internet, Windows and the browser build are untested ### Chat diff --git a/src/ui/SettingsDialog.svelte b/src/ui/SettingsDialog.svelte index 5c25220..1e797bc 100644 --- a/src/ui/SettingsDialog.svelte +++ b/src/ui/SettingsDialog.svelte @@ -16,6 +16,21 @@ const s = store.settings; let embedHosts = $state(s.embedHosts.join('\n')); let testResult = $state(''); + + // Public STUN servers to pick from; anything else is typed in + const STUN_PRESETS = [ + { name: 'Google', url: 'stun.l.google.com:19302' }, + { name: 'Cloudflare', url: 'stun.cloudflare.com:3478' } + ]; + let stunCustom = $state(!!s.stunServer && !STUN_PRESETS.some(p => p.url === s.stunServer)); + const stunChoice = $derived(stunCustom ? 'custom' : s.stunServer); + function chooseStun(value: string) { + stunCustom = value === 'custom'; + // Keep what was typed when switching to "another server" + if (!stunCustom) s.stunServer = value; + else if (STUN_PRESETS.some(p => p.url === s.stunServer)) s.stunServer = ''; + store.saveSettings(); + } // Settings that only work through the upload host are disabled until it is set up const hasUpload = $derived(!!(s.uploadHost.trim() && s.uploadKey.trim())); const needsUpload = $derived(hasUpload ? undefined : 'Needs an upload host and key'); @@ -60,9 +75,16 @@ {#if tab === 'voice'}

Screen sharing

- - store.saveSettings()} placeholder="stun.example.com:3478" autocomplete="off" /> -

Screen sharing connects you directly to the people watching. Across the internet both the person sharing and the people watching need a STUN server here to find a route; it learns your IP address but never sees the stream. Empty means no outside server is contacted, which only works on the same network.

+ + + {#if stunChoice === 'custom'} + store.saveSettings()} placeholder="stun.example.com:3478" autocomplete="off" aria-label="STUN server address" /> + {/if} +

Screen sharing connects you directly to the people watching. Across the internet both sides need a STUN server to find a route; it learns your IP address but never sees the stream. {isWeb ? 'By default the site you are on provides it.' : 'With none, no outside server is contacted and streams only work on the same network.'} Networks that block direct connections, like many mobile ones, need more than STUN.

{:else if tab === 'sounds'} {:else if tab === 'appearance'} @@ -123,7 +145,7 @@ .tabs button { padding: 8px 14px; color: var(--text-dim); font-weight: 600; white-space: nowrap; } .tabs button.active { color: var(--text); box-shadow: inset 0 -2px 0 var(--accent); } h3 { margin: 22px 0 0; font-size: 14px; } - .opt { text-transform: none; font-weight: 400; letter-spacing: 0; color: var(--text-faint); } + .stun-custom { margin-top: 6px; } .help { margin: 10px 0 0; font-size: 13px; color: var(--text-dim); } .row { display: flex; align-items: flex-end; gap: 8px; } .row > div { flex: 1; } diff --git a/src/ui/VoiceStage.svelte b/src/ui/VoiceStage.svelte index 4c866ab..52706a4 100644 --- a/src/ui/VoiceStage.svelte +++ b/src/ui/VoiceStage.svelte @@ -341,7 +341,7 @@ {/each} {#if watching?.state === 'failed'} -

Could not connect to the stream. Across the internet both of you need a STUN server set in Settings, Voice (the person sharing has to restart the stream after setting it).

+

Could not connect to the stream. Across the internet both of you need a STUN server, chosen in Settings, Voice (the person sharing has to restart the stream afterwards).

{/if} {/if} diff --git a/test/e2e/app.e2e.ts b/test/e2e/app.e2e.ts index 1ac4beb..8872d76 100644 --- a/test/e2e/app.e2e.ts +++ b/test/e2e/app.e2e.ts @@ -334,6 +334,21 @@ try { await page.getByRole('button', { name: 'Done', exact: true }).click(); console.log('ok: quick audio options on right-click'); + // STUN server for screen sharing: none by default, presets, or a typed address + await page.getByTitle('Settings').click(); + const stun = page.getByLabel('STUN server', { exact: true }); + assert.equal(await stun.inputValue(), ''); + await stun.selectOption({ label: 'Cloudflare (stun.cloudflare.com:3478)' }); + assert.equal(await page.evaluate(() => JSON.parse(localStorage.getItem('mumh5.settings')!).stunServer), 'stun.cloudflare.com:3478'); + await stun.selectOption('custom'); + await page.getByLabel('STUN server address').fill('stun.example.org:3478'); + await page.getByLabel('STUN server address').blur(); + assert.equal(await page.evaluate(() => JSON.parse(localStorage.getItem('mumh5.settings')!).stunServer), 'stun.example.org:3478'); + await stun.selectOption(''); + assert.equal(await page.evaluate(() => JSON.parse(localStorage.getItem('mumh5.settings')!).stunServer), ''); + await page.getByRole('button', { name: 'Done', exact: true }).click(); + console.log('ok: STUN server choices'); + // Color schemes apply right away and are remembered await page.getByTitle('Settings').click(); await page.getByRole('tab', { name: 'Appearance' }).click();