cleanup

* 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

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+- Dashboard: add Log-File page
+- Dashboard: add Connection page
 - add web UI to add-on
 - allow `Y00` serial numbers for GEN3PLUS devices
 

Makefile

@@ -1,11 +1,19 @@
 .PHONY: build babel clean addon-dev addon-debug addon-rc addon-rel debug dev preview rc rel check-docker-compose install
 
-babel debug dev preview rc rel:
+babel:
 	$(MAKE) -C app $@
 
-clean build:
+build:
 	$(MAKE) -C ha_addons $@ 
 
+clean build:
+	$(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-%,%,$@)

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

app/Makefile

@@ -21,6 +21,8 @@ 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)
@@ -58,4 +60,4 @@ $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po : $(BABEL_TRANSLATIONS)/messages
 $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.mo : $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po
 	@pybabel compile  -d $(BABEL_TRANSLATIONS) -l $*
 
-.PHONY: babel debug dev preview rc rel
+.PHONY: babel clean debug dev preview rc rel

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

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

app/src/server.py

@@ -4,9 +4,7 @@ import logging.handlers
 import os
 import argparse
 from asyncio import StreamReader, StreamWriter
-from quart import Quart, Response, request
+from quart import Quart, Response
-from quart_babel import Babel
-from quart_babel.locale import get_locale
 from logging import config  # noqa F401
 from proxy import Proxy
 from inverter_ifc import InverterIfc
@@ -17,7 +15,9 @@ 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 web import Web
+from web.wrapper import url_for
+
 from modbus_tcp import ModbusTcp
 
 
@@ -33,31 +33,11 @@ class ProxyState:
         ProxyState._is_up = value
 
 
-def my_get_locale():
-    # 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(
-        ['de', 'en']
-    )
-
-
-def my_get_tz():
-    return 'CET'
-
-
 app = Quart(__name__,
             template_folder='web/templates',
             static_folder='web/static')
-babel = Babel(app,
+app.secret_key = 'JKLdks.dajlKKKdladkflKwolafallsdfl'
-              locale_selector=my_get_locale,
+app.jinja_env.globals.update(url_for=url_for)
-              timezone_selector=my_get_tz,
-              default_translation_directories='../translations')
-app.register_blueprint(web_routes)
-
-
-@app.context_processor
-def utility_processor():
-    return dict(lang=get_locale())
 
 
 @app.route('/-/ready')
@@ -152,6 +132,12 @@ def main():   # pragma: no cover
     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', type=bool,
+                        default=False,
+                        help='use relative dashboard urls')
     args = parser.parse_args()
     #
     # Setup our daily, rotating logger
@@ -170,6 +156,8 @@ def main():   # pragma: no cover
     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"trans_path:  {args.trans_path}")
+    logging.info(f"rel_urls:    {args.rel_urls}")
     logging.info(f"log_path:    {args.log_path}")
     if args.log_backups == 0:
         logging.info("log_backups: unlimited")
@@ -191,7 +179,8 @@ def main():   # pragma: no cover
     asyncio.set_event_loop(loop)
 
     # read config file
-    Config.init(ConfigReadToml(src_dir + "cnf/default_config.toml"))
+    Config.init(ConfigReadToml(src_dir + "cnf/default_config.toml"),
+                log_path=args.log_path)
     ConfigReadEnv()
     ConfigReadJson(args.config_path + "config.json")
     ConfigReadToml(args.config_path + "config.toml")
@@ -208,6 +197,7 @@ def main():   # pragma: no cover
     Proxy.class_init()
     Schedule.start()
     ModbusTcp(loop)
+    Web(app, args.trans_path, args.rel_urls)
 
     #
     # Create tasks for our listening servers. These must be tasks! If we call
@@ -224,7 +214,8 @@ def main():   # pragma: no cover
     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, loop=loop,
+                debug=log_level == logging.DEBUG)
         logging.info("Quart stopped")
 
     except KeyboardInterrupt:

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)

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)

app/src/web/conn_table.py

@@ -1,4 +1,9 @@
 from inverter_base import InverterBase
+from quart import render_template
+from quart_babel import format_datetime, _
+from infos import Infos
+
+from . import web
 
 
 def _get_device_icon(client_mode: bool):
@@ -12,7 +17,7 @@ def _get_device_icon(client_mode: bool):
 def _get_cloud_icon(emu_mode: bool):
     '''returns the icon for the cloud conntection'''
     if emu_mode:
-        return 'fa-cloud-arrow-down-alt'
+        return 'fa-cloud-arrow-up-alt'
 
     return 'fa-cloud'
 
@@ -49,9 +54,9 @@ def get_table_data():
             "w3-hide-small w3-hide-medium", "w3-hide-large",
         ],
         "thead": [[
-            'Device-IP:Port', 'Device-IP',
+            _('Device-IP:Port'), _('Device-IP'),
-            "Serial-No",
+            _("Serial-No"),
-            "Cloud-IP:Port", "Cloud-IP"
+            _("Cloud-IP:Port"), _("Cloud-IP")
         ]],
         "tbody": []
     }
@@ -59,3 +64,19 @@ def get_table_data():
         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_conn_table.html.j2',
+                                               table=get_table_data())
+
+    data["notes-list"] = await render_template('templ_notes_list.html.j2')
+    return data

app/src/web/favicon.py

@@ -0,0 +1,37 @@
+import os
+
+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.root_path, 'static/images'),
+        file,
+        mimetype=mime)
+
+
+@web.route('/favicon-96x96.png')
+async def favicon():
+    return await get_icon('favicon-96x96.png')
+
+
+@web.route('/favicon.ico')
+async def favicon_ico():
+    return await get_icon('favicon.ico', 'image/x-icon')
+
+
+@web.route('/favicon.svg')
+async def favicon_svg():
+    return await get_icon('favicon.svg', 'image/svg+xml')
+
+
+@web.route('/apple-touch-icon.png')
+async def apple_touch():
+    return await get_icon('apple-touch-icon.png')
+
+
+@web.route('/site.webmanifest')
+async def webmanifest():
+    return await get_icon('site.webmanifest', 'application/manifest+json')

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)

app/src/web/log_files.py

@@ -0,0 +1,61 @@
+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())
+
+    data["notes-list"] = await render_template('templ_notes_list.html.j2')
+    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

app/src/web/pages.py

@@ -0,0 +1,23 @@
+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('/page')
+async def empty():
+    return await render_template('empty.html.j2')
+
+
+@web.route('/logging')
+async def logging():
+    return await render_template(
+        'page_logging.html.j2',
+        fetch_url=url_for('.file_fetch'))

app/src/web/routes.py

@@ -1,69 +0,0 @@
-from quart import Blueprint
-from quart import render_template, url_for
-from quart import send_from_directory
-from quart_babel import format_datetime
-from infos import Infos
-from web.conn_table import get_table_data
-import os
-
-web_routes = Blueprint('web_routes', __name__)
-
-
-async def get_icon(file: str, mime: str = 'image/png'):
-    return await send_from_directory(
-        os.path.join(web_routes.root_path, 'static/images'),
-        file,
-        mimetype=mime)
-
-
-@web_routes.route('/')
-async def index():
-    return await render_template(
-        'index.html.j2',
-        fetch_url='.'+url_for('web_routes.data_fetch'))
-
-
-@web_routes.route('/page')
-async def empty():
-    return await render_template('empty.html.j2')
-
-
-@web_routes.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('conn_table.html.j2',
-                                               table=get_table_data())
-
-    data["notes-list"] = await render_template('notes_list.html.j2')
-    return data
-
-
-@web_routes.route('/favicon-96x96.png')
-async def favicon():
-    return await get_icon('favicon-96x96.png')
-
-
-@web_routes.route('/favicon.ico')
-async def favicon_ico():
-    return await get_icon('favicon.ico', 'image/x-icon')
-
-
-@web_routes.route('/favicon.svg')
-async def favicon_svg():
-    return await get_icon('favicon.svg', 'image/svg+xml')
-
-
-@web_routes.route('/apple-touch-icon.png')
-async def apple_touch():
-    return await get_icon('apple-touch-icon.png')
-
-
-@web_routes.route('/site.webmanifest')
-async def webmanifest():
-    return await get_icon('site.webmanifest', 'application/manifest+json')

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

@@ -4,8 +4,8 @@
     <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= 'css/style.css') }}">
-    <link rel="stylesheet" href=".{{ url_for('static', filename= 'font-awesome/css/all.min.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" />
@@ -14,7 +14,7 @@
     <style>
         @font-face {
             font-family: Roboto;
-            src: url(".{{ url_for('static', filename= 'font/roboto-light.ttf') }}");
+            src: url("{{ url_for('static', filename= 'font/roboto-light.ttf') }}");
         }
         html,body,h1,h2,h3,h4,h5 {font-family: Roboto, sans-serif}
     </style>
@@ -22,20 +22,28 @@
   <body class="w3-light-grey">
   
     <!-- Top container -->
-    <div class="w3-bar w3-top w3-dark-grey w3-large" style="z-index:4">
+    <div class="w3-bar w3-dark-grey 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>
+      <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-hover-none w3-hover-text-light-grey w3-right" onclick="fetch_data();"><span class="w3-hide-small">{{_('Updated:')}}  </span><span id="update-time"></span>  <i class="fa fa-rotate-right w3-medium"></i></button>
+      <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>
-      {% else %}
-      <span class="w3-bar-item w3-right">Logo</span>
       {% 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-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">
+          <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>
@@ -47,16 +55,16 @@
       </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-network-wired fa-fw"></i>  {{_('Connections')}}</a>
+        <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('web_routes.empty')}}" 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('.empty')}}" 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('web_routes.empty')}}" class="w3-bar-item w3-button w3-padding"><i class="fa fa-file-export fa-fw {% block menu3_class %}{% endblock %}"></i>  Downloads</a>
+        <a href="{{ url_for('.logging')}}" class="w3-bar-item w3-button w3-padding {% block menu3_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;">
     

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

@@ -0,0 +1,31 @@
+{% extends 'base.html.j2' %}
+
+{% block title %} TSUN Proxy - Downloads {% endblock title%}
+{% block menu3_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 class="w3-container" 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 %}
+

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

@@ -12,7 +12,7 @@
     {% endif %}
 {%- endmacro%}
 
-<h5>Connections</h5>
+<h5>{{_('Connections')}}</h5>
 <table class="w3-table w3-striped w3-bordered w3-border w3-hoverable w3-white">
   {% if table.thead is defined%}
   <thead>

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-blue" 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-blue">
+        <a href="{{ url_for('.send',file=file.name)}}" class="w3-button w3-hover-blue w3-hover-text-black"><i class="fa fa-file-download"></i>  {{_('Download File')}}</a>
+        <a class="w3-button w3-right w3-hover-blue 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>
+

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

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

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():

app/tests/test_web_route.py

@@ -1,13 +1,22 @@
 # 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
+import os, errno
 
 pytest_plugins = ('pytest_asyncio',)
 
+@pytest.fixture(scope="session")
+def client():
+    app.secret_key = 'super secret key'
+    Web(app, '../transfer', False)
+    return app.test_client()
+
 @pytest.fixture
 def create_inverter(config_conn):
     _ = config_conn
@@ -36,65 +45,73 @@ def create_inverter_client(config_conn):
     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():
+async def test_page(client):
     """Test the empty page route."""
-    client = app.test_client()
     response = await client.get('/page')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
 
+@pytest.mark.asyncio
+async def test_rel_page(client):
+    """Test the empty page route."""
+    web.build_relative_urls = True
+    response = await client.get('/page')
+    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_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 healthy route."""
+    """Test the data-fetch route."""
     _ = create_inverter
     client = app.test_client()
     response = await client.get('/data-fetch')
@@ -105,7 +122,7 @@ async def test_data_fetch(create_inverter):
 
 @pytest.mark.asyncio
 async def test_data_fetch1(create_inverter_server):
-    """Test the healthy route."""
+    """Test the data-fetch route with server connection."""
     _ = create_inverter_server
     client = app.test_client()
     response = await client.get('/data-fetch')
@@ -116,7 +133,7 @@ async def test_data_fetch1(create_inverter_server):
 
 @pytest.mark.asyncio
 async def test_data_fetch2(create_inverter_client):
-    """Test the healthy route."""
+    """Test the data-fetch route with client connection."""
     _ = create_inverter_client
     client = app.test_client()
     response = await client.get('/data-fetch')
@@ -124,3 +141,106 @@ async def test_data_fetch2(create_inverter_client):
 
     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('/page')
+    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_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

app/translations/de/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tsun-gen3-proxy 0.14.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-04-20 21:21+0200\n"
+"POT-Creation-Date: 2025-05-02 17:00+0200\n"
 "PO-Revision-Date: 2025-04-18 16:24+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -19,47 +19,100 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.17.0\n"
 
-#: src/web/templates/base.html.j2:27
+#: src/web/conn_table.py:57
+msgid "Device-IP:Port"
+msgstr "Geräte-IP:Port"
+
+#: src/web/conn_table.py:57
+msgid "Device-IP"
+msgstr "Geräte-IP"
+
+#: src/web/conn_table.py:58
+msgid "Serial-No"
+msgstr "Seriennummer"
+
+#: src/web/conn_table.py:59
+msgid "Cloud-IP:Port"
+msgstr "Cloud-IP:Port"
+
+#: src/web/conn_table.py:59
+msgid "Cloud-IP"
+msgstr "Cloud-IP"
+
+#: src/web/templates/base.html.j2:37
 msgid "Updated:"
 msgstr "Aktualisiert:"
 
-#: src/web/templates/base.html.j2:46
+#: src/web/templates/base.html.j2:58
+#: src/web/templates/templ_conn_table.html.j2:15
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: src/web/templates/index.html.j2:5
+#: src/web/templates/base.html.j2:60 src/web/templates/page_logging.html.j2:5
+msgid "Log Files"
+msgstr "Log Dateien"
+
+#: src/web/templates/page_index.html.j2:5
 msgid "Proxy Connection Overview"
 msgstr "Proxy Verbindungen"
 
-#: src/web/templates/index.html.j2:16
+#: src/web/templates/page_index.html.j2:16
 msgid "Server Mode"
 msgstr "Server Modus"
 
-#: src/web/templates/index.html.j2:17
+#: src/web/templates/page_index.html.j2:17
 msgid "Established from device to proxy"
 msgstr "Vom Gerät zum Proxy aufgebaut"
 
-#: src/web/templates/index.html.j2:27
+#: src/web/templates/page_index.html.j2:27
 msgid "Client Mode"
 msgstr "Client Modus"
 
-#: src/web/templates/index.html.j2:28
+#: src/web/templates/page_index.html.j2:28
 msgid "Established from proxy to device"
 msgstr "Vom Proxy zum Gerät aufgebaut"
 
-#: src/web/templates/index.html.j2:38
+#: src/web/templates/page_index.html.j2:38
 msgid "Proxy Mode"
 msgstr "Proxy Modus"
 
-#: src/web/templates/index.html.j2:39
+#: src/web/templates/page_index.html.j2:39
 msgid "Forwarding data to cloud"
 msgstr "Weiterleitung in die Cloud"
 
-#: src/web/templates/index.html.j2:49
+#: src/web/templates/page_index.html.j2:49
 msgid "Emu Mode"
 msgstr "Emu Modus"
 
-#: src/web/templates/index.html.j2:50
+#: src/web/templates/page_index.html.j2:50
 msgid "Emulation sends data to cloud"
 msgstr "Emulation sendet in die Cloud"
 
+#: 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/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"
+

ha_addons/Makefile

@@ -87,6 +87,7 @@ 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.j2)\
  $(wildcard $(SRC_PROXY)/web/static/css/*.css)\

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=True --json_config=/data/options.json  --log_path=/homeassistant/tsun-proxy/logs/ --config_path=/homeassistant/tsun-proxy/ --log_backups=2