stormcloud-video-player 0.6.8 → 0.6.9

package/lib/player/StormcloudVideoPlayer.d.cts

@@ -1,4 +1,4 @@
-import { S as StormcloudVideoPlayerConfig } from '../types-BYwfSJb5.cjs';
+import { S as StormcloudVideoPlayerConfig } from '../types-DSKC4ySr.cjs';
 
 declare class StormcloudVideoPlayer {
     private readonly video;
@@ -21,6 +21,7 @@ declare class StormcloudVideoPlayer {
     private heartbeatInterval;
     private currentAdIndex;
     private totalAdsInBreak;
+    private lastServedAdUrl;
     private showAds;
     private isLiveStream;
     private nativeHlsMode;
@@ -58,6 +59,10 @@ declare class StormcloudVideoPlayer {
     private adRequest;
     load(): Promise<void>;
     private getAdSource;
+    private getInputStreamType;
+    private getAnalyticsContext;
+    private getAdUrlFromBids;
+    private trackAdLoaded;
     private attachAdLayerEventListeners;
     private ensureFillerVideo;
     private showPlaceholderLayer;

package/lib/players/HlsPlayer.cjs

@@ -2193,24 +2193,30 @@ function getBrowserID(clientInfo) {
         });
     })();
 }
-var TRACK_URL = "https://adstorm.co/api-adstorm-dev/adstorm/player-tracking/track";
+var PLAYER_TRACKING_BASE_URL = "https://adstorm.co/api-adstorm-dev/adstorm/player-tracking";
+var TRACK_URL = "".concat(PLAYER_TRACKING_BASE_URL, "/metrics/ingest");
+var HEARTBEAT_URL = "".concat(PLAYER_TRACKING_BASE_URL, "/heartbeat");
+var IMPRESSIONS_URL = "".concat(PLAYER_TRACKING_BASE_URL, "/impressions/ingest");
+function buildHeaders(licenseKey) {
+    var headers = {
+        "Content-Type": "application/json"
+    };
+    if (licenseKey) {
+        headers["Authorization"] = "Bearer ".concat(licenseKey);
+    }
+    return headers;
+}
 function sendTrackRequest(licenseKey, body) {
     return _async_to_generator(function() {
-        var headers, response;
+        var response;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    headers = {
-                        "Content-Type": "application/json"
-                    };
-                    if (licenseKey) {
-                        headers["Authorization"] = "Bearer ".concat(licenseKey);
-                    }
                     return [
                         4,
                         fetch(TRACK_URL, {
                             method: "POST",
-                            headers: headers,
+                            headers: buildHeaders(licenseKey),
                             body: JSON.stringify(body)
                         })
                     ];
@@ -2232,14 +2238,86 @@ function sendTrackRequest(licenseKey, body) {
         });
     })();
 }
-function sendInitialTracking(licenseKey) {
+function postJson(url, licenseKey, body) {
     return _async_to_generator(function() {
-        var clientInfo, browserId, trackingData, headers, response, error;
+        var response;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    return [
+                        4,
+                        fetch(url, {
+                            method: "POST",
+                            headers: buildHeaders(licenseKey),
+                            body: JSON.stringify(body)
+                        })
+                    ];
+                case 1:
+                    response = _state.sent();
+                    if (!response.ok) {
+                        throw new Error("HTTP error! status: ".concat(response.status));
+                    }
+                    return [
+                        4,
+                        response.json()
+                    ];
+                case 2:
+                    _state.sent();
+                    return [
+                        2
+                    ];
+            }
+        });
+    })();
+}
+function buildPlayerMetricEvent(_0) {
+    return _async_to_generator(function(licenseKey) {
+        var context, flags, _flags_captureAt, clientInfo, browserId, captureAt;
+        var _arguments = arguments;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    context = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {}, flags = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
+                    clientInfo = getClientInfo();
+                    return [
+                        4,
+                        getBrowserID(clientInfo)
+                    ];
+                case 1:
+                    browserId = _state.sent();
+                    captureAt = (_flags_captureAt = flags.captureAt) !== null && _flags_captureAt !== void 0 ? _flags_captureAt : /* @__PURE__ */ new Date().toISOString();
+                    return [
+                        2,
+                        {
+                            player_id: browserId,
+                            browserId: browserId,
+                            device_type: clientInfo.deviceType,
+                            deviceType: clientInfo.deviceType,
+                            input_stream_type: context.inputStreamType,
+                            os: clientInfo.os,
+                            ad_loaded: flags.adLoaded,
+                            ad_detect: flags.adDetect,
+                            license_key: licenseKey,
+                            capture_at: captureAt,
+                            timestamp: captureAt
+                        }
+                    ];
+            }
+        });
+    }).apply(this, arguments);
+}
+function sendInitialTracking(_0) {
+    return _async_to_generator(function(licenseKey) {
+        var context, clientInfo, browserId, trackingData, error;
+        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    context = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {};
+                    _state.label = 1;
+                case 1:
                     _state.trys.push([
-                        0,
+                        1,
                         4,
                         ,
                         5
@@ -2249,34 +2327,29 @@ function sendInitialTracking(licenseKey) {
                         4,
                         getBrowserID(clientInfo)
                     ];
-                case 1:
+                case 2:
                     browserId = _state.sent();
                     trackingData = _object_spread({
                         browserId: browserId
                     }, clientInfo);
-                    headers = {
-                        "Content-Type": "application/json"
-                    };
-                    if (licenseKey) {
-                        headers["Authorization"] = "Bearer ".concat(licenseKey);
-                    }
                     return [
                         4,
-                        fetch(TRACK_URL, {
-                            method: "POST",
-                            headers: headers,
-                            body: JSON.stringify(trackingData)
+                        sendTrackRequest(licenseKey, {
+                            events: [
+                                {
+                                    player_id: browserId,
+                                    device_type: clientInfo.deviceType,
+                                    input_stream_type: context.inputStreamType,
+                                    os: clientInfo.os,
+                                    ad_loaded: false,
+                                    ad_detect: false,
+                                    license_key: licenseKey,
+                                    capture_at: /* @__PURE__ */ new Date().toISOString()
+                                }
+                            ],
+                            trackingData: trackingData
                         })
                     ];
-                case 2:
-                    response = _state.sent();
-                    if (!response.ok) {
-                        throw new Error("HTTP error! status: ".concat(response.status));
-                    }
-                    return [
-                        4,
-                        response.json()
-                    ];
                 case 3:
                     _state.sent();
                     return [
@@ -2296,36 +2369,30 @@ function sendInitialTracking(licenseKey) {
                     ];
             }
         });
-    })();
+    }).apply(this, arguments);
 }
-function sendAdDetectTracking(licenseKey, adDetectInfo) {
-    return _async_to_generator(function() {
-        var clientInfo, browserId, trackingData, error;
+function sendAdDetectTracking(_0, _1) {
+    return _async_to_generator(function(licenseKey, adDetectInfo) {
+        var context, error;
+        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    context = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
+                    _state.label = 1;
+                case 1:
                     _state.trys.push([
-                        0,
+                        1,
                         3,
                         ,
                         4
                     ]);
-                    clientInfo = getClientInfo();
-                    return [
-                        4,
-                        getBrowserID(clientInfo)
-                    ];
-                case 1:
-                    browserId = _state.sent();
-                    trackingData = _object_spread({
-                        browserId: browserId
-                    }, clientInfo);
                     return [
                         4,
-                        sendTrackRequest(licenseKey, _object_spread_props(_object_spread({}, trackingData), {
-                            licenseKey: licenseKey,
-                            adDetectInfo: adDetectInfo
-                        }))
+                        sendHeartbeat(licenseKey, context, {
+                            adDetect: true,
+                            captureAt: adDetectInfo.timestamp
+                        })
                     ];
                 case 2:
                     _state.sent();
@@ -2346,36 +2413,30 @@ function sendAdDetectTracking(licenseKey, adDetectInfo) {
                     ];
             }
         });
-    })();
+    }).apply(this, arguments);
 }
-function sendAdLoadedTracking(licenseKey, adLoadedInfo) {
-    return _async_to_generator(function() {
-        var clientInfo, browserId, trackingData, error;
+function sendAdLoadedTracking(_0, _1) {
+    return _async_to_generator(function(licenseKey, adLoadedInfo) {
+        var context, error;
+        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    context = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
+                    _state.label = 1;
+                case 1:
                     _state.trys.push([
-                        0,
+                        1,
                         3,
                         ,
                         4
                     ]);
-                    clientInfo = getClientInfo();
-                    return [
-                        4,
-                        getBrowserID(clientInfo)
-                    ];
-                case 1:
-                    browserId = _state.sent();
-                    trackingData = _object_spread({
-                        browserId: browserId
-                    }, clientInfo);
                     return [
                         4,
-                        sendTrackRequest(licenseKey, _object_spread_props(_object_spread({}, trackingData), {
-                            licenseKey: licenseKey,
-                            adLoadedInfo: adLoadedInfo
-                        }))
+                        sendHeartbeat(licenseKey, context, {
+                            adLoaded: true,
+                            captureAt: adLoadedInfo.timestamp
+                        })
                     ];
                 case 2:
                     _state.sent();
@@ -2396,103 +2457,95 @@ function sendAdLoadedTracking(licenseKey, adLoadedInfo) {
                     ];
             }
         });
-    })();
+    }).apply(this, arguments);
 }
-function sendAdImpressionTracking(licenseKey, adImpressionInfo) {
-    return _async_to_generator(function() {
-        var clientInfo, browserId, trackingData, error;
+function sendAdImpressionTracking(_0, _1) {
+    return _async_to_generator(function(licenseKey, adImpressionInfo) {
+        var context, metricEvent, error;
+        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    context = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
+                    _state.label = 1;
+                case 1:
                     _state.trys.push([
-                        0,
-                        3,
+                        1,
+                        4,
                         ,
-                        4
+                        5
                     ]);
-                    clientInfo = getClientInfo();
                     return [
                         4,
-                        getBrowserID(clientInfo)
+                        buildPlayerMetricEvent(licenseKey, context, {
+                            captureAt: adImpressionInfo.timestamp
+                        })
                     ];
-                case 1:
-                    browserId = _state.sent();
-                    trackingData = _object_spread({
-                        browserId: browserId
-                    }, clientInfo);
+                case 2:
+                    metricEvent = _state.sent();
                     return [
                         4,
-                        sendTrackRequest(licenseKey, _object_spread_props(_object_spread({}, trackingData), {
-                            licenseKey: licenseKey,
-                            adImpressionInfo: adImpressionInfo
-                        }))
+                        Promise.all([
+                            postJson(HEARTBEAT_URL, licenseKey, metricEvent),
+                            postJson(IMPRESSIONS_URL, licenseKey, {
+                                events: [
+                                    {
+                                        player_id: metricEvent.player_id,
+                                        ad_played_count: 1,
+                                        ad_url: adImpressionInfo.adUrl,
+                                        license_key: licenseKey,
+                                        capture_at: adImpressionInfo.timestamp
+                                    }
+                                ]
+                            })
+                        ])
                     ];
-                case 2:
+                case 3:
                     _state.sent();
                     return [
                         3,
-                        4
+                        5
                     ];
-                case 3:
+                case 4:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending ad impression tracking:", error);
                     return [
                         3,
-                        4
+                        5
                     ];
-                case 4:
+                case 5:
                     return [
                         2
                     ];
             }
         });
-    })();
+    }).apply(this, arguments);
 }
-function sendHeartbeat(licenseKey) {
-    return _async_to_generator(function() {
-        var clientInfo, browserId, heartbeatData, headers, response, error;
+function sendHeartbeat(_0) {
+    return _async_to_generator(function(licenseKey) {
+        var context, flags, heartbeatData, error;
+        var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
+                    context = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {}, flags = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
+                    _state.label = 1;
+                case 1:
                     _state.trys.push([
-                        0,
+                        1,
                         4,
                         ,
                         5
                     ]);
-                    clientInfo = getClientInfo();
                     return [
                         4,
-                        getBrowserID(clientInfo)
-                    ];
-                case 1:
-                    browserId = _state.sent();
-                    heartbeatData = {
-                        browserId: browserId,
-                        timestamp: /* @__PURE__ */ new Date().toISOString()
-                    };
-                    headers = {
-                        "Content-Type": "application/json"
-                    };
-                    if (licenseKey) {
-                        headers["Authorization"] = "Bearer ".concat(licenseKey);
-                    }
-                    return [
-                        4,
-                        fetch("https://adstorm.co/api-adstorm-dev/adstorm/player-tracking/heartbeat", {
-                            method: "POST",
-                            headers: headers,
-                            body: JSON.stringify(heartbeatData)
-                        })
+                        buildPlayerMetricEvent(licenseKey, context, flags)
                     ];
                 case 2:
-                    response = _state.sent();
-                    if (!response.ok) {
-                        throw new Error("HTTP error! status: ".concat(response.status));
-                    }
+                    heartbeatData = _state.sent();
                     return [
                         4,
-                        response.json()
+                        postJson(HEARTBEAT_URL, licenseKey, heartbeatData)
                     ];
                 case 3:
                     _state.sent();
@@ -2513,7 +2566,7 @@ function sendHeartbeat(licenseKey) {
                     ];
             }
         });
-    })();
+    }).apply(this, arguments);
 }
 // src/utils/polyfills.ts
 function polyfillURLSearchParams() {
@@ -3528,17 +3581,62 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return "vast";
             }
         },
+        {
+            key: "getInputStreamType",
+            value: function getInputStreamType() {
+                var src = this.config.src.toLowerCase();
+                if (src.includes(".m3u8")) return "hls";
+                if (src.includes(".mpd")) return "dash";
+                if (src.includes(".mp4")) return "mp4";
+                return this.isLiveStream ? "live" : "vod";
+            }
+        },
+        {
+            key: "getAnalyticsContext",
+            value: function getAnalyticsContext() {
+                return {
+                    inputStreamType: this.getInputStreamType()
+                };
+            }
+        },
+        {
+            key: "getAdUrlFromBids",
+            value: function getAdUrlFromBids(bids) {
+                var _bids_;
+                return bids === null || bids === void 0 ? void 0 : (_bids_ = bids[0]) === null || _bids_ === void 0 ? void 0 : _bids_.vastUrl;
+            }
+        },
+        {
+            key: "trackAdLoaded",
+            value: function trackAdLoaded(bids) {
+                if (!this.config.licenseKey) return;
+                var adUrl = this.getAdUrlFromBids(bids);
+                if (adUrl) {
+                    this.lastServedAdUrl = adUrl;
+                }
+                sendAdLoadedTracking(this.config.licenseKey, _object_spread_props(_object_spread({
+                    source: this.getAdSource()
+                }, adUrl ? {
+                    vastUrl: adUrl
+                } : {}), {
+                    timestamp: /* @__PURE__ */ new Date().toISOString()
+                }), this.getAnalyticsContext());
+            }
+        },
         {
             key: "attachAdLayerEventListeners",
             value: function attachAdLayerEventListeners() {
                 var _this = this;
                 this.adLayer.on("ad_impression", function() {
                     if (_this.config.licenseKey) {
-                        sendAdImpressionTracking(_this.config.licenseKey, {
+                        sendAdImpressionTracking(_this.config.licenseKey, _object_spread_props(_object_spread({
                             source: _this.getAdSource(),
-                            adIndex: _this.currentAdIndex,
+                            adIndex: _this.currentAdIndex
+                        }, _this.lastServedAdUrl ? {
+                            adUrl: _this.lastServedAdUrl
+                        } : {}), {
                             timestamp: /* @__PURE__ */ new Date().toISOString()
-                        });
+                        }), _this.getAnalyticsContext());
                     }
                 });
                 this.adLayer.on("ad_error", function(errorPayload) {
@@ -3632,6 +3730,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _this.isInAdTransition = false;
                                 if (!_this.inAdBreak) return;
                                 _this.currentAdIndex++;
+                                _this.trackAdLoaded();
                                 _this.adLayer.playPreloaded(token).catch(function(err) {
                                     if (_this.config.debugAdTiming) console.warn("[StormcloudVideoPlayer] playPreloaded failed:", err);
                                     _this.handleAdFailure();
@@ -3661,6 +3760,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 var freshBids = (_this_pendingNextAdBids = _this.pendingNextAdBids) !== null && _this_pendingNextAdBids !== void 0 ? _this_pendingNextAdBids : bids;
                                 _this.pendingNextAdBids = null;
                                 _this.currentAdIndex++;
+                                _this.trackAdLoaded(freshBids);
                                 _this.adLayer.playAd(freshBids).catch(function(err) {
                                     if (_this.config.debugAdTiming) console.warn("[StormcloudVideoPlayer] playAd(pending) failed:", err);
                                     _this.handleAdFailure();
@@ -4040,7 +4140,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         }, ((_this_pendingAdBreak1 = this.pendingAdBreak) === null || _this_pendingAdBreak1 === void 0 ? void 0 : _this_pendingAdBreak1.detectedAtFragmentSn) != null && {
                             detectedAtFragmentSn: this.pendingAdBreak.detectedAtFragmentSn
                         });
-                        sendAdDetectTracking(this.config.licenseKey, adDetectInfo);
+                        sendAdDetectTracking(this.config.licenseKey, adDetectInfo, this.getAnalyticsContext());
                     }
                     var isManifestMarker = this.isManifestBasedMarker(marker);
                     var forceImmediate = (_this_config_immediateManifestAds = this.config.immediateManifestAds) !== null && _this_config_immediateManifestAds !== void 0 ? _this_config_immediateManifestAds : true;
@@ -4109,6 +4209,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         var bids = this.pendingNextAdBids;
                         this.pendingNextAdBids = null;
                         this.currentAdIndex++;
+                        this.trackAdLoaded(bids);
                         this.adLayer.playAd(bids).catch(function() {
                             return _this.handleAdFailure();
                         });
@@ -4363,7 +4464,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "initializeTracking",
             value: function initializeTracking() {
                 var _this = this;
-                sendInitialTracking(this.config.licenseKey).then(function() {
+                sendInitialTracking(this.config.licenseKey, this.getAnalyticsContext()).then(function() {
                     _this.heartbeatInterval = window.setInterval(function() {
                         _this.sendHeartbeatIfNeeded();
                     }, 5e3);
@@ -4384,7 +4485,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 var now = Date.now();
                 if (!this.lastHeartbeatTime || now - this.lastHeartbeatTime > 3e4) {
                     this.lastHeartbeatTime = now;
-                    sendHeartbeat(this.config.licenseKey).catch(function(error) {
+                    sendHeartbeat(this.config.licenseKey, this.getAnalyticsContext()).catch(function(error) {
                         if (_this.config.debugAdTiming) {
                             console.warn("[StormcloudVideoPlayer] Failed to send heartbeat:", error);
                         }
@@ -4777,12 +4878,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                     10
                                                 ];
                                                 _this.currentAdIndex++;
-                                                if (_this.config.licenseKey) {
-                                                    sendAdLoadedTracking(_this.config.licenseKey, {
-                                                        source: _this.getAdSource(),
-                                                        timestamp: /* @__PURE__ */ new Date().toISOString()
-                                                    });
-                                                }
+                                                _this.trackAdLoaded(bids1);
                                                 return [
                                                     4,
                                                     _this.adLayer.playAd(bids1)
@@ -4887,12 +4983,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                 ];
                                             case 18:
                                                 _this.currentAdIndex++;
-                                                if (_this.config.licenseKey) {
-                                                    sendAdLoadedTracking(_this.config.licenseKey, {
-                                                        source: _this.getAdSource(),
-                                                        timestamp: /* @__PURE__ */ new Date().toISOString()
-                                                    });
-                                                }
+                                                _this.trackAdLoaded(bids2);
                                                 return [
                                                     4,
                                                     _this.adLayer.playAd(bids2)
@@ -5051,12 +5142,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     6
                                 ];
                                 this.currentAdIndex++;
-                                if (this.config.licenseKey) {
-                                    sendAdLoadedTracking(this.config.licenseKey, {
-                                        source: this.getAdSource(),
-                                        timestamp: /* @__PURE__ */ new Date().toISOString()
-                                    });
-                                }
+                                this.trackAdLoaded();
                                 _state.label = 1;
                             case 1:
                                 _state.trys.push([
@@ -5250,12 +5336,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     5
                                 ];
                             case 3:
-                                if (this.config.licenseKey) {
-                                    sendAdLoadedTracking(this.config.licenseKey, {
-                                        source: this.getAdSource(),
-                                        timestamp: /* @__PURE__ */ new Date().toISOString()
-                                    });
-                                }
+                                this.trackAdLoaded(bids);
                                 return [
                                     4,
                                     this.adLayer.playAd(bids)
@@ -5401,6 +5482,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     ,
                                     7
                                 ]);
+                                this.trackAdLoaded(bids);
                                 return [
                                     4,
                                     this.adLayer.playAd(bids)