Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions packages/core/src/stores/tts-store.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function createMockPlayer(): MockTTSPlayer {
});
player.stop = vi.fn(() => {
player.onStateChange?.("stopped");
player.onEnd?.();
});
return player;
}
Expand Down Expand Up @@ -235,4 +236,30 @@ describe("useTTSStore — re-speak on synth change (#370)", () => {
expect(edgePlayer.speak).not.toHaveBeenCalled();
expect(systemPlayer.speak).not.toHaveBeenCalled();
});

it("[engine-switch] stops active playback without firing reader onEnd", () => {
const onEnd = vi.fn();
startEdge();
useTTSStore.getState().setOnEnd(onEnd);
edgePlayer.stop.mockClear();

useTTSStore.getState().updateConfig({ engine: "system" });

expect(edgePlayer.stop).toHaveBeenCalledOnce();
expect(edgePlayer.onEnd).toBeUndefined();
expect(onEnd).not.toHaveBeenCalled();
expect(useTTSStore.getState().playState).toBe("stopped");
expect(useTTSStore.getState().config.engine).toBe("system");
});

it("[engine-switch] does not stop playback for non-engine synth updates", () => {
startEdge();
edgePlayer.stop.mockClear();

useTTSStore.getState().updateConfig({ rate: 1.3 });

expect(edgePlayer.stop).not.toHaveBeenCalled();
expect(useTTSStore.getState().playState).toBe("playing");
expect(useTTSStore.getState().config.rate).toBe(1.3);
});
});
13 changes: 11 additions & 2 deletions packages/core/src/stores/tts-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,19 @@ export const useTTSStore = create<TTSState>()(
updateConfig: (updates) => {
const previousConfig = normalizeTTSConfig(get().config);
const nextConfig = normalizeTTSConfig({ ...previousConfig, ...updates });
const engineChanged =
updates.engine !== undefined && nextConfig.engine !== previousConfig.engine;
const wasPlaying = isActivePlay(get().playState);
set({ config: nextConfig });

// [占位 · #427/#349] engine 变化 + 播放中 → 停播。合并 #427 时在此插入,
// 并在该分支内调用 clearRespeakTimer()。
if (engineChanged && wasPlaying) {
clearRespeakTimer();
_sessionGeneration += 1;
detachAndStopAllPlayers();
_dashscopeActiveVoice = undefined;
set({ playState: "stopped" });
return;
}

if (
shouldRespeakForSynthChange(previousConfig, nextConfig) &&
Expand Down