@amazon/vinyl 3.0.0 → 3.0.1

package/dist/test/integ.js

@@ -15182,7 +15182,7 @@ ${this.lastInitStack}` : "";
   // src/global/environment.ts
   var vinylVersion = parseVersion(
     /* istanbul ignore next */
-    "3.0.0"
+    "3.0.1"
   );
 
   // src/global/globalRef.ts
@@ -23544,36 +23544,36 @@ ${this.lastInitStack}` : "";
             logDebug(this, "more adbreaks");
             return;
           }
-          if (adParent.active) {
-            logDebug(this, "no ads began");
-            return;
-          }
           const adParentLoad = this._current;
           const placement = event.adBreak.placement;
           const isPreroll = placement === "preroll";
           const isPostroll = placement === "postroll";
+          const noAdBegan = adParent.active;
+          const resumeContent = (startTime) => this.setCurrentTrack(adParent, {
+            config: __spreadProps(__spreadValues({}, adParentLoad.config), { startTime }),
+            isAd: false,
+            checkPreroll: false
+          });
           if (isPostroll) {
             logDebug(this, "trackEnded after postroll");
             this.dispatch("trackEnded", { track: adParentLoad });
-          }
-          if (isPostroll && this.hasNext()) {
-            this.next();
-          } else {
-            const startTime = isPreroll ? (_a3 = adParentLoad.config) == null ? void 0 : _a3.startTime : event.resumePosition;
-            this.setCurrentTrack(adParent, {
-              config: __spreadProps(__spreadValues({}, adParentLoad.config), {
-                startTime
-              }),
-              isAd: false,
-              checkPreroll: false
-            });
-            if (isPostroll) {
-              logInfo(this, "queueEnded after postroll ad(s)");
-              this.dispatch("queueEnded", {});
-            } else {
-              playbackController.play().catch(noop);
+            if (this.hasNext()) {
+              this.next();
+              return;
             }
+            if (!noAdBegan) resumeContent(event.resumePosition);
+            logInfo(this, "queueEnded after postroll");
+            this.dispatch("queueEnded", {});
+            return;
           }
+          if (noAdBegan) {
+            logDebug(this, "no ads began");
+            return;
+          }
+          resumeContent(
+            isPreroll ? (_a3 = adParentLoad.config) == null ? void 0 : _a3.startTime : event.resumePosition
+          );
+          playbackController.play().catch(noop);
         })
       );
     }
@@ -52136,6 +52136,42 @@ x`);
         );
         expect(trackActivated).toHaveBeenCalledBefore(queueEnded);
       });
+      it("ends the track after an empty postroll where no ad ever began", async () => {
+        const [main] = createLoadOptionsList(1);
+        trackController.load(main);
+        await clock.tick();
+        expect(trackController.activeTrack.active).toBeTrue();
+        const trackEnded = createEventSpy(trackController, "trackEnded");
+        const queueEnded = createEventSpy(trackController, "queueEnded");
+        deps.adController.dispatch("adBreakCompleted", {
+          adBreak: adBreak("postroll"),
+          resumePosition: 0
+        });
+        await clock.tick();
+        expect(trackEnded).toHaveBeenCalledWith(
+          objectContaining24({
+            track: objectContaining24({ uri: main.uri })
+          })
+        );
+        expect(queueEnded).toHaveBeenCalled();
+      });
+      it("advances to the next track after an empty postroll where no ad ever began", async () => {
+        var _a3;
+        const list = createLoadOptionsList(2);
+        trackController.load(...list);
+        await clock.tick();
+        expect(trackController.activeTrack.active).toBeTrue();
+        const trackEnded = createEventSpy(trackController, "trackEnded");
+        deps.adController.dispatch("adBreakCompleted", {
+          adBreak: adBreak("postroll"),
+          resumePosition: 0
+        });
+        await clock.tick();
+        expect(trackEnded).toHaveBeenCalledWith(
+          objectContaining24({ track: any29(Object) })
+        );
+        expect((_a3 = trackController.activeTrack) == null ? void 0 : _a3.uri).toBe(list[1].uri);
+      });
       it("does not treat a completed midroll ad as the track ending", async () => {
         trackController.load(...createLoadOptionsList(1));
         const trackEnded = createEventSpy(trackController, "trackEnded");
@@ -55699,6 +55735,62 @@ x`);
       ).toBeTrue();
       expect(await poll(() => player.paused || player.ended, { timeout: 20 })).withContext("player.paused || player.ended").toBeTrue();
     });
+    const EMPTY_BREAKS_ASSET = vinylTestAssets.hls.vinyl_ad_breaks_av__empty_breaks_pre_mid_post;
+    it("ends the track after an empty postroll (no ads) instead of hanging", async () => {
+      const player = suite.player;
+      player.load({ type: "hls", uri: EMPTY_BREAKS_ASSET });
+      await poll(() => {
+        var _a3, _b;
+        return ((_b = (_a3 = player.currentTrackAds) == null ? void 0 : _a3.adBreaks.length) != null ? _b : 0) > 0;
+      }, {
+        timeout: 15
+      });
+      const trackEnded = nextEventAsPromise(player, "trackEnded", {
+        filter: (e) => e.track.uri === EMPTY_BREAKS_ASSET,
+        timeout: 40,
+        timeoutMessage: "trackEnded not received for the empty postroll"
+      });
+      const queueEnded = nextEventAsPromise(player, "queueEnded", {
+        timeout: 40,
+        timeoutMessage: "queueEnded not received after the empty postroll"
+      });
+      await player.play().catch(noop);
+      await player.seekTo(Math.max(0, player.duration - 1.5), 1).catch(() => void 0);
+      await trackEnded;
+      await queueEnded;
+      expect(player.currentAd).withContext("no ad played for the empty break").toBeNull();
+    });
+    it("advances to the next track after an empty postroll (no ads)", async () => {
+      var _a3;
+      const player = suite.player;
+      const nextAsset = vinylTestAssets.hls.live_static_video_audio_60s_4s;
+      player.load(
+        { type: "hls", uri: EMPTY_BREAKS_ASSET },
+        { type: "hls", uri: nextAsset }
+      );
+      await poll(() => {
+        var _a4, _b;
+        return ((_b = (_a4 = player.currentTrackAds) == null ? void 0 : _a4.adBreaks.length) != null ? _b : 0) > 0;
+      }, {
+        timeout: 15
+      });
+      const firstTrackEnded = nextEventAsPromise(player, "trackEnded", {
+        filter: (e) => e.track.uri === EMPTY_BREAKS_ASSET,
+        timeout: 40,
+        timeoutMessage: "trackEnded not received for the first track"
+      });
+      const nextActivated = nextEventAsPromise(player, "trackActivated", {
+        filter: (e) => e.track.uri === nextAsset,
+        timeout: 40,
+        timeoutMessage: "the next queued track was not activated"
+      });
+      await player.play().catch(noop);
+      await player.seekTo(Math.max(0, player.duration - 1.5), 1).catch(() => void 0);
+      await firstTrackEnded;
+      await nextActivated;
+      expect((_a3 = player.activeTrack) == null ? void 0 : _a3.uri).withContext("advanced to the next queued track").toBe(nextAsset);
+      expect(player.currentAd).withContext("no ad played for the empty break").toBeNull();
+    });
     it("does not replay a postroll after it finishes naturally", async () => {
       var _a3;
       const player = suite.player;