stormcloud-video-player 0.8.28 → 0.8.30

package/lib/player/AdBreakOrchestrator.d.cts

@@ -1,6 +1,5 @@
-import { S as Scte35Marker, a as StormcloudVideoPlayerConfig, A as AdController } from '../types-Xgz2_W1C.cjs';
+import { S as Scte35Marker, a as StormcloudVideoPlayerConfig, A as AdController } from '../types-CSHvCbhZ.cjs';
 import { AdTimingService } from './AdTimingService.cjs';
-import { AdPreloadPool } from './AdPreloadPool.cjs';
 import { AdConfigManager } from './AdConfigManager.cjs';
 import { Scte35CueManager } from './Scte35CueManager.cjs';
 import { PlaceholderLayer } from './PlaceholderLayer.cjs';
@@ -16,7 +15,6 @@ interface AdBreakOrchestratorHost {
     createAdPlayer(continueLiveStreamDuringAds: boolean): AdController;
     shouldContinueLiveStreamDuringAds(): boolean;
     getLiveSyncPosition(): number | undefined;
-    generateVastUrls(baseUrl: string, count: number): string[];
     generatePodVastUrl(baseUrl: string, breakDurationMs?: number): string;
 }
 declare class AdBreakOrchestrator {
@@ -39,20 +37,24 @@ declare class AdBreakOrchestrator {
     prefetchTimerId: number | undefined;
     private readonly host;
     private readonly timing;
-    private readonly preloadPool;
     private readonly adConfig;
     private readonly cueManager;
     private readonly placeholder;
-    constructor(host: AdBreakOrchestratorHost, timing: AdTimingService, preloadPool: AdPreloadPool, adConfig: AdConfigManager, cueManager: Scte35CueManager, placeholder: PlaceholderLayer);
+    constructor(host: AdBreakOrchestratorHost, timing: AdTimingService, adConfig: AdConfigManager, cueManager: Scte35CueManager, placeholder: PlaceholderLayer);
     private get debug();
     private get analyticsContext();
-    private get optimizedPodsEnabled();
+    /**
+     * Produces the next pod ad-request URL for the current break. Every request
+     * (initial and continuous-fetch top-up) carries pod macros (pmad/pmnd/pmxd,
+     * no ppos); pmxd tracks the remaining break time so top-up pods only ask for
+     * what still fits.
+     */
+    private nextAdRequestUrl;
     attachImaEventListeners(): void;
     recreateAdController(): void;
     clearPendingAdBreak(): void;
     handleAdStart(_marker: Scte35Marker): Promise<void>;
     private startOptimizedPod;
-    private swapToPreloadedAdPlayer;
     private startContinuousFetching;
     private continuousFetchLoop;
     stopContinuousFetching(): void;

package/lib/player/AdConfigManager.cjs

@@ -1155,21 +1155,16 @@ function applyVastMacros(baseUrl, ctx) {
     if (ctx.pod != null) {
         params.set("pod", String(ctx.pod));
     }
-    var optimizedPodMode = ctx.podMaxAds != null || ctx.podMinDurationMs != null || ctx.podMaxDurationMs != null;
-    if (optimizedPodMode) {
-        params.delete("ppos");
-        params.delete("lip");
-        if (ctx.podMinDurationMs != null) {
-            params.set("pmnd", String(Math.max(0, Math.round(ctx.podMinDurationMs))));
-        }
-        if (ctx.podMaxDurationMs != null) {
-            params.set("pmxd", String(Math.max(0, Math.round(ctx.podMaxDurationMs))));
-        }
-        if (ctx.podMaxAds != null) {
-            params.set("pmad", String(Math.max(1, Math.round(ctx.podMaxAds))));
-        }
-    } else if (ctx.adPosition != null) {
-        params.set("ppos", String(ctx.adPosition));
+    params.delete("ppos");
+    params.delete("lip");
+    if (ctx.podMinDurationMs != null) {
+        params.set("pmnd", String(Math.max(0, Math.round(ctx.podMinDurationMs))));
+    }
+    if (ctx.podMaxDurationMs != null) {
+        params.set("pmxd", String(Math.max(0, Math.round(ctx.podMaxDurationMs))));
+    }
+    if (ctx.podMaxAds != null) {
+        params.set("pmad", String(Math.max(1, Math.round(ctx.podMaxAds))));
     }
     var requestUrl = ctx.contentUrl || ctx.pageUrl;
     if (requestUrl) {
@@ -1771,9 +1766,9 @@ var AdConfigManager = /*#__PURE__*/ function() {
         this.consentSignals = {};
         this.podCounter = 0;
         this.podAssignedByPrefetch = false;
-        this.adRequestPositionInBreak = 0;
         this.lastHeartbeatTime = 0;
         this.defaultPodMaxAds = 6;
+        this.defaultPodMaxDurationMs = 12e4;
         this.config = config;
         this.video = video;
     }
@@ -2191,48 +2186,12 @@ var AdConfigManager = /*#__PURE__*/ function() {
             key: "beginNewAdPod",
             value: function beginNewAdPod() {
                 this.podCounter++;
-                this.adRequestPositionInBreak = 0;
-            }
-        },
-        {
-            key: "generateVastUrlsWithCorrelators",
-            value: function generateVastUrlsWithCorrelators(baseUrl, count, adPlayer, palNonce, inAdBreak) {
-                var urls = [];
-                for(var i = 0; i < count; i++){
-                    this.adRequestPositionInBreak++;
-                    var adWillPlayMuted = inAdBreak ? adPlayer.getOriginalMutedState() : this.video.muted;
-                    var envSignals = resolveVastEnvironmentSignals(!!this.config.ctvAdRequest);
-                    var urlWithMacros = applyVastMacros(baseUrl, {
-                        correlator: this.viewCorrelator,
-                        streamCorrelator: this.streamCorrelator,
-                        pod: this.podCounter > 0 ? this.podCounter : void 0,
-                        adPosition: this.adRequestPositionInBreak,
-                        isCtv: envSignals.isCtv,
-                        contentUrl: envSignals.contentUrl,
-                        pageUrl: !envSignals.isCtv && typeof window !== "undefined" ? window.location.href : void 0,
-                        adWillPlayMuted: adWillPlayMuted,
-                        adWillAutoPlay: !!this.config.autoplay,
-                        appId: envSignals.appId,
-                        appName: envSignals.appName,
-                        sessionId: envSignals.sessionId,
-                        deviceId: envSignals.deviceId,
-                        deviceIdType: envSignals.deviceIdType,
-                        limitAdTracking: envSignals.limitAdTracking,
-                        deviceTypeHint: envSignals.deviceTypeHint,
-                        adTest: this.config.adTest,
-                        consent: this.consentSignals
-                    });
-                    var finalUrl = palNonce.injectNonce(urlWithMacros);
-                    console.log("[StormcloudVideoPlayer] Resolved ad request URL (pod=".concat(this.podCounter, ", pos=").concat(this.adRequestPositionInBreak, "):"), finalUrl);
-                    urls.push(finalUrl);
-                }
-                return urls;
             }
         },
         {
             key: "resolvePodParams",
             value: function resolvePodParams(breakDurationMs) {
-                var maxDurationMs = breakDurationMs != null && breakDurationMs > 0 ? breakDurationMs : this.config.podMaxDurationMs;
+                var maxDurationMs = breakDurationMs != null && breakDurationMs > 0 ? breakDurationMs : this.config.podMaxDurationMs != null && this.config.podMaxDurationMs > 0 ? this.config.podMaxDurationMs : this.defaultPodMaxDurationMs;
                 var maxAds = this.config.podMaxAds && this.config.podMaxAds > 0 ? this.config.podMaxAds : this.apiNumberAds && this.apiNumberAds > 0 ? this.apiNumberAds : this.defaultPodMaxAds;
                 var minDurationMs = this.config.podExactDuration && maxDurationMs != null ? maxDurationMs : 0;
                 return {