Improved HyperHDR web server startup (awawa-dev#351)

* Improved webserver start * Wait for the start report from all instances * Fix web page loader
chbartsch · Nov 29, 2022 · 2b62659 · 2b62659
1 parent 2baef95
commit 2b62659
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/assets/webconfig/js/ui_utils.js b/assets/webconfig/js/ui_utils.js
@@ -72,7 +72,11 @@ function loadContent(event, forceRefresh)
 		if ((typeof lastSelectedInstance !== 'undefined') && 
 			(typeof window.serverInfo.instance[lastSelectedInstance] !== 'undefined') &&
 			 typeof(window.serverInfo.instance[lastSelectedInstance].running) !== 'undefined' && window.serverInfo.instance[lastSelectedInstance].running)
+		{
+			$("#page-content").off();
 			instanceSwitch(lastSelectedInstance);
+			return;
+		}
 		else
 			removeStorage('lastSelectedInstance', false);
 

diff --git a/include/base/HyperHdrIManager.h b/include/base/HyperHdrIManager.h
@@ -37,6 +37,7 @@ class HyperHdrIManager : public QObject
 	static HyperHdrIManager* getInstance() { return HIMinstance; }
 	static HyperHdrIManager* HIMinstance;
 	QString getRootPath() { return _rootPath; }
+	bool areInstancesReady();
 
 public slots:
 	bool isCEC();
@@ -193,11 +194,12 @@ private slots:
 private:
 	Logger* _log;
 	InstanceTable* _instanceTable;
-	const QString _rootPath;
+	const QString	_rootPath;
 	QMap<quint8, HyperHdrInstance*> _runningInstances;
-	QList<quint8> _startQueue;
+	QList<quint8>	_startQueue;
 
-	bool _readonlyMode;
+	bool	_readonlyMode;
+	int		_fireStarter;
 
 	/// All pending requests
 	QMap<quint8, PendingRequests> _pendingRequests;

diff --git a/sources/base/HyperHdrIManager.cpp b/sources/base/HyperHdrIManager.cpp
@@ -15,6 +15,7 @@ HyperHdrIManager::HyperHdrIManager(const QString& rootPath, QObject* parent, boo
 	, _instanceTable(new InstanceTable(rootPath, this, readonlyMode))
 	, _rootPath(rootPath)
 	, _readonlyMode(readonlyMode)
+	, _fireStarter(0)
 {
 	HIMinstance = this;
 	qRegisterMetaType<InstanceState>("InstanceState");
@@ -59,9 +60,21 @@ QVector<QVariantMap> HyperHdrIManager::getInstanceData() const
 	return instances;
 }
 
+bool HyperHdrIManager::areInstancesReady()
+{
+	if (_fireStarter > 0)
+		_fireStarter--;
+
+	return (_fireStarter < 1);
+}
+
 void HyperHdrIManager::startAll()
 {
-	for (const auto& entry : _instanceTable->getAllInstances(true))
+	auto instanceList = _instanceTable->getAllInstances(true);
+
+	_fireStarter = instanceList.count();
+
+	for (const auto& entry : instanceList)
 	{
 		startInstance(entry["instance"].toInt());
 	}

diff --git a/sources/hyperhdr/hyperhdr.cpp b/sources/hyperhdr/hyperhdr.cpp
@@ -186,6 +186,18 @@ HyperHdrDaemon::HyperHdrDaemon(const QString& rootPath, QObject* parent, bool lo
 
 void HyperHdrDaemon::instanceStateChanged(InstanceState state, quint8 instance, const QString& name)
 {
+	// start web server if needed
+	if (state == InstanceState::H_STARTED)
+	{
+		if (_instanceManager->areInstancesReady())
+		{
+			if (_webserver != nullptr && !_webserver->thread()->isRunning())
+				_webserver->thread()->start();
+			if (_sslWebserver != nullptr && !_sslWebserver->thread()->isRunning())
+				_sslWebserver->thread()->start();
+		}
+	}
+
 	// cec
 	updateCEC();
 }
@@ -331,7 +343,6 @@ void HyperHdrDaemon::startNetworkServices()
 	connect(wsThread, &QThread::started, _webserver, &WebServer::initServer);
 	connect(wsThread, &QThread::finished, _webserver, &WebServer::deleteLater);
 	connect(this, &HyperHdrDaemon::settingsChanged, _webserver, &WebServer::handleSettingsUpdate);
-	wsThread->start();
 
 	// Create SSL Webserver in thread
 	_sslWebserver = new WebServer(getSetting(settings::type::WEBSERVER), true);
@@ -341,7 +352,6 @@ void HyperHdrDaemon::startNetworkServices()
 	connect(sslWsThread, &QThread::started, _sslWebserver, &WebServer::initServer);
 	connect(sslWsThread, &QThread::finished, _sslWebserver, &WebServer::deleteLater);
 	connect(this, &HyperHdrDaemon::settingsChanged, _sslWebserver, &WebServer::handleSettingsUpdate);
-	sslWsThread->start();
 
 	// Create SSDP server in thread
 	_ssdp = new SSDPHandler(_webserver,

diff --git a/sources/hyperhdr/hyperhdr.h b/sources/hyperhdr/hyperhdr.h
@@ -118,11 +118,6 @@ class HyperHdrDaemon : public QObject
 	HyperHdrDaemon(const QString& rootPath, QObject* parent, bool logLvlOverwrite, bool readonlyMode = false, QStringList params = QStringList());
 	~HyperHdrDaemon();
 
-	///
-	/// @brief Get webserver pointer (systray)
-	///
-	WebServer* getWebServerInstance() { return _webserver; }
-
 	///
 	/// @brief get the settings
 	///