stormcloud-video-player 0.7.23 → 0.7.25

package/lib/ui/StormcloudVideoPlayer.cjs

@@ -570,7 +570,7 @@ function isSupportedFormat(url, mimeType) {
     return false;
 }
 function createAdStormPlayer(contentVideo, options) {
-    var licenseKey = options.licenseKey, _options_debug = options.debug, debug = _options_debug === void 0 ? false : _options_debug;
+    var licenseKey = options.licenseKey, _options_debug = options.debug, debug = _options_debug === void 0 ? false : _options_debug, channelId = options.channelId;
     var adPlaying = false;
     var originalMutedState = false;
     var originalVolume = Math.max(0, Math.min(1, contentVideo.volume || 1));
@@ -776,8 +776,13 @@ function createAdStormPlayer(contentVideo, options) {
         adVideoElement.load();
     }
     function buildVastUrl(durationSeconds) {
-        var baseUrl = "https://adstorm.co/api-adstorm-dev/adstorm/nab/vast/pod";
-        return "".concat(baseUrl, "?duration=").concat(Math.ceil(durationSeconds));
+        var baseUrl = "https://adstorm.co/api/adstorm/nab/vast/pod";
+        var params = new URLSearchParams();
+        if (channelId != null) {
+            params.set("channel_id", String(channelId));
+        }
+        params.set("duration", String(Math.ceil(durationSeconds)));
+        return "".concat(baseUrl, "?").concat(params.toString());
     }
     function parseVastXml(xmlString) {
         var ads = [];
@@ -2775,10 +2780,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         logBrowserInfo(config.debugAdTiming);
         var browserForAdLayer = detectBrowser();
         var isSinglePipeline = browserForAdLayer.isSmartTV || !!this.config.singlePipelineMode;
-        this.adLayer = createAdStormPlayer(this.video, {
+        this.adLayer = createAdStormPlayer(this.video, _object_spread({
             licenseKey: this.config.licenseKey || "",
             debug: !!config.debugAdTiming
-        });
+        }, this.config.channelId != null && {
+            channelId: this.config.channelId
+        }));
         this.adLayer.updateOptions({
             continueLiveStreamDuringAds: !isSinglePipeline && this.shouldContinueLiveStreamDuringAds()
         });
@@ -3030,31 +3037,34 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 this.hls.on(import_hls.default.Events.FRAG_CHANGED, function(_evt, data) {
                                     var frag = data === null || data === void 0 ? void 0 : data.frag;
                                     if (!frag) return;
-                                    if (_this.lastAdInsertionPoint && !_this.inAdBreak && !_this.pendingAdBreak && _this.lastAdInsertionPoint.updated_at !== _this.processedAdInsertionUpdatedAt) {
+                                    if (_this.lastAdInsertionPoint && !_this.inAdBreak && _this.lastAdInsertionPoint.updated_at !== _this.processedAdInsertionUpdatedAt) {
                                         var segmentName = _this.lastAdInsertionPoint.segment_ts_name;
                                         if (_this.fragmentMatchesSegment(frag, segmentName)) {
-                                            var _ref;
+                                            var _ref, _ref1;
+                                            var _this_pendingAdBreak;
                                             _this.processedAdInsertionUpdatedAt = _this.lastAdInsertionPoint.updated_at;
                                             var offsetMs = (_this.lastAdInsertionPoint.offset_seconds || 0) * 1e3;
+                                            var durationSeconds = (_ref = (_this_pendingAdBreak = _this.pendingAdBreak) === null || _this_pendingAdBreak === void 0 ? void 0 : _this_pendingAdBreak.durationSeconds) !== null && _ref !== void 0 ? _ref : 60;
+                                            var withPrefetch = _this.pendingAdBreak != null;
                                             _this.pushAdInsertionDebug("segment_playing", segmentName, {
                                                 offsetSeconds: _this.lastAdInsertionPoint.offset_seconds,
-                                                detail: "sn=".concat((_ref = frag === null || frag === void 0 ? void 0 : frag.sn) !== null && _ref !== void 0 ? _ref : "?")
+                                                detail: "sn=".concat((_ref1 = frag === null || frag === void 0 ? void 0 : frag.sn) !== null && _ref1 !== void 0 ? _ref1 : "?").concat(withPrefetch ? " (prefetch active)" : "")
                                             });
                                             if (_this.config.debugAdTiming) {
-                                                console.log('[StormcloudVideoPlayer] Ad insertion segment "'.concat(segmentName, '" now playing — scheduling ad start in ').concat(offsetMs, "ms"));
+                                                console.log('[StormcloudVideoPlayer] Ad insertion segment "'.concat(segmentName, '" now playing — scheduling ad start in ').concat(offsetMs, "ms") + (withPrefetch ? " (prefetch was active, preloaded tokens will be used)" : ""));
                                             }
                                             _this.pushAdInsertionDebug("ad_scheduled", segmentName, {
                                                 offsetSeconds: _this.lastAdInsertionPoint.offset_seconds,
-                                                detail: "in ".concat(offsetMs, "ms, dur=60s")
+                                                detail: "in ".concat(offsetMs, "ms, dur=").concat(durationSeconds, "s").concat(withPrefetch ? " (with prefetch)" : "")
                                             });
                                             _this.clearAdInsertionOffsetTimer();
                                             _this.adInsertionOffsetTimerId = window.setTimeout(function() {
                                                 _this.adInsertionOffsetTimerId = void 0;
                                                 if (_this.inAdBreak) return;
                                                 _this.pushAdInsertionDebug("ad_triggered", segmentName, {
-                                                    detail: "ad break started (60s)"
+                                                    detail: "ad break started (".concat(durationSeconds, "s").concat(withPrefetch ? ", with prefetch" : "", ")")
                                                 });
-                                                void _this.handleAdStart(60);
+                                                void _this.handleAdStart(durationSeconds);
                                             }, offsetMs);
                                         }
                                     }
@@ -3922,7 +3932,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     this.pushAdInsertionDebug("api_response", data.segment_ts_name, {
                                         offsetSeconds: data.offset_seconds,
                                         updatedAt: data.updated_at,
-                                        detail: "ch=".concat(data.channel_id, " id=").concat(data.id)
+                                        detail: "ch=".concat(data.channel_id)
                                     });
                                     if (segmentChanged && (this.pendingAdBreak || this.adInsertionOffsetTimerId != null)) {
                                         this.clearAdInsertionOffsetTimer();
@@ -7566,8 +7576,10 @@ var StormcloudVideoPlayerComponent = import_react2.default.memo(function(props)
         if (minSegmentsBeforePlay !== void 0) cfg.minSegmentsBeforePlay = minSegmentsBeforePlay;
         if (disableAds !== void 0) cfg.disableAds = disableAds;
         cfg.disableFiller = disableFiller !== null && disableFiller !== void 0 ? disableFiller : true;
-        if (adcisionChannelId !== void 0) cfg.projectId = String(adcisionChannelId);
-        else if (swirlProjectId !== void 0) cfg.projectId = String(swirlProjectId);
+        if (adcisionChannelId !== void 0) {
+            cfg.projectId = String(adcisionChannelId);
+            cfg.channelId = adcisionChannelId;
+        } else if (swirlProjectId !== void 0) cfg.projectId = String(swirlProjectId);
         var player = new StormcloudVideoPlayer(cfg);
         playerRef.current = player;
         player.load().then(function() {