Dev 0.12 (#257)

* add ha_addons repository to cscode workspace * Issue220 ha addon dokumentation update (#232) * initial DOCS.md for Addon * links to Mosquitto and Adguard * replaced _ by . for PV-Strings * mentioned add-on installation method in README.md * fix most of the markdown linter warnings * add missing alt texts * added nice add repository to my Home Assistant badges --------- Co-authored-by: Michael Metz <michael.metz@siemens.com> Co-authored-by: Stefan Allius <stefan.allius@t-online.de> * S allius/issue216 (#235) * improve docker run - establish multistage Dockerfile - build a python wheel for all needed packages - remove unneeded tools like apk for runtime * pin versions, fix hadolint warnings * merge from dev-0.12 --------- Co-authored-by: Michael Metz <michael.metz@siemens.com> * Issue220 ha addon dokumentation update (#245) * revised config disclaimer * add newline at end of file to fix linter warning --------- Co-authored-by: Michael Metz <michael.metz@siemens.com> * 238 ha addon repository check (#244) * move Makefile and bake file into parent folder * build config.yaml from template * use Makefile instead of build shell script * ignore temporary or created files * add rules for building the add-on repository * add rel version of add-on * add jinja2-cli * ignore inverter replays which a older than 1 day (#246) * S allius/issue7 (#248) * report alarm and fault bitfield to ha * define the alarm and fault names * configure log path and max number of daily log files (#243) * configure log path and max number of daily log files * don't use a subfolder for configs * use make instead of a build script * mount /homeassistant/tsun-proxy * Add venv to base image * give write access to mounted folder * intial checkin, ignore SC1091 * set advanced and stage value in config.yaml * fix typo * added watchdog and removed Port 8127 from mapping * fixed typo and use new add-on repro - change the install button to install from https://github.com/s-allius/ha-addons * add addon-rel target * disable watchdog due to exceptions in the ha supervisor * update changelog --------- Co-authored-by: Michael Metz <michael.metz@siemens.com> * Update README.md (#251) install `https://github.com/s-allius/ha-addons` as repro for our add-on * add german language file (#253) * fix return type get_extra_info in FakeWriter * move global startup code into main methdod * pin version of base image * avoid forwarding to a private (lokal) IP addr (#256) * avoid forwarding to a private (lokal) IP addr * test DNS resolver issues * increase test coverage * update changelog * fix client_mode configuration block (#252) * fix client_mode block * add client mode * fix tests with client_mode values * log client_mode configuration * add forward flag for client_mode * improve startup logging * added client_mode example * adjusted translation files * AT commands added * typo * missing "PLUS" * link to config details * improve log msg for config problems * improve log msg on config errors * improve log msg for config problems * copy CHANGELOG.md into add-on repro --------- Co-authored-by: Michael Metz <michael.metz@siemens.com> * rename "ConfigErr" to match naming convention * disable test coverage for __main__ * update changelog version 0.12 --------- Co-authored-by: metzi <147942647+mime24@users.noreply.github.com> Co-authored-by: Michael Metz <michael.metz@siemens.com>
2024-12-22 22:25:50 +01:00
parent badc065b7a
commit 3bf245300d
37 changed files with 971 additions and 242 deletions
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -5,13 +5,12 @@ ARG GID=1000
 #
 # first stage for our base image
 FROM python:3.13-alpine AS base
-USER root

-COPY --chmod=0700 ./hardening_base.sh .
+COPY --chmod=0700 ./hardening_base.sh /
 RUN apk upgrade --no-cache && \
-    apk add --no-cache su-exec	&& \
-    ./hardening_base.sh && \
-    rm ./hardening_base.sh
+    apk add --no-cache su-exec=0.2-r3	&& \
+    /hardening_base.sh && \
+    rm /hardening_base.sh

 #
 # second stage for building wheels packages
@@ -19,8 +18,8 @@ FROM base AS builder

 # copy the dependencies file to the root dir and install requirements
 COPY ./requirements.txt /root/
-RUN apk add --no-cache build-base && \
-    python -m pip install --no-cache-dir -U pip wheel && \
+RUN apk add --no-cache build-base=0.5-r3 && \
+    python -m pip install --no-cache-dir pip==24.3.1 wheel==0.45.1 && \
    python -OO -m pip wheel --no-cache-dir --wheel-dir=/root/wheels -r /root/requirements.txt


@@ -50,9 +49,9 @@ VOLUME ["/home/$SERVICE_NAME/log", "/home/$SERVICE_NAME/config"]
 # and unistall python packages and alpine package manger to reduce attack surface
 COPY --from=builder /root/wheels /root/wheels
 COPY --chmod=0700 ./hardening_final.sh .
-RUN python -m pip install --no-cache --no-index /root/wheels/* && \
+RUN python -m pip install --no-cache-dir --no-cache --no-index /root/wheels/* && \
    rm -rf /root/wheels && \
-    python -m pip uninstall --yes setuptools wheel pip && \
+    python -m pip uninstall --yes wheel pip && \
    apk --purge del apk-tools && \
    ./hardening_final.sh && \
    rm ./hardening_final.sh
--- a/app/Makefile
+++ b/app/Makefile
@@ -0,0 +1,67 @@
+#!make
+include ../.env
+
+SHELL = /bin/sh
+IMAGE = tsun-gen3-proxy
+
+
+# Folders
+SRC=.
+SRC_PROXY=$(SRC)/src
+CNF_PROXY=$(SRC)/config
+
+DST=rootfs
+DST_PROXY=$(DST)/home/proxy
+
+# collect source files 
+SRC_FILES := $(wildcard $(SRC_PROXY)/*.py)\
+ $(wildcard $(SRC_PROXY)/*.ini)\
+ $(wildcard $(SRC_PROXY)/cnf/*.py)\
+ $(wildcard $(SRC_PROXY)/gen3/*.py)\
+ $(wildcard $(SRC_PROXY)/gen3plus/*.py)
+CNF_FILES := $(wildcard $(CNF_PROXY)/*.toml)
+
+# determine destination files
+TARGET_FILES = $(SRC_FILES:$(SRC_PROXY)/%=$(DST_PROXY)/%)
+CONFIG_FILES = $(CNF_FILES:$(CNF_PROXY)/%=$(DST_PROXY)/%)
+
+export BUILD_DATE := ${shell date -Iminutes}
+VERSION := $(shell cat $(SRC)/.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/)
+
+
+dev debug:
+	@echo version: $(VERSION)  build-date: $(BUILD_DATE)   image: $(PRIVAT_CONTAINER_REGISTRY)$(IMAGE)
+	export VERSION=$(VERSION)-$@ && \
+	export IMAGE=$(PRIVAT_CONTAINER_REGISTRY)$(IMAGE) && \
+	docker buildx bake -f docker-bake.hcl $@
+
+preview rc rel:
+	@echo version: $(VERSION)  build-date: $(BUILD_DATE)   image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE)
+	@echo login at $(PUBLIC_URL) as $(PUBLIC_USER)
+	@DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)"
+	export VERSION=$(VERSION)-$@ && \
+	export IMAGE=$(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) && \
+	docker buildx bake -f docker-bake.hcl $@
+
+
+
+.PHONY: debug dev preview rc rel
+
+
+$(CONFIG_FILES): $(DST_PROXY)/% : $(CNF_PROXY)/%
+	@echo Copy $< to $@
+	@mkdir -p $(@D)
+	@cp $< $@
+
+$(TARGET_FILES): $(DST_PROXY)/% : $(SRC_PROXY)/%
+	@echo Copy $< to $@
+	@mkdir -p $(@D)
+	@cp $< $@
+
+$(DST)/requirements.txt : $(SRC)/requirements.txt
+	@echo Copy $< to $@
+	@cp $< $@
--- a/app/config/default_config.toml
+++ b/app/config/default_config.toml
@@ -149,7 +149,7 @@ modbus_polling = true        # Enable optional MODBUS polling

 # if your inverter supports SSL connections you must use the client_mode. Pls, uncomment
 # the next line and configure the fixed IP of your inverter
-#client_mode = {host = '192.168.0.1', port = 8899}  
+#client_mode = {host = '192.168.0.1', port = 8899, forward = true}  

 pv1 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
 pv2 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
--- a/app/docker-bake.hcl
+++ b/app/docker-bake.hcl
@@ -18,7 +18,7 @@ variable "DESCRIPTION" {
 }

 target "_common" {
-  context = "app"
+  context = "."
  dockerfile = "Dockerfile"
  args = {
    VERSION = "${VERSION}"
--- a/app/requirements-test.txt
+++ b/app/requirements-test.txt
@@ -4,4 +4,5 @@
    pytest-cov
    python-dotenv
    mock
-    coverage
+    coverage
+    jinja2-cli
--- a/app/src/cnf/config.py
+++ b/app/src/cnf/config.py
@@ -189,6 +189,7 @@ here. The default config reader is handled in the Config.init method'''
            cls.err = f'error: {error}'
            logging.error(
                f"Can't read from {reader.descr()} => error\n  {error}")
+            return cls.err

        logging.info(f'Read from {reader.descr()} => {res}')
        return cls.err
--- a/app/src/cnf/config_read_env.py
+++ b/app/src/cnf/config_read_env.py
@@ -22,4 +22,4 @@ class ConfigReadEnv(ConfigIfc):
        return conf

    def descr(self):
-        return "Read environment"
+        return "environment"
--- a/app/src/gen3/talent.py
+++ b/app/src/gen3/talent.py
@@ -449,7 +449,7 @@ class Talent(Message):
            self.__build_header(0x99)
            self.ifc.tx_add(b'\x01')
            self.__finish_send_msg()
-            self.__process_data()
+            self.__process_data(False)

        elif self.ctrl.is_resp():
            return  # ignore received response
@@ -464,7 +464,7 @@ class Talent(Message):
            self.__build_header(0x99)
            self.ifc.tx_add(b'\x01')
            self.__finish_send_msg()
-            self.__process_data()
+            self.__process_data(True)
            self.state = State.up  # allow MODBUS cmds
            if (self.modbus_polling):
                self.mb_timer.start(self.mb_first_timeout)
@@ -479,8 +479,14 @@ class Talent(Message):

        self.forward()

-    def __process_data(self):
+    def __process_data(self, ignore_replay: bool):
        msg_hdr_len, ts = self.parse_msg_header()
+        if ignore_replay:
+            age = self._utc() - self._utcfromts(ts)
+            age = age/(3600*24)
+            logger.debug(f"Age: {age} days")
+            if age > 1:
+                return

        for key, update in self.db.parse(self.ifc.rx_peek(), self.header_len
                                         + msg_hdr_len, self.node_id):
--- a/app/src/infos.py
+++ b/app/src/infos.py
@@ -299,37 +299,53 @@ class Infos:
    {% set result = 'noAlarm'%}
  {%else%}
    {% set result = '' %}
-    {% if val_int | bitwise_and(1)%}{% set result = result + 'Bit1, '%}
+    {% if val_int | bitwise_and(1)%}
+        {% set result = result + 'HBridgeFault, '%}
    {% endif %}
-    {% if val_int | bitwise_and(2)%}{% set result = result + 'Bit2, '%}
+    {% if val_int | bitwise_and(2)%}
+        {% set result = result + 'DriVoltageFault, '%}
    {% endif %}
-    {% if val_int | bitwise_and(3)%}{% set result = result + 'Bit3, '%}
+    {% if val_int | bitwise_and(3)%}
+        {% set result = result + 'GFDI-Fault, '%}
    {% endif %}
-    {% if val_int | bitwise_and(4)%}{% set result = result + 'Bit4, '%}
+    {% if val_int | bitwise_and(4)%}
+        {% set result = result + 'OverTemp, '%}
    {% endif %}
-    {% if val_int | bitwise_and(5)%}{% set result = result + 'Bit5, '%}
+    {% if val_int | bitwise_and(5)%}
+        {% set result = result + 'CommLose, '%}
    {% endif %}
-    {% if val_int | bitwise_and(6)%}{% set result = result + 'Bit6, '%}
+    {% if val_int | bitwise_and(6)%}
+        {% set result = result + 'Bit6, '%}
    {% endif %}
-    {% if val_int | bitwise_and(7)%}{% set result = result + 'Bit7, '%}
+    {% if val_int | bitwise_and(7)%}
+        {% set result = result + 'Bit7, '%}
    {% endif %}
-    {% if val_int | bitwise_and(8)%}{% set result = result + 'Bit8, '%}
+    {% if val_int | bitwise_and(8)%}
+        {% set result = result + 'EEPROM-Fault, '%}
    {% endif %}
-    {% if val_int | bitwise_and(9)%}{% set result = result + 'noUtility, '%}
+    {% if val_int | bitwise_and(9)%}
+        {% set result = result + 'NoUtility, '%}
    {% endif %}
-    {% if val_int | bitwise_and(10)%}{% set result = result + 'Bit10, '%}
+    {% if val_int | bitwise_and(10)%}
+        {% set result = result + 'VG_Offset, '%}
    {% endif %}
-    {% if val_int | bitwise_and(11)%}{% set result = result + 'Bit11, '%}
+    {% if val_int | bitwise_and(11)%}
+        {% set result = result + 'Relais_Open, '%}
    {% endif %}
-    {% if val_int | bitwise_and(12)%}{% set result = result + 'Bit12, '%}
+    {% if val_int | bitwise_and(12)%}
+        {% set result = result + 'Relais_Short, '%}
    {% endif %}
-    {% if val_int | bitwise_and(13)%}{% set result = result + 'Bit13, '%}
+    {% if val_int | bitwise_and(13)%}
+        {% set result = result + 'GridVoltOverRating, '%}
    {% endif %}
-    {% if val_int | bitwise_and(14)%}{% set result = result + 'Bit14, '%}
+    {% if val_int | bitwise_and(14)%}
+        {% set result = result + 'GridVoltUnderRating, '%}
    {% endif %}
-    {% if val_int | bitwise_and(15)%}{% set result = result + 'Bit15, '%}
+    {% if val_int | bitwise_and(15)%}
+        {% set result = result + 'GridFreqOverRating, '%}
    {% endif %}
-    {% if val_int | bitwise_and(16)%}{% set result = result + 'Bit16, '%}
+    {% if val_int | bitwise_and(16)%}
+        {% set result = result + 'GridFreqUnderRating, '%}
    {% endif %}
  {% endif %}
  {{ result }}
@@ -345,15 +361,20 @@ class Infos:
    {% set result = 'noFault'%}
  {%else%}
    {% set result = '' %}
-    {% if val_int | bitwise_and(1)%}{% set result = result + 'Bit1, '%}
+    {% if val_int | bitwise_and(1)%}
+        {% set result = result + 'PVOV-Fault (PV OverVolt), '%}
    {% endif %}
-    {% if val_int | bitwise_and(2)%}{% set result = result + 'Bit2, '%}
+    {% if val_int | bitwise_and(2)%}
+        {% set result = result + 'PVLV-Fault (PV LowVolt), '%}
    {% endif %}
-    {% if val_int | bitwise_and(3)%}{% set result = result + 'Bit3, '%}
+    {% if val_int | bitwise_and(3)%}
+        {% set result = result + 'PV OI-Fault (PV OverCurrent), '%}
    {% endif %}
-    {% if val_int | bitwise_and(4)%}{% set result = result + 'Bit4, '%}
+    {% if val_int | bitwise_and(4)%}
+        {% set result = result + 'PV OFV-Fault, '%}
    {% endif %}
-    {% if val_int | bitwise_and(5)%}{% set result = result + 'Bit5, '%}
+    {% if val_int | bitwise_and(5)%}
+        {% set result = result + 'DC ShortCircuitFault, '%}
    {% endif %}
    {% if val_int | bitwise_and(6)%}{% set result = result + 'Bit6, '%}
    {% endif %}
--- a/app/src/inverter_base.py
+++ b/app/src/inverter_base.py
@@ -6,6 +6,7 @@ import json
 import gc
 from aiomqtt import MqttCodeError
 from asyncio import StreamReader, StreamWriter
+from ipaddress import ip_address

 from inverter_ifc import InverterIfc
 from proxy import Proxy
@@ -101,6 +102,20 @@ class InverterBase(InverterIfc, Proxy):
            logging.info(f'[{stream.node_id}] Connect to {addr}')
            connect = asyncio.open_connection(host, port)
            reader, writer = await connect
+            r_addr = writer.get_extra_info('peername')
+            if r_addr is not None:
+                (ip, _) = r_addr
+                if ip_address(ip).is_private:
+                    logging.error(
+                        f"""resolve {host} to {ip}, which is a private IP!
+\u001B[31m  Check your DNS settings and use a public DNS resolver!
+
+  To prevent a possible loop, forwarding to local IP addresses is
+  not supported and is deactivated for subsequent connections
+\u001B[0m
+""")
+                    Config.act_config[self.config_id]['enabled'] = False
+
            ifc = AsyncStreamClient(
                reader, writer, self.local, self.__del_remote)

--- a/app/src/logging.ini
+++ b/app/src/logging.ini
@@ -58,13 +58,13 @@ formatter=console_formatter
 class=handlers.TimedRotatingFileHandler
 level=INFO
 formatter=file_formatter
-args=('log/proxy.log', when:='midnight')
+args=(handlers.log_path + 'proxy.log', when:='midnight', backupCount:=handlers.log_backups)

 [handler_file_handler_name2]
 class=handlers.TimedRotatingFileHandler
 level=NOTSET
 formatter=file_formatter
-args=('log/trace.log', when:='midnight')
+args=(handlers.log_path + 'trace.log', when:='midnight', backupCount:=handlers.log_backups)

 [formatter_console_formatter]
 format=%(asctime)s %(levelname)5s | %(name)4s | %(message)s'
--- a/app/src/modbus_tcp.py
+++ b/app/src/modbus_tcp.py
@@ -49,7 +49,7 @@ class ModbusTcp():
               and 'monitor_sn' in inv
               and 'client_mode' in inv):
                client = inv['client_mode']
-                # logging.info(f"SerialNo:{inv['monitor_sn']} host:{client['host']} port:{client['port']}")  # noqa: E501
+                logger.info(f"'client_mode' for snr: {inv['monitor_sn']} host: {client['host']}:{client['port']}, forward: {client['forward']}")  # noqa: E501
                loop.create_task(self.modbus_loop(client['host'],
                                                  client['port'],
                                                  inv['monitor_sn'],
--- a/app/src/server.py
+++ b/app/src/server.py
@@ -1,5 +1,6 @@
 import logging
 import asyncio
+import logging.handlers
 import signal
 import os
 import argparse
@@ -81,7 +82,7 @@ async def handle_client(reader: StreamReader, writer: StreamWriter, inv_class):
        await inv.local.ifc.server_loop()


-async def handle_shutdown(web_task):
+async def handle_shutdown(loop, web_task):
    '''Close all TCP connections and stop the event loop'''

    logging.info('Shutdown due to SIGTERM')
@@ -131,16 +132,21 @@ def get_log_level() -> int:
    return log_level


-if __name__ == "__main__":   # pragma: no cover
+def main():   # pragma: no cover
    parser = argparse.ArgumentParser()
-    parser.add_argument('-p', '--config_path', type=str,
+    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('--add_on', action='store_true')
+    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
@@ -148,12 +154,20 @@ if __name__ == "__main__":   # pragma: no cover
    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)
+
    logging.config.fileConfig('logging.ini')
    logging.info(f'Server "{serv_name} - {version}" will be started')
-    logging.info(f"AddOn: {args.add_on}")
+    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('******')

@@ -176,10 +190,12 @@ if __name__ == "__main__":   # pragma: no cover
    ConfigReadToml(args.config_path + "config.toml")
    ConfigReadJson(args.json_config)
    ConfigReadToml(args.toml_config)
-    ConfigErr = Config.get_error()
+    config_err = Config.get_error()
+
+    if config_err is not None:
+        logging.info(f'config_err: {config_err}')
+        return

-    if ConfigErr is not None:
-        logging.info(f'ConfigErr: {ConfigErr}')
    logging.info('******')

    Proxy.class_init()
@@ -192,6 +208,7 @@ if __name__ == "__main__":   # pragma: no cover
    # 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))
@@ -204,12 +221,12 @@ if __name__ == "__main__":   # pragma: no cover
    for signame in ('SIGINT', 'SIGTERM'):
        loop.add_signal_handler(getattr(signal, signame),
                                lambda loop=loop: asyncio.create_task(
-                                    handle_shutdown(web_task)))
+                                    handle_shutdown(loop, web_task)))

    loop.set_debug(log_level == logging.DEBUG)
    try:
-        if ConfigErr is None:
-            proxy_is_up = True
+        global proxy_is_up
+        proxy_is_up = True
        loop.run_forever()
    except KeyboardInterrupt:
        pass
@@ -219,3 +236,7 @@ if __name__ == "__main__":   # pragma: no cover
        logging.debug('Close event loop')
        loop.close()
        logging.info(f'Finally, exit Server "{serv_name}"')
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
--- a/app/tests/test_config_read_json.py
+++ b/app/tests/test_config_read_json.py
@@ -195,10 +195,10 @@ def test_cnv4():
       "node_id": "PV-Garage/",
       "suggested_area": "Garage",
       "modbus_polling": False,
-       "pv1_manufacturer": "man1",
-       "pv1_type": "type1",
-       "pv2_manufacturer": "man2",
-       "pv2_type": "type2",
+       "pv1.manufacturer": "man1",
+       "pv1.type": "type1",
+       "pv2.manufacturer": "man2",
+       "pv2.type": "type2",
       "sensor_list": 688
     },
     {
@@ -207,16 +207,17 @@ def test_cnv4():
       "node_id": "PV-Garage2/",
       "suggested_area": "Garage2",
       "modbus_polling": True,
-       "client_mode_host": "InverterIP",
-       "client_mode_port": 1234,
-       "pv1_manufacturer": "man1",
-       "pv1_type": "type1",
-       "pv2_manufacturer": "man2",
-       "pv2_type": "type2",
-       "pv3_manufacturer": "man3",
-       "pv3_type": "type3",
-       "pv4_manufacturer": "man4",
-       "pv4_type": "type4",
+       "client_mode.host": "InverterIP",
+       "client_mode.port": 1234,
+       "client_mode.forward": True,
+       "pv1.manufacturer": "man1",
+       "pv1.type": "type1",
+       "pv2.manufacturer": "man2",
+       "pv2.type": "type2",
+       "pv3.manufacturer": "man3",
+       "pv3.type": "type3",
+       "pv4.manufacturer": "man4",
+       "pv4.type": "type4",
       "sensor_list": 688
     }
   ],
@@ -247,25 +248,33 @@ def test_cnv4():
                                          'block': ['AT+SUPDATE']}}},
        'inverters': {'R170000000000001': {'modbus_polling': False,
                                           'node_id': 'PV-Garage/',
-                                           'pv1_manufacturer': 'man1',
-                                           'pv1_type': 'type1',
-                                           'pv2_manufacturer': 'man2',
-                                           'pv2_type': 'type2',
+                                           'pv1': {
+                                               'manufacturer': 'man1',
+                                                'type': 'type1'},
+                                           'pv2': {
+                                               'manufacturer': 'man2',
+                                                'type': 'type2'},
                                           'sensor_list': 688,
                                           'suggested_area': 'Garage'},
-                      'Y170000000000001': {'client_mode_host': 'InverterIP',
-                                           'client_mode_port': 1234,
+                      'Y170000000000001': {'client_mode': {
+                                                'host': 'InverterIP',
+                                                'port': 1234,
+                                                'forward': True},
                                           'modbus_polling': True,
                                           'monitor_sn': 2000000000,
                                           'node_id': 'PV-Garage2/',
-                                           'pv1_manufacturer': 'man1',
-                                           'pv1_type': 'type1',
-                                           'pv2_manufacturer': 'man2',
-                                           'pv2_type': 'type2',
-                                           'pv3_manufacturer': 'man3',
-                                           'pv3_type': 'type3',
-                                           'pv4_manufacturer': 'man4',
-                                           'pv4_type': 'type4',
+                                           'pv1': {
+                                                'manufacturer': 'man1',
+                                                'type': 'type1'},
+                                           'pv2': {
+                                                'manufacturer': 'man2',
+                                                'type': 'type2'},
+                                           'pv3': {
+                                                'manufacturer': 'man3',
+                                                'type': 'type3'},
+                                           'pv4': {
+                                                'manufacturer': 'man4',
+                                                'type': 'type4'},
                                           'sensor_list': 688,
                                           'suggested_area': 'Garage2'},
                      'allow_all': False},
@@ -362,8 +371,6 @@ def test_full_config(ConfigComplete):
       "node_id": "PV-Garage2/",
       "suggested_area": "Garage2",
       "modbus_polling": true,
-       "client_mode_host": "InverterIP",
-       "client_mode_port": 1234,
       "pv1.manufacturer": "man1",
       "pv1.type": "type1",
       "pv2.manufacturer": "man2",
--- a/app/tests/test_inverter_base.py
+++ b/app/tests/test_inverter_base.py
@@ -54,11 +54,12 @@ class FakeReader():


 class FakeWriter():
+    peer = ('47.1.2.3', 10000)
    def write(self, buf: bytes):
        return
    def get_extra_info(self, sel: str):
        if sel == 'peername':
-            return 'remote.intern'
+            return self.peer
        elif sel == 'sockname':
            return 'sock:1234'
        assert False
@@ -241,6 +242,118 @@ async def test_remote_conn(config_conn, patch_open_connection):
        cnt += 1
    assert cnt == 0

+@pytest.mark.asyncio
+async def test_remote_conn_to_private(config_conn, patch_open_connection):
+    '''check DNS resolving of the TSUN FQDN to a local address'''
+    _ = config_conn
+    _ = patch_open_connection
+    assert asyncio.get_running_loop()
+    InverterBase._registry.clear()
+    reader = FakeReader()
+    writer =  FakeWriter()
+    FakeWriter.peer = ("192.168.0.1", 10000)
+
+    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
+        assert inverter.local.stream
+        assert inverter.local.ifc
+        await inverter.create_remote()
+        await asyncio.sleep(0)
+        assert not Config.act_config['tsun']['enabled']
+        assert inverter.remote.stream
+        assert inverter.remote.ifc
+        assert inverter.local.ifc.healthy()
+
+    # outside context manager the unhealth AsyncStream is released
+    FakeWriter.peer = ("47.1.2.3", 10000)
+    cnt = 0
+    for inv in InverterBase:
+        assert inv.healthy()  # inverter is healthy again (without the unhealty AsyncStream)
+        cnt += 1
+        del inv
+    assert cnt == 1
+
+    del inverter
+    cnt = 0
+    for inv in InverterBase:
+        print(f'InverterBase refs:{gc.get_referrers(inv)}')
+        cnt += 1
+    assert cnt == 0
+
+
+@pytest.mark.asyncio
+async def test_remote_conn_to_loopback(config_conn, patch_open_connection):
+    '''check DNS resolving of the TSUN FQDN to the loopback address'''
+    _ = config_conn
+    _ = patch_open_connection
+    assert asyncio.get_running_loop()
+    InverterBase._registry.clear()
+    reader = FakeReader()
+    writer =  FakeWriter()
+    FakeWriter.peer = ("127.0.0.1", 10000)
+
+    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
+        assert inverter.local.stream
+        assert inverter.local.ifc
+        await inverter.create_remote()
+        await asyncio.sleep(0)
+        assert not Config.act_config['tsun']['enabled']
+        assert inverter.remote.stream
+        assert inverter.remote.ifc
+        assert inverter.local.ifc.healthy()
+
+    # outside context manager the unhealth AsyncStream is released
+    FakeWriter.peer = ("47.1.2.3", 10000)
+    cnt = 0
+    for inv in InverterBase:
+        assert inv.healthy()  # inverter is healthy again (without the unhealty AsyncStream)
+        cnt += 1
+        del inv
+    assert cnt == 1
+
+    del inverter
+    cnt = 0
+    for inv in InverterBase:
+        print(f'InverterBase refs:{gc.get_referrers(inv)}')
+        cnt += 1
+    assert cnt == 0
+
+@pytest.mark.asyncio
+async def test_remote_conn_to_None(config_conn, patch_open_connection):
+    '''check if get_extra_info() return None in case of an error'''
+    _ = config_conn
+    _ = patch_open_connection
+    assert asyncio.get_running_loop()
+    InverterBase._registry.clear()
+    reader = FakeReader()
+    writer =  FakeWriter()
+    FakeWriter.peer = None
+
+    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
+        assert inverter.local.stream
+        assert inverter.local.ifc
+        await inverter.create_remote()
+        await asyncio.sleep(0)
+        assert Config.act_config['tsun']['enabled']
+        assert inverter.remote.stream
+        assert inverter.remote.ifc
+        assert inverter.local.ifc.healthy()
+
+    # outside context manager the unhealth AsyncStream is released
+    FakeWriter.peer = ("47.1.2.3", 10000)
+    cnt = 0
+    for inv in InverterBase:
+        assert inv.healthy()  # inverter is healthy again (without the unhealty AsyncStream)
+        cnt += 1
+        del inv
+    assert cnt == 1
+
+    del inverter
+    cnt = 0
+    for inv in InverterBase:
+        print(f'InverterBase refs:{gc.get_referrers(inv)}')
+        cnt += 1
+    assert cnt == 0
+
@pytest.mark.asyncio
 async def test_unhealthy_remote(config_conn, patch_open_connection, patch_unhealthy_remote):
    _ = config_conn
--- a/app/tests/test_inverter_g3.py
+++ b/app/tests/test_inverter_g3.py
@@ -59,7 +59,7 @@ class FakeWriter():
        return
    def get_extra_info(self, sel: str):
        if sel == 'peername':
-            return 'remote.intern'
+            return ('47.1.2.3', 10000)
        elif sel == 'sockname':
            return 'sock:1234'
        assert False
--- a/app/tests/test_inverter_g3p.py
+++ b/app/tests/test_inverter_g3p.py
@@ -58,7 +58,7 @@ class FakeWriter():
        return
    def get_extra_info(self, sel: str):
        if sel == 'peername':
-            return 'remote.intern'
+            return ('47.1.2.3', 10000)
        elif sel == 'sockname':
            return 'sock:1234'
        assert False
@@ -94,7 +94,8 @@ def patch_open_connection():
    with patch.object(asyncio, 'open_connection', new_open) as conn:
        yield conn

-def test_method_calls():
+def test_method_calls(config_conn):
+    _ = config_conn
    reader = FakeReader()
    writer =  FakeWriter()
    InverterBase._registry.clear()
--- a/app/tests/test_talent.py
+++ b/app/tests/test_talent.py
@@ -328,6 +328,90 @@ def msg_inverter_ind_new(): # Data indication from DSP V5.0.17
    msg += b'\x00\x00\x00\x00'
    return msg

+@pytest.fixture
+def msg_inverter_ind_new2(): # Data indication from DSP V5.0.17
+    msg =  b'\x00\x00\x04\xf4\x10R170000000000001\x91\x04\x01\x90\x00\x01\x10R170000000000001'
+    msg += b'\x01\x00\x00\x01'
+    msg += b'\x86\x98\x55\xe7\x48\x00\x00\x00\xa3\x00\x00\x01\x93\x53\x00\x00'
+    msg += b'\x00\x00\x01\x94\x53\x00\x00\x00\x00\x01\x95\x53\x00\x00\x00\x00'
+    msg += b'\x01\x96\x53\x00\x00\x00\x00\x01\x97\x53\x00\x00\x00\x00\x01\x98'
+    msg += b'\x53\x00\x00\x00\x00\x01\x99\x53\x00\x00\x00\x00\x01\x9a\x53\x00'
+    msg += b'\x00\x00\x00\x01\x9b\x53\x00\x00\x00\x00\x01\x9c\x53\x00\x00\x00'
+    msg += b'\x00\x01\x9d\x53\x00\x00\x00\x00\x01\x9e\x53\x00\x00\x00\x00\x01'
+    msg += b'\x9f\x53\x00\x00\x00\x00\x01\xa0\x53\x00\x00\x00\x00\x01\xf4\x49'
+    msg += b'\x00\x00\x00\x00\x00\x00\x01\xf5\x53\x00\x00\x00\x00\x01\xf6\x53'
+    msg += b'\x00\x00\x00\x00\x01\xf7\x53\x00\x00\x00\x00\x01\xf8\x53\x00\x00'
+    msg += b'\x00\x00\x01\xf9\x53\x00\x00\x00\x00\x01\xfa\x53\x00\x00\x00\x00'
+    msg += b'\x01\xfb\x53\x00\x00\x00\x00\x01\xfc\x53\x00\x00\x00\x00\x01\xfd'
+    msg += b'\x53\x00\x00\x00\x00\x01\xfe\x53\x00\x00\x00\x00\x01\xff\x53\x00'
+    msg += b'\x00\x00\x00\x02\x00\x53\x00\x00\x00\x00\x02\x01\x53\x00\x00\x00'
+    msg += b'\x00\x02\x02\x53\x00\x00\x00\x00\x02\x03\x53\x00\x00\x00\x00\x02'
+    msg += b'\x04\x53\x00\x00\x00\x00\x02\x58\x49\x00\x00\x00\x00\x00\x00\x02'
+    msg += b'\x59\x53\x00\x00\x00\x00\x02\x5a\x53\x00\x00\x00\x00\x02\x5b\x53'
+    msg += b'\x00\x00\x00\x00\x02\x5c\x53\x00\x00\x00\x00\x02\x5d\x53\x00\x00'
+    msg += b'\x00\x00\x02\x5e\x53\x00\x00\x00\x00\x02\x5f\x53\x00\x00\x00\x00'
+    msg += b'\x02\x60\x53\x00\x00\x00\x00\x02\x61\x53\x00\x00\x00\x00\x02\x62'
+    msg += b'\x53\x00\x00\x00\x00\x02\x63\x53\x00\x00\x00\x00\x02\x64\x53\x00'
+    msg += b'\x00\x00\x00\x02\x65\x53\x00\x00\x00\x00\x02\x66\x53\x00\x00\x00'
+    msg += b'\x00\x02\x67\x53\x00\x00\x00\x00\x02\x68\x53\x00\x00\x00\x00\x02'
+    msg += b'\xbc\x49\x00\x00\x00\x00\x00\x00\x02\xbd\x53\x00\x00\x00\x00\x02'
+    msg += b'\xbe\x53\x00\x00\x00\x00\x02\xbf\x53\x00\x00\x00\x00\x02\xc0\x53'
+    msg += b'\x00\x00\x00\x00\x02\xc1\x53\x00\x00\x00\x00\x02\xc2\x53\x00\x00'
+    msg += b'\x00\x00\x02\xc3\x53\x00\x00\x00\x00\x02\xc4\x53\x00\x00\x00\x00'
+    msg += b'\x02\xc5\x53\x00\x00\x00\x00\x02\xc6\x53\x00\x00\x00\x00\x02\xc7'
+    msg += b'\x53\x00\x00\x00\x00\x02\xc8\x53\x00\x00\x00\x00\x02\xc9\x53\x00'
+    msg += b'\x00\x00\x00\x02\xca\x53\x00\x00\x00\x00\x02\xcb\x53\x00\x00\x00'
+    msg += b'\x00\x02\xcc\x53\x00\x00\x00\x00\x03\x20\x53\x00\x00\x00\x00\x03'
+    msg += b'\x84\x53\x50\x11\x00\x00\x03\xe8\x46\x43\x65\xcc\xcd\x00\x00\x04'
+    msg += b'\x4c\x46\x40\x0c\xcc\xcd\x00\x00\x04\xb0\x46\x42\x47\xd7\x0a\x00'
+    msg += b'\x00\x05\x14\x53\x00\x35\x00\x00\x05\x78\x53\x00\x00\x00\x00\x05'
+    msg += b'\xdc\x53\x03\x20\x00\x00\x06\x40\x46\x43\xfd\x4c\xcd\x00\x00\x06'
+    msg += b'\xa4\x46\x42\x18\x00\x00\x00\x00\x07\x08\x46\x40\xde\x14\x7b\x00'
+    msg += b'\x00\x07\x6c\x46\x43\x84\x33\x33\x00\x00\x07\xd0\x46\x42\x1a\x00'
+    msg += b'\x00\x00\x00\x08\x34\x46\x40\xda\x8f\x5c\x00\x00\x08\x98\x46\x43'
+    msg += b'\x83\xb3\x33\x00\x00\x08\xfc\x46\x00\x00\x00\x00\x00\x00\x09\x60'
+    msg += b'\x46\x00\x00\x00\x00\x00\x00\x09\xc4\x46\x00\x00\x00\x00\x00\x00'
+    msg += b'\x0a\x28\x46\x00\x00\x00\x00\x00\x00\x0a\x8c\x46\x00\x00\x00\x00'
+    msg += b'\x00\x00\x0a\xf0\x46\x00\x00\x00\x00\x00\x00\x0b\x54\x46\x40\x9c'
+    msg += b'\xcc\xcd\x00\x00\x0b\xb8\x46\x43\xea\xb5\xc3\x00\x00\x0c\x1c\x46'
+    msg += b'\x40\x1e\xb8\x52\x00\x00\x0c\x80\x46\x43\x6d\x2b\x85\x00\x00\x0c'
+    msg += b'\xe4\x46\x40\x1a\xe1\x48\x00\x00\x0d\x48\x46\x43\x68\x40\x00\x00'
+    msg += b'\x00\x0d\xac\x46\x00\x00\x00\x00\x00\x00\x0e\x10\x46\x00\x00\x00'
+    msg += b'\x00\x00\x00\x0e\x74\x46\x00\x00\x00\x00\x00\x00\x0e\xd8\x46\x00'
+    msg += b'\x00\x00\x00\x00\x00\x0f\x3c\x53\x00\x00\x00\x00\x0f\xa0\x53\x00'
+    msg += b'\x00\x00\x00\x10\x04\x53\x55\xaa\x00\x00\x10\x68\x53\x00\x01\x00'
+    msg += b'\x00\x10\xcc\x53\x00\x00\x00\x00\x11\x30\x53\x00\x00\x00\x00\x11'
+    msg += b'\x94\x53\x00\x00\x00\x00\x11\xf8\x53\xff\xff\x00\x00\x12\x5c\x53'
+    msg += b'\xff\xff\x00\x00\x12\xc0\x53\x00\x00\x00\x00\x13\x24\x53\xff\xff'
+    msg += b'\x00\x00\x13\x88\x53\xff\xff\x00\x00\x13\xec\x53\xff\xff\x00\x00'
+    msg += b'\x14\x50\x53\xff\xff\x00\x00\x14\xb4\x53\xff\xff\x00\x00\x15\x18'
+    msg += b'\x53\xff\xff\x00\x00\x15\x7c\x53\x00\x00\x00\x00\x27\x10\x53\x00'
+    msg += b'\x02\x00\x00\x27\x74\x53\x00\x3c\x00\x00\x27\xd8\x53\x00\x68\x00'
+    msg += b'\x00\x28\x3c\x53\x05\x00\x00\x00\x28\xa0\x46\x43\x79\x00\x00\x00'
+    msg += b'\x00\x29\x04\x46\x43\x48\x00\x00\x00\x00\x29\x68\x46\x42\x48\x33'
+    msg += b'\x33\x00\x00\x29\xcc\x46\x42\x3e\x3d\x71\x00\x00\x2a\x30\x53\x00'
+    msg += b'\x01\x00\x00\x2a\x94\x46\x43\x37\x00\x00\x00\x00\x2a\xf8\x46\x42'
+    msg += b'\xce\x00\x00\x00\x00\x2b\x5c\x53\x00\x96\x00\x00\x2b\xc0\x53\x00'
+    msg += b'\x10\x00\x00\x2c\x24\x46\x43\x90\x00\x00\x00\x00\x2c\x88\x46\x43'
+    msg += b'\x95\x00\x00\x00\x00\x2c\xec\x53\x00\x06\x00\x00\x2d\x50\x53\x00'
+    msg += b'\x06\x00\x00\x2d\xb4\x46\x43\x7d\x00\x00\x00\x00\x2e\x18\x46\x42'
+    msg += b'\x3d\xeb\x85\x00\x00\x2e\x7c\x46\x42\x3d\xeb\x85\x00\x00\x2e\xe0'
+    msg += b'\x53\x00\x03\x00\x00\x2f\x44\x53\x00\x03\x00\x00\x2f\xa8\x46\x42'
+    msg += b'\x4d\xeb\x85\x00\x00\x30\x0c\x46\x42\x4d\xeb\x85\x00\x00\x30\x70'
+    msg += b'\x53\x00\x03\x00\x00\x30\xd4\x53\x00\x03\x00\x00\x31\x38\x46\x42'
+    msg += b'\x08\x00\x00\x00\x00\x31\x9c\x53\x00\x05\x00\x00\x32\x00\x53\x04'
+    msg += b'\x00\x00\x00\x32\x64\x53\x00\x01\x00\x00\x32\xc8\x53\x13\x9c\x00'
+    msg += b'\x00\x33\x2c\x53\x0f\xa0\x00\x00\x33\x90\x53\x00\x4f\x00\x00\x33'
+    msg += b'\xf4\x53\x00\x66\x00\x00\x34\x58\x53\x03\xe8\x00\x00\x34\xbc\x53'
+    msg += b'\x04\x00\x00\x00\x35\x20\x53\x00\x00\x00\x00\x35\x84\x53\x00\x00'
+    msg += b'\x00\x00\x35\xe8\x53\x00\x00\x00\x00\x36\x4c\x53\x00\x00\x00\x01'
+    msg += b'\x38\x80\x53\x00\x02\x00\x01\x38\x81\x53\x00\x01\x00\x01\x38\x82'
+    msg += b'\x53\x00\x01\x00\x01\x38\x83\x53\x00\x00\x00\x00\x00\x0a\x08\x00'
+    msg += b'\x00\x00\x00\x00\x00\x00\x00\x14\x04\x00\x00\x00\x00\x00\x00\x00'
+    msg += b'\x00\x1e\x07\x00\x00\x00\x00\x00'
+    return msg
+
+
@pytest.fixture
 def msg_inverter_ind_0w(): # Data indication with 0.5W grid output
    msg =  b'\x00\x00\x05\x02\x10R170000000000001\x91\x04\x01\x90\x00\x01\x10R170000000000001'
@@ -2151,3 +2235,34 @@ def test_timeout(config_tsun_inv1):
    m.modbus_polling = False
    assert Talent.MAX_DEF_IDLE_TIME == m._timeout()
    m.close()
+
+def test_msg_inv_replay(config_tsun_inv1, msg_inverter_ind_0w, msg_inverter_ind_new2):
+    '''replay must be ignores, since HA only supports realtime values'''
+    _ = config_tsun_inv1
+
+    m = MemoryStream(msg_inverter_ind_0w, (0,))   # realtime msg with 0.5W Output Power
+    m.append_msg(msg_inverter_ind_new2)           # replay msg with 506.6W Output Power
+    m.db.db['grid'] = {'Output_Power': 100}
+    m.db.stat['proxy']['Unknown_Ctrl'] = 0
+    m.db.stat['proxy']['Invalid_Data_Type'] = 0
+    m.read()         # read complete msg, and dispatch msg
+    assert m.db.stat['proxy']['Unknown_Ctrl'] == 0
+    assert m.db.stat['proxy']['Invalid_Data_Type'] == 0
+    assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
+    assert m.msg_count == 2
+    assert m.msg_recvd[0]['ctrl']==145
+    assert m.msg_recvd[0]['msg_id']==4
+    assert m.msg_recvd[0]['header_len']==23
+    assert m.msg_recvd[0]['data_len']==1263
+    assert m.msg_recvd[1]['ctrl']==145
+    assert m.msg_recvd[1]['msg_id']==4
+    assert m.msg_recvd[1]['header_len']==23
+    assert m.msg_recvd[1]['data_len']==1249
+    assert m.id_str == b"R170000000000001" 
+    assert m.unique_id == 'R170000000000001'
+
+    assert m.db.get_db_value(Register.INVERTER_STATUS) == 1
+    assert isclose(m.db.db['grid']['Output_Power'], 0.5)  # must be 0.5W not 100W nor 506.6W
+
+    m.close()
+    assert m.db.get_db_value(Register.INVERTER_STATUS) == 0