Upgrade reporting
This commit is contained in:
@@ -2224,6 +2224,7 @@ function requestJson(command=null)
|
|||||||
if (json.info) {
|
if (json.info) {
|
||||||
let i = json.info;
|
let i = json.info;
|
||||||
parseInfo(i);
|
parseInfo(i);
|
||||||
|
checkVersionUpgrade(i); // Check for version upgrade
|
||||||
populatePalettes(i);
|
populatePalettes(i);
|
||||||
if (isInfo) populateInfo(i);
|
if (isInfo) populateInfo(i);
|
||||||
}
|
}
|
||||||
@@ -3681,6 +3682,181 @@ function mergeDeep(target, ...sources)
|
|||||||
}
|
}
|
||||||
return mergeDeep(target, ...sources);
|
return mergeDeep(target, ...sources);
|
||||||
}
|
}
|
||||||
|
// Version reporting feature
|
||||||
|
var versionCheckDone = false;
|
||||||
|
|
||||||
|
function checkVersionUpgrade(info) {
|
||||||
|
// Only check once per page load
|
||||||
|
if (versionCheckDone) return;
|
||||||
|
versionCheckDone = true;
|
||||||
|
|
||||||
|
// Fetch version-info.json using existing /edit endpoint
|
||||||
|
fetch('/edit?edit=version-info.json', {
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
.then(res => {
|
||||||
|
if (res.status === 404) {
|
||||||
|
// File doesn't exist - first install, show install prompt
|
||||||
|
showVersionUpgradePrompt(info, null, info.ver);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new Error('Failed to fetch version-info.json');
|
||||||
|
}
|
||||||
|
return res.json();
|
||||||
|
})
|
||||||
|
.then(versionInfo => {
|
||||||
|
if (!versionInfo) return; // 404 case already handled
|
||||||
|
|
||||||
|
// Check if user opted out
|
||||||
|
if (versionInfo.neverAsk) return;
|
||||||
|
|
||||||
|
// Check if version has changed
|
||||||
|
const currentVersion = info.ver;
|
||||||
|
const storedVersion = versionInfo.version || '';
|
||||||
|
|
||||||
|
if (storedVersion && storedVersion !== currentVersion) {
|
||||||
|
// Version has changed, show upgrade prompt
|
||||||
|
showVersionUpgradePrompt(info, storedVersion, currentVersion);
|
||||||
|
} else if (!storedVersion) {
|
||||||
|
// Empty version in file, show install prompt
|
||||||
|
showVersionUpgradePrompt(info, null, currentVersion);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(e => {
|
||||||
|
console.log('Failed to load version-info.json', e);
|
||||||
|
// On error, save current version for next time
|
||||||
|
if (info && info.ver) {
|
||||||
|
updateVersionInfo(info.ver, false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function showVersionUpgradePrompt(info, oldVersion, newVersion) {
|
||||||
|
// Determine if this is an install or upgrade
|
||||||
|
const isInstall = !oldVersion;
|
||||||
|
|
||||||
|
// Create overlay and dialog
|
||||||
|
const overlay = d.createElement('div');
|
||||||
|
overlay.id = 'versionUpgradeOverlay';
|
||||||
|
overlay.style.cssText = 'position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.7);z-index:10000;display:flex;align-items:center;justify-content:center;';
|
||||||
|
|
||||||
|
const dialog = d.createElement('div');
|
||||||
|
dialog.style.cssText = 'background:var(--c-1);border-radius:10px;padding:25px;max-width:500px;margin:20px;box-shadow:0 4px 6px rgba(0,0,0,0.3);';
|
||||||
|
|
||||||
|
// Build contextual message based on install vs upgrade
|
||||||
|
const title = isInstall
|
||||||
|
? '🎉 Thank you for installing WLED!'
|
||||||
|
: '🎉 WLED Upgrade Detected!';
|
||||||
|
|
||||||
|
const description = isInstall
|
||||||
|
? `You are now running WLED <strong>${newVersion}</strong>.`
|
||||||
|
: `Your WLED has been upgraded from <strong>${oldVersion}</strong> to <strong>${newVersion}</strong>.`;
|
||||||
|
|
||||||
|
const question = 'Would you like to help the WLED development team by reporting your installation? This helps us understand what hardware and versions are being used.'
|
||||||
|
|
||||||
|
dialog.innerHTML = `
|
||||||
|
<h2 style="margin-top:0;color:var(--c-f);">${title}</h2>
|
||||||
|
<p style="color:var(--c-f);">${description}</p>
|
||||||
|
<p style="color:var(--c-f);">${question}</p>
|
||||||
|
<div style="margin-top:20px;">
|
||||||
|
<button id="versionReportYes" class="btn">Yes</button>
|
||||||
|
<button id="versionReportNo" class="btn">Not Now</button>
|
||||||
|
<button id="versionReportNever" class="btn">Never Ask</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
overlay.appendChild(dialog);
|
||||||
|
d.body.appendChild(overlay);
|
||||||
|
|
||||||
|
// Add event listeners
|
||||||
|
gId('versionReportYes').addEventListener('click', () => {
|
||||||
|
reportUpgradeEvent(oldVersion, newVersion);
|
||||||
|
d.body.removeChild(overlay);
|
||||||
|
});
|
||||||
|
|
||||||
|
gId('versionReportNo').addEventListener('click', () => {
|
||||||
|
// Don't update version, will ask again on next load
|
||||||
|
d.body.removeChild(overlay);
|
||||||
|
});
|
||||||
|
|
||||||
|
gId('versionReportNever').addEventListener('click', () => {
|
||||||
|
updateVersionInfo(newVersion, true);
|
||||||
|
d.body.removeChild(overlay);
|
||||||
|
showToast('You will not be asked again.');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function reportUpgradeEvent(oldVersion, newVersion) {
|
||||||
|
showToast('Reporting upgrade...');
|
||||||
|
|
||||||
|
// Fetch fresh data from /json/info endpoint as requested
|
||||||
|
fetch('/json/info', {
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(infoData => {
|
||||||
|
// Map to UpgradeEventRequest structure per OpenAPI spec
|
||||||
|
// Required fields: deviceId, version, previousVersion, releaseName, chip, ledCount, isMatrix, bootloaderSHA256
|
||||||
|
const upgradeData = {
|
||||||
|
deviceId: infoData.deviceId,
|
||||||
|
version: infoData.ver || '', // Current version string
|
||||||
|
previousVersion: oldVersion || '', // Previous version from version-info.json
|
||||||
|
releaseName: infoData.release,
|
||||||
|
chip: infoData.arch || '', // Chip architecture (esp32, esp8266, etc)
|
||||||
|
ledCount: infoData.leds ? infoData.leds.count : 0, // Number of LEDs
|
||||||
|
isMatrix: !!(infoData.leds && infoData.leds.matrix), // Whether it's a 2D matrix setup
|
||||||
|
bootloaderSHA256: infoData.bootloaderSHA256 || '' // Bootloader SHA256 hash
|
||||||
|
};
|
||||||
|
|
||||||
|
// Make AJAX call to postUpgradeEvent API
|
||||||
|
return fetch('https://usage.wled.me/api/usage/upgrade', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify(upgradeData)
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.then(res => {
|
||||||
|
if (res.ok) {
|
||||||
|
showToast('Thank you for reporting!');
|
||||||
|
updateVersionInfo(newVersion, false);
|
||||||
|
} else {
|
||||||
|
showToast('Report failed. Please try again later.', true);
|
||||||
|
// Do NOT update version info on failure - user will be prompted again
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(e => {
|
||||||
|
console.log('Failed to report upgrade', e);
|
||||||
|
showToast('Report failed. Please try again later.', true);
|
||||||
|
// Do NOT update version info on error - user will be prompted again
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateVersionInfo(version, neverAsk) {
|
||||||
|
const versionInfo = {
|
||||||
|
version: version,
|
||||||
|
neverAsk: neverAsk
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create a Blob with JSON content and use /upload endpoint
|
||||||
|
const blob = new Blob([JSON.stringify(versionInfo)], { type: 'application/json' });
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('data', blob, 'version-info.json');
|
||||||
|
|
||||||
|
fetch('/upload', {
|
||||||
|
method: 'POST',
|
||||||
|
body: formData
|
||||||
|
})
|
||||||
|
.then(res => res.text())
|
||||||
|
.then(data => {
|
||||||
|
console.log('Version info updated', data);
|
||||||
|
})
|
||||||
|
.catch(e => {
|
||||||
|
console.log('Failed to update version-info.json', e);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
size();
|
size();
|
||||||
_C.style.setProperty('--n', N);
|
_C.style.setProperty('--n', N);
|
||||||
|
|||||||
Reference in New Issue
Block a user