@amazon/vinyl 1.2.0 → 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);
         });
@@ -20860,7 +20868,7 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
     createMediaKeySystemAccessParams(drmInfo) {
       const keySystems = drmInfo.contentProtections.map((protection) => protection.keySystem).sort(this.keySystemComparator);
       return keySystems.map((keySystem) => {
-        var _a3, _b;
+        var _a3, _b, _c;
         const mediaOptions = this.getMediaKeySystemOptions(
           keySystem,
           drmInfo.contentType
@@ -20880,6 +20888,15 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
           config.videoCapabilities = [capability];
         } else if (contentType2 === "audio") {
           config.audioCapabilities = [capability];
+          if (((_c = getUserAgentInfo().os) == null ? void 0 : _c.name) === "chromeOS" /* CHROME_OS */) {
+            logDebug(this, "Adding video avc1 drm capabilities for VMP");
+            config.videoCapabilities = [
+              {
+                contentType: `video/mp4; codecs="avc1.4d401f"`,
+                robustness: "SW_SECURE_DECODE"
+              }
+            ];
+          }
         }
         return {
           keySystem,
@@ -21375,7 +21392,7 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
   // src/global/environment.ts
   var vinylVersion = parseVersion(
     /* istanbul ignore next */
-    "1.2.0"
+    "1.2.1"
   );
 
   // src/global/globalRef.ts
@@ -34014,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 () => {
@@ -39592,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", () => {
@@ -40427,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(
@@ -40644,6 +40698,65 @@ ${(_a3 = this.failedResult.failedExpectations[0]) == null ? void 0 : _a3.message
         );
       });
     });
+    describe("ChromeOS verified media path", () => {
+      const chromeOsUserAgent = "Mozilla/5.0 (X11; CrOS x86_64 14541.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
+      const chromeUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
+      it("adds avc1 video capabilities for audio content on ChromeOS", async () => {
+        setUserAgent(chromeOsUserAgent);
+        drmController.setBufferingDrmInfo(__spreadProps(__spreadValues({}, drmInfo), {
+          contentType: "audio",
+          mimeType: "audio/mp4"
+        }));
+        await emitEncrypted();
+        expect(
+          commonEme.requestMediaKeySystemAccess
+        ).toHaveBeenCalledOnceWith("com.widevine.alpha" /* WIDEVINE */, [
+          {
+            initDataTypes: ["cenc"],
+            audioCapabilities: [
+              {
+                contentType: "audio/mp4",
+                encryptionScheme: "cenc",
+                robustness: "SW_SECURE_CRYPTO" /* SW_SECURE_CRYPTO */
+              }
+            ],
+            videoCapabilities: [
+              {
+                contentType: 'video/mp4; codecs="avc1.4d401f"',
+                robustness: "SW_SECURE_DECODE" /* SW_SECURE_DECODE */
+              }
+            ]
+          }
+        ]);
+      });
+      it("does not add video capabilities for audio content off ChromeOS", async () => {
+        setUserAgent(chromeUserAgent);
+        drmController.setBufferingDrmInfo(__spreadProps(__spreadValues({}, drmInfo), {
+          contentType: "audio",
+          mimeType: "audio/mp4"
+        }));
+        await emitEncrypted();
+        const config = commonEme.requestMediaKeySystemAccess.calls.mostRecent().args[1][0];
+        expect(config.videoCapabilities).toBeUndefined();
+      });
+      it("does not alter video content capabilities on ChromeOS", async () => {
+        setUserAgent(chromeOsUserAgent);
+        drmController.setBufferingDrmInfo(__spreadProps(__spreadValues({}, drmInfo), {
+          contentType: "video",
+          mimeType: "video/mp4"
+        }));
+        await emitEncrypted();
+        const config = commonEme.requestMediaKeySystemAccess.calls.mostRecent().args[1][0];
+        expect(config.videoCapabilities).toEqual([
+          {
+            contentType: "video/mp4",
+            encryptionScheme: "cenc",
+            robustness: "SW_SECURE_CRYPTO" /* SW_SECURE_CRYPTO */
+          }
+        ]);
+        expect(config.audioCapabilities).toBeUndefined();
+      });
+    });
     describe("when a session has been created", () => {
       beforeEach(async () => {
         drmController.setBufferingDrmInfo(drmInfo);