Various Fixes/Updates (hyperion-project#1549)

* Update FindWindowsSDK.cmake * cmake support libcec without version * Ensure Light-Ids are strings * Fix type - do not have dbus as requried * Fixing hyperion-project#1544 * Cleanup * CleanupFix hyperion-project#1551 * Consistently return instance number with JSON replies (hyperion-project#1504) * hyperion-remote- Fix extracting reply for configGet request * Qt 6.6 - Fix iterator finds * Fix test_image2ledsmap * Ensure window.currentHyperionInstanceName is set, cleanup system/log clipboard report * Address protobuf cmake warning * Update License * Update ChangeLog * Address CodeQL and clang findings
asturel · Feb 11, 2023 · aeb2c52 · aeb2c52
1 parent d77cde4
commit aeb2c52
Show file tree

Hide file tree

Showing 23 changed files with 187 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Restart correctly, if running as service (#1368)
+- Hue-Wizard: In case auto discovery failed, port 80 was not used as default (#1544)
+- Send only one reply per Start Instance request (#1551)
+- Add instance# in JSON-API replies (aligning to Add instance in websocket response to a subscription #1504 behaviour)
+- hyperion-remote: Extracting reply for a configGet request correctly (#1555) 
+
+### Technical
+- Add CodeQL for GitHub code scanning
+- Update to Protocol Buffers 3.21.12
+- cmake support of libcec without version in lib-name
+- Qt6 alignments
+- Refactor for Python 3.11 deprecated functions
 
 ## Removed
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014-2022 Hyperion Project
+Copyright (c) 2014-2023 Hyperion Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/assets/webconfig/js/content_index.js b/assets/webconfig/js/content_index.js
@@ -278,8 +278,9 @@ $(document).ready(function () {
       if (getStorage('lastSelectedInstance'))
         removeStorage('lastSelectedInstance')
 
-      currentHyperionInstance = 0;
-      currentHyperionInstanceName = getInstanceNameByIndex(0);
+      window.currentHyperionInstance = 0;
+      window.currentHyperionInstanceName = getInstanceNameByIndex(0);
+
       requestServerConfig();
       setTimeout(requestServerInfo, 100)
       setTimeout(requestTokenInfo, 200)
@@ -293,7 +294,7 @@ $(document).ready(function () {
       $('#btn_hypinstanceswitch').toggle(false)
 
     // update listing for button
-    updateUiOnInstance(currentHyperionInstance);
+    updateUiOnInstance(window.currentHyperionInstance);
     updateHyperionInstanceListing();
   });
 

diff --git a/assets/webconfig/js/content_logging.js b/assets/webconfig/js/content_logging.js
@@ -35,30 +35,45 @@ $(document).ready(function () {
   function infoSummary() {
     var info = "";
 
-    info += 'Hyperion System Summary Report (' + window.serverConfig.general.name + '), Reported instance: ' + window.currentHyperionInstanceName + '\n';
+    info += 'Hyperion System Summary Report (' + window.serverConfig.general.name + ')\n';
+    info += 'Reported instance: [' + window.currentHyperionInstance + '] - ' + window.currentHyperionInstanceName + '\n';
 
     info += "\n< ----- System information -------------------- >\n";
     info += getSystemInfo() + '\n';
 
     info += "\n< ----- Configured Instances ------------------ >\n";
     var instances = window.serverInfo.instance;
     for (var i = 0; i < instances.length; i++) {
-      info += instances[i].instance + ': ' + instances[i].friendly_name + ' Running: ' + instances[i].running + '\n';
+      info += instances[i].instance + ': ' + instances[i].friendly_name + ', Running: ' + instances[i].running + '\n';
     }
 
     info += "\n< ----- This instance's priorities ------------ >\n";
     var prios = window.serverInfo.priorities;
-    for (var i = 0; i < prios.length; i++) {
-      info += prios[i].priority + ': ';
-      if (prios[i].visible) {
-        info += ' VISIBLE!';
-      }
-      else {
-        info += '         ';
+
+    if (prios.length > 0) {
+
+      for (var i = 0; i < prios.length; i++) {
+
+        var prio = prios[i].priority.toString().padStart(3, '0');
+
+        info += prio + ': ';
+        if (prios[i].visible) {
+          info += ' VISIBLE   -';
+        }
+        else {
+          info += ' INVISIBLE -';
+        }
+        info += ' (' + prios[i].componentId + ')';
+        if (prios[i].owner) {
+          info += ' (Owner: ' + prios[i].owner + ')';
+        }
+        info += '\n';
+
       }
-      info += ' (' + prios[i].componentId + ') Owner: ' + prios[i].owner + '\n';
+    } else {
+      info += 'The current priority list is empty!\n';
     }
-    info += 'priorities_autoselect: ' + window.serverInfo.priorities_autoselect + '\n';
+    info += 'Autoselect: ' + window.serverInfo.priorities_autoselect + '\n';
 
     info += "\n< ----- This instance components' status ------->\n";
     var comps = window.serverInfo.components;
@@ -67,7 +82,7 @@ $(document).ready(function () {
     }
 
     info += "\n< ----- This instance's configuration --------- >\n";
-    info += JSON.stringify(window.serverConfig) + '\n';
+    info += JSON.stringify(window.serverConfig, null, 2) + '\n';
 
     info += "\n< ----- Current Log --------------------------- >\n";
     var logMsgs = document.getElementById("logmessages").textContent;
@@ -193,18 +208,19 @@ $(document).ready(function () {
   });
 
   // toggle fullscreen button in log output
-  $(".fullscreen-btn").mousedown(function(e) {
+  $(".fullscreen-btn").mousedown(function (e) {
     e.preventDefault();
   });
 
-  $(".fullscreen-btn").click(function(e) {
+  $(".fullscreen-btn").click(function (e) {
     e.preventDefault();
     $(this).children('i')
       .toggleClass('fa-expand')
       .toggleClass('fa-compress');
     $('#conf_cont').toggle();
-    $('#logmessages').css('max-height', $('#logmessages').css('max-height') !== 'none' ? 'none' : '400px' );
+    $('#logmessages').css('max-height', $('#logmessages').css('max-height') !== 'none' ? 'none' : '400px');
   });
 
   removeOverlay();
 });
+
diff --git a/assets/webconfig/js/ui_utils.js b/assets/webconfig/js/ui_utils.js
@@ -171,6 +171,10 @@ function initLanguageSelection() {
 }
 
 function updateUiOnInstance(inst) {
+
+  window.currentHyperionInstance = inst;
+  window.currentHyperionInstanceName = getInstanceNameByIndex(inst);
+
   $("#active_instance_friendly_name").text(getInstanceNameByIndex(inst));
   if (window.serverInfo.instance.filter(entry => entry.running).length > 1) {
     $('#btn_hypinstanceswitch').toggle(true);

diff --git a/assets/webconfig/js/wizard.js b/assets/webconfig/js/wizard.js
@@ -854,11 +854,17 @@ function checkUserResult(reply, usr) {
 
 function useGroupId(id) {
   $('#groupId').val(id);
-  groupLights = hueGroups[id].lights;
+
+  //Ensure ligthIDs are strings
+  groupLights = hueGroups[id].lights.map(num => {
+    return String(num);
+  });
+
   groupLightsLocations = hueGroups[id].locations;
   get_hue_lights();
 }
 
+
 async function discover_hue_bridges() {
   $('#wiz_hue_ipstate').html($.i18n('edt_dev_spec_devices_discovery_inprogress'));
   $('#wiz_hue_discovered').html("")
@@ -1016,11 +1022,11 @@ function beginWizardHue() {
     $('#host').val(host);
 
     var port = eV("port");
-    if (port > 0) {
-      $('#port').val(port);
+    if (port == 0) {
+      $('#port').val(80);
     }
     else {
-      $('#port').val('');
+      $('#port').val(port);
     }
     hueIPs.unshift({ host: host, port: port });
 
@@ -1037,7 +1043,13 @@ function beginWizardHue() {
 
       hueIPs = [];
       hueIPsinc = 0;
-      hueIPs.push({ host: $('#host').val(), port: $('#port').val() });
+
+      var port = $('#port').val();
+      if (isNaN(port) || port < 1 || port > 65535) {
+        port = 80;
+        $('#port').val(80);
+      }
+      hueIPs.push({ host: $('#host').val(), port: port });
     }
     else {
       discover_hue_bridges();

diff --git a/cmake/FindWindowsSDK.cmake b/cmake/FindWindowsSDK.cmake
@@ -1,4 +1,4 @@
-# - Find the Windows SDK aka Platform SDK
+# - Find the Windows SDK aka Platform SDK (from https://github.com/rpavlik/cmake-modules)
 #
 # Relevant Wikipedia article: http://en.wikipedia.org/wiki/Microsoft_Windows_SDK
 #
@@ -49,10 +49,11 @@
 # http://academic.cleardefinition.com
 # Iowa State University HCI Graduate Program/VRAC
 #
-# Copyright Iowa State University 2012.
+# Copyright 2012, Iowa State University
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
+# SPDX-License-Identifier: BSL-1.0
 
 set(_preferred_sdk_dirs) # pre-output
 set(_win_sdk_dirs) # pre-output
@@ -76,6 +77,9 @@ endmacro()
 # although version numbers listed on that page don't necessarily match the directory
 # used by the installer.
 set(_winsdk_win10vers
+	10.0.22000.0
+	10.0.20348.0
+	10.0.19041.0
 	10.0.18362.0 # Win10 1903 "19H1"
 	10.0.17763.0 # Win10 1809 "October 2018 Update"
 	10.0.17134.0 # Redstone 4 aka Win10 1803 "April 2018 Update"

diff --git a/cmake/packages.cmake b/cmake/packages.cmake
@@ -72,7 +72,7 @@ endif()
 # .deb files for apt
 # https://cmake.org/cmake/help/latest/cpack_gen/deb.html
 SET ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/package-scripts/preinst;${CMAKE_SOURCE_DIR}/cmake/package-scripts/postinst;${CMAKE_SOURCE_DIR}/cmake/package-scripts/prerm" )
-SET ( CPACK_DEBIAN_PACKAGE_DEPENDS "libcec6 | libcec4" )
+SET ( CPACK_DEBIAN_PACKAGE_DEPENDS "libcec6 | libcec4 | libcec (>= 4.0)" )
 SET ( CPACK_DEBIAN_PACKAGE_SECTION "Miscellaneous" )
 
 # .rpm for rpm

diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -150,7 +150,7 @@ if(ENABLE_PROTOBUF_SERVER)
 			set(protobuf_MSVC_STATIC_RUNTIME OFF CACHE BOOL "Build protobuf static")
 		endif()
 
-		add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf/cmake")
+		add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf")
 
 		# define the include for the protobuf library
 		set(PROTOBUF_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf/src")

diff --git a/include/mdns/MdnsBrowser.h b/include/mdns/MdnsBrowser.h
@@ -19,6 +19,7 @@
 
 // Utility includes
 #include <utils/Logger.h>
+#include <utils/WeakConnect.h>
 
 namespace {
 	constexpr std::chrono::milliseconds DEFAULT_DISCOVER_TIMEOUT{ 500 };
@@ -103,24 +104,6 @@ private slots:
 	void onServiceRemoved(const QMdnsEngine::Service& service);
 
 private:
-
-	template <typename Func1, typename Func2, typename std::enable_if_t<!std::is_member_pointer<Func2>::value, int> = 0>
-	static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
-		Func1 signal,
-		Func2 slot)
-	{
-		QMetaObject::Connection conn_normal = QObject::connect(sender, signal, slot);
-
-		QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
-
-		*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
-			QObject::disconnect(conn_normal);
-			QObject::disconnect(*conn_delete);
-			delete conn_delete;
-			});
-		return conn_normal;
-	}
-
 	/// The logger instance for mDNS-Service
 	Logger* _log;
 

diff --git a/include/utils/NetUtils.h b/include/utils/NetUtils.h
@@ -51,7 +51,7 @@ namespace NetUtils {
 	{
 		if ((port <= 0 || port > MAX_PORT) && port != -1)
 		{
-			Error(log, "Invalid port [%d] for host: (%s)! - Port must be in range [0 - %d]", port, QSTRING_CSTR(host), MAX_PORT);
+			Error(log, "Invalid port [%d] for host: (%s)! - Port must be in range [1 - %d]", port, QSTRING_CSTR(host), MAX_PORT);
 			return false;
 		}
 		return true;

diff --git a/include/utils/WeakConnect.h b/include/utils/WeakConnect.h
@@ -0,0 +1,63 @@
+#ifndef WEAKCONNECT_H
+#define WEAKCONNECT_H
+
+#include <type_traits>
+
+// Qt includes
+#include <QObject>
+
+template <typename Func1, typename Func2, typename std::enable_if_t<std::is_member_pointer<Func2>::value, int> = 0>
+static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
+												  Func1 signal,
+												  typename QtPrivate::FunctionPointer<Func2>::Object* receiver,
+												  Func2 slot)
+{
+	QMetaObject::Connection conn_normal = QObject::connect(sender, signal, receiver, slot);
+
+	QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
+
+	*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
+		QObject::disconnect(conn_normal);
+		QObject::disconnect(*conn_delete);
+		delete conn_delete;
+	});
+	return conn_normal;
+}
+
+template <typename Func1, typename Func2, typename std::enable_if_t<!std::is_member_pointer<Func2>::value, int> = 0>
+static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
+												  Func1 signal,
+												  Func2 slot)
+{
+	QMetaObject::Connection conn_normal = QObject::connect(sender, signal, slot);
+
+	QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
+
+	*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
+		QObject::disconnect(conn_normal);
+		QObject::disconnect(*conn_delete);
+		delete conn_delete;
+	});
+	return conn_normal;
+}
+
+template <typename Func1, typename Func2, typename std::enable_if_t<!std::is_member_pointer<Func2>::value, int> = 0>
+static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
+												  Func1 signal,
+												  typename QtPrivate::FunctionPointer<Func2>::Object* receiver,
+												  Func2 slot)
+{
+	Q_UNUSED(receiver);
+	QMetaObject::Connection conn_normal = QObject::connect(sender, signal, slot);
+
+	QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
+
+	*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
+		QObject::disconnect(conn_normal);
+		QObject::disconnect(*conn_delete);
+		delete conn_delete;
+	});
+	return conn_normal;
+}
+
+#endif // WEAKCONNECT_H