From 3b969c8754bb51ce60e7e3a0d8a61f7d42892701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Mon, 21 Sep 2026 11:30:36 +0200 Subject: [PATCH] v0.15.14 --- Cargo.lock | 2 +- Cargo.toml | 2 +- FILE_MANIFEST.sha256 | 28 +++++++++---------- README.md | 4 +-- SOURCE_MANIFEST.sha256 | 26 ++++++++--------- docs/API.md | 6 ++-- docs/openapi.json | 4 +-- .../gree_controller/manifest.json | 2 +- .../repository/gree-controller/CHANGELOG.md | 5 ++++ ha-addon/repository/gree-controller/README.md | 2 +- .../repository/gree-controller/config.yaml | 2 +- scripts/api_dev_test.py | 6 ++-- src/api/integrations.rs | 8 ++---- src/engine/energy.rs | 2 +- src/home_assistant.rs | 21 ++++++++++++++ 15 files changed, 71 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90a9e59..dd05078 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -719,7 +719,7 @@ dependencies = [ [[package]] name = "gree-controller" -version = "0.15.13" +version = "0.15.14" dependencies = [ "aes", "aes-gcm", diff --git a/Cargo.toml b/Cargo.toml index 0ea701d..7c1c8c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gree-controller" -version = "0.15.13" +version = "0.15.14" edition = "2021" authors = ["GREE Controller contributors"] description = "Standalone local GREE HVAC controller with Web UI, SQLite and Home Assistant sensor support" diff --git a/FILE_MANIFEST.sha256 b/FILE_MANIFEST.sha256 index 8f47cfe..8dfe778 100644 --- a/FILE_MANIFEST.sha256 +++ b/FILE_MANIFEST.sha256 @@ -1,14 +1,14 @@ de0793949cf01d27d903653226ecc9b5f72523d8711f20bcab022cf42c4c4ed0 ./.env.example a4ec3874a2e3ab1bad28fb40bb620f7b01f64d01ad9b699306bf70ada31227db ./.gitignore -814d089f903ccb4a7c73da9330dd712ac6c61930e6e04d46a2e7d17a42df0170 ./Cargo.lock -06aee8c1c6877d77f6442ae801018c6d6ad1eafc39f183caf64c8f70c38485f8 ./Cargo.toml +11082066dd96ca1b6c606593cbb1264ad19d30e92db64aa0ca14b0203f880e81 ./Cargo.lock +909fd22e0fb139f17f3996be8088c42150761706e8b6c495d9f016ba26191491 ./Cargo.toml 19b2943504acb8f8de280f873a8dbec4bb6ebbe3870b158f5655d4fb8c298f5f ./LICENSE -6b7e376e25e6917c458e0633ea853cae9935240aeb2b18e9d1712925c3e37c72 ./README.md -5033d39b78afe2b9497663e23ed0fa61bafcc16b834a7ec207a69beb79ba58ef ./SOURCE_MANIFEST.sha256 +3bb541af2907e9f55ab3ab683822966834b8f6d81881ab0ce812d48cadac344b ./README.md +dab9da1afb385bc96ba4888c9eb0c8fcef60f5983bd8fdbb808632f269d8f02d ./SOURCE_MANIFEST.sha256 29e9821e5ed216ea3565dd6d8bc0b174ed3cf9fa72c4ccebbfa99e98db3ad8f9 ./build.rs -6a0847edcc5a165d2ecba857a5528abf69499e4d2b2f5b3c18d07212e6830134 ./docs/API.md +69c7604b2bdeef946dd95675a07b77bd798a0c4ab17025670df09cd339d38278 ./docs/API.md 43af7941ec4d427f9db7ab3cc6baf3d182a72dba7a6791f14094fee138324d8d ./docs/FLOW.md -cdd337e3daa56176a939389064f620364fa1f04dd48f7d2d3879dc130c95d31c ./docs/openapi.json +01186f7403248378373edebb990cb016e9ff9f48df5874ab95eec4b1fa6e4273 ./docs/openapi.json 77b8becf7a2c16a384ea85721d878b76e2d520549cb4455d9aa806e57e5a2ecd ./ha-addon/.env.example 0ca6e58170c2b8925194431ebbdb55f0c8b377fec5cd422cd2bd257e2d9328e3 ./ha-addon/Dockerfile 0951696a2c2e66d4d969f8e7f8641184e3012f261583b31074bc38a7a1c0cc1a ./ha-addon/README.md @@ -22,7 +22,7 @@ b7f0873109c52be9d7f09bea3dffc416103c50085e1f0680d11661a969479898 ./ha-addon/hom 6509286c7b7de638dcc5d40ce53181e65d1eddc5dc36a13306dc6d87220fedbb ./ha-addon/home-assistant/custom_components/gree_controller/coordinator.py 5a96fe8f5c035c34f1339370270cd078056202d09e236dec75735be11de92a7d ./ha-addon/home-assistant/custom_components/gree_controller/entity_map.py c4fb75c246db651087900ebfc2291ff41ac87652cd6194fc0b776b0005c1cbcf ./ha-addon/home-assistant/custom_components/gree_controller/icon.png -b2af634cee9e2221caca3f6eeaf4bb21ec679ce1e69178bd96c5ce45d3921957 ./ha-addon/home-assistant/custom_components/gree_controller/manifest.json +f84b8abfd72a2f4eb69cff85aa4e9ec46b06a44f038e6a75afdd6b5accf570e8 ./ha-addon/home-assistant/custom_components/gree_controller/manifest.json c52a484b671ce738ecc00228a1db19a5d703f69ab27530c2896a5c2ae3b4a96f ./ha-addon/home-assistant/custom_components/gree_controller/number.py 39c4309001b75abb56234f05662bc06e077054986876f1927937edbce528ec95 ./ha-addon/home-assistant/custom_components/gree_controller/select.py cca65482e36d48035aca178121a378fe7d578d600acff267ae81a6399c0da653 ./ha-addon/home-assistant/custom_components/gree_controller/sensor.py @@ -30,10 +30,10 @@ cca65482e36d48035aca178121a378fe7d578d600acff267ae81a6399c0da653 ./ha-addon/hom a745cc458c235158d5d70b6a33d8000fd8b40ff93bfe2f2796af0f4b3a9eef9b ./ha-addon/home-assistant/custom_components/gree_controller/translations/en.json 50b7d6fe6329ad4ea6bee9612ab141c2f73f8382fcc2af0bb076a8e8d4dd4465 ./ha-addon/home-assistant/custom_components/gree_controller/translations/pl.json c5fc5c87273d82d2834a0a5a365c821a416413ed509613441e24e4dc3507c4d2 ./ha-addon/home-assistant/generated/gree_controller_entities.example.json -843d0dc9ac0c2f79abce8fb47359aed3f9eb3b95c7a5fc3a4648cb09a6d8d4b5 ./ha-addon/repository/gree-controller/CHANGELOG.md +b1aa529d58658ca1538904e86a42d0b5d23fc39c35a4bae9c785f3288d75af55 ./ha-addon/repository/gree-controller/CHANGELOG.md 50b8ba050c6b4919e4d057f7b38c1e23d3913b5b7c87552626452e9695d37251 ./ha-addon/repository/gree-controller/DOCS.md -1f4cdeb234853a984381631cab6a0a297aae381750b17c9380d5f1ab093b63e4 ./ha-addon/repository/gree-controller/README.md -ed4feee8a3ccf817545de028fc55bec3386b2cb3b3e348d4eac93a49768ec648 ./ha-addon/repository/gree-controller/config.yaml +f583a7f66d024da96f55c4aa45ea403294a433265da2312a0d81502a2f7079c3 ./ha-addon/repository/gree-controller/README.md +2b4470debd1ad26fbddb3c1c70ba6ad994f5509c2c604a3dcc0ba62b4779572e ./ha-addon/repository/gree-controller/config.yaml 3aae6cdae4c3aaab7786a9575e7093b7e2c5b69288167075f4b7475611691a6b ./ha-addon/repository/gree-controller/topologia-ha-vlan-gree-pl.png 0d0b42a7639b128946eec379175436fa1f150294f39d2dfd169077bfa87fd14d ./ha-addon/repository/gree-controller/topology-ha-vlan-gree-en.png 2272740b185e9520e948f74b8f45cf98b8b5fd28c93bdee760da626f91fe5c2a ./ha-addon/repository/gree-controller/translations/en.yaml @@ -85,7 +85,7 @@ fdcd9a5055d08037278b842e7ab69265345c5811f0a06867136c511d140bb191 ./presets/wind 804f22123cd3e8db0fac791826c8dd9f758fb866c8e3b5655fb6d25d259dccf1 ./presets/workday_comfort.json fd7390d64a2378352c09382accf6efff43903d952d111b22a982f06c5b2a3b4b ./regenerate-sha.sh c64b1c6deeb24f20af662bfce7fa3683703914987241107ce664fa2f6d1a9dcb ./scripts/README.md -bbc7719e29db419d3dad078bc8371d58623695d7d5a9c43ca66a03e6daa5df1b ./scripts/api_dev_test.py +17a8e34882ad7c3f4cd53d3ccdff74a9d533963bd14b7434fc7d4ca2d9e56093 ./scripts/api_dev_test.py 5bc736c7bc76ca80aaa406bb171d2aa91baf4c3aa8695dce0e09b888b6ab3146 ./scripts/common.sh 6403786610ee6d2f628193c25aee0dd058d62e904aa1a31d5f62fdaae0e94b4f ./scripts/configure-gree-network.sh 1d6e14e26e49aa9d3527f30a23668bf8d9c48b67e6628ef686c3155c012155de ./scripts/dev.sh @@ -112,7 +112,7 @@ ca5bc21e051222dcaf0c507e84cb3e60f52a0b612a6056847fa0aee3a4d1a672 ./src/api/flow b61b0b4f196c5e72e47cf06ca0c14df3cf8eedbdef0242a9d2af33623663489f ./src/api/groups.rs b6d586bc42b166ac05648f3da7d9aeb88efde2e9eaab5642685eb4d9cf15f95a ./src/api/history.rs e8edfbb725d6de650442444b0a929ad2be0bd2c2d7d227d2b3fdd99d05c94f94 ./src/api/house.rs -8495967c3df72110f591c744975984c78cafc8181b2d430e7fd5b9baf57eba95 ./src/api/integrations.rs +4ed7835ed622806124a805f54ffde7c39854f2447de0141d756d96f22446fb90 ./src/api/integrations.rs 7658111f7d125db55a6e23f88157339b110b2cd1ed13ceabd8f860b42dba5101 ./src/api/middleware.rs 9d996d326f2ec192c79fb108a8d2c06efaa1c9634d9e9e54fa65a65524f92a75 ./src/api/openapi.rs b777e7fbeccef699e11ffd16bb18633843c99afecacce2221280e54b09f6d2da ./src/api/public_settings.rs @@ -141,7 +141,7 @@ a0d60ad81d024488dfec586b0d9e9f447e9a3485985604415465cacba59d645f ./src/engine/a 357ef92c3cc42b243af4da31ac52bb360d7444ae423f58d7a13bdee79bf0a748 ./src/engine/connectivity.rs ad53cd7be24deb759e03cbc6472522b69ebd36d8fac35398a9b19c899d3b17f2 ./src/engine/control_plan.rs 7b48a33343d519a2ff2d81e9d757eb56a0c1beacfc0b7b8ef61f49c2ad363f9a ./src/engine/deadlines.rs -a3282d1e22fbdc89bed1d9e681e4865c9d8778f97805083c709fc62090a00d27 ./src/engine/energy.rs +519f67ab805f61afea107215f5df50562fa1669a48334cc015570952e25e773a ./src/engine/energy.rs e350aa63f3bb14ca887eaaa7555edbeae00fb584cbcaf552cc972f0c8918f5d8 ./src/engine/groups.rs 4ec11426ef860811348f2bf1b458bc5713fe8a7794fb4c8045dd637652e8e696 ./src/engine/history.rs 41b7045877771b7c352328998cb45ce2433e7f9631fad3eb1a882ab4897dc31f ./src/engine/local_thermostat.rs @@ -156,7 +156,7 @@ b0189f28d0f337dfd3ce0934da7a565e4a5535afc1c242214c26ed584b3b7840 ./src/engine/t c89ff36c6a67bf4fbf68c43e18aa0a556de2dc69263fd79db376363afc741a4f ./src/engine/zone_actions.rs fb169bcc20f95abe9892367df6dd3a683584bdbc721792d6ffb9311b81ca30d9 ./src/engine/zone_control.rs bfac95cec87f0df6ce562153cd3cfe6731359d703e6c592d2c2f7ba01ea62d99 ./src/error.rs -a9768150162a010579d40060417e276703e8756c139fcf57dddab9fffc98d840 ./src/home_assistant.rs +d681f2aa53c39f37411834c300e9200299f94ee4ea021f44f70a3ea1774bd698 ./src/home_assistant.rs bcd14e4d1af3ca580f3b95bcd86164c40f762511e1b8e2501cb8a598a6d8adf4 ./src/influxdb.rs da4068295f37c23222bb13bebac022d88ba7729604a49ad25438c55e45458a49 ./src/influxdb/codec.rs 2d36405912646b30b1a1a37a7a4e18c2104ab22e865b593316a609dda884aec2 ./src/influxdb/query.rs diff --git a/README.md b/README.md index c59225c..7f58885 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ Self-hosted controller for GREE-compatible air conditioners with a local Web UI, thermostat zones, schedules, Home Assistant integration, history, notifications and a documented HTTP/WebSocket API. -**Version: 0.15.13** +**Version: 0.15.14** -Version 0.15.13 makes Flow cards explicit and safer to use: each card shows whether it compiles to a schedule, an automation, both, or neither; opening the editor is now only possible from a dedicated Editor button styled like Simulator, while clicks on counts and card text no longer open the editor. +Version 0.15.14 fixes Home Assistant Supervisor authentication detection for background energy sampling and centralizes runtime HA readiness checks, so add-on installations use the same Supervisor-aware connection logic as entity tests, temperatures and Flow integrations. > [Full API reference](docs/API.md) — authentication, every endpoint, request bodies, response models, WebSocket events and examples. > Built-in API: `/api/*` and `/ws`; interactive Swagger docs: `/api-docs`; OpenAPI JSON: `/api-docs/openapi.json`. diff --git a/SOURCE_MANIFEST.sha256 b/SOURCE_MANIFEST.sha256 index 9f63098..38bdc39 100644 --- a/SOURCE_MANIFEST.sha256 +++ b/SOURCE_MANIFEST.sha256 @@ -1,13 +1,13 @@ de0793949cf01d27d903653226ecc9b5f72523d8711f20bcab022cf42c4c4ed0 ./.env.example a4ec3874a2e3ab1bad28fb40bb620f7b01f64d01ad9b699306bf70ada31227db ./.gitignore -814d089f903ccb4a7c73da9330dd712ac6c61930e6e04d46a2e7d17a42df0170 ./Cargo.lock -06aee8c1c6877d77f6442ae801018c6d6ad1eafc39f183caf64c8f70c38485f8 ./Cargo.toml +11082066dd96ca1b6c606593cbb1264ad19d30e92db64aa0ca14b0203f880e81 ./Cargo.lock +909fd22e0fb139f17f3996be8088c42150761706e8b6c495d9f016ba26191491 ./Cargo.toml 19b2943504acb8f8de280f873a8dbec4bb6ebbe3870b158f5655d4fb8c298f5f ./LICENSE -6b7e376e25e6917c458e0633ea853cae9935240aeb2b18e9d1712925c3e37c72 ./README.md +3bb541af2907e9f55ab3ab683822966834b8f6d81881ab0ce812d48cadac344b ./README.md 29e9821e5ed216ea3565dd6d8bc0b174ed3cf9fa72c4ccebbfa99e98db3ad8f9 ./build.rs -6a0847edcc5a165d2ecba857a5528abf69499e4d2b2f5b3c18d07212e6830134 ./docs/API.md +69c7604b2bdeef946dd95675a07b77bd798a0c4ab17025670df09cd339d38278 ./docs/API.md 43af7941ec4d427f9db7ab3cc6baf3d182a72dba7a6791f14094fee138324d8d ./docs/FLOW.md -cdd337e3daa56176a939389064f620364fa1f04dd48f7d2d3879dc130c95d31c ./docs/openapi.json +01186f7403248378373edebb990cb016e9ff9f48df5874ab95eec4b1fa6e4273 ./docs/openapi.json 77b8becf7a2c16a384ea85721d878b76e2d520549cb4455d9aa806e57e5a2ecd ./ha-addon/.env.example 0ca6e58170c2b8925194431ebbdb55f0c8b377fec5cd422cd2bd257e2d9328e3 ./ha-addon/Dockerfile 0951696a2c2e66d4d969f8e7f8641184e3012f261583b31074bc38a7a1c0cc1a ./ha-addon/README.md @@ -21,7 +21,7 @@ b7f0873109c52be9d7f09bea3dffc416103c50085e1f0680d11661a969479898 ./ha-addon/hom 6509286c7b7de638dcc5d40ce53181e65d1eddc5dc36a13306dc6d87220fedbb ./ha-addon/home-assistant/custom_components/gree_controller/coordinator.py 5a96fe8f5c035c34f1339370270cd078056202d09e236dec75735be11de92a7d ./ha-addon/home-assistant/custom_components/gree_controller/entity_map.py c4fb75c246db651087900ebfc2291ff41ac87652cd6194fc0b776b0005c1cbcf ./ha-addon/home-assistant/custom_components/gree_controller/icon.png -b2af634cee9e2221caca3f6eeaf4bb21ec679ce1e69178bd96c5ce45d3921957 ./ha-addon/home-assistant/custom_components/gree_controller/manifest.json +f84b8abfd72a2f4eb69cff85aa4e9ec46b06a44f038e6a75afdd6b5accf570e8 ./ha-addon/home-assistant/custom_components/gree_controller/manifest.json c52a484b671ce738ecc00228a1db19a5d703f69ab27530c2896a5c2ae3b4a96f ./ha-addon/home-assistant/custom_components/gree_controller/number.py 39c4309001b75abb56234f05662bc06e077054986876f1927937edbce528ec95 ./ha-addon/home-assistant/custom_components/gree_controller/select.py cca65482e36d48035aca178121a378fe7d578d600acff267ae81a6399c0da653 ./ha-addon/home-assistant/custom_components/gree_controller/sensor.py @@ -29,10 +29,10 @@ cca65482e36d48035aca178121a378fe7d578d600acff267ae81a6399c0da653 ./ha-addon/hom a745cc458c235158d5d70b6a33d8000fd8b40ff93bfe2f2796af0f4b3a9eef9b ./ha-addon/home-assistant/custom_components/gree_controller/translations/en.json 50b7d6fe6329ad4ea6bee9612ab141c2f73f8382fcc2af0bb076a8e8d4dd4465 ./ha-addon/home-assistant/custom_components/gree_controller/translations/pl.json c5fc5c87273d82d2834a0a5a365c821a416413ed509613441e24e4dc3507c4d2 ./ha-addon/home-assistant/generated/gree_controller_entities.example.json -843d0dc9ac0c2f79abce8fb47359aed3f9eb3b95c7a5fc3a4648cb09a6d8d4b5 ./ha-addon/repository/gree-controller/CHANGELOG.md +b1aa529d58658ca1538904e86a42d0b5d23fc39c35a4bae9c785f3288d75af55 ./ha-addon/repository/gree-controller/CHANGELOG.md 50b8ba050c6b4919e4d057f7b38c1e23d3913b5b7c87552626452e9695d37251 ./ha-addon/repository/gree-controller/DOCS.md -1f4cdeb234853a984381631cab6a0a297aae381750b17c9380d5f1ab093b63e4 ./ha-addon/repository/gree-controller/README.md -ed4feee8a3ccf817545de028fc55bec3386b2cb3b3e348d4eac93a49768ec648 ./ha-addon/repository/gree-controller/config.yaml +f583a7f66d024da96f55c4aa45ea403294a433265da2312a0d81502a2f7079c3 ./ha-addon/repository/gree-controller/README.md +2b4470debd1ad26fbddb3c1c70ba6ad994f5509c2c604a3dcc0ba62b4779572e ./ha-addon/repository/gree-controller/config.yaml 3aae6cdae4c3aaab7786a9575e7093b7e2c5b69288167075f4b7475611691a6b ./ha-addon/repository/gree-controller/topologia-ha-vlan-gree-pl.png 0d0b42a7639b128946eec379175436fa1f150294f39d2dfd169077bfa87fd14d ./ha-addon/repository/gree-controller/topology-ha-vlan-gree-en.png 2272740b185e9520e948f74b8f45cf98b8b5fd28c93bdee760da626f91fe5c2a ./ha-addon/repository/gree-controller/translations/en.yaml @@ -84,7 +84,7 @@ fdcd9a5055d08037278b842e7ab69265345c5811f0a06867136c511d140bb191 ./presets/wind 804f22123cd3e8db0fac791826c8dd9f758fb866c8e3b5655fb6d25d259dccf1 ./presets/workday_comfort.json fd7390d64a2378352c09382accf6efff43903d952d111b22a982f06c5b2a3b4b ./regenerate-sha.sh c64b1c6deeb24f20af662bfce7fa3683703914987241107ce664fa2f6d1a9dcb ./scripts/README.md -bbc7719e29db419d3dad078bc8371d58623695d7d5a9c43ca66a03e6daa5df1b ./scripts/api_dev_test.py +17a8e34882ad7c3f4cd53d3ccdff74a9d533963bd14b7434fc7d4ca2d9e56093 ./scripts/api_dev_test.py 5bc736c7bc76ca80aaa406bb171d2aa91baf4c3aa8695dce0e09b888b6ab3146 ./scripts/common.sh 6403786610ee6d2f628193c25aee0dd058d62e904aa1a31d5f62fdaae0e94b4f ./scripts/configure-gree-network.sh 1d6e14e26e49aa9d3527f30a23668bf8d9c48b67e6628ef686c3155c012155de ./scripts/dev.sh @@ -111,7 +111,7 @@ ca5bc21e051222dcaf0c507e84cb3e60f52a0b612a6056847fa0aee3a4d1a672 ./src/api/flow b61b0b4f196c5e72e47cf06ca0c14df3cf8eedbdef0242a9d2af33623663489f ./src/api/groups.rs b6d586bc42b166ac05648f3da7d9aeb88efde2e9eaab5642685eb4d9cf15f95a ./src/api/history.rs e8edfbb725d6de650442444b0a929ad2be0bd2c2d7d227d2b3fdd99d05c94f94 ./src/api/house.rs -8495967c3df72110f591c744975984c78cafc8181b2d430e7fd5b9baf57eba95 ./src/api/integrations.rs +4ed7835ed622806124a805f54ffde7c39854f2447de0141d756d96f22446fb90 ./src/api/integrations.rs 7658111f7d125db55a6e23f88157339b110b2cd1ed13ceabd8f860b42dba5101 ./src/api/middleware.rs 9d996d326f2ec192c79fb108a8d2c06efaa1c9634d9e9e54fa65a65524f92a75 ./src/api/openapi.rs b777e7fbeccef699e11ffd16bb18633843c99afecacce2221280e54b09f6d2da ./src/api/public_settings.rs @@ -140,7 +140,7 @@ a0d60ad81d024488dfec586b0d9e9f447e9a3485985604415465cacba59d645f ./src/engine/a 357ef92c3cc42b243af4da31ac52bb360d7444ae423f58d7a13bdee79bf0a748 ./src/engine/connectivity.rs ad53cd7be24deb759e03cbc6472522b69ebd36d8fac35398a9b19c899d3b17f2 ./src/engine/control_plan.rs 7b48a33343d519a2ff2d81e9d757eb56a0c1beacfc0b7b8ef61f49c2ad363f9a ./src/engine/deadlines.rs -a3282d1e22fbdc89bed1d9e681e4865c9d8778f97805083c709fc62090a00d27 ./src/engine/energy.rs +519f67ab805f61afea107215f5df50562fa1669a48334cc015570952e25e773a ./src/engine/energy.rs e350aa63f3bb14ca887eaaa7555edbeae00fb584cbcaf552cc972f0c8918f5d8 ./src/engine/groups.rs 4ec11426ef860811348f2bf1b458bc5713fe8a7794fb4c8045dd637652e8e696 ./src/engine/history.rs 41b7045877771b7c352328998cb45ce2433e7f9631fad3eb1a882ab4897dc31f ./src/engine/local_thermostat.rs @@ -155,7 +155,7 @@ b0189f28d0f337dfd3ce0934da7a565e4a5535afc1c242214c26ed584b3b7840 ./src/engine/t c89ff36c6a67bf4fbf68c43e18aa0a556de2dc69263fd79db376363afc741a4f ./src/engine/zone_actions.rs fb169bcc20f95abe9892367df6dd3a683584bdbc721792d6ffb9311b81ca30d9 ./src/engine/zone_control.rs bfac95cec87f0df6ce562153cd3cfe6731359d703e6c592d2c2f7ba01ea62d99 ./src/error.rs -a9768150162a010579d40060417e276703e8756c139fcf57dddab9fffc98d840 ./src/home_assistant.rs +d681f2aa53c39f37411834c300e9200299f94ee4ea021f44f70a3ea1774bd698 ./src/home_assistant.rs bcd14e4d1af3ca580f3b95bcd86164c40f762511e1b8e2501cb8a598a6d8adf4 ./src/influxdb.rs da4068295f37c23222bb13bebac022d88ba7729604a49ad25438c55e45458a49 ./src/influxdb/codec.rs 2d36405912646b30b1a1a37a7a4e18c2104ab22e865b593316a609dda884aec2 ./src/influxdb/query.rs diff --git a/docs/API.md b/docs/API.md index 23cc046..1d8890c 100644 --- a/docs/API.md +++ b/docs/API.md @@ -1,6 +1,6 @@ # GREE Controller API reference -HTTP and WebSocket API for GREE Controller **0.15.13**. +HTTP and WebSocket API for GREE Controller **0.15.14**. [← Main documentation](../README.md) @@ -241,7 +241,7 @@ Response: { "status": "ok", "name": "gree-controller", - "version": "0.15.13", + "version": "0.15.14", "uptime_seconds": 1234, "control_ready": true, "time": "2026-08-30T06:54:00Z" @@ -304,7 +304,7 @@ Returns the initial Web UI snapshot: "control_plan": {"generated_at": "2026-09-04T08:00:00Z", "zones": [], "rules": []}, "control_plan_revision": 42, "system": { - "version": "0.15.13", + "version": "0.15.14", "uptime_seconds": 1234, "auth_required": false, "control_ready": true, diff --git a/docs/openapi.json b/docs/openapi.json index 08479ef..6c61f98 100644 --- a/docs/openapi.json +++ b/docs/openapi.json @@ -2,7 +2,7 @@ "openapi": "3.1.0", "info": { "title": "GREE Controller API", - "version": "0.15.13", + "version": "0.15.14", "summary": "Local HTTP/WebSocket API for GREE Controller", "description": "Local API used by the GREE Controller Web UI and Home Assistant integration.", "license": { @@ -5967,7 +5967,7 @@ }, "version": { "type": "string", - "example": "0.15.13" + "example": "0.15.14" }, "uptime_seconds": { "type": "integer", diff --git a/ha-addon/home-assistant/custom_components/gree_controller/manifest.json b/ha-addon/home-assistant/custom_components/gree_controller/manifest.json index 9e15f41..47b971f 100644 --- a/ha-addon/home-assistant/custom_components/gree_controller/manifest.json +++ b/ha-addon/home-assistant/custom_components/gree_controller/manifest.json @@ -1,7 +1,7 @@ { "domain": "gree_controller", "name": "GREE Controller", - "version": "0.15.13", + "version": "0.15.14", "config_flow": true, "integration_type": "hub", "iot_class": "local_polling", diff --git a/ha-addon/repository/gree-controller/CHANGELOG.md b/ha-addon/repository/gree-controller/CHANGELOG.md index 828c007..2cf41e7 100644 --- a/ha-addon/repository/gree-controller/CHANGELOG.md +++ b/ha-addon/repository/gree-controller/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.15.14 + +- Fixes Home Assistant energy sampling in the packaged add-on when authentication comes from `SUPERVISOR_TOKEN`; background sampling no longer requires persisted manual URL/token fields. +- Centralizes Home Assistant readiness detection so Supervisor authentication and standalone manual URL/token authentication use the same runtime check across background jobs and integration endpoints. + ## 0.15.13 - Flow cards now show an explicit execution type: Schedule, Automation, Schedule + Automation, Draft, or None, based on the compiled Flow output. diff --git a/ha-addon/repository/gree-controller/README.md b/ha-addon/repository/gree-controller/README.md index 30e1085..7bd5fe1 100644 --- a/ha-addon/repository/gree-controller/README.md +++ b/ha-addon/repository/gree-controller/README.md @@ -2,7 +2,7 @@ Local GREE HVAC controller packaged as a Home Assistant add-on, with Web UI, HTTP/WebSocket API, built-in Swagger API documentation, UDP discovery/control, `amd64` and `aarch64` support, ingress, and database backup from `/data/gree-controller.db`. -Version 0.15.13 adds an explicit Flow execution type on every Flow card and removes whole-card editor navigation. The editor now opens only from a dedicated Editor button that visually matches Simulator, so counters and descriptive text are safe to click. +Version 0.15.14 fixes Home Assistant Supervisor authentication detection for background energy sampling and centralizes runtime HA readiness checks, so the add-on uses Supervisor credentials consistently across entity discovery, sensor reads, Flow integrations and energy collection. ![Home Assistant OS + GREE + VLAN topology](https://git.linuxiarz.pl/gru/gree-controller-ha-addon/raw/branch/master/gree-controller/topology-ha-vlan-gree-en.png) diff --git a/ha-addon/repository/gree-controller/config.yaml b/ha-addon/repository/gree-controller/config.yaml index e9e449b..e2be068 100644 --- a/ha-addon/repository/gree-controller/config.yaml +++ b/ha-addon/repository/gree-controller/config.yaml @@ -1,5 +1,5 @@ name: "GREE Controller" -version: "0.15.13" +version: "0.15.14" slug: "gree_controller" description: "Local GREE HVAC controller with Web UI, API, and Home Assistant integration" url: "https://git.linuxiarz.pl/gru/gree-controller-ha-addon/" diff --git a/scripts/api_dev_test.py b/scripts/api_dev_test.py index 7da6f99..63841bb 100644 --- a/scripts/api_dev_test.py +++ b/scripts/api_dev_test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -"""Developer smoke/integration tests for GREE Controller API 0.15.13. +"""Developer smoke/integration tests for GREE Controller API 0.15.14. Default mode is read-only and safe to run against a real controller. Use --settings-write to additionally round-trip all split settings resources and @@ -26,7 +26,7 @@ from typing import Any, Callable, Iterable, Optional DEFAULT_BASE_URL = os.environ.get("GREE_API_URL", "http://127.0.0.1:8787") DEFAULT_TOKEN = os.environ.get("GREE_API_TOKEN", "") -DEFAULT_EXPECTED_VERSION = "0.15.13" +DEFAULT_EXPECTED_VERSION = "0.15.14" SETTINGS_PATHS: dict[str, set[str]] = { "/api/settings/application": {"simulator_enabled"}, @@ -599,7 +599,7 @@ def run_suite(args: argparse.Namespace) -> int: print(f"Settings write tests: {'ENABLED' if args.settings_write else 'disabled'}\n") runner.run("public health", lambda: test_health(client, args.expected_version)) - runner.run("OpenAPI 0.15.13 contract", lambda: test_openapi(client, args.expected_version)) + runner.run("OpenAPI 0.15.14 contract", lambda: test_openapi(client, args.expected_version)) runner.run("bootstrap snapshot contract", lambda: test_bootstrap_contract(client)) runner.run("protected API requires auth", lambda: test_protected_auth(client)) diff --git a/src/api/integrations.rs b/src/api/integrations.rs index 6916181..9c589ab 100644 --- a/src/api/integrations.rs +++ b/src/api/integrations.rs @@ -56,9 +56,7 @@ async fn list_home_assistant_entities( State(state): State, ) -> Result, AppError> { let settings = state.settings.read().await.home_assistant.clone(); - if !home_assistant::token_configured(&settings) - || home_assistant::effective_url(&settings).trim().is_empty() - { + if !home_assistant::configured(&settings) { return Ok(Json(json!({ "configured": false, "entities": [], @@ -165,9 +163,7 @@ async fn list_home_assistant_energy_sensors( State(state): State, ) -> Result, AppError> { let settings = state.settings.read().await.home_assistant.clone(); - if !home_assistant::token_configured(&settings) - || home_assistant::effective_url(&settings).trim().is_empty() - { + if !home_assistant::configured(&settings) { return Ok(Json(json!({ "configured": false, "sensors": [], diff --git a/src/engine/energy.rs b/src/engine/energy.rs index 1084d6c..3622e90 100644 --- a/src/engine/energy.rs +++ b/src/engine/energy.rs @@ -158,7 +158,7 @@ pub(crate) async fn home_assistant_energy_loop(state: AppState) { sleep(Duration::from_secs(10)).await; loop { let settings = state.settings.read().await.home_assistant.clone(); - if !settings.url.trim().is_empty() && !settings.token.trim().is_empty() { + if home_assistant::configured(&settings) { if let Ok(devices) = state.db.list_devices() { for device in devices .into_iter() diff --git a/src/home_assistant.rs b/src/home_assistant.rs index d28d6a1..f6c08c2 100644 --- a/src/home_assistant.rs +++ b/src/home_assistant.rs @@ -58,6 +58,13 @@ pub fn token_configured(settings: &HomeAssistantSettings) -> bool { } } +/// Return whether the active Home Assistant authentication path has both an +/// effective URL and credentials. This intentionally evaluates the runtime +/// Supervisor path for the HA add-on instead of only persisted manual fields. +pub fn configured(settings: &HomeAssistantSettings) -> bool { + token_configured(settings) && !effective_url(settings).trim().is_empty() +} + fn connection(settings: &HomeAssistantSettings) -> Result<(Url, String)> { let (raw_url, token) = if uses_supervisor_auth(settings) { let token = env::var(SUPERVISOR_TOKEN_ENV) @@ -285,6 +292,20 @@ mod tests { ); assert_eq!(resolve_entity_id(&settings, None), None); } + + #[test] + fn configured_uses_active_manual_credentials() { + let mut settings = settings(); + settings.manual_auth_override = true; + assert!(configured(&settings)); + + settings.url.clear(); + assert!(!configured(&settings)); + + settings.url = "http://homeassistant.local:8123".into(); + settings.token.clear(); + assert!(!configured(&settings)); + } } /// Read a complete Home Assistant entity document for Flow conditions. Keeping this helper