singleton audio

Author: kommander

packages/opencode/src/cli/cmd/tui/app.tsx

@@ -2,6 +2,7 @@ import { render, TimeToFirstDraw, useRenderer, useTerminalDimensions } from "@op
 import { createDefaultOpenTuiKeymap } from "@opentui/keymap/opentui"
 import * as Clipboard from "@tui/util/clipboard"
 import * as Selection from "@tui/util/selection"
+import * as TuiAudio from "@tui/util/audio"
 import { createCliRenderer, MouseButton, type CliRendererConfig } from "@opentui/core"
 import { RouteProvider, useRoute } from "@tui/context/route"
 import {
@@ -180,6 +181,7 @@ export function tui(input: {
     const onBeforeExit = async () => {
       offKeymap()
       await TuiPluginRuntime.dispose()
+      TuiAudio.dispose()
     }
 
     const renderer = await createCliRenderer(rendererConfig(input.config))

packages/opencode/src/cli/cmd/tui/attention.ts

@@ -1,4 +1,4 @@
-import { Audio, type AudioErrorContext, type AudioSound } from "@opentui/core"
+import type { AudioSound } from "@opentui/core"
 import type {
   TuiAttention,
   TuiAttentionNotifyInput,
@@ -12,6 +12,7 @@ import type {
 } from "@opencode-ai/plugin/tui"
 import stripAnsi from "strip-ansi"
 import type { TuiConfig } from "./config/tui"
+import * as TuiAudio from "@tui/util/audio"
 import defaultSoundPath from "@opencode-ai/ui/audio/bip-bop-01.mp3" with { type: "file" }
 import questionSoundPath from "@opencode-ai/ui/audio/bip-bop-03.mp3" with { type: "file" }
 import permissionSoundPath from "@opencode-ai/ui/audio/staplebops-06.mp3" with { type: "file" }
@@ -28,19 +29,6 @@ type AttentionRenderer = {
   triggerNotification(message: string, title?: string): boolean
 }
 
-type AttentionAudioEngine = {
-  on(event: "error", listener: (error: Error, context: AudioErrorContext) => void): unknown
-  isStarted(): boolean
-  start(): boolean
-  loadSoundFile(file: string): Promise<AudioSound | null>
-  play(sound: AudioSound, options?: { volume?: number }): unknown | null
-  dispose(): void
-}
-
-type AttentionAudio = {
-  create(): AttentionAudioEngine
-}
-
 type RegisteredSoundPack = TuiAttentionSoundPack & {
   builtin: boolean
 }
@@ -159,25 +147,14 @@ export function createTuiAttention(input: {
   renderer: AttentionRenderer
   config: Pick<TuiConfig.Resolved, "attention">
   kv?: TuiKV
-  audio?: AttentionAudio
+  audio?: Pick<typeof TuiAudio, "loadSoundFile" | "play">
 }): TuiAttentionHost {
   let focus: FocusState = "unknown"
   let disposed = false
-  let audio: AttentionAudioEngine | undefined
   let activePackID: string | undefined
   const packs = new Map<string, RegisteredSoundPack>([[BUILTIN_PACK.id, BUILTIN_PACK]])
   const sounds = new Map<string, Promise<AudioSound | null>>()
-
-  const audioInput: AttentionAudio =
-    input.audio ?? {
-      create: () => {
-        const engine = Audio.create({ autoStart: false })
-        engine.on("error", (error, context) => {
-          log.debug("attention audio error", { error, context })
-        })
-        return engine
-      },
-    }
+  const audio = input.audio ?? TuiAudio
 
   const onFocus = () => {
     focus = "focused"
@@ -205,7 +182,6 @@ export function createTuiAttention(input: {
   }
 
   async function loadSound(file: string) {
-    if (!audio) return null
     const cached = sounds.get(file)
     if (cached) return cached
     const task = audio.loadSoundFile(file).catch((error) => {
@@ -218,10 +194,9 @@ export function createTuiAttention(input: {
 
   async function playSound(name: TuiAttentionSoundName, volume: number) {
     try {
-      audio ??= audioInput.create()
-      if (!audio.isStarted() && !audio.start()) return false
       for (const file of soundCandidates(name)) {
         const current = await loadSound(file)
+        if (disposed) return false
         if (current == null) continue
         if (audio.play(current, { volume }) != null) return true
       }
@@ -316,8 +291,6 @@ export function createTuiAttention(input: {
       disposed = true
       input.renderer.off("focus", onFocus)
       input.renderer.off("blur", onBlur)
-      audio?.dispose()
-      audio = undefined
       sounds.clear()
     },
   }

packages/opencode/src/cli/cmd/tui/component/logo.tsx

@@ -1,16 +1,15 @@
 import {
-  Audio,
   BoxRenderable,
   MouseButton,
   MouseEvent,
   RGBA,
   TextAttributes,
-  type AudioSound,
   type AudioVoice,
 } from "@opentui/core"
 import { useRenderer } from "@opentui/solid"
 import { For, createMemo, createSignal, onCleanup, onMount, type JSX } from "solid-js"
 import { useTheme, tint } from "@tui/context/theme"
+import * as TuiAudio from "@tui/util/audio"
 import { go, logo } from "@/cli/logo"
 import pulseA from "../asset/pulse-a.wav" with { type: "file" }
 import pulseB from "../asset/pulse-b.wav" with { type: "file" }
@@ -102,41 +101,18 @@ const GLOW_OUT = 1600
 const PEAK = RGBA.fromInts(255, 255, 255)
 const PULSE_SOUNDS = [pulseA, pulseB, pulseC]
 
-let logoAudio: Audio | undefined
-let logoAudioSounds: Promise<{ charge: AudioSound | null; pulse: (AudioSound | null)[] }> | undefined
 let logoAudioVoice: AudioVoice | undefined
 let logoAudioTail: ReturnType<typeof setTimeout> | undefined
 let logoAudioSeq = 0
 let logoAudioShot = 0
 
-function createLogoAudio() {
-  if (logoAudio) return logoAudio
-  try {
-    logoAudio = Audio.create({ autoStart: false })
-    logoAudio.on("error", () => undefined)
-    return logoAudio
-  } catch {
-    return
-  }
-}
-
-function loadLogoSounds(audio: Audio) {
-  logoAudioSounds ??= Promise.all([
-    audio.loadSoundFile(charge).catch(() => null),
-    Promise.all(PULSE_SOUNDS.map((file) => audio.loadSoundFile(file).catch(() => null))),
-  ]).then(([charge, pulse]) => ({ charge, pulse }))
-  return logoAudioSounds
-}
-
 function startLogoSound() {
   stopLogoSound()
   const id = ++logoAudioSeq
-  const audio = createLogoAudio()
-  if (!audio || (!audio.isStarted() && !audio.start())) return
-  void loadLogoSounds(audio)
-    .then((sounds) => {
-      if (id !== logoAudioSeq || sounds.charge == null) return
-      const voice = audio.play(sounds.charge, { volume: 0.24, loop: true })
+  void TuiAudio.loadSoundFile(charge)
+    .then((sound) => {
+      if (id !== logoAudioSeq || sound == null) return
+      const voice = TuiAudio.play(sound, { volume: 0.24, loop: true })
       if (voice == null) return
       logoAudioVoice = voice
     })
@@ -156,37 +132,32 @@ function stopLogoSound(delay = 0) {
   const voice = logoAudioVoice
   if (delay <= 0) {
     logoAudioVoice = undefined
-    logoAudio?.stopVoice(voice)
+    TuiAudio.stopVoice(voice)
     return
   }
   logoAudioTail = setTimeout(() => {
     logoAudioTail = undefined
     if (logoAudioVoice !== voice) return
     logoAudioVoice = undefined
-    logoAudio?.stopVoice(voice)
+    TuiAudio.stopVoice(voice)
   }, delay)
 }
 
 function pulseLogoSound(scale = 1) {
   stopLogoSound(140)
   const id = logoAudioSeq
-  const audio = createLogoAudio()
-  if (!audio || (!audio.isStarted() && !audio.start())) return
-  void loadLogoSounds(audio)
-    .then((sounds) => {
+  const file = PULSE_SOUNDS[logoAudioShot++ % PULSE_SOUNDS.length]
+  void TuiAudio.loadSoundFile(file)
+    .then((sound) => {
       if (id !== logoAudioSeq) return
-      const sound = sounds.pulse[logoAudioShot++ % PULSE_SOUNDS.length]
       if (sound == null) return
-      audio.play(sound, { volume: 0.26 + 0.14 * scale })
+      TuiAudio.play(sound, { volume: 0.26 + 0.14 * scale })
     })
     .catch(() => undefined)
 }
 
 function disposeLogoSound() {
   stopLogoSound()
-  logoAudio?.dispose()
-  logoAudio = undefined
-  logoAudioSounds = undefined
 }
 
 type Ring = {

packages/opencode/src/cli/cmd/tui/util/audio.ts

@@ -0,0 +1,55 @@
+import { Audio, type AudioErrorContext, type AudioPlayOptions, type AudioSound, type AudioVoice } from "@opentui/core"
+import * as Log from "@opencode-ai/core/util/log"
+
+const log = Log.create({ service: "tui.audio" })
+
+let audio: Audio | null | undefined
+const sounds = new Map<string, Promise<AudioSound | null>>()
+
+function getAudio() {
+  if (audio !== undefined) return audio
+  try {
+    const next = Audio.create({ autoStart: false })
+    next.on("error", (error: Error, context: AudioErrorContext) => {
+      log.debug("tui audio error", { error, context })
+    })
+    audio = next
+    return next
+  } catch (error) {
+    log.debug("failed to create tui audio", { error })
+    audio = null
+    return null
+  }
+}
+
+export function loadSoundFile(file: string) {
+  const current = getAudio()
+  if (!current) return Promise.resolve(null)
+  const cached = sounds.get(file)
+  if (cached) return cached
+  const task = current.loadSoundFile(file).catch((error) => {
+    log.debug("failed to load tui sound", { file, error })
+    return null
+  })
+  sounds.set(file, task)
+  return task
+}
+
+export function play(sound: AudioSound, options?: AudioPlayOptions) {
+  const current = getAudio()
+  if (!current) return null
+  if (!current.isStarted() && !current.start()) return null
+  return current.play(sound, options)
+}
+
+export function stopVoice(voice: AudioVoice) {
+  return audio?.stopVoice(voice) ?? false
+}
+
+export function dispose() {
+  audio?.dispose()
+  audio = undefined
+  sounds.clear()
+}
+
+export * as TuiAudio from "./audio"