Handle Certurl like laurl; centralize certUrls normalization/deduplication

Author: gorkemg

src/streaming/MediaPlayer.js

@@ -2020,44 +2020,15 @@ function MediaPlayer() {
      * @instance
      */
     function setProtectionData(value) {
-        protectionData = value;
-
+        const sanitizedValue = CertUrlUtils.sanitizeProtectionDataCertUrls(value);
+        protectionData = sanitizedValue;
+        
         // Propagate changes in case StreamController is already created
         if (streamController) {
             streamController.setProtectionData(protectionData);
         }
     }
 
-    /**
-     * Adds one or multiple certificate URLs (Certurl) for a given key system. These URLs
-     * override (i.e. take priority over) manifest-provided Certurl entries when acquiring
-     * the server certificate. They are tried before manifest entries and in the provided order.
-     * Input may be a single string, an object {url, certType}, or an array of those.
-     * @param {string} keySystemString EME key system identifier e.g. 'com.widevine.alpha'
-     * @param {string|object|Array<string|object>} certUrls One or many certificate URL descriptors
-     * @example
-     * // Single URL
-     * player.addCertUrls('com.widevine.alpha', 'https://example.com/wv_cert');
-     * // Multiple with certType labels
-     * player.addCertUrls('com.widevine.alpha', [
-     *   { url: 'https://example.com/wv_cert_primary', certType: 'primary' },
-     *   { url: 'https://backup.example.com/wv_cert_backup', certType: 'backup' }
-     * ]);
-     */
-    function addCertUrls(keySystemString, certUrls) {
-        if (!keySystemString || !certUrls) { return; }
-        const normalized = CertUrlUtils.normalizeCertUrls(certUrls);
-        if (!normalized.length) { return; }
-        // Ensure protectionData structure
-        protectionData = protectionData || {};
-        const existing = protectionData[keySystemString] || {};
-        const existingList = Array.isArray(existing.certUrls) ? existing.certUrls : [];
-        // Merge and dedupe via shared utility (existing first order preserved)
-        const merged = existingList.concat(normalized);
-        existing.certUrls = CertUrlUtils.dedupeCertUrls(merged);
-        protectionData[keySystemString] = existing;
-        setProtectionData(protectionData);
-    }
 
     /*
     ---------------------------------------------------------------------------
@@ -2955,7 +2926,6 @@ function MediaPlayer() {
         setMute,
         setPlaybackRate,
         setProtectionData,
-        addCertUrls,
         setRepresentationForTypeById,
         setRepresentationForTypeByIndex,
         setTextTrack,

src/streaming/utils/CertUrlUtils.js

@@ -1,6 +1,37 @@
+/**
+ * The copyright in this software is being made available under the BSD License,
+ * included below. This software may be subject to other third party and contributor
+ * rights, including patent rights, and no such rights are granted under this license.
+ *
+ * Copyright (c) 2013, Dash Industry Forum.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *  * Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation and/or
+ *  other materials provided with the distribution.
+ *  * Neither the name of Dash Industry Forum nor the names of its
+ *  contributors may be used to endorse or promote products derived from this software
+ *  without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
+ *  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *  POSSIBILITY OF SUCH DAMAGE.
+ */
+
 /**
  * Utility functions for DASH Certurl normalization.
- * Shared by ContentProtection parsing and MediaPlayer.addCertUrls API.
+ * Shared by ContentProtection parsing and protData handling.
  *
  * A Certurl entry may appear as:
  *  - String: 'https://example.com/cert'
@@ -59,7 +90,26 @@ function dedupeCertUrls(list) {
     return result;
 }
 
+/**
+ * Iterates over a ProtectionDataSet object and normalizes & deduplicates any certUrls arrays in-place.
+ * Returns the same object reference for convenience.
+ * @param {Object} protData - keySystem -> config object
+ * @returns {Object} protData
+ */
+function sanitizeProtectionDataCertUrls(protData) {
+    if (protData && typeof protData === 'object') {
+        Object.keys(protData).forEach(keySystem => {
+            const entry = protData[keySystem];
+            if (entry && Array.isArray(entry.certUrls)) {
+                entry.certUrls = dedupeCertUrls(normalizeCertUrls(entry.certUrls));
+            }
+        });
+    }
+    return protData;
+}
+
 export default {
     normalizeCertUrls,
-    dedupeCertUrls
+    dedupeCertUrls,
+    sanitizeProtectionDataCertUrls
 };