bartoszek/ranczo-io
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tl expected issues

Browse Source
This commit is contained in:
Bartosz Wieczorek 2025-11-17 18:24:57 +01:00
parent 686decfc50
commit 4caf57c82e
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/json_helpers.cpp
View File

@ -1,19 +1,10 @@
#include <ranczo-io/utils/json_helpers.hpp>
#include <boost/json/value.hpp>
#include <boost/json.hpp>
std::optional<double> ranczo::json::as_number(const boost::json::value &v) {
if(v.is_double())
return v.as_double();
if(v.is_int64())
return static_cast< double >(v.as_int64());
if(v.is_uint64())
return static_cast< double >(v.as_uint64());
if(v.is_string()) {
const auto & s = v.as_string();
double out{};
if(auto res = std::from_chars(s.data(), s.data() + s.size(), out); res.ec == std::errc{})
return out;
}
if (auto p = boost::json::try_value_to<double>(v))
return *p;
return std::nullopt;
}

2
libs/ranczo-io/utils/asio_watchdog.hpp
View File

@ -83,7 +83,7 @@ class SimpleTimer {
ASYNC_CHECK(on_tick_());
} catch(const std::exception & e) {
spdlog::error("on_tick threw exception: {}", e.what());
co_return std::unexpected{ boost::system::error_code{} };
co_return unexpected{ boost::system::error_code{} };
}
}

6
services/floorheat_svc/thermometer.cpp
View File

@ -59,17 +59,17 @@ awaitable_expected< void > MqttThermometer::listen() noexcept {
expected< Thermometer::ThermometerData > MqttThermometer::to_thermometer_data(const boost::json::value & v) {
const auto * obj = v.if_object();
if(!obj) {
return std::unexpected{make_error_code(std::errc::invalid_argument)};
return unexpected{make_error_code(std::errc::invalid_argument)};
}
// ---- value (required) ----
const auto * pv = obj->if_contains("value");
if(!pv) {
return std::unexpected{make_error_code(std::errc::invalid_argument)};
return unexpected{make_error_code(std::errc::invalid_argument)};
}
auto val = ranczo::json::as_number(*pv);
if(!val) {
return std::unexpected{make_error_code(std::errc::invalid_argument)};
return unexpected{make_error_code(std::errc::invalid_argument)};
}
// ---- timestamp (optional; default: now()) ----