Merge pull request #47 from s-allius/s-allius/issue44

S allius/issue44

README.md

@@ -7,7 +7,7 @@
 <p align="center">
     <a href="https://opensource.org/licenses/BSD-3-Clause"><img alt="License: BSD-3-Clause" src="https://img.shields.io/badge/License-BSD_3--Clause-green.svg"></a>
     <a href="https://www.python.org/downloads/release/python-3120/"><img alt="Supported Python versions" src="https://img.shields.io/badge/python-3.12-blue.svg"></a>
-    <a href="https://sbtinstruments.github.io/aiomqtt/introduction.html"><img alt="Supported aiomqtt versions" src="https://img.shields.io/badge/aiomqtt-1.2.1-lightblue.svg"></a>
+    <a href="https://sbtinstruments.github.io/aiomqtt/introduction.html"><img alt="Supported aiomqtt versions" src="https://img.shields.io/badge/aiomqtt-2.0.0-lightblue.svg"></a>
     <a href="https://libraries.io/pypi/aiocron"><img alt="Supported aiocron versions" src="https://img.shields.io/badge/aiocron-1.8-lightblue.svg"></a>
     <a href="https://toml.io/en/v1.0.0"><img alt="Supported toml versions" src="https://img.shields.io/badge/toml-1.0.0-lightblue.svg"></a>
 

app/build.sh

@@ -11,6 +11,7 @@
 set -e
 
 BUILD_DATE=$(date -Iminutes)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
 VERSION=$(git describe --tags --abbrev=0)
 VERSION="${VERSION:1}"
 arr=(${VERSION//./ })
@@ -19,7 +20,7 @@ IMAGE=tsun-gen3-proxy
 
 if [[ $1 == dev ]] || [[ $1 == rc ]] ;then
 IMAGE=docker.io/sallius/${IMAGE}
-VERSION=${VERSION}-$1
+VERSION=${VERSION}-$1-${BRANCH}
 elif [[ $1 == rel ]];then
 IMAGE=ghcr.io/s-allius/${IMAGE}
 else

app/requirements.txt

@@ -1,3 +1,3 @@
-    aiomqtt==1.2.1
+    aiomqtt==2.0.0
     schema==0.7.5
     aiocron==1.8

app/src/mqtt.py

@@ -73,17 +73,17 @@ class Mqtt(metaclass=Singleton):
                     if self.cb_MqttIsUp:
                         await self.cb_MqttIsUp()
 
-                    async with self.__client.messages() as messages:
-                        await self.__client.subscribe(
-                            f"{ha['auto_conf_prefix']}"
-                            "/status")
-                        async for message in messages:
-                            status = message.payload.decode("UTF-8")
-                            logger_mqtt.info('Home-Assistant Status:'
-                                             f' {status}')
-                            if status == 'online':
-                                self.ha_restarts += 1
-                                await self.cb_MqttIsUp()
+                    # async with self.__client.messages() as messages:
+                    await self.__client.subscribe(
+                        f"{ha['auto_conf_prefix']}"
+                        "/status")
+                    async for message in self.__client.messages:
+                        status = message.payload.decode("UTF-8")
+                        logger_mqtt.info('Home-Assistant Status:'
+                                         f' {status}')
+                        if status == 'online':
+                            self.ha_restarts += 1
+                            await self.cb_MqttIsUp()
 
             except aiomqtt.MqttError:
                 logger_mqtt.info(f"Connection lost; Reconnecting in {interval}"