fix(desktop): harden cancellation, dispose, and lifecycle races across main services
Cancel pending result-popup measure timers on hideResultPopup; track CaptionService aux-model load state, stop deduplication, and refine abort epochs across restarts; forward per-call AbortSignal through VoiceModeService and LlmGateway to LocalLLMService and abort pull streams plus availability polling on dispose; clear aborted response pointers and gate stale mic start errors in VoiceConversationService; guard AudioCaptureService stopping resume against exited SoX processes and cleanup failed starts; abort LocalSTTService downloadModel polling on dispose; and fail closed when desktopCapturer.getSources rejects in caption loopback setup.
This commit is contained in:
parent
4bf0f0df12
commit
fc5d45312c
19 changed files with 922 additions and 94 deletions
|
|
@ -190,4 +190,64 @@ describe('VoiceConversationService local response ownership', () => {
|
|||
expect(mocks.speakSentences).not.toHaveBeenCalled()
|
||||
expect(service.getHistory().map((message) => message.content)).toEqual(['cancel before response'])
|
||||
})
|
||||
|
||||
it('cancelResponse_followedImmediatelyBySendTextMessage_startsNewTurnWithoutConflict', async () => {
|
||||
let releaseFirstStream: (() => void) | undefined
|
||||
mocks.chatStream
|
||||
.mockImplementationOnce(() => (async function* (): AsyncGenerator<string, string> {
|
||||
await new Promise<void>((resolve) => {
|
||||
releaseFirstStream = resolve
|
||||
})
|
||||
return ''
|
||||
})())
|
||||
.mockImplementationOnce(() => (async function* (): AsyncGenerator<string, string> {
|
||||
yield 'second reply.'
|
||||
return 'second reply.'
|
||||
})())
|
||||
|
||||
const service = getVoiceConversationService()
|
||||
await service.startSession()
|
||||
|
||||
const firstResponse = service.sendTextMessage('first question')
|
||||
await vi.waitFor(() => expect(mocks.chatStream).toHaveBeenCalledTimes(1))
|
||||
|
||||
service.cancelResponse()
|
||||
const secondResponse = service.sendTextMessage('second question')
|
||||
releaseFirstStream?.()
|
||||
|
||||
await expect(secondResponse).resolves.toBeUndefined()
|
||||
await firstResponse
|
||||
expect(mocks.chatStream).toHaveBeenCalledTimes(2)
|
||||
expect(service.getHistory().map((m) => m.content)).toEqual([
|
||||
'first question',
|
||||
'second question',
|
||||
'second reply.',
|
||||
])
|
||||
})
|
||||
|
||||
it('startSession_audioStartRejectsAfterStop_doesNotEmitSttErrorOrClobberNewSessionMic', async () => {
|
||||
let rejectFirstMic!: (err: Error) => void
|
||||
mocks.audioStart
|
||||
.mockImplementationOnce(() => new Promise<void>((_resolve, reject) => {
|
||||
rejectFirstMic = reject
|
||||
}))
|
||||
.mockImplementationOnce(async () => undefined)
|
||||
|
||||
const service = getVoiceConversationService()
|
||||
const errorEvents: Array<{ phase: string; message: string }> = []
|
||||
service.on('error', (payload) => errorEvents.push(payload))
|
||||
|
||||
await service.startSession()
|
||||
service.stopSession()
|
||||
|
||||
await service.startSession()
|
||||
rejectFirstMic(new Error('stale mic failure'))
|
||||
await new Promise((r) => setTimeout(r, 0))
|
||||
|
||||
expect(errorEvents).toEqual([])
|
||||
expect(mocks.send.mock.calls.filter(([channel]) => channel === IPC_CHANNELS.VOICE_CONVERSATION.ERROR)).toEqual([])
|
||||
|
||||
service.stopSession()
|
||||
expect(mocks.audioStop).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue