much better

packages/firebase_vertexai/firebase_vertexai/example/lib/pages/bidi_page.dart

@@ -58,6 +58,12 @@ class _BidiPageState extends State<BidiPage> {
   @override
   void dispose() {
     if (_session_opening) {
+      _audioManager.stopAudioPlayer();
+      _audioManager.disposeAudioPlayer();
+
+      _audioRecorder.stopRecording();
+
+      _session_opening = false;
       print('close the websocket session.');
       _session.close();
     }
@@ -450,7 +456,6 @@ class _BidiPageState extends State<BidiPage> {
           _audioManager.addAudio(chunk);
           audioIndex = 0;
           chunkBuilder.clear();
-          await _audioManager.refreshAudioSource();
         }
       }
     }

packages/firebase_vertexai/firebase_vertexai/example/lib/utils/audio_player.dart

@@ -149,32 +149,41 @@ class AudioStreamManager {
   final StreamController<Uint8List> _audioChunkController =
       StreamController<Uint8List>();
   var _chunkIndex = 0;
+  ConcatenatingAudioSource _audioSource = ConcatenatingAudioSource(
+    children: [],
+  );
 
   AudioStreamManager() {
     _initAudioPlayer();
   }
 
   Future<void> _initAudioPlayer() async {
     // 1. Create a ConcatenatingAudioSource to handle the stream
-    await _audioPlayer.setAudioSource(
-      ConcatenatingAudioSource(
-        children: [],
-      ),
-    );
+    await _audioPlayer.setAudioSource(_audioSource);
 
     // 2. Listen to the stream of audio chunks
     _audioChunkController.stream.listen(_addAudioChunk);
 
     await _audioPlayer.play(); // Start playing (even if initially empty)
+
+    _audioPlayer.processingStateStream.listen((state) async {
+      if (state == ProcessingState.completed) {
+        await _audioPlayer
+            .pause(); // Or player.stop() if you want to release resources
+        await _audioPlayer.seek(Duration.zero, index: 0);
+        await _audioSource.clear();
+        await _audioPlayer.play();
+      }
+    });
   }
 
   Future<void> _addAudioChunk(Uint8List chunk) async {
     var buffer = ByteStreamAudioSource(chunk);
-    final currentSource = _audioPlayer.audioSource! as ConcatenatingAudioSource;
+
     print('Add new Audio Chunk to player');
 
     // The crucial change: use add instead of insert
-    await currentSource.add(buffer);
+    await _audioSource.add(buffer);
 
     _chunkIndex++;
     print('play audio chunk $_chunkIndex');
@@ -184,15 +193,6 @@ class AudioStreamManager {
     _audioChunkController.add(chunk);
   }
 
-  Future<void> refreshAudioSource() async {
-    // 1. Reset a new audio source
-    await _audioPlayer.setAudioSource(
-      ConcatenatingAudioSource(
-        children: [],
-      ),
-    );
-  }
-
   Future<void> stopAudioPlayer() async {
     print('Stopped and total audio chunks are $_chunkIndex');
     await _audioPlayer.stop();