From 8ec968ff3b2dcfd2a0c64e16d50f847e28aa8629 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 7 Nov 2026 09:56:28 -0800 Subject: [PATCH 1/4] chore(quest): claim quest/m0/speaker-volume.md Quest-Claim: 276779c8b9141555 From 8d8450cca5acae581fa84dea63d1d0173682c13c Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 7 Nov 2026 10:02:31 -0800 Subject: [PATCH 2/4] fix: preserve speaker gain across reload and mute --- app/package.json | 2 +- app/src/controls.tsx | 19 +++----- app/src/settings.tsx | 20 ++------- app/src/speaker.test.ts | 88 ++++++++++++++++++++++++++++++++++++++ app/src/speaker.ts | 37 ++++++++++++++++ quest/m0/README.md | 1 - quest/m0/speaker-volume.md | 21 --------- 7 files changed, 134 insertions(+), 54 deletions(-) create mode 100644 app/src/speaker.test.ts create mode 100644 app/src/speaker.ts delete mode 100644 quest/m0/speaker-volume.md diff --git a/app/package.json b/app/package.json index e010a93..cb0563c 100644 --- a/app/package.json +++ b/app/package.json @@ -11,7 +11,7 @@ "deps": "bun run --cwd ../api build && bun run --cwd ../moq/js/libav build", "fix": "biome check --fix", "tauri": "tauri", - "test": "bun test src/room/metadata.test.ts" + "test": "bun test --conditions=browser src" }, "license": "MIT", "dependencies": { diff --git a/app/src/controls.tsx b/app/src/controls.tsx index 315f432..a1aba46 100644 --- a/app/src/controls.tsx +++ b/app/src/controls.tsx @@ -22,6 +22,7 @@ import type { HangLocalSource } from "./room/local"; import { Local } from "./room/local"; import { Sound } from "./room/sound"; import Settings, { Modal } from "./settings"; +import * as Speaker from "./speaker"; import * as Tauri from "./tauri"; import { isMobile } from "./util/mobile"; @@ -860,16 +861,6 @@ function Volume(): JSX.Element { const volume = solid(Settings.audio.volume); const opacity = Opacity(() => showSlider()); - const setVolume = (v: number) => { - if (v === 0) { - Settings.audio.enabled.set(false); - Settings.audio.volume.set(1.0); - } else { - Settings.audio.enabled.set(true); - Settings.audio.volume.set(v); - } - }; - return (
0}> setVolume(Number(e.currentTarget.value))} + onInput={(e) => Settings.audio.setVolume(Number(e.currentTarget.value))} class="cursor-pointer backdrop-blur-sm bg-transparent rounded py-1 px-2 outline-none" aria-label="Output Volume" style={{ diff --git a/app/src/settings.tsx b/app/src/settings.tsx index 494606e..2202287 100644 --- a/app/src/settings.tsx +++ b/app/src/settings.tsx @@ -6,6 +6,7 @@ import type { JSX } from "solid-js/jsx-runtime"; import { z } from "zod"; import { Tab } from "./components/meme-selector"; import { Sound } from "./room/sound"; +import * as Speaker from "./speaker"; const ttsSchema = z.enum(["none", "low", "high"]); type TTS = z.infer; @@ -25,13 +26,13 @@ function loadTTS() { } const guest = Api.guestSchema.safeParse(localStorage.getItem("settings.account.guest")); +const effect = new Effect(); export const Settings = { draggable: new Signal(localStorage.getItem("settings.draggable") !== "false"), audio: { - enabled: new Signal(localStorage.getItem("settings.audio.enabled") !== "false"), - volume: new Signal(Number.parseFloat(localStorage.getItem("settings.audio.volume") ?? "1")), + ...Speaker.load(localStorage, effect), tts: new Signal(loadTTS()), }, @@ -101,25 +102,10 @@ export const Settings = { }, }; -const volume = Settings.audio.volume.peek(); -if (Number.isNaN(volume) || volume < 0 || volume > 1) { - Settings.audio.volume.set(1); -} - -const effect = new Effect(); - effect.subscribe(Settings.draggable, (draggable) => { localStorage.setItem("settings.draggable", draggable.toString()); }); -effect.subscribe(Settings.audio.volume, (volume) => { - localStorage.setItem("settings.audio.volume", volume.toString()); -}); - -effect.subscribe(Settings.audio.enabled, (enabled) => { - localStorage.setItem("settings.audio.enabled", enabled.toString()); -}); - effect.subscribe(Settings.microphone.gain, (gain) => { localStorage.setItem("settings.microphone.gain", gain.toString()); }); diff --git a/app/src/speaker.test.ts b/app/src/speaker.test.ts new file mode 100644 index 0000000..e178a2b --- /dev/null +++ b/app/src/speaker.test.ts @@ -0,0 +1,88 @@ +import { afterEach, expect, test } from "bun:test"; +import { Effect } from "@moq/signals"; +import * as Speaker from "./speaker"; + +class Storage { + #values = new Map(); + + getItem(key: string): string | null { + return this.#values.get(key) ?? null; + } + + setItem(key: string, value: string) { + this.#values.set(key, value); + } +} + +const effects: Effect[] = []; + +function load(storage: Storage) { + const effect = new Effect(); + effects.push(effect); + return Speaker.load(storage, effect); +} + +afterEach(() => { + for (const effect of effects.splice(0)) effect.close(); +}); + +test.each([0.01, 0.75, 1.5, Speaker.VOLUME_RANGE.max])("selected gain %s survives reload", async (gain) => { + const storage = new Storage(); + const audio = load(storage); + audio.setVolume(gain); + await Promise.resolve(); + expect(storage.getItem("settings.audio.volume")).toBe(gain.toString()); + const reloaded = load(storage); + expect(reloaded.volume.peek()).toBe(gain); + expect(reloaded.enabled.peek()).toBe(true); +}); + +test.each(["NaN", "Infinity", "-Infinity", "-0.01", "2.01", "1.5junk", "", " "])( + "invalid persisted gain '%s' resets to unity", + async (raw) => { + const storage = new Storage(); + storage.setItem("settings.audio.volume", raw); + const audio = load(storage); + expect(audio.volume.peek()).toBe(1); + expect(audio.enabled.peek()).toBe(true); + await Promise.resolve(); + expect(storage.getItem("settings.audio.volume")).toBe("1"); + }, +); + +test.each(["button", "slider"])("%s mute preserves gain across reload and unmute", async (mute) => { + const storage = new Storage(); + const audio = load(storage); + audio.setVolume(1.7); + if (mute === "slider") audio.setVolume(0); + else audio.enabled.update((enabled) => !enabled); + await Promise.resolve(); + expect(storage.getItem("settings.audio.volume")).toBe("1.7"); + expect(storage.getItem("settings.audio.enabled")).toBe("false"); + const reloaded = load(storage); + expect(reloaded.enabled.peek()).toBe(false); + reloaded.enabled.update((enabled) => !enabled); + expect(reloaded.enabled.peek()).toBe(true); + expect(reloaded.volume.peek()).toBe(1.7); +}); + +test("a nonzero slider change unmutes and persists the new gain", async () => { + const storage = new Storage(); + const audio = load(storage); + audio.setVolume(1.7); + audio.setVolume(0); + audio.setVolume(0.5); + await Promise.resolve(); + const reloaded = load(storage); + expect(reloaded.volume.peek()).toBe(0.5); + expect(reloaded.enabled.peek()).toBe(true); +}); + +test("a legacy zero gain stays muted and can be unmuted audibly", () => { + const storage = new Storage(); + storage.setItem("settings.audio.volume", "0"); + const audio = load(storage); + expect(audio.enabled.peek()).toBe(false); + audio.enabled.update((enabled) => !enabled); + expect(audio.volume.peek()).toBe(1); +}); diff --git a/app/src/speaker.ts b/app/src/speaker.ts new file mode 100644 index 0000000..4d91ff2 --- /dev/null +++ b/app/src/speaker.ts @@ -0,0 +1,37 @@ +import { Effect, Signal } from "@moq/signals"; + +export const VOLUME_RANGE = { min: 0, max: 2, step: 0.01 }; + +function validVolume(value: number): boolean { + return Number.isFinite(value) && value >= VOLUME_RANGE.min && value <= VOLUME_RANGE.max; +} + +export function load( + storage: Pick, + effect: Effect, +): { enabled: Signal; volume: Signal; setVolume(value: number): void } { + const raw = storage.getItem("settings.audio.volume"); + let initial = raw?.trim() ? Number(raw) : 1; + if (!validVolume(initial)) initial = 1; + + // A legacy zero gain is muted, with unity gain available when unmuted. + const enabled = new Signal(storage.getItem("settings.audio.enabled") !== "false" && initial !== VOLUME_RANGE.min); + const volume = new Signal(initial === VOLUME_RANGE.min ? 1 : initial); + + effect.subscribe(volume, (value) => storage.setItem("settings.audio.volume", value.toString())); + effect.subscribe(enabled, (value) => storage.setItem("settings.audio.enabled", value.toString())); + + return { + enabled, + volume, + setVolume(value: number): void { + if (!validVolume(value)) return; + if (value === VOLUME_RANGE.min) { + enabled.set(false); + } else { + volume.set(value); + enabled.set(true); + } + }, + }; +} diff --git a/quest/m0/README.md b/quest/m0/README.md index 3799fdc..ca349c9 100644 --- a/quest/m0/README.md +++ b/quest/m0/README.md @@ -14,4 +14,3 @@ verified presence and volume bugs. Each child is independently shippable. - [Recover media toggles](/quest/m0/media-toggles.md) - audio and video resume without reloading - [Correct favorite presence](/quest/m0/favorite-presence.md) - each room and the app badge show current participants -- [Preserve speaker gain](/quest/m0/speaker-volume.md) - supported volume survives reload and mute cycles diff --git a/quest/m0/speaker-volume.md b/quest/m0/speaker-volume.md deleted file mode 100644 index 76b0291..0000000 --- a/quest/m0/speaker-volume.md +++ /dev/null @@ -1,21 +0,0 @@ -# [S] Preserve supported speaker gain across reloads and mute - -## Goal - -A speaker gain accepted by the volume control survives reload, and muting then -unmuting restores the user's chosen gain. - -## Plan - -Confirmed in `app/src/settings.tsx`: the persisted volume validator resets values -above 1 to 1, while the speaker control in `app/src/controls.tsx` allows -up to 2. Align validation with the supported UI range using one shared definition, -and continue rejecting non-finite and invalid stored values. - -Inspect the zero-volume handler: it currently stores gain 1 while disabling audio. -Preserve the last nonzero gain separately from mute if necessary so the mute -control and slider agree. Test a gain above unity across reload, invalid storage, -and mute/unmute without needing a live media stream. - -This is a settings fix; leave codec gain and spatial mixing in their existing -layers. The AFK request authorizes the recommended m0 scope and priority. From 5c59822a80207eac77eee375df21571f1dd349c5 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 7 Nov 2026 10:08:22 -0800 Subject: [PATCH 3/4] fix: honor speaker limits at playback boundaries --- app/package.json | 2 +- app/src/components/meme-selector.tsx | 3 ++- app/src/room/audio.ts | 4 +++- app/src/speaker.test.ts | 6 +++--- app/src/speaker.ts | 12 +++++++----- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/package.json b/app/package.json index cb0563c..5966a8d 100644 --- a/app/package.json +++ b/app/package.json @@ -11,7 +11,7 @@ "deps": "bun run --cwd ../api build && bun run --cwd ../moq/js/libav build", "fix": "biome check --fix", "tauri": "tauri", - "test": "bun test --conditions=browser src" + "test": "bun test --isolate --conditions=browser src" }, "license": "MIT", "dependencies": { diff --git a/app/src/components/meme-selector.tsx b/app/src/components/meme-selector.tsx index 4c5051c..543383e 100644 --- a/app/src/components/meme-selector.tsx +++ b/app/src/components/meme-selector.tsx @@ -213,7 +213,8 @@ function VideoMemeItem(props: VideoMemeItemProps): JSX.Element { const video = Meme.video(props.name); if (!video) throw new Error(`Video meme not found: ${props.name}`); - video.element.volume = Settings.audio.volume.peek(); + // Media elements cap volume at unity; amplification belongs to the room gain node. + video.element.volume = Math.min(Settings.audio.volume.peek(), 1); video.element.muted = false; video.element.style.width = "100%"; video.element.style.height = "100%"; diff --git a/app/src/room/audio.ts b/app/src/room/audio.ts index 9e6c1dc..a649367 100644 --- a/app/src/room/audio.ts +++ b/app/src/room/audio.ts @@ -134,7 +134,9 @@ export class Audio { const root = effect.get(this.broadcast.source.audio.root); if (!root) return; - const gain = new GainNode(root.context, { gain: Settings.audio.volume.peek() }); + const gain = new GainNode(root.context, { + gain: Settings.audio.enabled.peek() ? Settings.audio.volume.peek() : 0, + }); effect.cleanup(() => gain.disconnect()); this.#gain.set(gain); diff --git a/app/src/speaker.test.ts b/app/src/speaker.test.ts index e178a2b..3f682e4 100644 --- a/app/src/speaker.test.ts +++ b/app/src/speaker.test.ts @@ -1,5 +1,5 @@ import { afterEach, expect, test } from "bun:test"; -import { Effect } from "@moq/signals"; +import * as Signals from "@moq/signals"; import * as Speaker from "./speaker"; class Storage { @@ -14,10 +14,10 @@ class Storage { } } -const effects: Effect[] = []; +const effects: Signals.Effect[] = []; function load(storage: Storage) { - const effect = new Effect(); + const effect = new Signals.Effect(); effects.push(effect); return Speaker.load(storage, effect); } diff --git a/app/src/speaker.ts b/app/src/speaker.ts index 4d91ff2..8c70411 100644 --- a/app/src/speaker.ts +++ b/app/src/speaker.ts @@ -1,4 +1,4 @@ -import { Effect, Signal } from "@moq/signals"; +import * as Signals from "@moq/signals"; export const VOLUME_RANGE = { min: 0, max: 2, step: 0.01 }; @@ -8,15 +8,17 @@ function validVolume(value: number): boolean { export function load( storage: Pick, - effect: Effect, -): { enabled: Signal; volume: Signal; setVolume(value: number): void } { + effect: Signals.Effect, +): { enabled: Signals.Signal; volume: Signals.Signal; setVolume(value: number): void } { const raw = storage.getItem("settings.audio.volume"); let initial = raw?.trim() ? Number(raw) : 1; if (!validVolume(initial)) initial = 1; // A legacy zero gain is muted, with unity gain available when unmuted. - const enabled = new Signal(storage.getItem("settings.audio.enabled") !== "false" && initial !== VOLUME_RANGE.min); - const volume = new Signal(initial === VOLUME_RANGE.min ? 1 : initial); + const enabled = new Signals.Signal( + storage.getItem("settings.audio.enabled") !== "false" && initial !== VOLUME_RANGE.min, + ); + const volume = new Signals.Signal(initial === VOLUME_RANGE.min ? 1 : initial); effect.subscribe(volume, (value) => storage.setItem("settings.audio.volume", value.toString())); effect.subscribe(enabled, (value) => storage.setItem("settings.audio.enabled", value.toString())); From 84292d899b9c0a90fcc2a54e30d5714c758e0fcf Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sat, 7 Nov 2026 10:10:39 -0800 Subject: [PATCH 4/4] docs: explain speaker settings lifecycle --- app/src/speaker.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/speaker.ts b/app/src/speaker.ts index 8c70411..2a9e088 100644 --- a/app/src/speaker.ts +++ b/app/src/speaker.ts @@ -1,11 +1,13 @@ import * as Signals from "@moq/signals"; +/** The speaker slider and stored gain share this range. */ export const VOLUME_RANGE = { min: 0, max: 2, step: 0.01 }; function validVolume(value: number): boolean { return Number.isFinite(value) && value >= VOLUME_RANGE.min && value <= VOLUME_RANGE.max; } +/** Load speaker gain and mute, persisting changes until the effect closes. */ export function load( storage: Pick, effect: Signals.Effect, @@ -14,7 +16,7 @@ export function load( let initial = raw?.trim() ? Number(raw) : 1; if (!validVolume(initial)) initial = 1; - // A legacy zero gain is muted, with unity gain available when unmuted. + // Zero represents mute; keep an audible gain for the next unmute. const enabled = new Signals.Signal( storage.getItem("settings.audio.enabled") !== "false" && initial !== VOLUME_RANGE.min, );