@amazon/vinyl 1.2.1 → 1.2.2

package/dist/test/integ.js

@@ -13362,7 +13362,6 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
       const deps = depsContainer.dependencies;
       super(uri, type, deps);
       __publicField(this, "streams", []);
-      __publicField(this, "disposeAbort", new Abort());
       __publicField(this, "lastPreloadOptions", null);
       __publicField(this, "activateOptions", null);
       __publicField(this, "allFetchedRanges", []);
@@ -13397,14 +13396,14 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
         if (this.activateOptions) {
           this.deps.drmController.initializeForPlayback(
             event.current,
-            this.disposeAbort
+            this.drmSessionAbort.value
           );
         }
       });
       this.on("bufferingQualityChange", (event) => {
         this.deps.drmController.setBufferingDrmInfo(
           event.current,
-          this.disposeAbort
+          this.drmSessionAbort.value
         );
       });
       add(
@@ -13560,7 +13559,7 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
       this.streams.forEach((stream) => {
         this.deps.drmController.initializeForPlayback(
           stream.streamingQuality,
-          this.disposeAbort
+          this.drmSessionAbort.value
         );
       });
       this.deps.playbackSource.src = this.deps.mediaSourceController.createUrl();
@@ -20587,6 +20586,7 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
   // 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();
@@ -20768,12 +20768,20 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
           keySystemOptions == null ? void 0 : keySystemOptions.initDataTransformer
         );
         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
         });
         newSession.on("closed", () => this.closeSession(newSession));
         abort == null ? void 0 : abort.onAborted(() => {
+          if (this.disposed) return;
           logDebug(this, "abort session");
           this.closeSession(newSession);
         });
@@ -34023,6 +34031,16 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
         expect(deps.playbackSource.load).toHaveBeenCalledOnceWith();
         expect(deps.playbackController.pause).toHaveBeenCalledOnceWith();
       });
+      it("aborts the drm session abort so key sessions close", async () => {
+        track = createTrack();
+        await awaitContentTypes();
+        getAudioStream().streamingQuality = createEmptyMediaQualityMetadata();
+        track.activate({});
+        const abort = deps.drmController.initializeForPlayback.calls.mostRecent().args[1];
+        expect(abort.aborted()).toBeFalse();
+        track.deactivate();
+        expect(abort.aborted()).toBeTrue();
+      });
     });
     describe("error", () => {
       it("returns the first emitted error", async () => {
@@ -39601,6 +39619,16 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
           ).toEqual([1, 1, 1, 1, 1, 1]);
           expect(drmController.activeSessions).toEqual(0);
         });
+        it("does not close sessions again after dispose", async () => {
+          const abort = new Abort();
+          drmController.setBufferingDrmInfo(drmInfo, abort);
+          await emitEncrypted();
+          const session = mediaKeys.createSession.calls.mostRecent().returnValue;
+          drmController.dispose();
+          const disposeCount = session.dispose.calls.count();
+          abort.abort();
+          expect(session.dispose.calls.count()).toBe(disposeCount);
+        });
       });
     });
     describe("when an encrypted event is observed", () => {
@@ -40436,6 +40464,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(