liuyu/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-06-06 05:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: throttle voice wake meter preview

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-29 00:13:57 +01:00
parent 361753908e
commit 46a67eea4c
7 changed files with 99 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/macos/Sources/OpenClaw/AppState.swift
View File

@@ -170,6 +170,8 @@ final class AppState {
}
}
var voiceWakeMeterActive = false
var talkEnabled: Bool {
didSet {
self.ifNotPreview {

17
apps/macos/Sources/OpenClaw/CritterStatusLabel+Behavior.swift
View File

@@ -63,6 +63,14 @@ extension CritterStatusLabel {
.frame(width: 6, height: 6)
.padding(1)
}
if self.voiceWakeMeterActive {
Circle()
.fill(.orange)
.frame(width: 5, height: 5)
.padding(2)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomLeading)
}
}
.frame(width: 18, height: 18)
}
@@ -239,7 +247,8 @@ extension CritterStatusLabel {
sendCelebrationTick: 1,
gatewayStatus: .running(details: nil),
animationsEnabled: true,
iconState: .workingMain(.tool(.bash)))
iconState: .workingMain(.tool(.bash)),
voiceWakeMeterActive: true)
_ = label.body
_ = label.iconImage
@@ -275,7 +284,8 @@ extension CritterStatusLabel {
sendCelebrationTick: 0,
gatewayStatus: .failed("boom"),
animationsEnabled: false,
iconState: .idle)
iconState: .idle,
voiceWakeMeterActive: false)
_ = failed.gatewayNeedsAttention
_ = failed.gatewayBadgeColor
@@ -288,7 +298,8 @@ extension CritterStatusLabel {
sendCelebrationTick: 0,
gatewayStatus: .stopped,
animationsEnabled: false,
iconState: .idle)
iconState: .idle,
voiceWakeMeterActive: false)
_ = stopped.gatewayNeedsAttention
_ = stopped.gatewayBadgeColor

1
apps/macos/Sources/OpenClaw/CritterStatusLabel.swift
View File

@@ -10,6 +10,7 @@ struct CritterStatusLabel: View {
var gatewayStatus: GatewayProcessManager.Status
var animationsEnabled: Bool
var iconState: IconState
var voiceWakeMeterActive: Bool = false
@State var blinkAmount: CGFloat = 0
@State var nextBlink = Date().addingTimeInterval(Double.random(in: 3.5...8.5))

9
apps/macos/Sources/OpenClaw/MenuBar.swift
View File

@@ -50,7 +50,8 @@ struct OpenClawApp: App {
sendCelebrationTick: self.state.sendCelebrationTick,
gatewayStatus: self.gatewayManager.status,
animationsEnabled: self.state.iconAnimationsEnabled && !self.isGatewaySleeping,
iconState: self.effectiveIconState)
iconState: self.effectiveIconState,
voiceWakeMeterActive: self.state.voiceWakeMeterActive)
.background(SettingsWindowOpenRegistrar())
}
.menuBarExtraAccess(isPresented: self.$isMenuPresented) { item in
@@ -75,6 +76,9 @@ struct OpenClawApp: App {
.onChange(of: self.gatewayManager.status) { _, _ in
self.applyStatusItemAppearance(paused: self.state.isPaused, sleeping: self.isGatewaySleeping)
}
.onChange(of: self.state.voiceWakeMeterActive) { _, _ in
self.applyStatusItemAppearance(paused: self.state.isPaused, sleeping: self.isGatewaySleeping)
}
.onChange(of: self.state.connectionMode) { _, mode in
Task { await ConnectionModeCoordinator.shared.apply(mode: mode, paused: self.state.isPaused) }
CLIInstallPrompter.shared.checkAndPromptIfNeeded(reason: "connection-mode")
@@ -107,6 +111,9 @@ struct OpenClawApp: App {
// The SwiftUI label already renders those states; AppKit's disabled appearance can
// leak into menu item validation and grey out app-level commands like Settings.
self.statusItem?.button?.appearsDisabled = false
self.statusItem?.button?.toolTip = self.state.voiceWakeMeterActive
? "OpenClaw - Voice Wake live meter active"
: "OpenClaw"
}
private static func applyAttachOnlyOverrideIfNeeded() {

12
apps/macos/Sources/OpenClaw/MicLevelMonitor.swift
View File

@@ -8,12 +8,18 @@ actor MicLevelMonitor {
private var update: (@Sendable (Double) -> Void)?
private var running = false
private var smoothedLevel: Double = 0
private var lastUpdate = ContinuousClock.now
private var lastPublishedLevel: Double = 0
private let minimumUpdateInterval: Duration = .milliseconds(125)
private let minimumLevelDelta = 0.02
func start(onLevel: @Sendable @escaping (Double) -> Void) async throws {
self.update = onLevel
if self.running { return }
self.logger.info(
"mic level monitor start (\(AudioInputDeviceObserver.defaultInputDeviceSummary(), privacy: .public))")
self.lastUpdate = .now
self.lastPublishedLevel = self.smoothedLevel
guard AudioInputDeviceObserver.hasUsableDefaultInputDevice() else {
self.engine = nil
throw NSError(
@@ -56,7 +62,13 @@ actor MicLevelMonitor {
private func push(level: Double) {
self.smoothedLevel = (self.smoothedLevel * 0.45) + (level * 0.55)
guard let update else { return }
let now = ContinuousClock.now
guard now - self.lastUpdate >= self.minimumUpdateInterval ||
abs(self.smoothedLevel - self.lastPublishedLevel) >= self.minimumLevelDelta
else { return }
self.lastUpdate = now
let value = self.smoothedLevel
self.lastPublishedLevel = value
Task { @MainActor in update(value) }
}

4
apps/macos/Sources/OpenClaw/SoundEffects.swift
View File

@@ -3,12 +3,12 @@ import Foundation
enum SoundEffectCatalog {
/// All discoverable system sound names, with "Glass" pinned first.
static var systemOptions: [String] {
static let systemOptions: [String] = {
var names = Set(Self.discoveredSoundMap.keys).union(Self.fallbackNames)
names.remove("Glass")
let sorted = names.sorted { $0.localizedCaseInsensitiveCompare($1) == .orderedAscending }
return ["Glass"] + sorted
}
}()
static func displayName(for raw: String) -> String {
raw

93
apps/macos/Sources/OpenClaw/VoiceWakeSettings.swift
View File

@@ -20,6 +20,7 @@ struct VoiceWakeSettings: View {
private let meter = MicLevelMonitor()
@State private var micObserver = AudioInputDeviceObserver()
@State private var micRefreshTask: Task<Void, Never>?
@State private var meterStartupTask: Task<Void, Never>?
@State private var availableLocales: [Locale] = []
@State private var triggerEntries: [TriggerEntry] = []
private let fieldLabelWidth: CGFloat = 140
@@ -188,59 +189,68 @@ struct VoiceWakeSettings: View {
}
.settingsDetailContent()
}
.task {
guard !self.isPreview else { return }
await self.loadMicsIfNeeded()
}
.task {
guard !self.isPreview else { return }
await self.loadLocalesIfNeeded()
}
.task {
guard !self.isPreview else { return }
await self.restartMeter()
}
.onAppear {
guard !self.isPreview else { return }
self.startMicObserver()
self.loadTriggerEntries()
guard self.isActive else { return }
self.activateLivePreview()
}
.onChange(of: self.state.voiceWakeMicID) { _, _ in
guard !self.isPreview else { return }
self.updateSelectedMicName()
Task { await self.restartMeter() }
guard self.isActive else { return }
self.scheduleMeterRestart()
}
.onChange(of: self.isActive) { _, active in
guard !self.isPreview else { return }
if !active {
self.tester.stop()
self.isTesting = false
self.testState = .idle
self.testTimeoutTask?.cancel()
self.micRefreshTask?.cancel()
self.micRefreshTask = nil
Task { await self.meter.stop() }
self.micObserver.stop()
self.deactivateLivePreview()
self.syncTriggerEntriesToState()
} else {
self.startMicObserver()
self.loadTriggerEntries()
self.activateLivePreview()
}
}
.onDisappear {
guard !self.isPreview else { return }
self.tester.stop()
self.isTesting = false
self.testState = .idle
self.testTimeoutTask?.cancel()
self.micRefreshTask?.cancel()
self.micRefreshTask = nil
self.micObserver.stop()
Task { await self.meter.stop() }
self.deactivateLivePreview()
self.syncTriggerEntriesToState()
}
}
private func activateLivePreview() {
self.meterStartupTask?.cancel()
self.startMicObserver()
self.loadTriggerEntries()
self.meterStartupTask = Task { @MainActor in
await self.loadMicsIfNeeded()
guard !Task.isCancelled, self.isActive else { return }
await self.loadLocalesIfNeeded()
guard !Task.isCancelled, self.isActive else { return }
await self.restartMeter()
}
}
private func deactivateLivePreview() {
self.tester.stop()
self.isTesting = false
self.testState = .idle
self.testTimeoutTask?.cancel()
self.micRefreshTask?.cancel()
self.micRefreshTask = nil
self.meterStartupTask?.cancel()
self.meterStartupTask = nil
self.micObserver.stop()
self.state.voiceWakeMeterActive = false
Task { await self.meter.stop() }
}
private func scheduleMeterRestart() {
self.meterStartupTask?.cancel()
self.meterStartupTask = Task { @MainActor in
guard !Task.isCancelled, self.isActive else { return }
await self.restartMeter()
}
}
private func loadTriggerEntries() {
self.triggerEntries = self.state.swabbleTriggerWords.map { TriggerEntry(id: UUID(), value: $0) }
}
@@ -652,6 +662,7 @@ struct VoiceWakeSettings: View {
@MainActor
private func scheduleMicRefresh() {
guard self.isActive else { return }
MicRefreshSupport.schedule(refreshTask: &self.micRefreshTask) {
await self.loadMicsIfNeeded(force: true)
await self.restartMeter()
@@ -713,8 +724,17 @@ struct VoiceWakeSettings: View {
@MainActor
private func restartMeter() async {
guard self.isActive else {
self.state.voiceWakeMeterActive = false
await self.meter.stop()
return
}
self.meterError = nil
await self.meter.stop()
guard !Task.isCancelled, self.isActive else {
self.state.voiceWakeMeterActive = false
return
}
do {
try await self.meter.start { [weak state] level in
Task { @MainActor in
@@ -722,7 +742,14 @@ struct VoiceWakeSettings: View {
self.meterLevel = level
}
}
guard !Task.isCancelled, self.isActive else {
self.state.voiceWakeMeterActive = false
await self.meter.stop()
return
}
self.state.voiceWakeMeterActive = true
} catch {
self.state.voiceWakeMeterActive = false
self.meterError = error.localizedDescription
}
}