@f8team/reel-core 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @f8team/reel-core
 
+## 1.1.1
+
+### Patch Changes
+
+- e6d5243: Stop a replaced source from loading anyway.
+
+  The YouTube and HLS loaders cleared their `aborted` flag in `detach()`, so a source switch
+  (abort, then detach) let an attach that was still waiting for the YouTube or hls.js runtime carry
+  on: YouTube mounted a second iframe that stayed in the page, and HLS bound a stale hls.js instance
+  to the `<video>`. Each attach now remembers which abort/detach generation it started in and stops
+  when a newer one has happened.
+
+  `<Root>` (React) and `<reel-player>` (Lit) no longer call `setSource` again for the source the
+  player was created with in `options.source`. That second call aborted the first load on mount
+  (an extra media request) and was how the duplicate YouTube iframe was reached.
+
 ## 1.1.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -400,6 +400,12 @@ var HlsLoader = class {
     this.rejectAttach = null;
     this.manifestTimeout = null;
     this.aborted = false;
+    /**
+     * Bumped by every abort/detach. `detach()` clears `aborted` so the loader can be reused, so a
+     * source switch (abort, then detach) used to let an attach that was still awaiting the runtime
+     * carry on and bind a stale hls.js instance to the <video>. Each attach keeps its own value.
+     */
+    this.generation = 0;
     this.lastLoadingFragmentKey = null;
     this.repeatedFragmentLoadCount = 0;
     this.repeatedFragmentErrorFired = false;
@@ -418,11 +424,12 @@ var HlsLoader = class {
   async attach(video, source) {
     this.detach();
     this.aborted = false;
+    const generation = this.generation;
     this.video = video;
     this.currentSource = source;
     this.unauthorizedFired = false;
     const Hls = await (this.options.loadRuntime ?? defaultLoad)();
-    if (this.aborted) {
+    if (this.aborted || generation !== this.generation) {
       throw makeAbortError();
     }
     if (!Hls.isSupported()) {
@@ -733,6 +740,7 @@ var HlsLoader = class {
     this.abortLiveXhrs();
   }
   abort() {
+    this.generation += 1;
     if (this.aborted) return;
     this.aborted = true;
     this.clearManifestTimeout();
@@ -1066,17 +1074,24 @@ var YouTubeLoader = class {
     this.duration = 0;
     this.rejectAttach = null;
     this.aborted = false;
+    /**
+     * Bumped by every abort/detach. `detach()` clears `aborted` so the loader can be reused, so a
+     * source switch (abort, then detach) used to let an attach that was still awaiting the runtime
+     * carry on and mount a second iframe. Each attach keeps the value it started with instead.
+     */
+    this.generation = 0;
   }
   async attach(video, source) {
     this.detach();
     this.aborted = false;
+    const generation = this.generation;
     const id = extractYouTubeId(source.src);
     if (!id) {
       throw new Error(`Cannot extract YouTube videoId from "${source.src}"`);
     }
     this.video = video;
     const YT = await (this.options.loadRuntime ?? defaultLoad2)();
-    if (this.aborted) {
+    if (this.aborted || generation !== this.generation) {
       throw makeYtAbortError();
     }
     const parent = video.parentElement;
@@ -1172,6 +1187,7 @@ var YouTubeLoader = class {
     });
   }
   abort() {
+    this.generation += 1;
     if (this.aborted) return;
     this.aborted = true;
     const reject = this.rejectAttach;