Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-04-24 06:40:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Retry slow SDR detection in ADS-B

Browse Source
This commit is contained in:
James Smith
2026-03-19 08:43:20 +00:00
parent 4410aa2433
commit 613258c3a2
1 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
templates/adsb_dashboard.html
View File

@@ -440,6 +440,7 @@
let panelSelectionStageTimer = null; let panelSelectionStageTimer = null;
let mapCrosshairRequestId = 0; let mapCrosshairRequestId = 0;
let detectedDevicesPromise = null; let detectedDevicesPromise = null;
let deviceDetectionRetryTimer = null;
let clockInterval = null; let clockInterval = null;
let cleanupInterval = null; let cleanupInterval = null;
let delayedGpsInitTimer = null; let delayedGpsInitTimer = null;
@@ -1733,6 +1734,7 @@ ACARS: ${r.statistics.acarsMessages} messages`;
if (delayedGpsInitTimer) { clearTimeout(delayedGpsInitTimer); delayedGpsInitTimer = null; } if (delayedGpsInitTimer) { clearTimeout(delayedGpsInitTimer); delayedGpsInitTimer = null; }
if (delayedDriverCheckTimer) { clearTimeout(delayedDriverCheckTimer); delayedDriverCheckTimer = null; } if (delayedDriverCheckTimer) { clearTimeout(delayedDriverCheckTimer); delayedDriverCheckTimer = null; }
if (delayedAircraftDbTimer) { clearTimeout(delayedAircraftDbTimer); delayedAircraftDbTimer = null; } if (delayedAircraftDbTimer) { clearTimeout(delayedAircraftDbTimer); delayedAircraftDbTimer = null; }
if (deviceDetectionRetryTimer) { clearTimeout(deviceDetectionRetryTimer); deviceDetectionRetryTimer = null; }
}); });
function ensureAdsbMapBootstrapped() { function ensureAdsbMapBootstrapped() {
@@ -1769,6 +1771,7 @@ ACARS: ${r.statistics.acarsMessages} messages`;
console.error('ADS-B Bias-T bootstrap warning:', e); console.error('ADS-B Bias-T bootstrap warning:', e);
} }
showDeviceDetectionPendingState();
initDeviceSelectors() initDeviceSelectors()
.then((devices) => checkAdsbTools(devices)) .then((devices) => checkAdsbTools(devices))
.catch((e) => { .catch((e) => {
@@ -1776,6 +1779,22 @@ ACARS: ${r.statistics.acarsMessages} messages`;
checkAdsbTools([]); checkAdsbTools([]);
}); });
deviceDetectionRetryTimer = setTimeout(() => {
deviceDetectionRetryTimer = null;
const adsbSelect = document.getElementById('adsbDeviceSelect');
const emptyText = adsbSelect?.options?.[0]?.textContent || '';
const stillWaitingForDevices = adsbSelect && adsbSelect.options.length === 1
&& /No SDR|Detecting SDR/i.test(emptyText);
if (!stillWaitingForDevices) return;
initDeviceSelectors(true, 20000)
.then((devices) => checkAdsbTools(devices))
.catch((e) => {
console.error('ADS-B device selector retry warning:', e);
});
}, 6000);
try { try {
updateClock(); updateClock();
clockInterval = setInterval(updateClock, 1000); clockInterval = setInterval(updateClock, 1000);
@@ -1848,21 +1867,46 @@ ACARS: ${r.statistics.acarsMessages} messages`;
}); });
} }
function getDetectedDevices(force = false) { function showDeviceDetectionPendingState() {
populateCompositeDeviceSelect(document.getElementById('adsbDeviceSelect'), [], 'Detecting SDRs...');
populateCompositeDeviceSelect(document.getElementById('airbandDeviceSelect'), [], 'Detecting SDRs...');
populateCompositeDeviceSelect(document.getElementById('acarsDeviceSelect'), [], 'Detecting SDRs...');
populateCompositeDeviceSelect(document.getElementById('vdl2DeviceSelect'), [], 'Detecting SDRs...');
}
function getDetectedDevices(force = false, timeoutMs = 12000) {
if (force) {
detectedDevicesPromise = null;
}
if (!force && detectedDevicesPromise) { if (!force && detectedDevicesPromise) {
return detectedDevicesPromise; return detectedDevicesPromise;
} }
detectedDevicesPromise = fetchJsonWithTimeout('/devices', {}, 4000)
detectedDevicesPromise = fetchJsonWithTimeout('/devices', {}, timeoutMs)
.then((r) => r.ok ? r.json() : []) .then((r) => r.ok ? r.json() : [])
.then((devices) => {
if (!Array.isArray(devices)) {
detectedDevicesPromise = null;
return [];
}
if (devices.length === 0) {
detectedDevicesPromise = null;
}
return devices;
})
.catch((err) => { .catch((err) => {
console.warn('[ADS-B] Device detection failed:', err?.message || err); console.warn('[ADS-B] Device detection failed:', err?.message || err);
detectedDevicesPromise = null;
return []; return [];
}); });
return detectedDevicesPromise; return detectedDevicesPromise;
} }
function initDeviceSelectors() { function initDeviceSelectors(force = false, timeoutMs = 12000) {
return getDetectedDevices().then((devices) => { return getDetectedDevices(force, timeoutMs).then((devices) => {
const adsbSelect = document.getElementById('adsbDeviceSelect'); const adsbSelect = document.getElementById('adsbDeviceSelect');
const airbandSelect = document.getElementById('airbandDeviceSelect'); const airbandSelect = document.getElementById('airbandDeviceSelect');
const acarsSelect = document.getElementById('acarsDeviceSelect'); const acarsSelect = document.getElementById('acarsDeviceSelect');