ham-ref/js8call
1
0
Fork 0
mirror of https://github.com/JS8Call-improved/JS8Call-improved synced 2026-08-13 17:47:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce MessageError namespace

Browse source
This commit is contained in:
Allan Bazinet 2024-11-03 06:20:05 -08:00
parent 2f8a4f7c1e
commit c1fe8a431d
4 changed files with 105 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
MessageClient.cpp
View file

@ -10,6 +10,7 @@
#include <QUdpSocket>
#include "DriftingDateTime.h"
#include "MessageError.hpp"
#include "pimpl_impl.hpp"
#include "moc_MessageClient.cpp"
@ -28,14 +29,15 @@ namespace
namespace
{
// Exception thrown on JSON parsing errors.
// Exception thrown on message parsing errors.
struct parse_error : public std::runtime_error
struct parse_error : public std::system_error
{
explicit parse_error(QString const & what)
: std::runtime_error(QString {"json parse error: %1"}
.arg(what)
.toStdString())
using std::system_error::system_error;
explicit parse_error(QJsonParseError const & parse)
: parse_error(MessageError::Code::json_parsing_error,
parse.errorString().toStdString())
{}
};
@ -45,11 +47,13 @@ namespace
Message
parse_message(QByteArray const & datagram)
{
using MessageError::Code;
QJsonParseError parse;
QJsonDocument document = QJsonDocument::fromJson(datagram, &parse);
if (parse.error) throw parse_error(parse.errorString());
if (!document.isObject()) throw parse_error("json is not an object");
if (parse.error) throw parse_error(parse);
if (!document.isObject()) throw parse_error(Code::json_not_an_object);
Message message;