mirror of https://github.com/f1xpl/openauto.git
Draft of ping implementation
parent
4c01c5cc55
commit
cf3a5e51d7
|
@ -26,6 +26,7 @@
|
|||
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/IAndroidAutoEntity.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/IServiceFactory.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/IPinger.hpp>
|
||||
|
||||
namespace f1x
|
||||
{
|
||||
|
@ -43,7 +44,8 @@ public:
|
|||
aasdk::messenger::ICryptor::Pointer cryptor,
|
||||
aasdk::transport::ITransport::Pointer transport,
|
||||
configuration::IConfiguration::Pointer configuration,
|
||||
IServiceFactory& serviceFactory);
|
||||
IServiceFactory& serviceFactory,
|
||||
IPinger::Pointer pinger);
|
||||
~AndroidAutoEntity() override;
|
||||
|
||||
void start(IAndroidAutoEntityEventHandler& eventHandler) override;
|
||||
|
@ -55,17 +57,20 @@ public:
|
|||
void onShutdownRequest(const aasdk::proto::messages::ShutdownRequest& request) override;
|
||||
void onShutdownResponse(const aasdk::proto::messages::ShutdownResponse& response) override;
|
||||
void onNavigationFocusRequest(const aasdk::proto::messages::NavigationFocusRequest& request) override;
|
||||
void onPingResponse(const aasdk::proto::messages::PingResponse& response) override;
|
||||
void onChannelError(const aasdk::error::Error& e) override;
|
||||
|
||||
private:
|
||||
using std::enable_shared_from_this<AndroidAutoEntity>::shared_from_this;
|
||||
void triggerQuit();
|
||||
void ping();
|
||||
|
||||
boost::asio::io_service::strand strand_;
|
||||
aasdk::messenger::ICryptor::Pointer cryptor_;
|
||||
aasdk::transport::ITransport::Pointer transport_;
|
||||
configuration::IConfiguration::Pointer configuration_;
|
||||
IServiceFactory& serviceFactory_;
|
||||
IPinger::Pointer pinger_;
|
||||
aasdk::messenger::IMessenger::Pointer messenger_;
|
||||
aasdk::channel::control::ControlServiceChannel::Pointer controlServiceChannel_;
|
||||
ServiceList serviceList_;
|
||||
|
|
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
* This file is part of openauto project.
|
||||
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||
*
|
||||
* openauto is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
||||
* openauto is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <f1x/aasdk/IO/Promise.hpp>
|
||||
|
||||
namespace f1x
|
||||
{
|
||||
namespace openauto
|
||||
{
|
||||
namespace autoapp
|
||||
{
|
||||
namespace projection
|
||||
{
|
||||
|
||||
class IPinger
|
||||
{
|
||||
public:
|
||||
typedef std::shared_ptr<IPinger> Pointer;
|
||||
typedef aasdk::io::Promise<void, void> Promise;
|
||||
|
||||
virtual ~IPinger() = default;
|
||||
virtual void ping(Promise::Pointer promise) = 0;
|
||||
virtual void pong() = 0;
|
||||
virtual void cancel() = 0;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,57 @@
|
|||
/*
|
||||
* This file is part of openauto project.
|
||||
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||
*
|
||||
* openauto is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
||||
* openauto is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <f1x/openauto/autoapp/Projection/IPinger.hpp>
|
||||
|
||||
namespace f1x
|
||||
{
|
||||
namespace openauto
|
||||
{
|
||||
namespace autoapp
|
||||
{
|
||||
namespace projection
|
||||
{
|
||||
|
||||
class Pinger: public IPinger, std::enable_shared_from_this<Pinger>
|
||||
{
|
||||
public:
|
||||
Pinger(boost::asio::io_service& ioService, time_t duration);
|
||||
|
||||
void ping(Promise::Pointer promise) override;
|
||||
void pong() override;
|
||||
void cancel() override;
|
||||
|
||||
private:
|
||||
using std::enable_shared_from_this<Pinger>::shared_from_this;
|
||||
|
||||
void onTimerExceeded(const boost::system::error_code& error);
|
||||
|
||||
boost::asio::io_service::strand strand_;
|
||||
boost::asio::deadline_timer timer_;
|
||||
time_t duration_;
|
||||
Promise::Pointer promise_;
|
||||
int64_t pingsCount_;
|
||||
int64_t pongsCount_;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -35,12 +35,14 @@ AndroidAutoEntity::AndroidAutoEntity(boost::asio::io_service& ioService,
|
|||
aasdk::messenger::ICryptor::Pointer cryptor,
|
||||
aasdk::transport::ITransport::Pointer transport,
|
||||
configuration::IConfiguration::Pointer configuration,
|
||||
IServiceFactory& serviceFactory)
|
||||
IServiceFactory& serviceFactory,
|
||||
IPinger::Pointer pinger)
|
||||
: strand_(ioService)
|
||||
, cryptor_(std::move(cryptor))
|
||||
, transport_(std::move(transport))
|
||||
, configuration_(std::move(configuration))
|
||||
, serviceFactory_(serviceFactory)
|
||||
, pinger_(std::move(pinger))
|
||||
, messenger_(std::make_shared<aasdk::messenger::Messenger>(ioService,
|
||||
std::make_shared<aasdk::messenger::MessageInStream>(ioService, transport_, cryptor_),
|
||||
std::make_shared<aasdk::messenger::MessageOutStream>(ioService, transport_, cryptor_)))
|
||||
|
@ -178,6 +180,8 @@ void AndroidAutoEntity::onServiceDiscoveryRequest(const aasdk::proto::messages::
|
|||
promise->then([]() {}, std::bind(&AndroidAutoEntity::onChannelError, this->shared_from_this(), std::placeholders::_1));
|
||||
controlServiceChannel_->sendServiceDiscoveryResponse(serviceDiscoveryResponse, std::move(promise));
|
||||
controlServiceChannel_->receive(this->shared_from_this());
|
||||
|
||||
this->ping();
|
||||
}
|
||||
|
||||
void AndroidAutoEntity::onAudioFocusRequest(const aasdk::proto::messages::AudioFocusRequest& request)
|
||||
|
@ -205,10 +209,8 @@ void AndroidAutoEntity::onShutdownRequest(const aasdk::proto::messages::Shutdown
|
|||
|
||||
aasdk::proto::messages::ShutdownResponse response;
|
||||
auto promise = aasdk::channel::SendPromise::defer(strand_);
|
||||
promise->then([this, self = this->shared_from_this()]() {
|
||||
this->triggerQuit();
|
||||
},
|
||||
std::bind(&AndroidAutoEntity::onChannelError, this->shared_from_this(), std::placeholders::_1));
|
||||
promise->then(std::bind(&AndroidAutoEntity::triggerQuit, this->shared_from_this()),
|
||||
std::bind(&AndroidAutoEntity::onChannelError, this->shared_from_this(), std::placeholders::_1));
|
||||
|
||||
controlServiceChannel_->sendShutdownResponse(response, std::move(promise));
|
||||
controlServiceChannel_->receive(this->shared_from_this());
|
||||
|
@ -233,6 +235,14 @@ void AndroidAutoEntity::onNavigationFocusRequest(const aasdk::proto::messages::N
|
|||
controlServiceChannel_->receive(this->shared_from_this());
|
||||
}
|
||||
|
||||
void AndroidAutoEntity::onPingResponse(const aasdk::proto::messages::PingResponse&)
|
||||
{
|
||||
OPENAUTO_LOG(info) << "[AndroidAutoEntity] ping response";
|
||||
|
||||
pinger_->pong();
|
||||
controlServiceChannel_->receive(this->shared_from_this());
|
||||
}
|
||||
|
||||
void AndroidAutoEntity::onChannelError(const aasdk::error::Error& e)
|
||||
{
|
||||
OPENAUTO_LOG(error) << "[AndroidAutoEntity] channel error: " << e.what();
|
||||
|
@ -247,6 +257,26 @@ void AndroidAutoEntity::triggerQuit()
|
|||
}
|
||||
}
|
||||
|
||||
void AndroidAutoEntity::ping()
|
||||
{
|
||||
auto promise = IPinger::Promise::defer(strand_);
|
||||
promise->then([this, self = this->shared_from_this()]() {
|
||||
auto promise = aasdk::channel::SendPromise::defer(strand_);
|
||||
promise->then([]() {}, std::bind(&AndroidAutoEntity::onChannelError, this->shared_from_this(), std::placeholders::_1));
|
||||
|
||||
aasdk::proto::messages::PingRequest request;
|
||||
controlServiceChannel_->sendPingRequest(request, std::move(promise));
|
||||
|
||||
this->ping();
|
||||
},
|
||||
[this, self = this->shared_from_this()]() {
|
||||
OPENAUTO_LOG(error) << "[AndroidAutoEntity] ping timer exceeded.";
|
||||
this->triggerQuit();
|
||||
});
|
||||
|
||||
pinger_->ping(std::move(promise));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <f1x/aasdk/Messenger/Cryptor.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/AndroidAutoEntityFactory.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/AndroidAutoEntity.hpp>
|
||||
#include <f1x/openauto/autoapp/Projection/Pinger.hpp>
|
||||
|
||||
namespace f1x
|
||||
{
|
||||
|
@ -59,8 +60,9 @@ IAndroidAutoEntity::Pointer AndroidAutoEntityFactory::create(aasdk::transport::I
|
|||
{
|
||||
auto sslWrapper(std::make_shared<aasdk::transport::SSLWrapper>());
|
||||
auto cryptor(std::make_shared<aasdk::messenger::Cryptor>(std::move(sslWrapper)));
|
||||
auto pinger(std::make_shared<Pinger>(ioService_, 5000));
|
||||
|
||||
return std::make_shared<AndroidAutoEntity>(ioService_, std::move(cryptor), std::move(transport), configuration_, serviceFactory_);
|
||||
return std::make_shared<AndroidAutoEntity>(ioService_, std::move(cryptor), std::move(transport), configuration_, serviceFactory_, std::move(pinger));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,86 @@
|
|||
/*
|
||||
* This file is part of openauto project.
|
||||
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||
*
|
||||
* openauto is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
||||
* openauto is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <f1x/openauto/autoapp/Projection/Pinger.hpp>
|
||||
|
||||
namespace f1x
|
||||
{
|
||||
namespace openauto
|
||||
{
|
||||
namespace autoapp
|
||||
{
|
||||
namespace projection
|
||||
{
|
||||
|
||||
Pinger::Pinger(boost::asio::io_service& ioService, time_t duration)
|
||||
: strand_(ioService)
|
||||
, timer_(ioService)
|
||||
, duration_(duration)
|
||||
, pingsCount_(0)
|
||||
, pongsCount_(0)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void Pinger::ping(Promise::Pointer promise)
|
||||
{
|
||||
strand_.dispatch([this, self = this->shared_from_this(), promise = std::move(promise)]() mutable {
|
||||
++pingsCount_;
|
||||
|
||||
promise_ = std::move(promise);
|
||||
timer_.expires_from_now(boost::posix_time::milliseconds(duration_));
|
||||
timer_.async_wait(strand_.wrap(std::bind(&Pinger::onTimerExceeded, this->shared_from_this(), std::placeholders::_1)));
|
||||
});
|
||||
}
|
||||
|
||||
void Pinger::pong()
|
||||
{
|
||||
strand_.dispatch([this, self = this->shared_from_this()]() {
|
||||
++pongsCount_;
|
||||
});
|
||||
}
|
||||
|
||||
void Pinger::onTimerExceeded(const boost::system::error_code& error)
|
||||
{
|
||||
if(!error && promise_ != nullptr)
|
||||
{
|
||||
if(std::abs(pingsCount_ - pongsCount_) > 1)
|
||||
{
|
||||
promise_->reject();
|
||||
}
|
||||
else
|
||||
{
|
||||
promise_->resolve();
|
||||
}
|
||||
|
||||
promise_.reset();
|
||||
}
|
||||
}
|
||||
|
||||
void Pinger::cancel()
|
||||
{
|
||||
strand_.dispatch([this, self = this->shared_from_this()]() {
|
||||
promise_.reset();
|
||||
timer_.cancel();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -46,8 +46,6 @@ void ConnectDialog::onConnectButtonClicked()
|
|||
|
||||
try
|
||||
{
|
||||
tcpWrapper_.setKeepAliveOption(*socket, true);
|
||||
tcpWrapper_.setNoDelayOption(*socket, true);
|
||||
tcpWrapper_.asyncConnect(*socket, ipAddress, 5277, std::bind(&ConnectDialog::connectHandler, this, std::placeholders::_1, ipAddress, socket));
|
||||
}
|
||||
catch(const boost::system::system_error& se)
|
||||
|
|
Loading…
Reference in New Issue