Merge pull request #3 from Nerixyz/reloading-bug

Fix Reloading Bug

src/background/ad.replacement.ts

@@ -30,7 +30,7 @@ export async function onAdPod(stitchedAd: TwitchStitchedAdData, stream: string)
     }
   }
 
-  eventHandler.emitContext('updateUrl',{url: await createM3U8Url({stream, usher: usherData})});
+  eventHandler.emitContext('updateUrl',{url: await createM3U8Url({stream, usher: usherData}), stream});
 }
 
 async function createM3U8Url({usher, stream}: {usher: any, stream: string}) {

src/context/context-script.ts

@@ -11,10 +11,20 @@ const eventHandler = new ContextEventHandler<MessageMap>();
 window.addEventListener('playing', () => initWorkerHandler(lazyConnector), true);
 const throttledReset = throttle(() => resetPlayer(lazyConnector), 5 * 1000);
 
-eventHandler.on('updateUrl', ({url}) => {
+eventHandler.on('updateUrl', ({url, stream}) => {
   const core = getPlayer(lazyConnector)?.props?.mediaPlayerInstance?.core;
   if(!core) return;
 
+  const path = core.getPath();
+  if(url === path) return; // same url
+
+  const user = path.match(/\/channel\/hls\/([^.]+).m3u8/)?.[1];
+  if(!user) {
+    console.warn('Attempted to reload but got a bad path:', path);
+    return;
+  }
+  if(user !== stream) return; // other stream -- invalid
+
   core.load(url, '');
   signalPlayer('blue');
 });

src/context/twitch-player.types.ts

@@ -28,6 +28,7 @@ export interface MediaPlayerCore {
   getVolume(): number;
   isMuted(): boolean;
   load(url: string, any: any): void;
+  getPath(): string;
 }
 
 export interface MediaSinkManager {

src/types.ts

@@ -19,7 +19,7 @@ export type MessageMap = {
   // adPod: AdPod;
   localStorage: Record<string, string | number | boolean>;
   reloadPlayer: {};
-  updateUrl: {url: string};
+  updateUrl: {url: string, stream: string};
   clientId: string;
   adSkipped: {};
 }