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:
LordGrey
GitHub
@@ -11,6 +11,9 @@ $(document).ready(function () {
|
||||
var conf_editor_fbs = null;
|
||||
var conf_editor_forw = null;
|
||||
|
||||
// Service properties , 2-dimensional array of [servicetype][id]
|
||||
discoveredRemoteServices = {};
|
||||
|
||||
addJsonEditorHostValidation();
|
||||
|
||||
if (window.showOptHelp) {
|
||||
@@ -142,10 +145,21 @@ $(document).ready(function () {
|
||||
forwarder: window.schema.forwarder
|
||||
}, true, true);
|
||||
|
||||
conf_editor_forw.on('ready', function () {
|
||||
|
||||
updateServiceCacheForwarderConfiguredItems("jsonapi");
|
||||
updateServiceCacheForwarderConfiguredItems("flatbuffer");
|
||||
|
||||
var forwarderEnable = conf_editor_forw.getEditor("root.forwarder.enable").getValue();
|
||||
if (forwarderEnable) {
|
||||
discoverRemoteHyperionServices("jsonapi");
|
||||
discoverRemoteHyperionServices("flatbuffer");
|
||||
}
|
||||
});
|
||||
|
||||
conf_editor_forw.on('change', function () {
|
||||
var forwarderEnable = conf_editor_forw.getEditor("root.forwarder.enable").getValue();
|
||||
if (forwarderEnable) {
|
||||
showInputOptionsForKey(conf_editor_forw, "forwarder", "enable", true);
|
||||
$('#forwarderHelpPanelId').show();
|
||||
} else {
|
||||
showInputOptionsForKey(conf_editor_forw, "forwarder", "enable", false);
|
||||
@@ -154,6 +168,23 @@ $(document).ready(function () {
|
||||
conf_editor_forw.validate().length || window.readOnlyMode ? $('#btn_submit_forwarder').prop('disabled', true) : $('#btn_submit_forwarder').prop('disabled', false);
|
||||
});
|
||||
|
||||
conf_editor_forw.watch('root.forwarder.jsonapiselect', () => {
|
||||
updateForwarderServiceSections("jsonapi");
|
||||
});
|
||||
|
||||
conf_editor_forw.watch('root.forwarder.flatbufferselect', () => {
|
||||
updateForwarderServiceSections("flatbuffer");
|
||||
});
|
||||
|
||||
conf_editor_forw.watch('root.forwarder.enable', () => {
|
||||
|
||||
var forwarderEnable = conf_editor_forw.getEditor("root.forwarder.enable").getValue();
|
||||
if (forwarderEnable) {
|
||||
discoverRemoteHyperionServices("jsonapi");
|
||||
discoverRemoteHyperionServices("flatbuffer");
|
||||
}
|
||||
});
|
||||
|
||||
$('#btn_submit_forwarder').off().on('click', function () {
|
||||
requestWriteConfig(conf_editor_forw.getValue());
|
||||
});
|
||||
@@ -238,5 +269,143 @@ $(document).ready(function () {
|
||||
checkApiTokenState(window.serverConfig.network.apiAuth);
|
||||
|
||||
removeOverlay();
|
||||
|
||||
function updateForwarderServiceSections(type) {
|
||||
|
||||
var editorPath = "root.forwarder." + type
|
||||
var selectedServices = conf_editor_forw.getEditor(editorPath + "select").getValue();
|
||||
|
||||
if (jQuery.isEmptyObject(selectedServices) || selectedServices[0] === "NONE") {
|
||||
conf_editor_forw.getEditor(editorPath).setValue([]);
|
||||
showInputOptionForItem(conf_editor_forw, "forwarder", type, false);
|
||||
} else {
|
||||
|
||||
var newServices = [];
|
||||
for (var i = 0; i < selectedServices.length; ++i) {
|
||||
|
||||
var service = discoveredRemoteServices[type][selectedServices[i]];
|
||||
var newrecord = {};
|
||||
|
||||
newrecord.name = service.name;
|
||||
newrecord.host = service.host;
|
||||
newrecord.port = service.port;
|
||||
|
||||
newServices.push(newrecord);
|
||||
}
|
||||
conf_editor_forw.getEditor(editorPath).setValue(newServices);
|
||||
|
||||
showInputOptionForItem(conf_editor_forw, "forwarder", type, true);
|
||||
conf_editor_forw.getEditor(editorPath).disable();
|
||||
}
|
||||
}
|
||||
|
||||
function updateForwarderSelectList(type) {
|
||||
|
||||
var selectionElement = type + "select"
|
||||
|
||||
var enumVals = [];
|
||||
var enumTitelVals = [];
|
||||
var enumDefaultVals = [];
|
||||
|
||||
for (var key in discoveredRemoteServices[type]) {
|
||||
|
||||
var service = discoveredRemoteServices[type][key];
|
||||
enumVals.push(service.host);
|
||||
enumTitelVals.push(service.name);
|
||||
|
||||
if (service.inConfig == true) {
|
||||
enumDefaultVals.push(service.host);
|
||||
}
|
||||
}
|
||||
|
||||
let addSchemaElements = {
|
||||
"uniqueItems": true
|
||||
};
|
||||
|
||||
if (jQuery.isEmptyObject(enumVals)) {
|
||||
enumVals.push("NONE");
|
||||
enumTitelVals.push($.i18n('edt_conf_fw_remote_service_discovered_none'));
|
||||
}
|
||||
|
||||
updateJsonEditorMultiSelection(conf_editor_forw, 'root.forwarder', selectionElement, addSchemaElements, enumVals, enumTitelVals, enumDefaultVals);
|
||||
};
|
||||
|
||||
function updateServiceCacheForwarderConfiguredItems(serviceType) {
|
||||
|
||||
var editor = conf_editor_forw.getEditor("root.forwarder." + serviceType);
|
||||
|
||||
if (editor) {
|
||||
if (!discoveredRemoteServices[serviceType]) {
|
||||
discoveredRemoteServices[serviceType] = {};
|
||||
}
|
||||
|
||||
var configuredServices = JSON.parse(JSON.stringify(editor.getValue('items')));
|
||||
for (const service of configuredServices) {
|
||||
|
||||
//Handle not named sceanrios
|
||||
if (!service.name) {
|
||||
service.name = service.host;
|
||||
}
|
||||
|
||||
service.inConfig = true;
|
||||
|
||||
discoveredRemoteServices[serviceType][service.host] = service;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function updateRemoteServiceCache(discoveryInfo) {
|
||||
|
||||
for (var serviceType in discoveryInfo) {
|
||||
|
||||
if (!discoveredRemoteServices[serviceType]) {
|
||||
discoveredRemoteServices[serviceType] = {};
|
||||
}
|
||||
|
||||
var discoveredServices = discoveryInfo[serviceType];
|
||||
for (const service of discoveredServices) {
|
||||
|
||||
if (!service.sameHost)
|
||||
{
|
||||
//Handle non mDNS sceanrios
|
||||
if (!service.name) {
|
||||
service.name = service.host;
|
||||
} else {
|
||||
service.host = service.service;
|
||||
}
|
||||
|
||||
if (discoveredRemoteServices[serviceType][service.host]) {
|
||||
service.inConfig = true;
|
||||
}
|
||||
|
||||
discoveredRemoteServices[serviceType][service.host] = service;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
async function discoverRemoteHyperionServices(type, params) {
|
||||
|
||||
const result = await requestServiceDiscovery(type, params);
|
||||
|
||||
var discoveryResult;
|
||||
if (result && !result.error) {
|
||||
discoveryResult = result.info;
|
||||
}
|
||||
else {
|
||||
discoveryResult = {
|
||||
"services": []
|
||||
};
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
case "jsonapi":
|
||||
case "flatbuffer":
|
||||
updateRemoteServiceCache(discoveryResult.services);
|
||||
updateForwarderSelectList(type);
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user