From 7f81799dd913f803369e547dc456ee461c4284d0 Mon Sep 17 00:00:00 2001
From: Stefan Allius <122395479+s-allius@users.noreply.github.com>
Date: Tue, 23 Jul 2024 21:54:01 +0200
Subject: [PATCH] S allius/issue131 (#132)

* Make __publish_outstanding_mqtt public

* update proxy counter

- on client mode connection establishment or
  disconnecting update tje counection counter
---
 app/src/async_stream.py | 6 +++---
 app/src/modbus_tcp.py   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/async_stream.py b/app/src/async_stream.py
index 3082a75..1c76cb3 100644
--- a/app/src/async_stream.py
+++ b/app/src/async_stream.py
@@ -44,7 +44,7 @@ class AsyncStream():
                 to = self.MAX_CLOUD_IDLE_TIME
         return to
 
-    async def __publish_outstanding_mqtt(self):
+    async def publish_outstanding_mqtt(self):
         '''Publish all outstanding MQTT topics'''
         try:
             if self.unique_id:
@@ -58,10 +58,10 @@ class AsyncStream():
         logger.info(f'[{self.node_id}:{self.conn_no}] '
                     f'Accept connection from {addr}')
         self.inc_counter('Inverter_Cnt')
-        await self.__publish_outstanding_mqtt()
+        await self.publish_outstanding_mqtt()
         await self.loop()
         self.dec_counter('Inverter_Cnt')
-        await self.__publish_outstanding_mqtt()
+        await self.publish_outstanding_mqtt()
         logger.info(f'[{self.node_id}:{self.conn_no}] Server loop stopped for'
                     f' r{self.r_addr}')
 
diff --git a/app/src/modbus_tcp.py b/app/src/modbus_tcp.py
index 6674b99..42a1eba 100644
--- a/app/src/modbus_tcp.py
+++ b/app/src/modbus_tcp.py
@@ -24,10 +24,12 @@ class ModbusConn():
         logging.info(f'[{self.stream.node_id}:{self.stream.conn_no}] '
                      f'Connected to {self.addr}')
         self.stream.inc_counter('Inverter_Cnt')
+        await self.stream.publish_outstanding_mqtt()
         return self.stream
 
     async def __aexit__(self, exc_type, exc, tb):
         self.stream.dec_counter('Inverter_Cnt')
+        await self.stream.publish_outstanding_mqtt()
 
 
 class ModbusTcp():