stormcloud-video-player 0.8.56 → 0.8.57

package/lib/players/index.cjs

@@ -2501,163 +2501,83 @@ function createPalNonceManager() {
         }
     };
 }
-// src/utils/mqttConfig.ts
-var DEFAULT_MQTT_CONFIG = {
+// src/utils/trackingIngest.ts
+var DEFAULT_TRACKING_INGEST_CONFIG = {
     enabled: true,
-    brokerAddress: "vecbae77.ala.us-east-1.emqxsl.com",
-    brokerPort: 8883,
-    wsPort: 8084,
-    username: "for-sonifi",
-    password: "sonifi-mqtt",
-    topicPrefix: "adstorm/players",
-    qos: 1
+    baseUrl: "https://player-analytics-ingest-api-760490581852.us-central1.run.app/api/adstorm/player-tracking"
 };
-var mqttConfig = _object_spread({}, DEFAULT_MQTT_CONFIG);
-function applyMQTTConfig(overrides) {
-    Object.assign(mqttConfig, overrides);
-}
-function isMQTTEnabled() {
-    return mqttConfig.enabled;
-}
-function buildMQTTBrokerUrl() {
-    if (mqttConfig.brokerUrl) return mqttConfig.brokerUrl;
-    return "wss://".concat(mqttConfig.brokerAddress, ":").concat(mqttConfig.wsPort, "/mqtt");
-}
-function buildPlayerTopic(licenseKey, channel) {
-    return "".concat(mqttConfig.topicPrefix, "/").concat(licenseKey, "/").concat(channel);
-}
-// src/utils/mqttClient.ts
-var import_mqtt = __toESM(require("mqtt"), 1);
-var LOG = "[StormcloudVideoPlayer][MQTT]";
-var KEEPALIVE_SECONDS = 30;
-var CONNECT_TIMEOUT_MS = 1e4;
-var RECONNECT_BASE_MS = 5e3;
-var RECONNECT_MAX_MS = 6e4;
-var MAX_RECONNECT_ATTEMPTS = 8;
-var COOLDOWN_MS = 10 * 6e4;
-var client = null;
-var status = "disconnected";
-var reconnectAttempts = 0;
-var reconnectTimer = null;
-var stopped = false;
-function clearReconnectTimer() {
-    if (reconnectTimer) {
-        clearTimeout(reconnectTimer);
-        reconnectTimer = null;
-    }
-}
-function teardownClient() {
-    if (client) {
-        try {
-            client.removeAllListeners();
-            client.end(true);
-        } catch (unused) {}
-        client = null;
-    }
-}
-function scheduleReconnect() {
-    if (stopped || !isMQTTEnabled() || reconnectTimer) return;
-    if (reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
-        console.warn("".concat(LOG, " giving up after ").concat(reconnectAttempts, " attempts; cooling down for ").concat(COOLDOWN_MS / 6e4, "m"));
-        teardownClient();
-        status = "disconnected";
-        reconnectTimer = setTimeout(function() {
-            reconnectTimer = null;
-            reconnectAttempts = 0;
-            openConnection();
-        }, COOLDOWN_MS);
-        return;
-    }
-    var delay = Math.min(RECONNECT_MAX_MS, RECONNECT_BASE_MS * Math.pow(2, reconnectAttempts));
-    var jitter = Math.floor(Math.random() * 1e3);
-    reconnectAttempts += 1;
-    reconnectTimer = setTimeout(function() {
-        reconnectTimer = null;
-        openConnection();
-    }, delay + jitter);
-}
-function openConnection() {
-    if (stopped || !isMQTTEnabled()) return;
-    teardownClient();
-    var url = buildMQTTBrokerUrl();
-    status = "connecting";
-    var clientId = "stormcloud-vp-".concat(Math.random().toString(36).slice(2, 9));
-    try {
-        client = import_mqtt.default.connect(url, {
-            clientId: clientId,
-            username: mqttConfig.username,
-            password: mqttConfig.password,
-            keepalive: KEEPALIVE_SECONDS,
-            clean: true,
-            // Disable MQTT.js internal reconnect; we manage reconnection ourselves.
-            reconnectPeriod: 0,
-            connectTimeout: CONNECT_TIMEOUT_MS,
-            queueQoSZero: false,
-            reschedulePings: true,
-            // Root-cause fix for the Tizen 4.0 "Keepalive timeout" loop: MQTT.js's
-            // default timerVariant "auto" runs the keepalive interval inside a
-            // Blob-URL Web Worker (via worker-timers). On Samsung Tizen 4.0 (old
-            // WebKit) served from a file:// origin that worker can't tick reliably,
-            // so the keepalive counter trips onKeepaliveTimeout almost immediately
-            // after connect. Force the native setInterval timer instead; the main
-            // thread is free because video is decoded by the native AVPlay pipeline.
-            timerVariant: "native"
-        });
-    } catch (err) {
-        status = "error";
-        console.warn("".concat(LOG, " connect() threw:"), err);
-        scheduleReconnect();
-        return;
-    }
-    client.on("connect", function() {
-        status = "connected";
-        reconnectAttempts = 0;
-        clearReconnectTimer();
-        console.info("".concat(LOG, " connected to ").concat(url));
-    });
-    client.on("offline", function() {
-        if (status === "connected") status = "disconnected";
-        console.warn("".concat(LOG, " offline"));
-        scheduleReconnect();
-    });
-    client.on("error", function(err) {
-        status = "error";
-        console.warn("".concat(LOG, " error:"), err.message);
-        scheduleReconnect();
-    });
-    client.on("close", function() {
-        if (status === "connected") status = "disconnected";
-        scheduleReconnect();
-    });
+var trackingIngestConfig = _object_spread({}, DEFAULT_TRACKING_INGEST_CONFIG);
+function isTrackingIngestEnabled() {
+    return trackingIngestConfig.enabled === true;
 }
-function initMQTTClient() {
-    if (client || !isMQTTEnabled()) return;
-    stopped = false;
-    reconnectAttempts = 0;
-    openConnection();
+function normalizeIngestBaseUrl(baseUrl) {
+    return baseUrl.replace(/\/+$/, "");
 }
-function ensureMQTTClient() {
-    if (isMQTTEnabled() && !client && !reconnectTimer) {
-        initMQTTClient();
+function buildTrackingIngestUrl(channel) {
+    var base = normalizeIngestBaseUrl(trackingIngestConfig.baseUrl);
+    if (channel === "impressions") {
+        return "".concat(base, "/impressions/ingest");
     }
+    return "".concat(base, "/metrics/ingest");
 }
-function publishMQTT(topic, payload) {
-    if (!isMQTTEnabled()) {
-        return false;
-    }
-    ensureMQTTClient();
-    if (!client || !client.connected) {
-        return false;
-    }
-    try {
-        client.publish(topic, JSON.stringify(payload), {
-            qos: mqttConfig.qos
+function ingestPlayerTracking(licenseKey, channel, body) {
+    return _async_to_generator(function() {
+        var response, error;
+        return _ts_generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    if (!isTrackingIngestEnabled() || !licenseKey) {
+                        return [
+                            2,
+                            false
+                        ];
+                    }
+                    _state.label = 1;
+                case 1:
+                    _state.trys.push([
+                        1,
+                        3,
+                        ,
+                        4
+                    ]);
+                    return [
+                        4,
+                        fetch(buildTrackingIngestUrl(channel), {
+                            method: "POST",
+                            headers: {
+                                "Content-Type": "application/json",
+                                Authorization: "License-Key ".concat(licenseKey)
+                            },
+                            body: JSON.stringify(body)
+                        })
+                    ];
+                case 2:
+                    response = _state.sent();
+                    if (!response.ok) {
+                        console.warn("[StormcloudVideoPlayer] Tracking ingest failed (".concat(response.status, ") for ").concat(channel));
+                        return [
+                            2,
+                            false
+                        ];
+                    }
+                    return [
+                        2,
+                        true
+                    ];
+                case 3:
+                    error = _state.sent();
+                    console.warn("[StormcloudVideoPlayer] Tracking ingest error for ".concat(channel, ":"), error);
+                    return [
+                        2,
+                        false
+                    ];
+                case 4:
+                    return [
+                        2
+                    ];
+            }
         });
-        return true;
-    } catch (err) {
-        console.warn("".concat(LOG, " publish failed on ").concat(topic, ":"), err);
-        return false;
-    }
+    })();
 }
 // src/utils/vastEnvironmentSignals.ts
 var AIRY_ANDROID_APP_ID = "com.freeairytv.android";
@@ -3428,7 +3348,7 @@ function getBrowserID(clientInfo) {
     })();
 }
 function canPublish(licenseKey) {
-    return Boolean(isMQTTEnabled() && licenseKey);
+    return Boolean(isTrackingIngestEnabled() && licenseKey);
 }
 function buildPlayerMetricEvent() {
     return _async_to_generator(function() {
@@ -3470,10 +3390,6 @@ function buildPlayerMetricEvent() {
         });
     }).apply(this, arguments);
 }
-function publishTracking(licenseKey, channel, body) {
-    ensureMQTTClient();
-    publishMQTT(buildPlayerTopic(licenseKey, channel), body);
-}
 function sendInitialTracking(_0) {
     return _async_to_generator(function(licenseKey) {
         var context, metricEvent, error;
@@ -3489,9 +3405,9 @@ function sendInitialTracking(_0) {
                 case 1:
                     _state.trys.push([
                         1,
-                        3,
+                        4,
                         ,
-                        4
+                        5
                     ]);
                     return [
                         4,
@@ -3502,23 +3418,28 @@ function sendInitialTracking(_0) {
                     ];
                 case 2:
                     metricEvent = _state.sent();
-                    publishTracking(licenseKey, "metrics", {
-                        events: [
-                            metricEvent
-                        ]
-                    });
                     return [
-                        3,
-                        4
+                        4,
+                        ingestPlayerTracking(licenseKey, "metrics", {
+                            events: [
+                                metricEvent
+                            ]
+                        })
                     ];
                 case 3:
+                    _state.sent();
+                    return [
+                        3,
+                        5
+                    ];
+                case 4:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending initial tracking data:", error);
                     return [
                         3,
-                        4
+                        5
                     ];
-                case 4:
+                case 5:
                     return [
                         2
                     ];
@@ -3629,9 +3550,9 @@ function sendAdImpressionTracking(_0, _1) {
                 case 1:
                     _state.trys.push([
                         1,
-                        3,
+                        5,
                         ,
-                        4
+                        6
                     ]);
                     return [
                         4,
@@ -3641,29 +3562,43 @@ function sendAdImpressionTracking(_0, _1) {
                     ];
                 case 2:
                     metricEvent = _state.sent();
-                    publishTracking(licenseKey, "heartbeat", metricEvent);
-                    publishTracking(licenseKey, "impressions", {
-                        events: [
-                            {
-                                player_id: metricEvent.player_id,
-                                ad_played_count: 1,
-                                ad_url: adImpressionInfo.adUrl,
-                                capture_at: adImpressionInfo.timestamp
-                            }
-                        ]
-                    });
                     return [
-                        3,
-                        4
+                        4,
+                        ingestPlayerTracking(licenseKey, "metrics", {
+                            events: [
+                                metricEvent
+                            ]
+                        })
                     ];
                 case 3:
+                    _state.sent();
+                    return [
+                        4,
+                        ingestPlayerTracking(licenseKey, "impressions", {
+                            events: [
+                                {
+                                    player_id: metricEvent.player_id,
+                                    ad_played_count: 1,
+                                    ad_url: adImpressionInfo.adUrl,
+                                    capture_at: adImpressionInfo.timestamp
+                                }
+                            ]
+                        })
+                    ];
+                case 4:
+                    _state.sent();
+                    return [
+                        3,
+                        6
+                    ];
+                case 5:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending ad impression tracking:", error);
                     return [
                         3,
-                        4
+                        6
                     ];
-                case 4:
+                case 6:
                     return [
                         2
                     ];
@@ -3686,9 +3621,9 @@ function sendHeartbeat(_0) {
                 case 1:
                     _state.trys.push([
                         1,
-                        3,
+                        4,
                         ,
-                        4
+                        5
                     ]);
                     return [
                         4,
@@ -3696,19 +3631,28 @@ function sendHeartbeat(_0) {
                     ];
                 case 2:
                     heartbeatData = _state.sent();
-                    publishTracking(licenseKey, "heartbeat", heartbeatData);
                     return [
-                        3,
-                        4
+                        4,
+                        ingestPlayerTracking(licenseKey, "metrics", {
+                            events: [
+                                heartbeatData
+                            ]
+                        })
                     ];
                 case 3:
+                    _state.sent();
+                    return [
+                        3,
+                        5
+                    ];
+                case 4:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending heartbeat:", error);
                     return [
                         3,
-                        4
+                        5
                     ];
-                case 4:
+                case 5:
                     return [
                         2
                     ];
@@ -5582,7 +5526,6 @@ var AdConfigManager = /*#__PURE__*/ function() {
                                 ];
                             case 4:
                                 data = _state.sent();
-                                this.applyMqttConfigFromResponse(data);
                                 imaPayload = (_data_response = data.response) === null || _data_response === void 0 ? void 0 : (_data_response_ima = _data_response.ima) === null || _data_response_ima === void 0 ? void 0 : (_data_response_ima_publisherdeskima = _data_response_ima["publisherdesk.ima"]) === null || _data_response_ima_publisherdeskima === void 0 ? void 0 : _data_response_ima_publisherdeskima.payload;
                                 if (imaPayload) {
                                     decodedPayload = imaPayload;
@@ -5616,20 +5559,6 @@ var AdConfigManager = /*#__PURE__*/ function() {
                 }).call(this);
             }
         },
-        {
-            key: "applyMqttConfigFromResponse",
-            value: function applyMqttConfigFromResponse(data) {
-                var _data_response;
-                var mqttConfig2 = (_data_response = data.response) === null || _data_response === void 0 ? void 0 : _data_response.mqtt_config;
-                if (!mqttConfig2 || (typeof mqttConfig2 === "undefined" ? "undefined" : _type_of(mqttConfig2)) !== "object") {
-                    return;
-                }
-                applyMQTTConfig(mqttConfig2);
-                if (this.debug) {
-                    console.log("[StormcloudVideoPlayer] Applied MQTT config from /ads/web:", mqttConfig2);
-                }
-            }
-        },
         {
             key: "fetchAndParseVmap",
             value: function fetchAndParseVmap(vmapUrl) {