initial implementation

* Update dependency pytest-asyncio to v1.1.0

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Stefan Allius <stefan.allius@t-online.de>

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+- Update dependency pytest-asyncio to v1.1.0
+- save task references, to avoid a task disappearing mid-execution
+- catch socket.gaierror exception and log this with info level
+- Update dependency coverage to v7.9.2
+- add-on: bump base-image to version 18.0.3
+- add-on: remove armhf and armv7 support
+- add-on: add links to config and log-file to the web-UI
 - fix some SonarQube warnings
 - remove unused 32-bit architectures
 - Babel don't build new po file if only the pot creation-date was changed

app/docker-bake.hcl

@@ -29,17 +29,17 @@ target "_common" {
     "type =sbom,generator=docker/scout-sbom-indexer:latest"
   ]
   annotations = [
-    "index:org.opencontainers.image.title=TSUN Gen3 Proxy",
+    "index,manifest-descriptor:org.opencontainers.image.title=TSUN-Proxy",
-    "index:org.opencontainers.image.authors=Stefan Allius",
+    "index,manifest-descriptor:org.opencontainers.image.authors=Stefan Allius",
-    "index:org.opencontainers.image.created=${BUILD_DATE}",
+    "index,manifest-descriptor:org.opencontainers.image.created=${BUILD_DATE}",
-    "index:org.opencontainers.image.version=${VERSION}",
+    "index,manifest-descriptor:org.opencontainers.image.version=${VERSION}",
-    "index:org.opencontainers.image.revision=${BRANCH}",
+    "index,manifest-descriptor:org.opencontainers.image.revision=${BRANCH}",
-    "index:org.opencontainers.image.description=${DESCRIPTION}",
+    "index,manifest-descriptor:org.opencontainers.image.description=${DESCRIPTION}",
     "index:org.opencontainers.image.licenses=BSD-3-Clause",
     "index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy"
   ]
   labels = {
-    "org.opencontainers.image.title" = "TSUN Gen3 Proxy"
+    "org.opencontainers.image.title" = "TSUN-Proxy"
     "org.opencontainers.image.authors" = "Stefan Allius"
     "org.opencontainers.image.created" = "${BUILD_DATE}"
     "org.opencontainers.image.version" = "${VERSION}"

app/requirements-test.txt

@@ -1,8 +1,8 @@
     flake8==7.3.0
     pytest==8.4.1
-    pytest-asyncio==1.0.0
+    pytest-asyncio==1.1.0
     pytest-cov==6.2.1
-    python-dotenv==1.1.0
+    python-dotenv==1.1.1
     mock==5.2.0
-    coverage==7.9.1
+    coverage==7.9.2
     jinja2-cli==0.8.2

app/src/async_ifc.py

@@ -102,3 +102,7 @@ class AsyncIfc(ABC):
     @abstractmethod
     def prot_set_update_header_cb(self, callback):
         pass  # pragma: no cover
+
+    @abstractmethod
+    def prot_set_disc_cb(self, callback):
+        pass  # pragma: no cover

app/src/async_stream.py

@@ -29,6 +29,7 @@ class AsyncIfcImpl(AsyncIfc):
         self.timeout_cb = None
         self.init_new_client_conn_cb = None
         self.update_header_cb = None
+        self.inv_disc_cb = None
 
     def close(self):
         self.timeout_cb = None
@@ -106,6 +107,9 @@ class AsyncIfcImpl(AsyncIfc):
     def prot_set_update_header_cb(self, callback):
         self.update_header_cb = callback
 
+    def prot_set_disc_cb(self, callback):
+        self.inv_disc_cb = callback
+
 
 class StreamPtr():
     '''Descr StreamPtr'''
@@ -330,6 +334,8 @@ class AsyncStreamServer(AsyncStream):
         Infos.inc_counter('ServerMode_Cnt')
         await self.publish_outstanding_mqtt()
         await self.loop()
+        if self.inv_disc_cb:
+            self.inv_disc_cb()
         Infos.dec_counter('ServerMode_Cnt')
         Infos.dec_counter('Inverter_Cnt')
         await self.publish_outstanding_mqtt()
@@ -386,6 +392,8 @@ class AsyncStreamClient(AsyncStream):
             Infos.inc_counter('ProxyMode_Cnt')
         await self.publish_outstanding_mqtt()
         await self.loop()
+        if self.inv_disc_cb:
+            self.inv_disc_cb()
         if self.emu_mode:
             Infos.dec_counter('EmuMode_Cnt')
         else:

app/src/gen3/talent.py

@@ -36,6 +36,7 @@ class Talent(Message):
 
     def __init__(self, inverter, addr, ifc: "AsyncIfc", server_side: bool,
                  client_mode: bool = False, id_str=b''):
+        self.db = InfosG3()
         super().__init__('G3', ifc, server_side, self.send_modbus_cb,
                          mb_timeout=15)
         _ = inverter
@@ -51,7 +52,6 @@ class Talent(Message):
         self.contact_name = b''
         self.contact_mail = b''
         self.ts_offset = 0        # time offset between tsun cloud and local
-        self.db = InfosG3()
         self.switch = {
             0x00: self.msg_contact_info,
             0x13: self.msg_ota_update,

app/src/gen3plus/solarman_v5.py

@@ -256,11 +256,11 @@ class SolarmanV5(SolarmanBase):
 
     def __init__(self, inverter, addr, ifc: "AsyncIfc",
                  server_side: bool, client_mode: bool):
+        self.db = InfosG3P(client_mode)
         super().__init__(addr, ifc, server_side, self.send_modbus_cb,
                          mb_timeout=8)
 
         self.inverter = inverter
-        self.db = InfosG3P(client_mode)
         self.no_forwarding = False
         '''not allowed to connect to TSUN cloud by connection type'''
         self.establish_inv_emu = False
@@ -327,6 +327,7 @@ class SolarmanV5(SolarmanBase):
         self.sensor_list = 0
         self.mb_regs = [{'addr': 0x3000, 'len': 48},
                         {'addr': 0x2000, 'len': 96}]
+        self.background_tasks = set()
 
     '''
     Our puplic methods
@@ -339,6 +340,7 @@ class SolarmanV5(SolarmanBase):
         self.inverter = None
         self.switch.clear()
         self.log_lvl.clear()
+        self.background_tasks.clear()
         super().close()
 
     def send_start_cmd(self, snr: int, host: str,
@@ -690,8 +692,10 @@ class SolarmanV5(SolarmanBase):
         self.__forward_msg()
 
     def publish_mqtt(self, key, data):  # pragma: no cover
-        asyncio.ensure_future(
+        task = asyncio.ensure_future(
             Proxy.mqtt.publish(key, data))
+        self.background_tasks.add(task)
+        task.add_done_callback(self.background_tasks.discard)
 
     def get_cmd_rsp_log_lvl(self) -> int:
         ftype = self.ifc.rx_peek()[self.header_len]

app/src/infos.py

@@ -31,6 +31,7 @@ class Register(Enum):
     GRID_VOLT_CAL_COEF = 29
     OUTPUT_COEFFICIENT = 30
     PROD_COMPL_TYPE = 31
+    AVAIL_STATUS = 32
     INVERTER_CNT = 50
     UNKNOWN_SNR = 51
     UNKNOWN_MSG = 52
@@ -577,6 +578,7 @@ class Infos:
     __output_coef_val_tpl = "{% if 'Output_Coefficient' in value_json and value_json['Output_Coefficient'] != None %}{{value_json['Output_Coefficient']|string() +' %'}}{% else %}{{ this.state }}{% endif %}"  # noqa: E501
 
     __info_defs = {
+        Register.AVAIL_STATUS: {'name': ['status', 'status']},
         # collector values used for device registration:
         Register.COLLECTOR_FW_VERSION:  {'name': ['collector', 'Collector_Fw_Version'],       'level': logging.INFO,  'unit': ''},  # noqa: E501
         Register.CHIP_TYPE:  {'name': ['collector', 'Chip_Type'],        'singleton': False,  'level': logging.DEBUG, 'unit': ''},  # noqa: E501
@@ -946,6 +948,9 @@ class Infos:
         attr['dev_cla'] = ha['dev_cla']
         attr['stat_cla'] = ha['stat_cla']
         attr['uniq_id'] = ha['id']+snr
+        # attr['availability_topic'] = prfx + "status"
+        # attr['payload_available'] = "online"
+        # attr['payload_not_available'] = "offline"
         if 'val_tpl' in ha:
             attr['val_tpl'] = ha['val_tpl']
         elif 'fmt' in ha:

app/src/inverter_base.py

@@ -4,6 +4,7 @@ import logging
 import traceback
 import json
 import gc
+import socket
 from aiomqtt import MqttCodeError
 from asyncio import StreamReader, StreamWriter
 from ipaddress import ip_address
@@ -38,6 +39,7 @@ class InverterBase(InverterIfc, Proxy):
             self.use_emulation = False
         self.__ha_restarts = -1
         self.remote = StreamPtr(None)
+        self.background_tasks = set()
         ifc = AsyncStreamServer(reader, writer,
                                 self.async_publ_mqtt,
                                 self.create_remote,
@@ -72,6 +74,7 @@ class InverterBase(InverterIfc, Proxy):
         if self.remote.ifc:
             self.remote.ifc.close()
             self.remote.ifc = None
+        self.background_tasks.clear()
 
     async def disc(self, shutdown_started=False) -> None:
         if self.remote.stream:
@@ -136,9 +139,14 @@ class InverterBase(InverterIfc, Proxy):
             logging.info(f'[{self.remote.stream.node_id}:'
                          f'{self.remote.stream.conn_no}] '
                          f'Connected to {addr}')
-            asyncio.create_task(self.remote.ifc.client_loop(addr))
+            task = asyncio.create_task(
+                self.remote.ifc.client_loop(addr))
+            self.background_tasks.add(task)
+            task.add_done_callback(self.background_tasks.discard)
 
-        except (ConnectionRefusedError, TimeoutError) as error:
+        except (ConnectionRefusedError,
+                TimeoutError,
+                socket.gaierror) as error:
             logging.info(f'{error}')
         except Exception:
             Infos.inc_counter('SW_Exception')
@@ -159,6 +167,8 @@ class InverterBase(InverterIfc, Proxy):
                         stream.new_data['batterie'])
                     or ('collector' in stream.new_data and
                         stream.new_data['collector'])
+                    or ('status' in stream.new_data and
+                        stream.new_data['status'])
                     or self.mqtt.ha_restarts != self.__ha_restarts):
                 await self._register_proxy_stat_home_assistant()
                 await self.__register_home_assistant(stream)

app/src/messages.py

@@ -98,7 +98,11 @@ class Message(ProtocolIfc):
         self.server_side = server_side
         self.ifc = ifc
         self.node_id = node_id
+        self.new_data = {}
         if server_side:
+            ifc.prot_set_disc_cb(self._inv_disc)
+            self.db.set_db_def_value(Register.AVAIL_STATUS, "on")
+            self.new_data['status'] = True
             self.mb = Modbus(send_modbus_cb, mb_timeout)
             self.mb_timer = Timer(self.mb_timout_cb, self.node_id)
         else:
@@ -110,7 +114,6 @@ class Message(ProtocolIfc):
         self.unique_id = 0
         self.inv_serial = ''
         self.sug_area = ''
-        self.new_data = {}
         self.state = State.init
         self.shutdown_started = False
         self.modbus_elms = 0    # for unit tests
@@ -220,6 +223,11 @@ class Message(ProtocolIfc):
                             f'(reg: 0x{self.mb.last_reg:04x}):',
                             data[hdr_len:], modbus_msg_len)
 
+    def _inv_disc(self):
+        logging.warning(f"Un-Available: [{self.node_id}]")
+        self.db.set_db_def_value(Register.AVAIL_STATUS, "off")
+        self.new_data['status'] = True
+
     '''
     Our puplic methods
     '''
@@ -237,6 +245,7 @@ class Message(ProtocolIfc):
         self.ifc.prot_set_timeout_cb(None)
         self.ifc.prot_set_init_new_client_conn_cb(None)
         self.ifc.prot_set_update_header_cb(None)
+        self.ifc.prot_set_disc_cb(None)
         self.ifc = None
 
         if self.mb:

app/src/modbus_tcp.py

@@ -35,6 +35,8 @@ class ModbusConn():
     async def __aexit__(self, exc_type, exc, tb):
         Infos.dec_counter('ClientMode_Cnt')
         Infos.dec_counter('Inverter_Cnt')
+        if self.inverter.local.ifc.inv_disc_cb:
+            self.inverter.local.ifc.inv_disc_cb()
         await self.inverter.local.ifc.publish_outstanding_mqtt()
         self.inverter.__exit__(exc_type, exc, tb)
 
@@ -43,6 +45,7 @@ class ModbusTcp():
 
     def __init__(self, loop, tim_restart=10) -> None:
         self.tim_restart = tim_restart
+        self.background_tasks = set()
 
         inverters = Config.get('inverters')
         batteries = Config.get('batteries')
@@ -54,10 +57,13 @@ class ModbusTcp():
                and 'client_mode' in inv):
                 client = inv['client_mode']
                 logger.info(f"'client_mode' for Monitoring-SN: {inv['monitor_sn']} host: {client['host']}:{client['port']}, forward: {client['forward']}")  # noqa: E501
-                loop.create_task(self.modbus_loop(client['host'],
+                task = loop.create_task(
-                                                  client['port'],
+                    self.modbus_loop(client['host'],
-                                                  inv['monitor_sn'],
+                                     client['port'],
-                                                  client['forward']))
+                                     inv['monitor_sn'],
+                                     client['forward']))
+                self.background_tasks.add(task)
+                task.add_done_callback(self.background_tasks.discard)
 
     async def modbus_loop(self, host, port,
                           snr: int, forward: bool) -> None:

app/src/server.py

@@ -60,7 +60,16 @@ class Server():
 
         @app.context_processor
         def utility_processor():
-            return {'version': self.version}
+            var = {'version': self.version,
+                   'slug': os.getenv("SLUG"),
+                   'hostname': os.getenv("HOSTNAME"),
+                   }
+            if var['slug']:
+                var['hassio'] = True
+                slug_len = len(var['slug'])
+                var['addonname'] = var['slug'] + '_' + \
+                    var['hostname'][slug_len+1:]
+            return var
 
     def parse_args(self, arg_list: list[str] | None):
         parser = argparse.ArgumentParser()
@@ -209,6 +218,7 @@ app = Quart(__name__,
             static_folder='web/static')
 app.secret_key = 'JKLdks.dajlKKKdladkflKwolafallsdfl'
 app.jinja_env.globals.update(url_for=url_for)
+app.background_tasks = set()
 server = Server(app, __name__ == "__main__")
 Web(app, server.trans_path, server.rel_urls)
 
@@ -259,9 +269,13 @@ async def startup_app():    # pragma: no cover
 
     for inv_class, port in [(InverterG3, 5005), (InverterG3P, 10000)]:
         logging.info(f'listen on port: {port} for inverters')
-        loop.create_task(asyncio.start_server(lambda r, w, i=inv_class:
+        task = loop.create_task(
-                                              handle_client(r, w, i),
+            asyncio.start_server(lambda r, w, i=inv_class:
-                                              '0.0.0.0', port))
+                                 handle_client(r, w, i),
+                                 '0.0.0.0', port))
+        app.background_tasks.add(task)
+        task.add_done_callback(app.background_tasks.discard)
+
     ProxyState.set_up(True)
 
 
@@ -285,6 +299,7 @@ async def handle_shutdown():   # pragma: no cover
         await inverter.disc(True)
 
     logging.info('Proxy disconnecting done')
+    app.background_tasks.clear()
 
     await Proxy.class_close(loop)
 

app/src/web/log_handler.py

@@ -22,3 +22,6 @@ class LogHandler(Handler, metaclass=Singleton):
 
     def get_buffer(self, elms=0) -> list:
         return list(self.buffer)[-elms:]
+
+    def clear(self):
+        self.buffer.clear()

app/src/web/static/font-awesome/css/all.min.css

@@ -7,3 +7,4 @@
 .fa-rotate-right:before{content:"\f01e"}
 .fa-cloud-arrow-down-alt:before{content:"\f381"}
 .fa-cloud-arrow-up-alt:before{content:"\f382"}
+.fa-gear:before{content:"\f013"}

app/src/web/templates/base.html.j2

@@ -59,6 +59,11 @@
         <a href="{{ url_for('.mqtt')}}" class="w3-bar-item w3-button w3-padding {% block menu2_class %}{% endblock %}"><i class="fa fa-database fa-fw"></i>  MQTT</a>
         <a href="{{ url_for('.notes')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-info fa-fw"></i>  {{_('Important Messages')}}</a>
         <a href="{{ url_for('.logging')}}" class="w3-bar-item w3-button w3-padding {% block menu4_class %}{% endblock %}"><i class="fa fa-file-export fa-fw"></i>  {{_('Log Files')}}</a>
+        {% if hassio is defined %}
+        <br>
+        <a href="/hassio/addon/{{addonname}}/config" target="_top" class="w3-bar-item w3-button w3-padding"><i class="fa fa-gear fa-fw"></i>  {{_('Add-on Config')}}</a>
+        <a href="/hassio/addon/{{addonname}}/logs" target="_top" class="w3-bar-item w3-button w3-padding"><i class="fa fa-file fa-fw"></i>  {{_('Add-on Log')}}</a>
+        {% endif %}
       </div>
     </nav>
   

app/tests/log/test.txt

@@ -1,19 +1,19 @@
 2025-04-30 00:01:23  INFO | root | Server "proxy - unknown" will be started
-2025-04-30 00:01:23  INFO | root | current dir: /Users/sallius/tsun/tsun-gen3-proxy
+2025-04-30 00:01:24  INFO | root | current dir: /Users/sallius/tsun/tsun-gen3-proxy
-2025-04-30 00:01:23  INFO | root | config_path: ./config/
+2025-04-30 00:01:25  INFO | root | config_path: ./config/
-2025-04-30 00:01:23  INFO | root | json_config: None
+2025-04-30 00:01:26  INFO | root | json_config: None
-2025-04-30 00:01:23  INFO | root | toml_config: None
+2025-04-30 00:01:27  INFO | root | toml_config: None
-2025-04-30 00:01:23  INFO | root | trans_path:  ../translations/
+2025-04-30 00:01:28  INFO | root | trans_path:  ../translations/
-2025-04-30 00:01:23  INFO | root | rel_urls:    False
+2025-04-30 00:01:29  INFO | root | rel_urls:    False
-2025-04-30 00:01:23  INFO | root | log_path:    ./log/
+2025-04-30 00:01:30  INFO | root | log_path:    ./log/
-2025-04-30 00:01:23  INFO | root | log_backups: unlimited
+2025-04-30 00:01:31  INFO | root | log_backups: unlimited
-2025-04-30 00:01:23  INFO | root | LOG_LVL    : None
+2025-04-30 00:01:32  INFO | root | LOG_LVL    : None
-2025-04-30 00:01:23  INFO | root | ******
+2025-04-30 00:01:33  INFO | root | ******
-2025-04-30 00:01:23  INFO | root | Read from /Users/sallius/tsun/tsun-gen3-proxy/app/src/cnf/default_config.toml => ok
+2025-04-30 00:01:34  INFO | root | Read from /Users/sallius/tsun/tsun-gen3-proxy/app/src/cnf/default_config.toml => ok
-2025-04-30 00:01:23  INFO | root | Read from environment => ok
+2025-04-30 00:01:35  INFO | root | Read from environment => ok
-2025-04-30 00:01:23  INFO | root | Read from ./config/config.json => n/a
+2025-04-30 00:01:36  INFO | root | Read from ./config/config.json => n/a
-2025-04-30 00:01:23  INFO | root | Read from ./config/config.toml => n/a
+2025-04-30 00:01:37  INFO | root | Read from ./config/config.toml => n/a
-2025-04-30 00:01:23  INFO | root | ******
+2025-04-30 00:01:38  INFO | root | ******
-2025-04-30 00:01:23  INFO | root | listen on port: 5005 for inverters
+2025-04-30 00:01:39  INFO | root | listen on port: 5005 for inverters
-2025-04-30 00:01:23  INFO | root | listen on port: 10000 for inverters
+2025-04-30 00:01:40  INFO | root | listen on port: 10000 for inverters
-2025-04-30 00:01:23  INFO | root | Start Quart
+2025-04-30 00:01:41  INFO | root | Start Quart

app/tests/test_server.py

@@ -191,6 +191,7 @@ class TestApp:
         """Test the ready route."""
 
         ProxyState.set_up(False)
+        app.testing = True
         client = app.test_client()
         response = await client.get('/-/ready')
         assert response.status_code == 503
@@ -211,6 +212,7 @@ class TestApp:
 
         with InverterBase(reader, writer, 'tsun', Talent):
             ProxyState.set_up(False)
+            app.testing = True
             client = app.test_client()
             response = await client.get('/-/healthy')
             assert response.status_code == 200
@@ -240,6 +242,7 @@ class TestApp:
 
         with caplog.at_level(logging.INFO) and InverterBase(reader, writer, 'tsun', Talent):
             ProxyState.set_up(False)
+            app.testing = True
             client = app.test_client()
             response = await client.get('/-/healthy')
             assert response.status_code == 200
@@ -271,6 +274,7 @@ class TestApp:
 
         with caplog.at_level(logging.INFO) and InverterBase(reader, writer, 'tsun', Talent):
             ProxyState.set_up(False)
+            app.testing = True
             client = app.test_client()
             response = await client.get('/-/healthy')
             assert response.status_code == 200

app/tests/test_solarman.py

@@ -1598,18 +1598,18 @@ async def test_msg_iterator(my_loop, config_tsun_inv1):
 @pytest.mark.asyncio
 async def test_proxy_counter(my_loop, config_tsun_inv1):
     m = SolarmanV5(None, ('test.local', 1234), ifc=AsyncIfcImpl(), server_side=True, client_mode=False)
-    assert m.new_data == {}
+    assert m.new_data == {'status': True}
     m.db.stat['proxy']['Unknown_Msg'] = 0
     Infos.new_stat_data['proxy'] =  False
 
     m.inc_counter('Unknown_Msg')
-    assert m.new_data == {}
+    assert m.new_data == {'status': True}
     assert Infos.new_stat_data == {'proxy': True}
     assert 1 == m.db.stat['proxy']['Unknown_Msg']
 
     Infos.new_stat_data['proxy'] =  False
     m.dec_counter('Unknown_Msg')
-    assert m.new_data == {}
+    assert m.new_data == {'status': True}
     assert Infos.new_stat_data == {'proxy': True}
     assert 0 == m.db.stat['proxy']['Unknown_Msg']
     m.close()

app/tests/test_talent.py

@@ -2070,7 +2070,7 @@ def test_proxy_counter():
     m.id_str = b"R170000000000001" 
     c = m.createClientStream(b'')
 
-    assert m.new_data == {}
+    assert m.new_data == {'status': True}
     m.db.stat['proxy']['Unknown_Msg'] = 0
     c.db.stat['proxy']['Unknown_Msg'] = 0
     Infos.new_stat_data['proxy'] =  False
@@ -2079,7 +2079,7 @@ def test_proxy_counter():
     m.close()
     m = MemoryStream(b'')
    
-    assert m.new_data == {}
+    assert m.new_data == {'status': True}
     assert Infos.new_stat_data == {'proxy': True}
     assert m.db.new_stat_data == {'proxy': True}
     assert c.db.new_stat_data == {'proxy': True}
@@ -2088,7 +2088,7 @@ def test_proxy_counter():
     Infos.new_stat_data['proxy'] =  False
 
     c.inc_counter('Unknown_Msg')
-    assert m.new_data == {}
+    assert m.new_data == {'status': True}
     assert Infos.new_stat_data == {'proxy': True}
     assert m.db.new_stat_data == {'proxy': True}
     assert c.db.new_stat_data == {'proxy': True}
@@ -2097,7 +2097,7 @@ def test_proxy_counter():
     Infos.new_stat_data['proxy'] =  False
 
     c.inc_counter('Modbus_Command')
-    assert m.new_data == {}
+    assert m.new_data == {'status': True}
     assert Infos.new_stat_data == {'proxy': True}
     assert m.db.new_stat_data == {'proxy': True}
     assert c.db.new_stat_data == {'proxy': True}
@@ -2106,7 +2106,7 @@ def test_proxy_counter():
 
     Infos.new_stat_data['proxy'] =  False
     m.dec_counter('Unknown_Msg')
-    assert m.new_data == {}
+    assert m.new_data == {'status': True}
     assert Infos.new_stat_data == {'proxy': True}
     assert 1 == m.db.stat['proxy']['Unknown_Msg']
     m.close()
@@ -2258,7 +2258,7 @@ def test_msg_modbus_rsp2(config_tsun_inv1, msg_modbus_rsp20):
     m.mb.req_pend = True
     m.mb.err = 0
 
-    assert m.db.db == {}
+    assert m.db.db == {'status': {'status': 'on'}}
     m.new_data['inverter'] = False
 
     m.read()         # read complete msg, and dispatch msg
@@ -2267,7 +2267,7 @@ def test_msg_modbus_rsp2(config_tsun_inv1, msg_modbus_rsp20):
     assert m.msg_count == 2
     assert m.ifc.fwd_fifo.get()==msg_modbus_rsp20
     assert m.ifc.tx_fifo.get()==b''
-    assert m.db.db == {'collector': {'Serial_Number': 'R170000000000001'}, 'inverter': {'Version': 'V5.1.09', 'Rated_Power': 300}, 'grid': {'Timestamp': m._utc(), 'Voltage': 225.9, 'Current': 0.41, 'Frequency': 49.99, 'Output_Power': 94.8}, 'env': {'Inverter_Temp': 22}, 'input': {'Timestamp': m._utc(), 'pv1': {'Voltage': 0.8, 'Current': 0.0, 'Power': 0.0}, 'pv2': {'Voltage': 34.5, 'Current': 2.89, 'Power': 99.8}, 'pv3': {'Voltage': 0.0, 'Current': 0.0, 'Power': 0.0}, 'pv4': {'Voltage': 0.0, 'Current': 0.0, 'Power': 0.0}}}
+    assert m.db.db == {'status': {'status': 'on'}, 'collector': {'Serial_Number': 'R170000000000001'}, 'inverter': {'Version': 'V5.1.09', 'Rated_Power': 300}, 'grid': {'Timestamp': m._utc(), 'Voltage': 225.9, 'Current': 0.41, 'Frequency': 49.99, 'Output_Power': 94.8}, 'env': {'Inverter_Temp': 22}, 'input': {'Timestamp': m._utc(), 'pv1': {'Voltage': 0.8, 'Current': 0.0, 'Power': 0.0}, 'pv2': {'Voltage': 34.5, 'Current': 2.89, 'Power': 99.8}, 'pv3': {'Voltage': 0.0, 'Current': 0.0, 'Power': 0.0}, 'pv4': {'Voltage': 0.0, 'Current': 0.0, 'Power': 0.0}}}
     assert m.db.get_db_value(Register.VERSION) == 'V5.1.09'
     assert m.db.get_db_value(Register.TS_GRID) == m._utc()
     assert m.new_data['inverter'] == True
@@ -2288,7 +2288,7 @@ def test_msg_modbus_rsp3(config_tsun_inv1, msg_modbus_rsp21):
     m.mb.req_pend = True
     m.mb.err = 0
 
-    assert m.db.db == {}
+    assert m.db.db == {'status': {'status': 'on'}}
     m.new_data['inverter'] = False
 
     m.read()         # read complete msg, and dispatch msg
@@ -2297,7 +2297,7 @@ def test_msg_modbus_rsp3(config_tsun_inv1, msg_modbus_rsp21):
     assert m.msg_count == 2
     assert m.ifc.fwd_fifo.get()==msg_modbus_rsp21
     assert m.ifc.tx_fifo.get()==b''
-    assert m.db.db == {'collector': {'Serial_Number': 'R170000000000001'}, 'inverter': {'Version': 'V5.1.0E', 'Rated_Power': 300}, 'grid': {'Timestamp': m._utc(), 'Voltage': 225.9, 'Current': 0.41, 'Frequency': 49.99, 'Output_Power': 94.8}, 'env': {'Inverter_Temp': 22}, 'input': {'Timestamp': m._utc(), 'pv1': {'Voltage': 0.8, 'Current': 0.0, 'Power': 0.0}, 'pv2': {'Voltage': 34.5, 'Current': 2.89, 'Power': 99.8}, 'pv3': {'Voltage': 0.0, 'Current': 0.0, 'Power': 0.0}, 'pv4': {'Voltage': 0.0, 'Current': 0.0, 'Power': 0.0}}}
+    assert m.db.db == {'status': {'status': 'on'}, 'collector': {'Serial_Number': 'R170000000000001'}, 'inverter': {'Version': 'V5.1.0E', 'Rated_Power': 300}, 'grid': {'Timestamp': m._utc(), 'Voltage': 225.9, 'Current': 0.41, 'Frequency': 49.99, 'Output_Power': 94.8}, 'env': {'Inverter_Temp': 22}, 'input': {'Timestamp': m._utc(), 'pv1': {'Voltage': 0.8, 'Current': 0.0, 'Power': 0.0}, 'pv2': {'Voltage': 34.5, 'Current': 2.89, 'Power': 99.8}, 'pv3': {'Voltage': 0.0, 'Current': 0.0, 'Power': 0.0}, 'pv4': {'Voltage': 0.0, 'Current': 0.0, 'Power': 0.0}}}
     assert m.db.get_db_value(Register.VERSION) == 'V5.1.0E'
     assert m.db.get_db_value(Register.TS_GRID) == m._utc()
     assert m.new_data['inverter'] == True

app/tests/test_web_route.py

@@ -1,22 +1,37 @@
 # test_with_pytest.py
 import pytest
-from server import app
+import logging
-from web import Web, web
+import os, errno
+import datetime
+from os import DirEntry, stat_result
+from quart import current_app
+from mock import patch
+
+from server import app as my_app
+from server import Server
+from web import web
 from async_stream import AsyncStreamClient
 from gen3plus.inverter_g3p import InverterG3P
+from web.log_handler import LogHandler
 from test_inverter_g3p import FakeReader, FakeWriter, config_conn
 from cnf.config import Config
-from mock import patch
 from proxy import Proxy
-import os, errno
+
-from os import DirEntry, stat_result
+
-import datetime
+class FakeServer(Server):
+    def __init__(self):
+        pass  # don't call the suoer(.__init__ for unit tests
+
 
 pytest_plugins = ('pytest_asyncio',)
+@pytest.fixture(scope="session")
+def app():
+    yield my_app
 
 @pytest.fixture(scope="session")
-def client():
+def client(app):
     app.secret_key = 'super secret key'
+    app.testing = True
     return app.test_client()
 
 @pytest.fixture
@@ -52,6 +67,7 @@ async def test_home(client):
     response = await client.get('/')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
+    assert b"<title>TSUN Proxy - Connections</title>" in await response.data
 
 @pytest.mark.asyncio
 async def test_page(client):
@@ -59,14 +75,17 @@ async def test_page(client):
     response = await client.get('/mqtt')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
+    assert b"<title>TSUN Proxy - MQTT Status</title>" in await response.data
+    assert b'fetch("/mqtt-fetch")' in await response.data
 
 @pytest.mark.asyncio
 async def test_rel_page(client):
-    """Test the mqtt route."""
+    """Test the mqtt route with relative paths."""
     web.build_relative_urls = True
     response = await client.get('/mqtt')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
+    assert b'fetch("./mqtt-fetch")' in await response.data
     web.build_relative_urls = False
 
 @pytest.mark.asyncio
@@ -75,6 +94,7 @@ async def test_notes(client):
     response = await client.get('/notes')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
+    assert b"<title>TSUN Proxy - Important Messages</title>" in await response.data
 
 @pytest.mark.asyncio
 async def test_logging(client):
@@ -82,6 +102,7 @@ async def test_logging(client):
     response = await client.get('/logging')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
+    assert b"<title>TSUN Proxy - Log Files</title>" in await response.data
 
 @pytest.mark.asyncio
 async def test_favicon96(client):
@@ -119,37 +140,37 @@ async def test_manifest(client):
     assert response.mimetype == 'application/manifest+json'
 
 @pytest.mark.asyncio
-async def test_data_fetch(create_inverter):
+async def test_data_fetch(client, create_inverter):
     """Test the data-fetch route."""
     _ = create_inverter
-    client = app.test_client()
     response = await client.get('/data-fetch')
     assert response.status_code == 200
 
     response = await client.get('/data-fetch')
     assert response.status_code == 200
+    assert b'<h5>Connections</h5>' in await response.data
 
 @pytest.mark.asyncio
-async def test_data_fetch1(create_inverter_server):
+async def test_data_fetch1(client, create_inverter_server):
     """Test the data-fetch route with server connection."""
     _ = create_inverter_server
-    client = app.test_client()
     response = await client.get('/data-fetch')
     assert response.status_code == 200
 
     response = await client.get('/data-fetch')
     assert response.status_code == 200
+    assert b'<h5>Connections</h5>' in await response.data
 
 @pytest.mark.asyncio
-async def test_data_fetch2(create_inverter_client):
+async def test_data_fetch2(client, create_inverter_client):
     """Test the data-fetch route with client connection."""
     _ = create_inverter_client
-    client = app.test_client()
     response = await client.get('/data-fetch')
     assert response.status_code == 200
 
     response = await client.get('/data-fetch')
     assert response.status_code == 200
+    assert b'<h5>Connections</h5>' in await response.data
 
 @pytest.mark.asyncio
 async def test_language_en(client):
@@ -159,21 +180,44 @@ async def test_language_en(client):
     assert response.content_language.pop() == 'en'
     assert response.location == '/index'
     assert response.mimetype == 'text/html'
+    assert b'<html lang=en' in await response.data
+    assert b'<title>Redirecting...</title>' in await response.data
 
     client.set_cookie('test', key='language', value='de')
-    response = await client.get('/mqtt')
+    response = await client.get('/')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
+    assert b'<html lang="en"' in await response.data
+    assert b'<title>TSUN Proxy - Connections</title>' in await response.data
 
 @pytest.mark.asyncio
 async def test_language_de(client):
     """Test the language/de route."""
+
     response = await client.get('/language/de', headers={'referer': '/'})
     assert response.status_code == 302
     assert response.content_language.pop() == 'de'
     assert response.location == '/'
     assert response.mimetype == 'text/html'
+    assert b'<html lang=en>' in await response.data
+    assert b'<title>Redirecting...</title>' in await response.data
 
+    client.set_cookie('test', key='language', value='en')
+    response = await client.get('/')
+    assert response.status_code == 200
+    assert response.mimetype == 'text/html'
+    assert b'<html lang="de"' in await response.data
+    # the following assert fails on github runner, since the translation to german fails
+    # assert b'<title>TSUN Proxy - Verbindungen</title>' in await response.data 
+
+    """Switch back to english"""
+    response = await client.get('/language/en', headers={'referer': '/index'})
+    assert response.status_code == 302
+    assert response.content_language.pop() == 'en'
+    assert response.location == '/index'
+    assert response.mimetype == 'text/html'
+    assert b'<html lang=en>' in await response.data
+    assert b'<title>Redirecting...</title>' in await response.data
 
 @pytest.mark.asyncio
 async def test_language_unknown(client):
@@ -182,6 +226,12 @@ async def test_language_unknown(client):
     assert response.status_code == 404
     assert response.mimetype == 'text/html'
 
+    client.set_cookie('test', key='language', value='en')
+    response = await client.get('/')
+    assert response.status_code == 200
+    assert response.mimetype == 'text/html'
+    assert b'<title>TSUN Proxy - Connections</title>' in await response.data
+
 
 @pytest.mark.asyncio
 async def test_mqtt_fetch(client, create_inverter):
@@ -191,15 +241,47 @@ async def test_mqtt_fetch(client, create_inverter):
 
     response = await client.get('/mqtt-fetch')
     assert response.status_code == 200
+    assert b'<h5>MQTT devices</h5>' in await response.data
 
 
 @pytest.mark.asyncio
 async def test_notes_fetch(client, config_conn):
     """Test the notes-fetch route."""
-    _ = create_inverter
+    _ = config_conn
 
+    s = FakeServer()
+    s.src_dir = 'app/src/'
+    s.init_logging_system()
+
+    # First clear log and test Well done message
+    logh = LogHandler()
+    logh.clear()
     response = await client.get('/notes-fetch')
     assert response.status_code == 200
+    assert b'<h2>Well done!</h2>' in await response.data
+
+    # Check info logs which must be ignored here
+    logging.info('config_info')
+    logh.flush()
+    response = await client.get('/notes-fetch')
+    assert response.status_code == 200
+    assert b'<h2>Well done!</h2>' in await response.data
+
+    # Check warning logs which must be added to the note list
+    logging.warning('config_warning')
+    logh.flush()
+    response = await client.get('/notes-fetch')
+    assert response.status_code == 200
+    assert b'WARNING' in await response.data
+    assert b'config_warning' in await response.data
+
+    # Check error logs which must be added to the note list
+    logging.error('config_err')
+    logh.flush()
+    response = await client.get('/notes-fetch')
+    assert response.status_code == 200
+    assert b'ERROR' in await response.data
+    assert b'config_err' in await response.data
 
 
 @pytest.mark.asyncio
@@ -229,6 +311,7 @@ async def test_file_fetch(client, config_conn, monkeypatch):
     monkeypatch.delattr(stat_result, "st_birthtime")
     response = await client.get('/file-fetch')
     assert response.status_code == 200
+    assert b'<h4>test.txt</h4>' in await response.data
 
 @pytest.mark.asyncio
 async def test_send_file(client, config_conn):
@@ -237,6 +320,7 @@ async def test_send_file(client, config_conn):
     assert Config.log_path == 'app/tests/log/'
     response = await client.get('/send-file/test.txt')
     assert response.status_code == 200
+    assert b'2025-04-30 00:01:23' in await response.data
 
 
 @pytest.mark.asyncio
@@ -291,3 +375,20 @@ async def test_del_file_err(client, config_conn, patch_os_remove_err):
     assert Config.log_path == 'app/tests/log/'
     response = await client.delete ('/del-file/test.txt')
     assert response.status_code == 404
+
+@pytest.mark.asyncio
+async def test_addon_links(client):
+    """Test links to HA add-on config/log in UI"""
+    with patch.dict(os.environ, {'SLUG': 'c676133d', 'HOSTNAME': 'c676133d-tsun-proxy'}):
+        response = await client.get('/')
+        assert response.status_code == 200
+        assert response.mimetype == 'text/html'
+        assert b'Add-on Config' in await response.data
+        assert b'href="/hassio/addon/c676133d_tsun-proxy/logs' in await response.data
+        assert b'href="/hassio/addon/c676133d_tsun-proxy/config' in await response.data
+
+    # check that links are not available if env vars SLUG and HOSTNAME are not defined (docker version)    
+    response = await client.get('/')
+    assert response.status_code == 200
+    assert response.mimetype == 'text/html'
+    assert b'Add-on Config' not in await response.data

app/translations/de/LC_MESSAGES/messages.po

@@ -75,6 +75,14 @@ msgstr "Wichtige Hinweise"
 msgid "Log Files"
 msgstr "Log Dateien"
 
+#: src/web/templates/base.html.j2:64
+msgid "Add-on Config"
+msgstr "Add-on Konfiguration"
+
+#: src/web/templates/base.html.j2:65
+msgid "Add-on Log"
+msgstr "Add-on Protokoll"
+
 #: src/web/templates/page_index.html.j2:3
 msgid "TSUN Proxy - Connections"
 msgstr "TSUN Proxy - Verbindungen"

ha_addons/docker-bake.hcl

@@ -29,27 +29,23 @@ target "_common" {
     "type =sbom,generator=docker/scout-sbom-indexer:latest"
   ]
   annotations = [
-    "index:io.hass.version=${VERSION}",
     "index:io.hass.type=addon",
-    "index:io.hass.arch=armhf|aarch64|i386|amd64",
+    "index:io.hass.arch=aarch64|amd64",
-    "index:org.opencontainers.image.title=TSUN-Proxy",
+    "index,manifest-descriptor:org.opencontainers.image.title=TSUN-Proxy",
-    "index:org.opencontainers.image.authors=Stefan Allius",
+    "index,manifest-descriptor:org.opencontainers.image.authors=Stefan Allius",
-    "index:org.opencontainers.image.created=${BUILD_DATE}",
+    "index,manifest-descriptor:org.opencontainers.image.created=${BUILD_DATE}",
-    "index:org.opencontainers.image.version=${VERSION}",
+    "index,manifest-descriptor:org.opencontainers.image.version=${VERSION}",
-    "index:org.opencontainers.image.revision=${BRANCH}",
+    "index,manifest-descriptor:org.opencontainers.image.description=${DESCRIPTION}",
-    "index:org.opencontainers.image.description=${DESCRIPTION}",
     "index:org.opencontainers.image.licenses=BSD-3-Clause",
-    "index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy/ha_addons/ha_addon"
+    "index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy/ha_addons/ha_addon",
   ]
   labels = {
-    "io.hass.version" = "${VERSION}"
     "io.hass.type" = "addon"
-    "io.hass.arch" = "armhf|aarch64|i386|amd64"
+    "io.hass.arch" = "aarch64|amd64"
     "org.opencontainers.image.title" = "TSUN-Proxy"
     "org.opencontainers.image.authors" = "Stefan Allius"
     "org.opencontainers.image.created" = "${BUILD_DATE}"
     "org.opencontainers.image.version" = "${VERSION}"
-    "org.opencontainers.image.revision" = "${BRANCH}"
     "org.opencontainers.image.description" = "${DESCRIPTION}"
     "org.opencontainers.image.licenses" = "BSD-3-Clause"
     "org.opencontainers.image.source" = "https://github.com/s-allius/tsun-gen3-proxy/ha_addonsha_addon"

ha_addons/ha_addon/Dockerfile

@@ -13,12 +13,12 @@
 # 1 Build Base Image #
 ######################
 
-ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.5"
+ARG BUILD_FROM="ghcr.io/hassio-addons/base:18.0.3"
 # hadolint ignore=DL3006
 FROM $BUILD_FROM AS base
 
 # Installiere Python, pip und virtuelle Umgebungstools
-RUN apk add --no-cache python3=3.12.10-r1 py3-pip=24.3.1-r0 && \
+RUN apk add --no-cache python3=3.12.11-r0 py3-pip=25.1.1-r0 && \
     python -m venv /opt/venv && \
     . /opt/venv/bin/activate
 

ha_addons/ha_addon/rootfs/run.sh

@@ -4,8 +4,10 @@ bashio::log.blue "-----------------------------------------------------------"
 bashio::log.blue "run.sh: info: setup Add-on environment"
 bashio::cache.flush_all
 MQTT_HOST=""
+SLUG=""
+HOSTNAME=""
 if bashio::supervisor.ping; then
-    bashio::log "run.sh: info: check for Home Assistant MQTT service"
+    bashio::log "run.sh: info: check Home Assistant bashio for config values"
     if bashio::services.available mqtt; then
         MQTT_HOST=$(bashio::services mqtt "host")
         MQTT_PORT=$(bashio::services mqtt "port")
@@ -14,15 +16,31 @@ if bashio::supervisor.ping; then
     else
         bashio::log.yellow "run.sh: info: Home Assistant MQTT service not available!"
     fi
+    SLUG=$(bashio::addon.repository)
+    HOSTNAME=$(bashio::addon.hostname)
 else
     bashio::log.red "run.sh: error: Home Assistant Supervisor API not available!"
 fi
 
+if [ -z "$SLUG" ]; then
+    bashio::log.yellow "run.sh: info: addon slug not found"
+else
+    bashio::log.green "run.sh: info: found addon slug: $SLUG"
+    export SLUG
+
+fi
+if [ -z "$HOSTNAME" ]; then
+    bashio::log.yellow "run.sh: info: addon hostname not found"
+else
+    bashio::log.green "run.sh: info: found addon hostname: $HOSTNAME"
+    export HOSTNAME
+fi
+
 # if a MQTT was/not found, drop a note
 if [ -z "$MQTT_HOST" ]; then
     bashio::log.yellow "run.sh: info: MQTT config not found"
 else
-    bashio::log.green "run.sh: info: MQTT config found"
+    bashio::log.green "run.sh: info: found MQTT config"
     export MQTT_HOST
     export MQTT_PORT
     export MQTT_USER

ha_addons/templates/config.jinja

@@ -10,8 +10,6 @@ init: false
 arch:
   - aarch64
   - amd64
-  - armhf
-  - armv7
 startup: services
 homeassistant_api: true
 map: