mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
mDNS Support (#1452)
* Allow build, if no grabbers are enabled * Align available functions to right Qt version * Update to next development version * Align available functions to right Qt version * fix workflows (apt/nightly) * Disable QNetworkConfigurationManager deprecation warnings * Initial go on Smart Pointers * Add Deallocation * Correct QT_WARNING_DISABLE_DEPRECATED (available since 5.9) * Cluster Build Variables * Hyperion Light * Address build warnings * Hyperion Light - UI * Update Protobuf to latest master * Removed compiler warnings * Added restart ability to systray * Correct Protobuf * Ignore 'no-return' warning on protobuf build * hyperion-remote: Fix auto discovery of hyperion server * Fix Qt version override * Update changelog * Remove Grabber Components, if no Grabber exists * Standalone Grabber - Fix fps default * Remote Control - Have Source Selction accrosswhole screen * Enable Blackborder detection only, if relevant input sources available * Enable Blackborder detection only, if relevant input sources available * Remote UI - rearrange containers * Checkout * Fix compilation on windows * Re-added qmdnsengine template cmake * chrono added for linux * Removed existing AVAHI/Bonjour, allow to enable/disable mDNS * hyperiond macos typo fix * Fix macOS Bundle build * Fix macOS bundle info details * Correct CMake files * Removed existing AVAHI/Bonjour (2) * Share hyperion's services via mDNS * Add mDNS Browser and mDNS for LED-Devices * Support mDNS discovery for standalone grabbers * Remove ZLib Dependency & Cleanup * mDNS - hanle 2.local2 an ".local." domains equally * Hue - Link discovery to bridge class, workaround port 443 for mDNS discovery * Fix save button state when switching between devices * Removed sessions (of other hyperions) * mDNS Publisher - Simplify service naming * mDNS refactoring & Forwarder discovery * mDNS Updates to use device service name * Consistency of standalone grabbers with mDNS Service Registry * Merge branch 'hyperion-project:master' into mDNS * Start JSON and WebServers only after Instance 0 is available * Remove bespoke qDebug Output again * MDNS updates and refactor Forwarder * Minor updates * Upgrade to CMake 3.1 * typo * macOS fix * Correct merge * - Remove dynamic linker flag from standalone dispmanX Grabber - Added ability to use system qmdns libs * Cec handler library will load at runtime * typo fix * protobuf changes * mDNS changes for Windows/macOS * test window build qmdnsengine * absolute path to protobuf cmake dir * Rework Hue Wizard supporting mDNS * LED-Devices - Retry support + Refactoring (excl. Hue) * LED-Devices - Refactoring/Retry support Hue + additional alignments * Address LGTM findings * Fix CI-Build, revert test changes * Build Windows in Release mode to avoid python problem * Correct that WebServerObject is available earlier * Ensure that instance name in logs for one instance are presented * Update content LEDs * Rework mDNS Address lookup * Fix LED UI * Fix for non mDNS Services (ignore default port) * Disbale device when now input is available * Revert back some updates, ensure last color is updated when switched on * Handle reopening case and changed IP, port for API-calls * Add UPD-DDP Device * WLED support for DDP * Fix printout * LEDDevice - Allow more retries, udapte defaults * LED-Net Devices - Select Custom device, if configured Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Co-authored-by: Paulchen Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
@@ -14,31 +14,22 @@ function storageComp() {
|
||||
return false;
|
||||
}
|
||||
|
||||
function getStorage(item, session) {
|
||||
function getStorage(item) {
|
||||
if (storageComp()) {
|
||||
if (session === true)
|
||||
return sessionStorage.getItem(item);
|
||||
else
|
||||
return localStorage.getItem(item);
|
||||
return localStorage.getItem(item);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function setStorage(item, value, session) {
|
||||
function setStorage(item, value) {
|
||||
if (storageComp()) {
|
||||
if (session === true)
|
||||
sessionStorage.setItem(item, value);
|
||||
else
|
||||
localStorage.setItem(item, value);
|
||||
localStorage.setItem(item, value);
|
||||
}
|
||||
}
|
||||
|
||||
function removeStorage(item, session) {
|
||||
function removeStorage(item) {
|
||||
if (storageComp()) {
|
||||
if (session === true)
|
||||
sessionStorage.removeItem(item);
|
||||
else
|
||||
localStorage.removeItem(item);
|
||||
localStorage.removeItem(item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,23 +39,6 @@ function debugMessage(msg) {
|
||||
}
|
||||
}
|
||||
|
||||
function updateSessions() {
|
||||
var sess = window.serverInfo.sessions;
|
||||
if (sess && sess.length) {
|
||||
window.wSess = [];
|
||||
for (var i = 0; i < sess.length; i++) {
|
||||
if (sess[i].type == "_http._tcp." || sess[i].type == "_https._tcp." || sess[i].type == "_hyperiond-http._tcp.") {
|
||||
window.wSess.push(sess[i]);
|
||||
}
|
||||
}
|
||||
|
||||
if (window.wSess.length > 1)
|
||||
$('#btn_instanceswitch').toggle(true);
|
||||
else
|
||||
$('#btn_instanceswitch').toggle(false);
|
||||
}
|
||||
}
|
||||
|
||||
function validateDuration(d) {
|
||||
if (typeof d === "undefined" || d < 0)
|
||||
return ENDLESS;
|
||||
@@ -73,8 +47,8 @@ function validateDuration(d) {
|
||||
}
|
||||
|
||||
function getHashtag() {
|
||||
if (getStorage('lasthashtag', true) != null)
|
||||
return getStorage('lasthashtag', true);
|
||||
if (getStorage('lasthashtag') != null)
|
||||
return getStorage('lasthashtag');
|
||||
else {
|
||||
var tag = document.URL;
|
||||
tag = tag.substr(tag.indexOf("#") + 1);
|
||||
@@ -87,20 +61,20 @@ function getHashtag() {
|
||||
function loadContent(event, forceRefresh) {
|
||||
var tag;
|
||||
|
||||
var lastSelectedInstance = getStorage('lastSelectedInstance', false);
|
||||
var lastSelectedInstance = getStorage('lastSelectedInstance');
|
||||
|
||||
if (lastSelectedInstance && (lastSelectedInstance != window.currentHyperionInstance)) {
|
||||
if (window.serverInfo.instance[lastSelectedInstance] && window.serverInfo.instance[lastSelectedInstance].running) {
|
||||
instanceSwitch(lastSelectedInstance);
|
||||
} else {
|
||||
removeStorage('lastSelectedInstance', false);
|
||||
removeStorage('lastSelectedInstance');
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof event != "undefined") {
|
||||
tag = event.currentTarget.hash;
|
||||
tag = tag.substr(tag.indexOf("#") + 1);
|
||||
setStorage('lasthashtag', tag, true);
|
||||
setStorage('lasthashtag', tag);
|
||||
}
|
||||
else
|
||||
tag = getHashtag();
|
||||
@@ -112,7 +86,7 @@ function loadContent(event, forceRefresh) {
|
||||
if (status == "error") {
|
||||
tag = 'dashboard';
|
||||
console.log("Could not find page:", prevTag, ", Redirecting to:", tag);
|
||||
setStorage('lasthashtag', tag, true);
|
||||
setStorage('lasthashtag', tag);
|
||||
|
||||
$("#page-content").load("/content/" + tag + ".html", function (response, status, xhr) {
|
||||
if (status == "error") {
|
||||
@@ -215,7 +189,7 @@ function instanceSwitch(inst) {
|
||||
requestInstanceSwitch(inst)
|
||||
window.currentHyperionInstance = inst;
|
||||
window.currentHyperionInstanceName = getInstanceNameByIndex(inst);
|
||||
setStorage('lastSelectedInstance', inst, false)
|
||||
setStorage('lastSelectedInstance', inst)
|
||||
updateHyperionInstanceListing()
|
||||
}
|
||||
|
||||
@@ -332,7 +306,7 @@ function showInfoDialog(type, header, message) {
|
||||
if (type == "select" || type == "iswitch")
|
||||
$('#id_body').append('<select id="id_select" class="form-control" style="margin-top:10px;width:auto;"></select>');
|
||||
|
||||
if (getStorage("darkMode", false) == "on")
|
||||
if (getStorage("darkMode") == "on")
|
||||
$('#id_logo').attr("src", 'img/hyperion/logo_negativ.png');
|
||||
|
||||
$(type == "renInst" || type == "changePassword" ? "#modal_dialog_rename" : "#modal_dialog").modal({
|
||||
@@ -1246,7 +1220,7 @@ function handleDarkMode() {
|
||||
href: "../css/darkMode.css"
|
||||
}).appendTo("head");
|
||||
|
||||
setStorage("darkMode", "on", false);
|
||||
setStorage("darkMode", "on");
|
||||
$('#btn_darkmode_icon').removeClass('fa fa-moon-o');
|
||||
$('#btn_darkmode_icon').addClass('mdi mdi-white-balance-sunny');
|
||||
$('#navbar_brand_logo').attr("src", 'img/hyperion/logo_negativ.png');
|
||||
@@ -1337,7 +1311,16 @@ function isValidIPv6(value) {
|
||||
|
||||
function isValidHostname(value) {
|
||||
if (value.match(
|
||||
'(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{0,62}[a-zA-Z0-9].)+[a-zA-Z]{2,63}$)'
|
||||
'^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[_a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$'
|
||||
))
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
function isValidServicename(value) {
|
||||
if (value.match(
|
||||
'^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9 \-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[_a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$'
|
||||
))
|
||||
return true;
|
||||
else
|
||||
@@ -1349,6 +1332,5 @@ function isValidHostnameOrIP4(value) {
|
||||
}
|
||||
|
||||
function isValidHostnameOrIP(value) {
|
||||
return (isValidHostnameOrIP4(value) || isValidIPv6(value));
|
||||
return (isValidHostnameOrIP4(value) || isValidIPv6(value) || isValidServicename(value));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user