From e147fd9ca17c1eb71b6ca7c3de709fb3563e49a1 Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Tue, 19 Nov 2024 15:46:56 +0530
Subject: [PATCH 01/12] fix: use existing audio context

---
 .../plugins/audio/HMSAudioPluginsManager.ts   |  3 +-
 .../src/reactive-store/HMSSDKActions.ts       | 35 ++++++++++---------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
index 75100bb9a5..29da67abae 100644
--- a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
+++ b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
@@ -4,6 +4,7 @@ import AnalyticsEventFactory from '../../analytics/AnalyticsEventFactory';
 import { ErrorFactory } from '../../error/ErrorFactory';
 import { HMSAction } from '../../error/HMSAction';
 import { EventBus } from '../../events/EventBus';
+import { HMSAudioContextHandler } from '../../internal';
 import { HMSLocalAudioTrack } from '../../media/tracks';
 import Room from '../../sdk/models/HMSRoom';
 import HMSLogger from '../../utils/logger';
@@ -48,7 +49,7 @@ export class HMSAudioPluginsManager {
     this.hmsTrack = track;
     this.pluginsMap = new Map();
     this.analytics = new AudioPluginsAnalytics(eventBus);
-    this.createAudioContext();
+    this.audioContext = HMSAudioContextHandler.getAudioContext();
     this.room = room;
   }
 
diff --git a/packages/hms-video-store/src/reactive-store/HMSSDKActions.ts b/packages/hms-video-store/src/reactive-store/HMSSDKActions.ts
index 9b880b70f7..7fb0960e47 100644
--- a/packages/hms-video-store/src/reactive-store/HMSSDKActions.ts
+++ b/packages/hms-video-store/src/reactive-store/HMSSDKActions.ts
@@ -1534,25 +1534,28 @@ export class HMSSDKActions<T extends HMSGenericTypes = { sessionStore: Record<st
     }
   }
 
+  //eslint-disable-next-line complexity
   private async addRemoveAudioPlugin(plugin: HMSAudioPlugin, action: 'add' | 'remove') {
-    if (!plugin) {
-      HMSLogger.w('Invalid plugin received in store');
-      return;
-    }
-    const trackID = this.store.getState(selectLocalAudioTrackID);
-    if (trackID) {
-      const sdkTrack = this.getLocalTrack(trackID);
-      if (sdkTrack) {
-        if (action === 'add') {
-          await (sdkTrack as SDKHMSLocalAudioTrack).addPlugin(plugin);
-        } else if (action === 'remove') {
-          await (sdkTrack as SDKHMSLocalAudioTrack).removePlugin(plugin);
+    try {
+      if (!plugin) {
+        HMSLogger.w('Invalid plugin received in store');
+        return;
+      }
+      const trackID = this.store.getState(selectLocalAudioTrackID);
+      if (trackID) {
+        const sdkTrack = this.getLocalTrack(trackID);
+        if (sdkTrack) {
+          if (action === 'add') {
+            await (sdkTrack as SDKHMSLocalAudioTrack).addPlugin(plugin);
+          } else if (action === 'remove') {
+            await (sdkTrack as SDKHMSLocalAudioTrack).removePlugin(plugin);
+          }
+          this.syncRoomState(`${action}AudioPlugin`);
+        } else {
+          this.logPossibleInconsistency(`track ${trackID} not present, unable to ${action} plugin`);
         }
-        this.syncRoomState(`${action}AudioPlugin`);
-      } else {
-        this.logPossibleInconsistency(`track ${trackID} not present, unable to ${action} plugin`);
       }
-    }
+    } catch (err) {}
   }
 
   /**

From ad59352431e28c5d78b8987c9ff76e832fa7648b Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Tue, 19 Nov 2024 15:48:18 +0530
Subject: [PATCH 02/12] fix: catch audio plugin errors

---
 packages/hms-video-store/src/reactive-store/HMSSDKActions.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/hms-video-store/src/reactive-store/HMSSDKActions.ts b/packages/hms-video-store/src/reactive-store/HMSSDKActions.ts
index 7fb0960e47..2d82826750 100644
--- a/packages/hms-video-store/src/reactive-store/HMSSDKActions.ts
+++ b/packages/hms-video-store/src/reactive-store/HMSSDKActions.ts
@@ -1555,7 +1555,9 @@ export class HMSSDKActions<T extends HMSGenericTypes = { sessionStore: Record<st
           this.logPossibleInconsistency(`track ${trackID} not present, unable to ${action} plugin`);
         }
       }
-    } catch (err) {}
+    } catch (err) {
+      console.error(err);
+    }
   }
 
   /**

From b14386aa502e54906c24e499897ebb1271327ed4 Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Tue, 19 Nov 2024 16:06:32 +0530
Subject: [PATCH 03/12] fix: types

---
 .../plugins/audio/HMSAudioPluginsManager.ts   | 22 +------------------
 packages/hms-video-store/src/utils/media.ts   | 19 +++++++++++++---
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
index 29da67abae..212774b513 100644
--- a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
+++ b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
@@ -11,11 +11,6 @@ import HMSLogger from '../../utils/logger';
 
 const DEFAULT_SAMPLE_RATE = 48000;
 
-//Handling sample rate error in case of firefox
-const checkBrowserSupport = () => {
-  return navigator.userAgent.indexOf('Firefox') !== -1;
-};
-
 /**
  * This class manages applying different plugins on a local audio track. Plugins which need to modify the audio
  * are called in the order they were added. Plugins which do not need to modify the audio are called
@@ -49,7 +44,7 @@ export class HMSAudioPluginsManager {
     this.hmsTrack = track;
     this.pluginsMap = new Map();
     this.analytics = new AudioPluginsAnalytics(eventBus);
-    this.audioContext = HMSAudioContextHandler.getAudioContext();
+    this.audioContext = HMSAudioContextHandler.getAudioContext({ sampleRate: DEFAULT_SAMPLE_RATE });
     this.room = room;
   }
 
@@ -283,19 +278,4 @@ export class HMSAudioPluginsManager {
     plugin.stop();
     this.analytics.removed(name);
   }
-
-  private createAudioContext() {
-    if (!this.audioContext) {
-      if (checkBrowserSupport()) {
-        /**
-        Not setting default sample rate for firefox since connecting
-        audio nodes from context with different sample rate is not
-        supported in firefox
- */
-        this.audioContext = new AudioContext();
-      } else {
-        this.audioContext = new AudioContext({ sampleRate: DEFAULT_SAMPLE_RATE });
-      }
-    }
-  }
 }
diff --git a/packages/hms-video-store/src/utils/media.ts b/packages/hms-video-store/src/utils/media.ts
index 05d60e443f..cb2979994f 100644
--- a/packages/hms-video-store/src/utils/media.ts
+++ b/packages/hms-video-store/src/utils/media.ts
@@ -2,6 +2,11 @@ import HMSLogger from './logger';
 import { BuildGetMediaError } from '../error/utils';
 import { HMSTrackExceptionTrackType } from '../media/tracks/HMSTrackExceptionTrackType';
 
+//Handling sample rate error in case of firefox
+const checkBrowserSupport = () => {
+  return navigator.userAgent.indexOf('Firefox') !== -1;
+};
+
 export async function getLocalStream(constraints: MediaStreamConstraints): Promise<MediaStream> {
   try {
     const stream = await navigator.mediaDevices.getUserMedia(constraints);
@@ -48,11 +53,19 @@ export interface HMSAudioContext {
   resumeContext: () => Promise<void>;
 }
 
-export const HMSAudioContextHandler: HMSAudioContext = {
+export const HMSAudioContextHandler: {
+  audioContext: AudioContext | null;
+  getAudioContext(options?: AudioContextOptions): AudioContext;
+  resumeContext(): Promise<void>;
+} = {
   audioContext: null,
-  getAudioContext() {
+  getAudioContext(options?: AudioContextOptions) {
     if (!this.audioContext) {
-      this.audioContext = new AudioContext();
+      if (checkBrowserSupport()) {
+        this.audioContext = new AudioContext();
+      } else {
+        this.audioContext = new AudioContext(options);
+      }
     }
     return this.audioContext;
   },

From c580c14798ab77111ce6b5540fe469e69b326785 Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Tue, 19 Nov 2024 16:16:51 +0530
Subject: [PATCH 04/12] fix: re-add comment

---
 packages/hms-video-store/src/utils/media.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/hms-video-store/src/utils/media.ts b/packages/hms-video-store/src/utils/media.ts
index cb2979994f..ef9b280da5 100644
--- a/packages/hms-video-store/src/utils/media.ts
+++ b/packages/hms-video-store/src/utils/media.ts
@@ -62,6 +62,11 @@ export const HMSAudioContextHandler: {
   getAudioContext(options?: AudioContextOptions) {
     if (!this.audioContext) {
       if (checkBrowserSupport()) {
+        /**
+        Not setting default sample rate for firefox since connecting
+        audio nodes from context with different sample rate is not
+        supported in firefox
+ */
         this.audioContext = new AudioContext();
       } else {
         this.audioContext = new AudioContext(options);

From 34e1c4efdaa788fc6e72ad4f8f3f037c366df2ad Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Tue, 19 Nov 2024 16:35:28 +0530
Subject: [PATCH 05/12] fix: resume context in unblockautoplay

---
 .../src/audio-sink-manager/AudioSinkManager.ts   |  2 ++
 packages/hms-video-store/src/utils/media.ts      | 16 ++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
index 9359b0b88e..184b02267f 100644
--- a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
+++ b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
@@ -5,6 +5,7 @@ import { ErrorFactory } from '../error/ErrorFactory';
 import { HMSAction } from '../error/HMSAction';
 import { EventBus } from '../events/EventBus';
 import { HMSDeviceChangeEvent, HMSTrackUpdate, HMSUpdateListener } from '../interfaces';
+import { HMSAudioContextHandler } from '../internal';
 import { HMSRemoteAudioTrack } from '../media/tracks';
 import { HMSRemotePeer } from '../sdk/models/peer';
 import { Store } from '../sdk/store';
@@ -72,6 +73,7 @@ export class AudioSinkManager {
    */
   async unblockAutoplay() {
     if (this.autoPausedTracks.size > 0) {
+      HMSAudioContextHandler.resumeContext();
       this.unpauseAudioTracks();
     }
   }
diff --git a/packages/hms-video-store/src/utils/media.ts b/packages/hms-video-store/src/utils/media.ts
index ef9b280da5..73d0ac4664 100644
--- a/packages/hms-video-store/src/utils/media.ts
+++ b/packages/hms-video-store/src/utils/media.ts
@@ -1,12 +1,8 @@
 import HMSLogger from './logger';
+import { isFirefox } from './support';
 import { BuildGetMediaError } from '../error/utils';
 import { HMSTrackExceptionTrackType } from '../media/tracks/HMSTrackExceptionTrackType';
 
-//Handling sample rate error in case of firefox
-const checkBrowserSupport = () => {
-  return navigator.userAgent.indexOf('Firefox') !== -1;
-};
-
 export async function getLocalStream(constraints: MediaStreamConstraints): Promise<MediaStream> {
   try {
     const stream = await navigator.mediaDevices.getUserMedia(constraints);
@@ -61,12 +57,12 @@ export const HMSAudioContextHandler: {
   audioContext: null,
   getAudioContext(options?: AudioContextOptions) {
     if (!this.audioContext) {
-      if (checkBrowserSupport()) {
+      if (isFirefox) {
         /**
-        Not setting default sample rate for firefox since connecting
-        audio nodes from context with different sample rate is not
-        supported in firefox
- */
+         * Not setting default sample rate for firefox since connecting
+         * audio nodes from context with different sample rate is not
+         * supported in firefox
+         */
         this.audioContext = new AudioContext();
       } else {
         this.audioContext = new AudioContext(options);

From c9202842faf01c072dfafd5c9508440658b0a463 Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Tue, 19 Nov 2024 16:43:11 +0530
Subject: [PATCH 06/12] fix: await async methods

---
 .../src/audio-sink-manager/AudioSinkManager.ts                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
index 184b02267f..35264f3328 100644
--- a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
+++ b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
@@ -73,8 +73,8 @@ export class AudioSinkManager {
    */
   async unblockAutoplay() {
     if (this.autoPausedTracks.size > 0) {
-      HMSAudioContextHandler.resumeContext();
-      this.unpauseAudioTracks();
+      await HMSAudioContextHandler.resumeContext();
+      await this.unpauseAudioTracks();
     }
   }
 

From 7fa8f2bab0e3aa4626483ddbee95ff139816eb41 Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Tue, 19 Nov 2024 17:36:14 +0530
Subject: [PATCH 07/12] fix: create new context if sample rate differs

---
 packages/hms-video-store/src/utils/media.ts | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/hms-video-store/src/utils/media.ts b/packages/hms-video-store/src/utils/media.ts
index 73d0ac4664..2d4924b418 100644
--- a/packages/hms-video-store/src/utils/media.ts
+++ b/packages/hms-video-store/src/utils/media.ts
@@ -56,19 +56,19 @@ export const HMSAudioContextHandler: {
 } = {
   audioContext: null,
   getAudioContext(options?: AudioContextOptions) {
-    if (!this.audioContext) {
-      if (isFirefox) {
-        /**
-         * Not setting default sample rate for firefox since connecting
-         * audio nodes from context with different sample rate is not
-         * supported in firefox
-         */
-        this.audioContext = new AudioContext();
-      } else {
-        this.audioContext = new AudioContext(options);
-      }
+    const newAudioContextNeeded =
+      !this.audioContext || (options?.sampleRate && this.audioContext.sampleRate !== options.sampleRate);
+
+    if (newAudioContextNeeded) {
+      /**
+       * Not setting default sample rate for firefox since connecting
+       * audio nodes from context with different sample rate is not
+       * supported in firefox
+       */
+      this.audioContext = isFirefox ? new AudioContext() : new AudioContext(options);
     }
-    return this.audioContext;
+
+    return this.audioContext!;
   },
   async resumeContext() {
     try {

From 70ca28e82c9da96679fe3f5cf9a957744204cc28 Mon Sep 17 00:00:00 2001
From: KaustubhKumar05 <kaustubhkumar05@gmail.com>
Date: Tue, 19 Nov 2024 18:47:11 +0530
Subject: [PATCH 08/12] fix: missing awaits

---
 .../src/audio-sink-manager/AudioSinkManager.ts            | 2 --
 .../src/plugins/audio/HMSAudioPluginsManager.ts           | 2 +-
 packages/hms-video-store/src/utils/media.ts               | 8 ++------
 .../components/Notifications/AutoplayBlockedModal.tsx     | 8 ++++----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
index 35264f3328..fcd4593071 100644
--- a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
+++ b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
@@ -5,7 +5,6 @@ import { ErrorFactory } from '../error/ErrorFactory';
 import { HMSAction } from '../error/HMSAction';
 import { EventBus } from '../events/EventBus';
 import { HMSDeviceChangeEvent, HMSTrackUpdate, HMSUpdateListener } from '../interfaces';
-import { HMSAudioContextHandler } from '../internal';
 import { HMSRemoteAudioTrack } from '../media/tracks';
 import { HMSRemotePeer } from '../sdk/models/peer';
 import { Store } from '../sdk/store';
@@ -73,7 +72,6 @@ export class AudioSinkManager {
    */
   async unblockAutoplay() {
     if (this.autoPausedTracks.size > 0) {
-      await HMSAudioContextHandler.resumeContext();
       await this.unpauseAudioTracks();
     }
   }
diff --git a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
index 212774b513..93f378890d 100644
--- a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
+++ b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
@@ -210,7 +210,7 @@ export class HMSAudioPluginsManager {
     for (const plugin of plugins) {
       await this.addPlugin(plugin);
     }
-    this.updateProcessedTrack();
+    await this.updateProcessedTrack();
   }
 
   private async initAudioNodes() {
diff --git a/packages/hms-video-store/src/utils/media.ts b/packages/hms-video-store/src/utils/media.ts
index 2d4924b418..abd26a4b66 100644
--- a/packages/hms-video-store/src/utils/media.ts
+++ b/packages/hms-video-store/src/utils/media.ts
@@ -45,15 +45,11 @@ export async function getLocalDevices(): Promise<MediaDeviceGroups> {
 
 export interface HMSAudioContext {
   audioContext: AudioContext | null;
-  getAudioContext: () => AudioContext;
+  getAudioContext: (options?: AudioContextOptions) => AudioContext;
   resumeContext: () => Promise<void>;
 }
 
-export const HMSAudioContextHandler: {
-  audioContext: AudioContext | null;
-  getAudioContext(options?: AudioContextOptions): AudioContext;
-  resumeContext(): Promise<void>;
-} = {
+export const HMSAudioContextHandler: HMSAudioContext = {
   audioContext: null,
   getAudioContext(options?: AudioContextOptions) {
     const newAudioContextNeeded =
diff --git a/packages/roomkit-react/src/Prebuilt/components/Notifications/AutoplayBlockedModal.tsx b/packages/roomkit-react/src/Prebuilt/components/Notifications/AutoplayBlockedModal.tsx
index ecd2a93f98..a8ba68b958 100644
--- a/packages/roomkit-react/src/Prebuilt/components/Notifications/AutoplayBlockedModal.tsx
+++ b/packages/roomkit-react/src/Prebuilt/components/Notifications/AutoplayBlockedModal.tsx
@@ -9,9 +9,9 @@ export function AutoplayBlockedModal() {
   return (
     <Dialog.Root
       open={!!error}
-      onOpenChange={value => {
+      onOpenChange={async value => {
         if (!value) {
-          unblockAudio();
+          await unblockAudio();
         }
         resetError();
       }}
@@ -25,8 +25,8 @@ export function AutoplayBlockedModal() {
         <DialogRow justify="end">
           <Button
             variant="primary"
-            onClick={() => {
-              unblockAudio();
+            onClick={async () => {
+              await unblockAudio();
               resetError();
             }}
           >

From 6c676ecc01143448e8ca09552156639db77fb143 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Mon, 23 Dec 2024 13:40:52 +0530
Subject: [PATCH 09/12] fix: resume audio context on unblock autoplay

---
 .../src/audio-sink-manager/AudioSinkManager.ts                | 2 ++
 packages/hms-video-store/src/sdk/index.ts                     | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
index fcd4593071..2d45dc0431 100644
--- a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
+++ b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
@@ -5,6 +5,7 @@ import { ErrorFactory } from '../error/ErrorFactory';
 import { HMSAction } from '../error/HMSAction';
 import { EventBus } from '../events/EventBus';
 import { HMSDeviceChangeEvent, HMSTrackUpdate, HMSUpdateListener } from '../interfaces';
+import { HMSAudioContextHandler } from '../internal';
 import { HMSRemoteAudioTrack } from '../media/tracks';
 import { HMSRemotePeer } from '../sdk/models/peer';
 import { Store } from '../sdk/store';
@@ -74,6 +75,7 @@ export class AudioSinkManager {
     if (this.autoPausedTracks.size > 0) {
       await this.unpauseAudioTracks();
     }
+    await HMSAudioContextHandler.resumeContext();
   }
 
   init(elementId?: string) {
diff --git a/packages/hms-video-store/src/sdk/index.ts b/packages/hms-video-store/src/sdk/index.ts
index c74c5c2e8e..fb184ade5f 100644
--- a/packages/hms-video-store/src/sdk/index.ts
+++ b/packages/hms-video-store/src/sdk/index.ts
@@ -667,6 +667,10 @@ export class HMSSdk implements HMSInterface {
       this.sdkState.isJoinInProgress = false;
       await this.publish(config.settings, previewRole);
       await this.deviceManager.autoSelectAudioOutput();
+      // Throw autoplay error even if audio context is suspended as it will be used in Audio Plugins which can lead to no audio
+      if (HMSAudioContextHandler.getAudioContext().state === 'suspended') {
+        this.listener?.onError(ErrorFactory.TracksErrors.AutoplayBlocked(HMSAction.JOIN));
+      }
     } catch (error) {
       this.analyticsTimer.end(TimedEvent.JOIN);
       this.sdkState.isJoinInProgress = false;

From a9627c9421bd66302ab731352f5b7d65d5c873f8 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Mon, 23 Dec 2024 15:07:18 +0530
Subject: [PATCH 10/12] fix: await on device change

---
 .../src/audio-sink-manager/AudioSinkManager.ts                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
index 2d45dc0431..16e74d3437 100644
--- a/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
+++ b/packages/hms-video-store/src/audio-sink-manager/AudioSinkManager.ts
@@ -186,12 +186,12 @@ export class AudioSinkManager {
     await this.playAudioFor(track);
   };
 
-  private handleAudioDeviceChange = (event: HMSDeviceChangeEvent) => {
+  private handleAudioDeviceChange = async (event: HMSDeviceChangeEvent) => {
     // if there is no selection that means this is an init request. No need to do anything
     if (event.isUserSelection || event.error || !event.selection || event.type === 'video') {
       return;
     }
-    this.unpauseAudioTracks();
+    await this.unpauseAudioTracks();
   };
 
   /**

From 384a4e79a5cbab11bf180d0aeab8333b88bbfa40 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Thu, 26 Dec 2024 11:42:59 +0530
Subject: [PATCH 11/12] fix: recreate source node on reprocess plugins

---
 .../plugins/audio/HMSAudioPluginsManager.ts   | 11 ++-----
 packages/hms-video-store/src/utils/media.ts   | 19 +++++-------
 yarn.lock                                     | 31 ++-----------------
 3 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
index 5a2816bdec..3ffbace3a4 100644
--- a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
+++ b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
@@ -11,8 +11,6 @@ import { HMSLocalAudioTrack } from '../../media/tracks';
 import Room from '../../sdk/models/HMSRoom';
 import HMSLogger from '../../utils/logger';
 
-const DEFAULT_SAMPLE_RATE = 48000;
-
 /**
  * This class manages applying different plugins on a local audio track. Plugins which need to modify the audio
  * are called in the order they were added. Plugins which do not need to modify the audio are called
@@ -46,7 +44,7 @@ export class HMSAudioPluginsManager {
     this.hmsTrack = track;
     this.pluginsMap = new Map();
     this.analytics = new AudioPluginsAnalytics(eventBus);
-    this.audioContext = HMSAudioContextHandler.getAudioContext({ sampleRate: DEFAULT_SAMPLE_RATE });
+    this.audioContext = HMSAudioContextHandler.getAudioContext();
     this.room = room;
   }
 
@@ -230,7 +228,6 @@ export class HMSAudioPluginsManager {
 
   //Keeping it separate since we are initializing context only once
   async closeContext() {
-    this.audioContext?.close();
     this.audioContext = undefined;
   }
 
@@ -249,10 +246,8 @@ export class HMSAudioPluginsManager {
 
   private async initAudioNodes() {
     if (this.audioContext) {
-      if (!this.sourceNode) {
-        const audioStream = new MediaStream([this.hmsTrack.nativeTrack]);
-        this.sourceNode = this.audioContext.createMediaStreamSource(audioStream);
-      }
+      const audioStream = new MediaStream([this.hmsTrack.nativeTrack]);
+      this.sourceNode = this.audioContext.createMediaStreamSource(audioStream);
       if (!this.destinationNode) {
         this.destinationNode = this.audioContext.createMediaStreamDestination();
         this.outputTrack = this.destinationNode.stream.getAudioTracks()[0];
diff --git a/packages/hms-video-store/src/utils/media.ts b/packages/hms-video-store/src/utils/media.ts
index abd26a4b66..35d928e72b 100644
--- a/packages/hms-video-store/src/utils/media.ts
+++ b/packages/hms-video-store/src/utils/media.ts
@@ -3,6 +3,9 @@ import { isFirefox } from './support';
 import { BuildGetMediaError } from '../error/utils';
 import { HMSTrackExceptionTrackType } from '../media/tracks/HMSTrackExceptionTrackType';
 
+// discussed with krisp team and this is their recommendation for the sample rate
+const DEFAULT_SAMPLE_RATE = 32000;
+
 export async function getLocalStream(constraints: MediaStreamConstraints): Promise<MediaStream> {
   try {
     const stream = await navigator.mediaDevices.getUserMedia(constraints);
@@ -45,23 +48,15 @@ export async function getLocalDevices(): Promise<MediaDeviceGroups> {
 
 export interface HMSAudioContext {
   audioContext: AudioContext | null;
-  getAudioContext: (options?: AudioContextOptions) => AudioContext;
+  getAudioContext: () => AudioContext;
   resumeContext: () => Promise<void>;
 }
 
 export const HMSAudioContextHandler: HMSAudioContext = {
   audioContext: null,
-  getAudioContext(options?: AudioContextOptions) {
-    const newAudioContextNeeded =
-      !this.audioContext || (options?.sampleRate && this.audioContext.sampleRate !== options.sampleRate);
-
-    if (newAudioContextNeeded) {
-      /**
-       * Not setting default sample rate for firefox since connecting
-       * audio nodes from context with different sample rate is not
-       * supported in firefox
-       */
-      this.audioContext = isFirefox ? new AudioContext() : new AudioContext(options);
+  getAudioContext() {
+    if (!this.audioContext) {
+      this.audioContext = isFirefox ? new AudioContext() : new AudioContext({ sampleRate: DEFAULT_SAMPLE_RATE });
     }
 
     return this.audioContext!;
diff --git a/yarn.lock b/yarn.lock
index ac4f8021d9..1dbd2dbfd4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16864,16 +16864,7 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -16978,14 +16969,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -18341,7 +18325,7 @@ worker-timers@^7.0.40:
     worker-timers-broker "^6.0.95"
     worker-timers-worker "^7.0.59"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -18359,15 +18343,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 835e3566bd8f4e1dcb4de6de558eed866feb7461 Mon Sep 17 00:00:00 2001
From: raviteja83 <ravi.theja@100ms.live>
Date: Thu, 26 Dec 2024 11:44:05 +0530
Subject: [PATCH 12/12] fix: add comment

---
 .../hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
index 3ffbace3a4..6accd28ac6 100644
--- a/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
+++ b/packages/hms-video-store/src/plugins/audio/HMSAudioPluginsManager.ts
@@ -246,6 +246,7 @@ export class HMSAudioPluginsManager {
 
   private async initAudioNodes() {
     if (this.audioContext) {
+      // recreate this again, irrespective of it being already there so that the latest native track is used in source node
       const audioStream = new MediaStream([this.hmsTrack.nativeTrack]);
       this.sourceNode = this.audioContext.createMediaStreamSource(audioStream);
       if (!this.destinationNode) {