Probes refresh rate

src/agent/HttpServer.cpp

@@ -12,6 +12,7 @@
 #include <iomanip>
 #include <list>
 #include <condition_variable>
+#include <ranges>
 #include <sstream>
 #include <thread>
 
@@ -21,7 +22,7 @@ namespace
     bool isValidDiskName(const std::string& name)
     {
         return !name.empty() && name.size() <= 64 &&
-               std::all_of(name.begin(), name.end(), [](char c) {
+               std::ranges::all_of(name, [](char c) {
                    return std::isalnum(static_cast<unsigned char>(c)) || c == '-' || c == '_';
                });
     }
@@ -40,6 +41,7 @@ struct HttpServer::Impl
     std::string lastRefreshed;
 
     std::function<void()> refreshCallback;
+    std::function<void()> onClientConnectedCallback;
 
     // Refresh cooldown
     static constexpr int RefreshCooldownSeconds = 600;  // 10 minutes
@@ -93,7 +95,7 @@ struct HttpServer::Impl
 };
 
 
-HttpServer::HttpServer(const std::string& agentName, unsigned int port)
+HttpServer::HttpServer(std::string_view agentName, unsigned int port)
     : m_impl(std::make_unique<Impl>())
 {
     m_impl->agentName = agentName;
@@ -134,14 +136,12 @@ HttpServer::HttpServer(const std::string& agentName, unsigned int port)
 
         std::lock_guard lock(m_impl->dataMutex);
 
-        for (const auto& d : m_impl->disks)
+        auto it = std::ranges::find(m_impl->disks, name, &DiskInfo::GetName);
+        if (it != m_impl->disks.end())
         {
-            if (d.GetName() == name)
-            {
-                nlohmann::json j = d;
-                res.set_content(j.dump(), "application/json");
-                return;
-            }
+            nlohmann::json j = *it;
+            res.set_content(j.dump(), "application/json");
+            return;
         }
         res.status = 404;
         res.set_content(R"({"error":"disk not found"})", "application/json");
@@ -190,6 +190,10 @@ HttpServer::HttpServer(const std::string& agentName, unsigned int port)
             m_impl->sseClients.push_back(client);
         }
 
+        // Notify that a new monitor connected — may trigger conditional refresh
+        if (m_impl->onClientConnectedCallback)
+            m_impl->onClientConnectedCallback();
+
         res.set_header("Cache-Control", "no-cache");
         res.set_header("Connection", "keep-alive");
 
@@ -234,8 +238,14 @@ void HttpServer::setStatusData(GeneralHealth::Health overallHealth, std::vector<
 
         const auto now = std::chrono::system_clock::now();
         const auto time_t = std::chrono::system_clock::to_time_t(now);
+        std::tm tm_buf{};
+#ifdef _WIN32
+        gmtime_s(&tm_buf, &time_t);
+#else
+        gmtime_r(&time_t, &tm_buf);
+#endif
         std::ostringstream oss;
-        oss << std::put_time(std::gmtime(&time_t), "%Y-%m-%dT%H:%M:%SZ");
+        oss << std::put_time(&tm_buf, "%Y-%m-%dT%H:%M:%SZ");
         m_impl->lastRefreshed = oss.str();
     }
 
@@ -269,3 +279,9 @@ void HttpServer::setRefreshCallback(std::function<void()> cb)
 {
     m_impl->refreshCallback = std::move(cb);
 }
+
+
+void HttpServer::setOnClientConnectedCallback(std::function<void()> cb)
+{
+    m_impl->onClientConnectedCallback = std::move(cb);
+}

src/agent/HttpServer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <string>
+#include <string_view>
 #include <vector>
 #include <mutex>
 #include <memory>
@@ -13,7 +13,7 @@
 class HttpServer
 {
 public:
-    HttpServer(const std::string& agentName, unsigned int port);
+    HttpServer(std::string_view agentName, unsigned int port);
     ~HttpServer();
 
     void setStatusData(GeneralHealth::Health overallHealth, std::vector<DiskInfo> disks);
@@ -25,6 +25,9 @@ class HttpServer
     // Called to trigger data refresh; the callback does collection and calls setStatusData
     void setRefreshCallback(std::function<void()> cb);
 
+    // Called when a new SSE client connects
+    void setOnClientConnectedCallback(std::function<void()> cb);
+
 private:
     struct Impl;
     std::unique_ptr<Impl> m_impl;

src/agent/IProbe.h

@@ -1,15 +1,31 @@
 #pragma once
 
+#include <chrono>
+#include <vector>
+
 #include <nlohmann/json.hpp>
 
 #include "common/GeneralHealth.h"
 #include "agent/Disk.h"
 
 
+struct RefreshPolicy
+{
+    std::chrono::seconds interval{0};
+    bool proactiveCollection = false;
+
+    bool operator==(const RefreshPolicy&) const = default;
+};
+
+
 class IProbe
 {
 public:
     virtual ~IProbe() = default;
-    virtual GeneralHealth::Health GetStatus(const Disk& _disk) = 0;
-    virtual nlohmann::json GetRawData(const Disk& _disk) = 0;
+
+    [[nodiscard]] virtual RefreshPolicy GetRefreshPolicy() const = 0;
+    virtual void Refresh(const std::vector<Disk>& disks) = 0;
+
+    [[nodiscard]] virtual GeneralHealth::Health GetStatus(const Disk& _disk) const = 0;
+    [[nodiscard]] virtual nlohmann::json GetRawData(const Disk& _disk) const = 0;
 };

src/agent/SmartHealthAnalyzer.cpp

@@ -4,6 +4,7 @@
 
 #include <algorithm>
 #include <array>
+#include <ranges>
 
 namespace
 {
@@ -27,7 +28,7 @@ namespace
 
     bool isCriticalAta(uint8_t id, const std::string& name)
     {
-        return std::any_of(criticalAttrs.begin(), criticalAttrs.end(),
+        return std::ranges::any_of(criticalAttrs,
             [&](const CriticalAttr& ca) { return ca.id == id && name == ca.canonicalName; });
     }
 
@@ -59,7 +60,23 @@ SmartHealthAnalyzer::SmartHealthAnalyzer(std::unique_ptr<ISmartReader> reader)
 SmartHealthAnalyzer::~SmartHealthAnalyzer() = default;
 
 
-const IVendorProfile& SmartHealthAnalyzer::profileFor(const std::string& vendor)
+RefreshPolicy SmartHealthAnalyzer::GetRefreshPolicy() const
+{
+    return {std::chrono::hours(4), false};
+}
+
+
+void SmartHealthAnalyzer::Refresh(const std::vector<Disk>& disks)
+{
+    for (const auto& disk : disks)
+    {
+        m_cachedSmartData[disk.GetDeviceId()] = m_reader->ReadSMARTData(disk);
+        m_cachedTestStatus[disk.GetDeviceId()] = m_reader->ReadTestStatus(disk);
+    }
+}
+
+
+const IVendorProfile& SmartHealthAnalyzer::profileFor(std::string_view vendor)
 {
     static const GenericProfile generic;
     static const SamsungProfile samsung;
@@ -74,9 +91,13 @@ const IVendorProfile& SmartHealthAnalyzer::profileFor(const std::string& vendor)
 }
 
 
-GeneralHealth::Health SmartHealthAnalyzer::GetStatus(const Disk& disk)
+GeneralHealth::Health SmartHealthAnalyzer::GetStatus(const Disk& disk) const
 {
-    const auto smart = m_reader->ReadSMARTData(disk);
+    auto it = m_cachedSmartData.find(disk.GetDeviceId());
+    if (it == m_cachedSmartData.end())
+        return GeneralHealth::UNKNOWN;
+
+    const auto& smart = it->second;
     const auto& profile = profileFor(disk.GetVendor());
 
     auto worst = GeneralHealth::GOOD;
@@ -98,18 +119,15 @@ GeneralHealth::Health SmartHealthAnalyzer::GetStatus(const Disk& disk)
         }
 
         // Layer 2b: NVMe critical fields — non-zero raw means trouble
-        if (isCriticalNvme(attr.name))
-        {
-            if (attr.rawVal > 0)
-                worst = std::max(worst, GeneralHealth::BAD);
-        }
+        if (isCriticalNvme(attr.name) && attr.rawVal > 0)
+            return GeneralHealth::BAD;
 
         // Layer 2c: NVMe wear indicator
         if (isNvmePercentageUsed(attr.name))
         {
             if (attr.rawVal >= 100)
-                worst = std::max(worst, GeneralHealth::BAD);
-            else if (attr.rawVal >= nvmeWearWarningPercent)
+                return GeneralHealth::BAD;
+            if (attr.rawVal >= nvmeWearWarningPercent)
                 worst = std::max(worst, GeneralHealth::CHECK_STATUS);
         }
 
@@ -126,9 +144,13 @@ GeneralHealth::Health SmartHealthAnalyzer::GetStatus(const Disk& disk)
 }
 
 
-nlohmann::json SmartHealthAnalyzer::GetRawData(const Disk& disk)
+nlohmann::json SmartHealthAnalyzer::GetRawData(const Disk& disk) const
 {
-    const auto smart = m_reader->ReadSMARTData(disk);
+    auto it = m_cachedSmartData.find(disk.GetDeviceId());
+    if (it == m_cachedSmartData.end())
+        return nlohmann::json{{"type", "smart"}, {"attributes", nlohmann::json::array()}};
+
+    const auto& smart = it->second;
 
     nlohmann::json attrs = nlohmann::json::array();
     for (const auto& attr : smart.attributes)
@@ -145,7 +167,11 @@ nlohmann::json SmartHealthAnalyzer::GetRawData(const Disk& disk)
 
     auto j = nlohmann::json{{"type", "smart"}, {"attributes", attrs}};
 
-    const auto testStatus = m_reader->ReadTestStatus(disk);
+    auto testIt = m_cachedTestStatus.find(disk.GetDeviceId());
+    SmartTestStatus testStatus;
+    if (testIt != m_cachedTestStatus.end())
+        testStatus = testIt->second;
+
     j["selfTestStatus"] = {
         {"running", testStatus.running},
         {"percentRemaining", testStatus.percentRemaining},

src/agent/SmartHealthAnalyzer.h

@@ -3,7 +3,12 @@
 #include "IProbe.h"
 #include "ISmartReader.h"
 
+#include <map>
 #include <memory>
+#include <string>
+#include <string_view>
+
+#include "common/SmartData.h"
 
 class IVendorProfile;
 
@@ -13,11 +18,17 @@ class SmartHealthAnalyzer : public IProbe
     explicit SmartHealthAnalyzer(std::unique_ptr<ISmartReader> reader);
     ~SmartHealthAnalyzer() override;
 
-    GeneralHealth::Health GetStatus(const Disk& disk) override;
-    nlohmann::json GetRawData(const Disk& disk) override;
+    RefreshPolicy GetRefreshPolicy() const override;
+    void Refresh(const std::vector<Disk>& disks) override;
+
+    GeneralHealth::Health GetStatus(const Disk& disk) const override;
+    nlohmann::json GetRawData(const Disk& disk) const override;
 
 private:
     std::unique_ptr<ISmartReader> m_reader;
 
-    static const IVendorProfile& profileFor(const std::string& vendor);
+    std::map<std::string, SmartData> m_cachedSmartData;
+    std::map<std::string, SmartTestStatus> m_cachedTestStatus;
+
+    static const IVendorProfile& profileFor(std::string_view vendor);
 };