andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

improved version check - #2190

Browse Source
This commit is contained in:
proddy
2024-11-09 15:08:36 +01:00
parent 367260b143
commit b00f5dd8c0
6 changed files with 76 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mock-api/rest_server.ts
View File

@@ -21,6 +21,7 @@ const router = AutoRouter({
const REST_ENDPOINT_ROOT = '/rest/';
const API_ENDPOINT_ROOT = '/api/';
const GH_ENDPOINT_ROOT = '/gh/'; // for mock GitHub API for version checking
// HTTP HEADERS for msgpack
const headers = {
@@ -28,6 +29,13 @@ const headers = {
'Content-type': 'application/msgpack'
};
// Versions - all without the 'v'
const THIS_VERSION = '3.7.0';
// const THIS_VERSION = '3.6.4'; // for testing
const LATEST_STABLE_VERSION = '3.7.0';
const LATEST_DEV_VERSION = '3.7.1-dev.4';
const VERSION_IS_UPGRADEABLE = true;
// GLOBAL VARIABLES
let countWifiScanPoll = 0; // wifi network scan
let countHardwarePoll = 0; // for during an upload
@@ -199,16 +207,18 @@ function custom_support() {
function check_upgrade(version: string) {
let data = {};
if (version) {
console.log('check upgrade from version', version);
const dev_version = version.split(',')[0];
const stable_version = version.split(',')[1];
console.log("latest dev version: " + dev_version + ", latest stable version: " + stable_version);
console.log('Version upgrade check from version ' + THIS_VERSION + ', upgradable: ' + VERSION_IS_UPGRADEABLE);
data = {
emsesp_version: VERSION,
// upgradeable: true
upgradeable: false
emsesp_version: THIS_VERSION,
upgradeable: VERSION_IS_UPGRADEABLE
};
} else {
console.log('requesting ems-esp version');
console.log('requesting ems-esp version ('+THIS_VERSION+')');
data = {
emsesp_version: VERSION
emsesp_version: THIS_VERSION
};
}
return data;
@@ -468,11 +478,8 @@ const VERIFY_AUTHORIZATION_ENDPOINT = REST_ENDPOINT_ROOT + 'verifyAuthorization'
const SIGN_IN_ENDPOINT = REST_ENDPOINT_ROOT + 'signIn';
const GENERATE_TOKEN_ENDPOINT = REST_ENDPOINT_ROOT + 'generateToken';
const VERSION = '3.7.0';
// const VERSION = '3.6.4';
let system_status = {
emsesp_version: VERSION,
emsesp_version: THIS_VERSION,
bus_status: 0,
// status: 2,
uptime: 77186,
@@ -573,7 +580,7 @@ const EMSESP_SYSTEM_INFO_ENDPOINT = API_ENDPOINT_ROOT + 'system/info';
const emsesp_info = {
System: {
version: VERSION,
version: THIS_VERSION,
uptime: '001+06:40:34.018',
'uptime (seconds)': 110434,
freemem: 131,
@@ -4878,6 +4885,18 @@ router
return status(404); // not found
});
// Mock GitHub API
router
.get(GH_ENDPOINT_ROOT + '/tags/latest', () => {
console.log('returning latest development version: ' + LATEST_DEV_VERSION);
return { name: 'v'+LATEST_DEV_VERSION };
})
.get(GH_ENDPOINT_ROOT + '/latest', () => {
console.log('returning latest stable version: ' + LATEST_STABLE_VERSION);
return { name: 'v'+LATEST_STABLE_VERSION };
});
export default router;
// use this with cloudflare workers instead