From 0b9dd10d2eeada8603bd20e8f70cc6f02bb0ddf2 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:28:42 +0100 Subject: [PATCH 1/9] test(web): cover superseded microphone scans Co-authored-by: GPT 6.2 Sol --- .../chat/VoiceInputSetup.browser.test.tsx | 25 +++++ .../VoiceSettingsPanel.browser.test.tsx | 31 +++++- ...one-refresh-keeps-newer-device-list.e2e.ts | 95 +++++++++++++++++++ 3 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 scripts/scenarios/microphone-refresh-keeps-newer-device-list.e2e.ts diff --git a/apps/web/src/components/chat/VoiceInputSetup.browser.test.tsx b/apps/web/src/components/chat/VoiceInputSetup.browser.test.tsx index b8ff994f47587..fbbb817935b38 100644 --- a/apps/web/src/components/chat/VoiceInputSetup.browser.test.tsx +++ b/apps/web/src/components/chat/VoiceInputSetup.browser.test.tsx @@ -58,3 +58,28 @@ it.each([ expect(alert.query() !== null).toBe(showsError); }, ); + +it("ignores a microphone refresh that fails after closing setup", async () => { + await using screen = await render(wizard(false)); + const closedScan = Promise.withResolvers(); + const currentScan = Promise.withResolvers(); + using _enumeration = vi + .spyOn(navigator.mediaDevices, "enumerateDevices") + .mockReturnValueOnce(closedScan.promise) + .mockReturnValueOnce(currentScan.promise); + + await screen.rerender(wizard(true)); + const picker = page.getByRole("combobox", { name: "Microphone", exact: true }); + await expect.element(picker).toBeDisabled(); + await screen.rerender(wizard(false)); + await act(() => closedScan.reject(new Error("Enumeration failed"))); + + await screen.rerender(wizard(true)); + await expect.element(picker).toBeDisabled(); + expect( + page.getByRole("alert").filter({ hasText: "Couldn’t list microphones" }).query(), + ).toBeNull(); + + await act(() => currentScan.resolve([])); + await expect.element(picker).toBeEnabled(); +}); diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx index 5c918f9430086..d2ba6f06977c6 100644 --- a/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx +++ b/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx @@ -12,7 +12,7 @@ import { } from "@t3tools/contracts"; import { expect, it, vi } from "vite-plus/test"; import { userEvent } from "vite-plus/test/browser"; -import { render } from "../../../test/render"; +import { act, render } from "../../../test/render"; import { __setClientSettingsForTests, getClientSettings } from "../../hooks/useSettings"; import { readBrowserClientSettings } from "../../clientPersistenceStorage"; import { chooseRecordingMicrophone } from "../../speech/browserMicrophones"; @@ -746,3 +746,32 @@ it("records from the first connected microphone in the saved order", async () => .element(screen.getByRole("button", { name: "Forget System default" })) .not.toBeInTheDocument(); }); + +it("does not remember microphones from a scan that finishes after leaving settings", async () => { + const previous = getClientSettings(); + using cleanup = new DisposableStack(); + cleanup.defer(() => __setClientSettingsForTests(previous)); + __setClientSettingsForTests({ ...previous, voiceMicrophone: "", voiceMicrophones: [] }); + const scan = deferred(); + using _enumerate = vi + .spyOn(navigator.mediaDevices, "enumerateDevices") + .mockReturnValue(scan.promise); + await using screen = await render( + {}}> + + , + ); + await screen.unmount(); + await act(() => + scan.resolve([ + { + kind: "audioinput", + deviceId: "usb", + groupId: "usb", + label: "USB test microphone", + toJSON: () => ({}), + }, + ]), + ); + expect(getClientSettings().voiceMicrophones).toEqual([]); +}); diff --git a/scripts/scenarios/microphone-refresh-keeps-newer-device-list.e2e.ts b/scripts/scenarios/microphone-refresh-keeps-newer-device-list.e2e.ts new file mode 100644 index 0000000000000..71c59454388b5 --- /dev/null +++ b/scripts/scenarios/microphone-refresh-keeps-newer-device-list.e2e.ts @@ -0,0 +1,95 @@ +/// +import { expect } from "e2e"; + +import { test, WEB } from "./t3.ts"; + +declare global { + interface Window { + microphoneEnumeration?: { + holdOldScan(): void; + readonly oldScanStarted: Promise; + disconnectUsbMicrophone(): void; + releaseOldScan(): void; + }; + } +} + +test( + "A slow microphone scan cannot bring back a disconnected microphone", + WEB, + async ({ t3, app, browser, screen }) => { + await t3.project("demo"); + await browser.addInitScript(() => { + const devices = navigator.mediaDevices; + const internalMic = { + kind: "audioinput", + deviceId: "internal", + label: "Internal test microphone", + }; + const usbMic = { kind: "audioinput", deviceId: "usb", label: "USB test microphone" }; + let connected = [internalMic, usbMic]; + let holdNext = false; + const started = Promise.withResolvers(); + const release = Promise.withResolvers(); + // Emulate device snapshots when each enumeration starts and vary their delivery order. + Object.defineProperty(devices, "enumerateDevices", { + value: async () => { + const snapshot = connected; + if (holdNext) { + holdNext = false; + started.resolve(); + await release.promise; + } + return snapshot; + }, + }); + window.microphoneEnumeration = { + holdOldScan: () => { + holdNext = true; + }, + oldScanStarted: started.promise, + disconnectUsbMicrophone: () => { + connected = [internalMic]; + devices.dispatchEvent(new Event("devicechange")); + }, + releaseOldScan: release.resolve, + }; + }); + + await t3.open("/settings/voice"); + const moveUsbUp = screen.getByRole("button", "Move USB test microphone up", { exact: true }); + await moveUsbUp.waitFor(); + while (await moveUsbUp.isEnabled()) await moveUsbUp.tap(); + + const list = screen.getByRole("list", "Microphones, preferred first", { exact: true }); + const usbRow = list.getByRole("listitem").filter({ hasText: "USB test microphone" }); + await usbRow.getByText("In use", { exact: true }).waitFor(); + + await browser.evaluate(() => { + window.microphoneEnumeration!.holdOldScan(); + return null; + }); + await screen.getByRole("button", "Refresh microphones", { exact: true }).tap(); + await browser.evaluate(async () => { + await window.microphoneEnumeration!.oldScanStarted; + window.microphoneEnumeration!.disconnectUsbMicrophone(); + return null; + }); + const disconnected = usbRow.getByText("Not connected", { exact: true }); + await disconnected.waitFor(); + + await browser.evaluate(async () => { + window.microphoneEnumeration!.releaseOldScan(); + // Sample after the delivered device list has had a chance to paint. + await new Promise((resolve) => + requestAnimationFrame(() => requestAnimationFrame(() => resolve())), + ); + return null; + }); + await app.screenshot("after-stale-microphone-scan"); + expect( + await disconnected.isVisible(), + "The unplugged microphone remains marked Not connected", + ).toBe(true); + }, +); From f4e4dd908081844831f8fe681b758b5d6b13482b Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:29:53 +0100 Subject: [PATCH 2/9] fix(web): ignore superseded microphone scans Co-authored-by: GPT 6.2 Sol --- .../src/components/chat/VoiceInputSetup.tsx | 39 ++++++---------- .../settings/VoiceSettingsPanel.tsx | 26 +++-------- apps/web/src/speech/browserMicrophones.ts | 46 +++++++++++++++++-- 3 files changed, 63 insertions(+), 48 deletions(-) diff --git a/apps/web/src/components/chat/VoiceInputSetup.tsx b/apps/web/src/components/chat/VoiceInputSetup.tsx index 7d251a6ad4ff2..48e9ee8a596b5 100644 --- a/apps/web/src/components/chat/VoiceInputSetup.tsx +++ b/apps/web/src/components/chat/VoiceInputSetup.tsx @@ -1,9 +1,9 @@ import { T, Var, msg, useGT, useLocale } from "gt-react"; import { m } from "~/i18n/messages"; -import { useStableCallback } from "~/hooks/useStableCallback"; import { - listBrowserMicrophones, + labelBrowserMicrophones, updateMicrophoneOrder, + useMicrophoneRefresh, type BrowserMicrophone, } from "../../speech/browserMicrophones"; import type { @@ -13,7 +13,7 @@ import type { } from "@t3tools/contracts"; import { useNavigate } from "@tanstack/react-router"; import { CircleAlertIcon, MicIcon, RefreshCwIcon } from "lucide-react"; -import { useEffect, useRef, useState } from "react"; +import { useState } from "react"; import { useClientSettings } from "../../hooks/useSettings"; import { @@ -58,30 +58,17 @@ export function VoiceInputSetup(props: { const selectedMicrophone = preferredMicrophoneId(order, microphones); const [loadingMicrophones, setLoadingMicrophones] = useState(false); const [microphoneError, setMicrophoneError] = useState(null); - const microphoneRefreshId = useRef(0); - const refreshMicrophones = useStableCallback(async () => { - if (!navigator.mediaDevices?.enumerateDevices) return; - const requestId = ++microphoneRefreshId.current; - setLoadingMicrophones(true); - const devices = await listBrowserMicrophones().catch(() => null); - if (requestId !== microphoneRefreshId.current) return; - - if (devices === null) { - setMicrophoneError(m(msg("Couldn’t list microphones. The system default still works."))); - } else { - setMicrophones(devices); - setMicrophoneError(null); - } - setLoadingMicrophones(false); + const refreshMicrophones = useMicrophoneRefresh({ + enabled: props.open && props.step === 1, + onStart: () => setLoadingMicrophones(true), + onResult: (devices) => { + if (devices) setMicrophones(labelBrowserMicrophones(devices)); + setMicrophoneError( + devices ? null : m(msg("Couldn’t list microphones. The system default still works.")), + ); + setLoadingMicrophones(false); + }, }); - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes to native microphone changes while the device setup step is visible - useEffect(() => { - if (!props.open || props.step !== 1) return; - queueMicrotask(() => void refreshMicrophones()); - const mediaDevices = navigator.mediaDevices; - mediaDevices?.addEventListener?.("devicechange", refreshMicrophones); - return () => mediaDevices?.removeEventListener?.("devicechange", refreshMicrophones); - }, [props.open, props.step, refreshMicrophones]); const selectedIsUnavailable = Boolean( selectedMicrophone && !microphones.some((device) => device.deviceId === selectedMicrophone), ); diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.tsx index 1b7b06bea9502..246217c5d2106 100644 --- a/apps/web/src/components/settings/VoiceSettingsPanel.tsx +++ b/apps/web/src/components/settings/VoiceSettingsPanel.tsx @@ -61,8 +61,8 @@ import { msg, T, useGT, useLocale, useMessages, Var } from "gt-react"; import { useStableCallback } from "~/hooks/useStableCallback"; import { cn } from "~/lib/utils"; import { - listAudioInputs, updateMicrophoneOrder, + useMicrophoneRefresh, type BrowserMicrophone, } from "../../speech/browserMicrophones"; import { @@ -1331,25 +1331,13 @@ export function VoiceSettingsPanel() { const prepared = destination.cloudProvider ? null : destination.prepared; const catalog = useVoiceModels(prepared); - const refreshMicrophones = useStableCallback(async () => { - if (!navigator.mediaDevices?.enumerateDevices) return; - try { - const devices = await listAudioInputs(); - setMicrophones(devices); - updateMicrophoneOrder((order) => rememberMicrophones(order, devices)); - } catch { - setMicrophones([]); - } + const refreshMicrophones = useMicrophoneRefresh({ + enabled: true, + onResult: (devices) => { + setMicrophones(devices ?? []); + if (devices) updateMicrophoneOrder((order) => rememberMicrophones(order, devices)); + }, }); - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes to microphone device changes while settings are open - useEffect(() => { - queueMicrotask(() => void refreshMicrophones()); - const mediaDevices = navigator.mediaDevices; - if (!mediaDevices?.addEventListener) return; - const onChange = () => void refreshMicrophones(); - mediaDevices.addEventListener("devicechange", onChange); - return () => mediaDevices.removeEventListener("devicechange", onChange); - }, [refreshMicrophones]); const modelStatus = catalog.status; const target = settingsScope?.target; const members = settingsScope?.scope.members; diff --git a/apps/web/src/speech/browserMicrophones.ts b/apps/web/src/speech/browserMicrophones.ts index 1264ef9968239..7e50515cb3f50 100644 --- a/apps/web/src/speech/browserMicrophones.ts +++ b/apps/web/src/speech/browserMicrophones.ts @@ -1,3 +1,5 @@ +import { useLayoutEffect, useRef } from "react"; +import { useStableCallback } from "../hooks/useStableCallback"; import { getClientSettings, isClientSettingsHydrated, @@ -15,20 +17,58 @@ import { m } from "../i18n/messages"; export type BrowserMicrophone = Pick; /** Audio inputs as the browser reports them. Labels stay empty until microphone permission. */ -export async function listAudioInputs(): Promise { +async function listAudioInputs(): Promise { const devices = await navigator.mediaDevices.enumerateDevices(); return devices .filter((device) => device.kind === "audioinput") .map(({ deviceId, label }) => ({ deviceId, label })); } -export async function listBrowserMicrophones(): Promise { - return (await listAudioInputs()).map(({ deviceId, label }, index) => ({ +export function labelBrowserMicrophones(devices: BrowserMicrophone[]): BrowserMicrophone[] { + return devices.map(({ deviceId, label }, index) => ({ deviceId, label: label || m(msg("Microphone {number}", { number: index + 1 })), })); } +export function useMicrophoneRefresh({ + enabled, + onStart, + onResult, +}: { + enabled: boolean; + onStart?: () => void; + onResult: (devices: BrowserMicrophone[] | null) => void; +}) { + const latest = useRef(null); + const refresh = useStableCallback(async () => { + if (latest.current === null || !navigator.mediaDevices?.enumerateDevices) return; + const scan = Symbol(); + latest.current = scan; + onStart?.(); + const devices = await listAudioInputs().catch(() => null); + if (latest.current === scan) onResult(devices); + }); + + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes browser device changes and invalidates pending scans on cleanup + useLayoutEffect(() => { + if (!enabled) return; + const initial = Symbol(); + latest.current = initial; + queueMicrotask(() => { + if (latest.current === initial) void refresh(); + }); + const devices = navigator.mediaDevices; + devices?.addEventListener?.("devicechange", refresh); + return () => { + latest.current = null; + devices?.removeEventListener?.("devicechange", refresh); + }; + }, [enabled, refresh]); + + return refresh; +} + /** Applies a change to the saved order. Skipped before hydration so defaults never replace a saved order. */ export function updateMicrophoneOrder( change: (order: ReadonlyArray) => ReadonlyArray, From 31e57c318cc5727fa91727d536c003992211a07b Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:37:50 +0100 Subject: [PATCH 3/9] fix(web): retain setup scan guard and invalidate it on close Co-authored-by: GPT 6.2 Sol --- .../src/components/chat/VoiceInputSetup.tsx | 45 ++++++++++++------ .../settings/VoiceSettingsPanel.tsx | 32 +++++++++---- apps/web/src/speech/browserMicrophones.ts | 46 ++----------------- 3 files changed, 59 insertions(+), 64 deletions(-) diff --git a/apps/web/src/components/chat/VoiceInputSetup.tsx b/apps/web/src/components/chat/VoiceInputSetup.tsx index 48e9ee8a596b5..d6150e281e725 100644 --- a/apps/web/src/components/chat/VoiceInputSetup.tsx +++ b/apps/web/src/components/chat/VoiceInputSetup.tsx @@ -1,9 +1,9 @@ import { T, Var, msg, useGT, useLocale } from "gt-react"; import { m } from "~/i18n/messages"; +import { useStableCallback } from "~/hooks/useStableCallback"; import { - labelBrowserMicrophones, + listBrowserMicrophones, updateMicrophoneOrder, - useMicrophoneRefresh, type BrowserMicrophone, } from "../../speech/browserMicrophones"; import type { @@ -13,7 +13,7 @@ import type { } from "@t3tools/contracts"; import { useNavigate } from "@tanstack/react-router"; import { CircleAlertIcon, MicIcon, RefreshCwIcon } from "lucide-react"; -import { useState } from "react"; +import { useEffect, useRef, useState } from "react"; import { useClientSettings } from "../../hooks/useSettings"; import { @@ -58,17 +58,36 @@ export function VoiceInputSetup(props: { const selectedMicrophone = preferredMicrophoneId(order, microphones); const [loadingMicrophones, setLoadingMicrophones] = useState(false); const [microphoneError, setMicrophoneError] = useState(null); - const refreshMicrophones = useMicrophoneRefresh({ - enabled: props.open && props.step === 1, - onStart: () => setLoadingMicrophones(true), - onResult: (devices) => { - if (devices) setMicrophones(labelBrowserMicrophones(devices)); - setMicrophoneError( - devices ? null : m(msg("Couldn’t list microphones. The system default still works.")), - ); - setLoadingMicrophones(false); - }, + const microphoneRefreshId = useRef(0); + const refreshMicrophones = useStableCallback(async () => { + if (!navigator.mediaDevices?.enumerateDevices) return; + const requestId = ++microphoneRefreshId.current; + setLoadingMicrophones(true); + const devices = await listBrowserMicrophones().catch(() => null); + if (requestId !== microphoneRefreshId.current) return; + + if (devices === null) { + setMicrophoneError(m(msg("Couldn’t list microphones. The system default still works."))); + } else { + setMicrophones(devices); + setMicrophoneError(null); + } + setLoadingMicrophones(false); }); + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes to native microphone changes while the device setup step is visible + useEffect(() => { + if (!props.open || props.step !== 1) return; + const initialRefreshId = microphoneRefreshId.current; + queueMicrotask(() => { + if (initialRefreshId === microphoneRefreshId.current) void refreshMicrophones(); + }); + const mediaDevices = navigator.mediaDevices; + mediaDevices?.addEventListener?.("devicechange", refreshMicrophones); + return () => { + ++microphoneRefreshId.current; + mediaDevices?.removeEventListener?.("devicechange", refreshMicrophones); + }; + }, [props.open, props.step, refreshMicrophones]); const selectedIsUnavailable = Boolean( selectedMicrophone && !microphones.some((device) => device.deviceId === selectedMicrophone), ); diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.tsx index 246217c5d2106..6c5f44bd5c717 100644 --- a/apps/web/src/components/settings/VoiceSettingsPanel.tsx +++ b/apps/web/src/components/settings/VoiceSettingsPanel.tsx @@ -55,14 +55,14 @@ import { UnlinkIcon, XIcon, } from "lucide-react"; -import { useEffect, useRef, useState, type ReactNode } from "react"; +import { useEffect, useLayoutEffect, useRef, useState, type ReactNode } from "react"; import { msg, T, useGT, useLocale, useMessages, Var } from "gt-react"; import { useStableCallback } from "~/hooks/useStableCallback"; import { cn } from "~/lib/utils"; import { + listAudioInputs, updateMicrophoneOrder, - useMicrophoneRefresh, type BrowserMicrophone, } from "../../speech/browserMicrophones"; import { @@ -1331,13 +1331,29 @@ export function VoiceSettingsPanel() { const prepared = destination.cloudProvider ? null : destination.prepared; const catalog = useVoiceModels(prepared); - const refreshMicrophones = useMicrophoneRefresh({ - enabled: true, - onResult: (devices) => { - setMicrophones(devices ?? []); - if (devices) updateMicrophoneOrder((order) => rememberMicrophones(order, devices)); - }, + const microphoneRefreshId = useRef(0); + const refreshMicrophones = useStableCallback(async () => { + if (!navigator.mediaDevices?.enumerateDevices) return; + const requestId = ++microphoneRefreshId.current; + const devices = await listAudioInputs().catch(() => null); + if (requestId !== microphoneRefreshId.current) return; + + setMicrophones(devices ?? []); + if (devices) updateMicrophoneOrder((order) => rememberMicrophones(order, devices)); }); + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes microphone changes and invalidates pending scans when settings closes + useLayoutEffect(() => { + const initialRefreshId = microphoneRefreshId.current; + queueMicrotask(() => { + if (initialRefreshId === microphoneRefreshId.current) void refreshMicrophones(); + }); + const mediaDevices = navigator.mediaDevices; + mediaDevices?.addEventListener?.("devicechange", refreshMicrophones); + return () => { + ++microphoneRefreshId.current; + mediaDevices?.removeEventListener?.("devicechange", refreshMicrophones); + }; + }, [refreshMicrophones]); const modelStatus = catalog.status; const target = settingsScope?.target; const members = settingsScope?.scope.members; diff --git a/apps/web/src/speech/browserMicrophones.ts b/apps/web/src/speech/browserMicrophones.ts index 7e50515cb3f50..1264ef9968239 100644 --- a/apps/web/src/speech/browserMicrophones.ts +++ b/apps/web/src/speech/browserMicrophones.ts @@ -1,5 +1,3 @@ -import { useLayoutEffect, useRef } from "react"; -import { useStableCallback } from "../hooks/useStableCallback"; import { getClientSettings, isClientSettingsHydrated, @@ -17,58 +15,20 @@ import { m } from "../i18n/messages"; export type BrowserMicrophone = Pick; /** Audio inputs as the browser reports them. Labels stay empty until microphone permission. */ -async function listAudioInputs(): Promise { +export async function listAudioInputs(): Promise { const devices = await navigator.mediaDevices.enumerateDevices(); return devices .filter((device) => device.kind === "audioinput") .map(({ deviceId, label }) => ({ deviceId, label })); } -export function labelBrowserMicrophones(devices: BrowserMicrophone[]): BrowserMicrophone[] { - return devices.map(({ deviceId, label }, index) => ({ +export async function listBrowserMicrophones(): Promise { + return (await listAudioInputs()).map(({ deviceId, label }, index) => ({ deviceId, label: label || m(msg("Microphone {number}", { number: index + 1 })), })); } -export function useMicrophoneRefresh({ - enabled, - onStart, - onResult, -}: { - enabled: boolean; - onStart?: () => void; - onResult: (devices: BrowserMicrophone[] | null) => void; -}) { - const latest = useRef(null); - const refresh = useStableCallback(async () => { - if (latest.current === null || !navigator.mediaDevices?.enumerateDevices) return; - const scan = Symbol(); - latest.current = scan; - onStart?.(); - const devices = await listAudioInputs().catch(() => null); - if (latest.current === scan) onResult(devices); - }); - - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes browser device changes and invalidates pending scans on cleanup - useLayoutEffect(() => { - if (!enabled) return; - const initial = Symbol(); - latest.current = initial; - queueMicrotask(() => { - if (latest.current === initial) void refresh(); - }); - const devices = navigator.mediaDevices; - devices?.addEventListener?.("devicechange", refresh); - return () => { - latest.current = null; - devices?.removeEventListener?.("devicechange", refresh); - }; - }, [enabled, refresh]); - - return refresh; -} - /** Applies a change to the saved order. Skipped before hydration so defaults never replace a saved order. */ export function updateMicrophoneOrder( change: (order: ReadonlyArray) => ReadonlyArray, From 47f539bc75f77502d779d0326c71b9938648cc68 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:44:16 +0100 Subject: [PATCH 4/9] refactor(web): keep the settings microphone subscription in useEffect The passive effect cleanup already invalidates pending scans on unmount, so the switch to useLayoutEffect is not needed. Co-Authored-By: Claude Opus 5.5 --- apps/web/src/components/settings/VoiceSettingsPanel.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.tsx index 6c5f44bd5c717..7eef7d0b03b57 100644 --- a/apps/web/src/components/settings/VoiceSettingsPanel.tsx +++ b/apps/web/src/components/settings/VoiceSettingsPanel.tsx @@ -55,7 +55,7 @@ import { UnlinkIcon, XIcon, } from "lucide-react"; -import { useEffect, useLayoutEffect, useRef, useState, type ReactNode } from "react"; +import { useEffect, useRef, useState, type ReactNode } from "react"; import { msg, T, useGT, useLocale, useMessages, Var } from "gt-react"; import { useStableCallback } from "~/hooks/useStableCallback"; @@ -1342,7 +1342,7 @@ export function VoiceSettingsPanel() { if (devices) updateMicrophoneOrder((order) => rememberMicrophones(order, devices)); }); // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes microphone changes and invalidates pending scans when settings closes - useLayoutEffect(() => { + useEffect(() => { const initialRefreshId = microphoneRefreshId.current; queueMicrotask(() => { if (initialRefreshId === microphoneRefreshId.current) void refreshMicrophones(); From 28be286d5494aa47c6e5e07e52c2cf4e7e3c8f21 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:50:49 +0100 Subject: [PATCH 5/9] refactor(web): share the microphone refresh lifecycle Co-authored-by: GPT 6.2 Sol --- .../src/components/chat/VoiceInputSetup.tsx | 45 +++++------------ .../settings/VoiceSettingsPanel.tsx | 30 +++-------- apps/web/src/speech/browserMicrophones.ts | 50 +++++++++++++++++-- 3 files changed, 67 insertions(+), 58 deletions(-) diff --git a/apps/web/src/components/chat/VoiceInputSetup.tsx b/apps/web/src/components/chat/VoiceInputSetup.tsx index d6150e281e725..48e9ee8a596b5 100644 --- a/apps/web/src/components/chat/VoiceInputSetup.tsx +++ b/apps/web/src/components/chat/VoiceInputSetup.tsx @@ -1,9 +1,9 @@ import { T, Var, msg, useGT, useLocale } from "gt-react"; import { m } from "~/i18n/messages"; -import { useStableCallback } from "~/hooks/useStableCallback"; import { - listBrowserMicrophones, + labelBrowserMicrophones, updateMicrophoneOrder, + useMicrophoneRefresh, type BrowserMicrophone, } from "../../speech/browserMicrophones"; import type { @@ -13,7 +13,7 @@ import type { } from "@t3tools/contracts"; import { useNavigate } from "@tanstack/react-router"; import { CircleAlertIcon, MicIcon, RefreshCwIcon } from "lucide-react"; -import { useEffect, useRef, useState } from "react"; +import { useState } from "react"; import { useClientSettings } from "../../hooks/useSettings"; import { @@ -58,36 +58,17 @@ export function VoiceInputSetup(props: { const selectedMicrophone = preferredMicrophoneId(order, microphones); const [loadingMicrophones, setLoadingMicrophones] = useState(false); const [microphoneError, setMicrophoneError] = useState(null); - const microphoneRefreshId = useRef(0); - const refreshMicrophones = useStableCallback(async () => { - if (!navigator.mediaDevices?.enumerateDevices) return; - const requestId = ++microphoneRefreshId.current; - setLoadingMicrophones(true); - const devices = await listBrowserMicrophones().catch(() => null); - if (requestId !== microphoneRefreshId.current) return; - - if (devices === null) { - setMicrophoneError(m(msg("Couldn’t list microphones. The system default still works."))); - } else { - setMicrophones(devices); - setMicrophoneError(null); - } - setLoadingMicrophones(false); + const refreshMicrophones = useMicrophoneRefresh({ + enabled: props.open && props.step === 1, + onStart: () => setLoadingMicrophones(true), + onResult: (devices) => { + if (devices) setMicrophones(labelBrowserMicrophones(devices)); + setMicrophoneError( + devices ? null : m(msg("Couldn’t list microphones. The system default still works.")), + ); + setLoadingMicrophones(false); + }, }); - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes to native microphone changes while the device setup step is visible - useEffect(() => { - if (!props.open || props.step !== 1) return; - const initialRefreshId = microphoneRefreshId.current; - queueMicrotask(() => { - if (initialRefreshId === microphoneRefreshId.current) void refreshMicrophones(); - }); - const mediaDevices = navigator.mediaDevices; - mediaDevices?.addEventListener?.("devicechange", refreshMicrophones); - return () => { - ++microphoneRefreshId.current; - mediaDevices?.removeEventListener?.("devicechange", refreshMicrophones); - }; - }, [props.open, props.step, refreshMicrophones]); const selectedIsUnavailable = Boolean( selectedMicrophone && !microphones.some((device) => device.deviceId === selectedMicrophone), ); diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.tsx index 7eef7d0b03b57..246217c5d2106 100644 --- a/apps/web/src/components/settings/VoiceSettingsPanel.tsx +++ b/apps/web/src/components/settings/VoiceSettingsPanel.tsx @@ -61,8 +61,8 @@ import { msg, T, useGT, useLocale, useMessages, Var } from "gt-react"; import { useStableCallback } from "~/hooks/useStableCallback"; import { cn } from "~/lib/utils"; import { - listAudioInputs, updateMicrophoneOrder, + useMicrophoneRefresh, type BrowserMicrophone, } from "../../speech/browserMicrophones"; import { @@ -1331,29 +1331,13 @@ export function VoiceSettingsPanel() { const prepared = destination.cloudProvider ? null : destination.prepared; const catalog = useVoiceModels(prepared); - const microphoneRefreshId = useRef(0); - const refreshMicrophones = useStableCallback(async () => { - if (!navigator.mediaDevices?.enumerateDevices) return; - const requestId = ++microphoneRefreshId.current; - const devices = await listAudioInputs().catch(() => null); - if (requestId !== microphoneRefreshId.current) return; - - setMicrophones(devices ?? []); - if (devices) updateMicrophoneOrder((order) => rememberMicrophones(order, devices)); + const refreshMicrophones = useMicrophoneRefresh({ + enabled: true, + onResult: (devices) => { + setMicrophones(devices ?? []); + if (devices) updateMicrophoneOrder((order) => rememberMicrophones(order, devices)); + }, }); - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes microphone changes and invalidates pending scans when settings closes - useEffect(() => { - const initialRefreshId = microphoneRefreshId.current; - queueMicrotask(() => { - if (initialRefreshId === microphoneRefreshId.current) void refreshMicrophones(); - }); - const mediaDevices = navigator.mediaDevices; - mediaDevices?.addEventListener?.("devicechange", refreshMicrophones); - return () => { - ++microphoneRefreshId.current; - mediaDevices?.removeEventListener?.("devicechange", refreshMicrophones); - }; - }, [refreshMicrophones]); const modelStatus = catalog.status; const target = settingsScope?.target; const members = settingsScope?.scope.members; diff --git a/apps/web/src/speech/browserMicrophones.ts b/apps/web/src/speech/browserMicrophones.ts index 1264ef9968239..2327811310a16 100644 --- a/apps/web/src/speech/browserMicrophones.ts +++ b/apps/web/src/speech/browserMicrophones.ts @@ -1,3 +1,5 @@ +import { useEffect, useRef } from "react"; +import { useStableCallback } from "../hooks/useStableCallback"; import { getClientSettings, isClientSettingsHydrated, @@ -15,20 +17,62 @@ import { m } from "../i18n/messages"; export type BrowserMicrophone = Pick; /** Audio inputs as the browser reports them. Labels stay empty until microphone permission. */ -export async function listAudioInputs(): Promise { +async function listAudioInputs(): Promise { const devices = await navigator.mediaDevices.enumerateDevices(); return devices .filter((device) => device.kind === "audioinput") .map(({ deviceId, label }) => ({ deviceId, label })); } -export async function listBrowserMicrophones(): Promise { - return (await listAudioInputs()).map(({ deviceId, label }, index) => ({ +export function labelBrowserMicrophones(devices: BrowserMicrophone[]): BrowserMicrophone[] { + return devices.map(({ deviceId, label }, index) => ({ deviceId, label: label || m(msg("Microphone {number}", { number: index + 1 })), })); } +/** Delivers the latest scan's result, or null if it fails, while the view is enabled. */ +export function useMicrophoneRefresh({ + enabled, + onStart, + onResult, +}: { + enabled: boolean; + onStart?: () => void; + onResult: (devices: BrowserMicrophone[] | null) => void; +}) { + const latest = useRef(null); + const reportResult = useStableCallback((devices: BrowserMicrophone[] | null) => { + if (enabled) onResult(devices); + }); + const refresh = useStableCallback(async () => { + if (!enabled || latest.current === null || !navigator.mediaDevices?.enumerateDevices) return; + const scan = Symbol(); + latest.current = scan; + onStart?.(); + const devices = await listAudioInputs().catch(() => null); + if (latest.current === scan) reportResult(devices); + }); + + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes browser device changes and invalidates pending scans on cleanup + useEffect(() => { + if (!enabled) return; + const initial = Symbol(); + latest.current = initial; + queueMicrotask(() => { + if (latest.current === initial) void refresh(); + }); + const devices = navigator.mediaDevices; + devices?.addEventListener?.("devicechange", refresh); + return () => { + latest.current = null; + devices?.removeEventListener?.("devicechange", refresh); + }; + }, [enabled, refresh]); + + return refresh; +} + /** Applies a change to the saved order. Skipped before hydration so defaults never replace a saved order. */ export function updateMicrophoneOrder( change: (order: ReadonlyArray) => ReadonlyArray, From 2d6b3f64e0acb4eb55007b7166018b2f72d121cb Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:57:10 +0100 Subject: [PATCH 6/9] test(web): keep unplugged microphones disconnected after stale scans Co-authored-by: GPT 6.2 Sol --- .../VoiceSettingsPanel.browser.test.tsx | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx index d2ba6f06977c6..28362ab2e53bc 100644 --- a/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx +++ b/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx @@ -775,3 +775,41 @@ it("does not remember microphones from a scan that finishes after leaving settin ); expect(getClientSettings().voiceMicrophones).toEqual([]); }); + +it("keeps an unplugged microphone disconnected when an older scan finishes last", async () => { + const previous = getClientSettings(); + using cleanup = new DisposableStack(); + cleanup.defer(() => __setClientSettingsForTests(previous)); + __setClientSettingsForTests({ + ...previous, + voiceMicrophones: [{ kind: "device", deviceId: "usb", label: "USB test microphone" }], + }); + const microphone = (deviceId: string, label: string): MediaDeviceInfo => ({ + kind: "audioinput", + deviceId, + groupId: deviceId, + label, + toJSON: () => ({}), + }); + const internal = microphone("internal", "Built-in microphone"); + const usb = microphone("usb", "USB test microphone"); + const olderScan = deferred(); + using _enumerate = vi + .spyOn(navigator.mediaDevices, "enumerateDevices") + .mockReturnValueOnce(olderScan.promise) + .mockResolvedValue([internal]); + await using screen = await render( + {}}> + + , + ); + + const microphones = screen.getByRole("list", { name: "Microphones, preferred first" }); + const usbRow = microphones.getByRole("listitem").filter({ hasText: "USB test microphone" }); + await userEvent.click(screen.getByRole("button", { name: "Refresh microphones" })); + await expect.element(microphones.getByText("Built-in microphone")).toBeVisible(); + expect(usbRow.element().textContent).toContain("Not connected"); + + await act(() => olderScan.resolve([internal, usb])); + expect(usbRow.element().textContent).toContain("Not connected"); +}); From f1388540005dc7c625b1e75ad9556755e9f9d88d Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:57:58 +0100 Subject: [PATCH 7/9] fix(web): invalidate microphone scans when their view is removed Co-authored-by: GPT 6.2 Sol --- .../browserMicrophones.browser.test.tsx | 48 +++++++++++++++++++ apps/web/src/speech/browserMicrophones.ts | 13 +++-- 2 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 apps/web/src/speech/browserMicrophones.browser.test.tsx diff --git a/apps/web/src/speech/browserMicrophones.browser.test.tsx b/apps/web/src/speech/browserMicrophones.browser.test.tsx new file mode 100644 index 0000000000000..eee3363b2a557 --- /dev/null +++ b/apps/web/src/speech/browserMicrophones.browser.test.tsx @@ -0,0 +1,48 @@ +import { startTransition, useLayoutEffect, useState } from "react"; +import { expect, it, vi } from "vite-plus/test"; +import { render } from "../../test/render"; +import { useMicrophoneRefresh } from "./browserMicrophones"; + +it("drops a microphone scan resolved during the commit that removes its view", async () => { + const scan = Promise.withResolvers(); + const started = Promise.withResolvers(); + const onResult = vi.fn(); + using _enumerate = vi.spyOn(navigator.mediaDevices, "enumerateDevices").mockImplementation(() => { + started.resolve(); + return scan.promise; + }); + + function MicrophoneView() { + useMicrophoneRefresh({ enabled: true, onResult }); + return null; + } + + function Replacement() { + useLayoutEffect(() => { + scan.resolve([]); + }, []); + return

Microphone view closed

; + } + + function App() { + const [open, setOpen] = useState(true); + return open ? ( + <> + + + + ) : ( + + ); + } + + // A plain root keeps the replacement commit independent of the router. + await using screen = await render(, { router: false }); + await started.promise; + // act would flush passive cleanup before the scan can complete. + screen.getByRole("button", { name: "Close microphone view" }).element().click(); + await expect.element(screen.getByText("Microphone view closed")).toBeVisible(); + expect(onResult).not.toHaveBeenCalled(); +}); diff --git a/apps/web/src/speech/browserMicrophones.ts b/apps/web/src/speech/browserMicrophones.ts index 2327811310a16..ea4ee8f74960f 100644 --- a/apps/web/src/speech/browserMicrophones.ts +++ b/apps/web/src/speech/browserMicrophones.ts @@ -1,4 +1,4 @@ -import { useEffect, useRef } from "react"; +import { useEffect, useLayoutEffect, useRef } from "react"; import { useStableCallback } from "../hooks/useStableCallback"; import { getClientSettings, @@ -54,7 +54,15 @@ export function useMicrophoneRefresh({ if (latest.current === scan) reportResult(devices); }); - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes browser device changes and invalidates pending scans on cleanup + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- invalidates pending scans at commit before passive cleanup can run + useLayoutEffect(() => { + if (!enabled) return; + return () => { + latest.current = null; + }; + }, [enabled]); + + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes browser device changes useEffect(() => { if (!enabled) return; const initial = Symbol(); @@ -65,7 +73,6 @@ export function useMicrophoneRefresh({ const devices = navigator.mediaDevices; devices?.addEventListener?.("devicechange", refresh); return () => { - latest.current = null; devices?.removeEventListener?.("devicechange", refresh); }; }, [enabled, refresh]); From 797299491e45a8aea2d28c7608196fa52bbd1161 Mon Sep 17 00:00:00 2001 From: Wout Stiens <71498452+StiensWout@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:59:03 +0100 Subject: [PATCH 8/9] test(web): dispatch a typed click in the microphone cleanup test Co-authored-by: GPT 6.2 Sol --- apps/web/src/speech/browserMicrophones.browser.test.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web/src/speech/browserMicrophones.browser.test.tsx b/apps/web/src/speech/browserMicrophones.browser.test.tsx index eee3363b2a557..f5fbf781a8633 100644 --- a/apps/web/src/speech/browserMicrophones.browser.test.tsx +++ b/apps/web/src/speech/browserMicrophones.browser.test.tsx @@ -42,7 +42,10 @@ it("drops a microphone scan resolved during the commit that removes its view", a await using screen = await render(, { router: false }); await started.promise; // act would flush passive cleanup before the scan can complete. - screen.getByRole("button", { name: "Close microphone view" }).element().click(); + screen + .getByRole("button", { name: "Close microphone view" }) + .element() + .dispatchEvent(new MouseEvent("click", { bubbles: true })); await expect.element(screen.getByText("Microphone view closed")).toBeVisible(); expect(onResult).not.toHaveBeenCalled(); }); From 86f6ece2079aba4ae27708a2f1a9d634597a1eae Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Fri, 20 Nov 2026 08:15:17 +0000 Subject: [PATCH 9/9] refactor(web): run the microphone refresh lifecycle in one layout effect The subscription, the initial scan and the invalidation now share one layout effect, so a pending scan is dropped in the commit that closes the view without a second effect or an extra enabled guard. Drops the wrapper tests that repeat the hook's closed-view case. Co-Authored-By: Claude Opus 5.5 --- .../chat/VoiceInputSetup.browser.test.tsx | 25 ---------------- .../VoiceSettingsPanel.browser.test.tsx | 29 ------------------- apps/web/src/speech/browserMicrophones.ts | 27 ++++++----------- 3 files changed, 9 insertions(+), 72 deletions(-) diff --git a/apps/web/src/components/chat/VoiceInputSetup.browser.test.tsx b/apps/web/src/components/chat/VoiceInputSetup.browser.test.tsx index fbbb817935b38..b8ff994f47587 100644 --- a/apps/web/src/components/chat/VoiceInputSetup.browser.test.tsx +++ b/apps/web/src/components/chat/VoiceInputSetup.browser.test.tsx @@ -58,28 +58,3 @@ it.each([ expect(alert.query() !== null).toBe(showsError); }, ); - -it("ignores a microphone refresh that fails after closing setup", async () => { - await using screen = await render(wizard(false)); - const closedScan = Promise.withResolvers(); - const currentScan = Promise.withResolvers(); - using _enumeration = vi - .spyOn(navigator.mediaDevices, "enumerateDevices") - .mockReturnValueOnce(closedScan.promise) - .mockReturnValueOnce(currentScan.promise); - - await screen.rerender(wizard(true)); - const picker = page.getByRole("combobox", { name: "Microphone", exact: true }); - await expect.element(picker).toBeDisabled(); - await screen.rerender(wizard(false)); - await act(() => closedScan.reject(new Error("Enumeration failed"))); - - await screen.rerender(wizard(true)); - await expect.element(picker).toBeDisabled(); - expect( - page.getByRole("alert").filter({ hasText: "Couldn’t list microphones" }).query(), - ).toBeNull(); - - await act(() => currentScan.resolve([])); - await expect.element(picker).toBeEnabled(); -}); diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx index 28362ab2e53bc..7908bd31d2259 100644 --- a/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx +++ b/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx @@ -747,35 +747,6 @@ it("records from the first connected microphone in the saved order", async () => .not.toBeInTheDocument(); }); -it("does not remember microphones from a scan that finishes after leaving settings", async () => { - const previous = getClientSettings(); - using cleanup = new DisposableStack(); - cleanup.defer(() => __setClientSettingsForTests(previous)); - __setClientSettingsForTests({ ...previous, voiceMicrophone: "", voiceMicrophones: [] }); - const scan = deferred(); - using _enumerate = vi - .spyOn(navigator.mediaDevices, "enumerateDevices") - .mockReturnValue(scan.promise); - await using screen = await render( - {}}> - - , - ); - await screen.unmount(); - await act(() => - scan.resolve([ - { - kind: "audioinput", - deviceId: "usb", - groupId: "usb", - label: "USB test microphone", - toJSON: () => ({}), - }, - ]), - ); - expect(getClientSettings().voiceMicrophones).toEqual([]); -}); - it("keeps an unplugged microphone disconnected when an older scan finishes last", async () => { const previous = getClientSettings(); using cleanup = new DisposableStack(); diff --git a/apps/web/src/speech/browserMicrophones.ts b/apps/web/src/speech/browserMicrophones.ts index ea4ee8f74960f..e7f9cdac368bb 100644 --- a/apps/web/src/speech/browserMicrophones.ts +++ b/apps/web/src/speech/browserMicrophones.ts @@ -1,4 +1,4 @@ -import { useEffect, useLayoutEffect, useRef } from "react"; +import { useLayoutEffect, useRef } from "react"; import { useStableCallback } from "../hooks/useStableCallback"; import { getClientSettings, @@ -41,38 +41,29 @@ export function useMicrophoneRefresh({ onStart?: () => void; onResult: (devices: BrowserMicrophone[] | null) => void; }) { + // null while the view is closed; otherwise the scan whose result may still be delivered. const latest = useRef(null); - const reportResult = useStableCallback((devices: BrowserMicrophone[] | null) => { - if (enabled) onResult(devices); - }); const refresh = useStableCallback(async () => { - if (!enabled || latest.current === null || !navigator.mediaDevices?.enumerateDevices) return; + if (latest.current === null || !navigator.mediaDevices?.enumerateDevices) return; const scan = Symbol(); latest.current = scan; onStart?.(); const devices = await listAudioInputs().catch(() => null); - if (latest.current === scan) reportResult(devices); + if (latest.current === scan) onResult(devices); }); - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- invalidates pending scans at commit before passive cleanup can run + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes browser device changes; layout cleanup drops pending scans in the commit that closes the view useLayoutEffect(() => { if (!enabled) return; - return () => { - latest.current = null; - }; - }, [enabled]); - - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes browser device changes - useEffect(() => { - if (!enabled) return; - const initial = Symbol(); - latest.current = initial; + const opened = Symbol(); + latest.current = opened; queueMicrotask(() => { - if (latest.current === initial) void refresh(); + if (latest.current === opened) void refresh(); }); const devices = navigator.mediaDevices; devices?.addEventListener?.("devicechange", refresh); return () => { + latest.current = null; devices?.removeEventListener?.("devicechange", refresh); }; }, [enabled, refresh]);