Speakr is a personal, self-hosted web application designed for transcribing audio recordings
Python
Fix Firefox system audio recording requiring user gesture
Murtaza Nasire51ea1ac58d1
diff --git a/static/js/modules/composables/audio.js b/static/js/modules/composables/audio.jsindex f4972aaa..6a173d5a 100644--- a/static/js/modules/composables/audio.js+++ b/static/js/modules/composables/audio.js@@ -148,30 +148,75 @@ export function useAudio(state, utils) {// Start recordingconst startRecording = async (mode = 'microphone') => {- // Check if there's a disclaimer to show- if (recordingDisclaimer.value && recordingDisclaimer.value.trim() !== '') {- showRecordingDisclaimerModal.value = true;- state.pendingRecordingMode = mode;- return;- }+ // For Firefox with system audio modes, we MUST call getDisplayMedia synchronously+ // from the user gesture, before any async operations or modal displays+ const isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;+ const needsDisplayMedia = mode === 'system' || mode === 'both';++ if (isFirefox && needsDisplayMedia) {+ // Get display media FIRST, synchronously from the click handler+ try {+ const displayStream = await navigator.mediaDevices.getDisplayMedia({+ video: true,+ audio: true+ });- await startRecordingInternal(mode);+ // Store the stream for later use+ state.pendingDisplayStream = displayStream;++ // Now check for disclaimer+ if (recordingDisclaimer.value && recordingDisclaimer.value.trim() !== '') {+ showRecordingDisclaimerModal.value = true;+ state.pendingRecordingMode = mode;+ return;+ }++ // No disclaimer, continue with recording using the obtained stream+ await startRecordingInternal(mode, displayStream);+ } catch (error) {+ console.error('[Recording] Failed to get display media:', error);+ if (error.name === 'NotAllowedError') {+ showToast('Screen sharing was denied or cancelled', 'error');+ } else {+ showToast(`Failed to capture system audio: ${error.message}`, 'error');+ }+ return;+ }+ } else {+ // Non-Firefox or microphone mode - original flow+ if (recordingDisclaimer.value && recordingDisclaimer.value.trim() !== '') {+ showRecordingDisclaimerModal.value = true;+ state.pendingRecordingMode = mode;+ return;+ }++ await startRecordingInternal(mode);+ }};// Accept recording disclaimer and start recordingconst acceptRecordingDisclaimer = async () => {showRecordingDisclaimerModal.value = false;- await startRecordingInternal(state.pendingRecordingMode || 'microphone');+ const mode = state.pendingRecordingMode || 'microphone';+ const displayStream = state.pendingDisplayStream;+ state.pendingDisplayStream = null;+ await startRecordingInternal(mode, displayStream);};// Cancel recording disclaimerconst cancelRecordingDisclaimer = () => {showRecordingDisclaimerModal.value = false;+ // Clean up any pending display stream+ if (state.pendingDisplayStream) {+ state.pendingDisplayStream.getTracks().forEach(track => track.stop());+ state.pendingDisplayStream = null;+ }state.pendingRecordingMode = null;};// Internal start recording function- const startRecordingInternal = async (mode) => {+ // existingDisplayStream is used for Firefox where we need to get the stream synchronously+ const startRecordingInternal = async (mode, existingDisplayStream = null) => {try {recordingMode.value = mode;audioChunks.value = [];@@ -206,16 +251,20 @@ export function useAudio(state, utils) {// Firefox requires simpler constraints and the tab must have audio playingconst isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;- const displayMediaConstraints = {- video: true, // Required by spec, we'll stop it immediately- audio: isFirefox ? true : {- echoCancellation: false,- noiseSuppression: false,- autoGainControl: false- }- };-- stream = await navigator.mediaDevices.getDisplayMedia(displayMediaConstraints);+ // Use existing stream if provided (Firefox pre-obtained it synchronously)+ if (existingDisplayStream) {+ stream = existingDisplayStream;+ } else {+ const displayMediaConstraints = {+ video: true, // Required by spec, we'll stop it immediately+ audio: isFirefox ? true : {+ echoCancellation: false,+ noiseSuppression: false,+ autoGainControl: false+ }+ };+ stream = await navigator.mediaDevices.getDisplayMedia(displayMediaConstraints);+ }const audioTrack = stream.getAudioTracks()[0];if (!audioTrack) {@@ -252,14 +301,20 @@ export function useAudio(state, utils) {// Firefox and Chrome handle system audio differentlyconst isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;- const displayStream = await navigator.mediaDevices.getDisplayMedia({- video: true,- audio: isFirefox ? true : {- echoCancellation: false,- noiseSuppression: false,- autoGainControl: false- }- });+ // Use existing stream if provided (Firefox pre-obtained it synchronously)+ let displayStream;+ if (existingDisplayStream) {+ displayStream = existingDisplayStream;+ } else {+ displayStream = await navigator.mediaDevices.getDisplayMedia({+ video: true,+ audio: isFirefox ? true : {+ echoCancellation: false,+ noiseSuppression: false,+ autoGainControl: false+ }+ });+ }const systemAudioTrack = displayStream.getAudioTracks()[0];if (!systemAudioTrack) {