Compare commits
6 Commits
s-allius/i
...
s-allius/i
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
84b4b4c8be | ||
|
|
b9d1868e4e | ||
|
|
d50f443e2f | ||
|
|
d33e6e8bb4 | ||
|
|
0e039c4683 | ||
|
|
2b6c71c0bb |
@@ -7,10 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [unreleased]
|
## [unreleased]
|
||||||
|
|
||||||
- catch socket.gaierror exception and log this with info level
|
|
||||||
- Update dependency coverage to v7.9.2
|
|
||||||
- add-on: bump base-image to version 18.0.3
|
|
||||||
- add-on: remove armhf and armv7 support
|
|
||||||
- add-on: add links to config and log-file to the web-UI
|
- add-on: add links to config and log-file to the web-UI
|
||||||
- fix some SonarQube warnings
|
- fix some SonarQube warnings
|
||||||
- remove unused 32-bit architectures
|
- remove unused 32-bit architectures
|
||||||
|
|||||||
@@ -29,17 +29,17 @@ target "_common" {
|
|||||||
"type =sbom,generator=docker/scout-sbom-indexer:latest"
|
"type =sbom,generator=docker/scout-sbom-indexer:latest"
|
||||||
]
|
]
|
||||||
annotations = [
|
annotations = [
|
||||||
"index,manifest-descriptor:org.opencontainers.image.title=TSUN-Proxy",
|
"index:org.opencontainers.image.title=TSUN Gen3 Proxy",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.authors=Stefan Allius",
|
"index:org.opencontainers.image.authors=Stefan Allius",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.created=${BUILD_DATE}",
|
"index:org.opencontainers.image.created=${BUILD_DATE}",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.version=${VERSION}",
|
"index:org.opencontainers.image.version=${VERSION}",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.revision=${BRANCH}",
|
"index:org.opencontainers.image.revision=${BRANCH}",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.description=${DESCRIPTION}",
|
"index:org.opencontainers.image.description=${DESCRIPTION}",
|
||||||
"index:org.opencontainers.image.licenses=BSD-3-Clause",
|
"index:org.opencontainers.image.licenses=BSD-3-Clause",
|
||||||
"index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy"
|
"index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy"
|
||||||
]
|
]
|
||||||
labels = {
|
labels = {
|
||||||
"org.opencontainers.image.title" = "TSUN-Proxy"
|
"org.opencontainers.image.title" = "TSUN Gen3 Proxy"
|
||||||
"org.opencontainers.image.authors" = "Stefan Allius"
|
"org.opencontainers.image.authors" = "Stefan Allius"
|
||||||
"org.opencontainers.image.created" = "${BUILD_DATE}"
|
"org.opencontainers.image.created" = "${BUILD_DATE}"
|
||||||
"org.opencontainers.image.version" = "${VERSION}"
|
"org.opencontainers.image.version" = "${VERSION}"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
pytest==8.4.1
|
pytest==8.4.1
|
||||||
pytest-asyncio==1.0.0
|
pytest-asyncio==1.0.0
|
||||||
pytest-cov==6.2.1
|
pytest-cov==6.2.1
|
||||||
python-dotenv==1.1.1
|
python-dotenv==1.1.0
|
||||||
mock==5.2.0
|
mock==5.2.0
|
||||||
coverage==7.9.2
|
coverage==7.9.1
|
||||||
jinja2-cli==0.8.2
|
jinja2-cli==0.8.2
|
||||||
@@ -4,7 +4,6 @@ import logging
|
|||||||
import traceback
|
import traceback
|
||||||
import json
|
import json
|
||||||
import gc
|
import gc
|
||||||
import socket
|
|
||||||
from aiomqtt import MqttCodeError
|
from aiomqtt import MqttCodeError
|
||||||
from asyncio import StreamReader, StreamWriter
|
from asyncio import StreamReader, StreamWriter
|
||||||
from ipaddress import ip_address
|
from ipaddress import ip_address
|
||||||
@@ -139,9 +138,7 @@ class InverterBase(InverterIfc, Proxy):
|
|||||||
f'Connected to {addr}')
|
f'Connected to {addr}')
|
||||||
asyncio.create_task(self.remote.ifc.client_loop(addr))
|
asyncio.create_task(self.remote.ifc.client_loop(addr))
|
||||||
|
|
||||||
except (ConnectionRefusedError,
|
except (ConnectionRefusedError, TimeoutError) as error:
|
||||||
TimeoutError,
|
|
||||||
socket.gaierror) as error:
|
|
||||||
logging.info(f'{error}')
|
logging.info(f'{error}')
|
||||||
except Exception:
|
except Exception:
|
||||||
Infos.inc_counter('SW_Exception')
|
Infos.inc_counter('SW_Exception')
|
||||||
|
|||||||
@@ -30,3 +30,9 @@ async def logging():
|
|||||||
return await render_template(
|
return await render_template(
|
||||||
'page_logging.html.j2',
|
'page_logging.html.j2',
|
||||||
fetch_url=url_for('.file_fetch'))
|
fetch_url=url_for('.file_fetch'))
|
||||||
|
|
||||||
|
|
||||||
|
@web.route('/network_tests')
|
||||||
|
async def network_tests():
|
||||||
|
return await render_template(
|
||||||
|
'page_network_tests.html.j2')
|
||||||
|
|||||||
@@ -59,6 +59,7 @@
|
|||||||
<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('.mqtt')}}" class="w3-bar-item w3-button w3-padding {% block menu2_class %}{% endblock %}"><i class="fa fa-database fa-fw"></i> MQTT</a>
|
||||||
<a href="{{ url_for('.notes')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-info fa-fw"></i> {{_('Important Messages')}}</a>
|
<a href="{{ url_for('.notes')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-info fa-fw"></i> {{_('Important Messages')}}</a>
|
||||||
<a href="{{ url_for('.logging')}}" class="w3-bar-item w3-button w3-padding {% block menu4_class %}{% endblock %}"><i class="fa fa-file-export fa-fw"></i> {{_('Log Files')}}</a>
|
<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>
|
||||||
|
<a href="{{ url_for('.network_tests')}}" class="w3-bar-item w3-button w3-padding {% block menu5_class %}{% endblock %}"><i class="fa fa-file-export fa-fw"></i> {{_('Network Tests')}}</a>
|
||||||
{% if hassio is defined %}
|
{% if hassio is defined %}
|
||||||
<br>
|
<br>
|
||||||
<a href="/hassio/addon/{{addonname}}/config" target="_top" class="w3-bar-item w3-button w3-padding"><i class="fa fa-gear fa-fw"></i> {{_('Add-on Config')}}</a>
|
<a href="/hassio/addon/{{addonname}}/config" target="_top" class="w3-bar-item w3-button w3-padding"><i class="fa fa-gear fa-fw"></i> {{_('Add-on Config')}}</a>
|
||||||
|
|||||||
31
app/src/web/templates/page_network_tests.html.j2
Normal file
31
app/src/web/templates/page_network_tests.html.j2
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
{% extends 'base.html.j2' %}
|
||||||
|
|
||||||
|
{% block title %}{{_("TSUN Proxy - Network Tests")}}{% endblock title %}
|
||||||
|
{% block menu5_class %}w3-blue{% endblock %}
|
||||||
|
{% block headline %}<i class="fa fa-file-export fa-fw"></i> {{_('Network Tests')}}{% endblock headline %}
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
<script>
|
||||||
|
url = "http://127.0.0.1:10000"
|
||||||
|
const req = new XMLHttpRequest();
|
||||||
|
req.open("POST", url, true);
|
||||||
|
//req.setRequestHeader("RESOLVE", "bla.com")
|
||||||
|
req.onload = (event) => {
|
||||||
|
// Uploaded
|
||||||
|
};
|
||||||
|
|
||||||
|
const blob = new Blob(["abc123"], { type: "text/plain" });
|
||||||
|
|
||||||
|
req.send(blob);
|
||||||
|
|
||||||
|
ws = new WebSocket("ws://127.0.0.1:10000");
|
||||||
|
// ws.open()
|
||||||
|
ws.onopen = () => {
|
||||||
|
console.log("Connection opened")
|
||||||
|
ws.send("Hi server, please send me the score of yesterday's game")
|
||||||
|
}
|
||||||
|
|
||||||
|
</script>
|
||||||
|
{% endblock content%}
|
||||||
|
|
||||||
|
{% block footer %}{% endblock footer %}
|
||||||
@@ -8,7 +8,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: tsun-gen3-proxy 0.14.0\n"
|
"Project-Id-Version: tsun-gen3-proxy 0.14.0\n"
|
||||||
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
|
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
|
||||||
"POT-Creation-Date: 2025-05-13 22:34+0200\n"
|
"POT-Creation-Date: 2025-06-21 10:54+0200\n"
|
||||||
"PO-Revision-Date: 2025-04-18 16:24+0200\n"
|
"PO-Revision-Date: 2025-04-18 16:24+0200\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language: de\n"
|
"Language: de\n"
|
||||||
@@ -75,11 +75,16 @@ msgstr "Wichtige Hinweise"
|
|||||||
msgid "Log Files"
|
msgid "Log Files"
|
||||||
msgstr "Log Dateien"
|
msgstr "Log Dateien"
|
||||||
|
|
||||||
#: src/web/templates/base.html.j2:64
|
#: src/web/templates/base.html.j2:62
|
||||||
|
#: src/web/templates/page_network_tests.html.j2:5
|
||||||
|
msgid "Network Tests"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/web/templates/base.html.j2:65
|
||||||
msgid "Add-on Config"
|
msgid "Add-on Config"
|
||||||
msgstr "Add-on Konfiguration"
|
msgstr "Add-on Konfiguration"
|
||||||
|
|
||||||
#: src/web/templates/base.html.j2:65
|
#: src/web/templates/base.html.j2:66
|
||||||
msgid "Add-on Log"
|
msgid "Add-on Log"
|
||||||
msgstr "Add-on Protokoll"
|
msgstr "Add-on Protokoll"
|
||||||
|
|
||||||
@@ -172,6 +177,11 @@ msgstr "Empfangene Topics"
|
|||||||
msgid "Number of topics received"
|
msgid "Number of topics received"
|
||||||
msgstr "Anzahl der empfangenen Topics"
|
msgstr "Anzahl der empfangenen Topics"
|
||||||
|
|
||||||
|
#: src/web/templates/page_network_tests.html.j2:3
|
||||||
|
#, fuzzy
|
||||||
|
msgid "TSUN Proxy - Network Tests"
|
||||||
|
msgstr "TSUN Proxy - Verbindungen"
|
||||||
|
|
||||||
#: src/web/templates/page_notes.html.j2:3
|
#: src/web/templates/page_notes.html.j2:3
|
||||||
msgid "TSUN Proxy - Important Messages"
|
msgid "TSUN Proxy - Important Messages"
|
||||||
msgstr "TSUN Proxy - Wichtige Hinweise"
|
msgstr "TSUN Proxy - Wichtige Hinweise"
|
||||||
|
|||||||
@@ -29,23 +29,27 @@ target "_common" {
|
|||||||
"type =sbom,generator=docker/scout-sbom-indexer:latest"
|
"type =sbom,generator=docker/scout-sbom-indexer:latest"
|
||||||
]
|
]
|
||||||
annotations = [
|
annotations = [
|
||||||
|
"index:io.hass.version=${VERSION}",
|
||||||
"index:io.hass.type=addon",
|
"index:io.hass.type=addon",
|
||||||
"index:io.hass.arch=aarch64|amd64",
|
"index:io.hass.arch=armhf|aarch64|i386|amd64",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.title=TSUN-Proxy",
|
"index:org.opencontainers.image.title=TSUN-Proxy",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.authors=Stefan Allius",
|
"index:org.opencontainers.image.authors=Stefan Allius",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.created=${BUILD_DATE}",
|
"index:org.opencontainers.image.created=${BUILD_DATE}",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.version=${VERSION}",
|
"index:org.opencontainers.image.version=${VERSION}",
|
||||||
"index,manifest-descriptor:org.opencontainers.image.description=${DESCRIPTION}",
|
"index:org.opencontainers.image.revision=${BRANCH}",
|
||||||
|
"index:org.opencontainers.image.description=${DESCRIPTION}",
|
||||||
"index:org.opencontainers.image.licenses=BSD-3-Clause",
|
"index:org.opencontainers.image.licenses=BSD-3-Clause",
|
||||||
"index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy/ha_addons/ha_addon",
|
"index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy/ha_addons/ha_addon"
|
||||||
]
|
]
|
||||||
labels = {
|
labels = {
|
||||||
|
"io.hass.version" = "${VERSION}"
|
||||||
"io.hass.type" = "addon"
|
"io.hass.type" = "addon"
|
||||||
"io.hass.arch" = "aarch64|amd64"
|
"io.hass.arch" = "armhf|aarch64|i386|amd64"
|
||||||
"org.opencontainers.image.title" = "TSUN-Proxy"
|
"org.opencontainers.image.title" = "TSUN-Proxy"
|
||||||
"org.opencontainers.image.authors" = "Stefan Allius"
|
"org.opencontainers.image.authors" = "Stefan Allius"
|
||||||
"org.opencontainers.image.created" = "${BUILD_DATE}"
|
"org.opencontainers.image.created" = "${BUILD_DATE}"
|
||||||
"org.opencontainers.image.version" = "${VERSION}"
|
"org.opencontainers.image.version" = "${VERSION}"
|
||||||
|
"org.opencontainers.image.revision" = "${BRANCH}"
|
||||||
"org.opencontainers.image.description" = "${DESCRIPTION}"
|
"org.opencontainers.image.description" = "${DESCRIPTION}"
|
||||||
"org.opencontainers.image.licenses" = "BSD-3-Clause"
|
"org.opencontainers.image.licenses" = "BSD-3-Clause"
|
||||||
"org.opencontainers.image.source" = "https://github.com/s-allius/tsun-gen3-proxy/ha_addonsha_addon"
|
"org.opencontainers.image.source" = "https://github.com/s-allius/tsun-gen3-proxy/ha_addonsha_addon"
|
||||||
|
|||||||
@@ -13,12 +13,12 @@
|
|||||||
# 1 Build Base Image #
|
# 1 Build Base Image #
|
||||||
######################
|
######################
|
||||||
|
|
||||||
ARG BUILD_FROM="ghcr.io/hassio-addons/base:18.0.3"
|
ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.5"
|
||||||
# hadolint ignore=DL3006
|
# hadolint ignore=DL3006
|
||||||
FROM $BUILD_FROM AS base
|
FROM $BUILD_FROM AS base
|
||||||
|
|
||||||
# Installiere Python, pip und virtuelle Umgebungstools
|
# Installiere Python, pip und virtuelle Umgebungstools
|
||||||
RUN apk add --no-cache python3=3.12.11-r0 py3-pip=25.1.1-r0 && \
|
RUN apk add --no-cache python3=3.12.10-r1 py3-pip=24.3.1-r0 && \
|
||||||
python -m venv /opt/venv && \
|
python -m venv /opt/venv && \
|
||||||
. /opt/venv/bin/activate
|
. /opt/venv/bin/activate
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ init: false
|
|||||||
arch:
|
arch:
|
||||||
- aarch64
|
- aarch64
|
||||||
- amd64
|
- amd64
|
||||||
|
- armhf
|
||||||
|
- armv7
|
||||||
startup: services
|
startup: services
|
||||||
homeassistant_api: true
|
homeassistant_api: true
|
||||||
map:
|
map:
|
||||||
|
|||||||
Reference in New Issue
Block a user