@amazon/vinyl 3.2.3-next.20261001224604 → 3.2.3-next.20261010160052

package/dist/index.cjs

@@ -245,6 +245,7 @@ __export(index_exports, {
   getSegmentTemplate: () => getSegmentTemplate,
   getSourceBufferQuota: () => getSourceBufferQuota,
   hlsByteRangeToMediaRange: () => hlsByteRangeToMediaRange,
+  hlsKeyDrmInfo: () => hlsKeyDrmInfo,
   immediatePrefetchPriority: () => immediatePrefetchPriority,
   inferTrackTypeFromUrl: () => inferTrackTypeFromUrl,
   inferTrackTypeFromUrlPath: () => inferTrackTypeFromUrlPath,
@@ -1579,8 +1580,21 @@ var MsCommonMediaKeySession = class extends import_vinyl_util13.EventHostImpl {
         this.dispatch("error", { error, target: this });
       }
     });
+    // Prefixed EME reports no key ids or statuses; a key was added for the
+    // session's init data.
+    __publicField(this, "keyAddedHandler", () => {
+      this.dispatch("keyStatusesChange", {
+        keyStatuses: [
+          {
+            keyId: (0, import_vinyl_util13.bufferToByteArray)(this.initData).slice().buffer,
+            status: "usable"
+          }
+        ]
+      });
+    });
     session.addEventListener("mskeymessage", this.messageHandler);
     session.addEventListener("mskeyerror", this.errorHandler);
+    session.addEventListener("mskeyadded", this.keyAddedHandler);
   }
   update(key) {
     if (this.disposed) return Promise.reject(new import_vinyl_util13.DisposedError());
@@ -1596,6 +1610,7 @@ var MsCommonMediaKeySession = class extends import_vinyl_util13.EventHostImpl {
     this.session.close();
     this.session.removeEventListener("mskeymessage", this.messageHandler);
     this.session.removeEventListener("mskeyerror", this.errorHandler);
+    this.session.removeEventListener("mskeyadded", this.keyAddedHandler);
   }
 };
 function msErrorCodeToStr(code) {
@@ -1679,6 +1694,10 @@ var StandardCommonMediaKeys = class {
     );
   }
 };
+function copyKeyId(keyId) {
+  const bytes = keyId instanceof ArrayBuffer ? new Uint8Array(keyId) : new Uint8Array(keyId.buffer, keyId.byteOffset, keyId.byteLength);
+  return bytes.slice().buffer;
+}
 var StandardCommonMediaKeySession = class extends import_vinyl_util15.EventHostImpl {
   constructor(session, mimeType, initDataType, initData) {
     super();
@@ -1692,7 +1711,21 @@ var StandardCommonMediaKeySession = class extends import_vinyl_util15.EventHostI
         message: event.message
       });
     });
+    __publicField(this, "keyStatusesChangeHandler", () => {
+      const keyStatuses = [];
+      this.session.keyStatuses.forEach((status, keyId) => {
+        keyStatuses.push({
+          keyId: copyKeyId(keyId),
+          status
+        });
+      });
+      this.dispatch("keyStatusesChange", { keyStatuses });
+    });
     session.addEventListener("message", this.messageHandler);
+    session.addEventListener(
+      "keystatuseschange",
+      this.keyStatusesChangeHandler
+    );
     if (session.closed) {
       session.closed.then((reason) => {
         this.dispatch("closed", {
@@ -1724,6 +1757,10 @@ var StandardCommonMediaKeySession = class extends import_vinyl_util15.EventHostI
     super.dispose();
     this._disposed = true;
     this.session.removeEventListener("message", this.messageHandler);
+    this.session.removeEventListener(
+      "keystatuseschange",
+      this.keyStatusesChangeHandler
+    );
     this.session.close().catch(import_vinyl_util15.noop);
   }
 };
@@ -1835,8 +1872,21 @@ var WebKitCommonMediaKeySession = class extends import_vinyl_util16.EventHostImp
         this.dispatch("error", { error, target: this });
       }
     });
+    // Prefixed EME reports no key ids or statuses; a key was added for the
+    // session's init data.
+    __publicField(this, "keyAddedHandler", () => {
+      this.dispatch("keyStatusesChange", {
+        keyStatuses: [
+          {
+            keyId: (0, import_vinyl_util16.bufferToByteArray)(this.initData).slice().buffer,
+            status: "usable"
+          }
+        ]
+      });
+    });
     session.addEventListener("webkitkeymessage", this.messageHandler);
     session.addEventListener("webkitkeyerror", this.errorHandler);
+    session.addEventListener("webkitkeyadded", this.keyAddedHandler);
   }
   update(key) {
     if (this.disposed) return Promise.reject(new import_vinyl_util16.DisposedError());
@@ -1854,6 +1904,7 @@ var WebKitCommonMediaKeySession = class extends import_vinyl_util16.EventHostImp
       this.messageHandler
     );
     this.session.removeEventListener("webkitkeyerror", this.errorHandler);
+    this.session.removeEventListener("webkitkeyadded", this.keyAddedHandler);
     this.session.close();
   }
 };
@@ -1877,9 +1928,18 @@ function webkitErrorCodeToStr(code) {
 
 // src/drm/commonEme/CommonEmeFactory.ts
 var import_vinyl_util17 = require("@amazon/vinyl-util");
-function commonEmeFactory() {
+function commonEmeFactory(options) {
+  var _a, _b;
+  if ((options == null ? void 0 : options.preferPrefixedMediaKeys) === true) {
+    return (_a = createPrefixedCommonEme()) != null ? _a : createStandardCommonEme();
+  }
+  return (_b = createStandardCommonEme()) != null ? _b : createPrefixedCommonEme();
+}
+function createStandardCommonEme() {
+  return supportsStandardEme() ? new StandardCommonEme() : null;
+}
+function createPrefixedCommonEme() {
   if (supportsWebKitEme()) return new WebKitCommonEme();
-  if (supportsStandardEme()) return new StandardCommonEme();
   if (supportsMsEme()) return new MsCommonEme();
   return null;
 }
@@ -1918,6 +1978,7 @@ var DrmKeySystem = /* @__PURE__ */ ((DrmKeySystem2) => {
   DrmKeySystem2["PLAY_READY_3000"] = "com.microsoft.playready.recommendation.3000";
   DrmKeySystem2["FAIR_PLAY"] = "com.apple.fps";
   DrmKeySystem2["FAIR_PLAY_1_0"] = "com.apple.fps.1_0";
+  DrmKeySystem2["FAIR_PLAY_2_0"] = "com.apple.fps.2_0";
   return DrmKeySystem2;
 })(DrmKeySystem || {});
 var drmKeySystemValidator = /* @__PURE__ */ (0, import_vinyl_validation.string)().notEmpty();
@@ -1932,7 +1993,8 @@ function isPlayReady(keySystem) {
 }
 var FAIR_PLAY_KEY_SYSTEMS = [
   "com.apple.fps" /* FAIR_PLAY */,
-  "com.apple.fps.1_0" /* FAIR_PLAY_1_0 */
+  "com.apple.fps.1_0" /* FAIR_PLAY_1_0 */,
+  "com.apple.fps.2_0" /* FAIR_PLAY_2_0 */
 ];
 function isFairPlay(keySystem) {
   return FAIR_PLAY_KEY_SYSTEMS.includes(keySystem);
@@ -1978,7 +2040,8 @@ var drmOptionsValidator = /* @__PURE__ */ (0, import_vinyl_validation3.object)({
       ["org.w3.clearkey" /* CLEAR_KEY */]: /* @__PURE__ */ drmClearKeySystemOptionsValidator.optional()
     })
   ),
-  licenseProvider: /* @__PURE__ */ (0, import_vinyl_validation3.func)().optional()
+  licenseProvider: /* @__PURE__ */ (0, import_vinyl_validation3.func)().optional(),
+  preferPrefixedMediaKeys: /* @__PURE__ */ (0, import_vinyl_validation3.boolean)().maybe().optional()
 });
 
 // src/drm/util/unpackPlayReadyChallenge.ts
@@ -2472,10 +2535,10 @@ var DrmControllerImpl = class extends import_vinyl_util24.EventHostImpl {
         keySystem,
         drmInfo.contentType
       );
-      const capability = {
-        robustness: (_a = mediaOptions == null ? void 0 : mediaOptions.robustness) != null ? _a : "SW_SECURE_CRYPTO" /* SW_SECURE_CRYPTO */,
+      const robustness = (_a = mediaOptions == null ? void 0 : mediaOptions.robustness) != null ? _a : defaultRobustness(keySystem);
+      const capability = __spreadProps(__spreadValues({}, robustness != null && { robustness }), {
         encryptionScheme: drmInfo.encryptionScheme
-      };
+      });
       if (drmInfo.mimeType) {
         capability.contentType = drmInfo.mimeType;
       }
@@ -2558,6 +2621,19 @@ var DrmControllerImpl = class extends import_vinyl_util24.EventHostImpl {
       this.closeSession(session);
       this.handleError(event.error);
     });
+    session.on("keyStatusesChange", ({ keyStatuses }) => {
+      if (this.disposed) return;
+      (0, import_vinyl_util24.logDebug)(
+        this,
+        "keyStatusesChange",
+        keyStatuses.map((keyStatus) => keyStatus.status)
+      );
+      this.dispatch("keyStatusesChange", {
+        keySystem: mediaKeys.keySystem,
+        keyStatuses,
+        trackUri
+      });
+    });
     return session;
   }
   /**
@@ -2570,28 +2646,47 @@ var DrmControllerImpl = class extends import_vinyl_util24.EventHostImpl {
     this.pendingMessageProps = messageProps;
     const keySystem = mediaKeys.keySystem;
     (0, import_vinyl_util24.logDebug)(this, "message", keySystem, event.message.byteLength);
+    const messageTime = Date.now();
+    const keySystemOptions = (_a = this.options.keySystems[keySystem]) != null ? _a : this.options.keySystems["*"];
+    const licenseServerOptionsProvider = keySystemOptions == null ? void 0 : keySystemOptions.licenseServer;
+    const resolvedLicenseServerOptions = await (0, import_vinyl_util24.resolveValueProvider)(
+      licenseServerOptionsProvider
+    );
+    let licenseServerOptions = __spreadValues({}, resolvedLicenseServerOptions);
+    this.abortIfDisposed();
+    if (isFairPlayCertificateRequest(keySystem, event.message)) {
+      const certBytes = toCertBytes(
+        licenseServerOptions.serverCertificate
+      );
+      if (!certBytes) {
+        throw new DrmError("FairPlay requires certificate data");
+      }
+      this.pendingMessageProps = null;
+      if (session.disposed) return;
+      (0, import_vinyl_util24.logDebug)(this, "update certificate");
+      await session.update(certBytes.buffer);
+      return;
+    }
     if (this.keySetupSpanStart != null) {
       this.dispatchLoadSpan(
         "keySetup",
         this.keySetupSpanStart,
-        Date.now(),
+        messageTime,
         messageProps
       );
       this.keySetupSpanStart = null;
     }
-    const keySystemOptions = (_a = this.options.keySystems[keySystem]) != null ? _a : this.options.keySystems["*"];
-    const licenseServerOptionsProvider = keySystemOptions == null ? void 0 : keySystemOptions.licenseServer;
-    const licenseServerOptions = (_b = (0, import_vinyl_util24.clone)(await (0, import_vinyl_util24.resolveValueProvider)(licenseServerOptionsProvider))) != null ? _b : {};
-    this.abortIfDisposed();
     let challenge = event.message;
     if (isPlayReady(keySystem)) {
       const unpacked = unpackPlayReadyChallenge(challenge);
       challenge = unpacked.challenge;
-      if (licenseServerOptions.init == null)
-        licenseServerOptions.init = {};
-      licenseServerOptions.init.headers = __spreadValues(__spreadValues({}, (0, import_vinyl_util24.normalizeHeadersInit)(
-        (_c = licenseServerOptions.init.headers) != null ? _c : {}
-      )), unpacked.headers);
+      licenseServerOptions = __spreadProps(__spreadValues({}, licenseServerOptions), {
+        init: __spreadProps(__spreadValues({}, licenseServerOptions.init), {
+          headers: __spreadValues(__spreadValues({}, (0, import_vinyl_util24.normalizeHeadersInit)(
+            (_c = (_b = licenseServerOptions.init) == null ? void 0 : _b.headers) != null ? _c : {}
+          )), unpacked.headers)
+        })
+      });
     }
     const licenseSpanStart = Date.now();
     const key = await this.licenseProvider(
@@ -2703,8 +2798,12 @@ function toCertBytes(serverCertificate) {
   if (!serverCertificate) return null;
   return typeof serverCertificate === "string" ? (0, import_vinyl_util24.base64ToByteArray)(serverCertificate) : (0, import_vinyl_util24.bufferToByteArray)(serverCertificate);
 }
+function defaultRobustness(keySystem) {
+  return keySystem === "com.widevine.alpha" /* WIDEVINE */ ? "SW_SECURE_CRYPTO" /* SW_SECURE_CRYPTO */ : void 0;
+}
 function defaultInitDataTransformer(keySystem, certBytes) {
-  return (initData) => {
+  return (initData, _initDataType, drmInfo) => {
+    var _a;
     if (keySystem === "com.apple.fps.1_0" /* FAIR_PLAY_1_0 */) {
       if (!certBytes) {
         throw new DrmError("FairPlay requires certificate data");
@@ -2712,9 +2811,23 @@ function defaultInitDataTransformer(keySystem, certBytes) {
       const contentId = extractContentId(initData);
       return createFairPlaySessionInitData(initData, contentId, certBytes);
     }
+    if (keySystem === "com.apple.fps.2_0" /* FAIR_PLAY_2_0 */) {
+      const contentId = (_a = drmInfo.contentProtections.find(
+        (cP) => cP.keySystem === keySystem
+      )) == null ? void 0 : _a.contentId;
+      if (!contentId) {
+        throw new DrmError("FairPlay 2.0 requires a content id", {
+          drmInfo
+        });
+      }
+      return (0, import_vinyl_util24.byteStrToByteArray)(contentId);
+    }
     return initData;
   };
 }
+function isFairPlayCertificateRequest(keySystem, message) {
+  return keySystem === "com.apple.fps.2_0" /* FAIR_PLAY_2_0 */ && (0, import_vinyl_util24.bufferToByteStr)(message) === "certificate";
+}
 
 // src/drm/DrmKeySystemResolver.ts
 var import_vinyl_mpd_parser = require("@amazon/vinyl-mpd-parser");
@@ -5223,7 +5336,8 @@ var RESTRICTABLE_CONTENT_TYPES = [
 var drmProtectionValidator = /* @__PURE__ */ descriptorValidator.extend({
   keySystem: /* @__PURE__ */ (0, import_vinyl_validation10.enumOf)(DrmKeySystem),
   pro: /* @__PURE__ */ (0, import_vinyl_validation10.string)().maybe().optional(),
-  pssh: /* @__PURE__ */ (0, import_vinyl_validation10.string)().maybe().optional()
+  pssh: /* @__PURE__ */ (0, import_vinyl_validation10.string)().maybe().optional(),
+  contentId: /* @__PURE__ */ (0, import_vinyl_validation10.string)().maybe().optional()
 });
 var mediaFormatMetadataValidator = /* @__PURE__ */ (0, import_vinyl_validation10.object)({
   contentProtections: /* @__PURE__ */ (0, import_vinyl_validation10.array)(drmProtectionValidator).readonly(),
@@ -9520,6 +9634,54 @@ function buildSegmentTimeline(deps, baseUrl, segments) {
 // src/track/hls/buildHlsMediaTimeline.ts
 var import_vinyl_util94 = require("@amazon/vinyl-util");
 var import_vinyl_transmux = require("@amazon/vinyl-transmux");
+
+// src/track/hls/util/hlsKeyDrmInfo.ts
+var import_vinyl_mpd_parser5 = require("@amazon/vinyl-mpd-parser");
+var FAIR_PLAY_KEY_FORMAT = "com.apple.streamingkeydelivery";
+var PLAY_READY_KEY_FORMAT = "com.microsoft.playready";
+function hlsKeyDrmInfo(deps, key) {
+  var _a, _b;
+  const encryptionScheme = methodToEncryptionScheme(key == null ? void 0 : key.method);
+  if (key == null || encryptionScheme == null) return null;
+  const keyFormat = (_a = key.keyFormat) == null ? void 0 : _a.toLowerCase();
+  let schemeIdUri;
+  let initDataType;
+  let contentId = null;
+  if (keyFormat === FAIR_PLAY_KEY_FORMAT) {
+    schemeIdUri = import_vinyl_mpd_parser5.ContentProtectionScheme.FAIR_PLAY;
+    initDataType = "sinf";
+    contentId = ((_b = key.uri) == null ? void 0 : _b.replace(/^skd:\/\//i, "")) || null;
+  } else if (keyFormat === PLAY_READY_KEY_FORMAT) {
+    schemeIdUri = import_vinyl_mpd_parser5.ContentProtectionScheme.PLAY_READY;
+    initDataType = "cenc";
+  } else if (keyFormat == null ? void 0 : keyFormat.startsWith("urn:uuid:")) {
+    schemeIdUri = keyFormat;
+    initDataType = "cenc";
+  } else {
+    return null;
+  }
+  const keySystems = deps.drmKeySystemResolver(schemeIdUri).filter((keySystem) => keySystem !== "com.apple.fps.1_0" /* FAIR_PLAY_1_0 */);
+  if (keySystems.length === 0) return null;
+  return {
+    contentProtections: keySystems.map((keySystem) => __spreadValues({
+      keySystem
+    }, contentId != null && { contentId })),
+    encryptionScheme,
+    initDataType
+  };
+}
+function methodToEncryptionScheme(method) {
+  switch (method) {
+    case "SAMPLE-AES":
+      return "cbcs";
+    case "SAMPLE-AES-CTR":
+      return "cenc";
+    default:
+      return null;
+  }
+}
+
+// src/track/hls/buildHlsMediaTimeline.ts
 function buildHlsMediaTimeline(deps, data3) {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const { mainPlaylist, baseUrl } = data3;
@@ -9618,7 +9780,7 @@ function createHlsQualityData(deps, data3, baseUrl, playlistUri, metadata) {
   return {
     metadata,
     async getSegment(time, affordance = 0) {
-      var _a;
+      var _a, _b;
       const playlist = await data3.getMediaPlaylist(playlistUri);
       const playlistBaseUrl = getPlaylistBaseUrl(
         playlist,
@@ -9634,8 +9796,12 @@ function createHlsQualityData(deps, data3, baseUrl, playlistUri, metadata) {
       if (!segment) return null;
       const hlsMap = (_a = playlist.segments[0]) == null ? void 0 : _a.map;
       if (hlsMap) {
+        const drmInfo = hlsKeyDrmInfo(
+          deps,
+          (_b = playlist.segments[segments.indexOf(segment)]) == null ? void 0 : _b.key
+        );
         return __spreadProps(__spreadValues({
-          quality: metadata
+          quality: drmInfo ? __spreadValues(__spreadValues({}, metadata), drmInfo) : metadata
         }, segment), {
           initData: createSegmentDataProvider(deps, {
             url: (0, import_vinyl_util94.resolveUrl)(hlsMap.uri, playlistBaseUrl),
@@ -10528,7 +10694,12 @@ function createVinylFactories(options) {
     trackController: (deps) => new TrackControllerImpl(deps, options.trackController),
     drmKeySystemResolver: () => defaultDrmKeySystemResolver,
     drmController: (deps) => new DrmControllerImpl(deps, options.drm),
-    commonEme: commonEmeFactory,
+    commonEme: () => {
+      var _a;
+      return commonEmeFactory({
+        preferPrefixedMediaKeys: (_a = options.drm) == null ? void 0 : _a.preferPrefixedMediaKeys
+      });
+    },
     autoResetController: (deps) => new AutoResetControllerImpl(deps, options.autoReset),
     adController: (deps) => new AdControllerImpl(deps, options.adController),
     createDashFactories: createDashFactories(options),
@@ -10619,7 +10790,12 @@ var VinylPlayer = class extends import_vinyl_util99.EventHostImpl {
         ALL_TRACK_CONTROLLER_EVENTS
       )
     );
-    add((0, import_vinyl_util99.redispatchEvents)(this, this.drmController, ["error"]));
+    add(
+      (0, import_vinyl_util99.redispatchEvents)(this, this.drmController, [
+        "error",
+        "keyStatusesChange"
+      ])
+    );
     add(
       this.drmController.on("loadSpanMeasured", (measurement) => {
         const trackUri = measurement.trackUri;