diff --git a/cspell.json b/cspell.json index 880eedb9c..a0c028ab4 100644 --- a/cspell.json +++ b/cspell.json @@ -9,6 +9,7 @@ } ], "dictionaries": ["project-words"], + "caseSensitive": false, "ignorePaths": [ "node_modules", "compile_commands.json", diff --git a/interface/package.json b/interface/package.json index 87005f6d9..2f170ed3b 100644 --- a/interface/package.json +++ b/interface/package.json @@ -47,22 +47,22 @@ "typescript": "^5.9.3" }, "devDependencies": { - "@babel/core": "^7.28.5", + "@babel/core": "^7.28.6", "@eslint/js": "^9.39.2", "@preact/compat": "^18.3.1", "@preact/preset-vite": "^2.10.2", "@trivago/prettier-plugin-sort-imports": "^6.0.2", - "@types/node": "^25.0.6", + "@types/node": "^25.0.9", "@types/react": "^19.2.8", "@types/react-dom": "^19.2.3", "axe-core": "^4.11.1", "concurrently": "^9.2.1", "eslint": "^9.39.2", "eslint-config-prettier": "^10.1.8", - "prettier": "^3.7.4", + "prettier": "^3.8.0", "rollup-plugin-visualizer": "^6.0.5", - "terser": "^5.44.1", - "typescript-eslint": "^8.52.0", + "terser": "^5.46.0", + "typescript-eslint": "^8.53.0", "vite": "^7.3.1", "vite-plugin-imagemin": "^0.6.1", "vite-tsconfig-paths": "^6.0.4" diff --git a/interface/pnpm-lock.yaml b/interface/pnpm-lock.yaml index a46d81557..37a101f1c 100644 --- a/interface/pnpm-lock.yaml +++ b/interface/pnpm-lock.yaml @@ -76,20 +76,20 @@ importers: version: 5.9.3 devDependencies: '@babel/core': - specifier: ^7.28.5 - version: 7.28.5 + specifier: ^7.28.6 + version: 7.28.6 '@eslint/js': specifier: ^9.39.2 version: 9.39.2 '@preact/preset-vite': specifier: ^2.10.2 - version: 2.10.2(@babel/core@7.28.5)(preact@10.28.2)(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1)) + version: 2.10.2(@babel/core@7.28.6)(preact@10.28.2)(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0)) '@trivago/prettier-plugin-sort-imports': specifier: ^6.0.2 - version: 6.0.2(prettier@3.7.4) + version: 6.0.2(prettier@3.8.0) '@types/node': - specifier: ^25.0.6 - version: 25.0.6 + specifier: ^25.0.9 + version: 25.0.9 '@types/react': specifier: ^19.2.8 version: 19.2.8 @@ -109,26 +109,26 @@ importers: specifier: ^10.1.8 version: 10.1.8(eslint@9.39.2) prettier: - specifier: ^3.7.4 - version: 3.7.4 + specifier: ^3.8.0 + version: 3.8.0 rollup-plugin-visualizer: specifier: ^6.0.5 version: 6.0.5(rollup@4.55.1) terser: - specifier: ^5.44.1 - version: 5.44.1 + specifier: ^5.46.0 + version: 5.46.0 typescript-eslint: - specifier: ^8.52.0 - version: 8.52.0(eslint@9.39.2)(typescript@5.9.3) + specifier: ^8.53.0 + version: 8.53.0(eslint@9.39.2)(typescript@5.9.3) vite: specifier: ^7.3.1 - version: 7.3.1(@types/node@25.0.6)(terser@5.44.1) + version: 7.3.1(@types/node@25.0.9)(terser@5.46.0) vite-plugin-imagemin: specifier: ^0.6.1 - version: 0.6.1(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1)) + version: 0.6.1(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0)) vite-tsconfig-paths: specifier: ^6.0.4 - version: 6.0.4(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1)) + version: 6.0.4(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0)) packages: @@ -140,46 +140,46 @@ packages: '@alova/shared@1.3.2': resolution: {integrity: sha512-1XvDLWgYpVZ99MmLl1f3Fw4T6S6pPYk5afz5cwRVjuq8JXEGsDn9IygDKfvRyWqkqCBx7Jif07LIct1O+MVEow==} - '@babel/code-frame@7.27.1': - resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==} + '@babel/code-frame@7.28.6': + resolution: {integrity: sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==} engines: {node: '>=6.9.0'} - '@babel/compat-data@7.28.5': - resolution: {integrity: sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==} + '@babel/compat-data@7.28.6': + resolution: {integrity: sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==} engines: {node: '>=6.9.0'} - '@babel/core@7.28.5': - resolution: {integrity: sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==} + '@babel/core@7.28.6': + resolution: {integrity: sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==} engines: {node: '>=6.9.0'} - '@babel/generator@7.28.5': - resolution: {integrity: sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==} + '@babel/generator@7.28.6': + resolution: {integrity: sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==} engines: {node: '>=6.9.0'} '@babel/helper-annotate-as-pure@7.27.3': resolution: {integrity: sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==} engines: {node: '>=6.9.0'} - '@babel/helper-compilation-targets@7.27.2': - resolution: {integrity: sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==} + '@babel/helper-compilation-targets@7.28.6': + resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==} engines: {node: '>=6.9.0'} '@babel/helper-globals@7.28.0': resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==} engines: {node: '>=6.9.0'} - '@babel/helper-module-imports@7.27.1': - resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==} + '@babel/helper-module-imports@7.28.6': + resolution: {integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==} engines: {node: '>=6.9.0'} - '@babel/helper-module-transforms@7.28.3': - resolution: {integrity: sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==} + '@babel/helper-module-transforms@7.28.6': + resolution: {integrity: sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-plugin-utils@7.27.1': - resolution: {integrity: sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==} + '@babel/helper-plugin-utils@7.28.6': + resolution: {integrity: sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==} engines: {node: '>=6.9.0'} '@babel/helper-string-parser@7.27.1': @@ -194,17 +194,17 @@ packages: resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==} engines: {node: '>=6.9.0'} - '@babel/helpers@7.28.4': - resolution: {integrity: sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==} + '@babel/helpers@7.28.6': + resolution: {integrity: sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==} engines: {node: '>=6.9.0'} - '@babel/parser@7.28.5': - resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==} + '@babel/parser@7.28.6': + resolution: {integrity: sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==} engines: {node: '>=6.0.0'} hasBin: true - '@babel/plugin-syntax-jsx@7.27.1': - resolution: {integrity: sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==} + '@babel/plugin-syntax-jsx@7.28.6': + resolution: {integrity: sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -215,26 +215,26 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-react-jsx@7.27.1': - resolution: {integrity: sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==} + '@babel/plugin-transform-react-jsx@7.28.6': + resolution: {integrity: sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/runtime@7.28.4': - resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==} + '@babel/runtime@7.28.6': + resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==} engines: {node: '>=6.9.0'} - '@babel/template@7.27.2': - resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} + '@babel/template@7.28.6': + resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.28.5': - resolution: {integrity: sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==} + '@babel/traverse@7.28.6': + resolution: {integrity: sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==} engines: {node: '>=6.9.0'} - '@babel/types@7.28.5': - resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==} + '@babel/types@7.28.6': + resolution: {integrity: sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==} engines: {node: '>=6.9.0'} '@emotion/babel-plugin@11.13.5': @@ -875,8 +875,8 @@ packages: resolution: {integrity: sha512-zmPitbQ8+6zNutpwgcQuLcsEpn/Cj54Kbn7L5pX0Os5kdWplB7xPgEh/g+SWOB/qmows2gpuCaPyduq8ZZRnxA==} deprecated: This is a stub types definition. minimatch provides its own type definitions, so you do not need this installed. - '@types/node@25.0.6': - resolution: {integrity: sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==} + '@types/node@25.0.9': + resolution: {integrity: sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==} '@types/parse-json@4.0.2': resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} @@ -903,63 +903,63 @@ packages: '@types/svgo@2.6.4': resolution: {integrity: sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==} - '@typescript-eslint/eslint-plugin@8.52.0': - resolution: {integrity: sha512-okqtOgqu2qmZJ5iN4TWlgfF171dZmx2FzdOv2K/ixL2LZWDStL8+JgQerI2sa8eAEfoydG9+0V96m7V+P8yE1Q==} + '@typescript-eslint/eslint-plugin@8.53.0': + resolution: {integrity: sha512-eEXsVvLPu8Z4PkFibtuFJLJOTAV/nPdgtSjkGoPpddpFk3/ym2oy97jynY6ic2m6+nc5M8SE1e9v/mHKsulcJg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.52.0 + '@typescript-eslint/parser': ^8.53.0 eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/parser@8.52.0': - resolution: {integrity: sha512-iIACsx8pxRnguSYhHiMn2PvhvfpopO9FXHyn1mG5txZIsAaB6F0KwbFnUQN3KCiG3Jcuad/Cao2FAs1Wp7vAyg==} + '@typescript-eslint/parser@8.53.0': + resolution: {integrity: sha512-npiaib8XzbjtzS2N4HlqPvlpxpmZ14FjSJrteZpPxGUaYPlvhzlzUZ4mZyABo0EFrOWnvyd0Xxroq//hKhtAWg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/project-service@8.52.0': - resolution: {integrity: sha512-xD0MfdSdEmeFa3OmVqonHi+Cciab96ls1UhIF/qX/O/gPu5KXD0bY9lu33jj04fjzrXHcuvjBcBC+D3SNSadaw==} + '@typescript-eslint/project-service@8.53.0': + resolution: {integrity: sha512-Bl6Gdr7NqkqIP5yP9z1JU///Nmes4Eose6L1HwpuVHwScgDPPuEWbUVhvlZmb8hy0vX9syLk5EGNL700WcBlbg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/scope-manager@8.52.0': - resolution: {integrity: sha512-ixxqmmCcc1Nf8S0mS0TkJ/3LKcC8mruYJPOU6Ia2F/zUUR4pApW7LzrpU3JmtePbRUTes9bEqRc1Gg4iyRnDzA==} + '@typescript-eslint/scope-manager@8.53.0': + resolution: {integrity: sha512-kWNj3l01eOGSdVBnfAF2K1BTh06WS0Yet6JUgb9Cmkqaz3Jlu0fdVUjj9UI8gPidBWSMqDIglmEXifSgDT/D0g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.52.0': - resolution: {integrity: sha512-jl+8fzr/SdzdxWJznq5nvoI7qn2tNYV/ZBAEcaFMVXf+K6jmXvAFrgo/+5rxgnL152f//pDEAYAhhBAZGrVfwg==} + '@typescript-eslint/tsconfig-utils@8.53.0': + resolution: {integrity: sha512-K6Sc0R5GIG6dNoPdOooQ+KtvT5KCKAvTcY8h2rIuul19vxH5OTQk7ArKkd4yTzkw66WnNY0kPPzzcmWA+XRmiA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/type-utils@8.52.0': - resolution: {integrity: sha512-JD3wKBRWglYRQkAtsyGz1AewDu3mTc7NtRjR/ceTyGoPqmdS5oCdx/oZMWD5Zuqmo6/MpsYs0wp6axNt88/2EQ==} + '@typescript-eslint/type-utils@8.53.0': + resolution: {integrity: sha512-BBAUhlx7g4SmcLhn8cnbxoxtmS7hcq39xKCgiutL3oNx1TaIp+cny51s8ewnKMpVUKQUGb41RAUWZ9kxYdovuw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/types@8.52.0': - resolution: {integrity: sha512-LWQV1V4q9V4cT4H5JCIx3481iIFxH1UkVk+ZkGGAV1ZGcjGI9IoFOfg3O6ywz8QqCDEp7Inlg6kovMofsNRaGg==} + '@typescript-eslint/types@8.53.0': + resolution: {integrity: sha512-Bmh9KX31Vlxa13+PqPvt4RzKRN1XORYSLlAE+sO1i28NkisGbTtSLFVB3l7PWdHtR3E0mVMuC7JilWJ99m2HxQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.52.0': - resolution: {integrity: sha512-XP3LClsCc0FsTK5/frGjolyADTh3QmsLp6nKd476xNI9CsSsLnmn4f0jrzNoAulmxlmNIpeXuHYeEQv61Q6qeQ==} + '@typescript-eslint/typescript-estree@8.53.0': + resolution: {integrity: sha512-pw0c0Gdo7Z4xOG987u3nJ8akL9093yEEKv8QTJ+Bhkghj1xyj8cgPaavlr9rq8h7+s6plUJ4QJYw2gCZodqmGw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/utils@8.52.0': - resolution: {integrity: sha512-wYndVMWkweqHpEpwPhwqE2lnD2DxC6WVLupU/DOt/0/v+/+iQbbzO3jOHjmBMnhu0DgLULvOaU4h4pwHYi2oRQ==} + '@typescript-eslint/utils@8.53.0': + resolution: {integrity: sha512-XDY4mXTez3Z1iRDI5mbRhH4DFSt46oaIFsLg+Zn97+sYrXACziXSQcSelMybnVZ5pa1P6xYkPr5cMJyunM1ZDA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/visitor-keys@8.52.0': - resolution: {integrity: sha512-ink3/Zofus34nmBsPjow63FP5M7IGff0RKAgqR6+CFpdk22M7aLwC9gOcLGYqr7MczLPzZVERW9hRog3O4n1sQ==} + '@typescript-eslint/visitor-keys@8.53.0': + resolution: {integrity: sha512-LZ2NqIHFhvFwxG0qZeLL9DvdNAHPGCY5dIRwBhyYeU+LfLhcStE1ImjsuTG/WaVh3XysGaeLW8Rqq7cGkPCFvw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} acorn-jsx@5.3.2: @@ -1042,8 +1042,8 @@ packages: base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - baseline-browser-mapping@2.9.14: - resolution: {integrity: sha512-B0xUquLkiGLgHhpPBqvl7GWegWBUNuujQ6kXd/r1U38ElPT6Ok8KZ8e+FpUGEc2ZoRQUzq/aUnaKFc/svWUGSg==} + baseline-browser-mapping@2.9.15: + resolution: {integrity: sha512-kX8h7K2srmDyYnXRIppo4AH/wYgzWVCs+eKr3RusRSQ5PvRYoEFmR/I0PbdTjKFAoKqp5+kbxnNTFO9jOfSVJg==} hasBin: true bin-build@3.0.0: @@ -2490,8 +2490,8 @@ packages: resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==} engines: {node: '>=4'} - prettier@3.7.4: - resolution: {integrity: sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==} + prettier@3.8.0: + resolution: {integrity: sha512-yEPsovQfpxYfgWNhCfECjG5AQaO+K3dp6XERmOepyPDVqcJm+bjyCVO3pmU+nAPe0N5dDvekfGezt/EIiRe1TA==} engines: {node: '>=14'} hasBin: true @@ -2863,8 +2863,8 @@ packages: resolution: {integrity: sha512-ZOn6nJUgvgC09+doCEF3oB+r3ag7kUvlsXEGX069QRD60p+P3uP7XG9N2/at+EyIRGSN//ZY3LyEotA1YpmjuA==} engines: {node: '>=4'} - terser@5.44.1: - resolution: {integrity: sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==} + terser@5.46.0: + resolution: {integrity: sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==} engines: {node: '>=10'} hasBin: true @@ -2939,8 +2939,8 @@ packages: peerDependencies: typescript: '>=3.5.1' - typescript-eslint@8.52.0: - resolution: {integrity: sha512-atlQQJ2YkO4pfTVQmQ+wvYQwexPDOIgo+RaVcD7gHgzy/IQA+XTyuxNM9M9TVXvttkF7koBHmcwisKdOAf2EcA==} + typescript-eslint@8.53.0: + resolution: {integrity: sha512-xHURCQNxZ1dsWn0sdOaOfCSQG0HKeqSj9OexIxrz6ypU6wHYOdX2I3D2b8s8wFSsSOYJb+6q283cLiLlkEsBYw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -3051,8 +3051,8 @@ packages: yaml: optional: true - which-typed-array@1.1.19: - resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==} + which-typed-array@1.1.20: + resolution: {integrity: sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==} engines: {node: '>= 0.4'} which@1.3.1: @@ -3117,25 +3117,25 @@ snapshots: '@alova/shared@1.3.2': {} - '@babel/code-frame@7.27.1': + '@babel/code-frame@7.28.6': dependencies: '@babel/helper-validator-identifier': 7.28.5 js-tokens: 4.0.0 picocolors: 1.1.1 - '@babel/compat-data@7.28.5': {} + '@babel/compat-data@7.28.6': {} - '@babel/core@7.28.5': + '@babel/core@7.28.6': dependencies: - '@babel/code-frame': 7.27.1 - '@babel/generator': 7.28.5 - '@babel/helper-compilation-targets': 7.27.2 - '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.5) - '@babel/helpers': 7.28.4 - '@babel/parser': 7.28.5 - '@babel/template': 7.27.2 - '@babel/traverse': 7.28.5 - '@babel/types': 7.28.5 + '@babel/code-frame': 7.28.6 + '@babel/generator': 7.28.6 + '@babel/helper-compilation-targets': 7.28.6 + '@babel/helper-module-transforms': 7.28.6(@babel/core@7.28.6) + '@babel/helpers': 7.28.6 + '@babel/parser': 7.28.6 + '@babel/template': 7.28.6 + '@babel/traverse': 7.28.6 + '@babel/types': 7.28.6 '@jridgewell/remapping': 2.3.5 convert-source-map: 2.0.0 debug: 4.4.3 @@ -3145,21 +3145,21 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.28.5': + '@babel/generator@7.28.6': dependencies: - '@babel/parser': 7.28.5 - '@babel/types': 7.28.5 + '@babel/parser': 7.28.6 + '@babel/types': 7.28.6 '@jridgewell/gen-mapping': 0.3.13 '@jridgewell/trace-mapping': 0.3.31 jsesc: 3.1.0 '@babel/helper-annotate-as-pure@7.27.3': dependencies: - '@babel/types': 7.28.5 + '@babel/types': 7.28.6 - '@babel/helper-compilation-targets@7.27.2': + '@babel/helper-compilation-targets@7.28.6': dependencies: - '@babel/compat-data': 7.28.5 + '@babel/compat-data': 7.28.6 '@babel/helper-validator-option': 7.27.1 browserslist: 4.28.1 lru-cache: 5.1.1 @@ -3167,23 +3167,23 @@ snapshots: '@babel/helper-globals@7.28.0': {} - '@babel/helper-module-imports@7.27.1': + '@babel/helper-module-imports@7.28.6': dependencies: - '@babel/traverse': 7.28.5 - '@babel/types': 7.28.5 + '@babel/traverse': 7.28.6 + '@babel/types': 7.28.6 transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.28.3(@babel/core@7.28.5)': + '@babel/helper-module-transforms@7.28.6(@babel/core@7.28.6)': dependencies: - '@babel/core': 7.28.5 - '@babel/helper-module-imports': 7.27.1 + '@babel/core': 7.28.6 + '@babel/helper-module-imports': 7.28.6 '@babel/helper-validator-identifier': 7.28.5 - '@babel/traverse': 7.28.5 + '@babel/traverse': 7.28.6 transitivePeerDependencies: - supports-color - '@babel/helper-plugin-utils@7.27.1': {} + '@babel/helper-plugin-utils@7.28.6': {} '@babel/helper-string-parser@7.27.1': {} @@ -3191,67 +3191,67 @@ snapshots: '@babel/helper-validator-option@7.27.1': {} - '@babel/helpers@7.28.4': + '@babel/helpers@7.28.6': dependencies: - '@babel/template': 7.27.2 - '@babel/types': 7.28.5 + '@babel/template': 7.28.6 + '@babel/types': 7.28.6 - '@babel/parser@7.28.5': + '@babel/parser@7.28.6': dependencies: - '@babel/types': 7.28.5 + '@babel/types': 7.28.6 - '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.5)': + '@babel/plugin-syntax-jsx@7.28.6(@babel/core@7.28.6)': dependencies: - '@babel/core': 7.28.5 - '@babel/helper-plugin-utils': 7.27.1 + '@babel/core': 7.28.6 + '@babel/helper-plugin-utils': 7.28.6 - '@babel/plugin-transform-react-jsx-development@7.27.1(@babel/core@7.28.5)': + '@babel/plugin-transform-react-jsx-development@7.27.1(@babel/core@7.28.6)': dependencies: - '@babel/core': 7.28.5 - '@babel/plugin-transform-react-jsx': 7.27.1(@babel/core@7.28.5) + '@babel/core': 7.28.6 + '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.28.6) transitivePeerDependencies: - supports-color - '@babel/plugin-transform-react-jsx@7.27.1(@babel/core@7.28.5)': + '@babel/plugin-transform-react-jsx@7.28.6(@babel/core@7.28.6)': dependencies: - '@babel/core': 7.28.5 + '@babel/core': 7.28.6 '@babel/helper-annotate-as-pure': 7.27.3 - '@babel/helper-module-imports': 7.27.1 - '@babel/helper-plugin-utils': 7.27.1 - '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.5) - '@babel/types': 7.28.5 + '@babel/helper-module-imports': 7.28.6 + '@babel/helper-plugin-utils': 7.28.6 + '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.28.6) + '@babel/types': 7.28.6 transitivePeerDependencies: - supports-color - '@babel/runtime@7.28.4': {} + '@babel/runtime@7.28.6': {} - '@babel/template@7.27.2': + '@babel/template@7.28.6': dependencies: - '@babel/code-frame': 7.27.1 - '@babel/parser': 7.28.5 - '@babel/types': 7.28.5 + '@babel/code-frame': 7.28.6 + '@babel/parser': 7.28.6 + '@babel/types': 7.28.6 - '@babel/traverse@7.28.5': + '@babel/traverse@7.28.6': dependencies: - '@babel/code-frame': 7.27.1 - '@babel/generator': 7.28.5 + '@babel/code-frame': 7.28.6 + '@babel/generator': 7.28.6 '@babel/helper-globals': 7.28.0 - '@babel/parser': 7.28.5 - '@babel/template': 7.27.2 - '@babel/types': 7.28.5 + '@babel/parser': 7.28.6 + '@babel/template': 7.28.6 + '@babel/types': 7.28.6 debug: 4.4.3 transitivePeerDependencies: - supports-color - '@babel/types@7.28.5': + '@babel/types@7.28.6': dependencies: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.28.5 '@emotion/babel-plugin@11.13.5': dependencies: - '@babel/helper-module-imports': 7.27.1 - '@babel/runtime': 7.28.4 + '@babel/helper-module-imports': 7.28.6 + '@babel/runtime': 7.28.6 '@emotion/hash': 0.9.2 '@emotion/memoize': 0.9.0 '@emotion/serialize': 1.3.3 @@ -3282,7 +3282,7 @@ snapshots: '@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 '@emotion/babel-plugin': 11.13.5 '@emotion/cache': 11.14.0 '@emotion/serialize': 1.3.3 @@ -3308,7 +3308,7 @@ snapshots: '@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 '@emotion/babel-plugin': 11.13.5 '@emotion/is-prop-valid': 1.4.0 '@emotion/react': 11.14.0(@types/react@19.2.8)(react@19.2.3) @@ -3503,7 +3503,7 @@ snapshots: '@mui/icons-material@7.3.7(@mui/material@7.3.7(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(@types/react@19.2.8)(react@19.2.3)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 '@mui/material': 7.3.7(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react: 19.2.3 optionalDependencies: @@ -3511,7 +3511,7 @@ snapshots: '@mui/material@7.3.7(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 '@mui/core-downloads-tracker': 7.3.7 '@mui/system': 7.3.7(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3) '@mui/types': 7.4.10(@types/react@19.2.8) @@ -3532,7 +3532,7 @@ snapshots: '@mui/private-theming@7.3.7(@types/react@19.2.8)(react@19.2.3)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 '@mui/utils': 7.3.7(@types/react@19.2.8)(react@19.2.3) prop-types: 15.8.1 react: 19.2.3 @@ -3541,7 +3541,7 @@ snapshots: '@mui/styled-engine@7.3.7(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3))(react@19.2.3)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 '@emotion/cache': 11.14.0 '@emotion/serialize': 1.3.3 '@emotion/sheet': 1.4.0 @@ -3554,7 +3554,7 @@ snapshots: '@mui/system@7.3.7(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 '@mui/private-theming': 7.3.7(@types/react@19.2.8)(react@19.2.3) '@mui/styled-engine': 7.3.7(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.8)(react@19.2.3))(@types/react@19.2.8)(react@19.2.3))(react@19.2.3) '@mui/types': 7.4.10(@types/react@19.2.8) @@ -3570,13 +3570,13 @@ snapshots: '@mui/types@7.4.10(@types/react@19.2.8)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 optionalDependencies: '@types/react': 19.2.8 '@mui/utils@7.3.7(@types/react@19.2.8)(react@19.2.3)': dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 '@mui/types': 7.4.10(@types/react@19.2.8) '@types/prop-types': 15.7.15 clsx: 2.1.1 @@ -3610,18 +3610,18 @@ snapshots: dependencies: preact: 10.28.2 - '@preact/preset-vite@2.10.2(@babel/core@7.28.5)(preact@10.28.2)(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1))': + '@preact/preset-vite@2.10.2(@babel/core@7.28.6)(preact@10.28.2)(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0))': dependencies: - '@babel/core': 7.28.5 - '@babel/plugin-transform-react-jsx': 7.27.1(@babel/core@7.28.5) - '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.28.5) - '@prefresh/vite': 2.4.11(preact@10.28.2)(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1)) + '@babel/core': 7.28.6 + '@babel/plugin-transform-react-jsx': 7.28.6(@babel/core@7.28.6) + '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.28.6) + '@prefresh/vite': 2.4.11(preact@10.28.2)(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0)) '@rollup/pluginutils': 4.2.1 - babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.28.5) + babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.28.6) debug: 4.4.3 picocolors: 1.1.1 - vite: 7.3.1(@types/node@25.0.6)(terser@5.44.1) - vite-prerender-plugin: 0.5.12(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1)) + vite: 7.3.1(@types/node@25.0.9)(terser@5.46.0) + vite-prerender-plugin: 0.5.12(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0)) transitivePeerDependencies: - preact - supports-color @@ -3634,15 +3634,15 @@ snapshots: '@prefresh/utils@1.2.1': {} - '@prefresh/vite@2.4.11(preact@10.28.2)(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1))': + '@prefresh/vite@2.4.11(preact@10.28.2)(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0))': dependencies: - '@babel/core': 7.28.5 + '@babel/core': 7.28.6 '@prefresh/babel-plugin': 0.5.2 '@prefresh/core': 1.5.9(preact@10.28.2) '@prefresh/utils': 1.2.1 '@rollup/pluginutils': 4.2.1 preact: 10.28.2 - vite: 7.3.1(@types/node@25.0.6)(terser@5.44.1) + vite: 7.3.1(@types/node@25.0.9)(terser@5.46.0) transitivePeerDependencies: - supports-color @@ -3737,17 +3737,17 @@ snapshots: react-virtualized-auto-sizer: 1.0.26(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react-window: 1.8.11(react-dom@19.2.3(react@19.2.3))(react@19.2.3) - '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.7.4)': + '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.8.0)': dependencies: - '@babel/generator': 7.28.5 - '@babel/parser': 7.28.5 - '@babel/traverse': 7.28.5 - '@babel/types': 7.28.5 + '@babel/generator': 7.28.6 + '@babel/parser': 7.28.6 + '@babel/traverse': 7.28.6 + '@babel/types': 7.28.6 javascript-natural-sort: 0.7.1 lodash-es: 4.17.22 minimatch: 9.0.5 parse-imports-exports: 0.2.4 - prettier: 3.7.4 + prettier: 3.8.0 transitivePeerDependencies: - supports-color @@ -3758,7 +3758,7 @@ snapshots: '@types/glob@7.2.0': dependencies: '@types/minimatch': 6.0.0 - '@types/node': 25.0.6 + '@types/node': 25.0.9 '@types/imagemin-gifsicle@7.0.4': dependencies: @@ -3787,19 +3787,19 @@ snapshots: '@types/imagemin@7.0.1': dependencies: - '@types/node': 25.0.6 + '@types/node': 25.0.9 '@types/json-schema@7.0.15': {} '@types/keyv@3.1.4': dependencies: - '@types/node': 25.0.6 + '@types/node': 25.0.9 '@types/minimatch@6.0.0': dependencies: minimatch: 10.1.1 - '@types/node@25.0.6': + '@types/node@25.0.9': dependencies: undici-types: 7.16.0 @@ -3821,20 +3821,20 @@ snapshots: '@types/responselike@1.0.3': dependencies: - '@types/node': 25.0.6 + '@types/node': 25.0.9 '@types/svgo@2.6.4': dependencies: - '@types/node': 25.0.6 + '@types/node': 25.0.9 - '@typescript-eslint/eslint-plugin@8.52.0(@typescript-eslint/parser@8.52.0(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/eslint-plugin@8.53.0(@typescript-eslint/parser@8.53.0(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2)(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.52.0(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/scope-manager': 8.52.0 - '@typescript-eslint/type-utils': 8.52.0(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/utils': 8.52.0(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.52.0 + '@typescript-eslint/parser': 8.53.0(eslint@9.39.2)(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.53.0 + '@typescript-eslint/type-utils': 8.53.0(eslint@9.39.2)(typescript@5.9.3) + '@typescript-eslint/utils': 8.53.0(eslint@9.39.2)(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.53.0 eslint: 9.39.2 ignore: 7.0.5 natural-compare: 1.4.0 @@ -3843,41 +3843,41 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.52.0(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/parser@8.53.0(eslint@9.39.2)(typescript@5.9.3)': dependencies: - '@typescript-eslint/scope-manager': 8.52.0 - '@typescript-eslint/types': 8.52.0 - '@typescript-eslint/typescript-estree': 8.52.0(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.52.0 + '@typescript-eslint/scope-manager': 8.53.0 + '@typescript-eslint/types': 8.53.0 + '@typescript-eslint/typescript-estree': 8.53.0(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.53.0 debug: 4.4.3 eslint: 9.39.2 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.52.0(typescript@5.9.3)': + '@typescript-eslint/project-service@8.53.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.52.0(typescript@5.9.3) - '@typescript-eslint/types': 8.52.0 + '@typescript-eslint/tsconfig-utils': 8.53.0(typescript@5.9.3) + '@typescript-eslint/types': 8.53.0 debug: 4.4.3 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.52.0': + '@typescript-eslint/scope-manager@8.53.0': dependencies: - '@typescript-eslint/types': 8.52.0 - '@typescript-eslint/visitor-keys': 8.52.0 + '@typescript-eslint/types': 8.53.0 + '@typescript-eslint/visitor-keys': 8.53.0 - '@typescript-eslint/tsconfig-utils@8.52.0(typescript@5.9.3)': + '@typescript-eslint/tsconfig-utils@8.53.0(typescript@5.9.3)': dependencies: typescript: 5.9.3 - '@typescript-eslint/type-utils@8.52.0(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/type-utils@8.53.0(eslint@9.39.2)(typescript@5.9.3)': dependencies: - '@typescript-eslint/types': 8.52.0 - '@typescript-eslint/typescript-estree': 8.52.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.52.0(eslint@9.39.2)(typescript@5.9.3) + '@typescript-eslint/types': 8.53.0 + '@typescript-eslint/typescript-estree': 8.53.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.53.0(eslint@9.39.2)(typescript@5.9.3) debug: 4.4.3 eslint: 9.39.2 ts-api-utils: 2.4.0(typescript@5.9.3) @@ -3885,14 +3885,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.52.0': {} + '@typescript-eslint/types@8.53.0': {} - '@typescript-eslint/typescript-estree@8.52.0(typescript@5.9.3)': + '@typescript-eslint/typescript-estree@8.53.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/project-service': 8.52.0(typescript@5.9.3) - '@typescript-eslint/tsconfig-utils': 8.52.0(typescript@5.9.3) - '@typescript-eslint/types': 8.52.0 - '@typescript-eslint/visitor-keys': 8.52.0 + '@typescript-eslint/project-service': 8.53.0(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.53.0(typescript@5.9.3) + '@typescript-eslint/types': 8.53.0 + '@typescript-eslint/visitor-keys': 8.53.0 debug: 4.4.3 minimatch: 9.0.5 semver: 7.7.3 @@ -3902,20 +3902,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.52.0(eslint@9.39.2)(typescript@5.9.3)': + '@typescript-eslint/utils@8.53.0(eslint@9.39.2)(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2) - '@typescript-eslint/scope-manager': 8.52.0 - '@typescript-eslint/types': 8.52.0 - '@typescript-eslint/typescript-estree': 8.52.0(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.53.0 + '@typescript-eslint/types': 8.53.0 + '@typescript-eslint/typescript-estree': 8.53.0(typescript@5.9.3) eslint: 9.39.2 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.52.0': + '@typescript-eslint/visitor-keys@8.53.0': dependencies: - '@typescript-eslint/types': 8.52.0 + '@typescript-eslint/types': 8.53.0 eslint-visitor-keys: 4.2.1 acorn-jsx@5.3.2(acorn@8.15.0): @@ -3970,19 +3970,19 @@ snapshots: babel-plugin-macros@3.1.0: dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 cosmiconfig: 7.1.0 resolve: 1.22.11 - babel-plugin-transform-hook-names@1.0.2(@babel/core@7.28.5): + babel-plugin-transform-hook-names@1.0.2(@babel/core@7.28.6): dependencies: - '@babel/core': 7.28.5 + '@babel/core': 7.28.6 balanced-match@1.0.2: {} base64-js@1.5.1: {} - baseline-browser-mapping@2.9.14: {} + baseline-browser-mapping@2.9.15: {} bin-build@3.0.0: dependencies: @@ -4039,7 +4039,7 @@ snapshots: browserslist@4.28.1: dependencies: - baseline-browser-mapping: 2.9.14 + baseline-browser-mapping: 2.9.15 caniuse-lite: 1.0.30001764 electron-to-chromium: 1.5.267 node-releases: 2.0.27 @@ -4312,7 +4312,7 @@ snapshots: dom-helpers@5.2.1: dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 csstype: 3.2.3 dom-serializer@1.4.1: @@ -5093,7 +5093,7 @@ snapshots: is-typed-array@1.1.15: dependencies: - which-typed-array: 1.1.19 + which-typed-array: 1.1.20 is-utf8@0.2.1: {} @@ -5432,7 +5432,7 @@ snapshots: parse-json@5.2.0: dependencies: - '@babel/code-frame': 7.27.1 + '@babel/code-frame': 7.28.6 error-ex: 1.3.4 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -5505,7 +5505,7 @@ snapshots: prepend-http@2.0.0: {} - prettier@3.7.4: {} + prettier@3.8.0: {} process-nextick-args@2.0.1: {} @@ -5565,7 +5565,7 @@ snapshots: react-transition-group@4.4.5(react-dom@19.2.3(react@19.2.3))(react@19.2.3): dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 @@ -5579,7 +5579,7 @@ snapshots: react-window@1.8.11(react-dom@19.2.3(react@19.2.3))(react@19.2.3): dependencies: - '@babel/runtime': 7.28.4 + '@babel/runtime': 7.28.6 memoize-one: 5.2.1 react: 19.2.3 react-dom: 19.2.3(react@19.2.3) @@ -5875,7 +5875,7 @@ snapshots: temp-dir: 1.0.0 uuid: 3.4.0 - terser@5.44.1: + terser@5.46.0: dependencies: '@jridgewell/source-map': 0.3.11 acorn: 8.15.0 @@ -5939,12 +5939,12 @@ snapshots: dependencies: typescript: 5.9.3 - typescript-eslint@8.52.0(eslint@9.39.2)(typescript@5.9.3): + typescript-eslint@8.53.0(eslint@9.39.2)(typescript@5.9.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.52.0(@typescript-eslint/parser@8.52.0(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/parser': 8.52.0(eslint@9.39.2)(typescript@5.9.3) - '@typescript-eslint/typescript-estree': 8.52.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.52.0(eslint@9.39.2)(typescript@5.9.3) + '@typescript-eslint/eslint-plugin': 8.53.0(@typescript-eslint/parser@8.53.0(eslint@9.39.2)(typescript@5.9.3))(eslint@9.39.2)(typescript@5.9.3) + '@typescript-eslint/parser': 8.53.0(eslint@9.39.2)(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.53.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.53.0(eslint@9.39.2)(typescript@5.9.3) eslint: 9.39.2 typescript: 5.9.3 transitivePeerDependencies: @@ -5990,7 +5990,7 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - vite-plugin-imagemin@0.6.1(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1)): + vite-plugin-imagemin@0.6.1(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0)): dependencies: '@types/imagemin': 7.0.1 '@types/imagemin-gifsicle': 7.0.4 @@ -6015,11 +6015,11 @@ snapshots: imagemin-webp: 6.1.0 jpegtran-bin: 6.0.1 pathe: 0.2.0 - vite: 7.3.1(@types/node@25.0.6)(terser@5.44.1) + vite: 7.3.1(@types/node@25.0.9)(terser@5.46.0) transitivePeerDependencies: - supports-color - vite-prerender-plugin@0.5.12(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1)): + vite-prerender-plugin@0.5.12(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0)): dependencies: kolorist: 1.8.0 magic-string: 0.30.21 @@ -6027,20 +6027,20 @@ snapshots: simple-code-frame: 1.3.0 source-map: 0.7.6 stack-trace: 1.0.0-pre2 - vite: 7.3.1(@types/node@25.0.6)(terser@5.44.1) + vite: 7.3.1(@types/node@25.0.9)(terser@5.46.0) - vite-tsconfig-paths@6.0.4(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.6)(terser@5.44.1)): + vite-tsconfig-paths@6.0.4(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.9)(terser@5.46.0)): dependencies: debug: 4.4.3 globrex: 0.1.2 tsconfck: 3.1.6(typescript@5.9.3) optionalDependencies: - vite: 7.3.1(@types/node@25.0.6)(terser@5.44.1) + vite: 7.3.1(@types/node@25.0.9)(terser@5.46.0) transitivePeerDependencies: - supports-color - typescript - vite@7.3.1(@types/node@25.0.6)(terser@5.44.1): + vite@7.3.1(@types/node@25.0.9)(terser@5.46.0): dependencies: esbuild: 0.27.2 fdir: 6.5.0(picomatch@4.0.3) @@ -6049,11 +6049,11 @@ snapshots: rollup: 4.55.1 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 25.0.6 + '@types/node': 25.0.9 fsevents: 2.3.3 - terser: 5.44.1 + terser: 5.46.0 - which-typed-array@1.1.19: + which-typed-array@1.1.20: dependencies: available-typed-arrays: 1.0.7 call-bind: 1.0.8 diff --git a/mock-api/package.json b/mock-api/package.json index d05239e7b..d384e9bb8 100644 --- a/mock-api/package.json +++ b/mock-api/package.json @@ -13,7 +13,7 @@ "@trivago/prettier-plugin-sort-imports": "^6.0.2", "formidable": "^3.5.4", "itty-router": "^5.0.22", - "prettier": "^3.7.4" + "prettier": "^3.8.0" }, "packageManager": "pnpm@10.28.0+sha512.05df71d1421f21399e053fde567cea34d446fa02c76571441bfc1c7956e98e363088982d940465fd34480d4d90a0668bc12362f8aa88000a64e83d0b0e47be48" } diff --git a/mock-api/pnpm-lock.yaml b/mock-api/pnpm-lock.yaml index 5f50a949e..9bfb93058 100644 --- a/mock-api/pnpm-lock.yaml +++ b/mock-api/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: version: 3.1.3 '@trivago/prettier-plugin-sort-imports': specifier: ^6.0.2 - version: 6.0.2(prettier@3.7.4) + version: 6.0.2(prettier@3.8.0) formidable: specifier: ^3.5.4 version: 3.5.4 @@ -21,17 +21,17 @@ importers: specifier: ^5.0.22 version: 5.0.22 prettier: - specifier: ^3.7.4 - version: 3.7.4 + specifier: ^3.8.0 + version: 3.8.0 packages: - '@babel/code-frame@7.27.1': - resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==} + '@babel/code-frame@7.28.6': + resolution: {integrity: sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==} engines: {node: '>=6.9.0'} - '@babel/generator@7.28.5': - resolution: {integrity: sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==} + '@babel/generator@7.28.6': + resolution: {integrity: sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==} engines: {node: '>=6.9.0'} '@babel/helper-globals@7.28.0': @@ -46,21 +46,21 @@ packages: resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==} engines: {node: '>=6.9.0'} - '@babel/parser@7.28.5': - resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==} + '@babel/parser@7.28.6': + resolution: {integrity: sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==} engines: {node: '>=6.0.0'} hasBin: true - '@babel/template@7.27.2': - resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} + '@babel/template@7.28.6': + resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.28.5': - resolution: {integrity: sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==} + '@babel/traverse@7.28.6': + resolution: {integrity: sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==} engines: {node: '>=6.9.0'} - '@babel/types@7.28.5': - resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==} + '@babel/types@7.28.6': + resolution: {integrity: sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==} engines: {node: '>=6.9.0'} '@jridgewell/gen-mapping@0.3.13': @@ -167,8 +167,8 @@ packages: picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} - prettier@3.7.4: - resolution: {integrity: sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==} + prettier@3.8.0: + resolution: {integrity: sha512-yEPsovQfpxYfgWNhCfECjG5AQaO+K3dp6XERmOepyPDVqcJm+bjyCVO3pmU+nAPe0N5dDvekfGezt/EIiRe1TA==} engines: {node: '>=14'} hasBin: true @@ -177,16 +177,16 @@ packages: snapshots: - '@babel/code-frame@7.27.1': + '@babel/code-frame@7.28.6': dependencies: '@babel/helper-validator-identifier': 7.28.5 js-tokens: 4.0.0 picocolors: 1.1.1 - '@babel/generator@7.28.5': + '@babel/generator@7.28.6': dependencies: - '@babel/parser': 7.28.5 - '@babel/types': 7.28.5 + '@babel/parser': 7.28.6 + '@babel/types': 7.28.6 '@jridgewell/gen-mapping': 0.3.13 '@jridgewell/trace-mapping': 0.3.31 jsesc: 3.1.0 @@ -197,29 +197,29 @@ snapshots: '@babel/helper-validator-identifier@7.28.5': {} - '@babel/parser@7.28.5': + '@babel/parser@7.28.6': dependencies: - '@babel/types': 7.28.5 + '@babel/types': 7.28.6 - '@babel/template@7.27.2': + '@babel/template@7.28.6': dependencies: - '@babel/code-frame': 7.27.1 - '@babel/parser': 7.28.5 - '@babel/types': 7.28.5 + '@babel/code-frame': 7.28.6 + '@babel/parser': 7.28.6 + '@babel/types': 7.28.6 - '@babel/traverse@7.28.5': + '@babel/traverse@7.28.6': dependencies: - '@babel/code-frame': 7.27.1 - '@babel/generator': 7.28.5 + '@babel/code-frame': 7.28.6 + '@babel/generator': 7.28.6 '@babel/helper-globals': 7.28.0 - '@babel/parser': 7.28.5 - '@babel/template': 7.27.2 - '@babel/types': 7.28.5 + '@babel/parser': 7.28.6 + '@babel/template': 7.28.6 + '@babel/types': 7.28.6 debug: 4.4.3 transitivePeerDependencies: - supports-color - '@babel/types@7.28.5': + '@babel/types@7.28.6': dependencies: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.28.5 @@ -246,17 +246,17 @@ snapshots: dependencies: '@noble/hashes': 1.8.0 - '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.7.4)': + '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.8.0)': dependencies: - '@babel/generator': 7.28.5 - '@babel/parser': 7.28.5 - '@babel/traverse': 7.28.5 - '@babel/types': 7.28.5 + '@babel/generator': 7.28.6 + '@babel/parser': 7.28.6 + '@babel/traverse': 7.28.6 + '@babel/types': 7.28.6 javascript-natural-sort: 0.7.1 lodash-es: 4.17.22 minimatch: 9.0.5 parse-imports-exports: 0.2.4 - prettier: 3.7.4 + prettier: 3.8.0 transitivePeerDependencies: - supports-color @@ -311,6 +311,6 @@ snapshots: picocolors@1.1.1: {} - prettier@3.7.4: {} + prettier@3.8.0: {} wrappy@1.0.2: {} diff --git a/project-words.txt b/project-words.txt index ea16610ce..5c880b0b8 100644 --- a/project-words.txt +++ b/project-words.txt @@ -1,76 +1,71 @@ abluft -Abluft abluftfeuchte -Abluftfeuchtefühler +abluftfeuchtefühler abluftgebläse abluftqualität -Abluftqualitätsfühler -ABRT +abluftqualitätsfühler +abrt absburnpow accomodate aceotrope -ACTIVEHIGH -ACTIVELOW -Adafruit +activehigh +activelow +adafruit adde adress +ahsx +airbypass airhumidity airpurgemode airquality -Airquality -Ajcks -AKMP +ajcks +akmp aktivieren allvalues -ALLVALUES alova -Alova alphanum alse alternatingop altopprio altopprioheat +analogenabled analogsensor -ANALOGSENSOR analogsensors analyse -Anschlussvariante +anschlussvariante apicalls apifails apiflags -APIP -APIURL -APLL +apip +apiurl +apll appfree -APPSIZE +appsize appused -APSSID -APSTA -ARDUHAL +apssid +apsta +arduhal arduinojson -ARDUINOJSON -ARDUINOOTA -Arjan -Arlott -Arwed -ASSOCED -ASTATES +arduinoota +arjan +arlott +arwed +assoced +astates asym asymetric asyncesp -ASYNCEVENTSOURCE -ASYNCTCP -ASYNCWEBSERVER -ASYNCWEBSERVERHANDLERIMPL -ASYNCWEBSERVERRESPONSEIMPL -ASYNCWEBSOCKET -ASYNCWEBSYNCHRONIZATION +asynceventsource +asynctcp +asyncwebserver +asyncwebserverhandlerimpl +asyncwebserverresponseimpl +asyncwebsocket +asyncwebsynchronization atoint ausreichend außenluft -Außenluft authmode -AUTHMODE autodst automode autoscroll @@ -79,6 +74,7 @@ auxelecheatnrgconsheating auxelecheatnrgconspool auxelecheatnrgconstotal auxheaterdelay +auxheaterlevel auxheateroff auxheateronly auxheaterstatus @@ -87,85 +83,89 @@ auxheatrmode auxlimitstart auxmaxlimit avty -AWSC -Azubuike +awsc +azubuike badems basepoint -BASEREG +basereg +bblanchon bbqkees -Benoit +beddouble +bedsingle +benoit bertmelis -Bertrik +bertrik bitb bitptr bittimes bitupdate bitvalue -BLANCHON +blanchon blockend blockheader blockheadersize blocksize blocktime -Blowerspeed -Boardprofile -BOARDPROFILE +blowerspeed +boardprofile boilhystoff boilhyston boiltemp bolier +bolv boosttime bootable bootloader bottomtemp +bowlmix breakp +brotlin bssid -Bssid -BSSID buderus -Buderus -BUDERUS budrus -BUFBLOCKSIZE +bufblocksize bufferedflow burngas burnmaxpower burnminperiod burnminpower -Burnpower +burnpower burnstarts burnworkmin -Bytetime +bytetime calinttemp catagory cbuf -Cerapur +cerapur +česky cfamily changeloglevel chargeduration chargeoptimization chargepump chargetype -Chmela +chefhat +chimneysweeper +chmela circmode circprog circpump circswitchtime +circtc cked clangtidy climatezone clockoffset clockrate -CLSD +clsd cmdfunction cmdfunctions -Codacy +codacy codeunit -COILDATA +coildata coilset coldshot -Coldshot -COLDSHOT +coldtemp collectormaxtemp collectormintemp collectorshutdown @@ -173,20 +173,21 @@ collectortemp collectortype colmax colmin -Comf +comf comfdiff comfoff comforttemp comfstop -Commpressor +commandsfunctions +commpressor compstartmod -Condens +condens configdone connack -Connack -CONNACK connectcb connectcount +constlow +constmed controlmode coolingcircuit coolingon @@ -194,35 +195,35 @@ coolingstarts cooloffdelay coolondelay coolstart -COOLSTART coredata -Coredump +coredump coulod cppcheck -CPPCHECK cppdefines -CPPDEFINES cpplint cprint cpsell -CSOURCES +csources cstate +ctkwh curburnpow curflow curflowtemp +currhum curroominfl currsetpoint +currsolarinfl currtemp curtemp curvebase curveend curveon customentities -CUSTOMENTITIES -CUSTOMENTITY +customentity customlist customname -CXXSOURCES +customsupport +cxxsources cylbottomtemp cylheated cylinderpumpmod @@ -232,123 +233,117 @@ cylmiddletemp cylprio cylpriority cylpumpmod +cyltoptemp dailyheating dailyheattime +dailytemp dallassensor dampedoutdoortemp dangel -Dangel -DARDUINO -DARDUINOJSON +darduino +darduinojson datafield datalast -Dauer +dauer dayhightemp daylightsaving daylow -DAYLOW daylowtemp daymid -DAYMID daymidtemp daymode daytemp -DBOARD -DCLANG -DCORE -DEFAULTIDLETIME -DEFAULTTIMEOUT +dboard +dclang +dcore +defaultidletime +defaulttimeout defterm delayboiler delimieter delt -DEMC -DEMSESP -DEPFLAGS +deltatret +demc +demsesp +depflags depower depowering derefenced designtemp desitnation -DESP -Deutsch +desp +deutsch devicedata -DEVICEDATA deviceentities -DEVICEENTITIES -DEVICEERROR +deviceerror devicename -DEVICENAME devicetype devicevalue -DEVICEVALUE devicevalues +devkitc devtype dewoffset dewpoint +dewtemp dewtemperature dhwmintemp dhwprio dhwvalve +dhwx +difftemp disassoc -DISASSOC -Disballance -DISCONN -Disconnectfn -DISCR +disballance +disconn +disconnectfn +discr disinfectday disinfecthour disinfectiontemp disinfecttime displaycode -Domoticz -DOMOTICZ -DONEWIRE +domoticz +donewire doub doublematchflow drehzahl -Drehzahlanpassung +drehzahlanpassung dscrc -Dsonar -DTASMOTA -DUARATION -Eacj -EASYCOM -Eburner +dsonar +dtasmota +duaration +eacj +easycom +eburner ecodiff -Ecomline +ecomline ecooff ecoplus -Ecoplus ecoplusdiff ecoplusoff ecoplusstop ecostop ecotemp efuse -Efuse einschlafen +eldhw elec -Elec electricfactor -ELGs +elgendhw +elgenheat +elgs +elheat elheatstep emergencyops emergencytemp -EMESESP -EMODBUS +emesesp +emodbus emsdevice -EMSDEVICE emsdevices emsdevicevalue -EMSDEVICEVALUE emsesp -EMSESP -EMSFACTORY +emsfactory emsplus -EMSPLUS emsuart -EMSUART encodestate endcond energycostratio @@ -358,45 +353,45 @@ energypriceel energypricegas energytoday energytotal -Enthalpie +enthalpie entityid entitypath enumupdate -Enviline -Equipt +enviline +equipt erct erdwärmetauscher -Erdwärmetauscher +errordisp errornumber esphome espressif -Espressif -Espressif's +espressif's esptool etharp -ETSI +etsi evenodd everslick -Ewen +ewen exhausttemp externalcyl +fanspd fanwork fastheatup fastheatupfactor -FCGENERIC -FCILLEGAL +favs +fcgeneric +fcillegal fcmap -FCUSER +fcuser fdata fernbed -Fernbed fetchblock feucht -Feuchteschutz +feuchteschutz ffunction filesiz -Filterlaufzeit -Filterwechsel +filterlaufzeit +filterwechsel fipa firstscan fixarray @@ -406,69 +401,65 @@ fixmap fixstr flamecurr floordry -Floordry floordrying floordrystatus floordrytemp floorheating flowbuffer -FLOWCTRL +flowctrl flowoffset -FLOWOFFSET flowsensor flowsettemp flowtemp -Flowtemp flowtemphc flowtempoffset -Flowtemps +flowtemps flowtempvf fnames footpoint forceheatingoff forrmat fortluft -Fortluft fossile fossilefactor fprofile -FPSTR +fpstr +français freeable freemem -Frostgrenztemperatur -Frostschutz -FSFS +frostgrenztemperatur +frostschutz +fsfs fstotal ftest +fueldhw +fuelheat fullscreen fulltopic -Funktion -Furtheron +funktion +furtheron gasmeter gasmeterheat -Genuino -Gerätetyp +genuino +gerätetyp getserver getservername ggdb gifsicle -GIQFZUG +giqfzug glbl -Gochkov +gochkov gpio -GPIO gpios -GPIOs -GPOC -Greenstar -Grokhotkov +gpoc +greenstar +grokhotkov haclimate -systemstatus -Harwerth +hardwarestatus +harwerth headersize headertemp healthcheck -HEALTHCHECK heatandcool heatassistpower heatassistvalve @@ -477,7 +468,7 @@ heatcable heatcnt heatcntflowtemp heatcntrettemp -Heatcounter +heatcounter heatdrainpan heatexchangertemp heatingactivated @@ -487,7 +478,6 @@ heatingcircuits heatingciruit heatingcurve heatingoff -HEATINGOFF heatingpid heatingpump heatingpumpmod @@ -500,29 +490,26 @@ heatmetering heatoffdelay heatondelay heatpump -Heatpump -HEATPUMP heatpumpoutput heatpumps heatrequest -Heatronic +heatronic heatsource -Heatsource -HEATSOURCE heatsources heatstarts heattemp +heattransfer heattransfersystem heatup -Heatup heatvalve heatworkmin -Heizkeis -HEXDIGIT -HEXDUMP +heizkeis +hexdigit +hexdump hextoa hextoint -Heyse +heyse +hideled highfive hinzufügen historial @@ -531,7 +518,7 @@ holidaymode holidaymodes holidaytemp homeassistant -HOMEASSISTANT +hottemp hpactivity hpbrinein hpbrineout @@ -541,6 +528,7 @@ hpcircspd hpcompon hpcompspd hpcooling +hpcurrpower hpea hphystcool hphystheat @@ -554,6 +542,7 @@ hpoperatingstate hpph hppl hppower +hppowerlimit hppumpmode hpsetdiffpress hpshutdown @@ -563,23 +552,20 @@ hptc hptl hptr hptw -Hristo -HTTPC +hristo +httpc humi -HUMI -HVAC +hvac hwaddr hwrevision hybriddhw hybridstrategy hydr -Hydr hyst -Hyst hystoff hyston ibutton -ICCARM +iccarm icondegrees iconkb iconlmin @@ -587,25 +573,26 @@ iconnum iconpercent iconua idedata -Iele +iele ignwork -Iiwi -Ijoy -Imlhd +iiwi +ijoy +imlhd inbyte inexhaust infresh inkscape -INPROGRESS +inprogress instaliert instantstart intensiv -Intensiv +intergral intoffset inttemp +intvl invers invertiert -IRAM +iram isbroadcast isglobal islinklocal @@ -613,40 +600,40 @@ isloopback ismixed ismulticast isnum -Isrc +isrc isrunning issign issitelocal isuniquelocal isvalid isystem -Italiano +italiano itty ivtclock +jtag junkersclock kamin -Kamin -Karlesky -Keelbypass +karlesky +keelbypass +keepwarm keepwarmtemp -Kees -Kernighan's +kees +kernighan's keysvalues klappe kmin -KMIN kompakt -Konfig +konfig kwertie -Kwmoar +kwmoar labellen -Larios +larios lastcode lastpayload lastresponse lasttopic -LATXCLR -LATXSET +latxclr +latxset layeredbuffer ldata ldus @@ -654,58 +641,54 @@ ledc leistung lgcov libdeps -LIBRETINY -Licence -Liligo +libretiny +licence +liligo linebuf littlefs -LITTLEFS llen +lltoa lmin -LMIN lockguard lockmq -Logamatic -Logamax -Logano -Logavent -LOGDEVICE +logamatic +logamax +logano +logatherm +logavent +logdevice logentry -Logomatic -LOGRAW +logomatic +lograw lolin -Lolin -LOLIN -Lovato +lovato lownoisemode lownoisestart lownoisestop lowpressure lowtopic -Lufqualität -Luft -Lüfterstufe +lufqualität +luft +lüfterstufe luftfeuchte -Luftfeuchte -Luftfeuchtefühler -Luftqualfühl -Lüftungsfrostschutz -Lukás +luftfeuchtefühler +luftqualfühl +lüftungsfrostschutz +lukás maintenancedate maintenancemessage maintenancetime malloc mandefrost manualtemp -Manuell -Margolis -Marko +manuell +margolis +marko masterthermostat mathieucarbou maxalloc -MAXBUFFERSIZE +maxbuffersize maxflow -MAXFLOW maxflowtemp maxheat maxheatcomp @@ -716,18 +699,17 @@ maxpower maxt maxtemp maxv -MBAP +mbap mbar -MBAR mbed mbedtsl mdio -MDNS -Melis -Mellis -MEMPOL +mdns +melis +mellis +mempol memsiz -MENUCONFIG +menuconfig messagebuffer messagetime metercomp @@ -735,12 +717,12 @@ metercool metereheat meterheat metertotal +mfgadd mheyse microcontroller -Microcontroller mindcase minexttemp -MINFLOW +minflow minflowtemp miniv minmod @@ -750,58 +732,48 @@ mintempsilent minv misa mischer -Mischer mischerposition mixertemp mixingvalves -Mjhl -Mjkz +mjhl +mjkz mlongcalls -MMIO -Mmode -MMPLUS +mmio +mmode +mmplus mockserver modbus -Modbus -MODBUS modee modetype -MODULELIBRARY -Moduline +modulelibrary +moduline mozjpeg mqtt -Mqtt -MQTT mqttclient mqttconnects mqttcount mqttfails +mqttreconnects msgpack -Msgpack msgstr msys -Msys mtext mult -Mysys +mysys nachheiz -Nachheiz nachheizreg -Nachheizregister +nachheizregister nameserver ncmd ncols -Ndrop -Nederlands +ndrop +nederlands nefit -Nefit -NEFIT negcond negheat nein -Nennvolumentstrom +nennvolumentstrom neopixel -Neopixel netcmp netflowtemp netif @@ -811,26 +783,24 @@ newpcb newrssi nightmode nighttemp -NODEMCU +nodemcu nofrost -NOFROST nofrostmode nofrosttemp nominalpower nomis nompower -NOPULL -NOREDUCE +nopull +noreduce noreducetemp -Norsk +norsk nosleep nostdinc notepack notoken -NOTOKEN -NOTRANSLATION -NOTSET -NOTYPE +notranslation +notset +notype nrgconscomp nrgconscompcooling nrgconscompheating @@ -846,16 +816,15 @@ nrgsupppool nrgsupptotal nrgtotal nrgww -NSIs +nsis ntag -NUBD +nubd nullptr numericoperator -NUMJOBS +numjobs numop -NUMOP -Nwcl -Nystrom +nwcl +nystrom odata oddparity öffnen @@ -863,15 +832,13 @@ offsettemp offtemp oilpreheat oldoffset -Olimex -OLIMEX -OLIMEXPOE +olimex +olimexpoe +omea onchange -ONCHANGE onetimekey onewire -ONEWIRE -Ooops +ooops operatingstate opmode optipng @@ -881,46 +848,46 @@ outdoortemp outexhaust outfresh outpow -Packr +packr pacman partitionname partymode payloadbuffer pbutton -PBUTTON penv periph -PERIPH persistance physaddr -PICO +pico pinchange -PINGREQ -PINGRESP -PINGTEST -PIOENV +pingreq +pingresp +pingtest +pinout +pioarduino +pioenv plainwatermode platformio -Platformio -PLATFORMIO pngquant polltime -Polski +polski poolsettemp +poolshunt +poolshuntstatus poolstarts -PORTX +pooltemp +portx +powerreduction powervalues prerel -Prerel primepump primepumpmod printfln prioitise prioritise -PRIXPTR -PROBEREQRECVED +prixptr +probereqrecved proddy -Proddy productid proga progb @@ -929,125 +896,128 @@ progd proge progf progmem -Progmem -PROGMEM progmode +proplow psram -Psram -PSRAM pswid ptys -Puback -PUBACK -PUBACKs -Pubcomp -PUBCOMP -PUBCOMPs -Pubrec -PUBREC -PUBRECs -Pubrel -PUBREL -PUBRELs +puback +pubacks +pubcomp +pubcomps +pubrec +pubrecs +pubrel +pubrels pumpcharacter pumpdelay pumpkick pumpminmod +pumpmod pumpmode pumpmodmax pumpmodmin +pumpontemp +pumpopt pumpstatus +pumpstep pumpworktime pvcooling pvenabledhw pvlen pvlowercool +pvmaxcomp pvraiseheat pvstr -PWRCAP -PYTHONEXE -QOSRESERVED +pwrcap +pythonexe +qosreserved qtxt -Qube +qube questionmark queuecount raumluftfechte raumluftqualität rawstr -RCPLUS +rcplus readback readelf recved +redtemp +redthreshold reducehours reduceminutes reducemode reducetemp -Referer +referer registercount registeroffset rego -Rego -RELNOTES -Remmerswaal's +relais +relnotes +remmerswaal's remotehum remoteseltemp -REMOTESELTEMP remotetemp reqconntype reqs +requiredtemp retheatassist rettemp returncodes reuest -RFBASE +rfbase rfds -RFSENSOR -Rinterval +rfsensor +rinterval riscv rjwats -Rlistener -RMII +rlistener +rmii roboto romminfluencefactor roomcontrol -ROOMCONTROL roomcontroller roomcontrollers -Roomctrl +roomctrl +roomdata +roomflow roomhold roominfl roominflfactor roominfluence -ROOMINFLUENCE +roomload +roomname +roomparams +roomschedule roomsensor +roomsettings roomtemp roomtempdiff roomtemperature -Roomtemperature -ROOMTHERMOSTAT -Rrts -Rserial -Rskip +roomthermostat +roomthermostats +rrts +rserial +rskip rssi -Rssi -RSSI runqueue rxfails -RXFIFO +rxfifo rxreceived rxservice -Saavedra +saavedra safebuild -SAMD +samd saveandactivate scalefactor scancnt scanretry -SCHEDULEFLAG +scheduleflag schließen -SCLK +sclk sday -SDIO +sdio selburnpow selflowtemp seltemp @@ -1062,10 +1032,10 @@ sensorname sensorreads sensortype seperator -SERVERCLASS +serverclass servicecode servicecodenumber -SERVICEKEY +servicekey setburnpow setburnpower setflowtemp @@ -1075,28 +1045,30 @@ setpower setpumppower setreturntemp settemp -Settemp settemplow settingsfiles setvalue -SHORTNAMES +shortnames +showeralert +showertimer +shuntingyard sieger -Sieger -SIEGER signon -Sikken +sikken silentfrom silentmode silentto skipchar skipt sleepmode -Slovenčina -SLTKA +slovenčina +sltka smallitoa -Smartline +smartline sntp +sofasingle solarenabled +solarinfl solarmode solarmodule solarpower @@ -1107,34 +1079,36 @@ solarpumpmode solartemp solekreispumpe soll -Speicher +speicher +spidqs +spiio squaremeters -Srts -STACONNECTED -STADISCONNECTED -STAIPASSIGNED +srts +staconnected +stadisconnected +staipassigned +startshp +starttemp starttemperature -STARTVALUE +startvalue statusbyte stickbreaker -Stickbreaker -Stoffregen +stoffregen +stoptime storagetemp -Störung -STRINGARRAY -STRINGIZE -Studt -Studt's +störung +stringarray +stringize +studt +studt's suback -Suback -SUBACK substract summermode summersetmode summertemp supchan -SUPCHAN -Svenska +suprapur +svenska svmap swapflowtemp swaprettemp @@ -1145,27 +1119,27 @@ switchoff switchonoptimization switchovertemp switchprogmode +switchprogram switchtemp switchtime +switchtimeww sycle syspress sysrettemp -Tado -TADO +systemstatus +tado tapactivated tapwarmwater tapwater tapwateractive targetflowtemp -TARGETHOSTINTERVAL +targethostinterval tasmota -Tasmota -TASMOTA -Tasmota's +tasmota's tbreak +teddybear tele tempauto -TEMPAUTO tempautotemp tempdiffboiler tempdiffcool @@ -1174,44 +1148,48 @@ tempecoplus temperatur temperaturcorrection temperaturesensor -TEMPERATURESENSOR templevel tempok tempparmode +temprature tempsensor -TEMPSENSOR +tempstatus testtemperature thermaldisinfect thermostate -Tillotson +tillotson timeoutcnt timestr -Toastify +toastify toencode toolbelt -TOOMANY -Topline +toomany +topline totalcompstarts tpcb -TRACELOG +tracelog +transferpump +transferpumpmod transre treemap -Trendline -Trewitt +trendline +trewitt triaging -Triaging -TRISXCLR -TRISXSET +trisxclr +trisxset trivago trocken -TRUEFALSE +truefalse +tsens tseslint -Türk +türk turnoffdiff turnondiff +txen txerror txfails -TXMODE +txmode +txpause txread txreads txservice @@ -1222,21 +1200,19 @@ typehh typeids typel typesafe -Typesafe -UART +uart ubauptime ucrt ultostr -Umladesystem -UNDERCLOCK +umladesystem +underclock unflags -UNICORE -Unpackr -Unported -UNSUB -Unsuback -UNSUBACK -UPLOADCMD +unicore +unpackr +unported +unsub +unsuback +uploadcmd uptimecomp uptimecompcooling uptimecompheating @@ -1244,60 +1220,64 @@ uptimecomppool uptimecontrol uptimetotal userprogram -Uutils -VACREDUCE +uutils +vacationmode +vacreduce vacreducemode vacreducetemp validateid -VALIDATORC -VALIDATORR +validatorc +validatorr valu -VALUECONFIG +valueconfig valuename +valvereturn valvesettime valvestatus -Vander -Ventil +vander +vchip +ventil ventinspeed ventmode ventoutspeed venv verwendete -Vflag +vflag viewtopic virtaddr -Volumenstromabgleich -Voord +volumenstromabgleich +voord vorheizer vorheizreg vpcooling vrey -Vybm -Wärmetauscher +vybm +wärmetauscher +washingmachine watchid wayon wayvalve -Wconversion -Wdiv +wconversion +wdiv webui wemos -Wemos -Werror -Wextra +werror +wextra whenmodeoff -WIFICLIENT +wificlient +wifireconnects wifistrength winsock withexitstatus -Wmaybe -Worchester +wmaybe +worchester workm workmin worktime -WOULDBLOCK -Wswitch -Wtype -Wunused +wouldblock +wswitch +wtype +wunused wwactivated wwcharge wwchargeduration @@ -1313,6 +1293,7 @@ wwmodes wwonetime wwprio wwseltemp +wwstarts wwswitchtime wwtankmiddletemp wwtapactivated @@ -1320,132 +1301,23 @@ wwtemp wwtemplow wwvacations wwwhenmodeoff -Xclnt -XRTU -XTCP -XVCJ -Yerger -Yerger's +xclnt +xiao +xrtu +xtcp +xvcj +yerger +yerger's yubox -Zivanovic -Živanović -Zlcn +zadig +zivanovic +živanović +zlcn zolder -Zolder zqhi -ZSIs +zsis zuluft -Zuluft zuluftebläse zuluftgebläse zulufttemp zyxwvutsrqponmlkjihgfedcba -Omea -Bolv -hardwarestatus -hpcurrpower -hppowerlimit -CUSTOMSUPPORT -favs -Logatherm -TSENS -pumpontemp -Česky -pioarduino -switchtimeww -pvmaxcomp -powerreduction -starttemp -heattransfer -poolshunt -poolshuntstatus -pooltemp -stoptime -showertimer -showeralert -CTKWH -wifireconnects -mqttreconnects -wwstarts -auxheaterlevel -startshp -cyltoptemp -transferpump -transferpumpmod -startshp -tempstatus -difftemp -redtemp -requiredtemp -coldtemp -redtemp -hottemp -dailytemp -circtc -keepwarm -pumpmod -valvereturn -deltatret -errordisp -commandsfunctions -hideled -analogenabled -dhwx -ahsx -roomflow -roomload -intvl -Français -lltoa -redthreshold -JTAG -fuelheat -elheat -elgenheat -fueldhw -eldhw -elgendhw -solarinfl -currsolarinfl -temprature -bblanchon -vacationmode -airbypass -Suprapur -mfgadd -shuntingyard -XIAO -zadig -devkitc -Roomthermostats -Roomname -Roomsettings -Roomparams -Roomdata -Roomschedule -dewtemp -chefhat -sofasingle -bowlmix -bedsingle -beddouble -teddybear -washingmachine -switchprogram -brotlin -fanspd -currhum -pumpstep -constmed -constlow -proplow -chimneysweeper -pumpopt -intergral -vchip -SPIIO -SPIDQS -txpause -relais -pinout -TXEN \ No newline at end of file diff --git a/src/ESP32React/APSettingsService.cpp b/src/ESP32React/APSettingsService.cpp index e26d3647d..b0e3480be 100644 --- a/src/ESP32React/APSettingsService.cpp +++ b/src/ESP32React/APSettingsService.cpp @@ -21,24 +21,24 @@ void APSettingsService::begin() { // wait 10 sec on STA disconnect before starting AP void APSettingsService::WiFiEvent(WiFiEvent_t event) { - uint8_t was_connected = _connected; + const uint8_t was_connected = _connected; switch (event) { case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: - _connected &= ~1; + _connected &= ~1U; break; case ARDUINO_EVENT_ETH_DISCONNECTED: - _connected &= ~2; + _connected &= ~2U; break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: case ARDUINO_EVENT_WIFI_STA_GOT_IP6: - _connected |= 1; + _connected |= 1U; break; case ARDUINO_EVENT_ETH_GOT_IP: case ARDUINO_EVENT_ETH_GOT_IP6: - _connected |= 2; + _connected |= 2U; break; default: - break; + return; } // wait 10 sec before starting AP if (was_connected && !_connected) { @@ -52,18 +52,19 @@ void APSettingsService::reconfigureAP() { } void APSettingsService::loop() { - unsigned long currentMillis = uuid::get_uptime(); - unsigned long manageElapsed = static_cast(currentMillis - _lastManaged); - if (manageElapsed >= MANAGE_NETWORK_DELAY) { + const unsigned long currentMillis = uuid::get_uptime(); + if ((currentMillis - _lastManaged) >= MANAGE_NETWORK_DELAY) { _lastManaged = currentMillis; manageAP(); } - handleDNS(); + if (_dnsServer) { + handleDNS(); + } } void APSettingsService::manageAP() { - WiFiMode_t currentWiFiMode = WiFi.getMode(); + const WiFiMode_t currentWiFiMode = WiFi.getMode(); if (_state.provisionMode == AP_MODE_ALWAYS || (_state.provisionMode == AP_MODE_DISCONNECTED && !_connected)) { if (_reconfigureAp || currentWiFiMode == WIFI_OFF || currentWiFiMode == WIFI_STA) { startAP(); @@ -87,8 +88,10 @@ void APSettingsService::startAP() { WiFi.setTxPower(WIFI_POWER_8_5dBm); // https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi #endif if (!_dnsServer) { - IPAddress apIp = WiFi.softAPIP(); - emsesp::EMSESP::logger().info("Starting Access Point with captive portal on %s", apIp.toString().c_str()); + const IPAddress apIp = WiFi.softAPIP(); + char ipStr[16]; + snprintf(ipStr, sizeof(ipStr), "%u.%u.%u.%u", apIp[0], apIp[1], apIp[2], apIp[3]); + emsesp::EMSESP::logger().info("Starting Access Point with captive portal on %s", ipStr); _dnsServer = new DNSServer; _dnsServer->start(DNS_PORT, "*", apIp); } @@ -111,8 +114,8 @@ void APSettingsService::handleDNS() { } APNetworkStatus APSettingsService::getAPNetworkStatus() { - WiFiMode_t currentWiFiMode = WiFi.getMode(); - bool apActive = currentWiFiMode == WIFI_AP || currentWiFiMode == WIFI_AP_STA; + const WiFiMode_t currentWiFiMode = WiFi.getMode(); + const bool apActive = (currentWiFiMode == WIFI_AP || currentWiFiMode == WIFI_AP_STA); if (apActive && _state.provisionMode != AP_MODE_ALWAYS && WiFi.status() == WL_CONNECTED) { return APNetworkStatus::LINGERING; @@ -135,7 +138,7 @@ void APSettings::read(const APSettings & settings, JsonObject root) { } StateUpdateResult APSettings::update(JsonObject root, APSettings & settings) { - APSettings newSettings = {}; + APSettings newSettings{}; newSettings.provisionMode = static_cast(root["provision_mode"] | FACTORY_AP_PROVISION_MODE); switch (settings.provisionMode) { diff --git a/src/ESP32React/APSettingsService.h b/src/ESP32React/APSettingsService.h index fda384bc8..9b52f84d0 100644 --- a/src/ESP32React/APSettingsService.h +++ b/src/ESP32React/APSettingsService.h @@ -1,5 +1,5 @@ -#ifndef APSettingsConfig_h -#define APSettingsConfig_h +#ifndef APSettingsService_h +#define APSettingsService_h #include "HttpEndpoint.h" #include "FSPersistence.h" @@ -70,9 +70,9 @@ class APSettings { IPAddress subnetMask; bool operator==(const APSettings & settings) const { - return provisionMode == settings.provisionMode && ssid == settings.ssid && password == settings.password && channel == settings.channel - && ssidHidden == settings.ssidHidden && maxClients == settings.maxClients && localIP == settings.localIP && gatewayIP == settings.gatewayIP - && subnetMask == settings.subnetMask; + return provisionMode == settings.provisionMode && channel == settings.channel && ssidHidden == settings.ssidHidden + && maxClients == settings.maxClients && localIP == settings.localIP && gatewayIP == settings.gatewayIP + && subnetMask == settings.subnetMask && ssid == settings.ssid && password == settings.password; } static void read(const APSettings & settings, JsonObject root); @@ -96,8 +96,8 @@ class APSettingsService : public StatefulService { // for the management delay loop volatile unsigned long _lastManaged; - volatile boolean _reconfigureAp; - uint8_t _connected; + volatile bool _reconfigureAp; + volatile uint8_t _connected; void reconfigureAP(); void manageAP(); diff --git a/src/ESP32React/JsonUtils.h b/src/ESP32React/JsonUtils.h index 0d2ff9fa5..7870f34a6 100644 --- a/src/ESP32React/JsonUtils.h +++ b/src/ESP32React/JsonUtils.h @@ -10,20 +10,23 @@ class JsonUtils { public: static void readIP(JsonObject root, const String & key, IPAddress & ip, const String & def) { - IPAddress defaultIp = {}; + IPAddress defaultIp{}; if (!defaultIp.fromString(def)) { defaultIp = INADDR_NONE; } readIP(root, key, ip, defaultIp); } static void readIP(JsonObject root, const String & key, IPAddress & ip, const IPAddress & defaultIp = INADDR_NONE) { - if (!root[key].is() || !ip.fromString(root[key].as())) { + const JsonVariant value = root[key]; + if (!value.is() || !ip.fromString(value.as())) { ip = defaultIp; } } static void writeIP(JsonObject root, const String & key, const IPAddress & ip) { if (IPUtils::isSet(ip)) { - root[key] = ip.toString(); + char ipStr[16]; + snprintf(ipStr, sizeof(ipStr), "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]); + root[key] = ipStr; } } }; diff --git a/src/ESP32React/MqttSettingsService.cpp b/src/ESP32React/MqttSettingsService.cpp index 11c84462e..1c07748f0 100644 --- a/src/ESP32React/MqttSettingsService.cpp +++ b/src/ESP32React/MqttSettingsService.cpp @@ -255,7 +255,7 @@ void MqttSettings::read(MqttSettings & settings, JsonObject root) { } StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings) { - MqttSettings newSettings = {}; + MqttSettings newSettings; bool changed = false; #ifndef TASMOTA_SDK diff --git a/src/ESP32React/MqttSettingsService.h b/src/ESP32React/MqttSettingsService.h index 83cf751dd..36b52fa74 100644 --- a/src/ESP32React/MqttSettingsService.h +++ b/src/ESP32React/MqttSettingsService.h @@ -125,11 +125,11 @@ class MqttSettingsService : public StatefulService { FSPersistence _fsPersistence; // variable to help manage connection - bool _reconfigureMqtt; - unsigned long _disconnectedAt; + volatile bool _reconfigureMqtt; + volatile unsigned long _disconnectedAt; // connection status - espMqttClientTypes::DisconnectReason _disconnectReason; + volatile espMqttClientTypes::DisconnectReason _disconnectReason; // the MQTT client instance MqttClient * _mqttClient; diff --git a/src/ESP32React/NTPSettingsService.h b/src/ESP32React/NTPSettingsService.h index 4b3bbce69..635b68f1c 100644 --- a/src/ESP32React/NTPSettingsService.h +++ b/src/ESP32React/NTPSettingsService.h @@ -49,7 +49,7 @@ class NTPSettingsService : public StatefulService { private: HttpEndpoint _httpEndpoint; FSPersistence _fsPersistence; - bool _connected; + volatile bool _connected; void WiFiEvent(WiFiEvent_t event); void configureNTP(); diff --git a/src/ESP32React/NetworkSettingsService.h b/src/ESP32React/NetworkSettingsService.h index f35186bf6..7c1ed0ff7 100644 --- a/src/ESP32React/NetworkSettingsService.h +++ b/src/ESP32React/NetworkSettingsService.h @@ -102,10 +102,10 @@ class NetworkSettingsService : public StatefulService { HttpEndpoint _httpEndpoint; FSPersistence _fsPersistence; - unsigned long _lastConnectionAttempt; - bool _stopping; + volatile unsigned long _lastConnectionAttempt; + volatile bool _stopping; - uint16_t connectcount_ = 0; // number of wifi reconnects + volatile uint16_t connectcount_ = 0; // number of wifi reconnects void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info); void mDNS_start() const; diff --git a/src/core/emsfactory.h b/src/core/emsfactory.h index d2ac63707..8f7f400f0 100644 --- a/src/core/emsfactory.h +++ b/src/core/emsfactory.h @@ -19,14 +19,15 @@ #ifndef EMSESP_EMSFACTORY_H_ #define EMSESP_EMSFACTORY_H_ -#include #include // for unique_ptr +#include -#include "emsdevice.h" +// Forward declaration +namespace emsesp { +class EMSdevice; +} // Macro for class registration -// Anonymous namespace is used to make the definitions here private to the current -// compilation unit (current file). It is equivalent to the old C static keyword. #define REGISTER_FACTORY(derivedClass, device_type) \ namespace { \ auto registry_##derivedClass = ConcreteEMSFactory(device_type); \ @@ -34,30 +35,30 @@ namespace emsesp { -class EMSdevice; // forward declaration, for gcc linking - class EMSFactory { public: virtual ~EMSFactory() = default; - // Register factory object of derived class - // using the device_type as the unique identifier + // Register factory object of derived class using the device_type as the unique identifier static auto registerFactory(const uint8_t device_type, EMSFactory * factory) -> void { auto & reg = EMSFactory::getRegister(); reg[device_type] = factory; } - using FactoryMap = std::map; + using FactoryMap = std::unordered_map; // returns all registered classes (really only for debugging) - static auto device_handlers() -> FactoryMap { + static auto device_handlers() -> const FactoryMap & { return EMSFactory::getRegister(); } // Construct derived class returning an unique ptr static auto add(const uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * default_name, uint8_t flags, uint8_t brand) -> std::unique_ptr { - return std::unique_ptr(EMSFactory::makeRaw(device_type, device_id, product_id, version, default_name, flags, brand)); + if (auto * ptr = EMSFactory::makeRaw(device_type, device_id, product_id, version, default_name, flags, brand)) { + return std::unique_ptr(ptr); + } + return nullptr; } virtual auto construct(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand) const @@ -74,8 +75,9 @@ class EMSFactory { // find which EMS device it is and use that class static auto makeRaw(const uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand) -> EMSdevice * { - auto it = EMSFactory::getRegister().find(device_type); - if (it != EMSFactory::getRegister().end()) { + auto & reg = EMSFactory::getRegister(); + auto it = reg.find(device_type); + if (it != reg.end()) { return it->second->construct(device_type, device_id, product_id, version, name, flags, brand); } return nullptr; diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index bbefe086b..4ebe5d33d 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -59,7 +59,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i if (model == EMSdevice::EMS_DEVICE_FLAG_RC10) { monitor_typeids = {0xB1}; set_typeids = {0xB0}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t size = monitor_typeids.size(); + for (uint8_t i = 0; i < size; i++) { register_telegram_type(monitor_typeids[i], "RC10Monitor", false, MAKE_PF_CB(process_RC10Monitor)); register_telegram_type(set_typeids[i], "RC10Set", false, MAKE_PF_CB(process_RC10Set)); } @@ -70,7 +71,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i set_typeids = {0x3D, 0x47, 0x51, 0x5B}; timer_typeids = {0x3F, 0x49, 0x53, 0x5D}; timer2_typeids = {0x42, 0x4C, 0x56, 0x60}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t size = monitor_typeids.size(); + for (uint8_t i = 0; i < size; i++) { register_telegram_type(monitor_typeids[i], "RC35Monitor", false, MAKE_PF_CB(process_RC35Monitor)); register_telegram_type(set_typeids[i], "RC35Set", false, MAKE_PF_CB(process_RC35Set)); register_telegram_type(timer_typeids[i], "RC35Timer", false, MAKE_PF_CB(process_RC35Timer)); @@ -88,7 +90,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i set_typeids = {0xA8}; curve_typeids = {0x90}; timer_typeids = {0x8F}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t size = monitor_typeids.size(); + for (uint8_t i = 0; i < size; i++) { register_telegram_type(monitor_typeids[i], "RC20Monitor", false, MAKE_PF_CB(process_RC20Monitor)); register_telegram_type(set_typeids[i], "RC20Set", false, MAKE_PF_CB(process_RC20Set)); register_telegram_type(curve_typeids[i], "RC20Temp", false, MAKE_PF_CB(process_RC20Temp)); @@ -103,7 +106,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i if (device_id == 0x17) { // master monitor_typeids = {0xAE}; set_typeids = {0xAD}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t size = monitor_typeids.size(); + for (uint8_t i = 0; i < size; i++) { register_telegram_type(monitor_typeids[i], "RC20Monitor", false, MAKE_PF_CB(process_RC20Monitor_2)); register_telegram_type(set_typeids[i], "RC20Set", false, MAKE_PF_CB(process_RC20Set_2)); } @@ -117,7 +121,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i set_typeids = {0xA7}; curve_typeids = {0x40}; timer_typeids = {0x3F}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t size = monitor_typeids.size(); + for (uint8_t i = 0; i < size; i++) { register_telegram_type(monitor_typeids[i], "RC30Monitor", false, MAKE_PF_CB(process_RC30Monitor)); register_telegram_type(set_typeids[i], "RC30Set", false, MAKE_PF_CB(process_RC30Set)); register_telegram_type(curve_typeids[i], "RC30Temp", false, MAKE_PF_CB(process_RC30Temp)); @@ -131,15 +136,16 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i // EASY } else if (model == EMSdevice::EMS_DEVICE_FLAG_EASY) { monitor_typeids = {0x0A}; - set_typeids = {}; + set_typeids.clear(); register_telegram_type(monitor_typeids[0], "EasyMonitor", true, MAKE_PF_CB(process_EasyMonitor)); register_telegram_type(0x02A5, "EasyMonitor", false, MAKE_PF_CB(process_EasyMonitor)); // CRF } else if (model == EMSdevice::EMS_DEVICE_FLAG_CRF) { monitor_typeids = {0x02A5, 0x02A6, 0x02A7, 0x02A8}; - set_typeids = {}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + set_typeids.clear(); + const size_t size = monitor_typeids.size(); + for (uint8_t i = 0; i < size; i++) { register_telegram_type(monitor_typeids[i], "CRFMonitor", false, MAKE_PF_CB(process_CRFMonitor)); } @@ -163,14 +169,16 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i summer2_typeids = {0x0471, 0x0472, 0x0473, 0x0474, 0x0475, 0x0476, 0x0477, 0x0478}; hp_typeids = {0x0467, 0x0468, 0x0469, 0x046A}; hpmode_typeids = {0x0291, 0x0292, 0x0293, 0x0294}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t monitor_size = monitor_typeids.size(); + for (uint8_t i = 0; i < monitor_size; i++) { register_telegram_type(monitor_typeids[i], "RC300Monitor", false, MAKE_PF_CB(process_RC300Monitor)); register_telegram_type(set_typeids[i], "RC300Set", false, MAKE_PF_CB(process_RC300Set)); register_telegram_type(summer_typeids[i], "RC300Summer", false, MAKE_PF_CB(process_RC300Summer)); register_telegram_type(curve_typeids[i], "RC300Curves", false, MAKE_PF_CB(process_RC300Curve)); register_telegram_type(summer2_typeids[i], "RC300Summer2", false, MAKE_PF_CB(process_RC300Summer2)); } - for (uint8_t i = 0; i < set2_typeids.size(); i++) { + const size_t set2_size = set2_typeids.size(); + for (uint8_t i = 0; i < set2_size; i++) { // register_telegram_type(set2_typeids[i], "RC300Set2", false, MAKE_PF_CB(process_RC300Set2)); register_telegram_type(set2_typeids[i], "RC300Set2", false, MAKE_PF_CB(process_PID)); register_telegram_type(hp_typeids[i], "HPSet", false, MAKE_PF_CB(process_HPSet)); @@ -210,19 +218,20 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i } monitor_typeids = {0x016F, 0x0170, 0x0171, 0x0172}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t junkers_size = monitor_typeids.size(); + for (uint8_t i = 0; i < junkers_size; i++) { register_telegram_type(monitor_typeids[i], "JunkersMonitor", false, MAKE_PF_CB(process_JunkersMonitor)); } if (has_flags(EMSdevice::EMS_DEVICE_FLAG_JUNKERS_OLD)) { // FR120, FR100 set_typeids = {0x0179, 0x017A, 0x017B, 0x017C}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + for (uint8_t i = 0; i < junkers_size; i++) { register_telegram_type(set_typeids[i], "JunkersSet", false, MAKE_PF_CB(process_JunkersSet2)); } } else { set_typeids = {0x0165, 0x0166, 0x0167, 0x0168}; - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + for (uint8_t i = 0; i < junkers_size; i++) { register_telegram_type(set_typeids[i], "JunkersSet", false, MAKE_PF_CB(process_JunkersSet)); } } @@ -237,10 +246,12 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i // query all the heating circuits. This is only done once. // The automatic fetch will from now on only update the active heating circuits - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t monitor_size_final = monitor_typeids.size(); + for (uint8_t i = 0; i < monitor_size_final; i++) { EMSESP::send_read_request(monitor_typeids[i], device_id); } - for (uint8_t i = 0; i < set_typeids.size(); i++) { + const size_t set_size = set_typeids.size(); + for (uint8_t i = 0; i < set_size; i++) { EMSESP::send_read_request(set_typeids[i], device_id); } @@ -293,7 +304,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search monitor message types if (hc_num == 0) { - for (uint8_t i = 0; i < monitor_typeids.size(); i++) { + const size_t monitor_size = monitor_typeids.size(); + for (uint8_t i = 0; i < monitor_size; i++) { if (monitor_typeids[i] == telegram->type_id) { hc_num = i + 1; toggle_ = true; @@ -304,7 +316,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search status message/set types if (hc_num == 0) { - for (uint8_t i = 0; i < set_typeids.size(); i++) { + const size_t set_size = set_typeids.size(); + for (uint8_t i = 0; i < set_size; i++) { if (set_typeids[i] == telegram->type_id) { hc_num = i + 1; break; @@ -314,7 +327,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search set2 types if (hc_num == 0) { - for (uint8_t i = 0; i < set2_typeids.size(); i++) { + const size_t set2_size = set2_typeids.size(); + for (uint8_t i = 0; i < set2_size; i++) { if (set2_typeids[i] == telegram->type_id) { hc_num = i + 1; break; @@ -324,7 +338,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search summer message types if (hc_num == 0) { - for (uint8_t i = 0; i < summer_typeids.size(); i++) { + const size_t summer_size = summer_typeids.size(); + for (uint8_t i = 0; i < summer_size; i++) { if (summer_typeids[i] == telegram->type_id) { hc_num = i + 1; break; @@ -334,7 +349,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search summer message types if (hc_num == 0) { - for (uint8_t i = 0; i < summer2_typeids.size(); i++) { + const size_t summer2_size = summer2_typeids.size(); + for (uint8_t i = 0; i < summer2_size; i++) { if (summer2_typeids[i] == telegram->type_id) { hc_num = i + 1; break; @@ -344,7 +360,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search heating_curve message types if (hc_num == 0) { - for (uint8_t i = 0; i < curve_typeids.size(); i++) { + const size_t curve_size = curve_typeids.size(); + for (uint8_t i = 0; i < curve_size; i++) { if (curve_typeids[i] == telegram->type_id) { hc_num = i + 1; break; @@ -354,7 +371,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search timer message types if (hc_num == 0) { - for (uint8_t i = 0; i < timer_typeids.size(); i++) { + const size_t timer_size = timer_typeids.size(); + for (uint8_t i = 0; i < timer_size; i++) { if (timer_typeids[i] == telegram->type_id) { hc_num = i + 1; break; @@ -364,7 +382,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search timer message types if (hc_num == 0) { - for (uint8_t i = 0; i < timer2_typeids.size(); i++) { + const size_t timer2_size = timer2_typeids.size(); + for (uint8_t i = 0; i < timer2_size; i++) { if (timer2_typeids[i] == telegram->type_id) { hc_num = i + 1; break; @@ -374,7 +393,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // not found, search heatpump message types if (hc_num == 0) { - for (uint8_t i = 0; i < hp_typeids.size(); i++) { + const size_t hp_size = hp_typeids.size(); + for (uint8_t i = 0; i < hp_size; i++) { if (hp_typeids[i] == telegram->type_id) { hc_num = i + 1; break; @@ -383,7 +403,8 @@ std::shared_ptr Thermostat::heating_circuit(std::sha } if (hc_num == 0) { - for (uint8_t i = 0; i < hpmode_typeids.size(); i++) { + const size_t hpmode_size = hpmode_typeids.size(); + for (uint8_t i = 0; i < hpmode_size; i++) { if (hpmode_typeids[i] == telegram->type_id) { hc_num = i + 1; break;