sv/tsun-gen3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
S allius/issue44
This commit is contained in:
Stefan Allius
2024-04-09 00:39:10 +02:00
committed by GitHub
parent e93432f318 234eb26eae
commit 8b20af692f
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -7,7 +7,7 @@
<p align="center"> <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://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://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://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> <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>

3
app/build.sh
View File

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

2
app/requirements.txt
View File

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

22
app/src/mqtt.py
View File

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