diff --git a/Makefile b/Makefile index 5e123d302..3acaa5796 100644 --- a/Makefile +++ b/Makefile @@ -19,18 +19,20 @@ C = $(words $N)$(eval N := x $N) ECHO = python3 $(I)/echo_progress.py --stepno=$C --nsteps=$T endif -# number of parallel compiles +# determine number of parallel compiles based on OS UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) - CFLAGS += -D LINUX + EXTRA_CPPFLAGS = -D LINUX JOBS ?= $(shell nproc) endif ifeq ($(UNAME_S),Darwin) - CFLAGS += -D OSX + EXTRA_CPPFLAGS = -D OSX -Wno-tautological-constant-out-of-range-compare JOBS ?= $(shell sysctl -n hw.ncpu) endif MAKEFLAGS += -j $(JOBS) -l $(JOBS) +# $(info Number of jobs: $(JOBS)) + #---------------------------------------------------------------------- # Project Structure #---------------------------------------------------------------------- @@ -103,7 +105,8 @@ CPPFLAGS += -Wall -Wextra -Werror CPPFLAGS += -Wswitch-enum CPPFLAGS += -Wno-unused-parameter CPPFLAGS += -Wno-missing-braces -# CPPFLAGS += -Wno-tautological-constant-out-of-range-compare + +CPPFLAGS += $(EXTRA_CPPFLAGS) CFLAGS += $(CPPFLAGS) CXXFLAGS += $(CPPFLAGS) diff --git a/cspell.json b/cspell.json index 2cca22a36..403b84e0a 100644 --- a/cspell.json +++ b/cspell.json @@ -30,6 +30,8 @@ "Makefile", "**/*.ini", "**/*.json", - "src/core/modbus_entity_parameters.hpp" + "src/core/modbus_entity_parameters.hpp", + "sdkconfig.*", + "managed_components/**" ] } \ No newline at end of file diff --git a/docs/dump_telegrams.csv b/docs/dump_telegrams.csv index a0f3956eb..2c81737ef 100644 --- a/docs/dump_telegrams.csv +++ b/docs/dump_telegrams.csv @@ -29,7 +29,7 @@ telegram_type_id,name,is_fetched 0x3B,Energy, 0x3D,RC35Set, 0x3E,RC35Monitor, -0x3F,RC35Timer, +0x3F,RC30Timer, 0x40,RC30Temp, 0x41,RC30Monitor, 0x42,RC35Timer2, @@ -101,7 +101,7 @@ telegram_type_id,name,is_fetched 0x0292,HPMode,fetched 0x0293,HPMode,fetched 0x0294,HPMode,fetched -0x029B,RC300Curves, +0x029B,RC300Curves,fetched 0x029C,RC300Curves, 0x029D,RC300Curves, 0x029E,RC300Curves, @@ -109,10 +109,10 @@ telegram_type_id,name,is_fetched 0x02A0,RC300Curves, 0x02A1,RC300Curves, 0x02A2,RC300Curves, -0x02A5,RC300Monitor, +0x02A5,RC300Monitor,fetched 0x02A6,RC300Monitor, -0x02A7,RC300Monitor, -0x02A8,CRFMonitor, +0x02A7,CRFMonitor, +0x02A8,RC300Monitor, 0x02A9,RC300Monitor, 0x02AA,RC300Monitor, 0x02AB,RC300Monitor, diff --git a/interface/package.json b/interface/package.json index ab581a297..d5599e68a 100644 --- a/interface/package.json +++ b/interface/package.json @@ -24,8 +24,8 @@ "@alova/adapter-xhr": "2.1.1", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", - "@mui/icons-material": "^6.4.2", - "@mui/material": "^6.4.2", + "@mui/icons-material": "^6.4.3", + "@mui/material": "^6.4.3", "@table-library/react-table-library": "4.1.7", "alova": "3.2.8", "async-validator": "^4.2.5", @@ -41,24 +41,24 @@ "typescript": "^5.7.3" }, "devDependencies": { - "@babel/core": "^7.26.7", - "@eslint/js": "^9.19.0", + "@babel/core": "^7.26.8", + "@eslint/js": "^9.20.0", "@preact/compat": "^18.3.1", "@preact/preset-vite": "^2.10.1", "@trivago/prettier-plugin-sort-imports": "^5.2.2", "@types/formidable": "^3", - "@types/node": "^22.13.0", + "@types/node": "^22.13.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "concurrently": "^9.1.2", - "eslint": "^9.19.0", + "eslint": "^9.20.0", "eslint-config-prettier": "^10.0.1", "formidable": "^3.5.2", "prettier": "^3.4.2", "rollup-plugin-visualizer": "^5.14.0", - "terser": "^5.37.0", + "terser": "^5.38.1", "typescript-eslint": "8.23.0", - "vite": "^6.0.11", + "vite": "^6.1.0", "vite-plugin-imagemin": "^0.6.1", "vite-tsconfig-paths": "^5.1.4" }, diff --git a/interface/src/api/system.ts b/interface/src/api/system.ts index bba8d0bae..387fddcc3 100644 --- a/interface/src/api/system.ts +++ b/interface/src/api/system.ts @@ -16,14 +16,20 @@ export const fetchLogES = () => alovaInstance.Get('/es/log'); // Get versions from GitHub export const getStableVersion = () => alovaInstanceGH.Get('latest', { - transform(response: { data: { name: string } }) { - return response.data.name.substring(1); + transform(response: { data: { name: string; published_at: string } }) { + return { + name: response.data.name.substring(1), + published_at: response.data.published_at + }; } }); export const getDevVersion = () => alovaInstanceGH.Get('tags/latest', { - transform(response: { data: { name: string } }) { - return response.data.name.split(/\s+/).splice(-1)[0].substring(1); + transform(response: { data: { name: string; published_at: string } }) { + return { + name: response.data.name.split(/\s+/).splice(-1)[0].substring(1), + published_at: response.data.published_at + }; } }); diff --git a/interface/src/app/settings/Version.tsx b/interface/src/app/settings/Version.tsx index 7f4540555..2529f1575 100644 --- a/interface/src/app/settings/Version.tsx +++ b/interface/src/app/settings/Version.tsx @@ -80,7 +80,7 @@ const Version = () => { useEffect(() => { if (latestVersion && latestDevVersion) { - sendCheckUpgrade(latestDevVersion + ',' + latestVersion) + sendCheckUpgrade(latestDevVersion.name + ',' + latestVersion.name) .catch((error: Error) => { toast.error('Failed to check for upgrades: ' + error.message); }) @@ -96,13 +96,16 @@ const Version = () => { } const filename = 'EMS-ESP-' + - (usingDevVersion ? latestDevVersion : latestVersion).replaceAll('.', '_') + + (usingDevVersion ? latestDevVersion.name : latestVersion.name).replaceAll( + '.', + '_' + ) + '-' + getPlatform() + '.bin'; return usingDevVersion ? DEV_URL + filename - : STABLE_URL + 'v' + latestVersion + '/' + filename; + : STABLE_URL + 'v' + latestVersion.name + '/' + filename; }; const getPlatform = () => { @@ -224,7 +227,7 @@ const Version = () => { <> - {LL.FIRMWARE_VERSION()} + {LL.THIS_VERSION()} { - - {LL.AVAILABLE_VERSION()} - - - - - {LL.STABLE()} - - - - - {latestVersion} - -   {!usingDevVersion && showButtons()} + {internetLive ? ( + <> + + {LL.AVAILABLE_VERSION()} - - - {LL.DEVELOPMENT()} - - - - - {latestDevVersion} - -   {usingDevVersion && showButtons()} - - - + + + {LL.STABLE()} + + + + + {latestVersion.name} + + {latestVersion.published_at && ( + +  ( + {Math.floor((Date.now() - new Date(latestVersion.published_at).getTime()) / (1000 * 60 * 60 * 24))} days ago) + + )} +   {!usingDevVersion && showButtons()} + + + + + {LL.DEVELOPMENT()} + + + + + {latestDevVersion.name} + + {latestDevVersion.published_at && ( + +  ( + {Math.floor((Date.now() - new Date(latestDevVersion.published_at).getTime()) / (1000 * 60 * 60 * 24))} days ago) + + )} +   {usingDevVersion && showButtons()} + + + - {internetLive ? ( - <> {upgradeAvailable ? ( { no access to download site )} - {renderInstallDialog()} diff --git a/interface/src/i18n/cz/index.ts b/interface/src/i18n/cz/index.ts index 0b747ff57..4e5585d9f 100644 --- a/interface/src/i18n/cz/index.ts +++ b/interface/src/i18n/cz/index.ts @@ -347,7 +347,7 @@ const cz: Translation = { NO_DATA_1: 'No favourite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'To see all available entities go to', // TODO translate - FIRMWARE_VERSION: 'Firmware Version', // TODO translate + THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Release Type', // TODO translate REINSTALL: 'Re-install' // TODO translate diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts index 356af4418..2bc12942b 100644 --- a/interface/src/i18n/de/index.ts +++ b/interface/src/i18n/de/index.ts @@ -347,7 +347,7 @@ const de: Translation = { NO_DATA_1: 'Keine favorisierten EMS-Entitäten gefunden! Verwenden Sie das Modul', NO_DATA_2: ', um sie zu markieren.', NO_DATA_3: 'Um alle verfügbaren Entitäten anzuzeigen, gehen Sie zu', - FIRMWARE_VERSION: 'Firmware Version', + THIS_VERSION: 'This Version', PLATFORM: 'Plattform', RELEASE_TYPE: 'Release Typ', REINSTALL: 'Neu installieren' diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts index 8a1ade414..5fcccbf0d 100644 --- a/interface/src/i18n/en/index.ts +++ b/interface/src/i18n/en/index.ts @@ -347,7 +347,7 @@ const en: Translation = { NO_DATA_1: 'No favourite EMS entities found yet. Use the', NO_DATA_2: 'module to mark them.', NO_DATA_3: 'To see all available entities go to', - FIRMWARE_VERSION: 'Firmware Version', + THIS_VERSION: 'This Version', PLATFORM: 'Platform', RELEASE_TYPE: 'Release Type', REINSTALL: 'Re-install' diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts index 47bf6785d..6b85f93b6 100644 --- a/interface/src/i18n/fr/index.ts +++ b/interface/src/i18n/fr/index.ts @@ -347,7 +347,7 @@ const fr: Translation = { NO_DATA_1: 'No favourite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'To see all available entities go to', // TODO translate - FIRMWARE_VERSION: 'Firmaware Version', // TODO translate + THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Release Type', // TODO translate REINSTALL: 'Re-install' // TODO translate diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts index cdbed71d0..0041efa88 100644 --- a/interface/src/i18n/it/index.ts +++ b/interface/src/i18n/it/index.ts @@ -347,7 +347,7 @@ const it: Translation = { NO_DATA_1: 'No favourite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'To see all available entities go to', // TODO translate - FIRMWARE_VERSION: 'Firmware Version', // TODO translate + THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Release Type', // TODO translate REINSTALL: 'Re-install' // TODO translate diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts index 3cbf1730f..14ed5d9b5 100644 --- a/interface/src/i18n/nl/index.ts +++ b/interface/src/i18n/nl/index.ts @@ -347,7 +347,7 @@ const nl: Translation = { NO_DATA_1: 'Er zijn nog geen favoriete EMS-entiteiten gevonden. Gebruik de', NO_DATA_2: 'module om ze te markeren.', NO_DATA_3: 'Om alle beschikbare entiteiten te zien, ga naar', - FIRMWARE_VERSION: 'Firmware Versie', + THIS_VERSION: 'Deze Versie', PLATFORM: 'Platform', RELEASE_TYPE: 'Release Typ', REINSTALL: 'Opnieuw Installeren' diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts index 5313a32a4..2bd0d8473 100644 --- a/interface/src/i18n/no/index.ts +++ b/interface/src/i18n/no/index.ts @@ -347,7 +347,7 @@ const no: Translation = { NO_DATA_1: 'No favourite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'To see all available entities go to', // TODO translate - FIRMWARE_VERSION: 'Firmware Version', // TODO translate + THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Release Type', // TODO translate REINSTALL: 'Re-install' // TODO translate diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts index 78ef914b4..d93ede67b 100644 --- a/interface/src/i18n/pl/index.ts +++ b/interface/src/i18n/pl/index.ts @@ -347,7 +347,7 @@ const pl: BaseTranslation = { NO_DATA_1: 'No favourite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'To see all available entities go to', // TODO translate - FIRMWARE_VERSION: 'Firmware Version', // TODO translate + THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Release Type', // TODO translate REINSTALL: 'Re-install' // TODO translate diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts index e73c96306..5c5491b60 100644 --- a/interface/src/i18n/sk/index.ts +++ b/interface/src/i18n/sk/index.ts @@ -347,7 +347,7 @@ const sk: Translation = { NO_DATA_1: 'Nenašli sa žiadne obľúbené entity EMS. Použite', NO_DATA_2: 'modul na ich označenie.', NO_DATA_3: 'Ak chcete zobraziť všetky dostupné entity, prejdite na', - FIRMWARE_VERSION: 'Verzia firmware', + THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platforma', RELEASE_TYPE: 'Typ vydania', REINSTALL: 'Preinštalovať' diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts index 5e59f0725..786f3b5b2 100644 --- a/interface/src/i18n/sv/index.ts +++ b/interface/src/i18n/sv/index.ts @@ -347,7 +347,7 @@ const sv: Translation = { NO_DATA_1: 'No favourite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'To see all available entities go to', // TODO translate - FIRMWARE_VERSION: 'Firmware Version', // TODO translate + THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Release Type', // TODO translate REINSTALL: 'Re-install' // TODO translate diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts index 627281758..f703ef972 100644 --- a/interface/src/i18n/tr/index.ts +++ b/interface/src/i18n/tr/index.ts @@ -347,7 +347,7 @@ const tr: Translation = { NO_DATA_1: 'No favourite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'To see all available entities go to', // TODO translate - FIRMWARE_VERSION: 'Firmware Version', // TODO translate + THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Release Type', // TODO translate REINSTALL: 'Re-install' // TODO translate diff --git a/interface/yarn.lock b/interface/yarn.lock index 53e5ab2c5..f696e1d3d 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -33,7 +33,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.2": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.26.2": version: 7.26.2 resolution: "@babel/code-frame@npm:7.26.2" dependencies: @@ -45,45 +45,46 @@ __metadata: linkType: hard "@babel/compat-data@npm:^7.26.5": - version: 7.26.5 - resolution: "@babel/compat-data@npm:7.26.5" - checksum: 10c0/9d2b41f0948c3dfc5de44d9f789d2208c2ea1fd7eb896dfbb297fe955e696728d6f363c600cd211e7f58ccbc2d834fe516bb1e4cf883bbabed8a32b038afc1a0 + version: 7.26.8 + resolution: "@babel/compat-data@npm:7.26.8" + checksum: 10c0/66408a0388c3457fff1c2f6c3a061278dd7b3d2f0455ea29bb7b187fa52c60ae8b4054b3c0a184e21e45f0eaac63cf390737bc7504d1f4a088a6e7f652c068ca languageName: node linkType: hard -"@babel/core@npm:^7.22.1, @babel/core@npm:^7.26.7": - version: 7.26.7 - resolution: "@babel/core@npm:7.26.7" +"@babel/core@npm:^7.22.1, @babel/core@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/core@npm:7.26.8" dependencies: "@ampproject/remapping": "npm:^2.2.0" "@babel/code-frame": "npm:^7.26.2" - "@babel/generator": "npm:^7.26.5" + "@babel/generator": "npm:^7.26.8" "@babel/helper-compilation-targets": "npm:^7.26.5" "@babel/helper-module-transforms": "npm:^7.26.0" "@babel/helpers": "npm:^7.26.7" - "@babel/parser": "npm:^7.26.7" - "@babel/template": "npm:^7.25.9" - "@babel/traverse": "npm:^7.26.7" - "@babel/types": "npm:^7.26.7" + "@babel/parser": "npm:^7.26.8" + "@babel/template": "npm:^7.26.8" + "@babel/traverse": "npm:^7.26.8" + "@babel/types": "npm:^7.26.8" + "@types/gensync": "npm:^1.0.0" convert-source-map: "npm:^2.0.0" debug: "npm:^4.1.0" gensync: "npm:^1.0.0-beta.2" json5: "npm:^2.2.3" semver: "npm:^6.3.1" - checksum: 10c0/fbd2cd9fc23280bdcaca556e558f715c0a42d940b9913c52582e8e3d24e391d269cb8a9cd6589172593983569021c379e28bba6b19ea2ee08674f6068c210a9d + checksum: 10c0/fafbd083ed3f79973ae2a11a69eee3f13b3226a1d4907abc2c6f2fea21adf4a7c20e00fe0eaa33f44a3666eeaf414edb07460ec031d478ee5f6088eb38b2a011 languageName: node linkType: hard -"@babel/generator@npm:^7.26.5": - version: 7.26.5 - resolution: "@babel/generator@npm:7.26.5" +"@babel/generator@npm:^7.26.5, @babel/generator@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/generator@npm:7.26.8" dependencies: - "@babel/parser": "npm:^7.26.5" - "@babel/types": "npm:^7.26.5" + "@babel/parser": "npm:^7.26.8" + "@babel/types": "npm:^7.26.8" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^3.0.2" - checksum: 10c0/3be79e0aa03f38858a465d12ee2e468320b9122dc44fc85984713e32f16f4d77ce34a16a1a9505972782590e0b8d847b6f373621f9c6fafa1906d90f31416cb0 + checksum: 10c0/9467f197d285ac315d1fa419138d36a3bfd69ca4baf763e914acab12f5f38e5d231497f6528e80613b28e73bb28c66fcc50b250b1f277b1a4d38ac14b03e9674 languageName: node linkType: hard @@ -170,14 +171,14 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.5, @babel/parser@npm:^7.26.7": - version: 7.26.7 - resolution: "@babel/parser@npm:7.26.7" +"@babel/parser@npm:^7.26.7, @babel/parser@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/parser@npm:7.26.8" dependencies: - "@babel/types": "npm:^7.26.7" + "@babel/types": "npm:^7.26.8" bin: parser: ./bin/babel-parser.js - checksum: 10c0/dcb08a4f2878ece33caffefe43b71488d753324bae7ca58d64bca3bc4af34dcfa1b58abdf9972516d76af760fceb25bb9294ca33461d56b31c5059ccfe32001f + checksum: 10c0/da04f26bae732a5b6790775a736b58c7876c28e62203c5097f043fd7273ef6debe5bfd7a4e670a6819f4549b215c7b9762c6358e44797b3c4d733defc8290781 languageName: node linkType: hard @@ -227,39 +228,39 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/template@npm:7.25.9" +"@babel/template@npm:^7.25.9, @babel/template@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/template@npm:7.26.8" dependencies: - "@babel/code-frame": "npm:^7.25.9" - "@babel/parser": "npm:^7.25.9" - "@babel/types": "npm:^7.25.9" - checksum: 10c0/ebe677273f96a36c92cc15b7aa7b11cc8bc8a3bb7a01d55b2125baca8f19cae94ff3ce15f1b1880fb8437f3a690d9f89d4e91f16fc1dc4d3eb66226d128983ab + "@babel/code-frame": "npm:^7.26.2" + "@babel/parser": "npm:^7.26.8" + "@babel/types": "npm:^7.26.8" + checksum: 10c0/90bc1085cbc090cbdd43af7b9dbb98e6bda96e55e0f565f17ebb8e97c2dfce866dc727ca02b8e08bd2662ba4fd3851907ba3c48618162c291221af17fb258213 languageName: node linkType: hard -"@babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.7": - version: 7.26.7 - resolution: "@babel/traverse@npm:7.26.7" +"@babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.7, @babel/traverse@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/traverse@npm:7.26.8" dependencies: "@babel/code-frame": "npm:^7.26.2" - "@babel/generator": "npm:^7.26.5" - "@babel/parser": "npm:^7.26.7" - "@babel/template": "npm:^7.25.9" - "@babel/types": "npm:^7.26.7" + "@babel/generator": "npm:^7.26.8" + "@babel/parser": "npm:^7.26.8" + "@babel/template": "npm:^7.26.8" + "@babel/types": "npm:^7.26.8" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10c0/b23a36ce40d2e4970741431c45d4f92e3f4c2895c0a421456516b2729bd9e17278846e01ee3d9039b0adf5fc5a071768061c17fcad040e74a5c3e39517449d5b + checksum: 10c0/0771d1ce0351628ad2e8dac56f0d59f706eb125c83fbcc039bde83088ba0a1477244ad5fb060802f90366cc4d7fa871e5009a292aef6205bcf83f2e01d1a0a5d languageName: node linkType: hard -"@babel/types@npm:^7.25.9, @babel/types@npm:^7.26.5, @babel/types@npm:^7.26.7": - version: 7.26.7 - resolution: "@babel/types@npm:7.26.7" +"@babel/types@npm:^7.25.9, @babel/types@npm:^7.26.7, @babel/types@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/types@npm:7.26.8" dependencies: "@babel/helper-string-parser": "npm:^7.25.9" "@babel/helper-validator-identifier": "npm:^7.25.9" - checksum: 10c0/7810a2bca97b13c253f07a0863a628d33dbe76ee3c163367f24be93bfaf4c8c0a325f73208abaaa050a6b36059efc2950c2e4b71fb109c0f07fa62221d8473d4 + checksum: 10c0/cd41ea47bb3d7baf2b3bf5e70e9c3a16f2eab699fab8575b2b31a7b1cb64166eb52c97124313863dde0581747bfc7a1810c838ad60b5b7ad1897d8004c7b95a9 languageName: node linkType: hard @@ -629,6 +630,15 @@ __metadata: languageName: node linkType: hard +"@eslint/core@npm:^0.11.0": + version: 0.11.0 + resolution: "@eslint/core@npm:0.11.0" + dependencies: + "@types/json-schema": "npm:^7.0.15" + checksum: 10c0/1e0671d035c908175f445864a7864cf6c6a8b67a5dfba8c47b2ac91e2d3ed36e8c1f2fd81d98a73264f8677055559699d4adb0f97d86588e616fc0dc9a4b86c9 + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^3.2.0": version: 3.2.0 resolution: "@eslint/eslintrc@npm:3.2.0" @@ -646,10 +656,10 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:9.19.0, @eslint/js@npm:^9.19.0": - version: 9.19.0 - resolution: "@eslint/js@npm:9.19.0" - checksum: 10c0/45dc544c8803984f80a438b47a8e578fae4f6e15bc8478a703827aaf05e21380b42a43560374ce4dad0d5cb6349e17430fc9ce1686fed2efe5d1ff117939ff90 +"@eslint/js@npm:9.20.0, @eslint/js@npm:^9.20.0": + version: 9.20.0 + resolution: "@eslint/js@npm:9.20.0" + checksum: 10c0/10e7b5b9e628b5192e8fc6b0ecd27cf48322947e83e999ff60f9f9e44ac8d499138bcb9383cbfa6e51e780d53b4e76ccc2d1753b108b7173b8404fd484d37328 languageName: node linkType: hard @@ -783,38 +793,38 @@ __metadata: languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^6.4.2": - version: 6.4.2 - resolution: "@mui/core-downloads-tracker@npm:6.4.2" - checksum: 10c0/7df1784d2b79fc90b808b0f02c1f2f2f5ab58f7b4967c11703571202a5ab0cf9ebc20708d2c6c7b09c3bf6d03669ffa32ad7e47246439fbe2642f51a85744069 +"@mui/core-downloads-tracker@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/core-downloads-tracker@npm:6.4.3" + checksum: 10c0/4be7a66f004a2bfb03d81348581c35c25f74dfc8cfe32a3a44ca30dd45888f37ae3c0da24b957d598adf3e833bc2ca32c0d6b70c4bca08499a0819f78dc417eb languageName: node linkType: hard -"@mui/icons-material@npm:^6.4.2": - version: 6.4.2 - resolution: "@mui/icons-material@npm:6.4.2" +"@mui/icons-material@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/icons-material@npm:6.4.3" dependencies: "@babel/runtime": "npm:^7.26.0" peerDependencies: - "@mui/material": ^6.4.2 + "@mui/material": ^6.4.3 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/b182f0ba58fd400852a4b7e3497f0ad5e6d3051f7a6d1b442e823d04c14f3e1d65958bfe41782573622cb77c4628078fd1f30d262642597c6aa2dca95e1554d7 + checksum: 10c0/d010088fe6c11a863be5ec35b12c6d8e3d423e50877b07d471cc62f07ca7aac7928cb6a1e41b782d67c44aaf682fe3eaf1d12de2c2d3cb71ed28df2c8ff2b965 languageName: node linkType: hard -"@mui/material@npm:^6.4.2": - version: 6.4.2 - resolution: "@mui/material@npm:6.4.2" +"@mui/material@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/material@npm:6.4.3" dependencies: "@babel/runtime": "npm:^7.26.0" - "@mui/core-downloads-tracker": "npm:^6.4.2" - "@mui/system": "npm:^6.4.2" + "@mui/core-downloads-tracker": "npm:^6.4.3" + "@mui/system": "npm:^6.4.3" "@mui/types": "npm:^7.2.21" - "@mui/utils": "npm:^6.4.2" + "@mui/utils": "npm:^6.4.3" "@popperjs/core": "npm:^2.11.8" "@types/react-transition-group": "npm:^4.4.12" clsx: "npm:^2.1.1" @@ -825,7 +835,7 @@ __metadata: peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material-pigment-css": ^6.4.2 + "@mui/material-pigment-css": ^6.4.3 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -838,16 +848,16 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10c0/e77604a7f83a5f8526077a9b7394e644d919dee5661f676d8b60ec6a7b9ae6a11eb5cf6656e9383d45467b7eb8e6d7e559f942df494f0bec908ff018874b97ae + checksum: 10c0/002f76dca62c514c5ea089e8632729f864e9e4b9d44cdfcc5bb3a6a742139615d149513ec9b90cdacc220ad9ec53fc22e717eb7cf12a8530cfb8a683cf8aec01 languageName: node linkType: hard -"@mui/private-theming@npm:^6.4.2": - version: 6.4.2 - resolution: "@mui/private-theming@npm:6.4.2" +"@mui/private-theming@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/private-theming@npm:6.4.3" dependencies: "@babel/runtime": "npm:^7.26.0" - "@mui/utils": "npm:^6.4.2" + "@mui/utils": "npm:^6.4.3" prop-types: "npm:^15.8.1" peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -855,13 +865,13 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/23d5a51a91db3ff6849e3511d95c7726969c888ff67a06b9f1d91a6aa322d37f9376baaf9ac53a21fa1ec200c7be2a7c7eb6205bf3f20042460da19d52a6d83d + checksum: 10c0/f1f6afede4917eb04f007b0c2ff52536b5e7561259812663eb77bfd059dd41eb7f85ae80e1229ebde0d134f428241bbd91185053c6e06e70a32bdfb983981a2a languageName: node linkType: hard -"@mui/styled-engine@npm:^6.4.2": - version: 6.4.2 - resolution: "@mui/styled-engine@npm:6.4.2" +"@mui/styled-engine@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/styled-engine@npm:6.4.3" dependencies: "@babel/runtime": "npm:^7.26.0" "@emotion/cache": "npm:^11.13.5" @@ -878,19 +888,19 @@ __metadata: optional: true "@emotion/styled": optional: true - checksum: 10c0/c60622d11d2f039d48c182674206b6117df8399dfe3f28a7b5ac21bc6f838ee3b6d2c637243c7bb39b067f042097d3ebf87e410c959435d419aaf8f9d78b366c + checksum: 10c0/7968beec5878fbed0e22d04595bf9e05007d67fbf5c69aed1095e7bef2207ddab72331ef683be2ad61bb5a59aeaca16464d86621d4da43c87c1c8cf4c8db8cdb languageName: node linkType: hard -"@mui/system@npm:^6.4.2": - version: 6.4.2 - resolution: "@mui/system@npm:6.4.2" +"@mui/system@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/system@npm:6.4.3" dependencies: "@babel/runtime": "npm:^7.26.0" - "@mui/private-theming": "npm:^6.4.2" - "@mui/styled-engine": "npm:^6.4.2" + "@mui/private-theming": "npm:^6.4.3" + "@mui/styled-engine": "npm:^6.4.3" "@mui/types": "npm:^7.2.21" - "@mui/utils": "npm:^6.4.2" + "@mui/utils": "npm:^6.4.3" clsx: "npm:^2.1.1" csstype: "npm:^3.1.3" prop-types: "npm:^15.8.1" @@ -906,7 +916,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10c0/4a298140eb354b4842bcb00c45da0a8803fd41a2c7fa3ef9fa1218c9931e6ba3bb3fcf44b92e628042b5420ff4979ae089d9327da89d3bfb0c67b38d8a432d64 + checksum: 10c0/e5bf5255672b21253390adfc843fa764d3e98e530dfe51b770ea6fba880a8b8c8b153d616f9b54828c99bbdb0f25911c2fc70e557434621d1eaa767de78aff1f languageName: node linkType: hard @@ -922,9 +932,9 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^6.4.2": - version: 6.4.2 - resolution: "@mui/utils@npm:6.4.2" +"@mui/utils@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/utils@npm:6.4.3" dependencies: "@babel/runtime": "npm:^7.26.0" "@mui/types": "npm:^7.2.21" @@ -938,7 +948,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/981a267c87d4ed9e9880dd98e31a16b8ff9e268295d4bcc7d185bf5e19a0d7b0afe14e9e37263acb054694f4520a8c5bf6d8ced6f6df1cbef4e8163d44a52da4 + checksum: 10c0/bf199e61bd5d92469b954dd74471db3d27bd6fe43fd13a306056f6cdeb60f5bb1fe1e9ffc4a99e56785c8f56928951e098f340d79aeaf2b3a91041ae8154f934 languageName: node linkType: hard @@ -1082,135 +1092,135 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.34.1" +"@rollup/rollup-android-arm-eabi@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.34.6" conditions: os=android & cpu=arm languageName: node linkType: hard -"@rollup/rollup-android-arm64@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-android-arm64@npm:4.34.1" +"@rollup/rollup-android-arm64@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-android-arm64@npm:4.34.6" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-darwin-arm64@npm:4.34.1" +"@rollup/rollup-darwin-arm64@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-darwin-arm64@npm:4.34.6" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-x64@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-darwin-x64@npm:4.34.1" +"@rollup/rollup-darwin-x64@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-darwin-x64@npm:4.34.6" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-freebsd-arm64@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-freebsd-arm64@npm:4.34.1" +"@rollup/rollup-freebsd-arm64@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-freebsd-arm64@npm:4.34.6" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-freebsd-x64@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-freebsd-x64@npm:4.34.1" +"@rollup/rollup-freebsd-x64@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-freebsd-x64@npm:4.34.6" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-linux-arm-gnueabihf@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.1" +"@rollup/rollup-linux-arm-gnueabihf@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.6" conditions: os=linux & cpu=arm & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm-musleabihf@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.34.1" +"@rollup/rollup-linux-arm-musleabihf@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.34.6" conditions: os=linux & cpu=arm & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.34.1" +"@rollup/rollup-linux-arm64-gnu@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.34.6" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm64-musl@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.34.1" +"@rollup/rollup-linux-arm64-musl@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.34.6" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-loongarch64-gnu@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.1" +"@rollup/rollup-linux-loongarch64-gnu@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.6" conditions: os=linux & cpu=loong64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.1" +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.6" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-riscv64-gnu@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.34.1" +"@rollup/rollup-linux-riscv64-gnu@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.34.6" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-s390x-gnu@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.34.1" +"@rollup/rollup-linux-s390x-gnu@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.34.6" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-gnu@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.34.1" +"@rollup/rollup-linux-x64-gnu@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.34.6" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.34.1" +"@rollup/rollup-linux-x64-musl@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.34.6" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-win32-arm64-msvc@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.34.1" +"@rollup/rollup-win32-arm64-msvc@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.34.6" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.34.1" +"@rollup/rollup-win32-ia32-msvc@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.34.6" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@rollup/rollup-win32-x64-msvc@npm:4.34.1": - version: 4.34.1 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.34.1" +"@rollup/rollup-win32-x64-msvc@npm:4.34.6": + version: 4.34.6 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.34.6" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1293,6 +1303,13 @@ __metadata: languageName: node linkType: hard +"@types/gensync@npm:^1.0.0": + version: 1.0.4 + resolution: "@types/gensync@npm:1.0.4" + checksum: 10c0/1daeb1693196a85ee68b82f3fb30906a1cccede69d492b190de80ff20cec2d528d98cad866d733fd83cb171096dfe8c26c9c02c50ffb93e1113d48bd79daa556 + languageName: node + linkType: hard + "@types/glob@npm:^7.1.1": version: 7.2.0 resolution: "@types/glob@npm:7.2.0" @@ -1399,12 +1416,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^22.13.0": - version: 22.13.0 - resolution: "@types/node@npm:22.13.0" +"@types/node@npm:*, @types/node@npm:^22.13.1": + version: 22.13.1 + resolution: "@types/node@npm:22.13.1" dependencies: undici-types: "npm:~6.20.0" - checksum: 10c0/9cf6358b2863ae7bf9588ca1cc3d87f6a6289c3880e95a046a188760666870e2c12502df8b0a473bec8aa8ffee85e025d60382a6104b10f197120793235b2c22 + checksum: 10c0/d4e56d41d8bd53de93da2651c0a0234e330bd7b1b6d071b1a94bd3b5ee2d9f387519e739c52a15c1faa4fb9d97e825b848421af4b2e50e6518011e7adb4a34b7 languageName: node linkType: hard @@ -1584,24 +1601,24 @@ __metadata: resolution: "EMS-ESP@workspace:." dependencies: "@alova/adapter-xhr": "npm:2.1.1" - "@babel/core": "npm:^7.26.7" + "@babel/core": "npm:^7.26.8" "@emotion/react": "npm:^11.14.0" "@emotion/styled": "npm:^11.14.0" - "@eslint/js": "npm:^9.19.0" - "@mui/icons-material": "npm:^6.4.2" - "@mui/material": "npm:^6.4.2" + "@eslint/js": "npm:^9.20.0" + "@mui/icons-material": "npm:^6.4.3" + "@mui/material": "npm:^6.4.3" "@preact/compat": "npm:^18.3.1" "@preact/preset-vite": "npm:^2.10.1" "@table-library/react-table-library": "npm:4.1.7" "@trivago/prettier-plugin-sort-imports": "npm:^5.2.2" "@types/formidable": "npm:^3" - "@types/node": "npm:^22.13.0" + "@types/node": "npm:^22.13.1" "@types/react": "npm:^19.0.8" "@types/react-dom": "npm:^19.0.3" alova: "npm:3.2.8" async-validator: "npm:^4.2.5" concurrently: "npm:^9.1.2" - eslint: "npm:^9.19.0" + eslint: "npm:^9.20.0" eslint-config-prettier: "npm:^10.0.1" formidable: "npm:^3.5.2" jwt-decode: "npm:^4.0.0" @@ -1614,11 +1631,11 @@ __metadata: react-router: "npm:^7.1.5" react-toastify: "npm:^11.0.3" rollup-plugin-visualizer: "npm:^5.14.0" - terser: "npm:^5.37.0" + terser: "npm:^5.38.1" typesafe-i18n: "npm:^5.26.2" typescript: "npm:^5.7.3" typescript-eslint: "npm:8.23.0" - vite: "npm:^6.0.11" + vite: "npm:^6.1.0" vite-plugin-imagemin: "npm:^0.6.1" vite-tsconfig-paths: "npm:^5.1.4" languageName: unknown @@ -2032,9 +2049,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001688": - version: 1.0.30001696 - resolution: "caniuse-lite@npm:1.0.30001696" - checksum: 10c0/8060584c612b2bc232995a6e31153432de7946b5417d3b3505a3ab76e632e5568ccc7bae38f1a977f21d4fc214f9e64be829213f810694172c9109e258cb5be8 + version: 1.0.30001698 + resolution: "caniuse-lite@npm:1.0.30001698" + checksum: 10c0/f3128454e6222b86349b62971501b8ebfc49faa9484398176f674293ea85091e1ca96862bc617dcac4d07850cfc5ef5173ebad03d63aa1197b6a8bf3cc46d745 languageName: node linkType: hard @@ -2615,9 +2632,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.5.73": - version: 1.5.90 - resolution: "electron-to-chromium@npm:1.5.90" - checksum: 10c0/864715adfebb5932a78f776c99f28a50942884302b42ee6de0ab64ca135891a5a43af3a7c719a7335687c0ee201561011e37d4994558a795f67b9e44f20fc6ee + version: 1.5.96 + resolution: "electron-to-chromium@npm:1.5.96" + checksum: 10c0/827d480f35abe8b0d01a4311fc3180089a406edfcd016d8433712b03ec6e56618ad6f9757e35403092de5c2e163372f9ec90eb8e8334f6f26119a21b568d9bf9 languageName: node linkType: hard @@ -3046,16 +3063,16 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^9.19.0": - version: 9.19.0 - resolution: "eslint@npm:9.19.0" +"eslint@npm:^9.20.0": + version: 9.20.0 + resolution: "eslint@npm:9.20.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/regexpp": "npm:^4.12.1" "@eslint/config-array": "npm:^0.19.0" - "@eslint/core": "npm:^0.10.0" + "@eslint/core": "npm:^0.11.0" "@eslint/eslintrc": "npm:^3.2.0" - "@eslint/js": "npm:9.19.0" + "@eslint/js": "npm:9.20.0" "@eslint/plugin-kit": "npm:^0.2.5" "@humanfs/node": "npm:^0.16.6" "@humanwhocodes/module-importer": "npm:^1.0.1" @@ -3091,7 +3108,7 @@ __metadata: optional: true bin: eslint: bin/eslint.js - checksum: 10c0/3b0dfaeff6a831de086884a3e2432f18468fe37c69f35e1a0a9a2833d9994a65b6dd2a524aaee28f361c849035ad9d15e3841029b67d261d0abd62c7de6d51f5 + checksum: 10c0/5eb2d9b5ed85a0b022871d19719417d110afb07a4abfedd856ad03d9a821def5f6bc31d7c407ca27f56e5e66e39375300fd2b877017245eb99c44060d6c983bd languageName: node linkType: hard @@ -3232,9 +3249,9 @@ __metadata: linkType: hard "exponential-backoff@npm:^3.1.1": - version: 3.1.1 - resolution: "exponential-backoff@npm:3.1.1" - checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579 + version: 3.1.2 + resolution: "exponential-backoff@npm:3.1.2" + checksum: 10c0/d9d3e1eafa21b78464297df91f1776f7fbaa3d5e3f7f0995648ca5b89c069d17055033817348d9f4a43d1c20b0eab84f75af6991751e839df53e4dfd6f22e844 languageName: node linkType: hard @@ -5430,7 +5447,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.49": +"postcss@npm:^8.5.1": version: 8.5.1 resolution: "postcss@npm:8.5.1" dependencies: @@ -5854,29 +5871,29 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^4.23.0": - version: 4.34.1 - resolution: "rollup@npm:4.34.1" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.34.1" - "@rollup/rollup-android-arm64": "npm:4.34.1" - "@rollup/rollup-darwin-arm64": "npm:4.34.1" - "@rollup/rollup-darwin-x64": "npm:4.34.1" - "@rollup/rollup-freebsd-arm64": "npm:4.34.1" - "@rollup/rollup-freebsd-x64": "npm:4.34.1" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.34.1" - "@rollup/rollup-linux-arm-musleabihf": "npm:4.34.1" - "@rollup/rollup-linux-arm64-gnu": "npm:4.34.1" - "@rollup/rollup-linux-arm64-musl": "npm:4.34.1" - "@rollup/rollup-linux-loongarch64-gnu": "npm:4.34.1" - "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.34.1" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.34.1" - "@rollup/rollup-linux-s390x-gnu": "npm:4.34.1" - "@rollup/rollup-linux-x64-gnu": "npm:4.34.1" - "@rollup/rollup-linux-x64-musl": "npm:4.34.1" - "@rollup/rollup-win32-arm64-msvc": "npm:4.34.1" - "@rollup/rollup-win32-ia32-msvc": "npm:4.34.1" - "@rollup/rollup-win32-x64-msvc": "npm:4.34.1" +"rollup@npm:^4.30.1": + version: 4.34.6 + resolution: "rollup@npm:4.34.6" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.34.6" + "@rollup/rollup-android-arm64": "npm:4.34.6" + "@rollup/rollup-darwin-arm64": "npm:4.34.6" + "@rollup/rollup-darwin-x64": "npm:4.34.6" + "@rollup/rollup-freebsd-arm64": "npm:4.34.6" + "@rollup/rollup-freebsd-x64": "npm:4.34.6" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.34.6" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.34.6" + "@rollup/rollup-linux-arm64-gnu": "npm:4.34.6" + "@rollup/rollup-linux-arm64-musl": "npm:4.34.6" + "@rollup/rollup-linux-loongarch64-gnu": "npm:4.34.6" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.34.6" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.34.6" + "@rollup/rollup-linux-s390x-gnu": "npm:4.34.6" + "@rollup/rollup-linux-x64-gnu": "npm:4.34.6" + "@rollup/rollup-linux-x64-musl": "npm:4.34.6" + "@rollup/rollup-win32-arm64-msvc": "npm:4.34.6" + "@rollup/rollup-win32-ia32-msvc": "npm:4.34.6" + "@rollup/rollup-win32-x64-msvc": "npm:4.34.6" "@types/estree": "npm:1.0.6" fsevents: "npm:~2.3.2" dependenciesMeta: @@ -5922,7 +5939,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 10c0/163c3e8488328ec415a78370e53ae35be0f260760032f57745aa030db4714d37b8930364f6fadf334e637c815ae0f898b45551ca3c955f665a3cd2c549617aba + checksum: 10c0/0d55e43754698996de5dea5e76041ea20d11d810e159e74d021e16fef23a3dbb456f77e04afdb0a85891905c3f92d5cefa64ade5581a9e31839fec3a101d7626 languageName: node linkType: hard @@ -6019,11 +6036,11 @@ __metadata: linkType: hard "semver@npm:^7.3.5, semver@npm:^7.6.0": - version: 7.7.0 - resolution: "semver@npm:7.7.0" + version: 7.7.1 + resolution: "semver@npm:7.7.1" bin: semver: bin/semver.js - checksum: 10c0/bcd1c03209b4be7d8ca86c976a0410beba7d4ec1d49d846a4be154b958db1ff5eaee50760c1d4f4070b19dee3236b8672d3e09642c53ea23740398bba2538a2d + checksum: 10c0/fd603a6fb9c399c6054015433051bdbe7b99a940a8fb44b85c2b524c4004b023d7928d47cb22154f8d054ea7ee8597f586605e05b52047f048278e4ac56ae958 languageName: node linkType: hard @@ -6504,9 +6521,9 @@ __metadata: languageName: node linkType: hard -"terser@npm:^5.37.0": - version: 5.37.0 - resolution: "terser@npm:5.37.0" +"terser@npm:^5.38.1": + version: 5.38.1 + resolution: "terser@npm:5.38.1" dependencies: "@jridgewell/source-map": "npm:^0.3.3" acorn: "npm:^8.8.2" @@ -6514,7 +6531,7 @@ __metadata: source-map-support: "npm:~0.5.20" bin: terser: bin/terser - checksum: 10c0/ff0dc79b0a0da821e7f5bf7a047eab6d04e70e88b62339a0f1d71117db3310e255f5c00738fa3b391f56c3571f800a00047720261ba04ced0241c1f9922199f4 + checksum: 10c0/7e96239ff94ca8f653c359d8825d0a98a3afc3f2f0f06c80b97785671ed5ca821cc280ce198576b08db7d4c0d08ae349619903f8213555a635eebee0786b7b63 languageName: node linkType: hard @@ -6583,8 +6600,8 @@ __metadata: linkType: hard "tsconfck@npm:^3.0.3": - version: 3.1.4 - resolution: "tsconfck@npm:3.1.4" + version: 3.1.5 + resolution: "tsconfck@npm:3.1.5" peerDependencies: typescript: ^5.0.0 peerDependenciesMeta: @@ -6592,7 +6609,7 @@ __metadata: optional: true bin: tsconfck: bin/tsconfck.js - checksum: 10c0/5120e91b3388574b449d57d08f45d05d9966cf4b9d6aa1018652c1fff6d7d37b1ed099b07e6ebf6099aa40b8a16968dd337198c55b7274892849112b942861ed + checksum: 10c0/9b62cd85d5702aa23ea50ea578d7124f3d59cc4518fcc7eacc04f4f9c9c481f720738ff8351bd4472247c0723a17dfd01af95a5b60ad623cdb8727fbe4881847 languageName: node linkType: hard @@ -6830,15 +6847,15 @@ __metadata: linkType: hard "vite-prerender-plugin@npm:^0.5.3": - version: 0.5.5 - resolution: "vite-prerender-plugin@npm:0.5.5" + version: 0.5.6 + resolution: "vite-prerender-plugin@npm:0.5.6" dependencies: magic-string: "npm:^0.30.6" node-html-parser: "npm:^6.1.12" simple-code-frame: "npm:^1.3.0" source-map: "npm:^0.7.4" stack-trace: "npm:^1.0.0-pre2" - checksum: 10c0/f457d6e83c7d4134586ccb1700c344b9e52a651dc1f09d1ea64e7076ab7b77759da916ae5addcf4dde6ac4e82faf8addc409156d12a48451cefd1a6f46b44c54 + checksum: 10c0/74e0d860b4f539804da23e85ea6f16b341cc882c8c1ccffc5467b4c726c399aea87cd1bf244a21b58c664e27ad8de5aac56c070292332ccaed93ddf1e29f17dc languageName: node linkType: hard @@ -6858,14 +6875,14 @@ __metadata: languageName: node linkType: hard -"vite@npm:^6.0.11": - version: 6.0.11 - resolution: "vite@npm:6.0.11" +"vite@npm:^6.1.0": + version: 6.1.0 + resolution: "vite@npm:6.1.0" dependencies: esbuild: "npm:^0.24.2" fsevents: "npm:~2.3.3" - postcss: "npm:^8.4.49" - rollup: "npm:^4.23.0" + postcss: "npm:^8.5.1" + rollup: "npm:^4.30.1" peerDependencies: "@types/node": ^18.0.0 || ^20.0.0 || >=22.0.0 jiti: ">=1.21.0" @@ -6906,7 +6923,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/a0537f9bf8d6ded740646a4aa44b8dbf442d3005e75f7b27e981ef6011f22d4759f5eb643a393c0ffb8d21e2f50fb5f774d3a53108fb96a10b0f83697e8efe84 + checksum: 10c0/e1cad1cfbd29923a37d2dbd60f7387901ed8356758073a0226cbe844fd032425ba3bf41651332cab4965d5c54d0b51d208889ff32ce81bd282d230c0c9f0f8f1 languageName: node linkType: hard diff --git a/mock-api/package.json b/mock-api/package.json index b636211db..6244352ca 100644 --- a/mock-api/package.json +++ b/mock-api/package.json @@ -9,7 +9,7 @@ "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'" }, "dependencies": { - "@msgpack/msgpack": "^2.8.0", + "@msgpack/msgpack": "^3.0.0", "@trivago/prettier-plugin-sort-imports": "^5.2.2", "formidable": "^3.5.2", "itty-router": "^5.0.18", diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts index 0a0250c81..e706c888f 100644 --- a/mock-api/rest_server.ts +++ b/mock-api/rest_server.ts @@ -4338,7 +4338,7 @@ router .get(SYSTEM_STATUS_ENDPOINT, () => { if (countHardwarePoll >= 2) { countHardwarePoll = 0; - system_status.status = 'ready'; + system_status.status = 0; // SYSTEM_STATUS_NORMAL } countHardwarePoll++; @@ -5036,7 +5036,7 @@ router return status(200); } else if (cmd === 'restart') { console.log('restarting...'); - system_status.status = 'restarting'; + system_status.status = 5; countHardwarePoll = 0; return status(200); } else if (cmd === 'read') { @@ -5051,12 +5051,14 @@ router router .get(GH_ENDPOINT_ROOT + '/tags/latest', () => { - console.log('returning latest development version: ' + LATEST_DEV_VERSION); - return { name: 'v' + LATEST_DEV_VERSION }; + const data = { name: 'v' + LATEST_DEV_VERSION, published_at: new Date().toISOString() }; + console.log('returning latest development version: ', data); + return data; }) .get(GH_ENDPOINT_ROOT + '/latest', () => { - console.log('returning latest stable version: ' + LATEST_STABLE_VERSION); - return { name: 'v' + LATEST_STABLE_VERSION }; + const data = { name: 'v' + LATEST_STABLE_VERSION, published_at: '2025-02-07T20:09:46Z' }; + console.log('returning latest stable version: ', data); + return data; }); // const logger: ResponseHandler = (response, request) => { diff --git a/mock-api/yarn.lock b/mock-api/yarn.lock index 5a5440c43..7ef4f12dd 100644 --- a/mock-api/yarn.lock +++ b/mock-api/yarn.lock @@ -5,7 +5,7 @@ __metadata: version: 8 cacheKey: 10c0 -"@babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.2": +"@babel/code-frame@npm:^7.26.2": version: 7.26.2 resolution: "@babel/code-frame@npm:7.26.2" dependencies: @@ -16,16 +16,16 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.26.5": - version: 7.26.5 - resolution: "@babel/generator@npm:7.26.5" +"@babel/generator@npm:^7.26.5, @babel/generator@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/generator@npm:7.26.8" dependencies: - "@babel/parser": "npm:^7.26.5" - "@babel/types": "npm:^7.26.5" + "@babel/parser": "npm:^7.26.8" + "@babel/types": "npm:^7.26.8" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^3.0.2" - checksum: 10c0/3be79e0aa03f38858a465d12ee2e468320b9122dc44fc85984713e32f16f4d77ce34a16a1a9505972782590e0b8d847b6f373621f9c6fafa1906d90f31416cb0 + checksum: 10c0/9467f197d285ac315d1fa419138d36a3bfd69ca4baf763e914acab12f5f38e5d231497f6528e80613b28e73bb28c66fcc50b250b1f277b1a4d38ac14b03e9674 languageName: node linkType: hard @@ -43,50 +43,50 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.5, @babel/parser@npm:^7.26.7": - version: 7.26.7 - resolution: "@babel/parser@npm:7.26.7" +"@babel/parser@npm:^7.26.7, @babel/parser@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/parser@npm:7.26.8" dependencies: - "@babel/types": "npm:^7.26.7" + "@babel/types": "npm:^7.26.8" bin: parser: ./bin/babel-parser.js - checksum: 10c0/dcb08a4f2878ece33caffefe43b71488d753324bae7ca58d64bca3bc4af34dcfa1b58abdf9972516d76af760fceb25bb9294ca33461d56b31c5059ccfe32001f + checksum: 10c0/da04f26bae732a5b6790775a736b58c7876c28e62203c5097f043fd7273ef6debe5bfd7a4e670a6819f4549b215c7b9762c6358e44797b3c4d733defc8290781 languageName: node linkType: hard -"@babel/template@npm:^7.25.9": - version: 7.25.9 - resolution: "@babel/template@npm:7.25.9" +"@babel/template@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/template@npm:7.26.8" dependencies: - "@babel/code-frame": "npm:^7.25.9" - "@babel/parser": "npm:^7.25.9" - "@babel/types": "npm:^7.25.9" - checksum: 10c0/ebe677273f96a36c92cc15b7aa7b11cc8bc8a3bb7a01d55b2125baca8f19cae94ff3ce15f1b1880fb8437f3a690d9f89d4e91f16fc1dc4d3eb66226d128983ab + "@babel/code-frame": "npm:^7.26.2" + "@babel/parser": "npm:^7.26.8" + "@babel/types": "npm:^7.26.8" + checksum: 10c0/90bc1085cbc090cbdd43af7b9dbb98e6bda96e55e0f565f17ebb8e97c2dfce866dc727ca02b8e08bd2662ba4fd3851907ba3c48618162c291221af17fb258213 languageName: node linkType: hard "@babel/traverse@npm:^7.26.7": - version: 7.26.7 - resolution: "@babel/traverse@npm:7.26.7" + version: 7.26.8 + resolution: "@babel/traverse@npm:7.26.8" dependencies: "@babel/code-frame": "npm:^7.26.2" - "@babel/generator": "npm:^7.26.5" - "@babel/parser": "npm:^7.26.7" - "@babel/template": "npm:^7.25.9" - "@babel/types": "npm:^7.26.7" + "@babel/generator": "npm:^7.26.8" + "@babel/parser": "npm:^7.26.8" + "@babel/template": "npm:^7.26.8" + "@babel/types": "npm:^7.26.8" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10c0/b23a36ce40d2e4970741431c45d4f92e3f4c2895c0a421456516b2729bd9e17278846e01ee3d9039b0adf5fc5a071768061c17fcad040e74a5c3e39517449d5b + checksum: 10c0/0771d1ce0351628ad2e8dac56f0d59f706eb125c83fbcc039bde83088ba0a1477244ad5fb060802f90366cc4d7fa871e5009a292aef6205bcf83f2e01d1a0a5d languageName: node linkType: hard -"@babel/types@npm:^7.25.9, @babel/types@npm:^7.26.5, @babel/types@npm:^7.26.7": - version: 7.26.7 - resolution: "@babel/types@npm:7.26.7" +"@babel/types@npm:^7.26.7, @babel/types@npm:^7.26.8": + version: 7.26.8 + resolution: "@babel/types@npm:7.26.8" dependencies: "@babel/helper-string-parser": "npm:^7.25.9" "@babel/helper-validator-identifier": "npm:^7.25.9" - checksum: 10c0/7810a2bca97b13c253f07a0863a628d33dbe76ee3c163367f24be93bfaf4c8c0a325f73208abaaa050a6b36059efc2950c2e4b71fb109c0f07fa62221d8473d4 + checksum: 10c0/cd41ea47bb3d7baf2b3bf5e70e9c3a16f2eab699fab8575b2b31a7b1cb64166eb52c97124313863dde0581747bfc7a1810c838ad60b5b7ad1897d8004c7b95a9 languageName: node linkType: hard @@ -132,10 +132,10 @@ __metadata: languageName: node linkType: hard -"@msgpack/msgpack@npm:^2.8.0": - version: 2.8.0 - resolution: "@msgpack/msgpack@npm:2.8.0" - checksum: 10c0/5964ed3daad9ccf314238da81c91152dc693bca167b2469445c1d3ce0495443612e543d052281061a91ec48ed44a6a49dd3a334b5d0dbe2dc2db6ea6143e5787 +"@msgpack/msgpack@npm:^3.0.0": + version: 3.0.0 + resolution: "@msgpack/msgpack@npm:3.0.0" + checksum: 10c0/7616654e175129e5b6f823d3c9ebed6711a7dd7460e11c2278ac69bacb565e45e3503919914af50dd7cf7d9723302314676b94e31ab735a892ca6db4bef0e17b languageName: node linkType: hard @@ -260,7 +260,7 @@ __metadata: version: 0.0.0-use.local resolution: "mock-api@workspace:." dependencies: - "@msgpack/msgpack": "npm:^2.8.0" + "@msgpack/msgpack": "npm:^3.0.0" "@trivago/prettier-plugin-sort-imports": "npm:^5.2.2" formidable: "npm:^3.5.2" itty-router: "npm:^5.0.18" diff --git a/platformio.ini b/platformio.ini index ad15f24ab..45c5c1465 100644 --- a/platformio.ini +++ b/platformio.ini @@ -126,8 +126,8 @@ build_type = release board_build.filesystem = littlefs lib_deps = bblanchon/ArduinoJson @ 7.3.0 - ESP32Async/AsyncTCP @ 3.3.2 - ESP32Async/ESPAsyncWebServer @ 3.6.2 + ESP32Async/AsyncTCP @ 3.3.5 + ESP32Async/ESPAsyncWebServer @ 3.7.0 https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.4 ;