stormcloud-video-player 0.3.59 → 0.3.60

package/lib/players/HlsPlayer.cjs

@@ -1761,6 +1761,16 @@ function createHlsAdPlayer(contentVideo, options) {
         });
         return bestMatch.file;
     }
+    function isHlsMediaFile(mediaFile) {
+        var type = mediaFile.type.toLowerCase();
+        var url = mediaFile.url.toLowerCase();
+        return type === "application/x-mpegurl" || type === "application/vnd.apple.mpegurl" || type.includes("mpegurl") || url.includes(".m3u8");
+    }
+    function isProgressiveMediaFile(mediaFile) {
+        var type = mediaFile.type.toLowerCase();
+        var url = mediaFile.url.toLowerCase();
+        return type.startsWith("video/") || url.endsWith(".mp4") || url.includes(".mp4?");
+    }
     function parseVastXml(xmlString) {
         try {
             var _xmlDoc_querySelector, _xmlDoc_querySelector1, _xmlDoc_querySelector_textContent, _xmlDoc_querySelector2;
@@ -1792,30 +1802,32 @@ function createHlsAdPlayer(contentVideo, options) {
                 var width = mf.getAttribute("width") || "";
                 var height = mf.getAttribute("height") || "";
                 console.log("[HlsAdPlayer] MediaFile ".concat(index, ': type="').concat(type, '", url="').concat(url, '", width="').concat(width, '", height="').concat(height, '"'));
-                if (type === "application/x-mpegURL" || type.includes("m3u8")) {
-                    if (!url) {
-                        console.warn("[HlsAdPlayer] MediaFile ".concat(index, " has HLS type but empty URL"));
-                        return;
-                    }
-                    var bitrateAttr = mf.getAttribute("bitrate");
-                    var bitrateValue = bitrateAttr ? parseInt(bitrateAttr, 10) : void 0;
-                    mediaFiles.push({
-                        url: url,
-                        type: type,
-                        width: parseInt(width || "1920", 10),
-                        height: parseInt(height || "1080", 10),
-                        bitrate: bitrateValue && bitrateValue > 0 ? bitrateValue : void 0
-                    });
-                    console.log("[HlsAdPlayer] Added HLS MediaFile: ".concat(url));
+                var mediaFile = {
+                    url: url,
+                    type: type,
+                    width: parseInt(width || "1920", 10),
+                    height: parseInt(height || "1080", 10),
+                    bitrate: void 0
+                };
+                if (!url) {
+                    console.warn("[HlsAdPlayer] MediaFile ".concat(index, " has empty URL"));
+                    return;
+                }
+                var bitrateAttr = mf.getAttribute("bitrate");
+                var bitrateValue = bitrateAttr ? parseInt(bitrateAttr, 10) : void 0;
+                mediaFile.bitrate = bitrateValue && bitrateValue > 0 ? bitrateValue : void 0;
+                if (isHlsMediaFile(mediaFile) || isProgressiveMediaFile(mediaFile)) {
+                    mediaFiles.push(mediaFile);
+                    console.log("[HlsAdPlayer] Added ".concat(isHlsMediaFile(mediaFile) ? "HLS" : "progressive", " MediaFile: ").concat(url));
                 } else {
-                    console.log("[HlsAdPlayer] MediaFile ".concat(index, ' ignored (type="').concat(type, '" is not HLS)'));
+                    console.log("[HlsAdPlayer] MediaFile ".concat(index, ' ignored (type="').concat(type, '" is not supported)'));
                 }
             });
             if (mediaFiles.length === 0) {
                 if (isNoAdAvailable) {
                     console.warn("[HlsAdPlayer] No ads available (VAST response indicates no ads)");
                 } else {
-                    console.warn("[HlsAdPlayer] No HLS media files found in VAST XML");
+                    console.warn("[HlsAdPlayer] No supported media files found in VAST XML");
                 }
                 return null;
             }
@@ -2112,7 +2124,7 @@ function createHlsAdPlayer(contentVideo, options) {
         },
         play: function play() {
             return _async_to_generator(function() {
-                var contentVolume, adVolume, mediaFile;
+                var contentVolume, adVolume, mediaFile, isHlsAd;
                 return _ts_generator(this, function(_state) {
                     if (!currentAd) {
                         console.warn("[HlsAdPlayer] Cannot play: No ad loaded (no ads available)");
@@ -2164,8 +2176,9 @@ function createHlsAdPlayer(contentVideo, options) {
                         if (!mediaFile) {
                             throw new Error("No media file available for ad");
                         }
-                        console.log("[HlsAdPlayer] Loading ad from: ".concat(mediaFile.url));
-                        if (import_hls.default.isSupported()) {
+                        isHlsAd = isHlsMediaFile(mediaFile);
+                        console.log("[HlsAdPlayer] Loading ".concat(isHlsAd ? "HLS" : "progressive", " ad from: ").concat(mediaFile.url));
+                        if (isHlsAd && import_hls.default.isSupported()) {
                             if (adHls) {
                                 adHls.destroy();
                             }
@@ -2188,14 +2201,25 @@ function createHlsAdPlayer(contentVideo, options) {
                                     handleAdError();
                                 }
                             });
-                        } else if (adVideoElement.canPlayType("application/vnd.apple.mpegurl")) {
+                        } else if (isHlsAd && adVideoElement.canPlayType("application/vnd.apple.mpegurl")) {
                             adVideoElement.src = mediaFile.url;
                             adVideoElement.play().catch(function(error) {
                                 console.error("[HlsAdPlayer] Error starting ad playback:", error);
                                 handleAdError();
                             });
+                        } else if (!isHlsAd && isProgressiveMediaFile(mediaFile)) {
+                            if (adHls) {
+                                adHls.destroy();
+                                adHls = void 0;
+                            }
+                            adVideoElement.src = mediaFile.url;
+                            adVideoElement.load();
+                            adVideoElement.play().catch(function(error) {
+                                console.error("[HlsAdPlayer] Error starting progressive ad playback:", error);
+                                handleAdError();
+                            });
                         } else {
-                            throw new Error("HLS not supported");
+                            throw new Error("Unsupported ad media file type: ".concat(mediaFile.type));
                         }
                         return [
                             2,