@amazon/vinyl 3.2.1 → 3.2.2

package/dist/test/integ.js

@@ -14007,6 +14007,7 @@ ${this.lastInitStack}` : "";
   // src/drm/DrmControllerImpl.ts
   var LICENSE_TIMEOUT = 90;
   var LICENSE_TIMEOUT_MESSAGE = "License provider timed out after {time}s";
+  var EXCESSIVE_SESSION_COUNT = 20;
   var DrmControllerImpl = class extends EventHostImpl {
     constructor(deps, options) {
       super();
@@ -14223,6 +14224,13 @@ ${this.lastInitStack}` : "";
         trackUri
       });
       this.sessions.push(newSession);
+      logVerbose(this, `total sessions: ${this.sessions.length}`);
+      if (this.sessions.length === EXCESSIVE_SESSION_COUNT + 1) {
+        logWarn(
+          this,
+          `${this.sessions.length} open key sessions exceeds ${EXCESSIVE_SESSION_COUNT}; sessions may be leaking (not closing on track deactivation)`
+        );
+      }
       this.dispatch("sessionCreate", {
         initDataType: newSession.initDataType,
         mimeType: newSession.mimeType
@@ -15221,7 +15229,7 @@ ${this.lastInitStack}` : "";
   // src/global/environment.ts
   var vinylVersion = parseVersion(
     /* istanbul ignore next */
-    "3.2.1"
+    "3.2.2"
   );
 
   // src/global/globalRef.ts
@@ -15715,15 +15723,13 @@ ${this.lastInitStack}` : "";
       __publicField(this, "_playing", false);
       __publicField(this, "_seeking", false);
       __publicField(this, "_waiting", false);
-      // Monotonic counter identifying the most recent seekTo call.
-      __publicField(this, "_seekId", 0);
+      __publicField(this, "seekAbortSlot", createAbortSlot());
       // Stops the stall detector started after the last seek, if any.
       __publicField(this, "stopStallDetection", null);
       // default user volume (0.0 to 1.0 scale)
       __publicField(this, "userVolume", 1);
       __publicField(this, "_pendingPlay", null);
       __publicField(this, "playAbort", null);
-      __publicField(this, "disposeAbort", new Abort());
       __publicField(this, "options");
       this.options = __spreadValues(__spreadProps(__spreadValues({}, defaultPlaybackControllerImplOptions), {
         minSeekableBuffer: getMinSeekableBufferDefault()
@@ -15734,8 +15740,7 @@ ${this.lastInitStack}` : "";
       const { add } = this.disposer;
       add(() => {
         var _a3;
-        this.disposeAbort.abort();
-        this.disposeAbort.dispose();
+        this.seekAbortSlot.abort();
         (_a3 = this.stopStallDetection) == null ? void 0 : _a3.call(this);
       });
       this.domEvents = add(
@@ -16148,14 +16153,10 @@ ${this.lastInitStack}` : "";
     async seekTo(time, tolerance = 0.5) {
       var _a3;
       logDebug(this, `seekTo: ${time}`);
-      const seekId = ++this._seekId;
       (_a3 = this.stopStallDetection) == null ? void 0 : _a3.call(this);
       this.stopStallDetection = null;
-      const superseded = () => {
-        if (this._seekId === seekId) return false;
-        logDebug(this, `seekTo: ${time} superseded by a newer seek`);
-        return true;
-      };
+      this.seekAbortSlot.abort();
+      const seekAbort = this.seekAbortSlot.value;
       const nextEvent = (type, options) => {
         var _a4;
         return nextEventAsPromise(this, type, {
@@ -16163,12 +16164,25 @@ ${this.lastInitStack}` : "";
           timeoutMessage: `seek timed out on ${type} event after {time}s`,
           timeoutOrigin: ErrorOrigin.INTERNAL,
           timeoutLevel: "warn" /* WARN */,
-          abort: this.disposeAbort
+          abort: seekAbort
         });
       };
+      try {
+        await this.doSeek(time, tolerance, seekAbort, nextEvent);
+      } catch (error) {
+        if (seekAbort.aborted() && !this.disposed) return;
+        throw error;
+      }
+    }
+    /**
+     * The body of a single {@link seekTo} attempt. Extracted so {@link seekTo}
+     * can wrap it with per-seek abort/supersession handling. `seekAbort` is
+     * aborted when a newer seek supersedes this one (or on dispose).
+     * @private
+     */
+    async doSeek(time, tolerance, seekAbort, nextEvent) {
       if (!this.hasMetadata) {
         await nextEvent("loadedMetadata");
-        if (superseded()) return;
       }
       const seekable = this.seekable;
       const range = seekable.getRangeAt(
@@ -16199,7 +16213,7 @@ ${this.lastInitStack}` : "";
         );
       } else {
         const nullIfStuck = (error) => {
-          if (this.disposeAbort.aborted()) throw error;
+          if (this.disposed) throw error;
           return null;
         };
         const seekOnce = async (reSeeking) => {
@@ -16213,7 +16227,7 @@ ${this.lastInitStack}` : "";
           }).catch(nullIfStuck);
         };
         let seekedEvent = await seekOnce(false);
-        for (let attempt = 0; !superseded() && attempt < SEEK_RETRY_LIMIT && (seekedEvent === null || seekedEvent.reason === "seeked" && !closeTo(clampedTime, this.currentTime, tolerance)); attempt++) {
+        for (let attempt = 0; !seekAbort.aborted() && attempt < SEEK_RETRY_LIMIT && (seekedEvent === null || seekedEvent.reason === "seeked" && !closeTo(clampedTime, this.currentTime, tolerance)); attempt++) {
           if (seekedEvent === null) void this.media.play().catch(noop);
           logDebug(this, `seekTo: re-seeking to ${clampedTime}`);
           seekedEvent = await seekOnce(true);
@@ -16221,7 +16235,7 @@ ${this.lastInitStack}` : "";
         if ((seekedEvent == null ? void 0 : seekedEvent.reason) === "emptied") {
           throw new AbortError();
         }
-        if (!this.paused) this.startStallDetection();
+        if (!this.paused && !seekAbort.aborted()) this.startStallDetection();
       }
     }
     /**
@@ -20561,7 +20575,6 @@ ${this.lastInitStack}` : "";
       const deps = depsContainer.dependencies;
       super(uri, type, deps);
       __publicField(this, "streams", []);
-      __publicField(this, "disposeAbort", new Abort());
       __publicField(this, "lastPreloadOptions", null);
       __publicField(this, "allFetchedRanges", []);
       __publicField(this, "_fetchedRanges", new IntersectionRanges(
@@ -20586,7 +20599,7 @@ ${this.lastInitStack}` : "";
         if (this.active) {
           this.deps.drmController.initializeForPlayback(event.current, {
             trackUri: this.uri,
-            abort: this.disposeAbort
+            abort: this.drmSessionAbort.value
           });
         }
       });
@@ -20594,7 +20607,7 @@ ${this.lastInitStack}` : "";
         if (event.current == null) return;
         this.deps.drmController.setBufferingDrmInfo(event.current, {
           trackUri: this.uri,
-          abort: this.disposeAbort
+          abort: this.drmSessionAbort.value
         });
       });
       add(
@@ -20832,7 +20845,7 @@ ${this.lastInitStack}` : "";
       this.streams.forEach((stream) => {
         this.deps.drmController.initializeForPlayback(
           stream.streamingQuality,
-          { trackUri: this.uri, abort: this.disposeAbort }
+          { trackUri: this.uri, abort: this.drmSessionAbort.value }
         );
       });
       this.deps.playbackSource.src = this.deps.mediaSourceController.activate();
@@ -20858,7 +20871,7 @@ ${this.lastInitStack}` : "";
       this.callOnStreams("deactivate");
       this.deps.drmController.setBufferingDrmInfo(null, {
         trackUri: this.uri,
-        abort: this.disposeAbort
+        abort: this.drmSessionAbort.value
       });
       (_b = this.deps.textTrackController) == null ? void 0 : _b.deactivate();
       this.deps.playbackSource.src = null;
@@ -32139,6 +32152,23 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
         expect(drmController.isEmeSupported()).toBeFalse();
       });
     });
+    describe("excessive sessions", () => {
+      it("warns once when the open session count exceeds the threshold", async () => {
+        drmController.setBufferingDrmInfo(drmInfo);
+        for (let i = 0; i < EXCESSIVE_SESSION_COUNT; i++) {
+          await emitEncrypted(new Uint8Array([i]));
+        }
+        expect(drmController.activeSessions).toBe(EXCESSIVE_SESSION_COUNT);
+        expect(logger.value.warn).not.toHaveBeenCalled();
+        await emitEncrypted(new Uint8Array([EXCESSIVE_SESSION_COUNT]));
+        expect(drmController.activeSessions).toBe(
+          EXCESSIVE_SESSION_COUNT + 1
+        );
+        expect(logger.value.warn).toHaveBeenCalledTimes(1);
+        await emitEncrypted(new Uint8Array([EXCESSIVE_SESSION_COUNT + 1]));
+        expect(logger.value.warn).toHaveBeenCalledTimes(1);
+      });
+    });
     describe("closeSessions", () => {
       it("clears active sessions", async () => {
         const sessionCloseSpy = createEventSpy(
@@ -34107,6 +34137,13 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
             await clock.tick(controller.options.seekTimeout);
             await seekExpectation;
           });
+          it("resolves a superseded seek at once when its seeking event never fires", async () => {
+            setSeekable([[0, 100]]);
+            const first2 = controller.seekTo(50);
+            const second = controller.seekTo(60);
+            await expectAsync(first2).toBeResolved();
+            second.catch(() => void 0);
+          });
           it("times out pending seeks after seekTimeout", async () => {
             const pendingSeekExpectation = expectAsync(
               controller.seekTo(60)
@@ -39217,6 +39254,16 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
           abort: any14(Abort)
         });
       });
+      it("aborts the drm session abort so key sessions close", async () => {
+        track2 = createTrack();
+        await awaitContentTypes();
+        getAudioStream().streamingQuality = createEmptyMediaQualityMetadata();
+        track2.activate({});
+        const { abort } = deps.drmController.initializeForPlayback.calls.mostRecent().args[1];
+        expect(abort.aborted()).toBeFalse();
+        track2.deactivate();
+        expect(abort.aborted()).toBeTrue();
+      });
     });
     describe("error", () => {
       it("returns the first emitted error", async () => {