update changelog

check print output in test_save_and_restore
2025-05-10 19:27:56 +02:00 · 2025-05-10 19:25:25 +02:00 · 2025-05-08 00:23:44 +02:00 · 2025-05-08 00:22:49 +02:00 · 2025-05-07 23:42:55 +02:00 · 2025-05-07 23:37:24 +02:00
65 changed files with 2082 additions and 652 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,2 +1,3 @@
 [run]
 branch = True
+omit = app/src/web/templates/*.html.j2
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,7 @@ Doku/**
 .env
 .venv
 coverage.xml
+*.pot
+*.mo
+*.log
+*.log.*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [unreleased]

+- fix a lot of pytest-asyncio problems in the unit tests  
+- Cleanup startup code for Quart and the Proxy
+- Redirect the hypercorn traces to a separate log-file
+- Configure the dashboard trace handler by the logging.ini file
+- Dashboard: add Notes page and table for important messages
+- Dashboard: add Log-File page
+- Dashboard: add Connection page
 - add web UI to add-on
 - allow `Y00` serial numbers for GEN3PLUS devices

--- a/15
+++ b/15
@@ -1,12 +1,21 @@
-.PHONY: build clean addon-dev addon-debug addon-rc addon-rel debug dev preview rc rel check-docker-compose install
+.PHONY: build babel clean addon-dev addon-debug addon-rc addon-rel debug dev preview rc rel check-docker-compose install

-debug dev preview rc rel:
+babel:
 	$(MAKE) -C app $@

-clean build:
+build:
 	$(MAKE) -C ha_addons $@ 

+clean:
+	$(MAKE) -C app $@
+	$(MAKE) -C ha_addons $@ 
+
+debug dev preview rc rel:
+	$(MAKE) -C app babel
+	$(MAKE) -C app $@
+
 addon-dev addon-debug addon-rc addon-rel:
+	$(MAKE) -C app babel
 	$(MAKE) -C ha_addons $(patsubst addon-%,%,$@)

 check-docker-compose:
--- a/app/.dockerignore
+++ b/app/.dockerignore
@@ -2,4 +2,6 @@ tests/
 **/__pycache__
 *.pyc
 .DS_Store
-build.sh
+build.sh
+*.pot
+*.po
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -60,6 +60,7 @@ RUN python -m pip install --no-cache-dir --no-cache --no-index /root/wheels/* &&
 # copy the content of the local src and config directory to the working directory
 COPY --chmod=0700 entrypoint.sh /root/entrypoint.sh
 COPY src .
+COPY translations ./translations
 RUN echo ${VERSION} > /proxy-version.txt \
  && date > /build-date.txt
 EXPOSE 5005 8127 10000
--- a/app/Makefile
+++ b/app/Makefile
@@ -6,15 +6,23 @@ IMAGE = tsun-gen3-proxy


 # Folders
-SRC=.
+APP=.
+SRC=$(APP)/src
+# Folders for Babel translation
+BABEL_INPUT_JINJA=$(SRC)/web/templates
+BABEL_INPUT= $(foreach dir,$(BABEL_INPUT_JINJA),$(wildcard $(dir)/*.html.j2)) \
+
+BABEL_TRANSLATIONS=$(APP)/translations

 export BUILD_DATE := ${shell date -Iminutes}
-VERSION := $(shell cat $(SRC)/.version)
+VERSION := $(shell cat $(APP)/.version)
 export MAJOR  := $(shell echo $(VERSION) | cut -f1 -d.)

 PUBLIC_URL := $(shell echo $(PUBLIC_CONTAINER_REGISTRY) | cut -f1 -d/)
 PUBLIC_USER :=$(shell echo $(PUBLIC_CONTAINER_REGISTRY) | cut -f2 -d/)

+clean:
+	rm -f $(BABEL_TRANSLATIONS)/*.pot

 dev debug:
 	@echo version: $(VERSION)  build-date: $(BUILD_DATE)   image: $(PRIVAT_CONTAINER_REGISTRY)$(IMAGE)
@@ -39,5 +47,17 @@ preview rel:
 	export IMAGE=$(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) && \
 	docker buildx bake -f docker-bake.hcl $@

+babel: $(BABEL_TRANSLATIONS)/de/LC_MESSAGES/messages.mo $(BABEL_TRANSLATIONS)/de/LC_MESSAGES/messages.po $(BABEL_TRANSLATIONS)/messages.pot

-.PHONY: debug dev preview rc rel
+$(BABEL_TRANSLATIONS)/%.pot : $(SRC)/.babel.cfg $(BABEL_INPUT)
+	@mkdir -p $(@D)
+	@pybabel extract -F $< --project=$(IMAGE) --version=$(VERSION) -o $@ $(SRC)
+
+$(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po : $(BABEL_TRANSLATIONS)/messages.pot
+	@mkdir -p $(@D)
+	@pybabel update  --init-missing -i $< -d $(BABEL_TRANSLATIONS) -l $*
+
+$(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.mo : $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po
+	@pybabel compile  -d $(BABEL_TRANSLATIONS) -l $*
+
+.PHONY: babel clean debug dev preview rc rel
--- a/app/entrypoint.sh
+++ b/app/entrypoint.sh
@@ -23,7 +23,7 @@ if [ "$user" = '0' ]; then
    echo "######################################################"
    echo "#"

-    exec su-exec $SERVICE_NAME "$@"
+    exec su-exec $SERVICE_NAME "$@" -tr './translations/'
 else
    exec "$@"
 fi
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -1,4 +1,5 @@
-    aiomqtt==2.3.2
+    aiomqtt==2.4.0
    schema==0.7.7
    aiocron==2.1
-    quart==0.20
+    quart==0.20
+    quart-babel==1.0.7
--- a/app/src/.babel.cfg
+++ b/app/src/.babel.cfg
@@ -0,0 +1,3 @@
+[python: **.py]
+[jinja2: web/templates/**.html]
+[jinja2: web/templates/**.html.j2]
--- a/app/src/async_stream.py
+++ b/app/src/async_stream.py
@@ -327,8 +327,10 @@ class AsyncStreamServer(AsyncStream):
        logger.info(f'[{self.node_id}:{self.conn_no}] '
                    f'Accept connection from {self.r_addr}')
        Infos.inc_counter('Inverter_Cnt')
+        Infos.inc_counter('ServerMode_Cnt')
        await self.publish_outstanding_mqtt()
        await self.loop()
+        Infos.dec_counter('ServerMode_Cnt')
        Infos.dec_counter('Inverter_Cnt')
        await self.publish_outstanding_mqtt()
        logger.info(f'[{self.node_id}:{self.conn_no}] Server loop stopped for'
@@ -359,9 +361,11 @@ class AsyncStreamServer(AsyncStream):

 class AsyncStreamClient(AsyncStream):
    def __init__(self, reader: StreamReader, writer: StreamWriter,
-                 rstream: "StreamPtr", close_cb) -> None:
+                 rstream: "StreamPtr", close_cb,
+                 use_emu: bool = False) -> None:
        AsyncStream.__init__(self, reader, writer, rstream)
        self.close_cb = close_cb
+        self.emu_mode = use_emu

    async def disc(self) -> None:
        logging.debug('AsyncStreamClient.disc()')
@@ -376,8 +380,16 @@ class AsyncStreamClient(AsyncStream):
    async def client_loop(self, _: str) -> None:
        '''Loop for receiving messages from the TSUN cloud (client-side)'''
        Infos.inc_counter('Cloud_Conn_Cnt')
+        if self.emu_mode:
+            Infos.inc_counter('EmuMode_Cnt')
+        else:
+            Infos.inc_counter('ProxyMode_Cnt')
        await self.publish_outstanding_mqtt()
        await self.loop()
+        if self.emu_mode:
+            Infos.dec_counter('EmuMode_Cnt')
+        else:
+            Infos.dec_counter('ProxyMode_Cnt')
        Infos.dec_counter('Cloud_Conn_Cnt')
        await self.publish_outstanding_mqtt()
        logger.info(f'[{self.node_id}:{self.conn_no}] '
--- a/app/src/cnf/config.py
+++ b/app/src/cnf/config.py
@@ -162,12 +162,13 @@ class Config():
    )

    @classmethod
-    def init(cls, def_reader: ConfigIfc) -> None | str:
+    def init(cls, def_reader: ConfigIfc, log_path: str = '') -> None | str:
        '''Initialise the Proxy-Config

 Copy the internal default config file into the config directory
 and initialise the Config with the default configuration '''
        cls.err = None
+        cls.log_path = log_path
        cls.def_config = {}
        try:
            # make the default config transparaent by copying it
@@ -247,3 +248,7 @@ here. The default config reader is handled in the Config.init method'''
        '''Check if the member is the default value'''

        return cls.act_config.get(member) == cls.def_config.get(member)
+
+    @classmethod
+    def get_log_path(cls) -> str:
+        return cls.log_path
--- a/app/src/gen3/talent.py
+++ b/app/src/gen3/talent.py
@@ -100,7 +100,7 @@ class Talent(Message):

            if serial_no in inverters:
                inv = inverters[serial_no]
-                self._set_config_parms(inv)
+                self._set_config_parms(inv, serial_no)
                self.db.set_pv_module_details(inv)
                logger.debug(f'SerialNo {serial_no} allowed! area:{self.sug_area}')  # noqa: E501
            else:
--- a/app/src/gen3plus/solarman_v5.py
+++ b/app/src/gen3plus/solarman_v5.py
@@ -393,7 +393,7 @@ class SolarmanV5(SolarmanBase):

    def _set_config_parms(self, inv: dict, serial_no: str = ""):
        '''init connection with params from the configuration'''
-        super()._set_config_parms(inv)
+        super()._set_config_parms(inv, serial_no)
        snr = serial_no[:3]
        if '410' == snr:
            self.db.set_db_def_value(Register.EQUIPMENT_MODEL,
--- a/app/src/infos.py
+++ b/app/src/infos.py
@@ -838,7 +838,10 @@ class Infos:
    def inc_counter(cls, counter: str) -> None:
        '''inc proxy statistic counter'''
        db_dict = cls.stat['proxy']
-        db_dict[counter] += 1
+        try:
+            db_dict[counter] += 1
+        except Exception:
+            db_dict[counter] = 1
        cls.new_stat_data['proxy'] = True

    @classmethod
@@ -848,6 +851,15 @@ class Infos:
        db_dict[counter] -= 1
        cls.new_stat_data['proxy'] = True

+    @classmethod
+    def get_counter(cls, counter: str) -> int:
+        '''get proxy statistic counter'''
+        try:
+            db_dict = cls.stat['proxy']
+            return db_dict[counter]
+        except Exception:
+            return 0
+
    def ha_proxy_confs(self, ha_prfx: str, node_id: str, snr: str) \
            -> Generator[tuple[str, str, str, str], None, None]:
        '''Generator function yields json register struct for home-assistant
--- a/app/src/inverter_base.py
+++ b/app/src/inverter_base.py
@@ -28,11 +28,14 @@ class InverterBase(InverterIfc, Proxy):
        Proxy.__init__(self)
        self._registry.append(weakref.ref(self))
        self.addr = writer.get_extra_info('peername')
+        self.client_mode = client_mode
        self.config_id = config_id
        if remote_prot_class:
            self.prot_class = remote_prot_class
+            self.use_emulation = True
        else:
            self.prot_class = prot_class
+            self.use_emulation = False
        self.__ha_restarts = -1
        self.remote = StreamPtr(None)
        ifc = AsyncStreamServer(reader, writer,
@@ -117,7 +120,8 @@ class InverterBase(InverterIfc, Proxy):
                    Config.act_config[self.config_id]['enabled'] = False

            ifc = AsyncStreamClient(
-                reader, writer, self.local, self.__del_remote)
+                reader, writer, self.local,
+                self.__del_remote, self.use_emulation)

            self.remote.ifc = ifc
            if hasattr(stream, 'id_str'):
--- a/app/src/logging.ini
+++ b/app/src/logging.ini
@@ -1,16 +1,15 @@
 [loggers]
-keys=root,tracer,mesg,conn,data,mqtt,asyncio
+keys=root,tracer,mesg,conn,data,mqtt,asyncio,hypercorn_access,hypercorn_error

 [handlers]
-keys=console_handler,file_handler_name1,file_handler_name2
+keys=console_handler,file_handler_name1,file_handler_name2,file_handler_name3,dashboard

 [formatters]
 keys=console_formatter,file_formatter

 [logger_root]
 level=DEBUG
-handlers=console_handler,file_handler_name1
-
+handlers=console_handler,file_handler_name1,dashboard

 [logger_conn]
 level=DEBUG
@@ -20,13 +19,13 @@ qualname=conn

 [logger_mqtt]
 level=INFO
-handlers=console_handler,file_handler_name1
+handlers=console_handler,file_handler_name1,dashboard
 propagate=0
 qualname=mqtt

 [logger_asyncio]
 level=INFO
-handlers=console_handler,file_handler_name1
+handlers=console_handler,file_handler_name1,dashboard
 propagate=0
 qualname=asyncio

@@ -49,6 +48,18 @@ handlers=file_handler_name2
 propagate=0
 qualname=tracer

+[logger_hypercorn_access]
+level=INFO
+handlers=file_handler_name3
+propagate=0
+qualname=hypercorn.access
+
+[logger_hypercorn_error]
+level=INFO
+handlers=file_handler_name1,dashboard
+propagate=0
+qualname=hypercorn.error
+
 [handler_console_handler]
 class=StreamHandler
 level=DEBUG
@@ -66,6 +77,16 @@ level=NOTSET
 formatter=file_formatter
 args=(handlers.log_path + 'trace.log', when:='midnight', backupCount:=handlers.log_backups)

+[handler_file_handler_name3]
+class=handlers.TimedRotatingFileHandler
+level=NOTSET
+formatter=file_formatter
+args=(handlers.log_path + 'access.log', when:='midnight', backupCount:=handlers.log_backups)
+
+[handler_dashboard]
+level=WARNING
+class=web.log_handler.LogHandler
+
 [formatter_console_formatter]
 format=%(asctime)s %(levelname)5s | %(name)4s | %(message)s
 datefmt=%Y-%m-%d %H:%M:%S
--- a/app/src/messages.py
+++ b/app/src/messages.py
@@ -108,6 +108,7 @@ class Message(ProtocolIfc):
        self.header_len = 0
        self.data_len = 0
        self.unique_id = 0
+        self.inv_serial = ''
        self.sug_area = ''
        self.new_data = {}
        self.state = State.init
@@ -140,8 +141,9 @@ class Message(ProtocolIfc):
        # to our _recv_buffer
        return  # pragma: no cover

-    def _set_config_parms(self, inv: dict):
+    def _set_config_parms(self, inv: dict, inv_serial: str):
        '''init connection with params from the configuration'''
+        self.inv_serial = inv_serial
        self.node_id = inv['node_id']
        self.sug_area = inv['suggested_area']
        self.modbus_polling = inv['modbus_polling']
--- a/app/src/modbus_tcp.py
+++ b/app/src/modbus_tcp.py
@@ -28,10 +28,12 @@ class ModbusConn():
        logging.info(f'[{stream.node_id}:{stream.conn_no}] '
                     f'Connected to {self.addr}')
        Infos.inc_counter('Inverter_Cnt')
+        Infos.inc_counter('ClientMode_Cnt')
        await self.inverter.local.ifc.publish_outstanding_mqtt()
        return self.inverter

    async def __aexit__(self, exc_type, exc, tb):
+        Infos.dec_counter('ClientMode_Cnt')
        Infos.dec_counter('Inverter_Cnt')
        await self.inverter.local.ifc.publish_outstanding_mqtt()
        self.inverter.__exit__(exc_type, exc, tb)
--- a/app/src/mqtt.py
+++ b/app/src/mqtt.py
@@ -7,13 +7,18 @@ from modbus import Modbus
 from messages import Message
 from cnf.config import Config
 from singleton import Singleton
+from datetime import datetime
+

 logger_mqtt = logging.getLogger('mqtt')


 class Mqtt(metaclass=Singleton):
-    __client = None
+    __client: aiomqtt.Client = None
    __cb_mqtt_is_up = None
+    ctime = None
+    published: int = 0
+    received: int = 0

    def __init__(self, cb_mqtt_is_up):
        logger_mqtt.debug('MQTT: __init__')
@@ -52,6 +57,7 @@ class Mqtt(metaclass=Singleton):
                      | int | float | None = None) -> None:
        if self.__client:
            await self.__client.publish(topic, payload)
+            self.published += 1

    async def __loop(self) -> None:
        mqtt = Config.get('mqtt')
@@ -69,6 +75,9 @@ class Mqtt(metaclass=Singleton):
            try:
                async with self.__client:
                    logger_mqtt.info('MQTT broker connection established')
+                    self.ctime = datetime.now()
+                    self.published = 0
+                    self.received = 0

                    if self.__cb_mqtt_is_up:
                        await self.__cb_mqtt_is_up()
@@ -84,6 +93,8 @@ class Mqtt(metaclass=Singleton):
                        await self.dispatch_msg(message)

            except aiomqtt.MqttError:
+                self.ctime = None
+
                if Config.is_default('mqtt'):
                    logger_mqtt.info(
                        "MQTT is unconfigured; Check your config.toml!")
@@ -101,11 +112,14 @@ class Mqtt(metaclass=Singleton):
                return
            except Exception:
                # self.inc_counter('SW_Exception')   # fixme
+                self.ctime = None
                logger_mqtt.error(
                    f"Exception:\n"
                    f"{traceback.format_exc()}")

    async def dispatch_msg(self, message):
+        self.received += 1
+
        if message.topic.matches(self.ha_status_topic):
            status = message.payload.decode("UTF-8")
            logger_mqtt.info('Home-Assistant Status:'
--- a/app/src/server.py
+++ b/app/src/server.py
@@ -1,24 +1,161 @@
 import logging
-import asyncio
 import logging.handlers
+from logging import config  # noqa F401
+import asyncio
+from asyncio import StreamReader, StreamWriter
 import os
 import argparse
-from asyncio import StreamReader, StreamWriter
 from quart import Quart, Response
-from logging import config  # noqa F401
+
+from cnf.config import Config
+from cnf.config_read_env import ConfigReadEnv
+from cnf.config_read_toml import ConfigReadToml
+from cnf.config_read_json import ConfigReadJson
+from web import Web
+from web.wrapper import url_for
 from proxy import Proxy
 from inverter_ifc import InverterIfc
 from gen3.inverter_g3 import InverterG3
 from gen3plus.inverter_g3p import InverterG3P
 from scheduler import Schedule
-from cnf.config import Config
-from cnf.config_read_env import ConfigReadEnv
-from cnf.config_read_toml import ConfigReadToml
-from cnf.config_read_json import ConfigReadJson
-from web.routes import web_routes
+
 from modbus_tcp import ModbusTcp


+class Server():
+    serv_name = ''
+    version = ''
+    src_dir = ''
+
+    ####
+    # The following default values are used for the unit tests only, since
+    # `Server.parse_args()' will not be called during test setup.
+    # Ofcorse, we can call `Server.parse_args()' in a test case explicitly
+    # to overwrite this values
+    config_path = './config/'
+    json_config = ''
+    toml_config = ''
+    trans_path = '../translations/'
+    rel_urls = False
+    log_path = './log/'
+    log_backups = 0
+    log_level = None
+
+    def __init__(self, app, parse_args: bool):
+        ''' Applikation Setup
+
+    1. Read cli arguments
+    2. Init the logging system by the ini file
+    3. Log the config parms
+    4. Set the log-levels
+    5. Read the build the config for the app
+    '''
+        self.serv_name = os.getenv('SERVICE_NAME', 'proxy')
+        self.version = os.getenv('VERSION', 'unknown')
+        self.src_dir = os.path.dirname(__file__) + '/'
+        if parse_args:   # pragma: no cover
+            self.parse_args(None)
+        self.init_logging_system()
+        self.build_config()
+
+        @app.context_processor
+        def utility_processor():
+            return dict(version=self.version)
+
+    def parse_args(self, arg_list: list[str] | None):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('-c', '--config_path', type=str,
+                            default='./config/',
+                            help='set path for the configuration files')
+        parser.add_argument('-j', '--json_config', type=str,
+                            help='read user config from json-file')
+        parser.add_argument('-t', '--toml_config', type=str,
+                            help='read user config from toml-file')
+        parser.add_argument('-l', '--log_path', type=str,
+                            default='./log/',
+                            help='set path for the logging files')
+        parser.add_argument('-b', '--log_backups', type=int,
+                            default=0,
+                            help='set max number of daily log-files')
+        parser.add_argument('-tr', '--trans_path', type=str,
+                            default='../translations/',
+                            help='set path for the translations files')
+        parser.add_argument('-r', '--rel_urls', action="store_true",
+                            help='use relative dashboard urls')
+        args = parser.parse_args(arg_list)
+
+        self.config_path = args.config_path
+        self.json_config = args.json_config
+        self.toml_config = args.toml_config
+        self.trans_path = args.trans_path
+        self.rel_urls = args.rel_urls
+        self.log_path = args.log_path
+        self.log_backups = args.log_backups
+
+    def init_logging_system(self):
+        setattr(logging.handlers, "log_path", self.log_path)
+        setattr(logging.handlers, "log_backups", self.log_backups)
+        os.makedirs(self.log_path, exist_ok=True)
+
+        logging.config.fileConfig(self.src_dir + 'logging.ini')
+
+        logging.info(
+            f'Server "{self.serv_name} - {self.version}" will be started')
+        logging.info(f'current dir: {os.getcwd()}')
+        logging.info(f"config_path: {self.config_path}")
+        logging.info(f"json_config: {self.json_config}")
+        logging.info(f"toml_config: {self.toml_config}")
+        logging.info(f"trans_path:  {self.trans_path}")
+        logging.info(f"rel_urls:    {self.rel_urls}")
+        logging.info(f"log_path:    {self.log_path}")
+        if self.log_backups == 0:
+            logging.info("log_backups: unlimited")
+        else:
+            logging.info(f"log_backups: {self.log_backups} days")
+        self.log_level = self.get_log_level()
+        logging.info('******')
+        if self.log_level:
+            # set lowest-severity for 'root', 'msg', 'conn' and 'data' logger
+            logging.getLogger().setLevel(self.log_level)
+            logging.getLogger('msg').setLevel(self.log_level)
+            logging.getLogger('conn').setLevel(self.log_level)
+            logging.getLogger('data').setLevel(self.log_level)
+            logging.getLogger('tracer').setLevel(self.log_level)
+            logging.getLogger('asyncio').setLevel(self.log_level)
+            # logging.getLogger('mqtt').setLevel(self.log_level)
+
+    def build_config(self):
+        # read config file
+        Config.init(ConfigReadToml(self.src_dir + "cnf/default_config.toml"),
+                    log_path=self.log_path)
+        ConfigReadEnv()
+        ConfigReadJson(self.config_path + "config.json")
+        ConfigReadToml(self.config_path + "config.toml")
+        ConfigReadJson(self.json_config)
+        ConfigReadToml(self.toml_config)
+        config_err = Config.get_error()
+
+        if config_err is not None:
+            logging.info(f'config_err: {config_err}')
+            return
+
+        logging.info('******')
+
+    def get_log_level(self) -> int | None:
+        '''checks if LOG_LVL is set in the environment and returns the
+        corresponding logging.LOG_LEVEL'''
+        switch = {
+            'DEBUG': logging.DEBUG,
+            'WARN': logging.WARNING,
+            'INFO': logging.INFO,
+            'ERROR': logging.ERROR,
+        }
+        log_lvl = os.getenv('LOG_LVL', None)
+        logging.info(f"LOG_LVL    : {log_lvl}")
+
+        return switch.get(log_lvl, None)
+
+
 class ProxyState:
    _is_up = False

@@ -31,10 +168,48 @@ class ProxyState:
        ProxyState._is_up = value


+class HypercornLogHndl:
+    access_hndl = []
+    error_hndl = []
+    must_fix = False
+    HYPERC_ERR = 'hypercorn.error'
+    HYPERC_ACC = 'hypercorn.access'
+
+    @classmethod
+    def save(cls):
+        cls.access_hndl = logging.getLogger(
+            cls.HYPERC_ACC).handlers
+        cls.error_hndl = logging.getLogger(
+            cls.HYPERC_ERR).handlers
+        cls.must_fix = True
+
+    @classmethod
+    def restore(cls):
+        if not cls.must_fix:
+            return
+        cls.must_fix = False
+        access_hndl = logging.getLogger(
+            cls.HYPERC_ACC).handlers
+        if access_hndl != cls.access_hndl:
+            print(' * Fix hypercorn.access setting')
+            logging.getLogger(
+                cls.HYPERC_ACC).handlers = cls.access_hndl
+
+        error_hndl = logging.getLogger(
+            cls.HYPERC_ERR).handlers
+        if error_hndl != cls.error_hndl:
+            print(' * Fix hypercorn.error setting')
+            logging.getLogger(
+                cls.HYPERC_ERR).handlers = cls.error_hndl
+
+
 app = Quart(__name__,
            template_folder='web/templates',
            static_folder='web/static')
-app.register_blueprint(web_routes)
+app.secret_key = 'JKLdks.dajlKKKdladkflKwolafallsdfl'
+app.jinja_env.globals.update(url_for=url_for)
+server = Server(app, __name__ == "__main__")
+Web(app, server.trans_path, server.rel_urls)


@app.route('/-/ready')
@@ -64,13 +239,36 @@ async def healthy():
    return Response(status=200, response="I'm fine")


-async def handle_client(reader: StreamReader, writer: StreamWriter, inv_class):
+async def handle_client(reader: StreamReader,
+                        writer: StreamWriter,
+                        inv_class):    # pragma: no cover
    '''Handles a new incoming connection and starts an async loop'''

    with inv_class(reader, writer) as inv:
        await inv.local.ifc.server_loop()


+@app.before_serving
+async def startup_app():    # pragma: no cover
+    HypercornLogHndl.save()
+    loop = asyncio.get_event_loop()
+    Proxy.class_init()
+    Schedule.start()
+    ModbusTcp(loop)
+
+    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:
+                                              handle_client(r, w, i),
+                                              '0.0.0.0', port))
+    ProxyState.set_up(True)
+
+
+@app.before_request
+async def startup_request():
+    HypercornLogHndl.restore()
+
+
@app.after_serving
 async def handle_shutdown():   # pragma: no cover
    '''Close all TCP connections and stop the event loop'''
@@ -87,121 +285,15 @@ async def handle_shutdown():   # pragma: no cover

    logging.info('Proxy disconnecting done')

-    #
-    # now cancel all remaining (pending) tasks
-    #
-    for task in asyncio.all_tasks():
-        if task == asyncio.current_task():
-            continue
-        task.cancel()
-    logging.info('Proxy cancelling done')
-
    await Proxy.class_close(loop)


-def get_log_level() -> int | None:
-    '''checks if LOG_LVL is set in the environment and returns the
-    corresponding logging.LOG_LEVEL'''
-    switch = {
-        'DEBUG': logging.DEBUG,
-        'WARN': logging.WARNING,
-        'INFO': logging.INFO,
-        'ERROR': logging.ERROR,
-    }
-    log_level = os.getenv('LOG_LVL', None)
-    logging.info(f"LOG_LVL    : {log_level}")
+if __name__ == "__main__":  # pragma: no cover

-    return switch.get(log_level, None)
-
-
-def main():   # pragma: no cover
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-c', '--config_path', type=str,
-                        default='./config/',
-                        help='set path for the configuration files')
-    parser.add_argument('-j', '--json_config', type=str,
-                        help='read user config from json-file')
-    parser.add_argument('-t', '--toml_config', type=str,
-                        help='read user config from toml-file')
-    parser.add_argument('-l', '--log_path', type=str,
-                        default='./log/',
-                        help='set path for the logging files')
-    parser.add_argument('-b', '--log_backups', type=int,
-                        default=0,
-                        help='set max number of daily log-files')
-    args = parser.parse_args()
-    #
-    # Setup our daily, rotating logger
-    #
-    serv_name = os.getenv('SERVICE_NAME', 'proxy')
-    version = os.getenv('VERSION', 'unknown')
-
-    setattr(logging.handlers, "log_path", args.log_path)
-    setattr(logging.handlers, "log_backups", args.log_backups)
-    os.makedirs(args.log_path, exist_ok=True)
-
-    src_dir = os.path.dirname(__file__) + '/'
-    logging.config.fileConfig(src_dir + 'logging.ini')
-    logging.info(f'Server "{serv_name} - {version}" will be started')
-    logging.info(f'current dir: {os.getcwd()}')
-    logging.info(f"config_path: {args.config_path}")
-    logging.info(f"json_config: {args.json_config}")
-    logging.info(f"toml_config: {args.toml_config}")
-    logging.info(f"log_path:    {args.log_path}")
-    if args.log_backups == 0:
-        logging.info("log_backups: unlimited")
-    else:
-        logging.info(f"log_backups: {args.log_backups} days")
-    log_level = get_log_level()
-    logging.info('******')
-    if log_level:
-        # set lowest-severity for 'root', 'msg', 'conn' and 'data' logger
-        logging.getLogger().setLevel(log_level)
-        logging.getLogger('msg').setLevel(log_level)
-        logging.getLogger('conn').setLevel(log_level)
-        logging.getLogger('data').setLevel(log_level)
-        logging.getLogger('tracer').setLevel(log_level)
-        logging.getLogger('asyncio').setLevel(log_level)
-        # logging.getLogger('mqtt').setLevel(log_level)
-
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-
-    # read config file
-    Config.init(ConfigReadToml(src_dir + "cnf/default_config.toml"))
-    ConfigReadEnv()
-    ConfigReadJson(args.config_path + "config.json")
-    ConfigReadToml(args.config_path + "config.toml")
-    ConfigReadJson(args.json_config)
-    ConfigReadToml(args.toml_config)
-    config_err = Config.get_error()
-
-    if config_err is not None:
-        logging.info(f'config_err: {config_err}')
-        return
-
-    logging.info('******')
-
-    Proxy.class_init()
-    Schedule.start()
-    ModbusTcp(loop)
-
-    #
-    # Create tasks for our listening servers. These must be tasks! If we call
-    # start_server directly out of our main task, the eventloop will be blocked
-    # and we can't receive and handle the UNIX signals!
-    #
-    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:
-                                              handle_client(r, w, i),
-                                              '0.0.0.0', port))
-
-    loop.set_debug(log_level == logging.DEBUG)
    try:
-        ProxyState.set_up(True)
        logging.info("Start Quart")
-        app.run(host='0.0.0.0', port=8127, use_reloader=False, loop=loop)
+        app.run(host='0.0.0.0', port=8127, use_reloader=False,
+                debug=server.log_level == logging.DEBUG)
        logging.info("Quart stopped")

    except KeyboardInterrupt:
@@ -210,10 +302,4 @@ def main():   # pragma: no cover
        logging.info("Quart cancelled")

    finally:
-        logging.debug('Close event loop')
-        loop.close()
-        logging.info(f'Finally, exit Server "{serv_name}"')
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()
+        logging.info(f'Finally, exit Server "{server.serv_name}"')
--- a/app/src/utils/init.py
+++ b/app/src/utils/init.py
@@ -0,0 +1,25 @@
+import mimetypes
+from importlib import import_module
+from pathlib import Path
+from collections.abc import Callable
+
+
+class SourceFileLoader:
+    """ Represents a SouceFileLoader (__loader__)"""
+    name: str
+    get_resource_reader: Callable
+
+
+def load_modules(loader: SourceFileLoader):
+    """Load the entire modules from a SourceFileLoader (__loader__)"""
+    pkg = loader.name
+    for load in loader.get_resource_reader().contents():
+
+        if "python" not in str(mimetypes.guess_type(load)[0]):
+            continue
+
+        mod = Path(load).stem
+        if mod == "__init__":
+            continue
+
+        import_module(pkg + "." + mod, pkg)
--- a/app/src/web/init.py
+++ b/app/src/web/init.py
@@ -0,0 +1,32 @@
+'''Quart blueprint for the proxy webserver with the dashboard
+
+Usage:
+    app = Quart(__name__, ...)
+    Web(app)
+'''
+from quart import Quart, Blueprint
+from quart_babel import Babel
+from utils import load_modules
+
+web = Blueprint('web', __name__)
+
+load_modules(__loader__)
+
+
+class Web:
+    '''Helper Class to register the Blueprint at Quart and
+    initializing Babel'''
+    def __init__(self,
+                 app: Quart,
+                 translation_directories: str | list[str],
+                 rel_urls: bool):
+        web.build_relative_urls = rel_urls
+        app.register_blueprint(web)
+
+        from .i18n import get_locale, get_tz
+        global babel
+        babel = Babel(
+            app,
+            locale_selector=get_locale,
+            timezone_selector=get_tz,
+            default_translation_directories=translation_directories)
--- a/app/src/web/conn_table.py
+++ b/app/src/web/conn_table.py
@@ -0,0 +1,87 @@
+from inverter_base import InverterBase
+from quart import render_template
+from quart_babel import format_datetime, _
+from infos import Infos
+
+from . import web
+from .log_handler import LogHandler
+
+
+def _get_device_icon(client_mode: bool):
+    '''returns the icon for the device conntection'''
+    if client_mode:
+        return 'fa-download fa-rotate-180'
+
+    return 'fa-upload fa-rotate-180'
+
+
+def _get_cloud_icon(emu_mode: bool):
+    '''returns the icon for the cloud conntection'''
+    if emu_mode:
+        return 'fa-cloud-arrow-up-alt'
+
+    return 'fa-cloud'
+
+
+def _get_row(inv: InverterBase):
+    '''build one row for the connection table'''
+    client_mode = inv.client_mode
+    inv_serial = inv.local.stream.inv_serial
+    icon1 = _get_device_icon(client_mode)
+    ip1, port1 = inv.addr
+    icon2 = ''
+    ip2 = '--'
+    port2 = '--'
+
+    if inv.remote.ifc:
+        ip2, port2 = inv.remote.ifc.r_addr
+        icon2 = _get_cloud_icon(client_mode)
+
+    row = []
+    row.append(f'<i class="fa {icon1}"></i> {ip1}:{port1}')
+    row.append(f'<i class="fa {icon1}"></i> {ip1}')
+    row.append(inv_serial)
+    row.append(f'<i class="fa {icon2}"></i> {ip2}:{port2}')
+    row.append(f'<i class="fa {icon2}"></i> {ip2}')
+    return row
+
+
+def get_table_data():
+    '''build the connection table'''
+    table = {
+        "headline": _('Connections'),
+        "col_classes": [
+            "w3-hide-small w3-hide-medium", "w3-hide-large",
+            "",
+            "w3-hide-small w3-hide-medium", "w3-hide-large",
+        ],
+        "thead": [[
+            _('Device-IP:Port'), _('Device-IP'),
+            _("Serial-No"),
+            _("Cloud-IP:Port"), _("Cloud-IP")
+        ]],
+        "tbody": []
+    }
+    for inverter in InverterBase:
+        table['tbody'].append(_get_row(inverter))
+
+    return table
+
+
+@web.route('/data-fetch')
+async def data_fetch():
+    data = {
+        "update-time": format_datetime(format="medium"),
+        "server-cnt": f"<h3>{Infos.get_counter('ServerMode_Cnt')}</h3>",
+        "client-cnt": f"<h3>{Infos.get_counter('ClientMode_Cnt')}</h3>",
+        "proxy-cnt": f"<h3>{Infos.get_counter('ProxyMode_Cnt')}</h3>",
+        "emulation-cnt": f"<h3>{Infos.get_counter('EmuMode_Cnt')}</h3>",
+    }
+    data["conn-table"] = await render_template('templ_table.html.j2',
+                                               table=get_table_data())
+
+    data["notes-list"] = await render_template(
+        'templ_notes_list.html.j2',
+        notes=LogHandler().get_buffer(3),
+        hide_if_empty=True)
+    return data
--- a/app/src/web/favicon.py
+++ b/app/src/web/favicon.py
@@ -1,48 +1,37 @@
-from quart import Blueprint
-from quart import render_template
-from quart import send_from_directory
 import os

-web_routes = Blueprint('web_routes', __name__)
+from quart import send_from_directory
+
+from . import web


 async def get_icon(file: str, mime: str = 'image/png'):
    return await send_from_directory(
-        os.path.join(web_routes.root_path, 'static/images'),
+        os.path.join(web.root_path, 'static/images'),
        file,
        mimetype=mime)


-@web_routes.route('/')
-async def index():
-    return await render_template('index.html')
-
-
-@web_routes.route('/page')
-async def empty():
-    return await render_template('empty.html')
-
-
-@web_routes.route('/favicon-96x96.png')
+@web.route('/favicon-96x96.png')
 async def favicon():
    return await get_icon('favicon-96x96.png')


-@web_routes.route('/favicon.ico')
+@web.route('/favicon.ico')
 async def favicon_ico():
    return await get_icon('favicon.ico', 'image/x-icon')


-@web_routes.route('/favicon.svg')
+@web.route('/favicon.svg')
 async def favicon_svg():
    return await get_icon('favicon.svg', 'image/svg+xml')


-@web_routes.route('/apple-touch-icon.png')
+@web.route('/apple-touch-icon.png')
 async def apple_touch():
    return await get_icon('apple-touch-icon.png')


-@web_routes.route('/site.webmanifest')
+@web.route('/site.webmanifest')
 async def webmanifest():
    return await get_icon('site.webmanifest', 'application/manifest+json')
--- a/app/src/web/i18n.py
+++ b/app/src/web/i18n.py
@@ -0,0 +1,45 @@
+from quart import request, session, redirect, abort
+from quart_babel.locale import get_locale as babel_get_locale
+
+from . import web
+
+LANGUAGES = {
+    'en': 'English',
+    'de': 'Deutsch',
+    # 'fr': 'Français'
+}
+
+
+def get_locale():
+    try:
+        language = session['language']
+    except KeyError:
+        language = None
+    if language is not None:
+        return language
+
+    # check how to get the locale form for the add-on - hass.selectedLanguage
+    # logging.info("get_locale(%s)", request.accept_languages)
+    return request.accept_languages.best_match(LANGUAGES.keys())
+
+
+def get_tz():
+    return 'CET'
+
+
+@web.context_processor
+def utility_processor():
+    return dict(lang=babel_get_locale(),
+                lang_str=LANGUAGES.get(str(babel_get_locale()), "English"),
+                languages=LANGUAGES)
+
+
+@web.route('/language/<language>')
+async def set_language(language=None):
+    if language in LANGUAGES:
+        session['language'] = language
+
+        rsp = redirect(request.referrer if request.referrer else '../#')
+        rsp.content_language = language
+        return rsp
+    return abort(404)
--- a/app/src/web/log_files.py
+++ b/app/src/web/log_files.py
@@ -0,0 +1,60 @@
+from quart import render_template
+from quart_babel import format_datetime, format_decimal
+from quart.helpers import send_from_directory
+from werkzeug.utils import secure_filename
+from cnf.config import Config
+import os
+
+from . import web
+
+
+def _get_file(file):
+    '''build one row for the connection table'''
+    entry = {}
+    entry['name'] = file.name
+    stat = file.stat()
+    entry['size'] = format_decimal(stat.st_size)
+    entry['date'] = stat.st_mtime
+    entry['created'] = format_datetime(stat.st_ctime, format="short")
+    entry['modified'] = format_datetime(stat.st_mtime, format="short")
+    return entry
+
+
+def get_list_data():
+    '''build the connection table'''
+    file_list = []
+    with os.scandir(Config.get_log_path()) as it:
+        for entry in it:
+            if entry.is_file():
+                file_list.append(_get_file(entry))
+
+    file_list.sort(key=lambda x: x['date'], reverse=True)
+    return file_list
+
+
+@web.route('/file-fetch')
+async def file_fetch():
+    data = {
+        "update-time": format_datetime(format="medium"),
+    }
+    data["file-list"] = await render_template('templ_log_files_list.html.j2',
+                                              dir_list=get_list_data())
+
+    return data
+
+
+@web.route('/send-file/<file>')
+async def send(file):
+    return await send_from_directory(
+        directory=Config.get_log_path(),
+        file_name=secure_filename(file),
+        as_attachment=True)
+
+
+@web.route('/del-file/<file>', methods=['DELETE'])
+async def delete(file):
+    try:
+        os.remove(Config.get_log_path() + secure_filename(file))
+    except OSError:
+        return 'File not found', 404
+    return '', 204
--- a/app/src/web/log_handler.py
+++ b/app/src/web/log_handler.py
@@ -0,0 +1,24 @@
+from logging import Handler
+from logging import LogRecord
+import logging
+from collections import deque
+
+from singleton import Singleton
+
+
+class LogHandler(Handler, metaclass=Singleton):
+    def __init__(self, capacity=64):
+        super().__init__(logging.WARNING)
+        self.capacity = capacity
+        self.buffer = deque(maxlen=capacity)
+
+    def emit(self, record: LogRecord):
+        self.buffer.append({
+            'ctime': record.created,
+            'level': record.levelno,
+            'lname': record.levelname,
+            'msg': record.getMessage()
+        })
+
+    def get_buffer(self, elms=0) -> list:
+        return list(self.buffer)[-elms:]
--- a/app/src/web/mqtt_table.py
+++ b/app/src/web/mqtt_table.py
@@ -0,0 +1,64 @@
+from inverter_base import InverterBase
+from quart import render_template
+from quart_babel import format_datetime, _
+from mqtt import Mqtt
+
+from . import web
+from .log_handler import LogHandler
+
+
+def _get_row(inv: InverterBase):
+    '''build one row for the connection table'''
+    entity_prfx = inv.entity_prfx
+    inv_serial = inv.local.stream.inv_serial
+    node_id = inv.local.stream.node_id
+    sug_area = inv.local.stream.sug_area
+
+    row = []
+    row.append(inv_serial)
+    row.append(entity_prfx+node_id)
+    row.append(sug_area)
+    return row
+
+
+def get_table_data():
+    '''build the connection table'''
+    table = {
+        "headline": _('MQTT devices'),
+        "col_classes": [
+            "",
+            "",
+            "",
+        ],
+        "thead": [[
+            _("Serial-No"),
+            _('Node-ID'),
+            _('HA-Area'),
+        ]],
+        "tbody": []
+    }
+    for inverter in InverterBase:
+        table['tbody'].append(_get_row(inverter))
+
+    return table
+
+
+@web.route('/mqtt-fetch')
+async def mqtt_fetch():
+    mqtt = Mqtt(None)
+    ctime = format_datetime(dt=mqtt.ctime, format='short')
+    data = {
+        "update-time": format_datetime(format="medium"),
+        "mqtt-ctime": f"<h3>{ctime}</h3>",
+        "mqtt-tx": f"<h3>{mqtt.published}</h3>",
+        "mqtt-rx": f"<h3>{mqtt.received}</h3>",
+    }
+    data["mqtt-table"] = await render_template('templ_table.html.j2',
+                                               table=get_table_data())
+
+    data["notes-list"] = await render_template(
+        'templ_notes_list.html.j2',
+        notes=LogHandler().get_buffer(3),
+        hide_if_empty=True)
+
+    return data
--- a/app/src/web/notes_list.py
+++ b/app/src/web/notes_list.py
@@ -0,0 +1,19 @@
+from quart import render_template
+from quart_babel import format_datetime
+
+from . import web
+from .log_handler import LogHandler
+
+
+@web.route('/notes-fetch')
+async def notes_fetch():
+    data = {
+        "update-time": format_datetime(format="medium"),
+    }
+
+    data["notes-list"] = await render_template(
+        'templ_notes_list.html.j2',
+        notes=LogHandler().get_buffer(),
+        hide_if_empty=False)
+
+    return data
--- a/app/src/web/pages.py
+++ b/app/src/web/pages.py
@@ -0,0 +1,32 @@
+from quart import render_template
+from .wrapper import url_for
+
+from . import web
+
+
+@web.route('/')
+async def index():
+    return await render_template(
+        'page_index.html.j2',
+        fetch_url=url_for('.data_fetch'))
+
+
+@web.route('/mqtt')
+async def mqtt():
+    return await render_template(
+        'page_mqtt.html.j2',
+        fetch_url=url_for('.mqtt_fetch'))
+
+
+@web.route('/notes')
+async def notes():
+    return await render_template(
+        'page_notes.html.j2',
+        fetch_url=url_for('.notes_fetch'))
+
+
+@web.route('/logging')
+async def logging():
+    return await render_template(
+        'page_logging.html.j2',
+        fetch_url=url_for('.file_fetch'))
--- a/app/src/web/static/font-awesome/css/all.min.css
+++ b/app/src/web/static/font-awesome/css/all.min.css
--- a/app/src/web/static/images/favicon.svg
+++ b/app/src/web/static/images/favicon.svg
--- a/app/src/web/static/images/site.webmanifest
+++ b/app/src/web/static/images/site.webmanifest
@@ -1,6 +1,6 @@
 {
  "name": "TSUN-Proxy",
-  "short_name": "TsunProxy",
+  "short_name": "Proxy",
  "icons": [
    {
      "src": "/web-app-manifest-192x192.png",
--- a/app/src/web/templates/base.html
+++ b/app/src/web/templates/base.html
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>{% block title %}{% endblock title %}</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href=".{{ url_for('static', filename= 'css/style.css') }}">
-    <link rel="stylesheet" href=".{{ url_for('static', filename= 'font-awesome/css/all.min.css') }}">
-    <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <link rel="shortcut icon" href="/favicon.ico" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <style>
-        @font-face {
-            font-family: Roboto;
-            src: url(".{{ url_for('static', filename= 'font/roboto-light.ttf') }}");
-        }
-        html,body,h1,h2,h3,h4,h5 {font-family: Roboto, sans-serif}
-    </style>
-  </head>
-  <body class="w3-light-grey">
-  
-    <!-- Top container -->
-    <div class="w3-bar w3-top w3-black w3-large" style="z-index:4">
-      <button class="w3-bar-item w3-button w3-hide-large w3-hover-none w3-hover-text-light-grey" onclick="w3_open();"><i class="fa fa-bars"></i>  Menu</button>
-      <span class="w3-bar-item w3-right">Logo</span>
-    </div>
-  
-    <!-- Sidebar/menu -->
-    <nav class="w3-sidebar w3-collapse w3-white w3-animate-left" style="z-index:3;width:250px;" id="mySidebar"><br>
-      <div class="w3-container w3-row">
-        <div class="w3-col s4">
-          <img src=".{{ url_for('static', filename= 'images/favicon.svg') }}" alt="" class="w3-circle w3-margin-right" style="width:60px">
-        </div>
-        <div class="w3-col s8 w3-bar">
-          <h3>TSUN-Proxy</h3><br>
-        </div>
-      </div>
-      <hr>
-      <div class="w3-container">
-        <h5>Dashboard</h5>
-      </div>
-      <div class="w3-bar-block">
-        <button href="#" class="w3-bar-item w3-button w3-padding-16 w3-hide-large w3-dark-grey w3-hover-black" onclick="w3_close()" title="close menu"><i class="fa fa-remove fa-fw"></i>  Close Menu</button>
-        <a href=".{{ url_for('web_routes.index')}}" class="w3-bar-item w3-button w3-padding {% block menu1_class %}{% endblock %}"><i class="fa fa-users fa-fw"></i>  Overview</a>
-        <a href=".{{ url_for('web_routes.empty')}}" class="w3-bar-item w3-button w3-padding {% block menu2_class %}{% endblock %}"><i class="fa fa-eye fa-fw"></i>  Views</a>
-        <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-users fa-fw {% block menu3_class %}{% endblock %}"></i>  Traffic</a>
-        <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-bullseye fa-fw {% block menu4_class %}{% endblock %}"></i>  Geo</a>
-        <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-gem fa-fw {% block menu5_class %}{% endblock %}"></i>  Orders</a>
-        <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-bell fa-fw {% block menu6_class %}{% endblock %}"></i>  News</a>
-        <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-university fa-fw {% block menu7_class %}{% endblock %}"></i>  General</a>
-        <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-history fa-fw {% block menu8_class %}{% endblock %}"></i>  History</a>
-        <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-cog fa-fw {% block menu9_class %}{% endblock %}"></i>  Settings</a><br><br>
-      </div>
-    </nav>
-  
-  
-    <!-- Overlay effect when opening sidebar on small screens -->
-    <button class="w3-overlay w3-hide-large w3-animate-opacity" onclick="w3_close()" style="cursor:pointer" title="close side menu" id="myOverlay"></button>
-  
-    <!-- !PAGE CONTENT! -->
-    <div class="w3-main" style="margin-left:250px;margin-top:43px;">
-    
-      <!-- Header -->
-      {% block header %} 
-      <header class="w3-container" style="padding-top:22px">
-        <h5><b>{% block headline %}{% endblock headline %}</b></h5>
-      </header>
-      {% endblock header %}
-
-      {% block content %} {% endblock content%}
-    
-      <!-- Footer -->
-      {% block footer %}
-      <footer class="w3-container w3-padding-16 w3-light-grey">
-        <h4>FOOTER</h4>
-        <p>Powered by <a href="https://www.w3schools.com/w3css/default.asp" target="_blank">w3.css</a></p>
-      </footer>
-      {% endblock footer %}
-    
-      <!-- End page content -->
-    </div>
-
-    {% block trailer %} 
-    <script>
-      // Get the Sidebar
-      var mySidebar = document.getElementById("mySidebar");
-      
-      // Get the DIV with overlay effect
-      var overlayBg = document.getElementById("myOverlay");
-      
-      // Toggle between showing and hiding the sidebar, and add overlay effect
-      function w3_open() {
-        if (mySidebar.style.display === 'block') {
-          mySidebar.style.display = 'none';
-          overlayBg.style.display = "none";
-        } else {
-          mySidebar.style.display = 'block';
-          overlayBg.style.display = "block";
-        }
-      }
-      
-      // Close the sidebar with the close button
-      function w3_close() {
-        mySidebar.style.display = "none";
-        overlayBg.style.display = "none";
-      }
-    </script>
-    {% endblock trailer %}
-  
-  </body>
-</html>
--- a/app/src/web/templates/base.html.j2
+++ b/app/src/web/templates/base.html.j2
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html lang="{{lang}}" >
+  <head>
+    <title>{% block title %}{% endblock title %}</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="{{ url_for('static', filename= 'css/style.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename= 'font-awesome/css/all.min.css') }}">
+    <link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <link rel="shortcut icon" href="/favicon.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="manifest" href="/site.webmanifest" />
+    <style>
+        @font-face {
+            font-family: Roboto;
+            src: url("{{ url_for('static', filename= 'font/roboto-light.ttf') }}");
+        }
+        html,body,h1,h2,h3,h4,h5 {font-family: Roboto, sans-serif}
+    </style>
+  </head>
+  <body class="w3-light-grey">
+  
+    <!-- Top container -->
+    <div class="w3-bar w3-dark-grey w3-large" style="z-index:4">
+      <button class="w3-bar-item w3-button w3-hide-large" onclick="w3_open();"><i class="fa fa-bars"></i>  Menu</button>
+      <div class="w3-dropdown-hover w3-right">
+        <button class="w3-button">{{lang_str}}</button>
+        <div class="w3-dropdown-content w3-bar-block w3-card-4" style="right:0">
+          {% for language in languages %}
+          <a href="{{url_for('web.set_language', language=language)}}" class="w3-bar-item w3-button">{{languages[language]}}</a>
+          {% endfor %}
+        </div>
+      </div>
+
+      {% if fetch_url is defined %}
+      <button class="w3-bar-item w3-button w3-right" onclick="fetch_data();"><span class="w3-hide-small">{{_('Updated:')}}  </span><span id="update-time"></span>  <i class="w3-hover fa fa-rotate-right w3-medium"></i></button>
+      {% endif %}
+      <div class="w3-clear"></div>
+    </div>
+  
+    <!-- Sidebar/menu -->
+    <nav class="w3-sidebar w3-collapse w3-white" style="z-index:3;width:250px;" id="mySidebar"><br>
+      <div class="w3-container w3-cell-row">
+        <div class="w3-cell w3-cell-middle">
+          <img src="{{url_for('static', filename= 'images/favicon.svg') }}" alt="" class="w3-circle w3-margin-right" style="width:60px">
+        </div>
+        <div class="w3-cell">
+          <span><b class="w3-xlarge">TSUN-Proxy</b><br>{{_('Version:')}} {{version}}</span>
+        </div>
+      </div>
+      <hr>
+      <div class="w3-container">
+        <h5>Dashboard</h5>
+      </div>
+      <div class="w3-bar-block">
+        <button href="#" class="w3-bar-item w3-button w3-padding-16 w3-hide-large w3-dark-grey w3-hover-black" onclick="w3_close()" title="close menu"><i class="fa fa-remove fa-fw"></i>  Close Menu</button>
+        <a href="{{ url_for('.index')}}" class="w3-bar-item w3-button w3-padding {% block menu1_class %}{% endblock %}"><i class="fa fa-network-wired fa-fw"></i>  {{_('Connections')}}</a>
+        <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-exclamation-triangle 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>
+      </div>
+    </nav>
+  
+  
+    <!-- Overlay effect when opening sidebar on small screens -->
+    <button class="w3-overlay w3-hide-large w3-animate-opacity" onclick="w3_close()" style="cursor:pointer" title="close side menu" id="myOverlay"></button>
+    
+    <!-- !PAGE CONTENT! -->
+    <div class="w3-main" style="margin-left:250px;margin-top:43px;">
+    
+      <!-- Header -->
+      {% block header %} 
+      <header class="w3-container" style="padding-top:22px">
+        <h5><b>{% block headline %}{% endblock headline %}</b></h5>
+      </header>
+      {% endblock header %}
+
+      {% block content %} {% endblock content%}
+    
+      <!-- Footer -->
+      {% block footer %}
+      <footer class="w3-container w3-padding-16 w3-light-grey">
+        <h4>FOOTER</h4>
+        <p>Powered by <a href="https://www.w3schools.com/w3css/default.asp" target="_blank">w3.css</a></p>
+      </footer>
+      {% endblock footer %}
+    
+      <!-- End page content -->
+    </div>
+
+    {% block trailer %} 
+    <script>
+      // Get the Sidebar
+      var mySidebar = document.getElementById("mySidebar");
+      
+      // Get the DIV with overlay effect
+      var overlayBg = document.getElementById("myOverlay");
+      
+      // Toggle between showing and hiding the sidebar, and add overlay effect
+      function w3_open() {
+        if (mySidebar.style.display === 'block') {
+          mySidebar.style.display = 'none';
+          overlayBg.style.display = "none";
+        } else {
+          mySidebar.style.display = 'block';
+          overlayBg.style.display = "block";
+        }
+      }
+      
+      // Close the sidebar with the close button
+      function w3_close() {
+        mySidebar.style.display = "none";
+        overlayBg.style.display = "none";
+      }
+      {% if fetch_url is defined %}
+      function fetch_data() {
+        fetch("{{fetch_url}}")
+          .then(response => response.json())
+          .then(function (data) {
+            Object.keys(data).forEach(key => {
+              //console.log(`${key}: ${data[key]}`);
+              try {
+                elm = document.getElementById(key)
+                elm.innerHTML = data[key]
+              }
+              catch(err) {
+                console.log('error: ' + err + ' (for key: ' + key + ')');
+              }
+            });
+          })
+          .catch(function (err) {
+            console.log('error: ' + err);
+          });
+      }
+
+      window.addEventListener('load', function () {
+        // Your document is loaded.
+        var fetchInterval = 5000; // 5 seconds.
+        fetch_data()
+        // Invoke the request every 5 seconds.
+        setInterval(fetch_data, fetchInterval);
+      });
+      {% endif %}
+
+    </script>
+    {% endblock trailer %}
+  
+  </body>
+</html>
--- a/app/src/web/templates/empty.html
+++ b/app/src/web/templates/empty.html
@@ -1,9 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %} TSUN Proxy - View {% endblock title%}
-{% block menu2_class %}w3-blue{% endblock %}
-{% block content %}
-{% endblock content%}
-
-{% block footer %}{% endblock footer %}
-
--- a/app/src/web/templates/index.html
+++ b/app/src/web/templates/index.html
@@ -1,182 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %} TSUN Proxy - Dashboard {% endblock title%}
-{% block menu1_class %}w3-blue{% endblock %}
-{% block headline %}<i class="fa fa-dashboard"></i> My Dashboard{% endblock headline %}
-
-{% block content %}
-  <div class="w3-row-padding w3-margin-bottom">
-    <div class="w3-quarter">
-      <div class="w3-container w3-red w3-padding-16">
-        <div class="w3-left"><i class="fa fa-comment w3-xxxlarge"></i></div>
-        <div class="w3-right">
-          <h3>52</h3>
-        </div>
-        <div class="w3-clear"></div>
-        <h4>Messages</h4>
-      </div>
-    </div>
-    <div class="w3-quarter">
-      <div class="w3-container w3-blue w3-padding-16">
-        <div class="w3-left"><i class="fa fa-eye w3-xxxlarge"></i></div>
-        <div class="w3-right">
-          <h3>99</h3>
-        </div>
-        <div class="w3-clear"></div>
-        <h4>Views</h4>
-      </div>
-    </div>
-    <div class="w3-quarter">
-      <div class="w3-container w3-teal w3-padding-16">
-        <div class="w3-left"><i class="fa fa-share-alt w3-xxxlarge"></i></div>
-        <div class="w3-right">
-          <h3>23</h3>
-        </div>
-        <div class="w3-clear"></div>
-        <h4>Shares</h4>
-      </div>
-    </div>
-    <div class="w3-quarter">
-      <div class="w3-container w3-orange w3-text-white w3-padding-16">
-        <div class="w3-left"><i class="fa fa-users w3-xxxlarge"></i></div>
-        <div class="w3-right">
-          <h3>50</h3>
-        </div>
-        <div class="w3-clear"></div>
-        <h4>Users</h4>
-      </div>
-    </div>
-  </div>
-
-  <div class="w3-panel">
-    <div class="w3-row-padding" style="margin:0 -16px">
-      <div class="w3-third">
-        <h5>Regions</h5>
-        <img src="/w3images/region.jpg" style="width:100%" alt="Google Regional Map">
-      </div>
-      <div class="w3-twothird">
-        <h5>Feeds</h5>
-        <table class="w3-table w3-striped w3-white">
-            <tr>
-                <th class="w3-hide-large"></th>
-              </tr>
-                  <tr>
-            <td><i class="fa fa-user w3-text-blue w3-large"></i></td>
-            <td>New record, over 90 views.</td>
-            <td><i>10 mins</i></td>
-          </tr>
-          <tr>
-            <td><i class="fa fa-bell w3-text-red w3-large"></i></td>
-            <td>Database error.</td>
-            <td><i>15 mins</i></td>
-          </tr>
-          <tr>
-            <td><i class="fa fa-users w3-text-yellow w3-large"></i></td>
-            <td>New record, over 40 users.</td>
-            <td><i>17 mins</i></td>
-          </tr>
-          <tr>
-            <td><i class="fa fa-comment w3-text-red w3-large"></i></td>
-            <td>New comments.</td>
-            <td><i>25 mins</i></td>
-          </tr>
-          <tr>
-            <td><i class="fa fa-bookmark w3-text-blue w3-large"></i></td>
-            <td>Check transactions.</td>
-            <td><i>28 mins</i></td>
-          </tr>
-          <tr>
-            <td><i class="fa fa-laptop w3-text-red w3-large"></i></td>
-            <td>CPU overload.</td>
-            <td><i>35 mins</i></td>
-          </tr>
-          <tr>
-            <td><i class="fa fa-share-alt w3-text-green w3-large"></i></td>
-            <td>New shares.</td>
-            <td><i>39 mins</i></td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </div>
-  <hr>
-  <div class="w3-container">
-    <h5>General Stats</h5>
-    <p>New Visitors</p>
-    <div class="w3-grey">
-      <div class="w3-container w3-center w3-padding w3-green" style="width:25%">+25%</div>
-    </div>
-
-    <p>New Users</p>
-    <div class="w3-grey">
-      <div class="w3-container w3-center w3-padding w3-orange" style="width:50%">50%</div>
-    </div>
-
-    <p>Bounce Rate</p>
-    <div class="w3-grey">
-      <div class="w3-container w3-center w3-padding w3-red" style="width:75%">75%</div>
-    </div>
-  </div>
-  <hr>
-
-  <div class="w3-container">
-    <h5>Countries</h5>
-    <table class="w3-table w3-striped w3-bordered w3-border w3-hoverable w3-white">
-      <tr>
-        <th class="w3-hide-large"></th>
-      </tr>
-      <tr>
-        <td>United States</td>
-        <td>65%</td>
-      </tr>
-      <tr>
-        <td>UK</td>
-        <td>15.7%</td>
-      </tr>
-      <tr>
-        <td>Russia</td>
-        <td>5.6%</td>
-      </tr>
-      <tr>
-        <td>Spain</td>
-        <td>2.1%</td>
-      </tr>
-      <tr>
-        <td>India</td>
-        <td>1.9%</td>
-      </tr>
-      <tr>
-        <td>France</td>
-        <td>1.5%</td>
-      </tr>
-    </table><br>
-    <button class="w3-button w3-dark-grey">More Countries  <i class="fa fa-arrow-right"></i></button>
-  </div>
-  <br>
-
-  <div class="w3-container w3-dark-grey w3-padding-32">
-    <div class="w3-row">
-      <div class="w3-container w3-third">
-        <h5 class="w3-bottombar w3-border-green">Demographic</h5>
-        <p>Language</p>
-        <p>Country</p>
-        <p>City</p>
-      </div>
-      <div class="w3-container w3-third">
-        <h5 class="w3-bottombar w3-border-red">System</h5>
-        <p>Browser</p>
-        <p>OS</p>
-        <p>More</p>
-      </div>
-      <div class="w3-container w3-third">
-        <h5 class="w3-bottombar w3-border-orange">Target</h5>
-        <p>Users</p>
-        <p>Active</p>
-        <p>Geo</p>
-        <p>Interests</p>
-      </div>
-    </div>
-  </div>
-{% endblock content%}
-
-
--- a/app/src/web/templates/page_index.html.j2
+++ b/app/src/web/templates/page_index.html.j2
@@ -0,0 +1,67 @@
+{% extends 'base.html.j2' %}
+
+{% block title %}{{_("TSUN Proxy - Connections")}}{% endblock title %}
+{% block menu1_class %}w3-blue{% endblock %}
+{% block headline %}<i class="fa fa-network-wired"></i>  {{_('Proxy Connection Overview')}}{% endblock headline %}
+
+{% block content %}
+  <div class="w3-row-padding w3-margin-bottom">
+    <div class="w3-quarter">
+      <div class="w3-card-4">
+      <div class="w3-container w3-indigo w3-padding-16">
+        <div class="w3-left"><i class="fa fa-upload w3-xxxlarge fa-rotate-180"></i></div>
+        <div id = "server-cnt" class="w3-right">
+          <h3>-</h3>
+        </div>
+        <div class="w3-clear"></div>
+        <h4>{{_('Server Mode')}}</h4>
+        <div class="w3-hide-small w3-hide-medium" style="min-height:50px">{{_('Established from device to proxy')}}</div>
+      </div>
+      </div>
+    </div>
+    <div class="w3-quarter">
+      <div class="w3-card-4">
+      <div class="w3-container w3-purple w3-padding-16">
+        <div class="w3-left"><i class="fa fa-download w3-xxxlarge fa-rotate-180"></i></div>
+        <div id = "client-cnt" class="w3-right">
+          <h3>-</h3>
+        </div>
+        <div class="w3-clear"></div>
+        <h4>{{_('Client Mode')}}</h4>
+        <div class="w3-hide-small w3-hide-medium" style="min-height:50px">{{_('Established from proxy to device')}}</div>
+      </div>
+      </div>
+    </div>
+    <div class="w3-quarter">
+      <div class="w3-card-4">
+      <div class="w3-container w3-orange w3-text-white w3-padding-16">
+        <div class="w3-left"><i class="fa fa-cloud w3-xxxlarge"></i></div>
+        <div id = "proxy-cnt" class="w3-right">
+          <h3>-</h3>
+        </div>
+        <div class="w3-clear"></div>
+        <h4>{{_('Proxy Mode')}}</h4>
+        <div class="w3-hide-small w3-hide-medium" style="min-height:50px">{{_('Forwarding data to cloud')}}</div>
+      </div>
+      </div>
+    </div>
+    <div class="w3-quarter">
+      <div class="w3-card-4">
+      <div class="w3-container w3-teal w3-padding-16">
+        <div class="w3-left"><i class="fa fa-cloud-arrow-up-alt w3-xxxlarge"></i></div>
+        <div id = "emulation-cnt" class="w3-right">
+          <h3>-</h3>
+        </div>
+        <div class="w3-clear"></div>
+        <h4>{{_('Emu Mode')}}</h4>
+        <div class="w3-hide-small w3-hide-medium" style="min-height:50px">{{_('Emulation sends data to cloud')}}</div>
+      </div>
+      </div>
+    </div>
+  </div>
+
+  <div id="notes-list"></div>
+  <div id="conn-table"></div>
+{% endblock content%}
+
+{% block footer %}{% endblock footer %}
--- a/app/src/web/templates/page_logging.html.j2
+++ b/app/src/web/templates/page_logging.html.j2
@@ -0,0 +1,30 @@
+{% extends 'base.html.j2' %}
+
+{% block title %}{{_("TSUN Proxy - Log Files")}}{% endblock title %}
+{% block menu4_class %}w3-blue{% endblock %}
+{% block headline %}<i class="fa fa-file-export fa-fw"></i>  {{_('Log Files')}}{% endblock headline %}
+{% block content %}
+  <div id="id01" class="w3-modal">
+    <div class="w3-modal-content" style="width:600px">
+      <div class="w3-container w3-padding-24">
+        <h2>{{_("Do you really want to delete the log file")}}:<br><b><span id="id03"></span></b> ?</h2>
+        <div class="w3-bar">
+          <button id="id02" class="w3-button w3-red" onclick="deleteFile(); document.getElementById('id01').style.display='none'">{{_('Delete File</button')}}>
+          <button class="w3-button w3-grey w3-right" onclick="document.getElementById('id01').style.display='none'">{{_('Abort')}}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div id="file-list"></div>
+
+  <script>
+    function deleteFile() {
+      fname = document.getElementById('id02').href;
+      fetch(fname, {method: 'DELETE'})
+        .then(fetch_data())
+    }
+  </script>
+{% endblock content%}
+
+{% block footer %}{% endblock footer %}
--- a/app/src/web/templates/page_mqtt.html.j2
+++ b/app/src/web/templates/page_mqtt.html.j2
@@ -0,0 +1,52 @@
+{% extends 'base.html.j2' %}
+
+{% block title %}{{_("TSUN Proxy - MQTT Status")}}{% endblock title %}
+{% block menu2_class %}w3-blue{% endblock %}
+{% block headline %}<i class="fa fa-database"></i>  {{_('MQTT Overview')}}{% endblock headline %}
+{% block content %}
+  <div class="w3-row-padding w3-margin-bottom">
+    <div class="w3-third">
+      <div class="w3-card-4">
+      <div class="w3-container w3-indigo w3-padding-16">
+        <div class="w3-left"><i class="fa fa-link w3-xxxlarge"></i></div>
+        <div id = "mqtt-ctime" class="w3-right">
+          <h3>-</h3>
+        </div>
+        <div class="w3-clear"></div>
+        <h4>{{_('Connection Time')}}</h4>
+        <div class="w3-hide-small w3-hide-medium" style="min-height:50px">{{_('Time at which the connection was established')}}</div>
+      </div>
+      </div>
+    </div>
+    <div class="w3-third">
+      <div class="w3-card-4">
+      <div class="w3-container w3-purple w3-padding-16">
+        <div class="w3-left"><i class="fa fa-server w3-xxxlarge"></i></div>
+        <div id = "mqtt-tx" class="w3-right">
+          <h3>-</h3>
+        </div>
+        <div class="w3-clear"></div>
+        <h4>{{_('Published Topics')}}</h4>
+        <div class="w3-hide-small w3-hide-medium" style="min-height:50px">{{_('Number of published topics')}}</div>
+      </div>
+      </div>
+    </div>
+    <div class="w3-third">
+      <div class="w3-card-4">
+      <div class="w3-container w3-orange w3-text-white w3-padding-16">
+        <div class="w3-left"><i class="fa fa-user w3-xxxlarge"></i></div>
+        <div id = "mqtt-rx" class="w3-right">
+          <h3>-</h3>
+        </div>
+        <div class="w3-clear"></div>
+        <h4>{{_('Received Topics')}}</h4>
+        <div class="w3-hide-small w3-hide-medium" style="min-height:50px">{{_('Number of topics received')}}</div>
+      </div>
+      </div>
+    </div>
+  </div>
+  <div id="notes-list"></div>
+  <div id="mqtt-table"></div>
+{% endblock content%}
+
+{% block footer %}{% endblock footer %}
--- a/app/src/web/templates/page_notes.html.j2
+++ b/app/src/web/templates/page_notes.html.j2
@@ -0,0 +1,10 @@
+{% extends 'base.html.j2' %}
+
+{% block title %}{{_("TSUN Proxy - Important Messages")}}{% endblock title %}
+{% block menu3_class %}w3-blue{% endblock %}
+{% block headline %}<i class="fa fa-exclamation-triangle fa-fw"></i>  {{_('Important Messages')}}{% endblock headline %}
+{% block content %}
+  <div id="notes-list"></div>
+{% endblock content%}
+
+{% block footer %}{% endblock footer %}
--- a/app/src/web/templates/templ_log_files_list.html.j2
+++ b/app/src/web/templates/templ_log_files_list.html.j2
@@ -0,0 +1,33 @@
+<div class="w3-row-padding w3-margin-bottom">
+{% for file in dir_list %}
+  <div class="w3-quarter w3-margin-bottom">
+
+     <div class="w3-card-4">
+      <header class="w3-container w3-teal" style="min-height:80px">
+        <h4>{{file.name}}</h4>
+      </header>
+  
+      <table class="w3-table">
+        {% for idx, name in [('created',_('Created')), ('modified', _('Modified')), ('size', _('Size'))]%}
+        <tr>
+        <td>{{_(name)}}:</td>
+        <td>{{file[idx]}}</td>
+        </tr>
+        {% endfor %}
+      </table>
+  
+      <footer class="w3-teal">
+        <a href="{{ url_for('.send',file=file.name)}}" class="w3-button w3-hover-teal w3-hover-text-black"><i class="fa fa-file-download"></i>  {{_('Download File')}}</a>
+        <a class="w3-button w3-right w3-hover-teal w3-hover-text-black" 
+        onclick="document.getElementById('id03').innerHTML='{{file.name}}'; document.getElementById('id02').href='{{ url_for('.delete',file=file.name)}}'; document.getElementById('id01').style.display='block';"><i class="fa fa-trash"></i></a>
+      </footer>
+    </div>
+
+   </div>
+{% if 0 == (loop.index%4) and not last %}
+</div>
+<div class="w3-row-padding w3-margin-bottom">
+{% endif %}
+{% endfor %}  
+</div>
+
--- a/app/src/web/templates/templ_notes_list.html.j2
+++ b/app/src/web/templates/templ_notes_list.html.j2
@@ -0,0 +1,23 @@
+{% if notes|length > 0 %}
+<div class="w3-container w3-margin-bottom">
+  <h5>{{_("Warnings and error messages")}}  </h5>
+  <ul class="w3-ul w3-card-4">
+  {% for note in notes %}
+    <li class="{% if note.level is le(30) %}w3-leftbar w3-rightbar w3-pale-blue w3-border-blue{% else %}w3-leftbar w3-rightbar w3-pale-red w3-border-red{% endif %}">
+      <span class="w3-col" style="width:150px">{{note.ctime|datetimeformat(format='short')}}</span>
+      <span class="w3-col w3-hide-small" style="width:100px">{{note.lname|e}}</span>
+      <span class="w3-rest">{{note.msg|e}}</span>
+    </li>
+  {% endfor %}
+  </ul>
+</div>
+{% elif not hide_if_empty %}
+<div class="w3-container w3-margin-bottom">
+  <div class="w3-leftbar w3-rightbar w3-pale-green w3-border-green">
+    <div class="w3-container">
+        <h2>{{_("Well done!")}}</h2>
+        <p>{{_("No warnings or errors have been logged since the last proxy start.")}}</p>
+    </div>
+  </div>
+</div>
+{% endif %}
--- a/app/src/web/templates/templ_table.html.j2
+++ b/app/src/web/templates/templ_table.html.j2
@@ -0,0 +1,42 @@
+{% macro table_elm(elm, col_class, tag='td') -%}
+    {% if elm is mapping %}
+    <{{tag}} 
+    {% if (col_class|length) > 0  or elm.class is defined%}class="{{col_class}} {{elm.class}}"{% endif %}
+    {% if elm.colspan is defined %}colspan="{{elm.colspan}}"{% endif %} 
+    {% if elm.rowspan is defined %}rowspan="{{elm.rowspan}}"{% endif %}
+    >{{elm.val}}</{{tag}}>
+    {% else %}
+    <{{tag}} 
+    {% if (col_class|length) > 0 %}class="{{col_class}}"{% endif %}
+    >{{elm}}</{{tag}}>
+    {% endif %}
+{%- endmacro%}
+
+<div class="w3-container w3-margin-bottom">
+<h5>{{table.headline}}</h5>
+<div class="w3-card-4">
+
+<table class="w3-table w3-bordered w3-hoverable w3-white">
+  {% if table.thead is defined%}
+  <thead>
+  {% for row in table.thead %}
+    <tr>
+      {% for col in row %}
+      {{table_elm(col, table.col_classes[loop.index0], 'th')}}
+      {% endfor %}
+    </tr>
+  {% endfor %}
+  </thead>
+  {% endif %}
+  <tbody>
+  {% for row in table.tbody %}
+    <tr>
+      {% for col in row %}
+      {{table_elm(col, table.col_classes[loop.index0])}}
+      {% endfor %}
+    </tr>
+  {% endfor %}
+  </tbody>
+</table>
+</div>
+</div>
--- a/app/src/web/wrapper.py
+++ b/app/src/web/wrapper.py
@@ -0,0 +1,26 @@
+from quart import url_for as quart_url_for
+from . import web
+
+
+def url_for(*args, **kwargs):
+    """Return the url for a specific endpoint.
+
+    This wrapper optionally convert into a relative url.
+
+    This is most useful in templates and redirects to create a URL
+    that can be used in the browser.
+
+    Arguments:
+        endpoint: The endpoint to build a url for, if prefixed with
+            ``.`` it targets endpoint's in the current blueprint.
+        _anchor: Additional anchor text to append (i.e. #text).
+        _external: Return an absolute url for external (to app) usage.
+        _method: The method to consider alongside the endpoint.
+        _scheme: A specific scheme to use.
+        values: The values to build into the URL, as specified in
+            the endpoint rule.
+    """
+    url = quart_url_for(*args, **kwargs)
+    if '/' == url[0] and web.build_relative_urls:
+        url = '.' + url
+    return url
--- a/app/tests/cnf/invalid_config.toml
+++ b/app/tests/cnf/invalid_config.toml
@@ -0,0 +1 @@
+mqtt.port    = ":1883"
--- a/app/tests/conftest.py
+++ b/app/tests/conftest.py
@@ -0,0 +1,20 @@
+import pytest_asyncio
+import asyncio
+
+
+@pytest_asyncio.fixture
+async def my_loop():
+    event_loop = asyncio.get_running_loop()
+    yield event_loop                     
+
+    # Collect all tasks and cancel those that are not 'done'.  
+    tasks = asyncio.all_tasks(event_loop)
+    tasks = [t for t in tasks if not t.done()]
+    for task in tasks:
+        task.cancel()
+
+    # Wait for all tasks to complete, ignoring any CancelledErrors                                  
+    try:
+        await asyncio.wait(tasks)
+    except asyncio.exceptions.CancelledError:
+        pass
--- a/app/tests/log/sub_dir/not_reachable.txt
+++ b/app/tests/log/sub_dir/not_reachable.txt
--- a/app/tests/log/test.txt
+++ b/app/tests/log/test.txt
@@ -0,0 +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:23  INFO | root | config_path: ./config/
+2025-04-30 00:01:23  INFO | root | json_config: None
+2025-04-30 00:01:23  INFO | root | toml_config: None
+2025-04-30 00:01:23  INFO | root | trans_path:  ../translations/
+2025-04-30 00:01:23  INFO | root | rel_urls:    False
+2025-04-30 00:01:23  INFO | root | log_path:    ./log/
+2025-04-30 00:01:23  INFO | root | log_backups: unlimited
+2025-04-30 00:01:23  INFO | root | LOG_LVL    : None
+2025-04-30 00:01:23  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:23  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:23  INFO | root | Read from ./config/config.toml => n/a
+2025-04-30 00:01:23  INFO | root | ******
+2025-04-30 00:01:23  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:23  INFO | root | Start Quart
--- a/app/tests/test_async_stream.py
+++ b/app/tests/test_async_stream.py
@@ -8,6 +8,7 @@ from infos import Infos
 from inverter_base import InverterBase
 from async_stream import AsyncStreamServer, AsyncStreamClient, StreamPtr
 from messages import Message
+from mock import patch, call

 from test_modbus_tcp import FakeReader, FakeWriter
 from test_inverter_base import config_conn, patch_open_connection
@@ -74,6 +75,13 @@ def test_health():
        cnt += 1
    assert cnt == 0

+
+@pytest.fixture
+def spy_inc_cnt():
+    with patch.object(Infos, 'inc_counter', wraps=Infos.inc_counter) as infos:
+        yield infos
+
+
@pytest.mark.asyncio
 async def test_close_cb():
    assert asyncio.get_running_loop()
@@ -529,9 +537,10 @@ async def test_forward_runtime_error2():
    del ifc

@pytest.mark.asyncio
-async def test_forward_runtime_error3():
+async def test_forward_runtime_error3(spy_inc_cnt):
    assert asyncio.get_running_loop()
    remote = StreamPtr(None)
+    spy = spy_inc_cnt
    cnt = 0

    async def _create_remote():
@@ -543,13 +552,17 @@ async def test_forward_runtime_error3():
    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
    ifc.fwd_add(b'test-forward_msg')
    await ifc.server_loop()
+    spy.assert_has_calls([call('Inverter_Cnt'), call('ServerMode_Cnt')])
+    assert Infos.get_counter('Inverter_Cnt') == 0
+    assert Infos.get_counter('ServerMode_Cnt') == 0
    assert cnt == 1
    del ifc

@pytest.mark.asyncio
-async def test_forward_resp():
+async def test_forward_resp(spy_inc_cnt):
    assert asyncio.get_running_loop()
    remote = StreamPtr(None)
+    spy = spy_inc_cnt
    cnt = 0

    def _close_cb():
@@ -557,27 +570,35 @@ async def test_forward_resp():
        cnt += 1
    
    cnt = 0
-    ifc =  AsyncStreamClient(fake_reader_fwd(), FakeWriter(), remote, _close_cb)
+    ifc =  AsyncStreamClient(fake_reader_fwd(), FakeWriter(), remote, _close_cb, use_emu = True)
    create_remote(remote, TestType.FWD_NO_EXCPT)
    ifc.fwd_add(b'test-forward_msg')
    await ifc.client_loop('')
+    spy.assert_has_calls([call('Cloud_Conn_Cnt'), call('EmuMode_Cnt')])
+    assert Infos.get_counter('Cloud_Conn_Cnt') == 0
+    assert Infos.get_counter('EmuMode_Cnt') == 0
    assert cnt == 1
    del ifc

+
@pytest.mark.asyncio
-async def test_forward_resp2():
+async def test_forward_resp2(spy_inc_cnt):
    assert asyncio.get_running_loop()
    remote = StreamPtr(None)
+    spy = spy_inc_cnt
    cnt = 0
    def _close_cb():
        nonlocal cnt
        cnt += 1
    
    cnt = 0
-    ifc =  AsyncStreamClient(fake_reader_fwd(), FakeWriter(), None, _close_cb)
+    ifc =  AsyncStreamClient(fake_reader_fwd(), FakeWriter(), None, _close_cb, use_emu = False)
    create_remote(remote, TestType.FWD_NO_EXCPT)
    ifc.fwd_add(b'test-forward_msg')
    await ifc.client_loop('')
+    spy.assert_has_calls([call('Cloud_Conn_Cnt'), call('ProxyMode_Cnt'), call('SW_Exception')])
+    assert Infos.get_counter('Cloud_Conn_Cnt') == 0
+    assert Infos.get_counter('ProxyMode_Cnt') == 0
    assert cnt == 1
    del ifc
 
--- a/app/tests/test_inverter_base.py
+++ b/app/tests/test_inverter_base.py
@@ -113,7 +113,9 @@ def patch_unhealthy_remote():
    with patch.object(AsyncStreamClient, 'healthy', new_healthy) as conn:
        yield conn

-def test_inverter_iter():
+@pytest.mark.asyncio
+async def test_inverter_iter(my_loop):
+    _ = my_loop
    InverterBase._registry.clear()
    cnt = 0
    reader = FakeReader()
@@ -216,7 +218,8 @@ def test_unhealthy_remote(patch_unhealthy_remote):
    assert cnt == 0

@pytest.mark.asyncio
-async def test_remote_conn(config_conn, patch_open_connection):
+async def test_remote_conn(my_loop, config_conn, patch_open_connection):
+    _ = my_loop
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -242,8 +245,9 @@ async def test_remote_conn(config_conn, patch_open_connection):
    assert cnt == 0

@pytest.mark.asyncio
-async def test_remote_conn_to_private(config_conn, patch_open_connection):
+async def test_remote_conn_to_private(my_loop, config_conn, patch_open_connection):
    '''check DNS resolving of the TSUN FQDN to a local address'''
+    _ = my_loop
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -280,8 +284,9 @@ async def test_remote_conn_to_private(config_conn, patch_open_connection):


@pytest.mark.asyncio
-async def test_remote_conn_to_loopback(config_conn, patch_open_connection):
+async def test_remote_conn_to_loopback(my_loop, config_conn, patch_open_connection):
    '''check DNS resolving of the TSUN FQDN to the loopback address'''
+    _ = my_loop
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -317,8 +322,9 @@ async def test_remote_conn_to_loopback(config_conn, patch_open_connection):
    assert cnt == 0

@pytest.mark.asyncio
-async def test_remote_conn_to_none(config_conn, patch_open_connection):
+async def test_remote_conn_to_none(my_loop, config_conn, patch_open_connection):
    '''check if get_extra_info() return None in case of an error'''
+    _ = my_loop
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -354,7 +360,8 @@ async def test_remote_conn_to_none(config_conn, patch_open_connection):
    assert cnt == 0

@pytest.mark.asyncio
-async def test_unhealthy_remote(config_conn, patch_open_connection, patch_unhealthy_remote):
+async def test_unhealthy_remote(my_loop, config_conn, patch_open_connection, patch_unhealthy_remote):
+    _ = my_loop
    _ = config_conn
    _ = patch_open_connection
    _ = patch_unhealthy_remote
@@ -391,10 +398,10 @@ async def test_unhealthy_remote(config_conn, patch_open_connection, patch_unheal
    assert cnt == 0

@pytest.mark.asyncio
-async def test_remote_disc(config_conn, patch_open_connection):
+async def test_remote_disc(my_loop, config_conn, patch_open_connection):
+    _ = my_loop
    _ = config_conn
    _ = patch_open_connection
-    assert asyncio.get_running_loop()
    reader = FakeReader()
    writer =  FakeWriter()

--- a/app/tests/test_inverter_g3.py
+++ b/app/tests/test_inverter_g3.py
@@ -99,7 +99,8 @@ def patch_healthy():
    with patch.object(AsyncStream, 'healthy') as conn:
        yield conn

-def test_method_calls(patch_healthy):
+@pytest.mark.asyncio
+async def test_method_calls(my_loop, patch_healthy):
    spy = patch_healthy
    reader = FakeReader()
    writer =  FakeWriter()
@@ -119,7 +120,7 @@ def test_method_calls(patch_healthy):
    assert cnt == 0

@pytest.mark.asyncio
-async def test_remote_conn(config_conn, patch_open_connection):
+async def test_remote_conn(my_loop, config_conn, patch_open_connection):
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -137,7 +138,7 @@ async def test_remote_conn(config_conn, patch_open_connection):
    assert cnt == 0

@pytest.mark.asyncio
-async def test_remote_except(config_conn, patch_open_connection):
+async def test_remote_except(my_loop, config_conn, patch_open_connection):
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -164,7 +165,7 @@ async def test_remote_except(config_conn, patch_open_connection):
    assert cnt == 0

@pytest.mark.asyncio
-async def test_mqtt_publish(config_conn, patch_open_connection):
+async def test_mqtt_publish(my_loop, config_conn, patch_open_connection):
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -191,7 +192,7 @@ async def test_mqtt_publish(config_conn, patch_open_connection):
        assert Infos.new_stat_data['proxy'] == False

@pytest.mark.asyncio
-async def test_mqtt_err(config_conn, patch_open_connection, patch_mqtt_err):
+async def test_mqtt_err(my_loop, config_conn, patch_open_connection, patch_mqtt_err):
    _ = config_conn
    _ = patch_open_connection
    _ = patch_mqtt_err
@@ -208,7 +209,7 @@ async def test_mqtt_err(config_conn, patch_open_connection, patch_mqtt_err):
        assert stream.new_data['inverter'] == True

@pytest.mark.asyncio
-async def test_mqtt_except(config_conn, patch_open_connection, patch_mqtt_except):
+async def test_mqtt_except(my_loop, config_conn, patch_open_connection, patch_mqtt_except):
    _ = config_conn
    _ = patch_open_connection
    _ = patch_mqtt_except
--- a/app/tests/test_inverter_g3p.py
+++ b/app/tests/test_inverter_g3p.py
@@ -37,6 +37,7 @@ def config_conn():
        },
        'solarman':{'enabled': True, 'host': 'test_cloud.local', 'port': 1234}, 'inverters':{'allow_all':True}
    }
+    Config.log_path='app/tests/log/'

@pytest.fixture(scope="module", autouse=True)
 def module_init():
@@ -93,7 +94,8 @@ def patch_open_connection():
    with patch.object(asyncio, 'open_connection', new_open) as conn:
        yield conn

-def test_method_calls(config_conn):
+@pytest.mark.asyncio
+async def test_method_calls(my_loop, config_conn):
    _ = config_conn
    reader = FakeReader()
    writer =  FakeWriter()
@@ -104,7 +106,7 @@ def test_method_calls(config_conn):
        assert inverter.local.ifc

@pytest.mark.asyncio
-async def test_remote_conn(config_conn, patch_open_connection):
+async def test_remote_conn(my_loop, config_conn, patch_open_connection):
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -115,7 +117,7 @@ async def test_remote_conn(config_conn, patch_open_connection):
        assert inverter.remote.stream

@pytest.mark.asyncio
-async def test_remote_except(config_conn, patch_open_connection):
+async def test_remote_except(my_loop, config_conn, patch_open_connection):
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -137,7 +139,7 @@ async def test_remote_except(config_conn, patch_open_connection):


@pytest.mark.asyncio
-async def test_mqtt_publish(config_conn, patch_open_connection):
+async def test_mqtt_publish(my_loop, config_conn, patch_open_connection):
    _ = config_conn
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -164,7 +166,7 @@ async def test_mqtt_publish(config_conn, patch_open_connection):
        assert Infos.new_stat_data['proxy'] == False

@pytest.mark.asyncio
-async def test_mqtt_err(config_conn, patch_open_connection, patch_mqtt_err):
+async def test_mqtt_err(my_loop, config_conn, patch_open_connection, patch_mqtt_err):
    _ = config_conn
    _ = patch_open_connection
    _ = patch_mqtt_err
@@ -181,7 +183,7 @@ async def test_mqtt_err(config_conn, patch_open_connection, patch_mqtt_err):
        assert stream.new_data['inverter'] == True

@pytest.mark.asyncio
-async def test_mqtt_except(config_conn, patch_open_connection, patch_mqtt_except):
+async def test_mqtt_except(my_loop, config_conn, patch_open_connection, patch_mqtt_except):
    _ = config_conn
    _ = patch_open_connection
    _ = patch_mqtt_except
--- a/app/tests/test_modbus.py
+++ b/app/tests/test_modbus.py
@@ -19,7 +19,8 @@ class ModbusTestHelper(Modbus):
    def resp_handler(self):
        self.recv_responses += 1

-def test_modbus_crc():
+@pytest.mark.asyncio
+async def test_modbus_crc():
    '''Check CRC-16 calculation'''
    mb = Modbus(None)
    assert 0x0b02 == mb._Modbus__calc_crc(b'\x01\x06\x20\x08\x00\x04')
@@ -37,7 +38,8 @@ def test_modbus_crc():
    msg += b'\x00\x00\x00\x00\x00\x00\x00\xe6\xef'
    assert 0 == mb._Modbus__calc_crc(msg)

-def test_build_modbus_pdu():
+@pytest.mark.asyncio
+async def test_build_modbus_pdu():
    '''Check building and sending a MODBUS RTU'''
    mb = ModbusTestHelper()
    mb.build_msg(1,6,0x2000,0x12)
@@ -49,7 +51,8 @@ def test_build_modbus_pdu():
    assert mb.last_len == 18
    assert mb.err == 0

-def test_recv_req():
+@pytest.mark.asyncio
+async def test_recv_req():
    '''Receive a valid request, which must transmitted'''
    mb = ModbusTestHelper()
    assert mb.recv_req(b'\x01\x06\x20\x00\x00\x12\x02\x07')
@@ -58,7 +61,8 @@ def test_recv_req():
    assert mb.last_len == 0x12
    assert mb.err == 0

-def test_recv_req_crc_err():
+@pytest.mark.asyncio
+async def test_recv_req_crc_err():
    '''Receive a request with invalid CRC, which must be dropped'''
    mb = ModbusTestHelper()
    assert not mb.recv_req(b'\x01\x06\x20\x00\x00\x12\x02\x08')
@@ -68,7 +72,8 @@ def test_recv_req_crc_err():
    assert mb.last_len == 0
    assert mb.err == 1

-def test_recv_resp_crc_err():
+@pytest.mark.asyncio
+async def test_recv_resp_crc_err():
    '''Receive a response with invalid CRC, which must be dropped'''
    mb = ModbusTestHelper()
    # simulate a transmitted request
@@ -89,7 +94,8 @@ def test_recv_resp_crc_err():
    mb._Modbus__stop_timer()
    assert not mb.req_pend

-def test_recv_resp_invalid_addr():
+@pytest.mark.asyncio
+async def test_recv_resp_invalid_addr():
    '''Receive a response with wrong server addr, which must be dropped'''
    mb = ModbusTestHelper()
    mb.req_pend = True
@@ -113,7 +119,8 @@ def test_recv_resp_invalid_addr():
    mb._Modbus__stop_timer()
    assert not mb.req_pend

-def test_recv_recv_fcode():
+@pytest.mark.asyncio
+async def test_recv_recv_fcode():
    '''Receive a response with wrong function code, which must be dropped'''
    mb = ModbusTestHelper()
    mb.build_msg(1,4,0x300e,2)
@@ -135,7 +142,8 @@ def test_recv_recv_fcode():
    mb._Modbus__stop_timer()
    assert not mb.req_pend

-def test_recv_resp_len():
+@pytest.mark.asyncio
+async def test_recv_resp_len():
    '''Receive a response with wrong data length, which must be dropped'''
    mb = ModbusTestHelper()
    mb.build_msg(1,3,0x300e,3)
@@ -158,7 +166,8 @@ def test_recv_resp_len():
    mb._Modbus__stop_timer()
    assert not mb.req_pend

-def test_recv_unexpect_resp():
+@pytest.mark.asyncio
+async def test_recv_unexpect_resp():
    '''Receive a response when we havb't sent a request'''
    mb = ModbusTestHelper()
    assert not mb.req_pend
@@ -174,7 +183,8 @@ def test_recv_unexpect_resp():
    assert mb.req_pend == False
    assert mb.que.qsize() == 0

-def test_parse_resp():
+@pytest.mark.asyncio
+async def test_parse_resp():
    '''Receive matching response and parse the values'''
    mb = ModbusTestHelper()
    mb.build_msg(1,3,0x3007,6)
@@ -200,7 +210,8 @@ def test_parse_resp():
    assert mb.que.qsize() == 0
    assert not mb.req_pend

-def test_queue():
+@pytest.mark.asyncio
+async def test_queue():
    mb = ModbusTestHelper()
    mb.build_msg(1,3,0x3022,4)
    assert mb.que.qsize() == 0
@@ -218,7 +229,8 @@ def test_queue():
    mb._Modbus__stop_timer()
    assert not mb.req_pend

-def test_queue2():
+@pytest.mark.asyncio
+async def test_queue2():
    '''Check queue handling for build_msg() calls'''
    mb = ModbusTestHelper()
    mb.build_msg(1,3,0x3007,6)
@@ -267,7 +279,8 @@ def test_queue2():
    assert mb.que.qsize() == 0
    assert not mb.req_pend

-def test_queue3():
+@pytest.mark.asyncio
+async def test_queue3():
    '''Check queue handling for recv_req() calls'''
    mb = ModbusTestHelper()
    assert mb.recv_req(b'\x01\x03\x30\x07\x00\x06{\t', mb.resp_handler)
@@ -324,7 +337,7 @@ def test_queue3():
    assert not mb.req_pend

@pytest.mark.asyncio
-async def test_timeout():
+async def test_timeout(my_loop):
    '''Test MODBUS response timeout and RTU retransmitting'''
    assert asyncio.get_running_loop()
    mb = ModbusTestHelper()
@@ -371,7 +384,8 @@ async def test_timeout():
    assert mb.retry_cnt == 0
    assert mb.send_calls == 4

-def test_recv_unknown_data():
+@pytest.mark.asyncio
+async def test_recv_unknown_data():
    '''Receive a response with an unknwon register'''
    mb = ModbusTestHelper()
    assert 0x9000 not in mb.mb_reg_mapping
@@ -390,7 +404,8 @@ def test_recv_unknown_data():

    del mb.mb_reg_mapping[0x9000]

-def test_close():
+@pytest.mark.asyncio
+async def test_close():
    '''Check queue handling for build_msg() calls'''
    mb = ModbusTestHelper()
    mb.build_msg(1,3,0x3007,6)
--- a/app/tests/test_mqtt.py
+++ b/app/tests/test_mqtt.py
@@ -140,6 +140,7 @@ async def test_ha_reconnect(config_mqtt_conn):
        assert on_connect.is_set()

    finally:
+        assert m.received == 2
        await m.close()

@pytest.mark.asyncio
--- a/app/tests/test_server.py
+++ b/app/tests/test_server.py
@@ -3,66 +3,216 @@ import pytest
 import logging
 import os
 from mock import patch
-from server import get_log_level, app, ProxyState
+from server import app, Server, ProxyState, HypercornLogHndl

 pytest_plugins = ('pytest_asyncio',)

-def test_get_log_level():

-    with patch.dict(os.environ, {}):
-        log_lvl = get_log_level()
-        assert log_lvl == None
+class TestServerClass:
+    class FakeServer(Server):
+        def __init__(self):
+            pass  # don't call the suoer(.__init__ for unit tests

-    with patch.dict(os.environ, {'LOG_LVL': 'DEBUG'}):
-        log_lvl = get_log_level()
-        assert log_lvl == logging.DEBUG
+    def test_get_log_level(self):
+        s = self.FakeServer()

-    with patch.dict(os.environ, {'LOG_LVL': 'INFO'}):
-        log_lvl = get_log_level()
-        assert log_lvl == logging.INFO
+        with patch.dict(os.environ, {}):
+            log_lvl = s.get_log_level()
+            assert log_lvl == None

-    with patch.dict(os.environ, {'LOG_LVL': 'WARN'}):
-        log_lvl = get_log_level()
-        assert log_lvl == logging.WARNING
+        with patch.dict(os.environ, {'LOG_LVL': 'DEBUG'}):
+            log_lvl = s.get_log_level()
+            assert log_lvl == logging.DEBUG

-    with patch.dict(os.environ, {'LOG_LVL': 'ERROR'}):
-        log_lvl = get_log_level()
-        assert log_lvl == logging.ERROR
+        with patch.dict(os.environ, {'LOG_LVL': 'INFO'}):
+            log_lvl = s.get_log_level()
+            assert log_lvl == logging.INFO

-    with patch.dict(os.environ, {'LOG_LVL': 'UNKNOWN'}):
-        log_lvl = get_log_level()
-        assert log_lvl == None
+        with patch.dict(os.environ, {'LOG_LVL': 'WARN'}):
+            log_lvl = s.get_log_level()
+            assert log_lvl == logging.WARNING

-@pytest.mark.asyncio
-async def test_ready():
-    """Test the ready route."""
+        with patch.dict(os.environ, {'LOG_LVL': 'ERROR'}):
+            log_lvl = s.get_log_level()
+            assert log_lvl == logging.ERROR

-    ProxyState.set_up(False)
-    client = app.test_client()
-    response = await client.get('/-/ready')
-    assert response.status_code == 503
-    result = await response.get_data()
-    assert result == b"Not ready"
+        with patch.dict(os.environ, {'LOG_LVL': 'UNKNOWN'}):
+            log_lvl = s.get_log_level()
+            assert log_lvl == None

-    ProxyState.set_up(True)
-    response = await client.get('/-/ready')
-    assert response.status_code == 200
-    result = await response.get_data()
-    assert result == b"Is ready"
+    def test_default_args(self):
+        s = self.FakeServer()
+        assert s.config_path == './config/'
+        assert s.json_config == ''
+        assert s.toml_config == ''
+        assert s.trans_path == '../translations/'
+        assert s.rel_urls == False
+        assert s.log_path == './log/'
+        assert s.log_backups == 0

-@pytest.mark.asyncio
-async def test_healthy():
-    """Test the healthy route."""
+    def test_parse_args_empty(self):
+        s = self.FakeServer()
+        s.parse_args([])
+        assert s.config_path == './config/'
+        assert s.json_config == None
+        assert s.toml_config == None
+        assert s.trans_path == '../translations/'
+        assert s.rel_urls == False
+        assert s.log_path == './log/'
+        assert s.log_backups == 0

-    ProxyState.set_up(False)
-    client = app.test_client()
-    response = await client.get('/-/healthy')
-    assert response.status_code == 200
-    result = await response.get_data()
-    assert result == b"I'm fine"
+    def test_parse_args_short(self):
+        s = self.FakeServer()
+        s.parse_args(['-r', '-c', '/tmp/my-config', '-j', 'cnf.jsn', '-t', 'cnf.tml', '-tr', '/my/trans/', '-l', '/my_logs/', '-b', '3'])
+        assert s.config_path == '/tmp/my-config'
+        assert s.json_config == 'cnf.jsn'
+        assert s.toml_config == 'cnf.tml'
+        assert s.trans_path == '/my/trans/'
+        assert s.rel_urls == True
+        assert s.log_path == '/my_logs/'
+        assert s.log_backups == 3
+
+    def test_parse_args_long(self):
+        s = self.FakeServer()
+        s.parse_args(['--rel_urls', '--config_path', '/tmp/my-config', '--json_config', 'cnf.jsn',
+                      '--toml_config', 'cnf.tml', '--trans_path', '/my/trans/', '--log_path', '/my_logs/',
+                      '--log_backups', '3'])
+        assert s.config_path == '/tmp/my-config'
+        assert s.json_config == 'cnf.jsn'
+        assert s.toml_config == 'cnf.tml'
+        assert s.trans_path == '/my/trans/'
+        assert s.rel_urls == True
+        assert s.log_path == '/my_logs/'
+        assert s.log_backups == 3
+
+    def test_parse_args_invalid(self):
+        s = self.FakeServer()
+        with pytest.raises(SystemExit) as exc_info: 
+            s.parse_args(['--inalid', '/tmp/my-config'])
+        assert exc_info.value.code == 2
+
+    def test_init_logging_system(self):
+        s = self.FakeServer()
+        s.src_dir = 'app/src/'
+        s.init_logging_system()
+        assert s.log_backups == 0
+        assert s.log_level == None
+        assert logging.handlers.log_path == './log/'
+        assert logging.handlers.log_backups == 0
+        assert logging.getLogger().level == logging.DEBUG
+        assert logging.getLogger('msg').level == logging.DEBUG
+        assert logging.getLogger('conn').level == logging.DEBUG
+        assert logging.getLogger('data').level == logging.DEBUG
+        assert logging.getLogger('tracer').level == logging.INFO
+        assert logging.getLogger('asyncio').level == logging.INFO
+        assert logging.getLogger('hypercorn.access').level == logging.INFO
+        assert logging.getLogger('hypercorn.error').level == logging.INFO
+
+        os.environ["LOG_LVL"] = "WARN"
+        s.parse_args(['--log_backups', '3'])
+        s.init_logging_system()
+        assert s.log_backups == 3
+        assert s.log_level == logging.WARNING
+        assert logging.handlers.log_backups == 3
+        assert logging.getLogger().level == s.log_level
+        assert logging.getLogger('msg').level == s.log_level
+        assert logging.getLogger('conn').level == s.log_level
+        assert logging.getLogger('data').level == s.log_level
+        assert logging.getLogger('tracer').level == s.log_level
+        assert logging.getLogger('asyncio').level == s.log_level
+        assert logging.getLogger('hypercorn.access').level == logging.INFO
+        assert logging.getLogger('hypercorn.error').level == logging.INFO
+
+    def test_build_config_error(self, caplog):
+        s = self.FakeServer()
+        s.src_dir = 'app/src/'
+        s.toml_config = 'app/tests/cnf/invalid_config.toml'
+
+        with caplog.at_level(logging.ERROR):
+            s.build_config()
+        assert "Can't read from app/tests/cnf/invalid_config.toml" in caplog.text
+        assert "Key 'port' error:" in caplog.text
+
+
+class TestHypercornLogHndl:
+    class FakeServer(Server):
+        def __init__(self):
+            pass  # don't call the suoer(.__init__ for unit tests
+
+    def test_save_and_restore(self, capsys):
+        s = self.FakeServer()
+        s.src_dir = 'app/src/'
+        s.init_logging_system()
+
+        h = HypercornLogHndl()
+        assert h.must_fix == False
+        assert len(h.access_hndl) == 0
+        assert len(h.error_hndl) == 0
+
+        h.save()
+        assert h.must_fix == True
+        assert len(h.access_hndl) == 1
+        assert len(h.error_hndl) == 2
+        assert h.access_hndl == logging.getLogger('hypercorn.access').handlers
+        assert h.error_hndl == logging.getLogger('hypercorn.error').handlers
+
+        logging.getLogger('hypercorn.access').handlers = []
+        logging.getLogger('hypercorn.error').handlers = []
+        
+        h.restore()
+        assert h.must_fix == False
+        assert h.access_hndl == logging.getLogger('hypercorn.access').handlers
+        assert h.error_hndl == logging.getLogger('hypercorn.error').handlers
+        output = capsys.readouterr().out.rstrip()
+        assert "* Fix hypercorn.access setting" in output
+        assert "* Fix hypercorn.error setting" in output
+
+        h.restore()  # second restore do nothing
+        assert h.must_fix == False
+        output = capsys.readouterr().out.rstrip()
+        assert output == ''
+
+        h.save()     # save the same values second time
+        assert h.must_fix == True
+
+        h.restore()  # restore without changing the handlers
+        assert h.must_fix == False
+        output = capsys.readouterr().out.rstrip()
+        assert output == ''
+
+
+class TestApp:
+    @pytest.mark.asyncio
+    async def test_ready(self):
+        """Test the ready route."""
+
+        ProxyState.set_up(False)
+        client = app.test_client()
+        response = await client.get('/-/ready')
+        assert response.status_code == 503
+        result = await response.get_data()
+        assert result == b"Not ready"
+
+        ProxyState.set_up(True)
+        response = await client.get('/-/ready')
+        assert response.status_code == 200
+        result = await response.get_data()
+        assert result == b"Is ready"
+
+    @pytest.mark.asyncio
+    async def test_healthy(self):
+        """Test the healthy route."""
+
+        ProxyState.set_up(False)
+        client = app.test_client()
+        response = await client.get('/-/healthy')
+        assert response.status_code == 200
+        result = await response.get_data()
+        assert result == b"I'm fine"
+
+        ProxyState.set_up(True)
+        response = await client.get('/-/healthy')
+        assert response.status_code == 200
+        result = await response.get_data()
+        assert result == b"I'm fine"

-    ProxyState.set_up(True)
-    response = await client.get('/-/healthy')
-    assert response.status_code == 200
-    result = await response.get_data()
-    assert result == b"I'm fine"
--- a/app/tests/test_solarman.py
+++ b/app/tests/test_solarman.py
@@ -79,6 +79,7 @@ class MemoryStream(SolarmanV5):
        self.key = ''
        self.data = ''
        self.msg_recvd = []
+        

    def write_cb(self):
        if self.test_exception_async_write:
@@ -855,7 +856,8 @@ def config_tsun_scan_dcu():
 def config_tsun_dcu1():
    Config.act_config = {'solarman':{'enabled': True},'batteries':{'4100000000000001':{'monitor_sn': 2070233888, 'node_id':'inv1/', 'modbus_polling': True, 'suggested_area':'roof', 'sensor_list': 0}}}

-def test_read_message(device_ind_msg):
+@pytest.mark.asyncio
+async def test_read_message(device_ind_msg):
    Config.act_config = {'solarman':{'enabled': True}}
    m = MemoryStream(device_ind_msg, (0,))
    m.read()         # read complete msg, and dispatch msg
@@ -873,10 +875,12 @@ def test_read_message(device_ind_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_invalid_start_byte(invalid_start_byte, device_ind_msg):
+@pytest.mark.asyncio
+async def test_invalid_start_byte(invalid_start_byte, device_ind_msg):
    # received a message with wrong start byte plus an valid message
    # the complete receive buffer must be cleared to 
    # find the next valid message
+    Config.act_config = {'solarman':{'enabled': True}}
    m = MemoryStream(invalid_start_byte, (0,))
    m.append_msg(device_ind_msg)
    m.read()         # read complete msg, and dispatch msg
@@ -894,10 +898,12 @@ def test_invalid_start_byte(invalid_start_byte, device_ind_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
    m.close()

-def test_invalid_stop_byte(invalid_stop_byte):
+@pytest.mark.asyncio
+async def test_invalid_stop_byte(invalid_stop_byte):
    # received a message with wrong stop byte
    # the complete receive buffer must be cleared to 
    # find the next valid message
+    Config.act_config = {'solarman':{'enabled': True}}
    m = MemoryStream(invalid_stop_byte, (0,))
    m.read()         # read complete msg, and dispatch msg
    assert not m.header_valid  # must be invalid, since start byte is wrong
@@ -914,9 +920,11 @@ def test_invalid_stop_byte(invalid_stop_byte):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
    m.close()

-def test_invalid_stop_byte2(invalid_stop_byte, device_ind_msg):
+@pytest.mark.asyncio
+async def test_invalid_stop_byte2(invalid_stop_byte, device_ind_msg):
    # received a message with wrong stop byte plus an valid message
    # only the first message must be discarded
+    Config.act_config = {'solarman':{'enabled': True}}
    m = MemoryStream(invalid_stop_byte, (0,))
    m.append_msg(device_ind_msg)

@@ -939,11 +947,13 @@ def test_invalid_stop_byte2(invalid_stop_byte, device_ind_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
    m.close()

-def test_invalid_stop_start_byte(invalid_stop_byte, invalid_start_byte):
+@pytest.mark.asyncio
+async def test_invalid_stop_start_byte(invalid_stop_byte, invalid_start_byte):
    # received a message with wrong stop byte plus an invalid message
    # with fron start byte
    # the complete receive buffer must be cleared to 
    # find the next valid message
+    Config.act_config = {'solarman':{'enabled': True}}
    m = MemoryStream(invalid_stop_byte, (0,))
    m.append_msg(invalid_start_byte)
    m.read()         # read complete msg, and dispatch msg
@@ -961,9 +971,11 @@ def test_invalid_stop_start_byte(invalid_stop_byte, invalid_start_byte):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
    m.close()

-def test_invalid_checksum(invalid_checksum, device_ind_msg):
+@pytest.mark.asyncio
+async def test_invalid_checksum(invalid_checksum, device_ind_msg):
    # received a message with wrong checksum plus an valid message
    # only the first message must be discarded
+    Config.act_config = {'solarman':{'enabled': True}}
    m = MemoryStream(invalid_checksum, (0,))
    m.append_msg(device_ind_msg)

@@ -985,7 +997,8 @@ def test_invalid_checksum(invalid_checksum, device_ind_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
    m.close()

-def test_read_message_twice(config_no_tsun_inv1, device_ind_msg, device_rsp_msg):
+@pytest.mark.asyncio
+async def test_read_message_twice(config_no_tsun_inv1, device_ind_msg, device_rsp_msg):
    _ = config_no_tsun_inv1
    m = MemoryStream(device_ind_msg, (0,))
    m.append_msg(device_ind_msg)
@@ -1006,7 +1019,9 @@ def test_read_message_twice(config_no_tsun_inv1, device_ind_msg, device_rsp_msg)
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_read_message_in_chunks(device_ind_msg):
+@pytest.mark.asyncio
+async def test_read_message_in_chunks(device_ind_msg):
+    Config.act_config = {'solarman':{'enabled': True}}
    m = MemoryStream(device_ind_msg, (4,11,0))
    m.read()        # read 4 bytes, header incomplere
    assert not m.header_valid  # must be invalid, since header not complete
@@ -1027,7 +1042,8 @@ def test_read_message_in_chunks(device_ind_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_read_message_in_chunks2(config_tsun_inv1, device_ind_msg):
+@pytest.mark.asyncio
+async def test_read_message_in_chunks2(my_loop, config_tsun_inv1, device_ind_msg):
    _ = config_tsun_inv1
    m = MemoryStream(device_ind_msg, (4,10,0))
    m.read()        # read 4 bytes, header incomplere
@@ -1052,7 +1068,8 @@ def test_read_message_in_chunks2(config_tsun_inv1, device_ind_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_read_two_messages(config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg):
+@pytest.mark.asyncio
+async def test_read_two_messages(my_loop, config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg):
    _ = config_tsun_allow_all
    m = MemoryStream(device_ind_msg, (0,))
    m.append_msg(inverter_ind_msg)
@@ -1080,7 +1097,8 @@ def test_read_two_messages(config_tsun_allow_all, device_ind_msg, device_rsp_msg
    assert m.ifc.tx_fifo.get()==b''
    m.close()

-def test_read_two_messages2(config_tsun_allow_all, inverter_ind_msg, inverter_ind_msg_81, inverter_rsp_msg, inverter_rsp_msg_81):
+@pytest.mark.asyncio
+async def test_read_two_messages2(my_loop, config_tsun_allow_all, inverter_ind_msg, inverter_ind_msg_81, inverter_rsp_msg, inverter_rsp_msg_81):
    _ = config_tsun_allow_all
    m = MemoryStream(inverter_ind_msg, (0,))
    m.append_msg(inverter_ind_msg_81)
@@ -1105,7 +1123,8 @@ def test_read_two_messages2(config_tsun_allow_all, inverter_ind_msg, inverter_in
    assert m.ifc.tx_fifo.get()==b''
    m.close()

-def test_read_two_messages3(config_tsun_allow_all, device_ind_msg2, device_rsp_msg2, inverter_ind_msg, inverter_rsp_msg):
+@pytest.mark.asyncio
+async def test_read_two_messages3(my_loop, config_tsun_allow_all, device_ind_msg2, device_rsp_msg2, inverter_ind_msg, inverter_rsp_msg):
    # test device message received after the inverter masg
    _ = config_tsun_allow_all
    m = MemoryStream(inverter_ind_msg, (0,))
@@ -1134,7 +1153,8 @@ def test_read_two_messages3(config_tsun_allow_all, device_ind_msg2, device_rsp_m
    assert m.ifc.tx_fifo.get()==b''
    m.close()

-def test_read_two_messages4(config_tsun_dcu1, dcu_dev_ind_msg, dcu_dev_rsp_msg, dcu_data_ind_msg, dcu_data_rsp_msg):
+@pytest.mark.asyncio
+async def test_read_two_messages4(my_loop, config_tsun_dcu1, dcu_dev_ind_msg, dcu_dev_rsp_msg, dcu_data_ind_msg, dcu_data_rsp_msg):
    _ = config_tsun_dcu1
    m = MemoryStream(dcu_dev_ind_msg, (0,))
    m.append_msg(dcu_data_ind_msg)
@@ -1162,7 +1182,8 @@ def test_read_two_messages4(config_tsun_dcu1, dcu_dev_ind_msg, dcu_dev_rsp_msg,
    assert m.ifc.tx_fifo.get()==b''
    m.close()

-def test_unkown_frame_code(config_tsun_inv1, inverter_ind_msg_81, inverter_rsp_msg_81):
+@pytest.mark.asyncio
+async def test_unkown_frame_code(my_loop, config_tsun_inv1, inverter_ind_msg_81, inverter_rsp_msg_81):
    _ = config_tsun_inv1
    m = MemoryStream(inverter_ind_msg_81, (0,))
    m.read()         # read complete msg, and dispatch msg
@@ -1180,7 +1201,8 @@ def test_unkown_frame_code(config_tsun_inv1, inverter_ind_msg_81, inverter_rsp_m
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_unkown_message(config_tsun_inv1, unknown_msg):
+@pytest.mark.asyncio
+async def test_unkown_message(my_loop, config_tsun_inv1, unknown_msg):
    _ = config_tsun_inv1
    m = MemoryStream(unknown_msg, (0,))
    m.read()         # read complete msg, and dispatch msg
@@ -1198,7 +1220,8 @@ def test_unkown_message(config_tsun_inv1, unknown_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_device_rsp(config_tsun_inv1, device_rsp_msg):
+@pytest.mark.asyncio
+async def test_device_rsp(my_loop, config_tsun_inv1, device_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(device_rsp_msg, (0,), False)
    m.read()         # read complete msg, and dispatch msg
@@ -1216,7 +1239,8 @@ def test_device_rsp(config_tsun_inv1, device_rsp_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_inverter_rsp(config_tsun_inv1, inverter_rsp_msg):
+@pytest.mark.asyncio
+async def test_inverter_rsp(my_loop, config_tsun_inv1, inverter_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(inverter_rsp_msg, (0,), False)
    m.read()         # read complete msg, and dispatch msg
@@ -1234,7 +1258,8 @@ def test_inverter_rsp(config_tsun_inv1, inverter_rsp_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_heartbeat_ind(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
+@pytest.mark.asyncio
+async def test_heartbeat_ind(my_loop, config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(heartbeat_ind_msg, (0,))
    m.read()         # read complete msg, and dispatch msg
@@ -1251,7 +1276,8 @@ def test_heartbeat_ind(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_heartbeat_ind2(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
+@pytest.mark.asyncio
+async def test_heartbeat_ind2(my_loop, config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(heartbeat_ind_msg, (0,))
    m.no_forwarding = True
@@ -1269,7 +1295,8 @@ def test_heartbeat_ind2(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_heartbeat_rsp(config_tsun_inv1, heartbeat_rsp_msg):
+@pytest.mark.asyncio
+async def test_heartbeat_rsp(my_loop, config_tsun_inv1, heartbeat_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(heartbeat_rsp_msg, (0,), False)
    m.read()         # read complete msg, and dispatch msg
@@ -1287,7 +1314,8 @@ def test_heartbeat_rsp(config_tsun_inv1, heartbeat_rsp_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_sync_start_ind(config_tsun_inv1, sync_start_ind_msg, sync_start_rsp_msg, sync_start_fwd_msg):
+@pytest.mark.asyncio
+async def test_sync_start_ind(my_loop, config_tsun_inv1, sync_start_ind_msg, sync_start_rsp_msg, sync_start_fwd_msg):
    _ = config_tsun_inv1
    m = MemoryStream(sync_start_ind_msg, (0,))
    m.read()         # read complete msg, and dispatch msg
@@ -1310,7 +1338,8 @@ def test_sync_start_ind(config_tsun_inv1, sync_start_ind_msg, sync_start_rsp_msg

    m.close()

-def test_sync_start_rsp(config_tsun_inv1, sync_start_rsp_msg):
+@pytest.mark.asyncio
+async def test_sync_start_rsp(my_loop, config_tsun_inv1, sync_start_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(sync_start_rsp_msg, (0,), False)
    m.read()         # read complete msg, and dispatch msg
@@ -1328,7 +1357,8 @@ def test_sync_start_rsp(config_tsun_inv1, sync_start_rsp_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_sync_end_ind(config_tsun_inv1, sync_end_ind_msg, sync_end_rsp_msg):
+@pytest.mark.asyncio
+async def test_sync_end_ind(my_loop, config_tsun_inv1, sync_end_ind_msg, sync_end_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(sync_end_ind_msg, (0,))
    m.read()         # read complete msg, and dispatch msg
@@ -1345,7 +1375,8 @@ def test_sync_end_ind(config_tsun_inv1, sync_end_ind_msg, sync_end_rsp_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_sync_end_rsp(config_tsun_inv1, sync_end_rsp_msg):
+@pytest.mark.asyncio
+async def test_sync_end_rsp(my_loop, config_tsun_inv1, sync_end_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(sync_end_rsp_msg, (0,), False)
    m.read()         # read complete msg, and dispatch msg
@@ -1363,7 +1394,8 @@ def test_sync_end_rsp(config_tsun_inv1, sync_end_rsp_msg):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_build_modell_600(config_tsun_allow_all, inverter_ind_msg):
+@pytest.mark.asyncio
+async def test_build_modell_600(my_loop, config_tsun_allow_all, inverter_ind_msg):
    _ = config_tsun_allow_all
    m = MemoryStream(inverter_ind_msg, (0,))
    assert 0 == m.sensor_list
@@ -1382,7 +1414,8 @@ def test_build_modell_600(config_tsun_allow_all, inverter_ind_msg):
    assert m.ifc.tx_fifo.get()==b''
    m.close()

-def test_build_modell_1600(config_tsun_allow_all, inverter_ind_msg1600):
+@pytest.mark.asyncio
+async def test_build_modell_1600(my_loop, config_tsun_allow_all, inverter_ind_msg1600):
    _ = config_tsun_allow_all
    m = MemoryStream(inverter_ind_msg1600, (0,))
    assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
@@ -1394,7 +1427,8 @@ def test_build_modell_1600(config_tsun_allow_all, inverter_ind_msg1600):
    assert 'TSOL-MS1600' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
    m.close()

-def test_build_modell_1800(config_tsun_allow_all, inverter_ind_msg1800):
+@pytest.mark.asyncio
+async def test_build_modell_1800(my_loop, config_tsun_allow_all, inverter_ind_msg1800):
    _ = config_tsun_allow_all
    m = MemoryStream(inverter_ind_msg1800, (0,))
    assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
@@ -1406,7 +1440,8 @@ def test_build_modell_1800(config_tsun_allow_all, inverter_ind_msg1800):
    assert 'TSOL-MS1800' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
    m.close()

-def test_build_modell_2000(config_tsun_allow_all, inverter_ind_msg2000):
+@pytest.mark.asyncio
+async def test_build_modell_2000(my_loop, config_tsun_allow_all, inverter_ind_msg2000):
    _ = config_tsun_allow_all
    m = MemoryStream(inverter_ind_msg2000, (0,))
    assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
@@ -1418,7 +1453,8 @@ def test_build_modell_2000(config_tsun_allow_all, inverter_ind_msg2000):
    assert 'TSOL-MS2000' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
    m.close()

-def test_build_modell_800(config_tsun_allow_all, inverter_ind_msg800):
+@pytest.mark.asyncio
+async def test_build_modell_800(my_loop, config_tsun_allow_all, inverter_ind_msg800):
    _ = config_tsun_allow_all
    m = MemoryStream(inverter_ind_msg800, (0,))
    assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
@@ -1430,7 +1466,8 @@ def test_build_modell_800(config_tsun_allow_all, inverter_ind_msg800):
    assert 'TSOL-MSxx00' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
    m.close()

-def test_build_logger_modell(config_tsun_allow_all, device_ind_msg):
+@pytest.mark.asyncio
+async def test_build_logger_modell(my_loop, config_tsun_allow_all, device_ind_msg):
    _ = config_tsun_allow_all
    m = MemoryStream(device_ind_msg, (0,))
    assert 0 == m.db.get_db_value(Register.COLLECTOR_FW_VERSION, 0)
@@ -1441,7 +1478,8 @@ def test_build_logger_modell(config_tsun_allow_all, device_ind_msg):
    assert 'V1.1.00.0B' == m.db.get_db_value(Register.COLLECTOR_FW_VERSION, 0).rstrip('\00')
    m.close()

-def test_msg_iterator():
+@pytest.mark.asyncio
+async def test_msg_iterator(my_loop, config_tsun_inv1):
    Message._registry.clear()
    m1 = SolarmanV5(None, ('test1.local', 1234), ifc=AsyncIfcImpl(), server_side=True, client_mode=False)
    m2 = SolarmanV5(None, ('test2.local', 1234), ifc=AsyncIfcImpl(), server_side=True, client_mode=False)
@@ -1462,7 +1500,8 @@ def test_msg_iterator():
    assert test1 == 1
    assert test2 == 1

-def test_proxy_counter():
+@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 == {}
    m.db.stat['proxy']['Unknown_Msg'] = 0
@@ -1481,7 +1520,7 @@ def test_proxy_counter():
    m.close()

@pytest.mark.asyncio
-async def test_msg_build_modbus_req(config_tsun_inv1, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, msg_modbus_cmd):
+async def test_msg_build_modbus_req(my_loop, config_tsun_inv1, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, msg_modbus_cmd):
    _ = config_tsun_inv1
    m = MemoryStream(device_ind_msg, (0,), True)
    m.read()
@@ -1516,7 +1555,7 @@ async def test_msg_build_modbus_req(config_tsun_inv1, device_ind_msg, device_rsp
    m.close()

@pytest.mark.asyncio
-async def test_at_cmd(config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, at_command_ind_msg, at_command_rsp_msg):
+async def test_at_cmd(my_loop, config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, at_command_ind_msg, at_command_rsp_msg):
    _ = config_tsun_allow_all
    m = MemoryStream(device_ind_msg, (0,), True)
    m.read()   # read device ind
@@ -1576,7 +1615,7 @@ async def test_at_cmd(config_tsun_allow_all, device_ind_msg, device_rsp_msg, inv
    m.close()

@pytest.mark.asyncio
-async def test_at_cmd_blocked(config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, at_command_ind_msg):
+async def test_at_cmd_blocked(my_loop, config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, at_command_ind_msg):
    _ = config_tsun_allow_all
    m = MemoryStream(device_ind_msg, (0,), True)
    m.read()
@@ -1610,7 +1649,8 @@ async def test_at_cmd_blocked(config_tsun_allow_all, device_ind_msg, device_rsp_
    assert Proxy.mqtt.data == "'AT+WEBU' is forbidden"
    m.close()

-def test_at_cmd_ind(config_tsun_inv1, at_command_ind_msg, at_command_rsp_msg):
+@pytest.mark.asyncio
+async def test_at_cmd_ind(my_loop, config_tsun_inv1, at_command_ind_msg, at_command_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(at_command_ind_msg, (0,), False)
    m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1645,7 +1685,8 @@ def test_at_cmd_ind(config_tsun_inv1, at_command_ind_msg, at_command_rsp_msg):

    m.close()

-def test_at_cmd_ind_block(config_tsun_inv1, at_command_ind_msg_block):
+@pytest.mark.asyncio
+async def test_at_cmd_ind_block(my_loop, config_tsun_inv1, at_command_ind_msg_block):
    _ = config_tsun_inv1
    m = MemoryStream(at_command_ind_msg_block, (0,), False)
    m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1673,7 +1714,8 @@ def test_at_cmd_ind_block(config_tsun_inv1, at_command_ind_msg_block):
    assert Proxy.mqtt.data == ""
    m.close()

-def test_msg_at_command_rsp1(config_tsun_inv1, at_command_rsp_msg):
+@pytest.mark.asyncio
+async def test_msg_at_command_rsp1(my_loop, config_tsun_inv1, at_command_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(at_command_rsp_msg)
    m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1692,7 +1734,8 @@ def test_msg_at_command_rsp1(config_tsun_inv1, at_command_rsp_msg):
    assert m.db.stat['proxy']['Modbus_Command'] == 0
    m.close()

-def test_msg_at_command_rsp2(config_tsun_inv1, at_command_rsp_msg):
+@pytest.mark.asyncio
+async def test_msg_at_command_rsp2(my_loop, config_tsun_inv1, at_command_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(at_command_rsp_msg)
    m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1713,7 +1756,8 @@ def test_msg_at_command_rsp2(config_tsun_inv1, at_command_rsp_msg):
    assert Proxy.mqtt.data == "+ok"
    m.close()

-def test_msg_at_command_rsp3(config_tsun_inv1, at_command_interim_rsp_msg):
+@pytest.mark.asyncio
+async def test_msg_at_command_rsp3(my_loop, config_tsun_inv1, at_command_interim_rsp_msg):
    _ = config_tsun_inv1
    m = MemoryStream(at_command_interim_rsp_msg)
    m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1738,7 +1782,8 @@ def test_msg_at_command_rsp3(config_tsun_inv1, at_command_interim_rsp_msg):
    assert Proxy.mqtt.data == ""
    m.close()

-def test_msg_modbus_req(config_tsun_inv1, msg_modbus_cmd, msg_modbus_cmd_fwd):
+@pytest.mark.asyncio
+async def test_msg_modbus_req(my_loop, config_tsun_inv1, msg_modbus_cmd, msg_modbus_cmd_fwd):
    _ = config_tsun_inv1
    m = MemoryStream(b'')
    m.snr = get_sn_int()
@@ -1766,7 +1811,8 @@ def test_msg_modbus_req(config_tsun_inv1, msg_modbus_cmd, msg_modbus_cmd_fwd):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_msg_modbus_req_seq(config_tsun_inv1, msg_modbus_cmd_seq):
+@pytest.mark.asyncio
+async def test_msg_modbus_req_seq(my_loop, config_tsun_inv1, msg_modbus_cmd_seq):
    _ = config_tsun_inv1
    m = MemoryStream(b'')
    m.snr = get_sn_int()
@@ -1794,7 +1840,8 @@ def test_msg_modbus_req_seq(config_tsun_inv1, msg_modbus_cmd_seq):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_msg_modbus_req2(config_tsun_inv1, msg_modbus_cmd_crc_err):
+@pytest.mark.asyncio
+async def test_msg_modbus_req2(my_loop, config_tsun_inv1, msg_modbus_cmd_crc_err):
    _ = config_tsun_inv1
    m = MemoryStream(b'')
    m.snr = get_sn_int()
@@ -1821,7 +1868,8 @@ def test_msg_modbus_req2(config_tsun_inv1, msg_modbus_cmd_crc_err):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
    m.close()

-def test_msg_unknown_cmd_req(config_tsun_inv1, msg_unknown_cmd):
+@pytest.mark.asyncio
+async def test_msg_unknown_cmd_req(my_loop, config_tsun_inv1, msg_unknown_cmd):
    _ = config_tsun_inv1
    m = MemoryStream(msg_unknown_cmd, (0,), False)
    m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1843,7 +1891,8 @@ def test_msg_unknown_cmd_req(config_tsun_inv1, msg_unknown_cmd):
    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
    m.close()

-def test_msg_modbus_rsp1(config_tsun_inv1, msg_modbus_rsp):
+@pytest.mark.asyncio
+async def test_msg_modbus_rsp1(my_loop, config_tsun_inv1, msg_modbus_rsp):
    '''Modbus response without a valid Modbus request must be dropped'''
    _ = config_tsun_inv1
    m = MemoryStream(msg_modbus_rsp)
@@ -1862,7 +1911,8 @@ def test_msg_modbus_rsp1(config_tsun_inv1, msg_modbus_rsp):
    assert m.db.stat['proxy']['Modbus_Command'] == 0
    m.close()

-def test_msg_modbus_rsp2(config_tsun_inv1, msg_modbus_rsp):
+@pytest.mark.asyncio
+async def test_msg_modbus_rsp2(my_loop, config_tsun_inv1, msg_modbus_rsp):
    '''Modbus response with a valid Modbus request must be forwarded'''
    _ = config_tsun_inv1  # setup config structure
    m = MemoryStream(msg_modbus_rsp)
@@ -1899,7 +1949,8 @@ def test_msg_modbus_rsp2(config_tsun_inv1, msg_modbus_rsp):

    m.close()

-def test_msg_modbus_rsp3(config_tsun_inv1, msg_modbus_rsp):
+@pytest.mark.asyncio
+async def test_msg_modbus_rsp3(my_loop, config_tsun_inv1, msg_modbus_rsp):
    '''Modbus response with a valid Modbus request must be forwarded'''
    _ = config_tsun_inv1
    m = MemoryStream(msg_modbus_rsp)
@@ -1935,7 +1986,8 @@ def test_msg_modbus_rsp3(config_tsun_inv1, msg_modbus_rsp):

    m.close()

-def test_msg_unknown_rsp(config_tsun_inv1, msg_unknown_cmd_rsp):
+@pytest.mark.asyncio
+async def test_msg_unknown_rsp(my_loop, config_tsun_inv1, msg_unknown_cmd_rsp):
    _ = config_tsun_inv1
    m = MemoryStream(msg_unknown_cmd_rsp)
    m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1953,7 +2005,8 @@ def test_msg_unknown_rsp(config_tsun_inv1, msg_unknown_cmd_rsp):
    assert m.db.stat['proxy']['Modbus_Command'] == 0
    m.close()

-def test_msg_modbus_invalid(config_tsun_inv1, msg_modbus_invalid):
+@pytest.mark.asyncio
+async def test_msg_modbus_invalid(my_loop, config_tsun_inv1, msg_modbus_invalid):
    _ = config_tsun_inv1
    m = MemoryStream(msg_modbus_invalid, (0,), False)
    m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1967,7 +2020,8 @@ def test_msg_modbus_invalid(config_tsun_inv1, msg_modbus_invalid):
    assert m.db.stat['proxy']['Modbus_Command'] == 0
    m.close()

-def test_msg_modbus_fragment(config_tsun_inv1, msg_modbus_rsp):
+@pytest.mark.asyncio
+async def test_msg_modbus_fragment(my_loop, config_tsun_inv1, msg_modbus_rsp):
    _ = config_tsun_inv1
    # receive more bytes than expected (7 bytes from the next msg)
    m = MemoryStream(msg_modbus_rsp+b'\x00\x00\x00\x45\x10\x52\x31', (0,))
@@ -1993,7 +2047,7 @@ def test_msg_modbus_fragment(config_tsun_inv1, msg_modbus_rsp):
    m.close()

@pytest.mark.asyncio
-async def test_modbus_polling(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
+async def test_modbus_polling(my_loop, config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
    _ = config_tsun_inv1
    assert asyncio.get_running_loop()
    m = MemoryStream(heartbeat_ind_msg, (0,))
@@ -2106,7 +2160,7 @@ async def test_modbus_scaning(config_tsun_scan, heartbeat_ind_msg, heartbeat_rsp
    m.close()

@pytest.mark.asyncio
-async def test_start_client_mode(config_tsun_inv1, str_test_ip):
+async def test_start_client_mode(my_loop, config_tsun_inv1, str_test_ip):
    _ = config_tsun_inv1
    assert asyncio.get_running_loop()
    m = MemoryStream(b'')
@@ -2210,7 +2264,8 @@ async def test_start_client_mode_scan(config_tsun_scan_dcu, str_test_ip, dcu_mod
    
    m.close()

-def test_timeout(config_tsun_inv1):
+@pytest.mark.asyncio
+async def test_timeout(my_loop, config_tsun_inv1):
    _ = config_tsun_inv1
    m = MemoryStream(b'')
    assert m.state == State.init
@@ -2223,7 +2278,8 @@ def test_timeout(config_tsun_inv1):
    m.state = State.closed
    m.close()

-def test_fnc_dispatch():
+@pytest.mark.asyncio
+async def test_fnc_dispatch(my_loop, config_tsun_inv1):
    def msg():
        return
    
@@ -2244,7 +2300,8 @@ def test_fnc_dispatch():
    assert _obj == m.msg_unknown
    assert _str == "'msg_unknown'"

-def test_timestamp():
+@pytest.mark.asyncio
+async def test_timestamp(my_loop, config_tsun_inv1):
    m = MemoryStream(b'')
    ts = m._timestamp()
    ts_emu = m._emu_timestamp()
@@ -2271,7 +2328,7 @@ class InverterTest(InverterBase):


@pytest.mark.asyncio
-async def test_proxy_at_cmd(config_tsun_inv1, patch_open_connection, at_command_ind_msg, at_command_rsp_msg):
+async def test_proxy_at_cmd(my_loop, config_tsun_inv1, patch_open_connection, at_command_ind_msg, at_command_rsp_msg):
    _ = config_tsun_inv1
    _ = patch_open_connection
    assert asyncio.get_running_loop()
@@ -2309,7 +2366,7 @@ async def test_proxy_at_cmd(config_tsun_inv1, patch_open_connection, at_command_
        assert Proxy.mqtt.data == ""

@pytest.mark.asyncio
-async def test_proxy_at_blocked(config_tsun_inv1, patch_open_connection, at_command_ind_msg_block, at_command_rsp_msg):
+async def test_proxy_at_blocked(my_loop, config_tsun_inv1, patch_open_connection, at_command_ind_msg_block, at_command_rsp_msg):
    _ = config_tsun_inv1
    _ = patch_open_connection
    assert asyncio.get_running_loop()
--- a/app/tests/test_solarman_emu.py
+++ b/app/tests/test_solarman_emu.py
@@ -9,6 +9,9 @@ from infos import Infos, Register
 from test_solarman import FakeIfc, FakeInverter, MemoryStream, get_sn_int, get_sn, correct_checksum, config_tsun_inv1, msg_modbus_rsp
 from test_infos_g3p import str_test_ip, bytes_test_ip

+
+pytest_plugins = ('pytest_asyncio',)
+
 timestamp = 0x3224c8bc

 class InvStream(MemoryStream):
@@ -125,17 +128,17 @@ def heartbeat_ind():
    msg  = b'\xa5\x01\x00\x10G\x00\x01\x00\x00\x00\x00\x00Y\x15'
    return msg

-def test_emu_init_close():
-    # received a message with wrong start byte plus an valid message
-    # the complete receive buffer must be cleared to 
-    # find the next valid message
+@pytest.mark.asyncio
+async def test_emu_init_close(my_loop, config_tsun_inv1):
+    _ = config_tsun_inv1
+    assert asyncio.get_running_loop()
    inv = InvStream()
    cld = CldStream(inv)
    cld.close()


@pytest.mark.asyncio
-async def test_emu_start(config_tsun_inv1, msg_modbus_rsp, str_test_ip, device_ind_msg):
+async def test_emu_start(my_loop, config_tsun_inv1, msg_modbus_rsp, str_test_ip, device_ind_msg):
    _ = config_tsun_inv1
    assert asyncio.get_running_loop()
    inv = InvStream(msg_modbus_rsp)
@@ -152,7 +155,8 @@ async def test_emu_start(config_tsun_inv1, msg_modbus_rsp, str_test_ip, device_i
    assert inv.ifc.fwd_fifo.peek() == device_ind_msg
    cld.close()

-def test_snd_hb(config_tsun_inv1, heartbeat_ind):
+@pytest.mark.asyncio
+async def test_snd_hb(my_loop, config_tsun_inv1, heartbeat_ind):
    _ = config_tsun_inv1
    inv = InvStream()
    cld = CldStream(inv)
@@ -163,7 +167,7 @@ def test_snd_hb(config_tsun_inv1, heartbeat_ind):
    cld.close()

@pytest.mark.asyncio
-async def test_snd_inv_data(config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg):
+async def test_snd_inv_data(my_loop, config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg):
    _ = config_tsun_inv1
    inv = InvStream()
    inv.db.set_db_def_value(Register.INVERTER_STATUS, 1)
@@ -205,7 +209,7 @@ async def test_snd_inv_data(config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg
    cld.close()

@pytest.mark.asyncio
-async def test_rcv_invalid(config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg):
+async def test_rcv_invalid(my_loop, config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg):
    _ = config_tsun_inv1
    inv = InvStream()
    assert asyncio.get_running_loop() == inv.mb_timer.loop
--- a/app/tests/test_talent.py
+++ b/app/tests/test_talent.py
@@ -1048,7 +1048,8 @@ def msg_inverter_ms3000_ind(): # Data indication from the controller
    msg +=  b'\x53\x00\x66'                                                      #  | S.f'
    return msg

-def test_read_message(msg_contact_info):
+@pytest.mark.asyncio
+async def test_read_message(msg_contact_info):
    Config.act_config = {'tsun':{'enabled': True}}
    m = MemoryStream(msg_contact_info, (0,))
    m.read()         # read complete msg, and dispatch msg
--- a/app/tests/test_web_route.py
+++ b/app/tests/test_web_route.py
@@ -1,63 +1,272 @@
 # test_with_pytest.py
 import pytest
 from server import app
+from web import Web, web
+from async_stream import AsyncStreamClient
+from gen3plus.inverter_g3p import InverterG3P
+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

 pytest_plugins = ('pytest_asyncio',)

+@pytest.fixture(scope="session")
+def client():
+    app.secret_key = 'super secret key'
+    return app.test_client()
+
+@pytest.fixture
+def create_inverter(config_conn):
+    _ = config_conn
+    inv = InverterG3P(FakeReader(), FakeWriter(), client_mode=False)
+
+    return inv
+
+@pytest.fixture
+def create_inverter_server(config_conn):
+    _ = config_conn
+    inv = InverterG3P(FakeReader(), FakeWriter(), client_mode=False)
+    ifc = AsyncStreamClient(FakeReader(), FakeWriter(), inv.local,
+                            None, inv.use_emulation)
+    inv.remote.ifc = ifc
+
+    return inv
+
+@pytest.fixture
+def create_inverter_client(config_conn):
+    _ = config_conn
+    inv = InverterG3P(FakeReader(), FakeWriter(), client_mode=True)
+    ifc = AsyncStreamClient(FakeReader(), FakeWriter(), inv.local,
+                            None, inv.use_emulation)
+    inv.remote.ifc = ifc
+
+    return inv

@pytest.mark.asyncio
-async def test_home():
+async def test_home(client):
    """Test the home route."""
-    client = app.test_client()
    response = await client.get('/')
    assert response.status_code == 200
    assert response.mimetype == 'text/html'

@pytest.mark.asyncio
-async def test_page():
-    """Test the empty page route."""
-    client = app.test_client()
-    response = await client.get('/page')
+async def test_page(client):
+    """Test the mqtt page route."""
+    response = await client.get('/mqtt')
    assert response.status_code == 200
    assert response.mimetype == 'text/html'

+@pytest.mark.asyncio
+async def test_rel_page(client):
+    """Test the mqtt route."""
+    web.build_relative_urls = True
+    response = await client.get('/mqtt')
+    assert response.status_code == 200
+    assert response.mimetype == 'text/html'
+    web.build_relative_urls = False

@pytest.mark.asyncio
-async def test_favicon96():
+async def test_notes(client):
+    """Test the notes page route."""
+    response = await client.get('/notes')
+    assert response.status_code == 200
+    assert response.mimetype == 'text/html'
+
+@pytest.mark.asyncio
+async def test_logging(client):
+    """Test the logging page route."""
+    response = await client.get('/logging')
+    assert response.status_code == 200
+    assert response.mimetype == 'text/html'
+
+@pytest.mark.asyncio
+async def test_favicon96(client):
    """Test the favicon-96x96.png route."""
-    client = app.test_client()
    response = await client.get('/favicon-96x96.png')
    assert response.status_code == 200
    assert response.mimetype == 'image/png'

@pytest.mark.asyncio
-async def test_favicon():
+async def test_favicon(client):
    """Test the favicon.ico route."""
-    client = app.test_client()
    response = await client.get('/favicon.ico')
    assert response.status_code == 200
    assert response.mimetype == 'image/x-icon'

@pytest.mark.asyncio
-async def test_favicon_svg():
+async def test_favicon_svg(client):
    """Test the favicon.svg route."""
-    client = app.test_client()
    response = await client.get('/favicon.svg')
    assert response.status_code == 200
    assert response.mimetype == 'image/svg+xml'

@pytest.mark.asyncio
-async def test_apple_touch_icon():
+async def test_apple_touch_icon(client):
    """Test the apple-touch-icon.png route."""
-    client = app.test_client()
    response = await client.get('/apple-touch-icon.png')
    assert response.status_code == 200
    assert response.mimetype == 'image/png'

@pytest.mark.asyncio
-async def test_manifest():
+async def test_manifest(client):
    """Test the site.webmanifest route."""
-    client = app.test_client()
    response = await client.get('/site.webmanifest')
    assert response.status_code == 200
    assert response.mimetype == 'application/manifest+json'
+
+@pytest.mark.asyncio
+async def test_data_fetch(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
+
+@pytest.mark.asyncio
+async def test_data_fetch1(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
+
+@pytest.mark.asyncio
+async def test_data_fetch2(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
+
+@pytest.mark.asyncio
+async def test_language_en(client):
+    """Test the language/en route and cookie."""
+    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'
+
+    client.set_cookie('test', key='language', value='de')
+    response = await client.get('/mqtt')
+    assert response.status_code == 200
+    assert response.mimetype == 'text/html'
+
+@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'
+
+
+@pytest.mark.asyncio
+async def test_language_unknown(client):
+    """Test the language/unknown route."""
+    response = await client.get('/language/unknown')
+    assert response.status_code == 404
+    assert response.mimetype == 'text/html'
+
+
+@pytest.mark.asyncio
+async def test_mqtt_fetch(client, create_inverter):
+    """Test the mqtt-fetch route."""
+    _ = create_inverter
+    Proxy.class_init()
+
+    response = await client.get('/mqtt-fetch')
+    assert response.status_code == 200
+
+
+@pytest.mark.asyncio
+async def test_notes_fetch(client, config_conn):
+    """Test the notes-fetch route."""
+    _ = create_inverter
+
+    response = await client.get('/notes-fetch')
+    assert response.status_code == 200
+
+
+@pytest.mark.asyncio
+async def test_file_fetch(client, config_conn):
+    """Test the data-fetch route."""
+    _ = config_conn
+    assert Config.log_path == 'app/tests/log/'
+    response = await client.get('/file-fetch')
+    assert response.status_code == 200
+
+
+@pytest.mark.asyncio
+async def test_send_file(client, config_conn):
+    """Test the send-file route."""
+    _ = config_conn
+    assert Config.log_path == 'app/tests/log/'
+    response = await client.get('/send-file/test.txt')
+    assert response.status_code == 200
+
+
+@pytest.mark.asyncio
+async def test_missing_send_file(client, config_conn):
+    """Test the send-file route (file not found)."""
+    _ = config_conn
+    assert Config.log_path == 'app/tests/log/'
+    response = await client.get('/send-file/no_file.log')
+    assert response.status_code == 404
+
+
+@pytest.mark.asyncio
+async def test_invalid_send_file(client, config_conn):
+    """Test the send-file route (invalid filename)."""
+    _ = config_conn
+    assert Config.log_path == 'app/tests/log/'
+    response = await client.get('/send-file/../test_web_route.py')
+    assert response.status_code == 404
+
+@pytest.fixture
+def patch_os_remove_err():
+    def new_remove(file_path: str):
+        raise OSError(errno.ENOENT, os.strerror(errno.ENOENT), file_path)
+
+
+    with patch.object(os, 'remove', new_remove) as wrapped_os:
+        yield wrapped_os
+
+@pytest.fixture
+def patch_os_remove_ok():
+    def new_remove(file_path: str):
+        return
+
+    with patch.object(os, 'remove', new_remove) as wrapped_os:
+        yield wrapped_os
+
+@pytest.mark.asyncio
+async def test_del_file_ok(client, config_conn, patch_os_remove_ok):
+    """Test the del-file route with no error."""
+    _ = config_conn
+    _ = patch_os_remove_ok
+    assert Config.log_path == 'app/tests/log/'
+    response = await client.delete ('/del-file/test.txt')
+    assert response.status_code == 204
+
+
+@pytest.mark.asyncio
+async def test_del_file_err(client, config_conn, patch_os_remove_err):
+    """Test the send-file route with OSError."""
+    _ = 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
--- a/app/translations/de/LC_MESSAGES/messages.po
+++ b/app/translations/de/LC_MESSAGES/messages.po
@@ -0,0 +1,195 @@
+# German translations for tsun-gen3-proxy.
+# Copyright (C) 2025 ORGANIZATION
+# This file is distributed under the same license as the tsun-gen3-proxy
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tsun-gen3-proxy 0.14.0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2025-05-04 18:16+0200\n"
+"PO-Revision-Date: 2025-04-18 16:24+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: de\n"
+"Language-Team: de <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.17.0\n"
+
+#: src/web/conn_table.py:52 src/web/templates/base.html.j2:58
+msgid "Connections"
+msgstr "Verbindungen"
+
+#: src/web/conn_table.py:59
+msgid "Device-IP:Port"
+msgstr "Geräte-IP:Port"
+
+#: src/web/conn_table.py:59
+msgid "Device-IP"
+msgstr "Geräte-IP"
+
+#: src/web/conn_table.py:60 src/web/mqtt_table.py:34
+msgid "Serial-No"
+msgstr "Seriennummer"
+
+#: src/web/conn_table.py:61
+msgid "Cloud-IP:Port"
+msgstr "Cloud-IP:Port"
+
+#: src/web/conn_table.py:61
+msgid "Cloud-IP"
+msgstr "Cloud-IP"
+
+#: src/web/mqtt_table.py:27
+msgid "MQTT devices"
+msgstr "MQTT Geräte"
+
+#: src/web/mqtt_table.py:35
+msgid "Node-ID"
+msgstr ""
+
+#: src/web/mqtt_table.py:36
+msgid "HA-Area"
+msgstr ""
+
+#: src/web/templates/base.html.j2:37
+msgid "Updated:"
+msgstr "Aktualisiert:"
+
+#: src/web/templates/base.html.j2:49
+msgid "Version:"
+msgstr ""
+
+#: src/web/templates/base.html.j2:60 src/web/templates/page_notes.html.j2:5
+msgid "Important Messages"
+msgstr "Wichtige Hinweise"
+
+#: src/web/templates/base.html.j2:61 src/web/templates/page_logging.html.j2:5
+msgid "Log Files"
+msgstr "Log Dateien"
+
+#: src/web/templates/page_index.html.j2:3
+msgid "TSUN Proxy - Connections"
+msgstr "TSUN Proxy - Verbindungen"
+
+#: src/web/templates/page_index.html.j2:5
+msgid "Proxy Connection Overview"
+msgstr "Proxy Verbindungen"
+
+#: src/web/templates/page_index.html.j2:17
+msgid "Server Mode"
+msgstr "Server Modus"
+
+#: src/web/templates/page_index.html.j2:18
+msgid "Established from device to proxy"
+msgstr "Vom Gerät zum Proxy aufgebaut"
+
+#: src/web/templates/page_index.html.j2:30
+msgid "Client Mode"
+msgstr "Client Modus"
+
+#: src/web/templates/page_index.html.j2:31
+msgid "Established from proxy to device"
+msgstr "Vom Proxy zum Gerät aufgebaut"
+
+#: src/web/templates/page_index.html.j2:43
+msgid "Proxy Mode"
+msgstr "Proxy Modus"
+
+#: src/web/templates/page_index.html.j2:44
+msgid "Forwarding data to cloud"
+msgstr "Weiterleitung in die Cloud"
+
+#: src/web/templates/page_index.html.j2:56
+msgid "Emu Mode"
+msgstr "Emu Modus"
+
+#: src/web/templates/page_index.html.j2:57
+msgid "Emulation sends data to cloud"
+msgstr "Emulation sendet in die Cloud"
+
+#: src/web/templates/page_logging.html.j2:3
+msgid "TSUN Proxy - Log Files"
+msgstr "TSUN Proxy - Log Dateien"
+
+#: src/web/templates/page_logging.html.j2:10
+msgid "Do you really want to delete the log file"
+msgstr "Soll die Datei wirklich gelöscht werden"
+
+#: src/web/templates/page_logging.html.j2:12
+msgid "Delete File</button"
+msgstr "File löschen"
+
+#: src/web/templates/page_logging.html.j2:13
+msgid "Abort"
+msgstr "Abbruch"
+
+#: src/web/templates/page_mqtt.html.j2:3
+msgid "TSUN Proxy - MQTT Status"
+msgstr ""
+
+#: src/web/templates/page_mqtt.html.j2:5
+msgid "MQTT Overview"
+msgstr "MQTT Überblick"
+
+#: src/web/templates/page_mqtt.html.j2:16
+msgid "Connection Time"
+msgstr "Verbindungszeit"
+
+#: src/web/templates/page_mqtt.html.j2:17
+msgid "Time at which the connection was established"
+msgstr "Zeitpunkt des Verbindungsaufbaus"
+
+#: src/web/templates/page_mqtt.html.j2:29
+msgid "Published Topics"
+msgstr "Gesendete Topics"
+
+#: src/web/templates/page_mqtt.html.j2:30
+msgid "Number of published topics"
+msgstr "Anzahl der veröffentlichten Topics"
+
+#: src/web/templates/page_mqtt.html.j2:42
+msgid "Received Topics"
+msgstr "Empfangene Topics"
+
+#: src/web/templates/page_mqtt.html.j2:43
+msgid "Number of topics received"
+msgstr "Anzahl der empfangenen Topics"
+
+#: src/web/templates/page_notes.html.j2:3
+msgid "TSUN Proxy - Important Messages"
+msgstr "TSUN Proxy - Wichtige Hinweise"
+
+#: src/web/templates/templ_log_files_list.html.j2:11
+msgid "Created"
+msgstr "Erzeugt"
+
+#: src/web/templates/templ_log_files_list.html.j2:11
+msgid "Modified"
+msgstr "Modifiziert"
+
+#: src/web/templates/templ_log_files_list.html.j2:11
+msgid "Size"
+msgstr "Größe"
+
+#: src/web/templates/templ_log_files_list.html.j2:20
+msgid "Download File"
+msgstr "Datei Download"
+
+#: src/web/templates/templ_notes_list.html.j2:3
+msgid "Warnings and error messages"
+msgstr "Warnungen und Fehlermeldungen"
+
+#: src/web/templates/templ_notes_list.html.j2:18
+msgid "Well done!"
+msgstr "Gut gemacht!"
+
+#: src/web/templates/templ_notes_list.html.j2:19
+msgid "No warnings or errors have been logged since the last proxy start."
+msgstr ""
+"Seit dem letzten Proxystart wurden keine Warnungen oder Fehler "
+"protokolliert."
+
--- a/ha_addons/Makefile
+++ b/ha_addons/Makefile
@@ -12,11 +12,14 @@ IMAGE = tsun-gen3-addon
 SRC=../app
 SRC_PROXY=$(SRC)/src
 CNF_PROXY=$(SRC)/config
+TRANSLATION_PROXY=$(SRC)/translations

 # Target folders for building the local add-on and the docker container
 ADDON_PATH = ha_addon
 DST=$(ADDON_PATH)/rootfs
 DST_PROXY=$(DST)/home/proxy
+DST_TRANSLATION=$(DST)/home/translations
+

 # base director of the add-on repro for installing the add-on git repros
 INST_BASE=../../ha-addons
@@ -84,20 +87,23 @@ SRC_FILES := $(wildcard $(SRC_PROXY)/*.py)\
 $(wildcard $(SRC_PROXY)/cnf/*.toml)\
 $(wildcard $(SRC_PROXY)/gen3/*.py)\
 $(wildcard $(SRC_PROXY)/gen3plus/*.py)\
+ $(wildcard $(SRC_PROXY)/utils/*.py)\
 $(wildcard $(SRC_PROXY)/web/*.py)\
- $(wildcard $(SRC_PROXY)/web/templates/*.html)\
+ $(wildcard $(SRC_PROXY)/web/templates/*.html.j2)\
 $(wildcard $(SRC_PROXY)/web/static/css/*.css)\
 $(wildcard $(SRC_PROXY)/web/static/font/*)\
 $(wildcard $(SRC_PROXY)/web/static/font-awesome/*/*)\
 $(wildcard $(SRC_PROXY)/web/static/images/*)

 CNF_FILES := $(wildcard $(CNF_PROXY)/*.toml)
+MO_FILES := $(wildcard $(TRANSLATION_PROXY)/de/LC_MESSAGES/*.mo)

 # determine destination files
 TARGET_FILES = $(SRC_FILES:$(SRC_PROXY)/%=$(DST_PROXY)/%)
 CONFIG_FILES = $(CNF_FILES:$(CNF_PROXY)/%=$(DST_PROXY)/%)
+TRANSLATION_FILES = $(MO_FILES:$(TRANSLATION_PROXY)/%=$(DST_TRANSLATION)/%)

-rootfs: $(TARGET_FILES) $(CONFIG_FILES) $(DST)/requirements.txt
+rootfs: $(TARGET_FILES) $(CONFIG_FILES) $(TRANSLATION_FILES) $(DST)/requirements.txt

 $(CONFIG_FILES): $(DST_PROXY)/% : $(CNF_PROXY)/%
 	@echo Copy $< to $@
@@ -109,6 +115,11 @@ $(TARGET_FILES): $(DST_PROXY)/% : $(SRC_PROXY)/%
 	@mkdir -p $(@D)
 	@cp $< $@

+$(TRANSLATION_FILES): $(DST_TRANSLATION)/% : $(TRANSLATION_PROXY)/%
+	@echo Copy $< to $@
+	@mkdir -p $(@D)
+	@cp $< $@
+
 $(DST)/requirements.txt : $(SRC)/requirements.txt
 	@echo Copy $< to $@
 	@cp $< $@
--- a/ha_addons/ha_addon/rootfs/run.sh
+++ b/ha_addons/ha_addon/rootfs/run.sh
@@ -30,4 +30,4 @@ cd /home/proxy || exit
 export VERSION=$(cat /proxy-version.txt)

 echo "Start Proxyserver..."
-python3 server.py --json_config=/data/options.json  --log_path=/homeassistant/tsun-proxy/logs/ --config_path=/homeassistant/tsun-proxy/ --log_backups=2
+python3 server.py --rel_urls --json_config=/data/options.json  --log_path=/homeassistant/tsun-proxy/logs/ --config_path=/homeassistant/tsun-proxy/ --log_backups=2
--- a/ha_addons/templates/config.jinja
+++ b/ha_addons/templates/config.jinja
@@ -23,11 +23,11 @@ services:
 ports:
  5005/tcp: 5005
  10000/tcp: 10000
-  8127/tcp: 8127
 webui: "http://[HOST]:[PORT:8127]/"
 watchdog: "http://[HOST]:[PORT:8127]/-/healthy"
 ingress: true
 ingress_port: 8127
+panel_icon: "mdi:application-cog-outline"

 # Definition of parameters in the configuration tab of the addon
 # parameters are available within the container as /data/options.json
Author	SHA1	Message	Date
Stefan Allius	c6a5490229	update changelog	2025-05-10 19:27:56 +02:00
Stefan Allius	bdf08f64a1	update changelog	2025-05-10 19:25:25 +02:00
Stefan Allius	25145a9c29	check print output in test_save_and_restore	2025-05-08 00:23:44 +02:00
Stefan Allius	628f992922	coverage: ignore quart template files	2025-05-08 00:22:49 +02:00
Stefan Allius	fc93930656	add unit test for error handling in build_config()	2025-05-07 23:42:55 +02:00
Stefan Allius	e1f0aac9bf	fix deprecated pytest async warning - Cleanup pending async tasks - fix deprecated warning about event_loop	2025-05-07 23:37:24 +02:00
Stefan Allius	b321cfce0f	add HypercornLogHndl tests	2025-05-07 12:05:58 +02:00
Stefan Allius	cf9911f2f1	test the init_logging_system() method	2025-05-07 11:42:04 +02:00
Stefan Allius	d35c4e7b90	move code from app.py into server.py	2025-05-07 10:26:58 +02:00
Stefan Allius	911d0a9612	add unit tests	2025-05-06 22:23:41 +02:00
Stefan Allius	4012196fcd	remove Web() instance from the testcase - with importing app.py The blueprint Web() will automatically created and a second call in test- cases must avoided	2025-05-05 23:58:30 +02:00
Stefan Allius	cfe13a01d1	define config in test_emu_init_close	2025-05-05 23:50:20 +02:00
Stefan Allius	ab2d4ed831	move get_log_level into Server class	2025-05-05 23:47:06 +02:00
Stefan Allius	089fb92a43	change proxy into a ASGI application - move Quart init from server.py into app.py - create Server class for config and loggin setup - restore hypercorn logging configuration after start of Quart/Hypercorn	2025-05-05 23:35:13 +02:00
Stefan Allius	6560079d89	fix the hypercorn log handler only once	2025-05-05 09:16:14 +02:00
Stefan Allius	4688e6a75b	workaround: restore the hypercorn logger config - quart/hyercorn overwrites the logger config. as a workaround we restore the config at the beginning of a request	2025-05-05 08:23:41 +02:00
Stefan Allius	4f6764e151	use logger.ini to setup dashboard logger	2025-05-05 08:22:13 +02:00
Stefan Allius	484df1dc46	setup logger for hypercorn and dashboard	2025-05-05 08:21:34 +02:00
renovate[bot]	f1628a0629	Update dependency aiomqtt to v2.4.0 (#404 ) * Update dependency aiomqtt to v2.4.0 * update changelog --------- Co-authored-by: Stefan Allius <122395479+s-allius@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stefan Allius <stefan.allius@t-online.de>	2025-05-04 19:20:45 +02:00
Stefan Allius	888e1475e4	S allius/issue397 (#405 ) * add Dashboards log handler to all known loggers * add list of last 3 warnings/errors to page * add note list to page * create LogHandler for the dashboard - simple memory log handler which stores the last 64 warnings/errors for the dashboard * render warnings/errors as note list * add page for warnings and errors * fix double defined build target * add well done message if no errors in the logs * translate page titles * more translations * add Notes page and table for important messages * add unit tests	2025-05-04 18:50:31 +02:00
Stefan Allius	e15db8c92a	S allius/issue393 (#403 ) * display proxy version on dashboard * add MQTT page * styles adjusted on the different pages - use same colors - add bordered shadow to all cards and tables * fix unit tests * migrate the conn table to a general table - rename the template file - get headline from table description * remove footer from index page * make version string translateable * cleanup * remove stripped table rows * add mqtt info table * translate mqtt page * don't fetch notes list for the log-page * fix Mqtt init call for unit tests * add mqtt-fetch test * check received counter in unit test	2025-05-03 23:45:10 +02:00
Stefan Allius	41515f4be3	S allius/issue401 (#402 ) * add route for log file deletion * add modal for senity check before file deletion * add trash icon which unhide the modal * add more translations * increase test coverage * cleanup	2025-05-02 19:47:16 +02:00
Stefan Allius	aadbe6855e	S allius/issue394 (#400 ) * store logging path in Config class * rename template files and page files * jump to referer page - after changing the language, we jump to the referer page, if the attribute exists * build and send list of log-files * rename Download page into Log files * initialize log-path in test config * improve dashboard unit tests - add log file tests - check content-languages after language switch * initialize config structure for log-file tests * add test log file to project * add sub_dir to test log path - non files must be skipped. To test this we add a sub directory to the test log directory * add german translations * set quart debug flag for debug versions * update changelog	2025-05-01 19:34:46 +02:00
Stefan Allius	7542c112f7	S allius/issue395 (#399 ) * add button for languages setting * build a web module for the dashboard - load all python module from local dir - initialize Blueprint and Babel * set a default key for secure cookies * add translations to docker container * improve translation build - clean target erases the .pot - don't modify the resurt of url_for() calls - don't translate the language description translate connection table, fix icon * build relative urls for HA ingress * fix unit test, increase coverage	2025-04-29 00:07:59 +02:00
Stefan Allius	093ec03d60	S allius/issue391 (#392 ) * design counter on connection board * display time of last update and add reload button * chance `Updated` field to a real button * Provide counter values for the dashboard * change background color ot the top branch - use dark-grey instead of black to reduce the contrast * change color of counter tiles * test proxy connection counter handling * prepare conn-table and notes list building * remove obsolete menue points * store client mode for dashboard * store inverters serial number for the dashboard * store inverters serial number * build connection table for dashboard * add connection table to dashboard * fix responsiveness of the tiles * adapt unit tests * remove test fake code * increase test coverage, remove obsolete if statement	2025-04-24 23:12:26 +02:00
Stefan Allius	ff5ed1e606	S allius/issue387 (#389 ) * add optional java script to fetch data regulary * change file extension to `html.j2` for templates * fix route for fetch data - for running in iframes (e.g. HA ingress) we must use relative path in the URLs * increase test coverage * remove unused statements * update favicon.svg	2025-04-20 01:51:04 +02:00
Stefan Allius	cbabbbd820	S allius/issue387 (#388 ) * add optional java script to fetch data regullary * change file extension to `html.j2` for templates * fix route for fetch data - for running in iframes (e.g. HA ingress) we must use relative path in the URLs * increase test coverage * remove unused statements	2025-04-20 00:53:31 +02:00
Stefan Allius	c270edff15	S allius/issue385 (#386 ) * ignore translation and log files * add quart-babel * build and install translation files * don't export the web-ui port 8127 - for security reason the user should use the HA ingress and not the direkt access to the web dashboard * set 'lang' in html tag	2025-04-19 16:51:06 +02:00
Stefan Allius	b82941bd38	S allius/issue383 (#384 ) * configure path to web files for Quart * copy web-file into the add-on container * add test template and stylesheet * add w3.css dashboard * fix unit test for test dashboard * add Roboto font * add awesome web font * add all favicon formats * load fonts locally * adapt unit tests * add all font and favicons to add-on * fix sonarqube warnings * add unit tests for all favicons	2025-04-18 03:47:38 +02:00