nu

backend/src/controllers/RealmController.cpp

@@ -311,19 +311,14 @@ void RealmController::getRealmStreamKey(const HttpRequestPtr &req,
 void RealmController::getRealm(const HttpRequestPtr &req,
                               std::function<void(const HttpResponsePtr &)> &&callback,
                               const std::string &realmId) {
-    UserInfo user = getUserFromRequest(req);
+    // Remove authentication requirement for public viewing
-    if (user.id == 0) {
-        callback(jsonError("Unauthorized", k401Unauthorized));
-        return;
-    }
-    
     int64_t id = std::stoll(realmId);
     
     auto dbClient = app().getDbClient();
     *dbClient << "SELECT r.*, u.username FROM realms r "
                  "JOIN users u ON r.user_id = u.id "
-                 "WHERE r.id = $1 AND r.user_id = $2"
+                 "WHERE r.id = $1 AND r.is_active = true"
-              << id << user.id
+              << id
               >> [callback](const Result& r) {
                   if (r.empty()) {
                       callback(jsonError("Realm not found", k404NotFound));
@@ -335,7 +330,8 @@ void RealmController::getRealm(const HttpRequestPtr &req,
                   auto& realm = resp["realm"];
                   realm["id"] = static_cast<Json::Int64>(r[0]["id"].as<int64_t>());
                   realm["name"] = r[0]["name"].as<std::string>();
-                  realm["streamKey"] = r[0]["stream_key"].as<std::string>();
+                  // Don't expose stream key in public endpoint
+                  // realm["streamKey"] = r[0]["stream_key"].as<std::string>();
                   realm["isActive"] = r[0]["is_active"].as<bool>();
                   realm["isLive"] = r[0]["is_live"].as<bool>();
                   realm["viewerCount"] = static_cast<Json::Int64>(r[0]["viewer_count"].as<int64_t>());

backend/src/main.cpp

@@ -33,6 +33,10 @@ int main() {
         LOG_INFO << "Loading configuration...";
         app().loadConfigFile("config.json");
         
+        // Initialize StatsService BEFORE registering callbacks
+        LOG_INFO << "Initializing StatsService...";
+        StatsService::getInstance().initialize();
+        
         // Register a pre-routing advice to handle CORS
         app().registerPreRoutingAdvice([](const HttpRequestPtr &req,
                                          AdviceCallback &&acb,
@@ -74,13 +78,13 @@ int main() {
             resp->addHeader("Access-Control-Allow-Credentials", "true");
         });
         
-        // Register beginning advice to initialize StatsService after app starts
+        // Register beginning advice to start the stats timer
         app().registerBeginningAdvice([]() {
             LOG_INFO << "Application started successfully";
             
-            // Initialize StatsService after app is running
+            // Start the stats polling timer
-            LOG_INFO << "Initializing StatsService...";
+            LOG_INFO << "Starting stats polling...";
-            StatsService::getInstance().initialize();
+            StatsService::getInstance().startPolling();
         });
         
         app().setTermSignalHandler([]() {

backend/src/services/OmeClient.h

@@ -16,22 +16,39 @@ public:
     }
     
     // Get list of active streams
+// In backend/src/services/OmeClient.h
+
 void getActiveStreams(std::function<void(bool, const Json::Value&)> callback) {
+    // Try the streams endpoint first
     auto request = createRequest(drogon::Get, "/v1/vhosts/default/apps/app/streams");
     
     getClient()->sendRequest(request, [callback](drogon::ReqResult result, const drogon::HttpResponsePtr& response) {
         if (result == drogon::ReqResult::Ok && response && response->getStatusCode() == drogon::k200OK) {
             try {
                 Json::Value json = *response->getJsonObject();
+                LOG_DEBUG << "OME streams response: " << json.toStyledString();
+                
+                // OME might return the streams in different formats
+                // Sometimes it's {"response": ["stream1", "stream2"]}
+                // Sometimes it's {"response": {"streams": ["stream1", "stream2"]}}
+                if (json.isMember("response")) {
                     callback(true, json);
+                } else {
+                    // Wrap the response if needed
+                    Json::Value wrapped;
+                    wrapped["response"] = json;
+                    callback(true, wrapped);
+                }
             } catch (const std::exception& e) {
                 LOG_ERROR << "Failed to parse OME response: " << e.what();
                 Json::Value empty;
+                empty["response"] = Json::arrayValue;
                 callback(false, empty);
             }
         } else {
             LOG_ERROR << "Failed to get active streams from OME";
             Json::Value empty;
+            empty["response"] = Json::arrayValue;
             callback(false, empty);
         }
     });

backend/src/services/StatsService.cpp

@@ -4,6 +4,7 @@
 #include "../services/OmeClient.h"
 #include <drogon/HttpClient.h>
 #include <drogon/utils/Utilities.h>
+#include <set>
 
 using namespace drogon;
 
@@ -17,12 +18,22 @@ StatsService::~StatsService() {
 void StatsService::initialize() {
     LOG_INFO << "Initializing Stats Service...";
     running_ = true;
+}
+
+void StatsService::startPolling() {
+    if (!running_) {
+        LOG_WARN << "Stats service not initialized, cannot start polling";
+        return;
+    }
     
-    drogon::app().registerBeginningAdvice([this]() {
     LOG_INFO << "Starting stats polling timer...";
     
     if (auto loop = drogon::app().getLoop()) {
         try {
+            // Do an immediate poll
+            pollOmeStats();
+            
+            // Then set up the timer
             timerId_ = loop->runEvery(
                 pollInterval_.count(),
                 [this]() {
@@ -38,8 +49,9 @@ void StatsService::initialize() {
         } catch (const std::exception& e) {
             LOG_ERROR << "Failed to create stats timer: " << e.what();
         }
+    } else {
+        LOG_ERROR << "Event loop not available for stats polling";
     }
-    });
 }
 
 void StatsService::shutdown() {
@@ -73,27 +85,82 @@ int64_t StatsService::getUniqueViewerCount(const std::string& streamKey) {
 }
 
 void StatsService::pollOmeStats() {
+    LOG_INFO << "Polling OvenMediaEngine for active streams...";
+    
     // Get active streams from OME
     OmeClient::getInstance().getActiveStreams([this](bool success, const Json::Value& json) {
-        if (success && json["response"].isArray()) {
+        if (success && json.isMember("response")) {
+            LOG_INFO << "OME Active Streams Response: " << json["response"].toStyledString();
+            
+            std::set<std::string> activeStreamKeys;
+            
+            // Handle both array and object responses from OME
+            if (json["response"].isArray()) {
                 for (const auto& stream : json["response"]) {
                     if (stream.isString()) {
-                    updateStreamStats(stream.asString());
+                        activeStreamKeys.insert(stream.asString());
                     }
                 }
+            } else if (json["response"].isMember("streams") && json["response"]["streams"].isArray()) {
+                for (const auto& stream : json["response"]["streams"]) {
+                    if (stream.isString()) {
+                        activeStreamKeys.insert(stream.asString());
+                    } else if (stream.isMember("name")) {
+                        activeStreamKeys.insert(stream["name"].asString());
+                    }
+                }
+            }
+            
+            LOG_INFO << "Found " << activeStreamKeys.size() << " active streams from OME";
+            
+            // Update each active stream
+            for (const auto& streamKey : activeStreamKeys) {
+                LOG_INFO << "Processing active stream: " << streamKey;
+                
+                // IMMEDIATELY update database to mark as live
+                auto dbClient = app().getDbClient();
+                *dbClient << "UPDATE realms SET is_live = true, viewer_count = 0, "
+                            "updated_at = CURRENT_TIMESTAMP WHERE stream_key = $1"
+                          << streamKey
+                          >> [streamKey](const orm::Result&) {
+                              LOG_INFO << "Successfully marked realm as live: " << streamKey;
+                          }
+                          >> [streamKey](const orm::DrogonDbException& e) {
+                              LOG_ERROR << "Failed to update realm live status: " << e.base().what();
+                          };
+                
+                // Then update detailed stats
+                updateStreamStats(streamKey);
+            }
+            
+            // Mark all non-active streams as offline
+            auto dbClient = app().getDbClient();
+            *dbClient << "SELECT stream_key FROM realms WHERE is_live = true"
+                      >> [activeStreamKeys](const orm::Result& r) {
+                          auto db = app().getDbClient();
+                          for (const auto& row : r) {
+                              std::string key = row["stream_key"].as<std::string>();
+                              if (activeStreamKeys.find(key) == activeStreamKeys.end()) {
+                                  LOG_INFO << "Marking realm as offline: " << key;
+                                  *db << "UPDATE realms SET is_live = false, viewer_count = 0, "
+                                         "updated_at = CURRENT_TIMESTAMP WHERE stream_key = $1"
+                                      << key
+                                      >> [key](const orm::Result&) {
+                                          LOG_INFO << "Marked realm as offline: " << key;
+                                      }
+                                      >> [](const orm::DrogonDbException& e) {
+                                          LOG_ERROR << "Failed to mark realm offline: " << e.base().what();
+                                      };
+                              }
+                          }
+                      }
+                      >> [](const orm::DrogonDbException& e) {
+                          LOG_ERROR << "Failed to query live realms: " << e.base().what();
+                      };
+        } else {
+            LOG_ERROR << "Failed to get active streams from OME or empty response";
         }
     });
-    
-    // Poll known stream keys from Redis
-    services::RedisHelper::instance().keysAsync("stream_key:*",
-        [this](const std::vector<std::string>& keys) {
-            for (const auto& key : keys) {
-                if (auto pos = key.find(':'); pos != std::string::npos) {
-                    updateStreamStats(key.substr(pos + 1));
-                }
-            }
-        }
-    );
 }
 
 void StatsService::updateStreamStats(const std::string& streamKey) {
@@ -107,7 +174,7 @@ void StatsService::updateStreamStats(const std::string& streamKey) {
             // Update realm in database
             updateRealmLiveStatus(streamKey, updatedStats);
             
-            // Only broadcast if stream has meaningful data
+            // Only broadcast if stream has meaningful data or is live
             if (updatedStats.isLive || updatedStats.totalBytesIn > 0 || updatedStats.uniqueViewers > 0) {
                 Json::Value msg;
                 msg["type"] = "stats_update";
@@ -140,11 +207,14 @@ void StatsService::updateStreamStats(const std::string& streamKey) {
 void StatsService::updateRealmLiveStatus(const std::string& streamKey, const StreamStats& stats) {
     auto dbClient = app().getDbClient();
     
+    // Cast to int32 to match PostgreSQL integer type
+    int32_t viewerCount = static_cast<int32_t>(stats.uniqueViewers);
+    
     // Update realm's live status and viewer count
-    *dbClient << "UPDATE realms SET is_live = $1, viewer_count = $2 WHERE stream_key = $3"
+    *dbClient << "UPDATE realms SET is_live = $1, viewer_count = $2, updated_at = CURRENT_TIMESTAMP WHERE stream_key = $3"
-              << stats.isLive << stats.uniqueViewers << streamKey
+              << stats.isLive << viewerCount << streamKey
               >> [streamKey, stats](const orm::Result&) {
-                  LOG_DEBUG << "Updated realm status for stream " << streamKey 
+                  LOG_INFO << "Updated realm status for stream " << streamKey 
                            << " - Live: " << stats.isLive 
                            << ", Viewers: " << stats.uniqueViewers;
               }
@@ -158,12 +228,15 @@ void StatsService::fetchStatsFromOme(const std::string& streamKey,
                                     std::function<void(bool, const StreamStats&)> callback) {
     LOG_DEBUG << "Fetching stats for stream: " << streamKey;
     
+    // First, try to get the stream stats
     OmeClient::getInstance().getStreamStats(streamKey, [this, callback, streamKey](bool success, const Json::Value& json) {
         StreamStats stats;
+        bool streamExists = false;
         
         if (success && json.isMember("response") && !json["response"].isNull()) {
             try {
                 const auto& data = json["response"];
+                streamExists = true;
                 
                 // Parse connections
                 if (data.isMember("connections")) {
@@ -186,36 +259,107 @@ void StatsService::fetchStatsFromOme(const std::string& streamKey,
                     stats.totalConnections = totalConns;
                 }
 
-                // Bitrate
+                // Check multiple indicators for live status
-                stats.bitrate = data.isMember("lastThroughputIn") ? 
+                bool hasInput = false;
-                    data["lastThroughputIn"].asDouble() : 
-                    (data.isMember("avgThroughputIn") ? data["avgThroughputIn"].asDouble() : 0);
                 
-                // Byte counters
+                // Check for input field
-                if (data.isMember("totalBytesIn")) stats.totalBytesIn = data["totalBytesIn"].asInt64();
+                if (data.isMember("input") && !data["input"].isNull()) {
-                if (data.isMember("totalBytesOut")) stats.totalBytesOut = data["totalBytesOut"].asInt64();
+                    hasInput = true;
+                    const auto& input = data["input"];
+                    
+                    // Get bitrate from input tracks
+                    if (input.isMember("tracks") && input["tracks"].isArray()) {
+                        for (const auto& track : input["tracks"]) {
+                            if (track["type"].asString() == "video" && track.isMember("bitrate")) {
+                                stats.bitrate = track["bitrate"].asDouble();
+                            }
+                        }
+                    }
+                }
+                
+                // Alternative: Check lastThroughputIn
+                if (!hasInput && data.isMember("lastThroughputIn")) {
+                    double throughput = data["lastThroughputIn"].asDouble();
+                    if (throughput > 0) {
+                        hasInput = true;
+                        stats.bitrate = throughput;
+                    }
+                }
+                
+                // Alternative: Check avgThroughputIn
+                if (!hasInput && data.isMember("avgThroughputIn")) {
+                    double avgThroughput = data["avgThroughputIn"].asDouble();
+                    if (avgThroughput > 0) {
+                        hasInput = true;
+                        stats.bitrate = avgThroughput;
+                    }
+                }
+                
+                // Check bytes counters
+                if (data.isMember("totalBytesIn")) {
+                    stats.totalBytesIn = data["totalBytesIn"].asInt64();
+                    if (stats.totalBytesIn > 0) {
+                        hasInput = true;
+                    }
+                }
+                
+                if (data.isMember("totalBytesOut")) {
+                    stats.totalBytesOut = data["totalBytesOut"].asInt64();
+                }
+                
+                // Stream is live if it has input or active bitrate
+                stats.isLive = hasInput || stats.bitrate > 0;
+                
+                LOG_DEBUG << "Stream " << streamKey 
+                          << " - hasInput: " << hasInput
+                          << ", bitrate: " << stats.bitrate
+                          << ", totalBytesIn: " << stats.totalBytesIn
+                          << ", isLive: " << stats.isLive;
                 
-                stats.isLive = (stats.bitrate > 0 || stats.currentConnections > 0);
-                LOG_DEBUG << "OME stats response: " << json.toStyledString();
             } catch (const std::exception& e) {
                 LOG_ERROR << "Failed to parse stats: " << e.what();
                 stats.isLive = false;
             }
         } else {
+            // Stream doesn't exist in OME
             stats.isLive = false;
+            LOG_DEBUG << "Stream " << streamKey << " not found in OME";
         }
         
         stats.lastUpdated = std::chrono::system_clock::now();
         
-        // Now fetch stream info for resolution/codec/fps
+        // If stream exists, try to get detailed stream info
+        if (streamExists) {
             OmeClient::getInstance().getStreamInfo(streamKey, [callback, stats](bool infoSuccess, const Json::Value& infoJson) mutable {
                 // Parse stream metadata if available
-            if (infoSuccess && infoJson.isMember("response") && infoJson["response"].isMember("tracks")) {
+                if (infoSuccess && infoJson.isMember("response")) {
                     try {
-                    for (const auto& track : infoJson["response"]["tracks"]) {
+                        const auto& response = infoJson["response"];
+                        
+                        LOG_DEBUG << "Stream info response: " << response.toStyledString();
+                        
+                        // Check if stream has input (another way to verify it's live)
+                        if (response.isMember("input") && !response["input"].isNull()) {
+                            stats.isLive = true;
+                            
+                            // Try to get codec from input tracks first
+                            if (response["input"].isMember("tracks") && response["input"]["tracks"].isArray()) {
+                                for (const auto& track : response["input"]["tracks"]) {
                                     if (track["type"].asString() == "video") {
                                         if (track.isMember("codec")) {
-                                stats.codec = track["codec"].asString();
+                                            std::string codec = track["codec"].asString();
+                                            // Clean up codec string
+                                            if (codec == "H264" || codec == "h264") {
+                                                stats.codec = "H.264";
+                                            } else if (codec == "H265" || codec == "h265") {
+                                                stats.codec = "H.265";
+                                            } else if (codec == "VP8" || codec == "vp8") {
+                                                stats.codec = "VP8";
+                                            } else if (codec == "VP9" || codec == "vp9") {
+                                                stats.codec = "VP9";
+                                            } else {
+                                                stats.codec = codec;
+                                            }
                                         }
                                         if (track.isMember("width") && track.isMember("height")) {
                                             stats.resolution = std::to_string(track["width"].asInt()) + "x" + 
@@ -223,10 +367,54 @@ void StatsService::fetchStatsFromOme(const std::string& streamKey,
                                         }
                                         if (track.isMember("framerate")) {
                                             stats.fps = track["framerate"].asDouble();
+                                        } else if (track.isMember("frameRate")) {
+                                            stats.fps = track["frameRate"].asDouble();
                                         }
                                         break;
                                     }
                                 }
+                            }
+                        }
+                        
+                        // If no codec found in input, try output tracks
+                        if (stats.codec.empty() || stats.codec == "N/A") {
+                            if (response.isMember("tracks") && response["tracks"].isArray()) {
+                                for (const auto& track : response["tracks"]) {
+                                    if (track["type"].asString() == "video") {
+                                        if (track.isMember("codec")) {
+                                            std::string codec = track["codec"].asString();
+                                            if (codec == "H264" || codec == "h264") {
+                                                stats.codec = "H.264";
+                                            } else if (codec == "H265" || codec == "h265") {
+                                                stats.codec = "H.265";
+                                            } else if (codec == "VP8" || codec == "vp8") {
+                                                stats.codec = "VP8";
+                                            } else if (codec == "VP9" || codec == "vp9") {
+                                                stats.codec = "VP9";
+                                            } else {
+                                                stats.codec = codec;
+                                            }
+                                        }
+                                        if (stats.resolution == "N/A" && track.isMember("width") && track.isMember("height")) {
+                                            stats.resolution = std::to_string(track["width"].asInt()) + "x" + 
+                                                             std::to_string(track["height"].asInt());
+                                        }
+                                        if (stats.fps == 0 && track.isMember("framerate")) {
+                                            stats.fps = track["framerate"].asDouble();
+                                        } else if (stats.fps == 0 && track.isMember("frameRate")) {
+                                            stats.fps = track["frameRate"].asDouble();
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        
+                        // Set defaults if still empty
+                        if (stats.codec.empty()) {
+                            stats.codec = "Unknown";
+                        }
+                        
                     } catch (const std::exception& e) {
                         LOG_ERROR << "Failed to parse stream info: " << e.what();
                     }
@@ -234,6 +422,10 @@ void StatsService::fetchStatsFromOme(const std::string& streamKey,
                 
                 callback(true, stats);
             });
+        } else {
+            // Stream doesn't exist, return offline stats
+            callback(true, stats);
+        }
     });
 }
 
@@ -287,7 +479,7 @@ void StatsService::getStreamStats(const std::string& streamKey,
         fetchStatsFromOme(streamKey, [this, callback, streamKey](bool success, const StreamStats& stats) {
             if (success) {
                 StreamStats updatedStats = stats;
-                // FIX: Set uniqueViewers on cache miss!
+                // Set uniqueViewers on cache miss
                 updatedStats.uniqueViewers = getUniqueViewerCount(streamKey);
                 callback(true, updatedStats);
             } else {

backend/src/services/StatsService.h

@@ -41,6 +41,7 @@ public:
     }
     
     void initialize();
+    void startPolling();  // NEW: Separate method to start polling
     void shutdown();
     
     // Get cached stats from Redis

frontend/src/routes/my-realms/+page.svelte

@@ -208,7 +208,7 @@
     if (bitrate > 1000000) {
         return (bitrate / 1000000).toFixed(2) + ' Mbps';
     } else if (bitrate > 1000) {
-            return (bitrate / 1000).toFixed(0) + ' Kbps';
+        return Math.round(bitrate / 1000) + ' kbps';  // Changed to lowercase 'kbps' and rounded
     } else {
         return bitrate + ' bps';
     }

frontend/svelte.config.js

@@ -11,7 +11,6 @@ const config = {
             precompress: false
         }),
         
-        // Security improvements
         csp: {
             mode: 'auto',
             directives: {
@@ -19,14 +18,20 @@ const config = {
                 'script-src': ["'self'", "'unsafe-inline'"],
                 'style-src': ["'self'", "'unsafe-inline'", 'https://cdnjs.cloudflare.com'],
                 'img-src': ["'self'", 'data:', 'blob:'],
-                'font-src': ["'self'", 'https://cdnjs.cloudflare.com'],
+                'font-src': ["'self'", 'data:', 'https://cdnjs.cloudflare.com'],  // Added 'data:' for embedded fonts
-                'connect-src': ["'self'", 'ws://localhost', 'wss://localhost', 'http://localhost:*'],
+                'connect-src': [
+                    "'self'", 
+                    'ws://localhost:*',     // Changed to include port wildcard
+                    'wss://localhost:*',    // Changed to include port wildcard
+                    'http://localhost:*'
+                ],
                 'media-src': ["'self'", 'blob:', 'http://localhost:*'],
                 'object-src': ["'none'"],
                 'frame-ancestors': ["'none'"],
                 'form-action': ["'self'"],
                 'base-uri': ["'self'"]
             }
+        
         },
         
         // Enable CSRF protection (default is true)