stormcloud-video-player 0.6.12 → 0.6.13

package/lib/player/StormcloudVideoPlayer.d.cts

@@ -1,4 +1,4 @@
-import { S as StormcloudVideoPlayerConfig } from '../types-FjAlGhAL.cjs';
+import { S as StormcloudVideoPlayerConfig } from '../types-DSKC4ySr.cjs';
 
 declare class StormcloudVideoPlayer {
     private readonly video;

package/lib/players/HlsPlayer.cjs

@@ -2060,24 +2060,43 @@ function createVastAdLayer(contentVideo, options) {
         }
     };
 }
+// src/utils/mqttConfig.ts
+var DEFAULT_MQTT_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
+};
+var mqttConfig = _object_spread({}, DEFAULT_MQTT_CONFIG);
+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 LOG2 = "[StormcloudVideoPlayer][MQTT]";
 var client = null;
 var status = "disconnected";
-var brokerUrl = "";
-function isMQTTConfigured() {
-    return client !== null;
-}
-function initMQTTClient(url) {
-    var _topicPrefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "adstorm";
-    if (client) return;
-    brokerUrl = url;
+function initMQTTClient() {
+    if (client || !isMQTTEnabled()) return;
+    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: 60,
             clean: true,
             reconnectPeriod: 5e3,
@@ -2111,13 +2130,22 @@ function initMQTTClient(url) {
         }
     });
 }
+function ensureMQTTClient() {
+    if (isMQTTEnabled() && !client) {
+        initMQTTClient();
+    }
+}
 function publishMQTT(topic, payload) {
+    if (!isMQTTEnabled()) {
+        return false;
+    }
+    ensureMQTTClient();
     if (!client) {
         return false;
     }
     try {
         client.publish(topic, JSON.stringify(payload), {
-            qos: 1
+            qos: mqttConfig.qos
         });
         return true;
     } catch (err) {
@@ -2130,7 +2158,6 @@ function disconnectMQTT() {
         client.end(true);
         client = null;
         status = "disconnected";
-        brokerUrl = "";
     }
 }
 // src/utils/tracking.ts
@@ -2352,171 +2379,91 @@ function getBrowserID(clientInfo) {
         });
     })();
 }
-var mqttTopicPrefix = "adstorm";
-function setMQTTTopicPrefix(prefix) {
-    mqttTopicPrefix = prefix || "adstorm";
-}
-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 canPublish(licenseKey) {
+    return Boolean(isMQTTEnabled() && licenseKey);
 }
-function postJson(url, licenseKey, body) {
+function buildPlayerMetricEvent() {
     return _async_to_generator(function() {
-        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 context, flags, _flags_captureAt, _flags_adLoaded, _flags_adDetect, clientInfo, playerId, 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] : {};
+                    context = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {}, flags = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {};
                     clientInfo = getClientInfo();
                     return [
                         4,
                         getBrowserID(clientInfo)
                     ];
                 case 1:
-                    browserId = _state.sent();
+                    playerId = _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,
+                        _object_spread({
+                            player_id: playerId,
                             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
-                        }
+                            os: clientInfo.os.toLowerCase(),
+                            ad_loaded: (_flags_adLoaded = flags.adLoaded) !== null && _flags_adLoaded !== void 0 ? _flags_adLoaded : false,
+                            ad_detect: (_flags_adDetect = flags.adDetect) !== null && _flags_adDetect !== void 0 ? _flags_adDetect : false,
+                            capture_at: captureAt
+                        }, context.inputStreamType ? {
+                            input_stream_type: context.inputStreamType
+                        } : {})
                     ];
             }
         });
     }).apply(this, arguments);
 }
-function publishOrPost(mqttTopic, httpUrl, licenseKey, body) {
-    return _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    if (isMQTTConfigured()) {
-                        publishMQTT(mqttTopic, body);
-                        return [
-                            2
-                        ];
-                    }
-                    return [
-                        4,
-                        postJson(httpUrl, licenseKey, body)
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    })();
+function publishTracking(licenseKey, channel, body) {
+    ensureMQTTClient();
+    publishMQTT(buildPlayerTopic(licenseKey, channel), body);
 }
 function sendInitialTracking(_0) {
     return _async_to_generator(function(licenseKey) {
-        var context, clientInfo, browserId, captureAt, trackingData, metricsBody, error;
+        var context, metricEvent, 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] : {};
+                    if (!canPublish(licenseKey)) return [
+                        2
+                    ];
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
-                        4,
+                        3,
                         ,
-                        5
+                        4
                     ]);
-                    clientInfo = getClientInfo();
                     return [
                         4,
-                        getBrowserID(clientInfo)
+                        buildPlayerMetricEvent(context, {
+                            adLoaded: false,
+                            adDetect: false
+                        })
                     ];
                 case 2:
-                    browserId = _state.sent();
-                    captureAt = /* @__PURE__ */ new Date().toISOString();
-                    trackingData = _object_spread({
-                        browserId: browserId
-                    }, clientInfo);
-                    metricsBody = {
+                    metricEvent = _state.sent();
+                    publishTracking(licenseKey, "metrics", {
                         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: captureAt
-                            }
-                        ],
-                        trackingData: trackingData
-                    };
-                    return [
-                        4,
-                        publishOrPost("".concat(mqttTopicPrefix, "/tracking/metrics"), TRACK_URL, licenseKey, metricsBody)
-                    ];
-                case 3:
-                    _state.sent();
+                            metricEvent
+                        ]
+                    });
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 4:
+                case 3:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending initial tracking data:", error);
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 5:
+                case 4:
                     return [
                         2
                     ];
@@ -2614,61 +2561,54 @@ function sendAdLoadedTracking(_0, _1) {
 }
 function sendAdImpressionTracking(_0, _1) {
     return _async_to_generator(function(licenseKey, adImpressionInfo) {
-        var context, metricEvent, heartbeatBody, impressionsBody, error;
+        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] : {};
+                    if (!canPublish(licenseKey)) return [
+                        2
+                    ];
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
-                        4,
+                        3,
                         ,
-                        5
+                        4
                     ]);
                     return [
                         4,
-                        buildPlayerMetricEvent(licenseKey, context, {
+                        buildPlayerMetricEvent(context, {
                             captureAt: adImpressionInfo.timestamp
                         })
                     ];
                 case 2:
                     metricEvent = _state.sent();
-                    heartbeatBody = metricEvent;
-                    impressionsBody = {
+                    publishTracking(licenseKey, "heartbeat", metricEvent);
+                    publishTracking(licenseKey, "impressions", {
                         events: [
                             {
                                 player_id: metricEvent.player_id,
                                 ad_played_count: 1,
                                 ad_url: adImpressionInfo.adUrl,
-                                license_key: licenseKey,
                                 capture_at: adImpressionInfo.timestamp
                             }
                         ]
-                    };
-                    return [
-                        4,
-                        Promise.all([
-                            publishOrPost("".concat(mqttTopicPrefix, "/tracking/heartbeat"), HEARTBEAT_URL, licenseKey, heartbeatBody),
-                            publishOrPost("".concat(mqttTopicPrefix, "/tracking/impressions"), IMPRESSIONS_URL, licenseKey, impressionsBody)
-                        ])
-                    ];
-                case 3:
-                    _state.sent();
+                    });
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 4:
+                case 3:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending ad impression tracking:", error);
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 5:
+                case 4:
                     return [
                         2
                     ];
@@ -2684,38 +2624,36 @@ function sendHeartbeat(_0) {
             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] : {};
+                    if (!canPublish(licenseKey)) return [
+                        2
+                    ];
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
-                        4,
+                        3,
                         ,
-                        5
+                        4
                     ]);
                     return [
                         4,
-                        buildPlayerMetricEvent(licenseKey, context, flags)
+                        buildPlayerMetricEvent(context, flags)
                     ];
                 case 2:
                     heartbeatData = _state.sent();
-                    return [
-                        4,
-                        publishOrPost("".concat(mqttTopicPrefix, "/tracking/heartbeat"), HEARTBEAT_URL, licenseKey, heartbeatData)
-                    ];
-                case 3:
-                    _state.sent();
+                    publishTracking(licenseKey, "heartbeat", heartbeatData);
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 4:
+                case 3:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending heartbeat:", error);
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 5:
+                case 4:
                     return [
                         2
                     ];
@@ -4629,10 +4567,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "initializeTracking",
             value: function initializeTracking() {
                 var _this = this;
-                if (this.config.mqttBrokerUrl) {
-                    var topicPrefix = "adstorm";
-                    setMQTTTopicPrefix(topicPrefix);
-                    initMQTTClient(this.config.mqttBrokerUrl, topicPrefix);
+                if (isMQTTEnabled()) {
+                    initMQTTClient();
                 }
                 sendInitialTracking(this.config.licenseKey, this.getAnalyticsContext()).then(function() {
                     _this.heartbeatInterval = window.setInterval(function() {
@@ -6313,7 +6249,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     clearInterval(this.heartbeatInterval);
                     this.heartbeatInterval = void 0;
                 }
-                if (this.config.mqttBrokerUrl) {
+                if (isMQTTEnabled()) {
                     disconnectMQTT();
                 }
                 (_this_hls = this.hls) === null || _this_hls === void 0 ? void 0 : _this_hls.destroy();