@amazon/vinyl 1.2.0 → 1.2.2

package/dist/index.js

@@ -1838,7 +1838,6 @@ import {
 
 // src/track/mse/MseTrack.ts
 import {
-  Abort as Abort2,
   equalDeep,
   IntersectionRanges,
   logDebug as logDebug5,
@@ -1864,7 +1863,6 @@ var MseTrack = class extends TrackBase {
     const deps = depsContainer.dependencies;
     super(uri, type, deps);
     __publicField(this, "streams", []);
-    __publicField(this, "disposeAbort", /* @__PURE__ */ new Abort2());
     __publicField(this, "lastPreloadOptions", null);
     __publicField(this, "activateOptions", null);
     __publicField(this, "allFetchedRanges", []);
@@ -1899,14 +1897,14 @@ var MseTrack = class extends TrackBase {
       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(
@@ -2062,7 +2060,7 @@ var MseTrack = class extends TrackBase {
     this.streams.forEach((stream) => {
       this.deps.drmController.initializeForPlayback(
         stream.streamingQuality,
-        this.disposeAbort
+        this.drmSessionAbort.value
       );
     });
     this.deps.playbackSource.src = this.deps.mediaSourceController.createUrl();
@@ -3964,7 +3962,7 @@ var BufferingControllerImpl = class extends EventHostImpl6 {
 
 // src/streaming/SegmentControllerImpl.ts
 import {
-  Abort as Abort3,
+  Abort as Abort2,
   clone as clone2,
   closeTo as closeTo5,
   createDisposer as createDisposer10,
@@ -4156,7 +4154,7 @@ var SegmentControllerImpl = class extends EventHostImpl7 {
     __publicField(this, "timeUpdateSub", null);
     __publicField(this, "seekingSub", null);
     // When disposed, aborts in-flight operations.
-    __publicField(this, "abort", /* @__PURE__ */ new Abort3());
+    __publicField(this, "abort", /* @__PURE__ */ new Abort2());
     /**
      * Cached last period lookup for fast repeated access.
      */
@@ -6649,12 +6647,15 @@ import {
   createDisposer as createDisposer14,
   ErrorOrigin as ErrorOrigin21,
   EventHostImpl as EventHostImpl12,
+  getUserAgentInfo as getUserAgentInfo2,
   isSilentError as isSilentError6,
   logDebug as logDebug14,
   logVerbose as logVerbose2,
+  logWarn as logWarn4,
   memoize as memoize7,
   noop as noop7,
   normalizeHeadersInit as normalizeHeadersInit2,
+  Os,
   remove,
   resolveValueProvider,
   withTimeout as withTimeout3
@@ -6805,6 +6806,7 @@ function createFairPlaySessionInitData(initData, contentId, certificateData) {
 // 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 EventHostImpl12 {
   constructor(deps, options) {
     super();
@@ -6986,12 +6988,20 @@ var DrmControllerImpl = class extends EventHostImpl12 {
         keySystemOptions == null ? void 0 : keySystemOptions.initDataTransformer
       );
       this.sessions.push(newSession);
+      logVerbose2(this, `total sessions: ${this.sessions.length}`);
+      if (this.sessions.length === EXCESSIVE_SESSION_COUNT + 1) {
+        logWarn4(
+          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;
         logDebug14(this, "abort session");
         this.closeSession(newSession);
       });
@@ -7078,7 +7088,7 @@ var DrmControllerImpl = class extends EventHostImpl12 {
   createMediaKeySystemAccessParams(drmInfo) {
     const keySystems = drmInfo.contentProtections.map((protection) => protection.keySystem).sort(this.keySystemComparator);
     return keySystems.map((keySystem) => {
-      var _a, _b;
+      var _a, _b, _c;
       const mediaOptions = this.getMediaKeySystemOptions(
         keySystem,
         drmInfo.contentType
@@ -7098,6 +7108,15 @@ var DrmControllerImpl = class extends EventHostImpl12 {
         config.videoCapabilities = [capability];
       } else if (contentType2 === "audio") {
         config.audioCapabilities = [capability];
+        if (((_c = getUserAgentInfo2().os) == null ? void 0 : _c.name) === Os.CHROME_OS) {
+          logDebug14(this, "Adding video avc1 drm capabilities for VMP");
+          config.videoCapabilities = [
+            {
+              contentType: `video/mp4; codecs="avc1.4d401f"`,
+              robustness: "SW_SECURE_DECODE"
+            }
+          ];
+        }
       }
       return {
         keySystem,
@@ -7590,7 +7609,7 @@ import {
   globalRef as globalRef4,
   globalTarget,
   IllegalStateError as IllegalStateError2,
-  logWarn as logWarn4,
+  logWarn as logWarn5,
   remove as remove2,
   substitute as substitute2
 } from "@amazon/vinyl-util";
@@ -7612,7 +7631,7 @@ var PlayerRegistryImpl = class {
     const n = this._players.length;
     if (n > this.maxPlayersWarning && !this.gaveMaxPlayersWarning) {
       this.gaveMaxPlayersWarning = true;
-      logWarn4(
+      logWarn5(
         globalTarget,
         substitute2(locale2.maxPlayersWarning, { count: n })
       );
@@ -7641,7 +7660,7 @@ import { initializeLogging } from "@amazon/vinyl-util";
 // src/global/globalRef.ts
 import {
   getNetworkMetrics as getNetworkMetrics2,
-  getUserAgentInfo as getUserAgentInfo2,
+  getUserAgentInfo as getUserAgentInfo3,
   globalRef as globalRef5,
   historyLogHandler,
   toDisposable
@@ -7651,7 +7670,7 @@ import {
 import { parseVersion } from "@amazon/vinyl-util";
 var vinylVersion = /* @__PURE__ */ parseVersion(
   /* istanbul ignore next */
-  "1.2.0"
+  "1.2.1"
 );
 
 // src/global/globalRef.ts
@@ -7673,7 +7692,7 @@ var VinylGlobal = class {
     return vinylVersion.str;
   }
   get userAgentInfo() {
-    return getUserAgentInfo2();
+    return getUserAgentInfo3();
   }
   get network() {
     return getNetworkMetrics2();
@@ -8270,6 +8289,7 @@ export {
   DrmError,
   DrmKeySystem,
   DrmRobustness,
+  EXCESSIVE_SESSION_COUNT,
   FAIR_PLAY_KEY_SYSTEMS,
   FixedPlaybackQuality,
   HlsManifestControllerImpl,