mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
259becea04
* whitespaces + typo fixes * JS / LGTM fixes * SSDP Handler crash fix * MessageForwarder handlePriorityChanges Slave fixes * use aboutToQuit Signal * complete rewriten Hue Entertainment API structure combined Philips Hue and Entertainment API with new MbedTLS based SSL UDP Provider * add required cross-compile submodules * logical rebuild fn: initLeds, setLights + new logs -more detailed checks and error handling inside iniLeds and setLights - logical script procedure before ProviderUdpSSL init - first steps for multiple ProviderUdpSSL usage - better fallback support to old RestAPI, if entertainment api is not supported - just 4 u LordGrey: new log fn for cosmetic config outputs ;) * add OSX CompileHowTo - undo from CrossCompileHowTo * whitespace fixes * lightID toString fix * fix unsigned int E-API + debug output * bugfixes, reworked black signal detection, wizard: - change device config field light-ids from int to string -> real unsigned int fix - add signal detection brightness minimum threshold value 0.0 for 0% brightness - 1.0 for 100% brightness to count for blacklight signal detection reason: input may not 100% black, like mine - i have a deep dark gray input signal -> my threshold value is set to 0.005 for 0.5% minimum brightness = 1 (from max 255) to count as black - wizard optimations, with fallback without entertainment support (beta state) - whitespace fixes * cleanup + minor fixes * change fixed Hue UPD SSL config to _devConfig paras * Hotfix SSL Connection, new light models, wizard: - Fix UPD SSL Connection failed Problems - add new supported gamut C light models: LCG002, LCA001, LCA002, LCA003 - wizard: extend fallback support to classic mode + hints * whitespace, typo fix * uncheck useEntertainmentAPI, if noAPISupport detected + hint * coredump fix -> add _blackLightsTimer nullptr init * code cleanup / remove old debugs + whitespacefixes * add gamut C LCP001, LCP002 * SSL UDP config made more flexible + remove qDebug -> switch to hyerion.ng _log -> replace logCommand with verbose -> code cleanups etc... * extended mbedtls debugging infos * add adjustable ssl timeout settings * error handling * streamdebugger bugfixes * UPDSSL psk / psk_identity bugfixes! + hue wizard fn typo fix + - verbose option available without dependencies - whitespace fixes * Philips Hue Assistant now recognizes non-original bridges better... + Added note if no clientkey is set when using the entertainment API + User creation (+ clientkey) for non-original bridges can now also be used + Minor changes and bug fixes * CMAKE mbedTLS detection * minor bug fixes + code cleanups * FindMbedTLS.cmake remove Path-Hints + wizard.js: ajax timeout handling Test - content_grabber.js: run relevant code only, if V4L2_AVAIL is true: conf_grabber don't displays other devices, if V4L2 is not available * compile mbedtls via cmake as static lib * remove libmbedtls-dev from compileHowto / scripts * Fix Windows build * Fix windows build (part 2) * removed unnecessary osx x11 include directory path * QTimer Shutdown bugfix * cmake win32 fix + minor bugfixes * cmake debug msg used mbedtls libs * Bugfix: noSignalDetection wasn't switchedOn again if no signal was previously detected * Some code fixes based on alerts from lgtm.com Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com>
101 lines
2.5 KiB
C++
101 lines
2.5 KiB
C++
#pragma once
|
|
|
|
#include <ssdp/SSDPServer.h>
|
|
|
|
#include <QNetworkConfiguration>
|
|
|
|
// utils
|
|
#include <utils/settings.h>
|
|
|
|
class WebServer;
|
|
class QNetworkConfigurationManager;
|
|
|
|
///
|
|
/// Manage SSDP discovery. SimpleServiceDisoveryProtocol is the discovery subset of UPnP. Implemented is spec V1.0.
|
|
/// As SSDP requires a webserver, this class depends on it
|
|
/// UPnP 1.0: spec: http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.0.pdf
|
|
///
|
|
|
|
class SSDPHandler : public SSDPServer{
|
|
Q_OBJECT
|
|
public:
|
|
SSDPHandler(WebServer* webserver, const quint16& flatBufPort, const quint16& jsonServerPort, const QString &name, QObject * parent = nullptr);
|
|
~SSDPHandler();
|
|
|
|
///
|
|
/// @brief Sends BYE BYE and stop server
|
|
///
|
|
void stopServer();
|
|
|
|
public slots:
|
|
///
|
|
/// @brief Init SSDP after thread start
|
|
///
|
|
void initServer();
|
|
|
|
///
|
|
/// @brief get state changes from webserver
|
|
/// @param newState true for started and false for stopped
|
|
///
|
|
void handleWebServerStateChange(const bool newState);
|
|
|
|
///
|
|
/// @brief Handle settings update from Hyperion Settingsmanager emit
|
|
/// @param type settingyType from enum
|
|
/// @param config configuration object
|
|
///
|
|
void handleSettingsUpdate(const settings::type& type, const QJsonDocument& config);
|
|
|
|
private:
|
|
///
|
|
/// @brief Build http url for current ip:port/desc.xml
|
|
///
|
|
const QString getDescAddress();
|
|
|
|
///
|
|
/// @brief Get the base address
|
|
///
|
|
const QString getBaseAddress();
|
|
|
|
///
|
|
/// @brief Build the ssdp description (description.xml)
|
|
///
|
|
const QString buildDesc();
|
|
|
|
///
|
|
/// @brief Get the local address of interface
|
|
/// @return the address, might be empty
|
|
///
|
|
const QString getLocalAddress();
|
|
|
|
///
|
|
/// @brief Send alive/byebye message based on _deviceList
|
|
/// @param alive When true send alive, else byebye
|
|
///
|
|
void sendAnnounceList(const bool alive);
|
|
|
|
private slots:
|
|
///
|
|
/// @brief Handle the mSeach request from SSDPServer
|
|
/// @param target The ST service type
|
|
/// @param mx Answer with delay in s
|
|
/// @param address The ip of the caller
|
|
/// @param port The port of the caller
|
|
///
|
|
void handleMSearchRequest(const QString& target, const QString& mx, const QString address, const quint16 & port);
|
|
|
|
///
|
|
/// @brief Handle changes in the network configuration
|
|
/// @param conig New config
|
|
///
|
|
void handleNetworkConfigurationChanged(const QNetworkConfiguration &config);
|
|
|
|
private:
|
|
WebServer* _webserver;
|
|
QString _localAddress;
|
|
QNetworkConfigurationManager* _NCA;
|
|
QString _uuid;
|
|
/// Targets for announcement
|
|
std::vector<QString> _deviceList;
|
|
};
|